* ========================LICENSE_END===================================
*/
import { Component, OnInit } from '@angular/core';
+import { HttpResponse, HttpErrorResponse } from '@angular/common/http';
import { MatDialog } from '@angular/material/dialog';
import { RanControlConnectDialogComponent } from './ran-connection-dialog.component';
import { E2ManagerService } from '../services/e2-mgr/e2-mgr.service';
import { ConfirmDialogService } from '../services/ui/confirm-dialog.service';
import { NotificationService } from '../services/ui/notification.service';
import { RANControlDataSource } from './ran-control.datasource';
-import { HttpErrorResponse } from '@angular/common/http';
@Component({
selector: 'rd-ran-control',
dataSource: RANControlDataSource;
constructor(private e2MgrSvc: E2ManagerService,
- private errorSvc: ErrorDialogService,
+ private errorDialogService: ErrorDialogService,
private confirmDialogService: ConfirmDialogService,
- private notification: NotificationService,
+ private notificationService: NotificationService,
public dialog: MatDialog) { }
ngOnInit() {
- this.dataSource = new RANControlDataSource(this.e2MgrSvc);
+ this.dataSource = new RANControlDataSource(this.e2MgrSvc, this.notificationService);
this.dataSource.loadTable();
}
setupRANConnection() {
const dialogRef = this.dialog.open(RanControlConnectDialogComponent, {
- width: '450px',
- data: {}
+ width: '450px'
});
- dialogRef.afterClosed().subscribe(result => {
- this.dataSource.loadTable();
+ dialogRef.afterClosed().subscribe( (result: boolean) => {
+ if (result) {
+ this.dataSource.loadTable();
+ }
});
}
disconnectAllRANConnections() {
- let httpErrRes: HttpErrorResponse;
const aboutError = 'Disconnect all RAN Connections Failed: ';
this.confirmDialogService.openConfirmDialog('Are you sure you want to disconnect all RAN connections?')
- .afterClosed().subscribe(res => {
+ .afterClosed().subscribe( (res: boolean) => {
if (res) {
- this.e2MgrSvc.nodebDelete().subscribe(
- response => {
- if (response.status === 200) {
- this.notification.success('Disconnect all RAN Connections Succeeded!');
- this.dataSource.loadTable();
- }
+ this.e2MgrSvc.nodebPut().subscribe(
+ ( body: any ) => {
+ this.notificationService.success('Disconnect succeeded!');
+ this.dataSource.loadTable();
},
- (error => {
- httpErrRes = error;
- this.errorSvc.displayError(aboutError + httpErrRes.message);
- })
+ (her: HttpErrorResponse) => {
+ // the error field should have an ErrorTransport object
+ let msg = her.message;
+ if (her.error && her.error.message) {
+ msg = her.error.message;
+ }
+ this.errorDialogService.displayError('Disconnect failed: ' + msg);
+ }
);
}
});
}
+
}