Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/tree-view

Author: AbhishekA1509

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.16.0-pre-10",
+        "@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",

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)}
                             />

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 = () => {

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 {

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>
             )

src/components/common/navigation/NavigationRoutes.tsx

@@ -149,6 +149,8 @@ const NavigationRoutes = ({ reloadVersionConfig }: Readonly<NavigationRoutesType
     const showCloseButtonAfterGettingStartedClicked = () => {
         setHelpGettingStartedClicked(true)
     }
+    // We use this to determine if we can show resource recommender, since we do not allow users to feed prometheus url if grafana module is not installed
+    const [isGrafanaModuleInstalled, setIsGrafanaModuleInstalled] = useState(false)
     const [environmentId, setEnvironmentId] = useState(null)
     const contextValue = useMemo(() => ({ environmentId, setEnvironmentId }), [environmentId])
 
@@ -387,17 +389,21 @@ const NavigationRoutes = ({ reloadVersionConfig }: Readonly<NavigationRoutesType
         }
     }
 
+    const getGrafanaModuleStatus = () => getModuleInfo(ModuleNameMap.GRAFANA)
+
     const handleFetchInitialData = async () => {
         try {
-            const [serverModeResponse, environmentDataResponse] = await Promise.all([
+            const [serverModeResponse, environmentDataResponse, grafanaModuleStatus] = await Promise.all([
                 getServerMode(),
                 getEnvironmentDataValues(),
+                getGrafanaModuleStatus(),
                 getCurrentServerInfo(),
                 handleFetchUserPreferences(),
             ])
 
             await getInit(serverModeResponse)
 
+            setIsGrafanaModuleInstalled(grafanaModuleStatus?.result?.status === ModuleStatus.INSTALLED)
             setEnvironmentDataState({
                 isAirgapped: environmentDataResponse.isAirGapEnvironment,
                 isManifestScanningEnabled: environmentDataResponse.isManifestScanningEnabled,
@@ -663,7 +669,8 @@ const NavigationRoutes = ({ reloadVersionConfig }: Readonly<NavigationRoutesType
                 setSidePanelConfig,
                 isEnterprise: currentServerInfo?.serverInfo?.installationType === InstallationType.ENTERPRISE,
                 isFELibAvailable: !!isFELibAvailable,
-                isResourceRecommendationEnabled: environmentDataState.isResourceRecommendationEnabled,
+                isResourceRecommendationEnabled:
+                    isGrafanaModuleInstalled && environmentDataState.isResourceRecommendationEnabled,
             }}
         >
             <ConfirmationModalProvider>

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-10":
-  version: 1.16.0-pre-10
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.16.0-pre-10"
+"@devtron-labs/devtron-fe-common-lib@npm:1.17.0-pre-0":
+  version: 1.17.0-pre-0
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.17.0-pre-0"
   dependencies:
     "@codemirror/autocomplete": "npm:6.18.6"
     "@codemirror/lang-json": "npm:6.0.1"
@@ -1773,7 +1773,7 @@ __metadata:
     react-select: 5.8.0
     rxjs: ^7.8.1
     yaml: ^2.4.1
-  checksum: 10c0/b02939d8adb7ec1cadf11076ef195a6a2a80c91ca215b3ae298e8a43105e8dc5419fbe3e064ff8b63b7df6f2e1c922a5e119ea23d575c522ec26c30edd2b40d0
+  checksum: 10c0/b73859860e959e79fcc358de6611c6a3501cd35c8fd7ea743f488e9f89bc605abb4e691f2f52c709c434d12b65fda3bd42e4b216b061378e0ebee61af25e7b75
   languageName: node
   linkType: hard
 
@@ -5685,7 +5685,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dashboard@workspace:."
   dependencies:
-    "@devtron-labs/devtron-fe-common-lib": "npm:1.16.0-pre-10"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.17.0-pre-0"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"