1
1
import { useLocation } from 'react-router-dom'
2
2
3
- import { CommonNodeAttr , DeploymentNodeType } from '@devtron-labs/devtron-fe-common-lib'
3
+ import { DeploymentNodeType } from '@devtron-labs/devtron-fe-common-lib'
4
4
5
5
import { getCDPipelineURL } from '@Components/common'
6
6
@@ -16,17 +16,17 @@ const CDMaterial = ({ workflows, handleClose, handleSuccess }: CDMaterialProps)
16
16
location . search . includes ( TRIGGER_VIEW_PARAMS . CD_NODE ) ||
17
17
location . search . includes ( TRIGGER_VIEW_PARAMS . ROLLBACK_NODE )
18
18
) {
19
- const cdNode : CommonNodeAttr = getSelectedNodeFromWorkflows ( workflows , location . search )
19
+ const { node : cdNode , cdNodeId } = getSelectedNodeFromWorkflows ( workflows , location . search )
20
20
21
21
const materialType = location . search . includes ( TRIGGER_VIEW_PARAMS . CD_NODE )
22
22
? MATERIAL_TYPE . inputMaterialList
23
23
: MATERIAL_TYPE . rollbackMaterialList
24
24
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 ) )
26
26
const selectedCINode = selectedWorkflow ?. nodes . find ( ( node ) => node . type === 'CI' || node . type === 'WEBHOOK' )
27
27
const doesWorkflowContainsWebhook = selectedCINode ?. type === 'WEBHOOK'
28
28
29
- const { appId } = selectedWorkflow
29
+ const appId = selectedWorkflow ?. appId ?? 0
30
30
31
31
const configurePluginURL = getCDPipelineURL (
32
32
String ( appId ) ,
@@ -40,12 +40,12 @@ const CDMaterial = ({ workflows, handleClose, handleSuccess }: CDMaterialProps)
40
40
return (
41
41
< DeployImageModal
42
42
materialType = { materialType }
43
- appId = { + appId }
43
+ appId = { appId }
44
44
envId = { cdNode . environmentId }
45
- appName = { selectedWorkflow . name }
45
+ appName = { selectedWorkflow ? .name ?? '' }
46
46
stageType = { cdNode . type as DeploymentNodeType }
47
47
envName = { cdNode . environmentName }
48
- pipelineId = { Number ( cdNode . id ) }
48
+ pipelineId = { Number ( cdNodeId ) }
49
49
handleClose = { handleClose }
50
50
handleSuccess = { handleSuccess }
51
51
deploymentAppType = { cdNode . deploymentAppType }
0 commit comments