Skip to content

Commit be0182c

Browse files
authored
Merge pull request #2432 from devtron-labs/fix/show-timeline-poll
fix: helm chart deployment type
2 parents 0ce3a3e + 848d00c commit be0182c

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

src/components/app/details/appDetails/AppDetails.tsx

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,14 @@ export const Details: React.FC<DetailsType> = ({
392392
],
393393
)
394394

395-
useEffect(() => () => {
396-
clearPollingInterval()
397-
IndexStore.clearAppDetails()
398-
}, [])
395+
useEffect(
396+
() => () => {
397+
clearPollingInterval()
398+
clearDeploymentStatusTimer()
399+
IndexStore.clearAppDetails()
400+
},
401+
[],
402+
)
399403

400404
useEffect(() => {
401405
appDetailsAbortRef.current = new AbortController()
@@ -409,8 +413,11 @@ export const Details: React.FC<DetailsType> = ({
409413
if (setIsAppDeleted) {
410414
setIsAppDeleted(true)
411415
}
412-
// NOTE: BE sends string representation of 7000 instead of number 7000
413-
if (getIsRequestAborted(error) || (error instanceof ServerErrors && String(error.errors?.[0]?.code ?? '') === "7000")) {
416+
// NOTE: BE sends string representation of 7000 instead of number 7000
417+
if (
418+
getIsRequestAborted(error) ||
419+
(error instanceof ServerErrors && String(error.errors?.[0]?.code ?? '') === '7000')
420+
) {
414421
setResourceTreeFetchTimeOut(true)
415422
} else {
416423
setResourceTreeFetchTimeOut(false)

src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export const initState = (
8080
invalidProject: false,
8181
formValidationError: {},
8282
showNoGitOpsWarning: false,
83-
deploymentAppType: deploymentAppType ?? DeploymentAppTypes.HELM,
83+
deploymentAppType: deploymentAppType ?? window._env_.HIDE_GITOPS_OR_HELM_OPTION ? '' : DeploymentAppTypes.HELM,
8484
gitRepoURL: '',
8585
authMode: null,
8686
initialChartVersionValues: {

0 commit comments

Comments
 (0)