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=f22b09f02006b5a9ee2917d298de94a991b69dda;hpb=ecdba9d180c894f528bdf95098024bf4a14fd9c0;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 f22b09f0..d1c14000 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -2,14 +2,14 @@
  * ========================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.
  * 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,57 +17,111 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit, ViewChild } from '@angular/core';
 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 { ErrorDialogService } from '../services/ui/error-dialog.service';
+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 {
 
+  darkMode: boolean;
+  panelClass: string = "";
   displayedColumns: string[] = ['name', 'version', 'action'];
   dataSource: CatalogDataSource;
-  @ViewChild(MatSort, {static: true}) sort: MatSort;
+  private instanceChange: Subscription;
+  private instanceKey: string;
+
+  @ViewChild(MatSort, { static: true }) sort: MatSort;
 
   constructor(
-    private appMgrSvc: AppMgrService,
+    private appMgrService: AppMgrService,
     private confirmDialogService: ConfirmDialogService,
-    private errorService: ErrorDialogService,
-    private notification: NotificationService) { }
+    private dialog: MatDialog,
+    private loadingDialogService: LoadingDialogService,
+    private notificationService: NotificationService,
+    public instanceSelectorService: InstanceSelectorService,
+    public ui: UiService) { }
 
   ngOnInit() {
-    this.dataSource = new CatalogDataSource(this.appMgrSvc, this.sort );
-    this.dataSource.loadTable();
+    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);
+      }
+    })
   }
 
-  onConfigureApp(name: string): void {
-    const aboutError = 'Configure not implemented (yet)';
-    this.errorService.displayError(aboutError);
+  ngOnDestroy() {
+    this.instanceChange.unsubscribe();
+  }
+
+  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(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!');
-            },
-            (error: HttpErrorResponse) => {
-              this.notification.warn('Deploy failed: ' + error.message);
-            }
-          );
+          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);
+              })
+            );
         }
       }
-    );
+      );
   }
 
 }