@copart/ops-tool-kit 1.8.1-alpha.30 → 1.8.1-alpha.31

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.30";
+const version$5 = "1.8.1-alpha.31";
 const main$1 = "dist/ops-tool-kit.js";
 const style = "dist/ops-tool-kit.css";
 const files = [
@@ -35334,9 +35334,14 @@ function filterOutNotificationByAudience(notifications) {
     });
   });
 }
+function filterOutInActiveNotification(notifications) {
+  return notifications.filter(function (notification) {
+    return (notification === null || notification === void 0 ? void 0 : notification.status) === 'A';
+  });
+}
 function filterNotifications(notifications) {
   try {
-    return compose(filterOutNotificationByAudience, filterOutViewedNotifications, filterOutExpiredNotifications, filterOutNotificationForOtherApps)(notifications);
+    return compose(filterOutInActiveNotification, filterOutNotificationByAudience, filterOutViewedNotifications, filterOutExpiredNotifications, filterOutNotificationForOtherApps)(notifications);
   } catch (err) {
     console.error(err);
     return notifications;
@@ -39833,7 +39838,7 @@ function fetchG2Notifications(updateNotifications, updateAllNotificationsList) {
       return notification;
     });
     compose(updateNotifications, filterNotifications)(modifiedNotifications);
-    updateAllNotificationsList(modifiedNotifications);
+    updateAllNotificationsList(modifiedNotifications, true);
   }).catch(function (e) {
     console.log(e);
   });
@@ -40228,30 +40233,35 @@ var AppBar = function AppBar(_ref) {
     });
   };
 
-  var updateAllNotificationsList = function updateAllNotificationsList(newNotifications) {
-    if (newNotifications.length === 1) {
-      var check = filterNotifications(newNotifications);
+  var updateAllNotificationsList = function updateAllNotificationsList(newNotifications, isSolr) {
+    console.log("$$$isSolr=", isSolr);
 
-      var newNotification = _objectSpread2({}, newNotifications[0]);
+    if (isSolr) {
+      console.log("$$$ in solr notif");
+      setListOfAllNotifications(function (notifications) {
+        return filterDuplicateAndSave(notifications, newNotifications);
+      });
+      return;
+    }
 
-      var startTime = newNotification.timeZoneType === "RPTZ" ? newNotification.startsAt : moment.utc(newNotification.startsAt).local().format("YYYY-MM-DD HH:mm:ss");
-      var endTime = newNotification.timeZoneType === "RPTZ" && newNotification.endDateTimeZone !== 'UTC' ? newNotification.endsAt : moment.utc(newNotification.endsAt).local().format("YYYY-MM-DD HH:mm:ss");
-      var currentDate = new Date();
+    console.log("$$$newNotifications=", newNotifications);
+    var check = filterNotifications(newNotifications);
+    console.log("$$$check=", check);
 
-      if (!check.length) {
-        removeNotification(newNotification);
-      } else if (new Date(startTime) > currentDate && (newNotification === null || newNotification === void 0 ? void 0 : newNotification.status) === 'A') {
-        setListOfAllNotifications(function (notifications) {
-          return filterDuplicateAndSave(notifications, newNotifications);
-        });
-      } else if ((newNotification === null || newNotification === void 0 ? void 0 : newNotification.status) !== 'A' || !isOutOfRange(startTime, endTime)) {
-        removeNotification(newNotification);
-      } else {
-        setListOfAllNotifications(function (notifications) {
-          return filterDuplicateAndSave(notifications, newNotifications);
-        });
-      }
-    } else {
+    var newNotification = _objectSpread2({}, newNotifications[0]);
+
+    var startTime = newNotification.timeZoneType === "RPTZ" ? newNotification.startsAt : moment.utc(newNotification.startsAt).local().format("YYYY-MM-DD HH:mm:ss"); // const endTime = newNotification.timeZoneType === "RPTZ" && newNotification.endDateTimeZone !=='UTC' ? newNotification.endsAt : moment.utc(newNotification.endsAt).local().format("YYYY-MM-DD HH:mm:ss")
+
+    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);
       });