From a1982e0481186deb5272649dda8459be10141266 Mon Sep 17 00:00:00 2001
From: logonoff <git@logonoff.co>
Date: Wed, 19 Nov 2025 14:52:04 -0500
Subject: [PATCH] OCPBUGS-65776: Fix unnecessary rerenders with pod-connect

---
 frontend/public/components/pod-connect.tsx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/public/components/pod-connect.tsx b/frontend/public/components/pod-connect.tsx
index 37de09e909..23b442b750 100644
--- a/frontend/public/components/pod-connect.tsx
+++ b/frontend/public/components/pod-connect.tsx
@@ -71,15 +71,18 @@ export const PodConnect: React.FCC<PodConnectProps> = ({
 
   const containers = useMemo(() => _.keyBy(_.get(obj, 'spec.containers', []), 'name'), [obj]);
 
+  const podName = useMemo(() => obj.metadata?.name || '', [obj?.metadata?.name]);
+  const namespace = useMemo(() => obj.metadata?.namespace || 'default', [obj?.metadata?.namespace]);
+  // We are being more specific with the dependency array here to avoid additional rerenders when other fields in obj changes
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const isWindows = useMemo(() => isWindowsPod(obj), [obj?.spec?.tolerations]);
+
   const connect = useCallback(() => {
-    const {
-      metadata: { name, namespace },
-    } = obj;
     const usedClient = isOpenShift ? 'oc' : 'kubectl';
-    const command = isWindowsPod(obj) ? ['cmd'] : ['sh', '-i', '-c', 'TERM=xterm sh'];
+    const command = isWindows ? ['cmd'] : ['sh', '-i', '-c', 'TERM=xterm sh'];
     const params = {
       ns: namespace,
-      name,
+      name: podName,
       path: attach ? ATTACH_COMMAND : EXEC_COMMAND,
       queryParams: {
         stdout: '1',
@@ -102,7 +105,7 @@ export const PodConnect: React.FCC<PodConnectProps> = ({
     const subprotocols = impersonate.subprotocols.concat('base64.channel.k8s.io');
 
     let previous = '';
-    wsRef.current = new WSFactory(`${name}-terminal`, {
+    wsRef.current = new WSFactory(`${podName}-terminal`, {
       host: 'auto',
       reconnect: true,
       path: resourceURL(PodModel, params),
@@ -143,7 +146,7 @@ export const PodConnect: React.FCC<PodConnectProps> = ({
       })
       // eslint-disable-next-line no-console
       .onerror((evt: any) => console.error(`WS error?! ${evt}`));
-  }, [obj, attach, activeContainer, t, isOpenShift]);
+  }, [podName, namespace, isWindows, attach, activeContainer, t, isOpenShift]);
 
   // Connect on mount and when dependencies change
   useEffect(() => {