Merge pull request #2816 from devtron-labs/chore/dt-39-sync

AbhishekA1509 · web-flow · commit 33acdb0bc055 · 2025-07-07T17:02:05.000+05:30
chore: dt 39 sync
diff --git a/Dockerfile b/Dockerfile
@@ -1,24 +1,24 @@
-FROM node:20-alpine AS builder
-
-RUN apk add --no-cache git
+FROM node:22-alpine AS builder
 
 WORKDIR /app
+
+RUN corepack enable yarn && \
+    yarn set version 4.9.2
+
 COPY package.json .
 COPY yarn.lock .
+COPY .yarn/ .yarn/
+COPY .yarnrc.yml ./
 
-RUN yarn install --frozen-lockfile --network-timeout 600000
+RUN apk add --no-cache git
+RUN yarn install --immutable --network-timeout 600000
 
-COPY src/ src
-COPY nginx.conf .
-COPY tsconfig.json .
-COPY vite.config.mts .
 COPY . .
 
 RUN echo `git rev-parse --short=9 HEAD` > health.html && \
     echo "" >> .env && \
-    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> .env
-
-RUN yarn build
+    echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short=9 HEAD)" >> .env && \
+    yarn build
 
 FROM fholzer/nginx-brotli:v1.26.2
 
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-7",
+        "@devtron-labs/devtron-fe-common-lib": "1.17.0-pre-0",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
diff --git a/src/Pages/App/CreateAppModal/ProjectSelector.tsx b/src/Pages/App/CreateAppModal/ProjectSelector.tsx
@@ -61,7 +61,6 @@ const ProjectSelector = ({ selectedProjectId, handleProjectIdChange, error }: Pr
                 onChange={handleChange}
                 error={error}
                 autoFocus
-                defaultMenuIsOpen
             />
         </div>
     )
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterForm.tsx b/src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterForm.tsx
@@ -1515,6 +1515,7 @@ const ClusterForm = ({
                                 clusterId={String(id)}
                                 clusterName={clusterName}
                                 handleClose={hideConfirmationModal}
+                                handleSuccess={hideEditModal}
                                 reload={reload}
                                 installationId={String(installationId)}
                             />
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/DeleteClusterConfirmationModal.tsx b/src/Pages/GlobalConfigurations/ClustersAndEnvironments/DeleteClusterConfirmationModal.tsx
@@ -23,6 +23,7 @@ const DeleteClusterConfirmationModal = ({
     handleClose,
     installationId,
     reload,
+    handleSuccess,
 }: DeleteClusterConfirmationModalProps) => {
     const isClusterInCreationPhase = Number(clusterId) === 0
 
@@ -40,6 +41,7 @@ const DeleteClusterConfirmationModal = ({
             await deleteCluster({ id: numberedClusterId })
         }
         reload?.()
+        handleSuccess?.()
     }
 
     const handleToggleShouldDeleteInstalledCluster = () => {
diff --git a/src/Pages/GlobalConfigurations/ClustersAndEnvironments/cluster.type.ts b/src/Pages/GlobalConfigurations/ClustersAndEnvironments/cluster.type.ts
@@ -231,6 +231,7 @@ export interface DeleteClusterConfirmationModalProps
         Pick<ClusterEnvironmentListProps, 'clusterId'> {
     handleClose: () => void
     installationId: string
+    handleSuccess?: () => void
 }
 
 export interface DeleteClusterPayload {
diff --git a/src/components/CIPipelineN/CIPipeline.tsx b/src/components/CIPipelineN/CIPipeline.tsx
@@ -812,7 +812,7 @@ export default function CIPipeline({
     const renderCIPipelineModalContent = () => {
         if (pageState === ViewType.ERROR) {
             return (
-                <div className="p-20">
+                <div className="flex-grow-1 p-20">
                     <ErrorScreenManager code={errorCode} reload={handleOnMountAPICalls} />
                 </div>
             )
diff --git a/src/components/ClusterNodes/ClusterOverview.tsx b/src/components/ClusterNodes/ClusterOverview.tsx
@@ -18,7 +18,6 @@ import React, { useEffect, useRef, useState } from 'react'
 import { generatePath, useHistory, useParams } from 'react-router-dom'
 
 import {
-    DUMMY_RESOURCE_GVK_VERSION,
     EditableTextArea,
     ErrorScreenManager,
     getRandomColor,
@@ -216,7 +215,6 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) {
             clusterId,
             kind: 'node',
             group: K8S_EMPTY_GROUP,
-            version: DUMMY_RESOURCE_GVK_VERSION,
         })}?${queryParam}=${encodeURIComponent(filterText)}`
         history.push(newUrl)
     }
diff --git a/src/components/ClusterNodes/NodeDetails.tsx b/src/components/ClusterNodes/NodeDetails.tsx
@@ -41,8 +41,11 @@ import {
     Button,
     ButtonVariantType,
     ButtonStyleType,
+    RESOURCE_BROWSER_ROUTES,
+    getUrlWithSearchParams,
+    ResourceBrowserActionMenuEnum,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { useParams, useLocation, useHistory } from 'react-router-dom'
+import { useParams, useLocation, useHistory, generatePath } from 'react-router-dom'
 import YAML from 'yaml'
 import * as jsonpatch from 'fast-json-patch'
 import { applyPatch } from 'fast-json-patch'
@@ -78,7 +81,7 @@ import { importComponentFromFELibrary } from '@Components/common'
 
 const REDFISH_NODE_UI_TABS = importComponentFromFELibrary('REDFISH_NODE_UI_TABS', [], 'function')
 
-const NodeDetails = ({ addTab, lowercaseKindToResourceGroupMap, updateTabUrl }: ClusterListType) => {
+const NodeDetails = ({ lowercaseKindToResourceGroupMap, updateTabUrl }: ClusterListType) => {
     const { clusterId, name } = useParams<{ clusterId: string; nodeType: string; name: string }>()
     const [loader, setLoader] = useState(true)
     const [apiInProgress, setApiInProgress] = useState(false)
@@ -673,9 +676,13 @@ const NodeDetails = ({ addTab, lowercaseKindToResourceGroupMap, updateTabUrl }:
     const openDebugTerminal = () => {
         const queryParams = new URLSearchParams(location.search)
         queryParams.set('node', nodeDetail.name)
-        const url = location.pathname
         push(
-            `${url.split('/').slice(0, -3).join('/')}/${AppDetailsTabs.terminal}/${K8S_EMPTY_GROUP}?${queryParams.toString()}`,
+            getUrlWithSearchParams(
+                generatePath(RESOURCE_BROWSER_ROUTES.TERMINAL, {
+                    clusterId,
+                }),
+                { node: nodeDetail.name },
+            ),
         )
     }
 
@@ -711,17 +718,19 @@ const NodeDetails = ({ addTab, lowercaseKindToResourceGroupMap, updateTabUrl }:
     }
 
     const handleResourceClick = (e) => {
-        const { name, tab, namespace } = e.currentTarget.dataset
-        let _nodeSelectionData
-        let _group
-        _group = selectedResource?.gvk.Group.toLowerCase() || K8S_EMPTY_GROUP
-        _nodeSelectionData = { name: `pod` + `_${name}`, namespace, isFromNodeDetails: true }
-        const _url = `${URLS.RESOURCE_BROWSER}/${clusterId}/${namespace}/pod/${_group}/${name}${
-            tab ? `/${tab.toLowerCase()}` : ''
-        }`
-        addTab({ idPrefix: `${_group}_${namespace}`, kind: 'pod', name, url: _url }).then(() => {
-            push(_url)
-        })
+        const { name, tab = ResourceBrowserActionMenuEnum.manifest, namespace } = e.currentTarget.dataset
+        push(
+            getUrlWithSearchParams(
+                generatePath(RESOURCE_BROWSER_ROUTES.K8S_RESOURCE_DETAIL, {
+                    clusterId,
+                    group: selectedResource?.gvk.Group.toLowerCase() || K8S_EMPTY_GROUP,
+                    kind: 'pod',
+                    name,
+                    namespace,
+                }),
+                { tab },
+            ),
+        )
     }
 
     const getTriggerSortingHandler =
diff --git a/src/components/ClusterNodes/types.ts b/src/components/ClusterNodes/types.ts
@@ -135,7 +135,6 @@ export interface ColumnMetadataType {
 }
 
 export interface ClusterListType extends Pick<K8SResourceListType, 'lowercaseKindToResourceGroupMap'> {
-    addTab?: UseTabsReturnType['addTab']
     updateTabUrl: (params: Omit<UpdateTabUrlParamsType, 'id'>) => void
 }
 
diff --git a/src/components/ResourceBrowser/Constants.ts b/src/components/ResourceBrowser/Constants.ts
@@ -397,7 +397,7 @@ export const AI_BUTTON_CONFIG_MAP: Record<string, ShowAIButtonConfig> = Object.f
 export const ResourceBrowserRouteToTabIdMap: Partial<
     Record<(typeof RESOURCE_BROWSER_ROUTES)[keyof typeof RESOURCE_BROWSER_ROUTES], ResourceBrowserTabsId | string>
 > = {
-    '/resource-browser/:clusterId/:kind/:group/:version': ResourceBrowserTabsId.k8s_Resources,
+    '/resource-browser/:clusterId/:kind/:group': ResourceBrowserTabsId.k8s_Resources,
     '/resource-browser/:clusterId/overview': ResourceBrowserTabsId.cluster_overview,
     '/resource-browser/:clusterId/monitoring-dashboard': MONITORING_DASHBOARD_TAB_ID,
     '/resource-browser/:clusterId/terminal': ResourceBrowserTabsId.terminal,
diff --git a/src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx b/src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React, { useRef, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import { useHistory } from 'react-router-dom'
 import ReactSelect, { Props as SelectProps, SelectInstance } from 'react-select'
 
@@ -29,6 +29,7 @@ import {
     PopupMenu,
     ToastManager,
     ToastVariantType,
+    useRegisterShortcut,
     ValueContainerWithLoadingShimmer,
 } from '@devtron-labs/devtron-fe-common-lib'
 
@@ -66,6 +67,22 @@ const ClusterSelector: React.FC<ClusterSelectorType> = ({
 
     const selectRef = useRef<SelectInstance>(null)
 
+    const { registerShortcut, unregisterShortcut } = useRegisterShortcut()
+
+    useEffect(() => {
+        registerShortcut({
+            keys: ['S'],
+            callback: () => {
+                selectRef.current?.focus()
+                selectRef.current?.openMenu('first')
+            },
+        })
+
+        return () => {
+            unregisterShortcut(['S'])
+        }
+    }, [])
+
     let filteredClusterList = clusterList
     if (window._env_.HIDE_DEFAULT_CLUSTER) {
         filteredClusterList = clusterList.filter((item) => Number(item.value) !== DEFAULT_CLUSTER_ID)
diff --git a/src/components/ResourceBrowser/ResourceList/ClusterUpgradeCompatibilityInfoTableCellComponent.tsx b/src/components/ResourceBrowser/ResourceList/ClusterUpgradeCompatibilityInfoTableCellComponent.tsx
@@ -5,7 +5,6 @@ import DOMPurify from 'dompurify'
 import {
     ALL_NAMESPACE_OPTION,
     ClipboardButton,
-    DUMMY_RESOURCE_GVK_VERSION,
     GVKType,
     highlightSearchText,
     K8sResourceDetailDataType,
@@ -49,7 +48,6 @@ const ClusterUpgradeCompatibilityInfoTableCellComponent = ({
             name,
             kind: kind.toLowerCase(),
             group,
-            version: DUMMY_RESOURCE_GVK_VERSION,
         })
 
         push(`${url}/${tab}`)
diff --git a/src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx b/src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx
@@ -161,7 +161,8 @@ export const K8SResourceList = ({
         [selectedResource, clusterId, selectedNamespace, JSON.stringify(resourceFilters)],
     )
 
-    const isResourceListLoading = resourceListLoader || getIsRequestAborted(resourceListError)
+    const isResourceListLoadingWithoutNullState = resourceListLoader || getIsRequestAborted(resourceListError)
+    const isResourceListLoading = !resourceList || isResourceListLoadingWithoutNullState
 
     useEffect(
         () => () => {
@@ -237,7 +238,7 @@ export const K8SResourceList = ({
         return columns.some(({ field }) => field === 'namespace') ? 'namespace' : 'name'
     }
 
-    if (resourceListError && !isResourceListLoading) {
+    if (resourceListError && !isResourceListLoadingWithoutNullState) {
         return (
             <div className="flexbox-col flex-grow-1 border__primary--left">
                 <ErrorScreenManager
diff --git a/src/components/ResourceBrowser/ResourceList/K8sResourceListTableCellComponent.tsx b/src/components/ResourceBrowser/ResourceList/K8sResourceListTableCellComponent.tsx
@@ -8,7 +8,6 @@ import {
     ButtonVariantType,
     ClipboardButton,
     ConditionalWrap,
-    DUMMY_RESOURCE_GVK_VERSION,
     getAIAnalyticsEvents,
     highlightSearchText,
     Icon,
@@ -90,7 +89,6 @@ const K8sResourceListTableCellComponent = ({
             name,
             kind: kind.toLowerCase(),
             group: _group || K8S_EMPTY_GROUP,
-            version: DUMMY_RESOURCE_GVK_VERSION,
         })
 
         push(`${url}/${tab}`)
@@ -154,7 +152,6 @@ const K8sResourceListTableCellComponent = ({
                 name,
                 group,
                 kind,
-                version: DUMMY_RESOURCE_GVK_VERSION,
             }),
         )
     }
diff --git a/src/components/ResourceBrowser/ResourceList/NodeDetailWrapper.tsx b/src/components/ResourceBrowser/ResourceList/NodeDetailWrapper.tsx
@@ -8,11 +8,10 @@ import { K8S_EMPTY_GROUP } from '../Constants'
 import { NodeDetailURLParams } from './types'
 
 const NodeDetailWrapper = ({
-    addTab,
     getTabId,
     updateTabUrl,
     lowercaseKindToResourceGroupMap,
-}: Omit<ClusterListType, 'updateTabUrl'> & Pick<UseTabsReturnType, 'addTab' | 'getTabId' | 'updateTabUrl'>) => {
+}: Omit<ClusterListType, 'updateTabUrl'> & Pick<UseTabsReturnType, 'getTabId' | 'updateTabUrl'>) => {
     const { name } = useParams<NodeDetailURLParams>()
 
     const id = getTabId(K8S_EMPTY_GROUP, name, 'node')
@@ -23,7 +22,6 @@ const NodeDetailWrapper = ({
         <NodeDetails
             updateTabUrl={updateTabUrlHandler}
             lowercaseKindToResourceGroupMap={lowercaseKindToResourceGroupMap}
-            addTab={addTab}
         />
     )
 }
diff --git a/src/components/ResourceBrowser/ResourceList/NodeListSearchFilter.tsx b/src/components/ResourceBrowser/ResourceList/NodeListSearchFilter.tsx
@@ -107,12 +107,12 @@ const NodeListSearchFilter = ({
 
     useEffect(() => {
         if (registerShortcut) {
-            registerShortcut({ keys: ['R'], callback: handleFocusInput })
+            registerShortcut({ keys: ['/'], callback: handleFocusInput })
             registerShortcut({ keys: ['Escape'], callback: handleBlurInput })
         }
 
         return (): void => {
-            unregisterShortcut(['R'])
+            unregisterShortcut(['/'])
             unregisterShortcut(['Escape'])
         }
     }, [])
@@ -249,7 +249,7 @@ const NodeListSearchFilter = ({
                     )}
 
                     {!searchTextType && (
-                        <ShortcutKeyBadge shortcutKey="r" rootClassName="node-listing-search-container__shortcut-key" />
+                        <ShortcutKeyBadge shortcutKey="/" rootClassName="node-listing-search-container__shortcut-key" />
                     )}
                 </button>
 
diff --git a/src/components/ResourceBrowser/ResourceList/ResourceFilterOptions.tsx b/src/components/ResourceBrowser/ResourceList/ResourceFilterOptions.tsx
@@ -130,13 +130,13 @@ const ResourceFilterOptions = ({
 
     useEffect(() => {
         if (registerShortcut) {
-            registerShortcut({ keys: ['R'], callback: handleInputShortcut })
+            registerShortcut({ keys: ['/'], callback: handleInputShortcut })
             registerShortcut({ keys: ['F'], callback: handleShowFilterModal })
             registerShortcut({ keys: ['N'], callback: handleFocusNamespaceFilter })
         }
         return (): void => {
             unregisterShortcut(['F'])
-            unregisterShortcut(['R'])
+            unregisterShortcut(['/'])
             unregisterShortcut(['N'])
         }
     }, [])
@@ -243,7 +243,7 @@ const ResourceFilterOptions = ({
                         />
                         {showShortcutKey && (
                             <ShortcutKeyBadge
-                                shortcutKey="r"
+                                shortcutKey="/"
                                 rootClassName="resource-search-shortcut-key"
                                 onClick={handleInputShortcut}
                             />
diff --git a/src/components/ResourceBrowser/ResourceList/ResourceList.tsx b/src/components/ResourceBrowser/ResourceList/ResourceList.tsx
@@ -392,7 +392,6 @@ const ResourceList = () => {
                 <Route path={RESOURCE_BROWSER_ROUTES.NODE_DETAIL} exact>
                     <DynamicTabComponentWrapper type="dynamic" {...DynamicTabComponentWrapperBaseProps} addTab={addTab}>
                         <NodeDetailWrapper
-                            addTab={addTab}
                             getTabId={getTabId}
                             lowercaseKindToResourceGroupMap={lowercaseKindToResourceGroupMap}
                             updateTabUrl={updateTabUrl}
diff --git a/src/components/ResourceBrowser/ResourceList/Sidebar.tsx b/src/components/ResourceBrowser/ResourceList/Sidebar.tsx
diff --git a/src/components/ResourceBrowser/Utils.tsx b/src/components/ResourceBrowser/Utils.tsx
diff --git a/src/components/common/ClusterMetaDataBar/ClusterMetaDataBar.tsx b/src/components/common/ClusterMetaDataBar/ClusterMetaDataBar.tsx
diff --git a/src/components/common/DynamicTabs/DynamicTabs.tsx b/src/components/common/DynamicTabs/DynamicTabs.tsx
diff --git a/src/components/common/navigation/NavigationRoutes.tsx b/src/components/common/navigation/NavigationRoutes.tsx
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ const ProjectSelector = ({ selectedProjectId, handleProjectIdChange, error }: Pr`
`61`	`61`	`onChange={handleChange}`
`62`	`62`	`error={error}`
`63`	`63`	`autoFocus`
`64`		`- defaultMenuIsOpen`
`65`	`64`	`/>`
`66`	`65`	`</div>`
`67`	`66`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ const DeleteClusterConfirmationModal = ({`
`23`	`23`	`handleClose,`
`24`	`24`	`installationId,`
`25`	`25`	`reload,`
	`26`	`+ handleSuccess,`
`26`	`27`	`}: DeleteClusterConfirmationModalProps) => {`
`27`	`28`	`const isClusterInCreationPhase = Number(clusterId) === 0`
`28`	`29`
`@@ -40,6 +41,7 @@ const DeleteClusterConfirmationModal = ({`
`40`	`41`	`await deleteCluster({ id: numberedClusterId })`
`41`	`42`	`}`
`42`	`43`	`reload?.()`
	`44`	`+ handleSuccess?.()`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`const handleToggleShouldDeleteInstalledCluster = () => {`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@ export interface DeleteClusterConfirmationModalProps`
`231`	`231`	`Pick<ClusterEnvironmentListProps, 'clusterId'> {`
`232`	`232`	`handleClose: () => void`
`233`	`233`	`installationId: string`
	`234`	`+ handleSuccess?: () => void`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`export interface DeleteClusterPayload {`
Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ export default function CIPipeline({`
`812`	`812`	`const renderCIPipelineModalContent = () => {`
`813`	`813`	`if (pageState === ViewType.ERROR) {`
`814`	`814`	`return (`
`815`		`- <div className="p-20">`
	`815`	`+ <div className="flex-grow-1 p-20">`
`816`	`816`	`<ErrorScreenManager code={errorCode} reload={handleOnMountAPICalls} />`
`817`	`817`	`</div>`
`818`	`818`	`)`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ export interface ColumnMetadataType {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`export interface ClusterListType extends Pick<K8SResourceListType, 'lowercaseKindToResourceGroupMap'> {`
`138`		`- addTab?: UseTabsReturnType['addTab']`
`139`	`138`	`updateTabUrl: (params: Omit<UpdateTabUrlParamsType, 'id'>) => void`
`140`	`139`	`}`
`141`	`140`