From 910d388e059441bfcce738ca93e0aa3c329396c8 Mon Sep 17 00:00:00 2001
From: Dave <Dave>
Date: Tue, 25 Nov 2025 18:04:15 -0500
Subject: [PATCH] feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration /
 RRScratch2 / Improve reconnect logic

---
 client/src/pages/dms/dms.container.jsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx
index 98820fff8..5b114af18 100644
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -67,6 +67,8 @@ const DMS_SOCKET_EVENTS = {
 
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
   const { t } = useTranslation();
+  const [resetAfterReconnect, setResetAfterReconnect] = useState(false);
+
   const history = useNavigate();
   const search = queryString.parse(useLocation().search);
   const { jobId } = search;
@@ -244,6 +246,11 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
     const onConnect = () => {
       setIsConnected(true);
       setActiveLogLevel(logLevel);
+
+      if (resetAfterReconnect) {
+        activeSocket.emit("dms-reset-context", { jobId, mode });
+        setResetAfterReconnect(false);
+      }
     };
 
     const onDisconnect = () => setIsConnected(false);
@@ -477,14 +484,13 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                   <Button
                     onClick={() => {
                       setLogs([]);
+                      setResetAfterReconnect(true);
                       if (isWssMode(mode)) {
                         setActiveLogLevel(logLevel);
                       }
                       if (activeSocket) {
                         activeSocket.disconnect();
-                        activeSocket.connect();
-                        // Re-emit reset after reconnect (we need to figure out how to make sure active socket has finished connecting first)
-                        // activeSocket.emit("dms-reset-context", { jobId, mode });
+                        setTimeout(() => activeSocket.connect(), 100);
                       }
                     }}
                   >