Skip to content

Commit e9424cc

Browse files
Merge pull request #1525 from devtron-labs/fix/argo-cd-legacy-deployment
fix: legacy deployments argo cd timeline status
2 parents d131388 + 75e60e5 commit e9424cc

File tree

1 file changed

+6
-6
lines changed
  • src/components/app/details/appDetails

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,12 @@ export const processDeploymentStatusDetailsData = (
519519
}
520520
deploymentData.deploymentError = `Below resources did not become healthy within 10 mins. Resource status shown below was last fetched ${lastFetchedTime}. ${data.statusFetchCount} retries failed.`
521521
} else if (element['status'].includes(TIMELINE_STATUS.KUBECTL_APPLY)) {
522+
if (!isArgoCDAvailable) {
523+
deploymentData.deploymentStatusBreakdown.ARGOCD_SYNC.icon = 'success'
524+
deploymentData.deploymentStatusBreakdown.ARGOCD_SYNC.displaySubText = ''
525+
deploymentData.deploymentStatusBreakdown.ARGOCD_SYNC.time = element['statusTime']
526+
}
527+
522528
if (element?.resourceDetails) {
523529
deploymentPhases.forEach((phase) => {
524530
for (let item of element.resourceDetails) {
@@ -586,12 +592,6 @@ export const processDeploymentStatusDetailsData = (
586592
}
587593
})
588594
}
589-
590-
if (!isArgoCDAvailable) {
591-
deploymentData.deploymentStatusBreakdown.ARGOCD_SYNC.icon = 'success'
592-
deploymentData.deploymentStatusBreakdown.ARGOCD_SYNC.displaySubText = ''
593-
deploymentData.deploymentStatusBreakdown.ARGOCD_SYNC.time = element['statusTime']
594-
}
595595
} else if (element['status'] === TIMELINE_STATUS.KUBECTL_APPLY_SYNCED) {
596596
deploymentData.deploymentStatusBreakdown.KUBECTL_APPLY.resourceDetails = []
597597
deploymentData.deploymentStatusBreakdown.KUBECTL_APPLY.displaySubText = ''

0 commit comments

Comments
 (0)