fix: use deployment type from service and not app details

arunjaindev · arunjaindev · commit fd2c4bb1e890 · 2025-06-13T19:15:24.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.15.2-beta-1",
+    "version": "1.15.2-beta-2",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx b/src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx
@@ -174,6 +174,7 @@ const DeploymentDetailSteps = ({
                     isVirtualEnvironment={isVirtualEnv.current}
                     appDetails={appDetails}
                     rootClassName="p-20"
+                    deploymentAppType={deploymentStatusDetailsBreakdownData.deploymentAppType}
                 />
             </div>
         )
diff --git a/src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.tsx b/src/Shared/Components/CICDHistory/DeploymentStatusBreakdown.tsx
@@ -30,6 +30,7 @@ const DeploymentStatusDetailBreakdown = ({
     isVirtualEnvironment,
     appDetails,
     rootClassName = '',
+    deploymentAppType,
 }: DeploymentStatusDetailBreakdownType) => {
     const isHelmManifestPushed =
         deploymentStatusDetailsBreakdownData.deploymentStatusBreakdown[
@@ -59,7 +60,8 @@ const DeploymentStatusDetailBreakdown = ({
                     {(
                         [
                             TIMELINE_STATUS.GIT_COMMIT,
-                            ...(deploymentStatusDetailRowProps.appDetails.deploymentAppType === DeploymentAppTypes.FLUX
+                            ...(appDetails.deploymentAppType === DeploymentAppTypes.FLUX ||
+                            deploymentAppType === DeploymentAppTypes.FLUX
                                 ? []
                                 : [TIMELINE_STATUS.ARGOCD_SYNC, TIMELINE_STATUS.KUBECTL_APPLY]),
                         ] as DeploymentStatusDetailRowType['type'][]
diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx
@@ -129,6 +129,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
                                 userApprovalMetadata={userApprovalMetadata}
                                 isGitops={
                                     deploymentAppType === DeploymentAppTypes.GITOPS ||
+                                    deploymentAppType === DeploymentAppTypes.FLUX ||
                                     deploymentAppType === DeploymentAppTypes.MANIFEST_DOWNLOAD ||
                                     deploymentAppType === DeploymentAppTypes.MANIFEST_PUSH
                                 }
diff --git a/src/Shared/Components/CICDHistory/types.tsx b/src/Shared/Components/CICDHistory/types.tsx
@@ -521,6 +521,7 @@ export interface DeploymentStatusDetailBreakdownType {
      */
     appDetails: AppDetails | null
     rootClassName?: string
+    deploymentAppType?: DeploymentAppTypes
 }
 
 export interface DeploymentStatusDetailRowType extends Pick<DeploymentStatusDetailBreakdownType, 'appDetails'> {
diff --git a/src/Shared/Components/DeploymentStatusBreakdown/utils.tsx b/src/Shared/Components/DeploymentStatusBreakdown/utils.tsx
@@ -48,6 +48,7 @@ const getDefaultDeploymentStatusTimeline = (
 
     return {
         deploymentStatus,
+        deploymentAppType,
         deploymentTriggerTime: data?.deploymentStartedOn || '',
         deploymentEndTime: data?.deploymentFinishedOn || '',
         triggeredBy: data?.triggeredBy || '',
diff --git a/src/Shared/types.ts b/src/Shared/types.ts
@@ -1312,6 +1312,7 @@ export interface DeploymentStatusDetailsBreakdownDataType {
         deploymentErrorMessage: string
         nextTimelineToProcess: DeploymentStatusTimelineType
     } | null
+    deploymentAppType: DeploymentAppTypes
 }
 
 export interface IntelligenceConfig {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@devtron-labs/devtron-fe-common-lib",`
`3`		`- "version": "1.15.2-beta-1",`
	`3`	`+ "version": "1.15.2-beta-2",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ const DeploymentDetailSteps = ({`
`174`	`174`	`isVirtualEnvironment={isVirtualEnv.current}`
`175`	`175`	`appDetails={appDetails}`
`176`	`176`	`rootClassName="p-20"`
	`177`	`+ deploymentAppType={deploymentStatusDetailsBreakdownData.deploymentAppType}`
`177`	`178`	`/>`
`178`	`179`	`</div>`
`179`	`180`	`)`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({`
`129`	`129`	`userApprovalMetadata={userApprovalMetadata}`
`130`	`130`	`isGitops={`
`131`	`131`	`deploymentAppType === DeploymentAppTypes.GITOPS \|\|`
	`132`	`+ deploymentAppType === DeploymentAppTypes.FLUX \|\|`
`132`	`133`	`deploymentAppType === DeploymentAppTypes.MANIFEST_DOWNLOAD \|\|`
`133`	`134`	`deploymentAppType === DeploymentAppTypes.MANIFEST_PUSH`
`134`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,7 @@ export interface DeploymentStatusDetailBreakdownType {`
`521`	`521`	`*/`
`522`	`522`	`appDetails: AppDetails \| null`
`523`	`523`	`rootClassName?: string`
	`524`	`+ deploymentAppType?: DeploymentAppTypes`
`524`	`525`	`}`
`525`	`526`
`526`	`527`	`export interface DeploymentStatusDetailRowType extends Pick<DeploymentStatusDetailBreakdownType, 'appDetails'> {`
Original file line number	Diff line number	Diff line change
`@@ -1312,6 +1312,7 @@ export interface DeploymentStatusDetailsBreakdownDataType {`
`1312`	`1312`	`deploymentErrorMessage: string`
`1313`	`1313`	`nextTimelineToProcess: DeploymentStatusTimelineType`
`1314`	`1314`	`} \| null`
	`1315`	`+ deploymentAppType: DeploymentAppTypes`
`1315`	`1316`	`}`
`1316`	`1317`
`1317`	`1318`	`export interface IntelligenceConfig {`