From ba798351c96b39736efdcc2012d28e9dfa6eb6f7 Mon Sep 17 00:00:00 2001
From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
Date: Tue, 14 Nov 2023 11:47:11 -0500
Subject: [PATCH 1/2] HPCC-30844 ECL Watch revert IdleWatcher event strings

Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
---
 esp/src/src/ESPUtil.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esp/src/src/ESPUtil.ts b/esp/src/src/ESPUtil.ts
index 8c8a94e4abc..43cf058435d 100644
--- a/esp/src/src/ESPUtil.ts
+++ b/esp/src/src/ESPUtil.ts
@@ -314,10 +314,10 @@ export function goToPageUserPreference(gridName, key) {
 
 export const MonitorLockClick = dojo.declare([Evented], {
     unlocked() {
-        this.emit("Unlocked", {});
+        this.emit("unlocked", {});
     },
     locked() {
-        this.emit("Locked", {});
+        this.emit("locked", {});
     }
 });
 

From 6e9d9a9fd00af901b5ac72c6158690bb28c09bd3 Mon Sep 17 00:00:00 2001
From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
Date: Tue, 14 Nov 2023 12:09:15 -0500
Subject: [PATCH 2/2] HPCC-30846 ECL Watch fix merge issues in Frame.tsx

Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
---
 esp/src/src-react/components/Frame.tsx | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/esp/src/src-react/components/Frame.tsx b/esp/src/src-react/components/Frame.tsx
index 2c4f7b0cecf..594f756080c 100644
--- a/esp/src/src-react/components/Frame.tsx
+++ b/esp/src/src-react/components/Frame.tsx
@@ -90,24 +90,6 @@ export const Frame: React.FunctionComponent<FrameProps> = () => {
         return () => unlisten();
     }, []);
 
-    React.useEffect(() => {
-        initSession();
-
-        topic.subscribe("hpcc/session_management_status", function (publishedMessage) {
-            if (publishedMessage.status === "Unlocked") {
-                unlock();
-            } else if (publishedMessage.status === "Locked") {
-                lock();
-            } else if (publishedMessage.status === "DoIdle") {
-                fireIdle();
-            } else if (publishedMessage.status === "Idle") {
-                window.localStorage.setItem("pageOnLock", window.location.hash.substring(1));
-                setUserSession({ ...userSession, Status: "Locked" });
-                window.location.reload();
-            }
-        });
-    }, [setUserSession, userSession]);
-
     React.useEffect(() => {
         document.title = `${showEnvironmentTitle && environmentTitle.length ? environmentTitle : "ECL Watch v9"}${locationPathname.split("/").join(" | ")}`;
     }, [environmentTitle, locationPathname, showEnvironmentTitle]);