@copart/ops-tool-kit 1.8.1-alpha.25 → 1.8.1-alpha.27

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.25";
+const version$5 = "1.8.1-alpha.27";
 const main$1 = "dist/ops-tool-kit.js";
 const style = "dist/ops-tool-kit.css";
 const files = [
@@ -35227,9 +35227,10 @@ function filterOutExpiredNotifications(notifications) {
   return filter$1(function (_ref) {
     var startsAt = _ref.startsAt,
         endsAt = _ref.endsAt,
-        timeZoneType = _ref.timeZoneType;
+        timeZoneType = _ref.timeZoneType,
+        endDateTimeZone = _ref.endDateTimeZone;
     var startTime = timeZoneType === "Recipient TimeZone" || timeZoneType === "RPTZ" ? startsAt : moment.utc(startsAt).local().format("YYYY-MM-DD HH:mm:ss");
-    var endTime = timeZoneType === "Recipient TimeZone" || timeZoneType === "RPTZ" ? endsAt : moment.utc(endsAt).local().format("YYYY-MM-DD HH:mm:ss");
+    var endTime = (timeZoneType === "Recipient TimeZone" || timeZoneType === "RPTZ") && endDateTimeZone !== 'UTC' ? endsAt : moment.utc(endsAt).local().format("YYYY-MM-DD HH:mm:ss");
     return isOutOfRange(startTime, endTime);
   })(notifications);
 }
@@ -35374,16 +35375,19 @@ function getPriorityCode(category) {
   }[category.toLowerCase()];
 }
 
-function getDate(dateStr) {
-  return new Date(dateStr) || '';
-}
-
 function sortNotifications(notifications) {
+  var newNotifications = clone$1(notifications);
+  var dateSortedNotifications = newNotifications.sort(function (a, b) {
+    var startDateA = a.timeZoneType === "Recipient TimeZone" || a.timeZoneType === "RPTZ" ? a.startsAt : moment.utc(a.startsAt).local().format("YYYY-MM-DD HH:mm:ss");
+    var startDateB = b.timeZoneType === "Recipient TimeZone" || b.timeZoneType === "RPTZ" ? b.startsAt : moment.utc(b.startsAt).local().format("YYYY-MM-DD HH:mm:ss");
+    return new Date(startDateB) - new Date(startDateA);
+  });
+
   try {
-    return sortWith$1([ascend$1(compose(getPriorityCode, prop$1('categoryDescription'))), descend$1(compose(getDate, prop$1('timeZoneType') === "SPTZ" || prop$1('timeZoneType') === "Specific TimeZone" ? moment.utc(prop$1('startsAt')).local().format("YYYY-MM-DD HH:mm:ss") : prop$1('startsAt')))], notifications);
+    return sortWith$1([ascend$1(compose(getPriorityCode, prop$1('categoryDescription')))], dateSortedNotifications);
   } catch (err) {
     console.error(err);
-    return notifications;
+    return dateSortedNotifications;
   }
 }
 var notificationKeysMapper = {
@@ -39863,7 +39867,6 @@ function startWebSocketConnection(updateNotifications, updateAllNotificationsLis
 
         notification = message.data ? [JSON.parse(message.data)] : [];
         var newNotification = notification;
-        console.log('***newNotification in socket resp=', newNotification);
 
         if (newNotification.length > 0 && ((_newNotification$ = newNotification[0]) === null || _newNotification$ === void 0 ? void 0 : _newNotification$.status) === 'A') {
           compose(updateNotifications, filterNotifications)(newNotification);
@@ -47930,29 +47933,41 @@ var AppBar = function AppBar(_ref) {
     });
   };
 
+  var removeNotification = function removeNotification(newNotification) {
+    setNotifications(function (notifications) {
+      var currentNotifications = clone$1(notifications);
+      var filteredNotifications = currentNotifications.filter(function (notification) {
+        return notification.notificationId !== newNotification.notificationId;
+      });
+      return filteredNotifications;
+    });
+    setListOfAllNotifications(function (notifications) {
+      var currentNotifications = clone$1(notifications);
+      var filteredNotifications = currentNotifications.filter(function (notification) {
+        return notification.notificationId !== newNotification.notificationId;
+      });
+      return filteredNotifications;
+    });
+  };
+
   var updateAllNotificationsList = function updateAllNotificationsList(newNotifications) {
     if (newNotifications.length === 1) {
+      var check = filterNotifications(newNotifications);
+
       var newNotification = _objectSpread2({}, newNotifications[0]);
 
-      console.log('***newNotification=', newNotification);
       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.endsAt : moment.utc(newNotification.endsAt).local().format("YYYY-MM-DD HH:mm:ss");
-      console.log('***condition=', (newNotification === null || newNotification === void 0 ? void 0 : newNotification.status) !== 'A' || !isOutOfRange(startTime, endTime));
-
-      if ((newNotification === null || newNotification === void 0 ? void 0 : newNotification.status) !== 'A' || !isOutOfRange(startTime, endTime)) {
-        newNotification.endsAt = '2020-01-01 00:00:00';
-        var currentNotifications = clone$1(notifications);
-        console.log('***currentNotifications=', currentNotifications);
-        var notificationindex = currentNotifications.findIndex(function (notification) {
-          return notification.notificationId === newNotification.notificationId;
-        });
-        console.log('***notificationindex=', notificationindex);
+      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();
 
-        if (notificationindex !== -1) {
-          currentNotifications[notificationindex] = newNotification;
-          setNotifications(currentNotifications);
-          console.log('***setNotifications done=', currentNotifications);
-        }
+      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);