improve dashboard UI

[portal/ric-dashboard.git] / webapp-frontend / src / app / app-configuration / app-configuration.component.ts

diff --git a/webapp-frontend/src/app/app-configuration/app-configuration.component.ts b/webapp-frontend/src/app/app-configuration/app-configuration.component.ts
index 28e9bf7..0e73413 100644 (file)
--- a/webapp-frontend/src/app/app-configuration/app-configuration.component.ts
+++ b/webapp-frontend/src/app/app-configuration/app-configuration.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.
@@ -26,7 +26,7 @@ import { AppMgrService } from '../services/app-mgr/app-mgr.service';
 import { ErrorDialogService } from '../services/ui/error-dialog.service';
 import { LoadingDialogService } from '../services/ui/loading-dialog.service';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { NotificationService } from './../services/ui/notification.service';
+import { NotificationService } from '../services/ui/notification.service';
 
 @Component({
   selector: 'rd-app-configuration',
@@ -50,35 +50,35 @@ export class AppConfigurationComponent implements OnInit {
   xappMetadata: any;
   xappConfigSchema: any;
   xappConfigData: any;
-  xappLayout:any;
+  xappLayout: any;
   ngOnInit() {
     this.loadingSubject.next(true);
-    this.appMgrService.getConfig()
+    this.appMgrService.getConfig(this.data.instanceKey)
       .pipe(
         finalize(() => this.loadingSubject.next(false))
       )
       .subscribe(
-      (allConfig: any) => {
-        this.loadConfigForm(this.data.name, allConfig)
-      }
-    )
+        (allConfig: any) => {
+          this.loadConfigForm(this.data.xapp.name, allConfig);
+        }
+      );
   }
 
   updateconfig(event) {
-    var config = {
+    const config = {
       metadata: this.xappMetadata,
       descriptor: this.xappConfigSchema,
       config: event,
       layout: this.xappLayout
-    }
-    this.loadingDialogService.startLoading("Updating " + this.data.name + " configuration");
-    this.appMgrService.putConfig(config)
+    };
+    this.loadingDialogService.startLoading('Updating ' + this.data.xapp.name + ' configuration');
+    this.appMgrService.putConfig(this.data.instanceKey, config)
       .pipe(
         finalize(() => {
           this.loadingDialogService.stopLoading();
           this.dialogRef.close();
         })
-    )
+      )
       .subscribe(
         (response: HttpResponse<Object>) => {
           this.notificationService.success('Configuration update succeeded!');
@@ -94,14 +94,14 @@ export class AppConfigurationComponent implements OnInit {
   }
 
   loadConfigForm(name: string, allConfig: any) {
-    var xappConfig = allConfig.find(xapp => xapp.metadata.name == name)
+    const xappConfig = allConfig.find(xapp => xapp.metadata.name === name);
     if (xappConfig != null) {
-      this.xappMetadata = xappConfig.metadata
+      this.xappMetadata = xappConfig.metadata;
       this.xappConfigSchema = xappConfig.descriptor;
       this.xappConfigData = xappConfig.config;
-      this.xappLayout= xappConfig.layout;
+      this.xappLayout = xappConfig.layout;
     } else {
-      this.errorDiaglogService.displayError("Cannot find configration data for " + name);
+      this.errorDiaglogService.displayError('Cannot find configration data for ' + name);
       this.dialogRef.close();
     }
   }