X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=d1c140002ccd17b9ac12ea61340003b5fcfbc3ea;hb=b7d7982bbfbf3a1333feb8b811f99497752d3722;hp=fd28f0a38595a0c562392966e5dbd094b4add0a3;hpb=3e69af1763ea2ce5f9485ab1cb5a39b089b109a7;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 fd28f0a3..d1c14000 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,77 +17,111 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit } from '@angular/core';
-import { LocalDataSource } from 'ng2-smart-table';
-import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
-import { ConfirmDialogService } from './../services/ui/confirm-dialog.service'
-import { NotificationService } from './../services/ui/notification.service'
-import { XMXapp } from '../interfaces/xapp-mgr.types';
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { MatSort } from '@angular/material/sort';
+import { Subscription } from 'rxjs';
+import { finalize } from 'rxjs/operators';
+import { XMDeployableApp } from '../interfaces/app-mgr.types';
+import { AppMgrService } from '../services/app-mgr/app-mgr.service';
+import { InstanceSelectorService } from '../services/instance-selector/instance-selector.service';
+import { LoadingDialogService } from '../services/ui/loading-dialog.service';
+import { UiService } from '../services/ui/ui.service';
+import { AppConfigurationComponent } from './../app-configuration/app-configuration.component';
+import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
+import { NotificationService } from './../services/ui/notification.service';
+import { CatalogDataSource } from './catalog.datasource';
 
 @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{
+export class CatalogComponent implements OnInit, OnDestroy {
 
-  settings = {
-    hideSubHeader: true,
-    actions: {
-      columnTitle: 'Actions',
-      add: false,
-      edit: false,
-      delete: false,
-      custom: [
-        { name: 'deployxApp', title: 'Deploy' },
-      ],
-      position: 'right'
+  darkMode: boolean;
+  panelClass: string = "";
+  displayedColumns: string[] = ['name', 'version', 'action'];
+  dataSource: CatalogDataSource;
+  private instanceChange: Subscription;
+  private instanceKey: string;
 
-    },
-    columns: {
-      name: {
-        title: 'xApp Name',
-        type: 'string',
-      },
-      version: {
-        title: 'xApp Version',
-        type: 'string',
-      },
-      status: {
-        title: 'Status',
-        type: 'string',
-      },
-    },
-  };
-
-  source: LocalDataSource = new LocalDataSource();
+  @ViewChild(MatSort, { static: true }) sort: MatSort;
 
   constructor(
-    private xappMgrSvc: XappMgrService,
+    private appMgrService: AppMgrService,
     private confirmDialogService: ConfirmDialogService,
-    private notification: NotificationService) { }
+    private dialog: MatDialog,
+    private loadingDialogService: LoadingDialogService,
+    private notificationService: NotificationService,
+    public instanceSelectorService: InstanceSelectorService,
+    public ui: UiService) { }
 
   ngOnInit() {
-    this.xappMgrSvc.getAll().subscribe((xapps: XMXapp[]) => this.source.load(xapps));
+    this.dataSource = new CatalogDataSource(this.appMgrService, this.sort, this.notificationService);
+    this.ui.darkModeState.subscribe((isDark) => {
+      this.darkMode = isDark;
+    });
+
+    this.instanceChange = this.instanceSelectorService.getSelectedInstancekey().subscribe((instanceKey: string) => {
+      if (instanceKey) {
+        this.instanceKey = instanceKey;
+        this.dataSource.loadTable(instanceKey);
+      }
+    })
+  }
+
+  ngOnDestroy() {
+    this.instanceChange.unsubscribe();
   }
 
-  onDeployxApp(event): void {
-    this.confirmDialogService.openConfirmDialog('Are you sure you want to deploy this xApp?')
-      .afterClosed().subscribe(res => {
+  onConfigureApp(xapp: XMDeployableApp): void {
+    if (this.darkMode) {
+      this.panelClass = "dark-theme";
+    } else {
+      this.panelClass = "";
+    }
+    const dialogRef = this.dialog.open(AppConfigurationComponent, {
+      panelClass: this.panelClass,
+      width: '40%',
+      maxHeight: '500px',
+      position: {
+        top: '10%'
+      },
+      data: {
+        xapp: xapp,
+        instanceKey: this.instanceKey
+      }
+
+    })
+  }
+
+  onDeployApp(app: XMDeployableApp): void {
+    this.confirmDialogService.openConfirmDialog('Deploy application ' + app.name + '?')
+      .afterClosed().subscribe((res: boolean) => {
         if (res) {
-          this.xappMgrSvc.deployXapp(event.data.name).subscribe(
-            response => {
-              switch (response.status) {
-                case 200:
-                  this.notification.success('xApp deploy succeeded!');
-                  break;
-                default:
-                  this.notification.warn('xApp deploy failed.');
-              }
-            }
-          );
+          this.loadingDialogService.startLoading('Deploying ' + app.name);
+          this.appMgrService.deployXapp(this.instanceKey, app.name)
+            .pipe(
+              finalize(() => this.loadingDialogService.stopLoading())
+            )
+            .subscribe(
+              (response: HttpResponse<Object>) => {
+                this.notificationService.success('App deploy succeeded!');
+              },
+              ((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);
+              })
+            );
         }
-      });
-
+      }
+      );
   }
-}
\ No newline at end of file
+
+}