@copart/ops-tool-kit 1.10.0-alpha.24 → 1.10.0-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.10.0-alpha.24";
+const version$5 = "1.10.0-alpha.27";
 const main$1 = "dist/ops-tool-kit.js";
 const style = "dist/ops-tool-kit.css";
 const files = [
@@ -41577,7 +41577,7 @@ var generateQuery = function generateQuery(yardNumber, email) {
   var startDateTsUTC = moment.utc(new Date()).add(1, 'days').format('YYYY-MM-DDTHH:mm:ss[Z]');
   var EndDateTsUTC = moment.utc(new Date()).format('YYYY-MM-DDTHH:mm:ss[Z]');
   var countryCodes = window.location.hostname.includes('.com') ? '"USA", "CAN"' : '"ARE", "OMN", "BHR", "IRL", "GBR"';
-  return "fq=(facilities:".concat(yardNumber, " OR user_details:\"").concat(email, "\" OR group_user_details:\"").concat(email, "\" OR applications:\"").concat(encodeURIComponent(getCurrentApp()), "\")&fq=((start_date_timezone:\"UTC\" AND end_date_timezone:\"UTC\" AND start_date_ts_utc:[* TO ").concat(startDateTsUTC, "] AND end_date_ts_utc:[").concat(EndDateTsUTC, " TO *]) OR (!start_date_timezone:\"UTC\" AND !end_date_timezone:\"UTC\" AND start_date_ts_utc:[* TO ").concat(startDateTs, "] AND end_date_ts_utc:[").concat(EndDateTs, " TO *]) OR (!start_date_timezone:\"UTC\" AND end_date_timezone:\"UTC\" AND start_date_ts_utc:[* TO ").concat(startDateTs, "] AND end_date_ts_utc:[").concat(EndDateTsUTC, " TO *]))&fq=(operating_country_a3_code:(").concat(countryCodes, "))&fq=status:A&rows=10000&q=*:*");
+  return "fq=(facilities:".concat(yardNumber, " OR user_details:\"").concat(email, "\" OR group_user_details:\"").concat(email, "\" OR applications:\"").concat(encodeURIComponent(getCurrentApp()), "\")&fq=((start_date_timezone:\"UTC\" AND end_date_timezone:\"UTC\" AND start_date_ts_utc:[* TO ").concat(startDateTsUTC, "] AND end_date_ts_utc:[").concat(EndDateTsUTC, " TO *]) OR (!start_date_timezone:\"UTC\" AND !end_date_timezone:\"UTC\" AND start_date_ts_utc:[* TO ").concat(startDateTs, "] AND end_date_ts_utc:[").concat(EndDateTs, " TO *]) OR (!start_date_timezone:\"UTC\" AND end_date_timezone:\"UTC\" AND start_date_ts_utc:[* TO ").concat(startDateTs, "] AND end_date_ts_utc:[").concat(EndDateTsUTC, " TO *]))&fq=(operating_country_a3_code:(").concat(countryCodes, ") OR destination_type:(\"groups\",\"users\"))&fq=status:A&rows=10000&q=*:*");
 };
 
 var generateTargets = function generateTargets(notification) {
@@ -41728,7 +41728,7 @@ function startWebSocketConnection(updateNotifications, updateAllNotificationsLis
 }
 
 var getFirebaseConfig = function getFirebaseConfig() {
-  var appConfig = storage$1.getItem('config');
+  var appConfig = storage$1.getLocalItem('opsportal-core:config');
   return appConfig.runConfig ? appConfig.runConfig.firebaseConfig : appConfig.firebaseConfig;
 };
 
@@ -41740,7 +41740,9 @@ function attachHandlers(firebase, updateNotifications, updateAllFirebaseNotifica
   var today = getTodayDate();
   firebase.database().ref().child('ops-news').orderByChild('ends_at').startAt(today).on('value', function (snapshot) {
     compose(updateNotifications, filterNotificationsFireBase, mapNotifications, values$1)(snapshot.val());
-    compose(updateAllFirebaseNotificationsList, mapNotifications, values$1)(snapshot.val());
+    setTimeout(function () {
+      compose(updateAllFirebaseNotificationsList, mapNotifications, values$1)(snapshot.val());
+    }, 500);
   });
 }
 
@@ -42184,6 +42186,11 @@ var AppBar = function AppBar(_ref) {
       firebaseInitialized = _useState20[0],
       setFirebaseinitialized = _useState20[1];
 
+  var listOfAllNotificationsRef = React.useRef(listOfAllNotifications);
+  React.useEffect(function () {
+    listOfAllNotificationsRef.current = listOfAllNotifications;
+  }, [listOfAllNotifications]);
+
   var updateNotifications = function updateNotifications(newNotifications) {
     setNotifications(function (notifications) {
       return filterDuplicateAndSave(notifications, newNotifications);
@@ -42250,7 +42257,6 @@ var AppBar = function AppBar(_ref) {
         var _notification$newsTar;
 
         if (notification === null || notification === void 0 ? void 0 : (_notification$newsTar = notification.newsTarget) === null || _notification$newsTar === void 0 ? void 0 : _notification$newsTar.audience_value) {
-          removeNotification(notification);
           var startTime = moment.utc(notification.startsAt).local().format("YYYY-MM-DD HH:mm:ss");
           var currentDate = new Date();
 
@@ -42258,6 +42264,8 @@ var AppBar = function AppBar(_ref) {
             setListOfAllFirebaseNotifications(function (notifications) {
               return filterDuplicateAndSave(notifications, newNotifications);
             });
+          } else {
+            removeNotification(notification);
           }
         }
       });
@@ -42282,6 +42290,12 @@ var AppBar = function AppBar(_ref) {
       return !notificationIds.includes(notification.notificationId);
     });
     var filterednewNotifications = newNotifications.filter(function (notification) {
+      if (notification.isFirebase && listOfAllNotificationsRef.current.find(function (n) {
+        return n.notificationId === notification.notificationId;
+      })) {
+        return false;
+      }
+
       return !actionCompletedNotificationIds.includes(notification.notificationId);
     });
     return sortNotifications([].concat(_toConsumableArray(filterednewNotifications), _toConsumableArray(filteredNotifications)));
@@ -42390,7 +42404,7 @@ var AppBar = function AppBar(_ref) {
       if (listOfAllFirebaseNotifications.length) {
         compose(updateNotifications, filterNotificationsFireBase)(listOfAllFirebaseNotifications);
       }
-    }, 20000);
+    }, 21000);
     return function () {
       clearInterval(interval);
     };