Merge pull request #2432 from devtron-labs/fix/show-timeline-poll

fix: helm chart deployment type
devtron-labs · Jan 31, 2025 · be0182c · be0182c
2 parents 0ce3a3e + 848d00c
commit be0182c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/components/app/details/appDetails/AppDetails.tsx b/src/components/app/details/appDetails/AppDetails.tsx
@@ -392,10 +392,14 @@ export const Details: React.FC<DetailsType> = ({
         ],
     )
 
-    useEffect(() => () => {
-        clearPollingInterval()
-        IndexStore.clearAppDetails()
-    }, [])
+    useEffect(
+        () => () => {
+            clearPollingInterval()
+            clearDeploymentStatusTimer()
+            IndexStore.clearAppDetails()
+        },
+        [],
+    )
 
     useEffect(() => {
         appDetailsAbortRef.current = new AbortController()
@@ -409,8 +413,11 @@ export const Details: React.FC<DetailsType> = ({
             if (setIsAppDeleted) {
                 setIsAppDeleted(true)
             }
-            // NOTE: BE sends  string representation of 7000 instead of number 7000 
-            if (getIsRequestAborted(error) || (error instanceof ServerErrors && String(error.errors?.[0]?.code ?? '') === "7000")) {
+            // NOTE: BE sends  string representation of 7000 instead of number 7000
+            if (
+                getIsRequestAborted(error) ||
+                (error instanceof ServerErrors && String(error.errors?.[0]?.code ?? '') === '7000')
+            ) {
                 setResourceTreeFetchTimeOut(true)
             } else {
                 setResourceTreeFetchTimeOut(false)

diff --git a/src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts b/src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
@@ -80,7 +80,7 @@ export const initState = (
         invalidProject: false,
         formValidationError: {},
         showNoGitOpsWarning: false,
-        deploymentAppType: deploymentAppType ?? DeploymentAppTypes.HELM,
+        deploymentAppType: deploymentAppType ?? window._env_.HIDE_GITOPS_OR_HELM_OPTION ? '' : DeploymentAppTypes.HELM,
         gitRepoURL: '',
         authMode: null,
         initialChartVersionValues: {