Skip to content

Commit 6c7807a

Browse files
committed
fix: DeploymentHistory - incorrect runSource in deployments dropdown
1 parent 3b41a3d commit 6c7807a

File tree

6 files changed

+10
-13
lines changed

6 files changed

+10
-13
lines changed

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiff.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export const DeploymentHistoryConfigDiff = ({
2929
wfrId,
3030
triggerHistory,
3131
setFullScreenView,
32-
runSource,
3332
resourceId,
3433
renderRunSource,
3534
}: DeploymentHistoryConfigDiffProps) => {
@@ -167,7 +166,7 @@ export const DeploymentHistoryConfigDiff = ({
167166
setFullScreenView={setFullScreenView}
168167
convertVariables={convertVariables}
169168
setConvertVariables={setConvertVariables}
170-
runSource={runSource}
169+
triggerHistory={triggerHistory}
171170
resourceId={resourceId}
172171
renderRunSource={renderRunSource}
173172
hideDiffState={hideDiffState}

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiffCompare.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const DeploymentHistoryConfigDiffCompare = ({
2626
previousWfrId,
2727
convertVariables,
2828
setConvertVariables,
29-
runSource,
29+
triggerHistory,
3030
renderRunSource,
3131
resourceId,
3232
isCompareDeploymentConfigNotAvailable,
@@ -60,7 +60,7 @@ export const DeploymentHistoryConfigDiffCompare = ({
6060
const { currentDeployment, pipelineDeploymentsOptions } = getPipelineDeploymentsOptions({
6161
pipelineDeployments,
6262
wfrId,
63-
runSource,
63+
triggerHistory,
6464
renderRunSource,
6565
resourceId,
6666
})

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/helpers.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ export const renderPipelineDeploymentOptionDescription = ({
7676
renderRunSource,
7777
resourceId,
7878
runSource,
79-
}: Pick<History, 'triggeredBy' | 'triggeredByEmail' | 'artifact' | 'stage'> &
80-
Pick<DeploymentHistoryConfigDiffProps, 'renderRunSource' | 'resourceId' | 'runSource'>) => (
79+
}: Pick<History, 'triggeredBy' | 'triggeredByEmail' | 'artifact' | 'stage' | 'runSource'> &
80+
Pick<DeploymentHistoryConfigDiffProps, 'renderRunSource' | 'resourceId'>) => (
8181
<div className="flexbox-col dc__gap-4">
8282
<p className="m-0 fs-12 lh-20 cn-7 flex left dc__gap-4">
8383
<span className="dc__capitalize">{stage}</span>

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/types.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ import { Dispatch, SetStateAction } from 'react'
33
import { DeploymentConfigDiffProps } from '@Shared/Components/DeploymentConfigDiff'
44
import { EnvResourceType } from '@Shared/Services'
55

6-
import { History, HistoryLogsProps, RunSourceType } from '../types'
6+
import { History, HistoryLogsProps } from '../types'
77

88
export interface DeploymentHistoryConfigDiffProps
99
extends Required<Pick<HistoryLogsProps, 'renderRunSource' | 'resourceId'>> {
1010
appName: string
1111
envName: string
1212
pipelineId: number
1313
wfrId: number
14-
runSource: RunSourceType
1514
triggerHistory: Map<number, History>
1615
setFullScreenView: (fullscreen: boolean) => void
1716
}
@@ -23,7 +22,7 @@ export type DeploymentHistoryDiffDetailedProps = Pick<
2322
Required<
2423
Pick<
2524
DeploymentHistoryConfigDiffProps,
26-
'setFullScreenView' | 'wfrId' | 'envName' | 'renderRunSource' | 'resourceId' | 'runSource'
25+
'setFullScreenView' | 'wfrId' | 'envName' | 'renderRunSource' | 'resourceId' | 'triggerHistory'
2726
>
2827
> & {
2928
pipelineDeployments: History[]

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export const getPipelineDeploymentsOptions = ({
3131
wfrId,
3232
renderRunSource,
3333
resourceId,
34-
runSource,
35-
}: Required<Pick<DeploymentHistoryConfigDiffProps, 'renderRunSource' | 'runSource' | 'resourceId'>> & {
34+
triggerHistory,
35+
}: Required<Pick<DeploymentHistoryConfigDiffProps, 'renderRunSource' | 'resourceId' | 'triggerHistory'>> & {
3636
pipelineDeployments: History[]
3737
wfrId: number
3838
}) => {
@@ -50,7 +50,7 @@ export const getPipelineDeploymentsOptions = ({
5050
artifact,
5151
renderRunSource,
5252
resourceId,
53-
runSource,
53+
runSource: triggerHistory.get(id).runSource,
5454
}),
5555
startIcon: renderPipelineDeploymentStatusIcon(status),
5656
}),

src/Shared/Components/CICDHistory/TriggerOutput.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,6 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
601601
setFullScreenView={setFullScreenView}
602602
resourceId={resourceId}
603603
renderRunSource={renderRunSource}
604-
runSource={triggerDetails.runSource}
605604
/>
606605
</Route>
607606
)}

0 commit comments

Comments
 (0)