Skip to content

Commit 8c9d25e

Browse files
authored
Merge pull request #735 from devtron-labs/feat/canary-details-app
feat: canary details app
2 parents 3a309cb + 44f241d commit 8c9d25e

File tree

13 files changed

+58
-5
lines changed

13 files changed

+58
-5
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.13.0",
3+
"version": "1.13.0-beta-7",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
Lines changed: 4 additions & 0 deletions
Loading

src/Assets/IconV2/ic-lego.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/Common/Types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {
2828
ButtonProps,
2929
ComponentLayoutType,
3030
StatusType,
31+
DeploymentStrategyType,
3132
} from '../Shared'
3233
import {
3334
ACTION_STATE,
@@ -845,7 +846,7 @@ export interface AppEnvironment {
845846
}
846847

847848
export interface Strategy {
848-
deploymentTemplate: string
849+
deploymentTemplate: DeploymentStrategyType
849850
config: any
850851
default?: boolean
851852
}

src/Pages/Applications/DevtronApps/Details/CDPipeline/services.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ export const triggerCDNode = ({
7373
abortControllerRef,
7474
skipIfHibernated,
7575
isRollbackTrigger = false,
76+
strategy,
7677
}: TriggerCDNodeServiceProps) => {
7778
const areRuntimeParamsConfigured =
7879
runtimeParamsPayload && (stageType === DeploymentNodeType.POSTCD || stageType === DeploymentNodeType.PRECD)
@@ -85,6 +86,7 @@ export const triggerCDNode = ({
8586
isRollbackDeployment: isRollbackTrigger,
8687
...(areRuntimeParamsConfigured && runtimeParamsPayload),
8788
...(skipIfHibernated ? { skipIfHibernated: true } : {}),
89+
...(strategy ? { strategy } : {}),
8890
}
8991

9092
if (deploymentWithConfig) {

src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import { BuildStageType, FormType } from '@Common/CIPipeline.Types'
1818
import { APIOptions, DeploymentAppTypes, DeploymentNodeType } from '@Common/Types'
1919
import { DeploymentStrategy } from '@Shared/Components'
20-
import { EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
20+
import { DeploymentStrategyType, EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
2121
import { STAGE_MAP } from '@Pages/index'
2222

2323
interface ConfigSecretType {
@@ -136,6 +136,7 @@ export interface TriggerCDNodeServiceProps extends Pick<APIOptions, 'abortContro
136136
*/
137137
runtimeParamsPayload?: RuntimeParamsTriggerPayloadType
138138
isRollbackTrigger?: boolean
139+
strategy?: DeploymentStrategyType
139140
}
140141

141142
export interface TriggerCDPipelinePayloadType

src/Shared/Components/Icon/Icon.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import { ReactComponent as ICEcr } from '@IconsV2/ic-ecr.svg'
4848
import { ReactComponent as ICEnv } from '@IconsV2/ic-env.svg'
4949
import { ReactComponent as ICError } from '@IconsV2/ic-error.svg'
5050
import { ReactComponent as ICFailure } from '@IconsV2/ic-failure.svg'
51+
import { ReactComponent as ICFastForward } from '@IconsV2/ic-fast-forward.svg'
5152
import { ReactComponent as ICFileKey } from '@IconsV2/ic-file-key.svg'
5253
import { ReactComponent as ICFlask } from '@IconsV2/ic-flask.svg'
5354
import { ReactComponent as ICFolderUser } from '@IconsV2/ic-folder-user.svg'
@@ -75,11 +76,13 @@ import { ReactComponent as ICJobColor } from '@IconsV2/ic-job-color.svg'
7576
import { ReactComponent as ICK8sJob } from '@IconsV2/ic-k8s-job.svg'
7677
import { ReactComponent as ICKey } from '@IconsV2/ic-key.svg'
7778
import { ReactComponent as ICLdap } from '@IconsV2/ic-ldap.svg'
79+
import { ReactComponent as ICLego } from '@IconsV2/ic-lego.svg'
7880
import { ReactComponent as ICLightning } from '@IconsV2/ic-lightning.svg'
7981
import { ReactComponent as ICLightningFill } from '@IconsV2/ic-lightning-fill.svg'
8082
import { ReactComponent as ICLivspace } from '@IconsV2/ic-livspace.svg'
8183
import { ReactComponent as ICLoginDevtronLogo } from '@IconsV2/ic-login-devtron-logo.svg'
8284
import { ReactComponent as ICLogout } from '@IconsV2/ic-logout.svg'
85+
import { ReactComponent as ICMagnifyingGlass } from '@IconsV2/ic-magnifying-glass.svg'
8386
import { ReactComponent as ICMediumDelete } from '@IconsV2/ic-medium-delete.svg'
8487
import { ReactComponent as ICMediumPaintbucket } from '@IconsV2/ic-medium-paintbucket.svg'
8588
import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
@@ -96,6 +99,7 @@ import { ReactComponent as ICOpenshift } from '@IconsV2/ic-openshift.svg'
9699
import { ReactComponent as ICOutOfSync } from '@IconsV2/ic-out-of-sync.svg'
97100
import { ReactComponent as ICPaperPlaneColor } from '@IconsV2/ic-paper-plane-color.svg'
98101
import { ReactComponent as ICPencil } from '@IconsV2/ic-pencil.svg'
102+
import { ReactComponent as ICPlayOutline } from '@IconsV2/ic-play-outline.svg'
99103
import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg'
100104
import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg'
101105
import { ReactComponent as ICRocketLaunch } from '@IconsV2/ic-rocket-launch.svg'
@@ -181,6 +185,7 @@ export const iconMap = {
181185
'ic-env': ICEnv,
182186
'ic-error': ICError,
183187
'ic-failure': ICFailure,
188+
'ic-fast-forward': ICFastForward,
184189
'ic-file-key': ICFileKey,
185190
'ic-flask': ICFlask,
186191
'ic-folder-user': ICFolderUser,
@@ -208,11 +213,13 @@ export const iconMap = {
208213
'ic-k8s-job': ICK8sJob,
209214
'ic-key': ICKey,
210215
'ic-ldap': ICLdap,
216+
'ic-lego': ICLego,
211217
'ic-lightning-fill': ICLightningFill,
212218
'ic-lightning': ICLightning,
213219
'ic-livspace': ICLivspace,
214220
'ic-login-devtron-logo': ICLoginDevtronLogo,
215221
'ic-logout': ICLogout,
222+
'ic-magnifying-glass': ICMagnifyingGlass,
216223
'ic-medium-delete': ICMediumDelete,
217224
'ic-medium-paintbucket': ICMediumPaintbucket,
218225
'ic-memory': ICMemory,
@@ -229,6 +236,7 @@ export const iconMap = {
229236
'ic-out-of-sync': ICOutOfSync,
230237
'ic-paper-plane-color': ICPaperPlaneColor,
231238
'ic-pencil': ICPencil,
239+
'ic-play-outline': ICPlayOutline,
232240
'ic-quay': ICQuay,
233241
'ic-quote': ICQuote,
234242
'ic-rocket-launch': ICRocketLaunch,

0 commit comments

Comments
 (0)