Bug 1499559 - Fix notifications not auto-expiring (#4420)

Author: Cameron Dawson

ui/shared/context/Notifications.jsx

@@ -1,7 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import findLastIndex from 'lodash/findLastIndex';
 
 export const NotificationsContext = React.createContext({});
+const maxTransientNotifications = 5;
+const maxStoredNotifications = 40;
 
 export class Notifications extends React.Component {
   constructor(props) {
@@ -49,12 +52,16 @@ export class Notifications extends React.Component {
     opts = opts || {};
     severity = severity || 'info';
     const { notifications, storedNotifications } = this.state;
-    const maxNsNotifications = 5;
     const notification = { ...opts, message, severity, created: Date.now() };
-    const newNotifications = [notification, ...notifications];
+    const trimmedNotifications =
+      notifications >= maxTransientNotifications
+        ? this.withoutOldestTransient(notifications)
+        : notifications;
+
+    const newNotifications = [notification, ...trimmedNotifications];
 
     storedNotifications.unshift(notification);
-    storedNotifications.splice(40);
+    storedNotifications.splice(maxStoredNotifications);
     localStorage.setItem('notifications', JSON.stringify(storedNotifications));
 
     this.setValue(
@@ -64,10 +71,6 @@ export class Notifications extends React.Component {
       },
       () => {
         if (!opts.sticky) {
-          if (notifications.length > maxNsNotifications) {
-            this.shift();
-            return;
-          }
           setTimeout(this.shift, 4000, true);
         }
       },
@@ -96,6 +99,15 @@ export class Notifications extends React.Component {
     this.removeNotification(notifications.findIndex(n => !n.sticky), delay);
   };
 
+  withoutOldestTransient = notifications => {
+    const last = findLastIndex(notifications, n => !n.sticky);
+
+    if (last) {
+      notifications.splice(last, 1);
+    }
+    return notifications;
+  };
+
   /*
    * Clear the list of stored notifications
    */