From 1ddf7dedd6f254a9d31af409a860f8a6573d26c6 Mon Sep 17 00:00:00 2001
From: jh245g <jh245g@att.com>
Date: Thu, 27 Jun 2019 10:58:59 -0400
Subject: [PATCH] Revise the notification services

Increase the success notification duration from 3s to 10s.
Remove automatically dismissing the warning and error notifications
Add the dismiss action into warning and error notifications

Change-Id: Iabedc3143b77a8432ad62257e3fc0af2efec23e2
Signed-off-by: Jun (Nicolas) Hu <jh245g@att.com>
---
 docs/release-notes.rst                             |  1 +
 .../src/app/control/control.component.css          | 21 +++++++++++++++++-
 .../src/app/services/ui/notification.service.ts    | 25 +++++++++++++++-------
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index c87ecab4..67a407ac 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -40,6 +40,7 @@ Version 1.0.4, 21 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
 
 Version 1.0.3, 28 May 2019
diff --git a/webapp-frontend/src/app/control/control.component.css b/webapp-frontend/src/app/control/control.component.css
index e0b220a7..5df590b0 100644
--- a/webapp-frontend/src/app/control/control.component.css
+++ b/webapp-frontend/src/app/control/control.component.css
@@ -1,3 +1,22 @@
+/*-
+ * ========================LICENSE_START=================================
+ * O-RAN-SC
+ * %%
+ * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * %%
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================LICENSE_END===================================
+ */
 .control__section {
   background-color: transparent;
-}
\ No newline at end of file
+}
diff --git a/webapp-frontend/src/app/services/ui/notification.service.ts b/webapp-frontend/src/app/services/ui/notification.service.ts
index 30f80214..64771254 100644
--- 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);
   }
 }
-- 
2.16.6