fix: review comments

Author: Amrit Kashyap Borah

src/Common/Hooks/UseRegisterShortcut/UseRegisterShortcutProvider.tsx

@@ -182,7 +182,7 @@ const UseRegisterShortcutProvider = ({
                 clearTimeout(keyDownTimeoutRef.current)
             }
         }
-    }, [handleKeyupEvent, handleKeydownEvent, handleBlur])
+    }, [handleKeyupEvent, handleKeydownEvent, handleBlur, shouldHookOntoWindow])
 
     const providerValue: UseRegisterShortcutContextType = useMemo(
         () => ({
@@ -194,7 +194,16 @@ const UseRegisterShortcutProvider = ({
                 ? { targetProps: { onKeyDown: handleKeydownEvent, onKeyUp: handleKeyupEvent, onBlur: handleBlur } }
                 : {}),
         }),
-        [registerShortcut, unregisterShortcut, setDisableShortcuts, triggerShortcut],
+        [
+            registerShortcut,
+            unregisterShortcut,
+            setDisableShortcuts,
+            triggerShortcut,
+            shouldHookOntoWindow,
+            handleKeydownEvent,
+            handleKeyupEvent,
+            handleBlur,
+        ],
     )
 
     return <UseRegisterShortcutContext.Provider value={providerValue}>{children}</UseRegisterShortcutContext.Provider>

src/Pages/ResourceBrowser/constants.tsx

@@ -17,6 +17,7 @@
 import { ReactComponent as ICCleanBrush } from '@Icons/ic-medium-clean-brush.svg'
 import { ReactComponent as ICMediumPause } from '@Icons/ic-medium-pause.svg'
 import { ReactComponent as ICMediumPlay } from '@Icons/ic-medium-play.svg'
+import { URLS } from '@Common/Constants'
 import { SelectPickerOptionType } from '@Shared/Components'
 
 import { NodeDrainRequest } from './types'
@@ -114,3 +115,18 @@ export const NODE_DRAIN_OPTIONS_CHECKBOX_CONFIG: {
 
 export const GVK_FILTER_KIND_QUERY_PARAM_KEY = 'gvkFilterKind'
 export const GVK_FILTER_API_VERSION_QUERY_PARAM_KEY = 'gvkFilterApiVersion'
+
+export const DUMMY_RESOURCE_GVK_VERSION = 'v1'
+
+export const RESOURCE_BROWSER_ROUTES = {
+    OVERVIEW: `${URLS.RESOURCE_BROWSER}/:clusterId/overview`,
+    MONITORING_DASHBOARD: `${URLS.RESOURCE_BROWSER}/:clusterId/monitoring-dashboard`,
+    TERMINAL: `${URLS.RESOURCE_BROWSER}/:clusterId/terminal`,
+    CLUSTER_UPGRADE: `${URLS.RESOURCE_BROWSER}/:clusterId/cluster-upgrade`,
+    NODE_DETAIL: `${URLS.RESOURCE_BROWSER}/:clusterId/node/:name`,
+    K8S_RESOURCE_DETAIL: `${URLS.RESOURCE_BROWSER}/:clusterId/:namespace/:kind/:group/:version/:name`,
+    K8S_RESOURCE_LIST: `${URLS.RESOURCE_BROWSER}/:clusterId/:kind/:group/:version`,
+    RESOURCE_RECOMMENDER: `${URLS.RESOURCE_BROWSER}/:clusterId/resource-recommender`,
+} as const
+
+export const K8S_EMPTY_GROUP = 'k8sEmptyGroup'

src/Pages/ResourceBrowser/types.ts

@@ -150,3 +150,22 @@ export interface InstallationClusterConfigType
     status: InstallationClusterStatus
     correspondingClusterId: number | 0
 }
+
+export enum NodeActionMenuOptionIdEnum {
+    terminal = 'terminal',
+    cordon = 'cordon',
+    uncordon = 'uncordon',
+    drain = 'drain',
+    editTaints = 'edit-taints',
+    editYaml = 'edit-yaml',
+    delete = 'delete',
+}
+
+export enum ResourceBrowserActionMenuEnum {
+    manifest = 'manifest',
+    events = 'events',
+    logs = 'logs',
+    terminal = 'terminal',
+    delete = 'delete',
+    vulnerability = 'vulnerability',
+}

src/Shared/Components/CICDHistory/utils.tsx

@@ -19,10 +19,11 @@ import moment from 'moment'
 import { ReactComponent as ICCheck } from '@Icons/ic-check.svg'
 import { ReactComponent as Close } from '@Icons/ic-close.svg'
 import { ReactComponent as ICInProgress } from '@Icons/ic-in-progress.svg'
-import { DATE_TIME_FORMATS } from '@Common/Constants'
+import { DATE_TIME_FORMATS, URLS } from '@Common/Constants'
 import { DeploymentAppTypes } from '@Common/Types'
 import { ALL_RESOURCE_KIND_FILTER } from '@Shared/constants'
 import { isTimeStringAvailable } from '@Shared/Helpers'
+import { DUMMY_RESOURCE_GVK_VERSION, K8S_EMPTY_GROUP } from '@Pages/ResourceBrowser'
 
 import { DeploymentStatusBreakdownItemType, Node, ResourceKindType, WorkflowStatusEnum } from '../../types'
 import { Icon } from '../Icon'
@@ -233,7 +234,7 @@ export const getHistoryItemStatusIconFromWorkflowStages = (
 }
 
 export const getWorkerPodBaseUrl = (clusterId: number = DEFAULT_CLUSTER_ID, podNamespace: string = DEFAULT_NAMESPACE) =>
-    `/resource-browser/${clusterId}/${podNamespace}/pod/k8sEmptyGroup/v1`
+    `${URLS.RESOURCE_BROWSER}/${clusterId}/${podNamespace}/pod/${K8S_EMPTY_GROUP}/${DUMMY_RESOURCE_GVK_VERSION}`
 
 export const getWorkflowNodeStatusTitle = (status: string) => {
     if (!status) {

src/Shared/Components/Table/InternalTable.tsx

@@ -60,18 +60,21 @@ const InternalTable = ({
     const searchSortTimeoutRef = useRef<number>(-1)
 
     useEffect(() => {
-        wrapperDivRef.current?.addEventListener('focusout', (e: FocusEvent) => {
+        const handleFocusOutEvent = (e: FocusEvent) => {
             const container = e.currentTarget as HTMLElement
             const related = e.relatedTarget as HTMLElement | null
 
             if (container && (!related || related.tagName === 'BODY')) {
                 const tableElement = wrapperDivRef.current.getElementsByClassName('generic-table')[0] as HTMLDivElement
                 tableElement?.focus()
             }
-        })
+        }
+
+        wrapperDivRef.current?.addEventListener('focusout', handleFocusOutEvent)
 
         return () => {
             clearTimeout(searchSortTimeoutRef.current)
+            wrapperDivRef.current?.removeEventListener('focusout', handleFocusOutEvent)
         }
     }, [])