Increase delay for hiding Warning & Error notifications #4090

Author: alansemenov

src/main/resources/assets/admin/common/js/notify/Message.ts

@@ -29,32 +29,40 @@ export class Message {
     private readonly text: string;
     private readonly actions: MessageAction[];
     private readonly autoHide: boolean;
+    private readonly lifeTime: number;
+    static shortLifeTime: number = 5000;
+    static longLifeTime: number = 30000;
 
-    constructor(type: MessageType, text: string, autoHide: boolean = true) {
+    constructor(type: MessageType, text: string, autoHide: boolean = true, lifeTime?: number) {
         this.type = type;
         this.text = text;
         this.actions = [];
         this.autoHide = autoHide;
+        this.lifeTime = lifeTime;
     }
 
-    static newSuccess(text: string, autoHide: boolean = true): Message {
-        return new Message(MessageType.SUCCESS, text, autoHide);
+    getLifeTime(): number {
+        return this.lifeTime;
     }
 
-    static newInfo(text: string, autoHide: boolean = true): Message {
-        return new Message(MessageType.INFO, text, autoHide);
+    static newSuccess(text: string, autoHide: boolean = true, lifeTime: number = Message.shortLifeTime): Message {
+        return new Message(MessageType.SUCCESS, text, autoHide, autoHide ? lifeTime : 0);
     }
 
-    static newError(text: string, autoHide: boolean = true): Message {
-        return new Message(MessageType.ERROR, text, autoHide);
+    static newInfo(text: string, autoHide: boolean = true, lifeTime: number = Message.shortLifeTime): Message {
+        return new Message(MessageType.INFO, text, autoHide, autoHide ? lifeTime : 0);
     }
 
-    static newWarning(text: string, autoHide: boolean = true): Message {
-        return new Message(MessageType.WARNING, text, autoHide);
+    static newError(text: string, autoHide: boolean = true, lifeTime: number = Message.longLifeTime): Message {
+        return new Message(MessageType.ERROR, text, autoHide, autoHide ? lifeTime : 0);
     }
 
-    static newAction(text: string, autoHide: boolean = true): Message {
-        return new Message(MessageType.ACTION, text, autoHide);
+    static newWarning(text: string, autoHide: boolean = true, lifeTime: number = Message.longLifeTime): Message {
+        return new Message(MessageType.WARNING, text, autoHide, autoHide ? lifeTime : 0);
+    }
+
+    static newAction(text: string, autoHide: boolean = true, lifeTime?: number): Message {
+        return new Message(MessageType.ACTION, text, autoHide, autoHide ? lifeTime : 0);
     }
 
     getType(): MessageType {

src/main/resources/assets/admin/common/js/notify/NotifyManager.ts

@@ -19,10 +19,6 @@ export class NotifyManager {
 
     private queue: NotificationMessage[] = [];
 
-    private shortLifeTime: number = 5000;
-
-    private longLifeTime: number = 30000;
-
     private slideDuration: number = 500;
 
     private timers: Map<string, Timer> = new Map<string, Timer>();
@@ -139,7 +135,7 @@ export class NotifyManager {
             () => {
                 if (notification.isAutoHide()) {
                     this.timers.set(notification.getEl().getId(), {
-                        remainingTime: this.getNotificationLifeTime(notification.getMessage())
+                        remainingTime: notification.getMessage().getLifeTime()
                     });
 
                     this.startTimer(notification);
@@ -149,14 +145,6 @@ export class NotifyManager {
         return notification;
     }
 
-    private getNotificationLifeTime(message: Message): number {
-        if (message.isError() || message.isWarning()) {
-            return this.longLifeTime;
-        }
-
-        return this.shortLifeTime;
-    }
-
     private setListeners(notificationMessage: NotificationMessage) {
         notificationMessage.getRemoveEl().onClicked(() => this.remove(notificationMessage));
         notificationMessage.onMouseEnter(() => this.stopTimer(notificationMessage));