X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fsignal%2Fsignal.component.ts;h=9e08f6f07380476e0e7fec11c7402ccb198e757d;hb=refs%2Fchanges%2F68%2F168%2F9;hp=a3ad5a24f6664c77d8aabe7850fcf87a6d58cf80;hpb=7635a665c46bb7a487a3b582bb3e98c7f12e799e;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/signal/signal.component.ts b/webapp-frontend/src/app/signal/signal.component.ts
index a3ad5a24..9e08f6f0 100644
--- a/webapp-frontend/src/app/signal/signal.component.ts
+++ b/webapp-frontend/src/app/signal/signal.component.ts
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,115 +17,73 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit, Inject } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
-import { SignalService } from '../services/signal/signal.service';
-import { Router } from '@angular/router';
-import { MatDialog, MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
-import {MatFormFieldModule} from '@angular/material';
-import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
-import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs/Rx';
-
-export interface DialogData {
-    ranName: string;
-    ranIp: number;
-    ranPort: number;
-}
+import { MatDialog} from '@angular/material/dialog';
+import { AppRANConnectDialogComponent } from './signal.component.ranconnect-dialog';
+import { E2ManagerService } from '../services/e2-mgr/e2-mgr.service';
+import { E2SetupRequest } from '../interfaces/e2-mgr.types';
 
 @Component({
-    selector: 'app-signal',
-    templateUrl: 'signal.component.html',
-    styleUrls: ['signal.component.css']
+  selector: 'app-signal',
+  templateUrl: 'signal.component.html',
+  styleUrls: ['signal.component.css']
 })
-export class SignalComponent {
-
-    settings = {
-        hideSubHeader: true,
-        actions: {
-            columnTitle: 'Actions',
-            add: false,
-            edit: false,
-            delete: false,
-            position: 'right'
-        },
-        columns: {
-            requestType: {
-                title: 'Request Type',
-                type: 'string',
-            },
-            ranName: {
-                title: 'eNodeB/gNodeB Name',
-                type: 'string',
-            },
-            ranIp: {
-                title: 'IP',
-                type: 'number',
-            },
-            ranPort: {
-                title: 'Port',
-                type: 'number',
-            },
-            responseCode: {
-                title: 'Response',
-                type: 'number',
-            },
-            timeStamp: {
-                title: 'Time Stamp',
-                type: 'string',
-            }
-        }
-    };
-
-    source: LocalDataSource = new LocalDataSource();
-
-    ranName: string;
-
-    ranIp: number;
 
-    ranPort: number;
-
-    constructor(private service: SignalService, public dialog: MatDialog, private http: HttpClient) {
-        this.service.getAll().subscribe((val: any[]) => this.source.load(val));
+export class SignalComponent implements OnInit {
+  settings = {
+    hideSubHeader: true,
+    actions: {
+      columnTitle: 'Actions',
+      add: false,
+      edit: false,
+      delete: false,
+      position: 'right'
+    },
+    columns: {
+      requestType: {
+        title: 'RAN Type',
+        type: 'string',
+      },
+      ranName: {
+        title: 'eNodeB/gNodeB Name',
+        type: 'string',
+      },
+      ranIp: {
+        title: 'IP',
+        type: 'number',
+      },
+      ranPort: {
+        title: 'Port',
+        type: 'number',
+      },
+      responseCode: {
+        title: 'Response',
+        type: 'number',
+      },
+      timeStamp: {
+        title: 'Time Stamp',
+        type: 'string',
+      }
     }
+  };
 
-    openRanConnectDialog() {
-
-        const dialogRef = this.dialog.open(AppRANConnectDialog,  {
-            width: '450px',
-            data: {ranName: this.ranName, ranIp: this.ranIp, ranPort: this.ranPort}
-    })
+  source: LocalDataSource = new LocalDataSource();
 
-        dialogRef.afterClosed().subscribe(result => {
-            this.service.getAll().subscribe((val: any[]) => this.source.load(val));
-        });
+  constructor(private service: E2ManagerService, public dialog: MatDialog) { }
 
-    }
-}
+  ngOnInit() {
+    this.service.getAll().subscribe((val: E2SetupRequest[]) => this.source.load(val));
+  }
 
-@Component({
-    selector: 'app-signal-ranconnect-dialog',
-    templateUrl: 'signal.component.ranconnect-dialog.html',
-    styleUrls: ['signal.component.css']
-})
-
-export class AppRANConnectDialog implements OnInit {
-
-    constructor(public dialogRef: MatDialogRef<AppRANConnectDialog>,
-          private service: SignalService,
-          @Inject(MAT_DIALOG_DATA) public data: DialogData) {
-    }
-
-    ngOnInit() {
-    }
-
-    close() {
-        this.dialogRef.close();
-    }
-
-    connectRAN(): void {
-        this.service.x2Setup(this.data).subscribe((val: any[]) => {});
-        this.dialogRef.close();
-    }
+  openRanConnectDialog() {
+    const dialogRef = this.dialog.open(AppRANConnectDialogComponent, {
+      width: '450px',
+      data: {}
+    });
+    dialogRef.afterClosed().subscribe(result => {
+      this.service.getAll().subscribe((val: any[]) => this.source.load(val));
+    });
+  }
 
-}
+} // class SignalComponent