X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fapp-configuration%2Fapp-configuration.component.ts;h=3c7a95c5a690ed4ac0f249b50c8f1803011e5347;hb=refs%2Fchanges%2F97%2F1197%2F3;hp=8b429c6ef41eb2047a1625eeb04b84de8403613e;hpb=52b5162f9ca85034e0def247f4a4e5c1bda85191;p=portal%2Fric-dashboard.git

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 8b429c6e..3c7a95c5 100644
--- 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.
@@ -18,13 +18,15 @@
  * ========================LICENSE_END===================================
  */
 
-import { Component, OnInit, Inject } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { AppMgrService } from '../services/app-mgr/app-mgr.service';
-import { ErrorDialogService } from '../services/ui/error-dialog.service';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { finalize } from 'rxjs/operators';
-
+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';
 
 @Component({
   selector: 'rd-app-configuration',
@@ -40,13 +42,15 @@ export class AppConfigurationComponent implements OnInit {
     private dialogRef: MatDialogRef<AppConfigurationComponent>,
     private appMgrService: AppMgrService,
     private errorDiaglogService: ErrorDialogService,
+    private loadingDialogService: LoadingDialogService,
+    private notificationService: NotificationService,
     @Inject(MAT_DIALOG_DATA) private data
   ) { }
 
   xappMetadata: any;
   xappConfigSchema: any;
-  xappConfigData: any; 
-  xappLayout:any;
+  xappConfigData: any;
+  xappLayout: any;
   ngOnInit() {
     this.loadingSubject.next(true);
     this.appMgrService.getConfig()
@@ -54,10 +58,10 @@ export class AppConfigurationComponent implements OnInit {
         finalize(() => this.loadingSubject.next(false))
       )
       .subscribe(
-      (allConfig: any) => {
-        this.loadConfigForm(this.data.name, allConfig)
-      }
-    )
+        (allConfig: any) => {
+          this.loadConfigForm(this.data.name, allConfig)
+        }
+      );
   }
 
   updateconfig(event) {
@@ -67,8 +71,26 @@ export class AppConfigurationComponent implements OnInit {
       config: event,
       layout: this.xappLayout
     }
+    this.loadingDialogService.startLoading("Updating " + this.data.name + " configuration");
     this.appMgrService.putConfig(config)
-    this.dialogRef.close();
+      .pipe(
+        finalize(() => {
+          this.loadingDialogService.stopLoading();
+          this.dialogRef.close();
+        })
+      )
+      .subscribe(
+        (response: HttpResponse<Object>) => {
+          this.notificationService.success('Configuration update succeeded!');
+        },
+        ((her: HttpErrorResponse) => {
+          let msg = her.message;
+          if (her.error && her.error.message) {
+            msg = her.error.message;
+          }
+          this.notificationService.warn('Configuration update failed: ' + msg);
+        })
+      );
   }
 
   loadConfigForm(name: string, allConfig: any) {
@@ -77,7 +99,7 @@ export class AppConfigurationComponent implements OnInit {
       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.dialogRef.close();