Merge "Upgrade Angular and Spring-Boot"

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 491a18f..c6fbd26 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -45,6 +45,7 @@ Version 1.0.4, 27 June 2019
 * Move mock admin screen user data to backend
 * Update App manager client to spec version 0.1.5
 * Rework admin table
+* Update the notification service 
 * Remove the RAN connection invocation link from left menu and move it to control screen
 * Repair deploy-app feature and use icon instead of text button
 

diff --git a/webapp-frontend/src/app/services/ui/notification.service.ts b/webapp-frontend/src/app/services/ui/notification.service.ts
index 30f8021..6477125 100644 (file)
--- a/webapp-frontend/src/app/services/ui/notification.service.ts
+++ b/webapp-frontend/src/app/services/ui/notification.service.ts
@@ -28,25 +28,34 @@ export class NotificationService {
 
   constructor(public snackBar: MatSnackBar) { }
 
-  config: MatSnackBarConfig = {
-    duration: 3000,
+  successConfig: MatSnackBarConfig = {
+    duration: 10000,
     horizontalPosition: 'right',
     verticalPosition: 'top'
   };
 
+  warningConfig: MatSnackBarConfig = {
+    horizontalPosition: 'right',
+    verticalPosition: 'top'
+  };
+
+  errorConfig: MatSnackBarConfig = {
+    horizontalPosition: 'right',
+    verticalPosition: 'top'
+  };
 
   success(msg: string) {
-    this.config['panelClass'] = ['notification', 'success', 'default'];
-    this.snackBar.open(msg, '', this.config);
+    this.successConfig['panelClass'] = ['notification', 'success', 'default'];
+    this.snackBar.open(msg, '', this.successConfig);
   }
 
   warn(msg: string) {
-    this.config['panelClass'] = ['notification', 'warn', 'default'];
-    this.snackBar.open(msg, '', this.config);
+    this.warningConfig['panelClass'] = ['notification', 'warn', 'default'];
+    this.snackBar.open(msg, 'Dismiss', this.warningConfig);
   }
 
   error(msg: string) {
-    this.config['panelClass'] = ['notification', 'error', 'default'];
-    this.snackBar.open(msg, '', this.config);
+    this.errorConfig['panelClass'] = ['notification', 'error', 'default'];
+    this.snackBar.open(msg, 'Dismiss', this.errorConfig);
   }
 }