Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
70b45d7
feat: add icons for various strategy
arunjaindev May 13, 2025
227719d
chore: update deployment strategy type
arunjaindev May 13, 2025
603c8e4
feat: add common loading card
arunjaindev May 15, 2025
63cd029
feat: revamp loading card
arunjaindev May 18, 2025
0b0e10d
chore: version bump
arunjaindev May 19, 2025
760fc2f
chore: version bump
arunjaindev May 19, 2025
3a309cb
chore: add new icons
RohitRaj011 May 19, 2025
02b9807
feat: Checkbox - add error prop to Checkbox
RohitRaj011 May 20, 2025
6050c82
chore: add ic-filter icons
RohitRaj011 May 20, 2025
19c1485
Merge branch 'feature/canary-visibility' of github.com:devtron-labs/d…
RohitRaj011 May 20, 2025
1d3eacb
feat: add type for deployment strategy vs pipeline ids
arunjaindev May 20, 2025
44f241d
Merge branch 'feature/canary-visibility' of https://github.com/devtro…
arunjaindev May 20, 2025
8c9d25e
Merge pull request #735 from devtron-labs/feat/canary-details-app
arunjaindev May 21, 2025
54bd40c
Merge pull request #739 from devtron-labs/feat/app-group-manage-traffic
RohitRaj011 May 21, 2025
985f3f2
feat: SortableTableHeaderCell - add fw-6 class
RohitRaj011 May 21, 2025
75d2357
feat: add FEATURE_MANAGE_TRAFFIC_ENABLE flag
RohitRaj011 May 22, 2025
6df7bc8
fix: ensure proper focus handling after adding a row in DynamicDataTa…
RohitRaj011 May 22, 2025
c4d0f3a
feat: Button - update hover background color variable
RohitRaj011 May 22, 2025
83e3cfe
chore(version): bump to 1.13.0-beta-9
RohitRaj011 May 22, 2025
18419dc
fix: update import paths for TooltipProps and icon types in Icon comp…
RohitRaj011 May 22, 2025
079f896
feat: update type for pipeline vs strategy map
arunjaindev May 23, 2025
42c8f25
feat: AppStatus - hide '-' when hideMessage is true
RohitRaj011 May 23, 2025
64f6c76
feat: add 424 in api status codes
arunjaindev May 23, 2025
7177746
Merge branch 'feature/canary-visibility' of https://github.com/devtro…
arunjaindev May 23, 2025
7b67aa2
chore: add class for shadow in loading card
arunjaindev May 23, 2025
47d90c7
revert: dynamic data table changes
arunjaindev May 23, 2025
2038d26
feat: update strategies type
arunjaindev May 26, 2025
e049908
feat: add uncolored and colored strategy icons
arunjaindev May 26, 2025
34f207c
chore: update mechanical operation svg
arunjaindev May 26, 2025
54129b7
Merge branch 'main' of https://github.com/devtron-labs/devtron-fe-com…
arunjaindev May 29, 2025
27950aa
chore: version bump
arunjaindev May 29, 2025
7606645
feat: add error state styling for checked checkbox and new error icon
RohitRaj011 May 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtron-labs/devtron-fe-common-lib",
"version": "1.14.1",
"version": "1.14.2",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand Down
61 changes: 1 addition & 60 deletions src/Assets/Icon/ic-mechanical-operation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-arrows-clockwise.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/Assets/IconV2/ic-fast-forward.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/Assets/IconV2/ic-filter-applied.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-filter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-flask.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-hibernate-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/Assets/IconV2/ic-hibernate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-lego.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-magnifying-glass.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-more-vertical.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-play-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-rocket-gear.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/Assets/IconV2/ic-strategy-blue-green-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-strategy-blue-green.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/Assets/IconV2/ic-strategy-canary-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-strategy-canary.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/Assets/IconV2/ic-strategy-recreate-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-strategy-recreate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/Assets/IconV2/ic-strategy-rolling-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-strategy-rolling.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-sun.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-traffic-signal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 11 additions & 3 deletions src/Common/Checkbox/Checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ $checkbox-hover-bg-image: url('./assets/ic-checkbox-hover.svg');
background-image: url('./assets/ic-checkbox-selected.svg');
}

.form__checkbox.error:checked[value='CHECKED'] ~ .form__checkbox-container {
background-image: url('./assets/ic-checkbox-selected-error.svg');
}

.form__checkbox:checked[value='BULK_CHECKED'] ~ .form__checkbox-container {
background-image: url('./assets/ic-bulk-check.svg');
}
Expand Down Expand Up @@ -84,15 +88,19 @@ $checkbox-hover-bg-image: url('./assets/ic-checkbox-hover.svg');
}
}

