@copart/ops-tool-kit 1.8.1-alpha.34 → 1.8.1-alpha.35

package/dist/ops-tool-kit.js

@@ -33,7 +33,7 @@ var ReactDOM__namespace = /*#__PURE__*/_interopNamespace(ReactDOM);
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
 
 const name$f = "@copart/ops-tool-kit";
-const version$5 = "1.8.1-alpha.34";
+const version$5 = "1.8.1-alpha.35";
 const main$1 = "dist/ops-tool-kit.js";
 const style = "dist/ops-tool-kit.css";
 const files = [
@@ -35414,6 +35414,8 @@ var notificationKeysMapper = {
 
 var renameKeys = function renameKeys(keysMap) {
   return function (obj) {
+    obj.isFirebase = true;
+    obj.uuid = parseInt(obj.uuid);
     return reduce$1(function (acc, key) {
       return assoc$1(keysMap[key] || key, obj[key], acc);
     }, {}, keys$1(obj));
@@ -35649,14 +35651,10 @@ var Banner = function Banner(props) {
     }, React__default["default"].createElement(coreComponents.Icon, {
       name: "open_in_new",
       variant: "material"
-    })))), action && ActionComponent && React__default["default"].createElement("div", {
-      style: {
-        minWidth: '20%'
-      }
-    }, React__default["default"].createElement(ActionComponent, {
+    })))), action && ActionComponent && React__default["default"].createElement(ActionComponent, {
       notification: notification,
       saveActionComponentState: saveActionComponentState
-    }))), isContentOverFlow && React__default["default"].createElement("div", {
+    })), isContentOverFlow && React__default["default"].createElement("div", {
       style: {
         cursor: 'pointer'
       },
@@ -39943,6 +39941,7 @@ var getFirebaseConfig = function getFirebaseConfig() {
 function attachHandlers(firebase, updateNotifications, updateAllFirebaseNotificationsList) {
   var today = getTodayDate();
   firebase.database().ref().child('ops-news').orderByChild('ends_at').startAt(today).on('value', function (snapshot) {
+    console.log("@@@snapshot.val()=", snapshot.val());
     compose(updateNotifications, filterNotificationsFireBase, mapNotifications, values$1)(snapshot.val());
     compose(updateAllFirebaseNotificationsList, mapNotifications, values$1)(snapshot.val());
   });
@@ -39952,12 +39951,9 @@ var getFireBaseNotifications = function getFireBaseNotifications(updateNotificat
   var firebaseConfig = getFirebaseConfig(); // connect(firebaseConfig)
 
   var firebase;
-  console.log("***before firebase import");
   Promise.resolve().then(function () { return index_esm$1; }).then(function (module) {
-    console.log("***after firebase app import");
     firebase = module.default;
     Promise.resolve().then(function () { return index_esm; }).then(function (module) {
-      console.log("***after firebase DB import");
       firebase.initializeApp(firebaseConfig);
       attachHandlers(firebase, updateNotifications, updateAllFirebaseNotificationsList);
     });
@@ -40245,37 +40241,35 @@ var AppBar = function AppBar(_ref) {
     });
   };
 
-  var removeNotification = function removeNotification(newNotification) {
+  var filterOut = function filterOut(notifications, notificationToRemove) {
+    var currentNotifications = clone$1(notifications);
+    var filteredNotifications = currentNotifications.filter(function (notification) {
+      return notification.notificationId !== notificationToRemove.notificationId;
+    });
+    return filteredNotifications;
+  };
+
+  var removeNotification = function removeNotification(notificationToRemove) {
     setNotifications(function (notifications) {
-      var currentNotifications = clone$1(notifications);
-      var filteredNotifications = currentNotifications.filter(function (notification) {
-        return notification.notificationId !== newNotification.notificationId;
-      });
-      return filteredNotifications;
+      return filterOut(notifications, notificationToRemove);
     });
     setListOfAllNotifications(function (notifications) {
-      var currentNotifications = clone$1(notifications);
-      var filteredNotifications = currentNotifications.filter(function (notification) {
-        return notification.notificationId !== newNotification.notificationId;
-      });
-      return filteredNotifications;
+      return filterOut(notifications, notificationToRemove);
+    });
+    setListOfAllFirebaseNotifications(function (notifications) {
+      return filterOut(notifications, notificationToRemove);
     });
   };
 
   var updateAllNotificationsList = function updateAllNotificationsList(newNotifications, isSolr) {
-    console.log("$$$isSolr=", isSolr);
-
     if (isSolr) {
-      console.log("$$$ in solr notif");
       setListOfAllNotifications(function (notifications) {
         return filterDuplicateAndSave(notifications, newNotifications);
       });
       return;
     }
 
-    console.log("$$$newNotifications=", newNotifications);
     var check = filterNotifications(newNotifications);
-    console.log("$$$check=", check);
 
     var newNotification = _objectSpread2({}, newNotifications[0]);
 
@@ -40284,13 +40278,11 @@ var AppBar = function AppBar(_ref) {
     var currentDate = new Date();
 
     if (!check.length) {
-      console.log("$$$ in if 1");
       removeNotification(newNotification);
     } // test for delete, update, new & future notification..
 
 
     if (new Date(startTime) > currentDate && (newNotification === null || newNotification === void 0 ? void 0 : newNotification.status) === 'A') {
-      console.log("$$$ in if 2");
       setListOfAllNotifications(function (notifications) {
         return filterDuplicateAndSave(notifications, newNotifications);
       });
@@ -40298,9 +40290,26 @@ var AppBar = function AppBar(_ref) {
   };
 
   var updateAllFirebaseNotificationsList = function updateAllFirebaseNotificationsList(newNotifications) {
-    setListOfAllFirebaseNotifications(function (notifications) {
-      return filterDuplicateAndSave(notifications, newNotifications);
-    });
+    var check = filterNotificationsFireBase(newNotifications);
+
+    if (check.length !== newNotifications.length) {
+      var filteredOutNotifications = newNotifications.filter(function (n) {
+        return !check.some(function (x) {
+          return x.id === n.id;
+        });
+      });
+      filteredOutNotifications.forEach(function (notification) {
+        removeNotification(notification);
+        var startTime = moment.utc(notification.startsAt).local().format("YYYY-MM-DD HH:mm:ss");
+        var currentDate = new Date();
+
+        if (new Date(startTime) > currentDate) {
+          setListOfAllFirebaseNotifications(function (notifications) {
+            return filterDuplicateAndSave(notifications, newNotifications);
+          });
+        }
+      });
+    }
   };
 
   var filterDuplicateAndSave = function filterDuplicateAndSave(notifications, newNotifications) {
@@ -40311,7 +40320,9 @@ var AppBar = function AppBar(_ref) {
     var filteredNotifications = notifications.filter(function (notification) {
       var _notification$action, _notification$action$;
 
-      if (notification === null || notification === void 0 ? void 0 : (_notification$action = notification.action) === null || _notification$action === void 0 ? void 0 : (_notification$action$ = _notification$action.componentState) === null || _notification$action$ === void 0 ? void 0 : _notification$action$.completed) {
+      if ((notification === null || notification === void 0 ? void 0 : (_notification$action = notification.action) === null || _notification$action === void 0 ? void 0 : (_notification$action$ = _notification$action.componentState) === null || _notification$action$ === void 0 ? void 0 : _notification$action$.completed) || notificationIds.includes(notification.notificationId) && !notification.isFirebase && newNotifications.find(function (n) {
+        return n.notificationId === notification.notificationId;
+      }).isFirebase) {
         actionCompletedNotificationIds.push(notification.notificationId);
         return true;
       }