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=2c1aa85acd095740a0f86dcac17dfdc172c79701;hb=1be4d77f0cd2d00da3ed33e21805f3c1abcac272;hp=c5aa195c178c665404ec7737a278072ed2f32c35;hpb=1275b31b7d0d4b9056e671614761452c151be008;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 c5aa195c..2c1aa85a 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -1,15 +1,15 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
  * 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,92 +17,57 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, Inject } from '@angular/core';
-import { LocalDataSource } from 'ng2-smart-table';
-import { CatalogService } from '../services/catalog/catalog.service';
-import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-
-export interface DialogData {
-    name: string;
-}
-
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
+import { MatSort } from '@angular/material/sort';
+import { ErrorDialogService } from '../services/ui/error-dialog.service';
+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';
 
 @Component({
   selector: 'app-catalog',
   templateUrl: './catalog.component.html',
-  styleUrls: ['./catalog.component.css']
+  styleUrls: ['./catalog.component.css'],
 })
-export class CatalogComponent {
-
-  settings = {
-    hideSubHeader: true,
-    actions: {
-      columnTitle: 'Actions',
-      add: false,
-      edit: false,
-      delete: false,
-      custom: [
-      { name: 'deployxApp', title: 'Deploy'},
-    ],
-      position: 'right'
+export class CatalogComponent implements OnInit {
 
-    },
-    columns: {
-      name: {
-        title: 'xApp Name',
-        type: 'string',
-      },
-      version: {
-        title: 'xApp Version',
-        type: 'string',
-      },
-      status: {
-        title: 'Status',
-        type: 'string',
-      },
-    },
-  };
+  displayedColumns: string[] = ['name', 'version', 'action'];
+  dataSource: CatalogDataSource;
+  @ViewChild(MatSort) sort: MatSort;
 
-  source: LocalDataSource = new LocalDataSource();
+  constructor(
+    private appMgrSvc: AppMgrService,
+    private confirmDialogService: ConfirmDialogService,
+    private errorService: ErrorDialogService,
+    private notification: NotificationService) { }
 
-    constructor(private service: CatalogService, public dialog: MatDialog) {
-    this.service.getAll().subscribe((val:any[]) => this.source.load(val));
+  ngOnInit() {
+    this.dataSource = new CatalogDataSource(this.appMgrSvc, this.sort );
+    this.dataSource.loadTable();
   }
 
+  onConfigureApp(name: string): void {
+    const aboutError = 'Configure not implemented (yet)';
+    this.errorService.displayError(aboutError);
+  }
 
-    onDeployxApp(event): void {
-        const dialogRef = this.dialog.open(AppCatalogDeployDialog, {
-            width: '400px',
-            data: { name: event.data.name }
-        });
-
-        dialogRef.afterClosed().subscribe(result => {
-            console.log('The dialog was closed');
-        });
-    }
-
-}
-
-@Component({
-    selector: 'app-catalog-deploy-dialog',
-    templateUrl: 'catalog.component.deploy-dialog.html',
-    styleUrls: ['./catalog.component.css']
-})
-
-export class AppCatalogDeployDialog{
-
-    constructor(
-        public dialogRef: MatDialogRef<AppCatalogDeployDialog>,
-        private service: CatalogService,
-        @Inject(MAT_DIALOG_DATA) public data: DialogData) { }
-
-    onNoClick(): void {
-        this.dialogRef.close();
-    }
-
-    deployXapp(): void {
-        this.service.deployXapp(this.data.name).subscribe((val: any[]) => console.log(val));;
-        this.dialogRef.close();
-    }
+  onDeployApp(name: string): void {
+    this.confirmDialogService.openConfirmDialog('Deploy application ' + name + '?')
+      .afterClosed().subscribe( (res: any) => {
+        if (res) {
+          this.appMgrSvc.deployXapp(name).subscribe(
+            (response: HttpResponse<object>) => {
+              this.notification.success('Deploy succeeded!');
+            },
+            (error: HttpErrorResponse) => {
+              this.notification.warn('Deploy failed: ' + error.message);
+            }
+          );
+        }
+      }
+    );
+  }
 
 }