From e34eaf548fd48a40d35afb9a5005d257fbc568bc Mon Sep 17 00:00:00 2001 From: shivani170 Date: Wed, 21 May 2025 15:07:43 +0530 Subject: [PATCH 01/11] chore: Added icon for the clusters --- src/Assets/IconV2/ic-environment-isolated.svg | 4 ++++ src/Assets/IconV2/ic-environment.svg | 4 ++++ src/Assets/IconV2/ic-shapes.svg | 3 +++ src/Assets/IconV2/ic-virtual-cluster.svg | 3 +++ src/Shared/Components/Icon/Icon.tsx | 8 ++++++++ 5 files changed, 22 insertions(+) create mode 100644 src/Assets/IconV2/ic-environment-isolated.svg create mode 100644 src/Assets/IconV2/ic-environment.svg create mode 100644 src/Assets/IconV2/ic-shapes.svg create mode 100644 src/Assets/IconV2/ic-virtual-cluster.svg diff --git a/src/Assets/IconV2/ic-environment-isolated.svg b/src/Assets/IconV2/ic-environment-isolated.svg new file mode 100644 index 000000000..3a34316c3 --- /dev/null +++ b/src/Assets/IconV2/ic-environment-isolated.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Assets/IconV2/ic-environment.svg b/src/Assets/IconV2/ic-environment.svg new file mode 100644 index 000000000..3a34316c3 --- /dev/null +++ b/src/Assets/IconV2/ic-environment.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Assets/IconV2/ic-shapes.svg b/src/Assets/IconV2/ic-shapes.svg new file mode 100644 index 000000000..520e2c4e3 --- /dev/null +++ b/src/Assets/IconV2/ic-shapes.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-virtual-cluster.svg b/src/Assets/IconV2/ic-virtual-cluster.svg new file mode 100644 index 000000000..14188fbf3 --- /dev/null +++ b/src/Assets/IconV2/ic-virtual-cluster.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index c3953b9fa..749967414 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -59,6 +59,8 @@ import { ReactComponent as ICEdit } from '@IconsV2/ic-edit.svg' import { ReactComponent as ICEnterpriseFeat } from '@IconsV2/ic-enterprise-feat.svg' import { ReactComponent as ICEnterpriseTag } from '@IconsV2/ic-enterprise-tag.svg' import { ReactComponent as ICEnv } from '@IconsV2/ic-env.svg' +import { ReactComponent as ICEnvironment } from '@IconsV2/ic-environment.svg' +import { ReactComponent as ICEnvironmentIsolated } from '@IconsV2/ic-environment-isolated.svg' import { ReactComponent as ICError } from '@IconsV2/ic-error.svg' import { ReactComponent as ICExpandRightSm } from '@IconsV2/ic-expand-right-sm.svg' import { ReactComponent as ICExpandSm } from '@IconsV2/ic-expand-sm.svg' @@ -126,6 +128,7 @@ import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg' import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg' import { ReactComponent as ICRocketLaunch } from '@IconsV2/ic-rocket-launch.svg' import { ReactComponent as ICSelected } from '@IconsV2/ic-selected.svg' +import { ReactComponent as ICShapes } from '@IconsV2/ic-shapes.svg' import { ReactComponent as ICShieldCheck } from '@IconsV2/ic-shield-check.svg' import { ReactComponent as ICSlidersVertical } from '@IconsV2/ic-sliders-vertical.svg' import { ReactComponent as ICSortAscending } from '@IconsV2/ic-sort-ascending.svg' @@ -149,6 +152,7 @@ import { ReactComponent as ICUnknown } from '@IconsV2/ic-unknown.svg' import { ReactComponent as ICUserCircle } from '@IconsV2/ic-user-circle.svg' import { ReactComponent as ICUserKey } from '@IconsV2/ic-user-key.svg' import { ReactComponent as ICUsers } from '@IconsV2/ic-users.svg' +import { ReactComponent as ICVirtualCluster } from '@IconsV2/ic-virtual-cluster.svg' import { ReactComponent as ICWarning } from '@IconsV2/ic-warning.svg' import { ReactComponent as ICWifiSlash } from '@IconsV2/ic-wifi-slash.svg' @@ -216,6 +220,8 @@ export const iconMap = { 'ic-enterprise-feat': ICEnterpriseFeat, 'ic-enterprise-tag': ICEnterpriseTag, 'ic-env': ICEnv, + 'ic-environment-isolated': ICEnvironmentIsolated, + 'ic-environment': ICEnvironment, 'ic-error': ICError, 'ic-expand-right-sm': ICExpandRightSm, 'ic-expand-sm': ICExpandSm, @@ -283,6 +289,7 @@ export const iconMap = { 'ic-quote': ICQuote, 'ic-rocket-launch': ICRocketLaunch, 'ic-selected': ICSelected, + 'ic-shapes': ICShapes, 'ic-shield-check': ICShieldCheck, 'ic-sliders-vertical': ICSlidersVertical, 'ic-sort-ascending': ICSortAscending, @@ -306,6 +313,7 @@ export const iconMap = { 'ic-user-circle': ICUserCircle, 'ic-user-key': ICUserKey, 'ic-users': ICUsers, + 'ic-virtual-cluster': ICVirtualCluster, 'ic-warning': ICWarning, 'ic-wifi-slash': ICWifiSlash, } From 61bc33cf0249cc8321c28b83b06f12f1258e6e26 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 22 May 2025 15:27:39 +0530 Subject: [PATCH 02/11] chore: virtual environment added --- src/Assets/IconV2/ic-environment-isolated.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Assets/IconV2/ic-environment-isolated.svg b/src/Assets/IconV2/ic-environment-isolated.svg index 3a34316c3..1c5c59dcb 100644 --- a/src/Assets/IconV2/ic-environment-isolated.svg +++ b/src/Assets/IconV2/ic-environment-isolated.svg @@ -1,4 +1,4 @@ - - + + From 8db2eb76282a3de4363da1df603d90c185612ab3 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Fri, 23 May 2025 12:33:31 +0530 Subject: [PATCH 03/11] chore: Added ENVIRONMENT_CATEGORIES constant route --- src/Common/Constants.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 3243f76c2..7270fac03 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -87,6 +87,8 @@ export const ROUTES = { APP: 'app', APP_ARTIFACT_PROMOTE_MATERIAL: 'app/artifact/promotion-request/material', APP_TEMPLATE_DATA: 'app/template/data', + CLUSTER_CATEGORIES: 'cluster/categories', + ENVIRONMENT_CATEGORIES: 'env/categories', PROJECT_LIST_MIN: 'team/autocomplete', USER_CHECK_ROLE: 'user/check/roles', IMAGE_TAGGING: 'app/image-tagging', From bfeb4c31c2979fdb3bd5c19977bd97150938f699 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Mon, 26 May 2025 11:10:11 +0530 Subject: [PATCH 04/11] chore: ClusterEnvironmentCategoryType & URL moved to common --- src/Common/Constants.ts | 1 + src/Common/Types.ts | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 7270fac03..77ad7dcfa 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -76,6 +76,7 @@ export const URLS = { COMPARE_CLUSTERS: '/compare-clusters', APP_CONFIG: 'edit', GLOBAL_CONFIG: '/global-config', + GLOBAL_CONFIG_MANAGE_CATEGORIES: '/global-config/cluster-env/manage-categories', GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP, GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_CREATE: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/create`, // NOTE: using appId since we are re-using AppConfig component diff --git a/src/Common/Types.ts b/src/Common/Types.ts index 2a5597eff..e90fe482a 100644 --- a/src/Common/Types.ts +++ b/src/Common/Types.ts @@ -1131,3 +1131,12 @@ export interface EnvAppsMetaDTO { appCount: number apps: AppMeta[] } + + +export interface ClusterEnvironmentCategoryDTO { + id: number + name: string + description?: string +} + +export interface ClusterEnvironmentCategoryType extends ClusterEnvironmentCategoryDTO {} From cfa7b6f51dd0be5f5c965cafc144e9c2cdd61c3e Mon Sep 17 00:00:00 2001 From: shivani170 Date: Tue, 27 May 2025 19:02:13 +0530 Subject: [PATCH 05/11] chore: code feedback fixes --- src/Assets/IconV2/ic-cluster-isolated.svg | 3 +++ src/Assets/IconV2/ic-environment-isolated.svg | 7 +++---- src/Assets/IconV2/ic-virtual-cluster.svg | 3 --- src/Common/Constants.ts | 1 - src/Common/Types.ts | 1 - src/Shared/Components/Icon/Icon.tsx | 4 ++-- 6 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 src/Assets/IconV2/ic-cluster-isolated.svg delete mode 100644 src/Assets/IconV2/ic-virtual-cluster.svg diff --git a/src/Assets/IconV2/ic-cluster-isolated.svg b/src/Assets/IconV2/ic-cluster-isolated.svg new file mode 100644 index 000000000..3e07813b5 --- /dev/null +++ b/src/Assets/IconV2/ic-cluster-isolated.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Assets/IconV2/ic-environment-isolated.svg b/src/Assets/IconV2/ic-environment-isolated.svg index 1c5c59dcb..74837dab5 100644 --- a/src/Assets/IconV2/ic-environment-isolated.svg +++ b/src/Assets/IconV2/ic-environment-isolated.svg @@ -1,4 +1,3 @@ - - - - + + + \ No newline at end of file diff --git a/src/Assets/IconV2/ic-virtual-cluster.svg b/src/Assets/IconV2/ic-virtual-cluster.svg deleted file mode 100644 index 14188fbf3..000000000 --- a/src/Assets/IconV2/ic-virtual-cluster.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 77ad7dcfa..908afcccc 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -88,7 +88,6 @@ export const ROUTES = { APP: 'app', APP_ARTIFACT_PROMOTE_MATERIAL: 'app/artifact/promotion-request/material', APP_TEMPLATE_DATA: 'app/template/data', - CLUSTER_CATEGORIES: 'cluster/categories', ENVIRONMENT_CATEGORIES: 'env/categories', PROJECT_LIST_MIN: 'team/autocomplete', USER_CHECK_ROLE: 'user/check/roles', diff --git a/src/Common/Types.ts b/src/Common/Types.ts index e90fe482a..9acb33f5c 100644 --- a/src/Common/Types.ts +++ b/src/Common/Types.ts @@ -1132,7 +1132,6 @@ export interface EnvAppsMetaDTO { apps: AppMeta[] } - export interface ClusterEnvironmentCategoryDTO { id: number name: string diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 1aa2c550f..c07bb0c3a 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -39,6 +39,7 @@ import { ReactComponent as ICCloseLarge } from '@IconsV2/ic-close-large.svg' import { ReactComponent as ICCloseSmall } from '@IconsV2/ic-close-small.svg' import { ReactComponent as ICCloudVms } from '@IconsV2/ic-cloud-vms.svg' import { ReactComponent as ICCluster } from '@IconsV2/ic-cluster.svg' +import { ReactComponent as ICClusterIsolated } from '@IconsV2/ic-cluster-isolated.svg' import { ReactComponent as ICCode } from '@IconsV2/ic-code.svg' import { ReactComponent as ICContainer } from '@IconsV2/ic-container.svg' import { ReactComponent as ICCookr } from '@IconsV2/ic-cookr.svg' @@ -158,7 +159,6 @@ import { ReactComponent as ICUnknown } from '@IconsV2/ic-unknown.svg' import { ReactComponent as ICUserCircle } from '@IconsV2/ic-user-circle.svg' import { ReactComponent as ICUserKey } from '@IconsV2/ic-user-key.svg' import { ReactComponent as ICUsers } from '@IconsV2/ic-users.svg' -import { ReactComponent as ICVirtualCluster } from '@IconsV2/ic-virtual-cluster.svg' import { ReactComponent as ICWarning } from '@IconsV2/ic-warning.svg' import { ReactComponent as ICWifiSlash } from '@IconsV2/ic-wifi-slash.svg' @@ -205,6 +205,7 @@ export const iconMap = { 'ic-close-large': ICCloseLarge, 'ic-close-small': ICCloseSmall, 'ic-cloud-vms': ICCloudVms, + 'ic-cluster-isolated': ICClusterIsolated, 'ic-cluster': ICCluster, 'ic-code': ICCode, 'ic-container': ICContainer, @@ -325,7 +326,6 @@ export const iconMap = { 'ic-user-circle': ICUserCircle, 'ic-user-key': ICUserKey, 'ic-users': ICUsers, - 'ic-virtual-cluster': ICVirtualCluster, 'ic-warning': ICWarning, 'ic-wifi-slash': ICWifiSlash, } From 739e94b6af633d06750cf1c038d7f35f8b888f23 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Wed, 28 May 2025 13:25:39 +0530 Subject: [PATCH 06/11] chore: placeholder fix for select picker --- src/Shared/Components/SelectPicker/SelectPicker.component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/Components/SelectPicker/SelectPicker.component.tsx b/src/Shared/Components/SelectPicker/SelectPicker.component.tsx index 930559493..482dd211a 100644 --- a/src/Shared/Components/SelectPicker/SelectPicker.component.tsx +++ b/src/Shared/Components/SelectPicker/SelectPicker.component.tsx @@ -187,7 +187,7 @@ const SelectPicker = ({ error, icon, helperText, - placeholder = 'Select a option', + placeholder = 'Select an option', label, showSelectedOptionIcon = true, size = ComponentSizeType.medium, From 1d007cf1905f9f5993c1d0135be27dde1f0f0d1d Mon Sep 17 00:00:00 2001 From: shivani170 Date: Wed, 28 May 2025 14:08:02 +0530 Subject: [PATCH 07/11] chore: vector-effect="non-scaling-stroke" applied on icons --- src/Assets/IconV2/ic-cluster-isolated.svg | 2 +- src/Assets/IconV2/ic-cluster.svg | 2 +- src/Assets/IconV2/ic-environment-isolated.svg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Assets/IconV2/ic-cluster-isolated.svg b/src/Assets/IconV2/ic-cluster-isolated.svg index 3e07813b5..24a017f32 100644 --- a/src/Assets/IconV2/ic-cluster-isolated.svg +++ b/src/Assets/IconV2/ic-cluster-isolated.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/src/Assets/IconV2/ic-cluster.svg b/src/Assets/IconV2/ic-cluster.svg index f6aea37fd..8bc0567ac 100644 --- a/src/Assets/IconV2/ic-cluster.svg +++ b/src/Assets/IconV2/ic-cluster.svg @@ -1,3 +1,3 @@ - + diff --git a/src/Assets/IconV2/ic-environment-isolated.svg b/src/Assets/IconV2/ic-environment-isolated.svg index 74837dab5..17e3d98c6 100644 --- a/src/Assets/IconV2/ic-environment-isolated.svg +++ b/src/Assets/IconV2/ic-environment-isolated.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file From c2874ef4f3aeb3cb7c3e7869f26f09c6515950b8 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 29 May 2025 10:25:42 +0530 Subject: [PATCH 08/11] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 898f45fa6..0b11b0656 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.1-pre-5", + "version": "1.14.1-pre-5-beta-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.1-pre-5", + "version": "1.14.1-pre-5-beta-2", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 9324c1228..cb1b04265 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.1-pre-5", + "version": "1.14.1-pre-5-beta-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 253b42987fca81230f961de7103265f890793287 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Fri, 30 May 2025 18:40:46 +0530 Subject: [PATCH 09/11] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d9ad3c053..9482a5d2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.2-pre-1", + "version": "1.14.2-pre-1-beta-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.2-pre-1", + "version": "1.14.2-pre-1-beta-2", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index d4d2bb3e7..652732636 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.2-pre-1", + "version": "1.14.2-pre-1-beta-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From b39c2ebb9e6434302d3058f55e6434a8db913256 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Mon, 2 Jun 2025 08:28:05 +0530 Subject: [PATCH 10/11] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9602fbeae..3797ba769 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.2-pre-2-beta-1", + "version": "1.14.2-pre-2-beta-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.2-pre-2-beta-1", + "version": "1.14.2-pre-2-beta-2", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 7254c94df..92b21ae13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.14.2-pre-2-beta-1", + "version": "1.14.2-pre-2-beta-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 5f232d21c82694bc46a6c013b930ac8bfa0083c9 Mon Sep 17 00:00:00 2001 From: shivani170 Date: Thu, 12 Jun 2025 13:54:16 +0530 Subject: [PATCH 11/11] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 714692205..767429662 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.15.1-pre-3", + "version": "1.15.1-pre-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.15.1-pre-3", + "version": "1.15.1-pre-4", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index b11595321..df494fe90 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.15.1-pre-3", + "version": "1.15.1-pre-4", "description": "Supporting common component library", "type": "module", "main": "dist/index.js",