@copart/ops-tool-kit 1.8.1-alpha.26 → 1.8.1-alpha.28

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.26";
+const version$5 = "1.8.1-alpha.28";
 const main$1 = "dist/ops-tool-kit.js";
 const style = "dist/ops-tool-kit.css";
 const files = [
@@ -39837,7 +39837,7 @@ function fetchG2Notifications(updateNotifications, updateAllNotificationsList) {
   });
 }
 
-function startWebSocketConnection(updateNotifications, updateAllNotificationsList) {
+function startWebSocketConnection(updateNotifications, updateAllNotificationsList, reConnectSocket) {
   var _storage$getSessionIt, _storage$getSessionIt2;
 
   var coreAppConfig = storage$1.getLocalItem('opsportal-core:config');
@@ -39857,7 +39857,13 @@ function startWebSocketConnection(updateNotifications, updateAllNotificationsLis
 
     client.onopen = function () {
       console.log('WebSocket connection has been opened');
-    };
+    }; // setInterval(()=>{
+    //   client.send('_ping_')
+    // },5000)
+    // setInterval(()=>{
+    //   console.log('ready state=',client.readyState)
+    // },1000)
+
 
     client.onmessage = function (message) {
       var notification = [];
@@ -39880,6 +39886,7 @@ function startWebSocketConnection(updateNotifications, updateAllNotificationsLis
 
     client.onclose = function () {
       console.log('Socket connection Closed');
+      reConnectSocket();
     };
 
     return client;
@@ -47933,33 +47940,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]);
 
       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();
 
-      if (new Date(startTime) > currentDate && (newNotification === null || newNotification === void 0 ? void 0 : newNotification.status) === 'A') {
+      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)) {
-        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;
-        });
+        removeNotification(newNotification);
       } else {
         setListOfAllNotifications(function (notifications) {
           return filterDuplicateAndSave(notifications, newNotifications);
@@ -48021,6 +48036,29 @@ var AppBar = function AppBar(_ref) {
   };
 
   var selectedYard = (_storage$getSessionIt = storage$1.getSessionItem('dashboard')) === null || _storage$getSessionIt === void 0 ? void 0 : _storage$getSessionIt.selectedYard;
+
+  var reConnectSocket = function reConnectSocket() {
+    socketClient && socketClient.close();
+    setSocketClient(startWebSocketConnection(updateNotifications, updateAllNotificationsList, reConnectSocket));
+  };
+
+  var handleVisibilityChange = function handleVisibilityChange() {
+    if (document.visibilityState === 'visible') {
+      if (socketClient && socketClient.readyState !== WebSocket.OPEN) {
+        reConnectSocket();
+      }
+    }
+  };
+
+  React.useEffect(function () {
+    if (socketClient) {
+      document.addEventListener('visibilitychange', handleVisibilityChange);
+    }
+
+    return function () {
+      document.removeEventListener('visibilitychange', handleVisibilityChange);
+    };
+  }, [socketClient]);
   React.useEffect(function () {
     setNotifications([]);
     setListOfAllNotifications([]);
@@ -48039,7 +48077,7 @@ var AppBar = function AppBar(_ref) {
       if (history.location.pathname !== '/logout' && history.location.pathname !== '/login' && localStorage.getItem('login') && tileConfigAccess) {
         if (notificationsSource.includes('Nchan')) {
           fetchG2Notifications(updateNotifications, updateAllNotificationsList);
-          setSocketClient(startWebSocketConnection(updateNotifications, updateAllNotificationsList));
+          setSocketClient(startWebSocketConnection(updateNotifications, updateAllNotificationsList, reConnectSocket));
         }
 
         if (!firebaseInitialized && notificationsSource.includes('Firebase')) {