diff --git a/package-lock.json b/package-lock.json index 4c5ea27c8..d2db8046b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.1", + "version": "1.14.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.1", + "version": "1.14.2", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 89ae92f13..130def67b 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/Assets/Icon/ic-mechanical-operation.svg b/src/Assets/Icon/ic-mechanical-operation.svg index 6d1c09400..df7abdf64 100644 --- a/src/Assets/Icon/ic-mechanical-operation.svg +++ b/src/Assets/Icon/ic-mechanical-operation.svg @@ -14,63 +14,4 @@ - limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/Assets/IconV2/ic-arrows-clockwise.svg b/src/Assets/IconV2/ic-arrows-clockwise.svg new file mode 100644 index 000000000..413309aa6 --- /dev/null +++ b/src/Assets/IconV2/ic-arrows-clockwise.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-fast-forward.svg b/src/Assets/IconV2/ic-fast-forward.svg new file mode 100644 index 000000000..97cf87d0d --- /dev/null +++ b/src/Assets/IconV2/ic-fast-forward.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Assets/IconV2/ic-filter-applied.svg b/src/Assets/IconV2/ic-filter-applied.svg new file mode 100644 index 000000000..86f00f5a1 --- /dev/null +++ b/src/Assets/IconV2/ic-filter-applied.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Assets/IconV2/ic-filter.svg b/src/Assets/IconV2/ic-filter.svg new file mode 100644 index 000000000..aeda5ba8f --- /dev/null +++ b/src/Assets/IconV2/ic-filter.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-flask.svg b/src/Assets/IconV2/ic-flask.svg new file mode 100644 index 000000000..b78213fc2 --- /dev/null +++ b/src/Assets/IconV2/ic-flask.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-hibernate-circle.svg b/src/Assets/IconV2/ic-hibernate-circle.svg new file mode 100644 index 000000000..9e1d1a729 --- /dev/null +++ b/src/Assets/IconV2/ic-hibernate-circle.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-hibernate.svg b/src/Assets/IconV2/ic-hibernate.svg index b26d59ce6..91e884ee2 100644 --- a/src/Assets/IconV2/ic-hibernate.svg +++ b/src/Assets/IconV2/ic-hibernate.svg @@ -14,6 +14,6 @@ - limitations under the License. --> - - + + diff --git a/src/Assets/IconV2/ic-lego.svg b/src/Assets/IconV2/ic-lego.svg new file mode 100644 index 000000000..fbefc99b3 --- /dev/null +++ b/src/Assets/IconV2/ic-lego.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-magnifying-glass.svg b/src/Assets/IconV2/ic-magnifying-glass.svg new file mode 100644 index 000000000..f560eb621 --- /dev/null +++ b/src/Assets/IconV2/ic-magnifying-glass.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-more-vertical.svg b/src/Assets/IconV2/ic-more-vertical.svg new file mode 100644 index 000000000..66c4d477a --- /dev/null +++ b/src/Assets/IconV2/ic-more-vertical.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-play-outline.svg b/src/Assets/IconV2/ic-play-outline.svg new file mode 100644 index 000000000..991073048 --- /dev/null +++ b/src/Assets/IconV2/ic-play-outline.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-rocket-gear.svg b/src/Assets/IconV2/ic-rocket-gear.svg new file mode 100644 index 000000000..710f021e1 --- /dev/null +++ b/src/Assets/IconV2/ic-rocket-gear.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-strategy-blue-green-color.svg b/src/Assets/IconV2/ic-strategy-blue-green-color.svg new file mode 100644 index 000000000..a93ef002e --- /dev/null +++ b/src/Assets/IconV2/ic-strategy-blue-green-color.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Assets/IconV2/ic-strategy-blue-green.svg b/src/Assets/IconV2/ic-strategy-blue-green.svg new file mode 100644 index 000000000..54a6d4220 --- /dev/null +++ b/src/Assets/IconV2/ic-strategy-blue-green.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-strategy-canary-color.svg b/src/Assets/IconV2/ic-strategy-canary-color.svg new file mode 100644 index 000000000..07f926bc2 --- /dev/null +++ b/src/Assets/IconV2/ic-strategy-canary-color.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/Assets/IconV2/ic-strategy-canary.svg b/src/Assets/IconV2/ic-strategy-canary.svg new file mode 100644 index 000000000..7b4688952 --- /dev/null +++ b/src/Assets/IconV2/ic-strategy-canary.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-strategy-recreate-color.svg b/src/Assets/IconV2/ic-strategy-recreate-color.svg new file mode 100644 index 000000000..100fa6df6 --- /dev/null +++ b/src/Assets/IconV2/ic-strategy-recreate-color.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Assets/IconV2/ic-strategy-recreate.svg b/src/Assets/IconV2/ic-strategy-recreate.svg new file mode 100644 index 000000000..f952637b6 --- /dev/null +++ b/src/Assets/IconV2/ic-strategy-recreate.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-strategy-rolling-color.svg b/src/Assets/IconV2/ic-strategy-rolling-color.svg new file mode 100644 index 000000000..af6da4a33 --- /dev/null +++ b/src/Assets/IconV2/ic-strategy-rolling-color.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Assets/IconV2/ic-strategy-rolling.svg b/src/Assets/IconV2/ic-strategy-rolling.svg new file mode 100644 index 000000000..746cad1a5 --- /dev/null +++ b/src/Assets/IconV2/ic-strategy-rolling.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-sun.svg b/src/Assets/IconV2/ic-sun.svg new file mode 100644 index 000000000..58025d300 --- /dev/null +++ b/src/Assets/IconV2/ic-sun.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-traffic-signal.svg b/src/Assets/IconV2/ic-traffic-signal.svg new file mode 100644 index 000000000..b29f5592f --- /dev/null +++ b/src/Assets/IconV2/ic-traffic-signal.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Common/Checkbox/Checkbox.scss b/src/Common/Checkbox/Checkbox.scss index 54e3a8ad6..992af4f7f 100644 --- a/src/Common/Checkbox/Checkbox.scss +++ b/src/Common/Checkbox/Checkbox.scss @@ -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'); } @@ -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'); } } diff --git a/src/Common/Checkbox/assets/dark/ic-checkbox-selected-error.svg b/src/Common/Checkbox/assets/dark/ic-checkbox-selected-error.svg new file mode 100644 index 000000000..374ed47d1 --- /dev/null +++ b/src/Common/Checkbox/assets/dark/ic-checkbox-selected-error.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Common/Checkbox/assets/ic-checkbox-selected-error.svg b/src/Common/Checkbox/assets/ic-checkbox-selected-error.svg new file mode 100644 index 000000000..b9a1ff316 --- /dev/null +++ b/src/Common/Checkbox/assets/ic-checkbox-selected-error.svg @@ -0,0 +1,20 @@ + + + + + + diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 49ce89f06..bd6cc21a5 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -388,6 +388,7 @@ export const API_STATUS_CODES = { EXPECTATION_FAILED: 417, UNPROCESSABLE_ENTITY: 422, LOCKED: 423, + FAILED_DEPENDENCY: 424, } export enum SERVER_MODE { diff --git a/src/Common/SortableTableHeaderCell/SortableTableHeaderCell.tsx b/src/Common/SortableTableHeaderCell/SortableTableHeaderCell.tsx index 621aca797..4c120268f 100644 --- a/src/Common/SortableTableHeaderCell/SortableTableHeaderCell.tsx +++ b/src/Common/SortableTableHeaderCell/SortableTableHeaderCell.tsx @@ -98,7 +98,7 @@ const SortableTableHeaderCell = ({