Merge branch 'kubecon-2025' of github.com:devtron-labs/dashboard into feat/use-query-table

Elessar1802 · Elessar1802 · commit f040e3da9ebd · 2025-09-23T12:05:26.000+05:30
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.20.2-alpha-1",
+        "@devtron-labs/devtron-fe-common-lib": "1.20.2-alpha-2",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
diff --git a/src/App.tsx b/src/App.tsx
@@ -23,6 +23,7 @@ import {
     BreadcrumbStore,
     DevtronProgressing,
     ErrorScreenManager,
+    setGlobalAPITimeout,
     showError,
     URLS as CommonURLS,
     useUserEmail,
@@ -147,6 +148,8 @@ const App = () => {
             setValidating(false)
             defaultRedirection()
         }
+
+        setGlobalAPITimeout(window._env_.GLOBAL_API_TIMEOUT)
     }, [])
 
     const renderRoutesWithErrorBoundary = () =>
diff --git a/src/Pages-Devtron-2.0/ApplicationManagement/Configurations/ConfigurationsRouter.tsx b/src/Pages-Devtron-2.0/ApplicationManagement/Configurations/ConfigurationsRouter.tsx
@@ -14,7 +14,6 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import ChartRepo from '@Components/chartRepo/ChartRepo'
-import { importComponentFromFELibrary } from '@Components/common'
 import { APPLICATION_MANAGEMENT_CONFIGURATIONS } from '@Components/Navigation'
 import { AddNotification } from '@Components/notifications/AddNotification'
 import { URLS } from '@Config/routes'
@@ -31,8 +30,6 @@ const BuildInfra = lazy(() =>
     import('@Pages/GlobalConfigurations/BuildInfra').then((module) => ({ default: module.BuildInfra })),
 )
 