.form__checkbox:checked[value='INTERMEDIATE']~.form__checkbox-container {
.form__checkbox:checked[value='INTERMEDIATE'] ~ .form__checkbox-container {
background-image: url('./assets/dark/ic-checkbox-intermediate.svg');
}

.form__checkbox:checked[value='CHECKED']~.form__checkbox-container {
.form__checkbox:checked[value='CHECKED'] ~ .form__checkbox-container {
background-image: url('./assets/dark/ic-checkbox-selected.svg');
}

.form__checkbox:checked[value='BULK_CHECKED']~.form__checkbox-container {
.form__checkbox.error:checked[value='CHECKED'] ~ .form__checkbox-container {
background-image: url('./assets/dark/ic-checkbox-selected-error.svg');
}

.form__checkbox:checked[value='BULK_CHECKED'] ~ .form__checkbox-container {
background-image: url('./assets/dark/ic-bulk-check.svg');
}
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions src/Common/Checkbox/assets/ic-checkbox-selected-error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/Common/Constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ export const API_STATUS_CODES = {
EXPECTATION_FAILED: 417,
UNPROCESSABLE_ENTITY: 422,
LOCKED: 423,
FAILED_DEPENDENCY: 424,
}

export enum SERVER_MODE {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const SortableTableHeaderCell = ({
<div className={`flex dc__content-space dc__gap-6 dc__position-rel ${isResizable ? 'w-100 h-100' : ''}`}>
<button
type="button"
className={`dc__transparent p-0 cn-7 flex dc__content-start dc__gap-4 dc__select-text ${!isSortable ? 'cursor-default' : ''} dc__position-rel`}
className={`dc__transparent p-0 cn-7 flex dc__content-start dc__gap-4 dc__select-text fw-6 ${!isSortable ? 'cursor-default' : ''} dc__position-rel`}
onClick={isSortable ? triggerSorting : noop}
disabled={disabled}
tabIndex={disabled || !isSortable ? -1 : 0}
Expand Down
4 changes: 3 additions & 1 deletion src/Common/Types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
ButtonProps,
ComponentLayoutType,
StatusType,
DeploymentStrategyType,
} from '../Shared'
import {
ACTION_STATE,
Expand Down Expand Up @@ -116,6 +117,7 @@ export interface CheckboxProps {
onClick?: (event) => void
id?: string
dataTestId?: string
error?: boolean
children?: ReactNode
}

Expand Down Expand Up @@ -847,7 +849,7 @@ export interface AppEnvironment {
}

export interface Strategy {
deploymentTemplate: string
deploymentTemplate: DeploymentStrategyType
config: any
default?: boolean
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const triggerCDNode = ({
abortControllerRef,
skipIfHibernated,
isRollbackTrigger = false,
strategy,
}: TriggerCDNodeServiceProps) => {
const areRuntimeParamsConfigured =
runtimeParamsPayload && (stageType === DeploymentNodeType.POSTCD || stageType === DeploymentNodeType.PRECD)
Expand All @@ -85,6 +86,7 @@ export const triggerCDNode = ({
isRollbackDeployment: isRollbackTrigger,
...(areRuntimeParamsConfigured && runtimeParamsPayload),
...(skipIfHibernated ? { skipIfHibernated: true } : {}),
...(strategy ? { strategy } : {}),
}

if (deploymentWithConfig) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { BuildStageType, FormType } from '@Common/CIPipeline.Types'
import { APIOptions, DeploymentAppTypes, DeploymentNodeType } from '@Common/Types'
import { DeploymentStrategy } from '@Shared/Components'
import { EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
import { DeploymentStrategyType, EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
import { STAGE_MAP } from '@Pages/index'

interface ConfigSecretType {
Expand Down Expand Up @@ -136,6 +136,7 @@ export interface TriggerCDNodeServiceProps extends Pick<APIOptions, 'abortContro
*/
runtimeParamsPayload?: RuntimeParamsTriggerPayloadType
isRollbackTrigger?: boolean
strategy?: DeploymentStrategyType
}

export interface TriggerCDPipelinePayloadType
Expand Down
8 changes: 4 additions & 4 deletions src/Shared/Components/Button/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
$active-bg-color: var(--B200);

@include button-variant-styles($background, var(--B500), $border-color, $active-bg-color);
@include pseudo-states(var(--B100), $active-bg-color, var(--B300));
@include pseudo-states(var(--bg-hover), $active-bg-color, var(--B300));
}

&--negative {
Expand Down Expand Up @@ -183,7 +183,7 @@
$active-bg-color: var(--N200);

@include button-variant-styles($background, var(--N700), $border-color, $active-bg-color);
@include pseudo-states(var(--N100), $active-bg-color, var(--N300));
@include pseudo-states(var(--bg-hover), $active-bg-color, var(--N300));
}
}

Expand Down Expand Up @@ -229,7 +229,7 @@
// Pseudo states for border-less button
&__border-less {
&--default {
@include pseudo-states(var(--B100), var(--B200));
@include pseudo-states(var(--bg-hover), var(--B200));
}

&--negative {
Expand All @@ -249,7 +249,7 @@
}

&--neutral {
@include pseudo-states(var(--N100), var(--N200));
@include pseudo-states(var(--bg-hover), var(--N200));
}

&--neutral-n0 {
Expand Down
3 changes: 1 addition & 2 deletions src/Shared/Components/CICDHistory/types.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
DeploymentStatusDetailsBreakdownDataType,
DeploymentStatusDetailsType,
DeploymentStatusTimelineType,
DeploymentStrategyType,
GitTriggers,
Node,
NodeType,
Expand Down Expand Up @@ -736,8 +737,6 @@ export interface DeploymentHistory {
runSource?: RunSourceType
}

type DeploymentStrategyType = 'CANARY' | 'ROLLING' | 'RECREATE' | 'BLUE_GREEN'

export interface DeploymentStrategy {
deploymentTemplate: DeploymentStrategyType
config: any
Expand Down
Loading
Loading