Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade App Manager to version 0.1.5
[portal/ric-dashboard.git]
/
webapp-frontend
/
src
/
app
/
control
/
control.component.ts
diff --git
a/webapp-frontend/src/app/control/control.component.ts
b/webapp-frontend/src/app/control/control.component.ts
index
29a88cc
..
4059d27
100644
(file)
--- a/
webapp-frontend/src/app/control/control.component.ts
+++ b/
webapp-frontend/src/app/control/control.component.ts
@@
-17,16
+17,16
@@
* limitations under the License.
* ========================LICENSE_END===================================
*/
* limitations under the License.
* ========================LICENSE_END===================================
*/
-import { Component, OnInit } from '@angular/core';
-import {
XappMgrService } from '../services/xapp-mgr/xapp-mgr.service
';
+import { Component, OnInit
, ViewChild
} from '@angular/core';
+import {
MatSort } from '@angular/material/sort
';
import { Router } from '@angular/router';
import { Router } from '@angular/router';
-import { ErrorDialogService } from './../services/ui/error-dialog.service';
+import { XappControlRow } from '../interfaces/app-mgr.types';
+import { AppMgrService } from '../services/app-mgr/app-mgr.service';
import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
+import { ErrorDialogService } from './../services/ui/error-dialog.service';
import { NotificationService } from './../services/ui/notification.service';
import { NotificationService } from './../services/ui/notification.service';
-import { XappControlRow } from '../interfaces/xapp-mgr.types';
import { ControlAnimations } from './control.animations';
import { ControlDataSource } from './control.datasource';
import { ControlAnimations } from './control.animations';
import { ControlDataSource } from './control.datasource';
-import { routerNgProbeToken } from '@angular/router/src/router_module';
@Component({
selector: 'app-control',
@Component({
selector: 'app-control',
@@
-38,22
+38,26
@@
export class ControlComponent implements OnInit {
displayedColumns: string[] = ['xapp', 'name', 'status', 'ip', 'port', 'action'];
dataSource: ControlDataSource;
displayedColumns: string[] = ['xapp', 'name', 'status', 'ip', 'port', 'action'];
dataSource: ControlDataSource;
+ @ViewChild(MatSort) sort: MatSort;
constructor(
constructor(
- private
xappMgrSvc: Xa
ppMgrService,
+ private
appMgrSvc: A
ppMgrService,
private router: Router,
private confirmDialogService: ConfirmDialogService,
private errorDialogService: ErrorDialogService,
private notification: NotificationService) { }
ngOnInit() {
private router: Router,
private confirmDialogService: ConfirmDialogService,
private errorDialogService: ErrorDialogService,
private notification: NotificationService) { }
ngOnInit() {
- this.dataSource = new ControlDataSource(this.
xappMgrSvc
);
+ this.dataSource = new ControlDataSource(this.
appMgrSvc, this.sort
);
this.dataSource.loadTable();
}
controlApp(app: XappControlRow): void {
this.dataSource.loadTable();
}
controlApp(app: XappControlRow): void {
+ const acXappPattern = /[Aa][Dd][Mm][Ii][Ss]{2}[Ii][Oo][Nn]/;
const anrXappPattern = /[Aa][Nn][Rr]/;
const anrXappPattern = /[Aa][Nn][Rr]/;
- if (anrXappPattern.test(app.xapp)) {
+ if (acXappPattern.test(app.xapp)) {
+ this.router.navigate(['/ac']);
+ } else if (anrXappPattern.test(app.xapp)) {
this.router.navigate(['/anr']);
} else {
this.errorDialogService.displayError('No control available for ' + app.xapp + ' (yet)');
this.router.navigate(['/anr']);
} else {
this.errorDialogService.displayError('No control available for ' + app.xapp + ' (yet)');
@@
-64,7
+68,7
@@
export class ControlComponent implements OnInit {
this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy xApp ' + app.xapp + '?')
.afterClosed().subscribe(res => {
if (res) {
this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy xApp ' + app.xapp + '?')
.afterClosed().subscribe(res => {
if (res) {
- this.
x
appMgrSvc.undeployXapp(app.xapp).subscribe(
+ this.appMgrSvc.undeployXapp(app.xapp).subscribe(
response => {
this.dataSource.loadTable();
switch (response.status) {
response => {
this.dataSource.loadTable();
switch (response.status) {