Skip to content

Commit c2cc743

Browse files
committed
refactor: clean up unused code and improve null checks in TriggerView components
1 parent 52aa805 commit c2cc743

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

src/components/ApplicationGroup/Details/TriggerView/TriggerResponseModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const TriggerResponseModalBody = ({ responseList, isLoading, isVirtualEnv }: Tri
8181
return <Progressing pageLoader />
8282
}
8383
return (
84-
<div className="response-list-container bg__primary pr-20 pb-16 pl-20 flex-grow-1">
84+
<div className="response-list-container bg__primary pr-20 pb-16 pl-20 flex-grow-1 h-100">
8585
<div
8686
className="dc__position-sticky dc__top-0 bg__primary dc__border-bottom response-row dc__border-bottom pt-24 pb-8"
8787
style={{ zIndex: 1 }}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@ const processConsumedAndApprovedImages = (materials: CDMaterialType[]) => {
246246
!mat.userApprovalMetadata ||
247247
mat.userApprovalMetadata.approvalRuntimeState !== ApprovalRuntimeStateType.approved
248248
) {
249-
// TODO: Check if this is needed
250-
// mat.isSelected = false
251249
consumedImage.push(mat)
252250
} else {
253251
approvedImages.push(mat)

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ const TriggerView = ({ isJobView, filteredEnvIds }: TriggerViewProps) => {
116116
location.search.includes(TRIGGER_VIEW_PARAMS.ROLLBACK_NODE)
117117
) {
118118
const cdNode: CommonNodeAttr = getSelectedNodeFromWorkflows(workflows, location.search)
119-
if (!cdNode.id) {
120-
return null
121-
}
119+
122120
const materialType = location.search.includes(TRIGGER_VIEW_PARAMS.CD_NODE)
123121
? MATERIAL_TYPE.inputMaterialList
124122
: MATERIAL_TYPE.rollbackMaterialList
@@ -128,30 +126,30 @@ const TriggerView = ({ isJobView, filteredEnvIds }: TriggerViewProps) => {
128126
const doesWorkflowContainsWebhook = selectedCINode?.type === 'WEBHOOK'
129127
const configurePluginURL = getCDPipelineURL(
130128
appId,
131-
selectedWorkflow.id,
129+
selectedWorkflow?.id || '0',
132130
doesWorkflowContainsWebhook ? '0' : selectedCINode?.id,
133131
doesWorkflowContainsWebhook,
134-
cdNode.id,
132+
cdNode.id || '0',
135133
true,
136134
)
137135

138136
return (
139137
<DeployImageModal
140138
materialType={materialType}
141139
appId={+appId}
142-
envId={cdNode?.environmentId}
140+
envId={cdNode.environmentId}
143141
appName={currentAppName}
144142
stageType={cdNode.type as DeploymentNodeType}
145-
envName={cdNode?.environmentName}
143+
envName={cdNode.environmentName}
146144
pipelineId={Number(cdNode.id)}
147145
handleClose={revertToPreviousURL}
148146
handleSuccess={reloadWorkflowStatus}
149-
deploymentAppType={cdNode?.deploymentAppType}
147+
deploymentAppType={cdNode.deploymentAppType}
150148
isVirtualEnvironment={cdNode.isVirtualEnvironment}
151-
showPluginWarningBeforeTrigger={cdNode?.showPluginWarning}
152-
consequence={cdNode?.pluginBlockState}
149+
showPluginWarningBeforeTrigger={cdNode.showPluginWarning}
150+
consequence={cdNode.pluginBlockState}
153151
configurePluginURL={configurePluginURL}
154-
isTriggerBlockedDueToPlugin={cdNode?.showPluginWarning && cdNode?.isTriggerBlocked}
152+
isTriggerBlockedDueToPlugin={cdNode.showPluginWarning && cdNode.isTriggerBlocked}
155153
triggerType={cdNode.triggerType}
156154
parentEnvironmentName={cdNode.parentEnvironmentName}
157155
/>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
DeploymentNodeType,
2323
DeploymentWithConfigType,
2424
handleAnalyticsEvent,
25-
showError,
2625
WorkflowType,
2726
} from '@devtron-labs/devtron-fe-common-lib'
2827

@@ -216,7 +215,6 @@ export const getSelectedNodeFromWorkflows = (workflows: WorkflowType[], search:
216215
const { cdNodeId, nodeType } = getNodeIdAndTypeFromSearch(search)
217216

218217
if (!cdNodeId) {
219-
showError('Invalid node id')
220218
return {} as CommonNodeAttr
221219
}
222220

@@ -228,7 +226,6 @@ export const getSelectedNodeFromWorkflows = (workflows: WorkflowType[], search:
228226
return foundNode
229227
}
230228

231-
showError('Invalid node id')
232229
return {} as CommonNodeAttr
233230
}
234231

0 commit comments

Comments
 (0)