From 6829c54c87d7e5af7d1171f0677b0fc4059b91ea Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 2 May 2025 16:53:19 +0530 Subject: [PATCH 1/5] feat: enhance deployment workflow by adding CD workflow type determination --- .../Components/CICDHistory/TriggerOutput.tsx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx index 4371257a8..c1ae601cb 100644 --- a/src/Shared/Components/CICDHistory/TriggerOutput.tsx +++ b/src/Shared/Components/CICDHistory/TriggerOutput.tsx @@ -27,6 +27,7 @@ import { URLS, ServerError, mapByKey, + DeploymentNodeType, } from '../../../Common' import { FetchIdDataStatus, @@ -44,7 +45,7 @@ import { DeploymentHistoryConfigDiff } from './DeploymentHistoryConfigDiff' import { GitChanges, Scroller } from './History.components' import Artifacts from './Artifacts' import TriggerDetails from './TriggerDetails' -import { EMPTY_STATE_STATUS } from '../../constants' +import { DeploymentStageType, EMPTY_STATE_STATUS } from '../../constants' import './cicdHistory.scss' const HistoryLogs: React.FC = ({ @@ -82,11 +83,24 @@ const HistoryLogs: React.FC = ({ envId: string }>() + const getCDWorkflowType = () => { + if (triggerDetails.stage === DeploymentStageType.PRE) { + return DeploymentNodeType.PRECD + } + + if (triggerDetails.stage === DeploymentStageType.POST) { + return DeploymentNodeType.POSTCD + } + + return DeploymentNodeType.CD + } + const paramsData = { appId, envId, appName: `${triggerDetails.helmPackageName}.tgz`, workflowId: triggerDetails.id, + cdWorkflowType: getCDWorkflowType(), } const CDBuildReportUrl = `app/cd-pipeline/workflow/download/${appId}/${envId}/${pipelineId}/${triggerId}` From 5ce936cb1b41642d051468f25d8b9118ab458de0 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 2 May 2025 17:15:03 +0530 Subject: [PATCH 2/5] feat: introduce deployment stage to node mapping for improved workflow handling --- .../Components/CICDHistory/TriggerOutput.tsx | 17 ++--------------- src/Shared/constants.tsx | 8 +++++++- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx index c1ae601cb..6d06a9cc2 100644 --- a/src/Shared/Components/CICDHistory/TriggerOutput.tsx +++ b/src/Shared/Components/CICDHistory/TriggerOutput.tsx @@ -27,7 +27,6 @@ import { URLS, ServerError, mapByKey, - DeploymentNodeType, } from '../../../Common' import { FetchIdDataStatus, @@ -45,7 +44,7 @@ import { DeploymentHistoryConfigDiff } from './DeploymentHistoryConfigDiff' import { GitChanges, Scroller } from './History.components' import Artifacts from './Artifacts' import TriggerDetails from './TriggerDetails' -import { DeploymentStageType, EMPTY_STATE_STATUS } from '../../constants' +import { DEPLOYMENT_STAGE_TO_NODE_MAP, EMPTY_STATE_STATUS } from '../../constants' import './cicdHistory.scss' const HistoryLogs: React.FC = ({ @@ -83,24 +82,12 @@ const HistoryLogs: React.FC = ({ envId: string }>() - const getCDWorkflowType = () => { - if (triggerDetails.stage === DeploymentStageType.PRE) { - return DeploymentNodeType.PRECD - } - - if (triggerDetails.stage === DeploymentStageType.POST) { - return DeploymentNodeType.POSTCD - } - - return DeploymentNodeType.CD - } - const paramsData = { appId, envId, appName: `${triggerDetails.helmPackageName}.tgz`, workflowId: triggerDetails.id, - cdWorkflowType: getCDWorkflowType(), + cdWorkflowType: DEPLOYMENT_STAGE_TO_NODE_MAP[triggerDetails.stage], } const CDBuildReportUrl = `app/cd-pipeline/workflow/download/${appId}/${envId}/${pipelineId}/${triggerId}` diff --git a/src/Shared/constants.tsx b/src/Shared/constants.tsx index fe2f49683..be57e588b 100644 --- a/src/Shared/constants.tsx +++ b/src/Shared/constants.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { OptionType } from '@Common/Types' +import { DeploymentNodeType, OptionType } from '@Common/Types' import { CDMaterialSidebarType, ConfigKeysWithLockType, ConfigurationType } from './types' export const ARTIFACT_STATUS = { @@ -537,3 +537,9 @@ export const Routes = { export const ENTERPRISE_SUPPORT_LINK = 'enterprise@devtron.ai' export const INVALID_LICENSE_KEY = 'inValid' + +export const DEPLOYMENT_STAGE_TO_NODE_MAP: Readonly> = { + [DeploymentStageType.DEPLOY]: DeploymentNodeType.CD, + [DeploymentStageType.POST]: DeploymentNodeType.POSTCD, + [DeploymentStageType.PRE]: DeploymentNodeType.PRECD, +} From ccfb8be16a6c43f6a4b3bf4f591affae5c78c9ff Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 2 May 2025 17:37:59 +0530 Subject: [PATCH 3/5] fix: correct appName assignment in TriggerOutput component for accurate deployment details --- src/Shared/Components/CICDHistory/TriggerOutput.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/Components/CICDHistory/TriggerOutput.tsx b/src/Shared/Components/CICDHistory/TriggerOutput.tsx index 6d06a9cc2..8ec54e94d 100644 --- a/src/Shared/Components/CICDHistory/TriggerOutput.tsx +++ b/src/Shared/Components/CICDHistory/TriggerOutput.tsx @@ -85,7 +85,7 @@ const HistoryLogs: React.FC = ({ const paramsData = { appId, envId, - appName: `${triggerDetails.helmPackageName}.tgz`, + appName: triggerDetails.helmPackageName, workflowId: triggerDetails.id, cdWorkflowType: DEPLOYMENT_STAGE_TO_NODE_MAP[triggerDetails.stage], } From 0032b0e4d4f528b27e6ffa251bdd5a61438f62cc Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 6 May 2025 16:11:06 +0530 Subject: [PATCH 4/5] chore: bump version to 1.10.0-patch-8-ng in package.json and package-lock.json --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72fbaba6f..5f3dfc019 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.10.0-patch-7-ng", + "version": "1.10.0-patch-8-ng", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.10.0-patch-7-ng", + "version": "1.10.0-patch-8-ng", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 470722e11..005bbdc26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.10.0-patch-7-ng", + "version": "1.10.0-patch-8-ng", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 8204b00ebfff83156174a3c218f6e21f5c882caf Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 6 May 2025 16:42:46 +0530 Subject: [PATCH 5/5] chore: bump version to 1.12.0-pre-7 in package.json and package-lock.json --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 99503cd04..6e7eb0d65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-6", + "version": "1.12.0-pre-7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-6", + "version": "1.12.0-pre-7", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 5e737b1ae..4e67a8f7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.12.0-pre-6", + "version": "1.12.0-pre-7", "description": "Supporting common component library", "type": "module", "main": "dist/index.js",