-const CatalogFramework = importComponentFromFELibrary('CatalogFramework')
-
 export const Configurations = () => {
     const { pathname } = useLocation()
     const { featureGitOpsFlags: isFeatureGitOpsEnabled, serverMode, isSuperAdmin } = useMainContext()
@@ -115,14 +112,6 @@ export const Configurations = () => {
                         >
                             {(props) => <Notifications {...props} isSuperAdmin={isSuperAdmin} />}
                         </Route>
-                        {CatalogFramework && (
-                            <Route
-                                key={COMMON_URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_CATALOG_FRAMEWORK}
-                                path={COMMON_URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_CATALOG_FRAMEWORK}
-                            >
-                                <CatalogFramework isSuperAdmin={isSuperAdmin} />
-                            </Route>
-                        )}
                         {...serverMode !== SERVER_MODE.EA_ONLY &&
                             window._env_.ENABLE_SCOPED_VARIABLES && [
                                 <Route
diff --git a/src/components/ClusterNodes/ClusterOverview.tsx b/src/components/ClusterNodes/ClusterOverview.tsx
@@ -481,7 +481,13 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) {
                     )}
                     {renderClusterError()}
                     {ClusterAddOns && <ClusterAddOns clusterId={clusterId} getAvailableCharts={getAvailableCharts} />}
-                    {Catalog && <Catalog resourceId={clusterId} resourceType={ResourceKindType.cluster} />}
+                    {Catalog && (
+                        <Catalog
+                            resourceId={clusterId}
+                            resourceType={ResourceKindType.cluster}
+                            catalogSchemaResourceId={clusterDetails?.catalogSchemaResourceId}
+                        />
+                    )}
                     <GenericDescription
                         isClusterTerminal
                         clusterId={clusterId}
diff --git a/src/components/ClusterNodes/clusterNodes.service.tsx b/src/components/ClusterNodes/clusterNodes.service.tsx
@@ -145,6 +145,7 @@ export const getClusterOverviewDetails = async ({
         _moment = moment(result.clusterCreatedOn, 'YYYY-MM-DDTHH:mm:ssZ')
         clusterDetails.addedOn = _moment.format(Moment12HourFormat)
         clusterDetails.serverURL = result.serverUrl
+        clusterDetails.catalogSchemaResourceId = result.catalogSchemaResourceId
 
         const data: DescriptionDataType = CLUSTER_DESCRIPTION_DUMMY_DATA
 
diff --git a/src/components/ClusterNodes/types.ts b/src/components/ClusterNodes/types.ts
@@ -53,6 +53,7 @@ export interface ClusterDescriptionType {
     clusterCreatedBy: string
     clusterCreatedOn: string
     clusterNote?: ClusterNoteType
+    catalogSchemaResourceId?: number
 }
 
 export interface ClusterNoteType {
@@ -261,7 +262,7 @@ export interface DescriptionDataType {
     descriptionUpdatedOn: string
 }
 
-export interface ClusterDetailsType {
+export interface ClusterDetailsType extends Pick<ClusterDescriptionType, 'catalogSchemaResourceId'> {
     clusterName: string
     shortDescription: string
     serverURL: string
diff --git a/src/components/Navigation/Navigation.tsx b/src/components/Navigation/Navigation.tsx
@@ -245,6 +245,7 @@ export const Navigation = ({
                             onClick={handleNavGroupClick(item)}
                             to={findActiveNavigationItemOfNavGroup(item.items)?.href}
                             onHover={handleNavGroupHover(item)}
+                            showTooltip={item.disabled}
                         />
                     ))}
                     {!window._env_.K8S_CLIENT && !isAirgapped && showStackManager && (
diff --git a/src/components/Navigation/constants.ts b/src/components/Navigation/constants.ts
@@ -51,13 +51,6 @@ export const APPLICATION_MANAGEMENT_CONFIGURATIONS: NavigationItemType['subItems
         href: URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_NOTIFICATIONS,
         keywords: ['config'],
     },
-    {
-        title: 'Catalog Frameworks',
-        dataTestId: 'click-on-configurations-catalog-frameworks',
-        id: 'application-management-configurations-catalog-frameworks',
-        href: COMMON_URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_CATALOG_FRAMEWORK,
-        keywords: ['config'],
-    },
     {
         title: 'Scoped Variables',
         dataTestId: 'click-on-configurations-scoped-variables',
@@ -279,14 +272,6 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [
                 icon: 'ic-cube',
                 href: COMMON_URLS.INFRASTRUCTURE_MANAGEMENT_RESOURCE_BROWSER,
             },
-            {
-                title: 'Catalog Framework',
-                dataTestId: 'catalog-framework',
-                id: 'infrastructure-management-catalog-framework',
-                icon: 'ic-file',
-                disabled: true,
-                href: '/dummy-url',
-            },
             {
                 title: 'Resource Watcher',
                 dataTestId: 'resource-watcher',
@@ -432,12 +417,14 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [
         title: 'Backup & Restore',
         id: 'backup-and-restore',
         icon: 'ic-database-backup',
+        disabled: true,
         items: [
             {
                 title: 'Overview',
                 dataTestId: 'backup-and-restore-overview',
                 id: 'backup-and-restore-overview',
                 icon: 'ic-speedometer',
+                disabled: true,
                 href: COMMON_URLS.BACKUP_AND_RESTORE_OVERVIEW,
             },
             {
@@ -486,12 +473,14 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [
         id: 'ai-recommendations',
         title: 'AI Recommendations',
         icon: 'ic-openai',
+        disabled: true,
         items: [
             {
                 title: 'Overview',
                 dataTestId: 'ai-recommendations-overview',
                 id: 'ai-recommendations-overview',
                 icon: 'ic-speedometer',
+                disabled: true,
                 href: COMMON_URLS.AI_RECOMMENDATIONS_OVERVIEW,
             },
         ],
diff --git a/src/components/app/Overview/Overview.tsx b/src/components/app/Overview/Overview.tsx
@@ -212,7 +212,16 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn
     }
 
     const renderSideInfoColumn = () => {
-        const { appName, description, gitMaterials = [], createdOn, createdBy, projectName, chartUsed, templateConfig } = appMetaInfo
+        const {
+            appName,
+            description,
+            gitMaterials = [],
+            createdOn,
+            createdBy,
+            projectName,
+            chartUsed,
+            templateConfig,
+        } = appMetaInfo
 
         const handleSaveDescription = async (value: string) => {
             const payload: EditAppRequest = {
@@ -452,7 +461,13 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn
     function renderAppDescription() {
         return (
             <div>
-                {Catalog && <Catalog resourceId={appId} resourceType={getResourceKindFromAppType(appType)} />}
+                {Catalog && (
+                    <Catalog
+                        resourceId={appId}
+                        resourceType={getResourceKindFromAppType(appType)}
+                        catalogSchemaResourceId={appMetaInfo.catalogSchemaResourceId}
+                    />
+                )}
                 {DeploymentWindowOverview && (
                     <DeploymentWindowOverview appId={Number(appId)} filteredEnvIds={filteredEnvIds} />
                 )}
diff --git a/src/components/app/types.ts b/src/components/app/types.ts
@@ -107,8 +107,6 @@ interface GitMaterial {
 }
 
 export interface AppMetaInfo extends BaseAppMetaData, Partial<Pick<CreateAppFormStateType, 'templateConfig'>> {
-    appId: number
-    appName: string
     createdBy: string
     description: string
     createdOn: string
@@ -121,6 +119,7 @@ export interface AppMetaInfo extends BaseAppMetaData, Partial<Pick<CreateAppForm
     chartUsed?: ChartUsed
     note?: Note
     gitMaterials?: GitMaterial[]
+    catalogSchemaResourceId?: number
 }
 
 export interface ArtifactsCiJob {
diff --git a/src/components/common/ClusterNotReachableDialog/ClusterNotReachableDialog.tsx b/src/components/common/ClusterNotReachableDialog/ClusterNotReachableDialog.tsx
@@ -19,7 +19,12 @@ import { ForceDeleteConfirmationModal } from '@devtron-labs/devtron-fe-common-li
 import { NON_CASCADE_DELETE_DIALOG_INTERNAL_MESSAGE } from '../../../config/constantMessaging'
 import { ClusterNotReachableDialogType } from './ClusterNotReachableDialog.type'
 
-const ClusterNotReachableDialog = ({ clusterName, onClickCancel, onClickDelete }: ClusterNotReachableDialogType) => {
+const ClusterNotReachableDialog = ({
+    clusterName,
+    onClickCancel,
+    onClickDelete,
+    isDeleting,
+}: ClusterNotReachableDialogType) => {
     if (!clusterName) {
         return null
     }
@@ -34,6 +39,7 @@ const ClusterNotReachableDialog = ({ clusterName, onClickCancel, onClickDelete }
                 </p>
             }
             onDelete={onClickDelete}
+            isDeleting={isDeleting}
             closeConfirmationModal={onClickCancel}
         />
     )
diff --git a/src/components/common/ClusterNotReachableDialog/ClusterNotReachableDialog.type.ts b/src/components/common/ClusterNotReachableDialog/ClusterNotReachableDialog.type.ts
@@ -18,4 +18,5 @@ export interface ClusterNotReachableDialogType {
     clusterName: string
     onClickCancel: () => void
     onClickDelete: () => void
+    isDeleting?: boolean
 }
diff --git a/src/components/externalArgoApps/ExternalArgoAppDetail.tsx b/src/components/externalArgoApps/ExternalArgoAppDetail.tsx
@@ -24,6 +24,7 @@ import {
     DeploymentAppTypes,
     getIsRequestAborted,
     abortPreviousRequests,
+    API_STATUS_CODES,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { getArgoAppDetail } from '../external-apps/ExternalAppService'
 import { checkIfToRefetchData, deleteRefetchDataFromUrl } from '../util/URLUtil'
@@ -41,6 +42,8 @@ const ExternalArgoAppDetail = ({ appName, clusterId, isExternalApp, namespace }:
     const [isReloadResourceTreeInProgress, setIsReloadResourceTreeInProgress] = useState(false)
     const [errorResponseCode, setErrorResponseCode] = useState(undefined)
 
+    const handledFirstCall = useRef(false)
+
     let isAPICallInProgress = false
 
     const abortControllerRef = useRef<AbortController>(new AbortController())
@@ -114,7 +117,11 @@ const ExternalArgoAppDetail = ({ appName, clusterId, isExternalApp, namespace }:
             .catch((errors: ServerErrors) => {
                 if (!getIsRequestAborted(errors)) {
                     showError(errors)
-                    setErrorResponseCode(errors.code)
+
+                    if (!handledFirstCall.current || errors.code === API_STATUS_CODES.NOT_FOUND) {
+                        setErrorResponseCode(errors.code)
+                    }
+
                     isAPICallInProgress = false
                     handleInitiatePolling()
                 }
@@ -123,6 +130,7 @@ const ExternalArgoAppDetail = ({ appName, clusterId, isExternalApp, namespace }:
                 setIsLoading(false)
                 isAPICallInProgress = false
                 setIsReloadResourceTreeInProgress(false)
+                handledFirstCall.current = true
             })
     }
 
diff --git a/src/components/v2/appDetails/ea/EAAppDetail.component.tsx b/src/components/v2/appDetails/ea/EAAppDetail.component.tsx
@@ -24,6 +24,7 @@ import {
     DeploymentAppTypes,
     getIsRequestAborted,
     abortPreviousRequests,
+    API_STATUS_CODES,
 } from '@devtron-labs/devtron-fe-common-lib'
 import moment from 'moment'
 import { sortOptionsByValue } from '../../../common'
@@ -54,6 +55,7 @@ const ExternalAppDetail = ({ appId, appName, isExternalApp }) => {
     const [isReloadResourceTreeInProgress, setIsReloadResourceTreeInProgress] = useState(false)
 
     const abortControllerRef = useRef<AbortController>(new AbortController())
+    const handledFirstCall = useRef(false)
 
     let isAPICallInProgress = false
 
@@ -189,12 +191,15 @@ const ExternalAppDetail = ({ appId, appName, isExternalApp }) => {
 
                 if (!getIsRequestAborted(errors)) {
                     showError(errors)
-                    setErrorResponseCode(errors.code)
+                    if (!handledFirstCall.current || errors.code === API_STATUS_CODES.NOT_FOUND) {
+                        setErrorResponseCode(errors.code)
+                    }
                     handleInitiatePolling()
                 }
             })
             .finally(() => {
                 setIsReloadResourceTreeInProgress(false)
+                handledFirstCall.current = true
             })
     }
 
diff --git a/src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx b/src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx
@@ -76,6 +76,8 @@ const EnvironmentSelectorComponent = ({
     const [forceDeleteDialogMessage, setForceDeleteDialogMessage] = useState<string>('')
     const [nonCascadeDeleteDialog, showNonCascadeDeleteDialog] = useState<boolean>(false)
     const [clusterName, setClusterName] = useState<string>('')
+    const [isDeleteLoading, setIsDeleteLoading] = useState<boolean>(false)
+
     const isGitops = appDetails?.deploymentAppType === DeploymentAppTypes.ARGO
     const isExternalArgo = appDetails.appType === AppType.EXTERNAL_ARGO_APP
     const isExternalFlux = appDetails.appType === AppType.EXTERNAL_FLUX_APP
@@ -150,6 +152,7 @@ const EnvironmentSelectorComponent = ({
 
     async function deleteResourceAction(deleteAction: DELETE_ACTION) {
         try {
+            setIsDeleteLoading(true)
             const response = await getDeleteApplicationApi(deleteAction)
             if (response.result.deleteResponse?.deleteInitiated || (isExternalApp && response.result?.success)) {
                 setShowDeleteConfirmation(false)
@@ -179,6 +182,8 @@ const EnvironmentSelectorComponent = ({
                 showForceDeleteDialog(true)
             }
             showError(error)
+        } finally {
+            setIsDeleteLoading(false)
         }
     }
 
@@ -376,6 +381,7 @@ const EnvironmentSelectorComponent = ({
                                     handleDelete={handleDelete}
                                     toggleConfirmation={setShowDeleteConfirmation}
                                     isCreateValueView={false}
+                                    disableButton={isDeleteLoading}
                                 />
                             )}
                         </div>
@@ -387,6 +393,7 @@ const EnvironmentSelectorComponent = ({
                             subtitle={forceDeleteDialogMessage}
                             onDelete={handleForceDelete}
                             closeConfirmationModal={closeForceConfirmationModal}
+                            isDeleting={isDeleteLoading}
                         />
                     )}
 
@@ -395,6 +402,7 @@ const EnvironmentSelectorComponent = ({
                             clusterName={clusterName}
                             onClickCancel={onClickHideNonCascadeDeletePopup}
                             onClickDelete={onClickNonCascadeDelete}
+                            isDeleting={isDeleteLoading}
                         />
                     )}
                 </div>
diff --git a/src/components/v2/index.tsx b/src/components/v2/index.tsx
diff --git a/src/config/constants.ts b/src/config/constants.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ export interface ClusterDescriptionType {`
`53`	`53`	`clusterCreatedBy: string`
`54`	`54`	`clusterCreatedOn: string`
`55`	`55`	`clusterNote?: ClusterNoteType`
	`56`	`+ catalogSchemaResourceId?: number`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`export interface ClusterNoteType {`
`@@ -261,7 +262,7 @@ export interface DescriptionDataType {`
`261`	`262`	`descriptionUpdatedOn: string`
`262`	`263`	`}`
`263`	`264`
`264`		`-export interface ClusterDetailsType {`
	`265`	`+export interface ClusterDetailsType extends Pick<ClusterDescriptionType, 'catalogSchemaResourceId'> {`
`265`	`266`	`clusterName: string`
`266`	`267`	`shortDescription: string`
`267`	`268`	`serverURL: string`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,6 @@ interface GitMaterial {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`export interface AppMetaInfo extends BaseAppMetaData, Partial<Pick<CreateAppFormStateType, 'templateConfig'>> {`
`110`		`- appId: number`
`111`		`- appName: string`
`112`	`110`	`createdBy: string`
`113`	`111`	`description: string`
`114`	`112`	`createdOn: string`
`@@ -121,6 +119,7 @@ export interface AppMetaInfo extends BaseAppMetaData, Partial<Pick<CreateAppForm`
`121`	`119`	`chartUsed?: ChartUsed`
`122`	`120`	`note?: Note`
`123`	`121`	`gitMaterials?: GitMaterial[]`
	`122`	`+ catalogSchemaResourceId?: number`
`124`	`123`	`}`
`125`	`124`
`126`	`125`	`export interface ArtifactsCiJob {`