IO-3319 Job Status Change

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/jobs-change-status/jobs-change-status.component.jsx

@@ -1,16 +1,16 @@
 import { DownCircleFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import { Button, Dropdown } from "antd";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -24,7 +24,6 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
   const { t } = useTranslation();
 
   const [availableStatuses, setAvailableStatuses] = useState([]);
-  const [otherStages, setOtherStages] = useState([]);
   const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
   const notification = useNotification();
 
@@ -32,7 +31,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
     mutationUpdateJobstatus({
       variables: { jobId: job.id, status: status }
     })
-      .then((r) => {
+      .then(() => {
         notification["success"]({ message: t("jobs.successes.save") });
         insertAuditTrail({
           jobid: job.id,
@@ -41,7 +40,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
         });
         // refetch();
       })
-      .catch((error) => {
+      .catch(() => {
         notification["error"]({ message: t("jobs.errors.saving") });
       });
   };
@@ -51,19 +50,14 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
     if (job && bodyshop) {
       if (bodyshop.md_ro_statuses.pre_production_statuses.includes(job.status)) {
         setAvailableStatuses(bodyshop.md_ro_statuses.pre_production_statuses);
-        if (bodyshop.md_ro_statuses.production_statuses[0])
-          setOtherStages([bodyshop.md_ro_statuses.production_statuses[0]]);
       } else if (bodyshop.md_ro_statuses.production_statuses.includes(job.status)) {
         setAvailableStatuses(bodyshop.md_ro_statuses.production_statuses);
-        setOtherStages([bodyshop.md_ro_statuses.default_imported, bodyshop.md_ro_statuses.default_delivered]);
       } else if (bodyshop.md_ro_statuses.post_production_statuses.includes(job.status)) {
         setAvailableStatuses(
           bodyshop.md_ro_statuses.post_production_statuses.filter(
             (s) => s !== bodyshop.md_ro_statuses.default_invoiced && s !== bodyshop.md_ro_statuses.default_exported
           )
         );
-        if (bodyshop.md_ro_statuses.production_statuses[0])
-          setOtherStages([bodyshop.md_ro_statuses.production_statuses[0]]);
       } else {
         console.log("Status didn't match any restrictions. Allowing all status changes.");
         setAvailableStatuses(bodyshop.md_ro_statuses.statuses);
@@ -76,16 +70,7 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
       ...availableStatuses.map((item) => ({
         key: item,
         label: item
-      })),
-      ...(job.converted
-        ? [
-            { type: "divider" },
-            ...otherStages.map((item) => ({
-              key: item,
-              label: item
-            }))
-          ]
-        : [])
+      }))
     ],
     onClick: (e) => updateJobStatus(e.key)
   };

client/src/contexts/SocketIO/socketProvider.jsx

@@ -32,7 +32,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
   const socketRef = useRef(null);
   const [clientId, setClientId] = useState(null);
   const [isConnected, setIsConnected] = useState(false);
-  const [socketInitialized, setSocketInitialized] = useState(false);
   const notification = useNotification();
   const userAssociationId = bodyshop?.associations?.[0]?.id;
   const { t } = useTranslation();
@@ -148,13 +147,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
     onError: (err) => console.error("MARK_ALL_NOTIFICATIONS_READ error:", err)
   });
 
-  const checkAndReconnect = () => {
-    if (socketRef.current && !socketRef.current.connected) {
-      console.log("Attempting manual reconnect due to event trigger");
-      socketRef.current.connect();
-    }
-  };
-
   useEffect(() => {
     const initializeSocket = async (token) => {
       if (!bodyshop || !bodyshop.id || socketRef.current) return;
@@ -166,14 +158,13 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
         auth: { token, bodyshopId: bodyshop.id },
         reconnectionAttempts: Infinity,
         reconnectionDelay: 2000,
-        reconnectionDelayMax: 60000,
-        randomizationFactor: 0.5,
-        transports: ["websocket", "polling"], // Add this to prefer WebSocket with polling fallback
-        rememberUpgrade: true
+        reconnectionDelayMax: 60000
+        // randomizationFactor: 0.5,
+        // transports: ["websocket", "polling"], // Add this to prefer WebSocket with polling fallback
+        // rememberUpgrade: true
       });
 
       socketRef.current = socketInstance;
-      setSocketInitialized(true);
 
       const handleBodyshopMessage = (message) => {
         if (!message || !message.type) return;
@@ -261,7 +252,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
             break;
         }
       };
-      
+
       const handleConnect = () => {
         socketInstance.emit("join-bodyshop-room", bodyshop.id);
         setClientId(socketInstance.id);
@@ -558,57 +549,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
     t
   ]);
 
-  useEffect(() => {
-    if (!socketInitialized) return;
-
-    const onVisibilityChange = () => {
-      if (document.visibilityState === "visible") {
-        checkAndReconnect();
-      }
-    };
-
-    const onFocus = () => {
-      checkAndReconnect();
-    };
-
-    const onOnline = () => {
-      checkAndReconnect();
-    };
-
-    const onPageShow = (event) => {
-      if (event.persisted) {
-        checkAndReconnect();
-      }
-    };
-
-    document.addEventListener("visibilitychange", onVisibilityChange);
-    window.addEventListener("focus", onFocus);
-    window.addEventListener("online", onOnline);
-    window.addEventListener("pageshow", onPageShow);
-
-    // Sleep/wake detection using timer
-    let lastTime = Date.now();
-    const intervalMs = 1000; // Check every second
-    const thresholdMs = 2000; // If more than 2 seconds elapsed, assume sleep/wake
-
-    const sleepCheckInterval = setInterval(() => {
-      const currentTime = Date.now();
-      if (currentTime > lastTime + intervalMs + thresholdMs) {
-        console.log("Detected potential wake from sleep/hibernate");
-        checkAndReconnect();
-      }
-      lastTime = currentTime;
-    }, intervalMs);
-
-    return () => {
-      document.removeEventListener("visibilitychange", onVisibilityChange);
-      window.removeEventListener("focus", onFocus);
-      window.removeEventListener("online", onOnline);
-      window.removeEventListener("pageshow", onPageShow);
-      clearInterval(sleepCheckInterval);
-    };
-  }, [socketInitialized]);
-
   return (
     <SocketContext.Provider
       value={{