X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=21860ac7971b6a50dcdc04c24ae1a7c4f2e46110;hb=refs%2Fchanges%2F37%2F537%2F12;hp=2c1aa85acd095740a0f86dcac17dfdc172c79701;hpb=1be4d77f0cd2d00da3ed33e21805f3c1abcac272;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/catalog/catalog.component.ts b/webapp-frontend/src/app/catalog/catalog.component.ts
index 2c1aa85a..21860ac7 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -25,45 +25,51 @@ import { AppMgrService } from '../services/app-mgr/app-mgr.service';
 import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
 import { NotificationService } from './../services/ui/notification.service';
 import { CatalogDataSource } from './catalog.datasource';
+import { XMDeployableApp } from '../interfaces/app-mgr.types';
 
 @Component({
-  selector: 'app-catalog',
+  selector: 'rd-app-catalog',
   templateUrl: './catalog.component.html',
-  styleUrls: ['./catalog.component.css'],
+  styleUrls: ['./catalog.component.scss'],
 })
 export class CatalogComponent implements OnInit {
 
   displayedColumns: string[] = ['name', 'version', 'action'];
   dataSource: CatalogDataSource;
-  @ViewChild(MatSort) sort: MatSort;
+  @ViewChild(MatSort, {static: true}) sort: MatSort;
 
   constructor(
-    private appMgrSvc: AppMgrService,
+    private appMgrService: AppMgrService,
     private confirmDialogService: ConfirmDialogService,
-    private errorService: ErrorDialogService,
-    private notification: NotificationService) { }
+    private errorDiaglogService: ErrorDialogService,
+    private notificationService: NotificationService) { }
 
   ngOnInit() {
-    this.dataSource = new CatalogDataSource(this.appMgrSvc, this.sort );
+    this.dataSource = new CatalogDataSource(this.appMgrService, this.sort, this.notificationService );
     this.dataSource.loadTable();
   }
 
   onConfigureApp(name: string): void {
     const aboutError = 'Configure not implemented (yet)';
-    this.errorService.displayError(aboutError);
+    this.errorDiaglogService.displayError(aboutError);
   }
 
-  onDeployApp(name: string): void {
-    this.confirmDialogService.openConfirmDialog('Deploy application ' + name + '?')
-      .afterClosed().subscribe( (res: any) => {
+  onDeployApp(app: XMDeployableApp): void {
+    this.confirmDialogService.openConfirmDialog('Deploy application ' + app.name + '?')
+      .afterClosed().subscribe( (res: boolean) => {
         if (res) {
-          this.appMgrSvc.deployXapp(name).subscribe(
-            (response: HttpResponse<object>) => {
-              this.notification.success('Deploy succeeded!');
+          this.appMgrService.deployXapp(app.name).subscribe(
+            (response: HttpResponse<Object>) => {
+              this.notificationService.success('App deploy succeeded!');
             },
-            (error: HttpErrorResponse) => {
-              this.notification.warn('Deploy failed: ' + error.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.notificationService.warn('App deploy failed: ' + msg);
+            })
           );
         }
       }