feat: refactor trigger ID handling in EnvCDDetails and CDDetails components for improved clarity and maintainability

Author: AbhishekA1509

src/components/ApplicationGroup/Details/EnvCDDetails/EnvCDDetails.tsx

@@ -49,6 +49,7 @@ import { APP_GROUP_CD_DETAILS } from '../../../../config/constantMessaging'
 import '../../../app/details/appDetails/appDetails.scss'
 import '../../../app/details/cdDetails/cdDetail.scss'
 import {
+    getUpdatedTriggerId,
     processVirtualEnvironmentDeploymentData,
     renderCIListHeader,
     renderDeploymentApprovalInfo,
@@ -131,26 +132,9 @@ export default function EnvCDDetails({ filteredAppIds }: AppGroupDetailDefaultTy
         setHasMore(cdWorkflows.length === pagination.size)
         setHasMoreLoading(cdWorkflows.length === pagination.size)
 
-        let triggerIdToSet = cdWorkflows[0].id
         const queryString = new URLSearchParams(location.search)
         const queryParam = queryString.get('type')
-
-        if (
-            queryParam === STAGE_TYPE.PRECD ||
-            queryParam === STAGE_TYPE.POSTCD ||
-            queryParam === DeploymentNodeType.CD
-        ) {
-            const deploymentStageTypeForPrePostCD =
-                queryParam === STAGE_TYPE.PRECD ? DeploymentStageType.PRE : DeploymentStageType.POST
-            const deploymentStageType =
-                queryParam === DeploymentNodeType.CD ? DeploymentStageType.DEPLOY : deploymentStageTypeForPrePostCD
-
-            const triggeredHistoryResult = cdWorkflows.find((obj) => obj.stage === deploymentStageType)
-
-            if (triggeredHistoryResult) {
-                triggerIdToSet = triggeredHistoryResult.id
-            }
-        }
+        const triggerIdToSet = getUpdatedTriggerId(cdWorkflows[0].id, queryParam, cdWorkflows)
 
         if (!triggerId && appId && pipelineId) {
             replace(

src/components/app/details/cdDetails/CDDetails.tsx

@@ -48,6 +48,7 @@ import './cdDetail.scss'
 import { getModuleConfigured } from '../appDetails/appDetails.service'
 import { EMPTY_STATE_STATUS } from '../../../../config/constantMessaging'
 import {
+    getUpdatedTriggerId,
     processVirtualEnvironmentDeploymentData,
     renderCIListHeader,
     renderDeploymentApprovalInfo,
@@ -118,26 +119,15 @@ export default function CDDetails({ filteredEnvIds }: { filteredEnvIds: string }
             setHasMore(true)
             setHasMoreLoading(true)
         }
-        let _triggerId = deploymentHistoryResult.result?.cdWorkflows?.[0]?.id
+
         const queryString = new URLSearchParams(location.search)
         const queryParam = queryString.get('type')
-        if (
-            queryParam === STAGE_TYPE.PRECD ||
-            queryParam === STAGE_TYPE.POSTCD ||
-            queryParam === DeploymentNodeType.CD
-        ) {
-            const deploymentStageTypeForPrePostCD =
-                queryParam === STAGE_TYPE.PRECD ? DeploymentStageType.PRE : DeploymentStageType.POST
-            const deploymentStageType =
-                queryParam === DeploymentNodeType.CD ? DeploymentStageType.DEPLOY : deploymentStageTypeForPrePostCD
+        const _triggerId = getUpdatedTriggerId(
+            deploymentHistoryResult.result?.cdWorkflows?.[0]?.id,
+            queryParam,
+            deploymentHistoryResult.result?.cdWorkflows,
+        )
 
-            const requiredResult = deploymentHistoryResult.result?.cdWorkflows?.filter((obj) => {
-                return obj.stage === deploymentStageType
-            })
-            if (requiredResult?.[0]) {
-                _triggerId = requiredResult[0].id
-            }
-        }
         const newTriggerHistory = (deploymentHistoryResult.result?.cdWorkflows || []).reduce((agg, curr) => {
             agg.set(curr.id, curr)
             return agg

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

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { DeploymentNodeType, DeploymentStageType, History, STAGE_TYPE } from '@devtron-labs/devtron-fe-common-lib'
+
 import { importComponentFromFELibrary } from '../../../common'
 
 export const renderCIListHeader = importComponentFromFELibrary('renderCIListHeader', null, 'function')
@@ -45,3 +47,19 @@ export const processVirtualEnvironmentDeploymentData = importComponentFromFELibr
 export const renderRunSource = importComponentFromFELibrary('renderRunSource', null, 'function')
 
 export const renderRunSourceInDropdown = importComponentFromFELibrary('renderRunSourceInDropdown', null, 'function')
+
+export const getUpdatedTriggerId = (initialTriggerId: number, queryParam: string, cdWorkflows: History[]): number => {
+    if (queryParam === STAGE_TYPE.PRECD || queryParam === STAGE_TYPE.POSTCD || queryParam === DeploymentNodeType.CD) {
+        const deploymentStageTypeForPrePostCD =
+            queryParam === STAGE_TYPE.PRECD ? DeploymentStageType.PRE : DeploymentStageType.POST
+        const deploymentStageType =
+            queryParam === DeploymentNodeType.CD ? DeploymentStageType.DEPLOY : deploymentStageTypeForPrePostCD
+
+        const requiredResult = cdWorkflows?.filter((obj) => obj.stage === deploymentStageType)
+        if (requiredResult?.[0]) {
+            return requiredResult[0].id
+        }
+    }
+
+    return initialTriggerId
+}