Merge pull request #2431 from devtron-labs/fix/helm-chart-deployment-…

…type fix: helm chart deployment type
devtron-labs · Jan 31, 2025 · 8251059 · 8251059
2 parents 09475d2 + 8e4cbd7
commit 8251059
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/components/app/details/appDetails/AppDetails.tsx b/src/components/app/details/appDetails/AppDetails.tsx
@@ -20,7 +20,6 @@ import {
     Progressing,
     noop,
     stopPropagation,
-    multiSelectStyles,
     DeploymentAppTypes,
     useSearchString,
     useAsync,
@@ -53,7 +52,6 @@ import {
     DEFAULT_STATUS_TEXT,
 } from '../../../../config'
 import { NavigationArrow, useAppContext, FragmentHOC } from '../../../common'
-import { groupHeaderStyle, Option } from '../../../v2/common/ReactSelect.utils'
 import { getAppConfigStatus, getAppOtherEnvironmentMin, stopStartApp } from '../../../../services/service'
 import AppNotDeployedIcon from '@Images/app-not-deployed.svg'
 import AppNotConfiguredIcon from '@Images/app-not-configured.png'
@@ -377,6 +375,7 @@ export const Details: React.FC<DetailsType> = ({
     useEffect(
         () => () => {
             clearPollingInterval()
+            clearDeploymentStatusTimer()
             IndexStore.clearAppDetails()
         },
         [],

diff --git a/src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx b/src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx
@@ -434,7 +434,6 @@ export const GitOpsDrawer = ({
                         renderValidationErrorLabel()}
                 </div>
             ) : null}
-            <hr />
         </>
     )
 }

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: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -434,7 +434,6 @@ export const GitOpsDrawer = ({ @@
                             renderValidationErrorLabel()}
                     </div>
                 ) : null}
-                <hr />
             </>
         )
     }
@@ Expand Down @@