Skip to content

Commit 3e8be4b

Browse files
committed
chore: use pipeline id from url
1 parent 25529ef commit 3e8be4b

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

src/components/app/details/triggerView/CDMaterial.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useLocation } from 'react-router-dom'
22

3-
import { CommonNodeAttr, DeploymentNodeType } from '@devtron-labs/devtron-fe-common-lib'
3+
import { DeploymentNodeType } from '@devtron-labs/devtron-fe-common-lib'
44

55
import { getCDPipelineURL } from '@Components/common'
66

@@ -16,17 +16,17 @@ const CDMaterial = ({ workflows, handleClose, handleSuccess }: CDMaterialProps)
1616
location.search.includes(TRIGGER_VIEW_PARAMS.CD_NODE) ||
1717
location.search.includes(TRIGGER_VIEW_PARAMS.ROLLBACK_NODE)
1818
) {
19-
const cdNode: CommonNodeAttr = getSelectedNodeFromWorkflows(workflows, location.search)
19+
const { node: cdNode, cdNodeId } = getSelectedNodeFromWorkflows(workflows, location.search)
2020

2121
const materialType = location.search.includes(TRIGGER_VIEW_PARAMS.CD_NODE)
2222
? MATERIAL_TYPE.inputMaterialList
2323
: MATERIAL_TYPE.rollbackMaterialList
2424

25-
const selectedWorkflow = workflows.find((wf) => wf.nodes.some((node) => node.id === cdNode.id))
25+
const selectedWorkflow = workflows.find((wf) => wf.nodes.some((node) => node.id === cdNodeId))
2626
const selectedCINode = selectedWorkflow?.nodes.find((node) => node.type === 'CI' || node.type === 'WEBHOOK')
2727
const doesWorkflowContainsWebhook = selectedCINode?.type === 'WEBHOOK'
2828

29-
const { appId } = selectedWorkflow
29+
const appId = selectedWorkflow?.appId ?? 0
3030

3131
const configurePluginURL = getCDPipelineURL(
3232
String(appId),
@@ -40,12 +40,12 @@ const CDMaterial = ({ workflows, handleClose, handleSuccess }: CDMaterialProps)
4040
return (
4141
<DeployImageModal
4242
materialType={materialType}
43-
appId={+appId}
43+
appId={appId}
4444
envId={cdNode.environmentId}
45-
appName={selectedWorkflow.name}
45+
appName={selectedWorkflow?.name ?? ''}
4646
stageType={cdNode.type as DeploymentNodeType}
4747
envName={cdNode.environmentName}
48-
pipelineId={Number(cdNode.id)}
48+
pipelineId={Number(cdNodeId)}
4949
handleClose={handleClose}
5050
handleSuccess={handleSuccess}
5151
deploymentAppType={cdNode.deploymentAppType}

src/components/app/details/triggerView/TriggerView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const TriggerView = ({ isJobView, filteredEnvIds }: TriggerViewProps) => {
101101

102102
const renderApprovalMaterial = () => {
103103
if (ApprovalMaterialModal && location.search.includes(TRIGGER_VIEW_PARAMS.APPROVAL_NODE)) {
104-
const node = getSelectedNodeFromWorkflows(workflows, location.search)
104+
const { node, cdNodeId } = getSelectedNodeFromWorkflows(workflows, location.search)
105105

106106
return (
107107
<ApprovalMaterialModal
@@ -111,7 +111,7 @@ const TriggerView = ({ isJobView, filteredEnvIds }: TriggerViewProps) => {
111111
stageType={node?.type}
112112
closeApprovalModal={closeApprovalModal}
113113
appId={+appId}
114-
pipelineId={node?.id}
114+
pipelineId={cdNodeId}
115115
getModuleInfo={getModuleInfo}
116116
ciPipelineId={node?.connectingCiPipelineId}
117117
history={history}

src/components/app/details/triggerView/TriggerView.utils.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,10 @@ export const getNodeIdAndTypeFromSearch = (search: string) => {
211211
return { cdNodeId, nodeType }
212212
}
213213

214-
export const getSelectedNodeFromWorkflows = (workflows: WorkflowType[], search: string): CommonNodeAttr => {
214+
export const getSelectedNodeFromWorkflows = (
215+
workflows: WorkflowType[],
216+
search: string,
217+
): { cdNodeId: string; node: CommonNodeAttr } => {
215218
const { cdNodeId, nodeType } = getNodeIdAndTypeFromSearch(search)
216219

217220
if (cdNodeId) {
@@ -220,11 +223,11 @@ export const getSelectedNodeFromWorkflows = (workflows: WorkflowType[], search:
220223
const foundNode = allNodes.find((n) => cdNodeId === n.id && n.type === nodeType)
221224

222225
if (foundNode) {
223-
return foundNode
226+
return { cdNodeId, node: foundNode }
224227
}
225228
}
226229

227-
return {} as CommonNodeAttr
230+
return { cdNodeId: cdNodeId ?? '0', node: {} as CommonNodeAttr }
228231
}
229232

230233
export const getCDNodeActionSearch = ({

0 commit comments

Comments
 (0)