Skip to content

Commit e2e8e95

Browse files
committed
Add isTriggerView prop to CDMaterial component and update usage in EnvTriggerView
1 parent df3ec04 commit e2e8e95

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,7 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
756756
workflows={filteredWorkflows}
757757
handleClose={revertToPreviousURL}
758758
handleSuccess={getWorkflowStatusData}
759+
isTriggerView={false}
759760
/>
760761
{renderBulkCDMaterial()}
761762
{renderBulkCIMaterial()}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ import { useLocation } from 'react-router-dom'
22

33
import { DeploymentNodeType } from '@devtron-labs/devtron-fe-common-lib'
44

5-
import { getCDPipelineURL } from '@Components/common'
5+
import { getCDPipelineURL, useAppContext } from '@Components/common'
66

77
import { TRIGGER_VIEW_PARAMS } from './Constants'
88
import { DeployImageModal } from './DeployImageModal'
99
import { getSelectedNodeFromWorkflows } from './TriggerView.utils'
1010
import { CDMaterialProps, MATERIAL_TYPE } from './types'
1111

12-
const CDMaterial = ({ workflows, handleClose, handleSuccess }: CDMaterialProps) => {
12+
const CDMaterial = ({ workflows, handleClose, handleSuccess, isTriggerView }: CDMaterialProps) => {
1313
const location = useLocation()
14+
const { currentAppName: triggerViewAppName } = useAppContext()
1415

1516
if (
1617
location.search.includes(TRIGGER_VIEW_PARAMS.CD_NODE) ||
@@ -42,7 +43,7 @@ const CDMaterial = ({ workflows, handleClose, handleSuccess }: CDMaterialProps)
4243
materialType={materialType}
4344
appId={appId}
4445
envId={cdNode.environmentId}
45-
appName={selectedWorkflow?.name ?? ''}
46+
appName={isTriggerView ? triggerViewAppName : selectedWorkflow?.name ?? ''}
4647
stageType={cdNode.type as DeploymentNodeType}
4748
envName={cdNode.environmentName}
4849
pipelineId={Number(cdNodeId)}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ const TriggerView = ({ isJobView, filteredEnvIds }: TriggerViewProps) => {
224224
workflows={workflows}
225225
handleClose={revertToPreviousURL}
226226
handleSuccess={reloadWorkflowStatus}
227+
isTriggerView
227228
/>
228229
{renderApprovalMaterial()}
229230
</div>

src/components/app/details/triggerView/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,4 +583,5 @@ export interface GetCDNodeSearchParams {
583583

584584
export interface CDMaterialProps extends Pick<DeployImageModalProps, 'handleClose' | 'handleSuccess'> {
585585
workflows: WorkflowType[]
586+
isTriggerView: boolean
586587
}

0 commit comments

Comments
 (0)