Skip to content

Commit 5fd00b1

Browse files
authored
Merge pull request #2710 from devtron-labs/feat/canary-details-app
feat: update loading card and use from fe-common
2 parents c5dfd7a + fd4a932 commit 5fd00b1

24 files changed

+492
-381
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.13.0",
7+
"@devtron-labs/devtron-fe-common-lib": "1.13.0-beta-7",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/components/ApplicationGroup/AppGroup.types.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import {
2929
CommonNodeAttr,
3030
ApprovalConfigDataType,
3131
RuntimePluginVariables,
32+
PipelineIdsVsDeploymentStrategyMap,
3233
} from '@devtron-labs/devtron-fe-common-lib'
3334
import { CDMaterialProps, RuntimeParamsErrorState } from '../app/details/triggerView/types'
3435
import { EditDescRequest, NodeType, Nodes, OptionType } from '../app/types'
@@ -134,7 +135,11 @@ export interface BulkCDTriggerType extends BulkRuntimeParamsType {
134135
appList: BulkCDDetailType[]
135136
closePopup: (e) => void
136137
updateBulkInputMaterial: (materialList: Record<string, any>) => void
137-
onClickTriggerBulkCD: (skipIfHibernated: boolean, appsToRetry?: Record<string, boolean>) => void
138+
onClickTriggerBulkCD: (
139+
skipIfHibernated: boolean,
140+
pipelineIdVsStrategyMap: PipelineIdsVsDeploymentStrategyMap,
141+
appsToRetry?: Record<string, boolean>,
142+
) => void
138143
changeTab?: (
139144
materrialId: string | number,
140145
artifactId: number,
@@ -190,11 +195,13 @@ type RetryFailedType =
190195
| {
191196
onClickRetryDeploy: BulkCDTriggerType['onClickTriggerBulkCD']
192197
skipHibernatedApps: boolean
198+
pipelineIdVsStrategyMap: PipelineIdsVsDeploymentStrategyMap
193199
onClickRetryBuild?: never
194200
}
195201
| {
196202
onClickRetryDeploy?: never
197203
skipHibernatedApps?: never
204+
pipelineIdVsStrategyMap?: never
198205
onClickRetryBuild: (appsToRetry: Record<string, boolean>) => void
199206
}
200207

0 commit comments

Comments
 (0)