Skip to content

Commit c975a32

Browse files
authored
Merge pull request #748 from devtron-labs/feat/cluster-env-categories
feat: Icon addded for Global cluster & env view
2 parents e3aae6d + 5f232d2 commit c975a32

11 files changed

Lines changed: 36 additions & 5 deletions

File tree

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.15.1-pre-3",
3+
"version": "1.15.1-pre-4",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-cluster.svg

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

src/Assets/IconV2/ic-shapes.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Common/Constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ export const URLS = {
7979
COMPARE_CLUSTERS: '/compare-clusters',
8080
APP_CONFIG: 'edit',
8181
GLOBAL_CONFIG: '/global-config',
82+
GLOBAL_CONFIG_MANAGE_CATEGORIES: '/global-config/cluster-env/manage-categories',
8283
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP,
8384
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_CREATE: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/create`,
8485
// NOTE: using appId since we are re-using AppConfig component
@@ -90,6 +91,7 @@ export const ROUTES = {
9091
APP: 'app',
9192
APP_ARTIFACT_PROMOTE_MATERIAL: 'app/artifact/promotion-request/material',
9293
APP_TEMPLATE_DATA: 'app/template/data',
94+
ENVIRONMENT_CATEGORIES: 'env/categories',
9395
PROJECT_LIST_MIN: 'team/autocomplete',
9496
USER_CHECK_ROLE: 'user/check/roles',
9597
IMAGE_TAGGING: 'app/image-tagging',

src/Common/Types.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,3 +1081,11 @@ export interface EnvAppsMetaDTO {
10811081
appCount: number
10821082
apps: AppMeta[]
10831083
}
1084+
1085+
export interface ClusterEnvironmentCategoryDTO {
1086+
id: number
1087+
name: string
1088+
description?: string
1089+
}
1090+
1091+
export interface ClusterEnvironmentCategoryType extends ClusterEnvironmentCategoryDTO {}

src/Shared/Components/Icon/Icon.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import { ReactComponent as ICCloseLarge } from '@IconsV2/ic-close-large.svg'
4242
import { ReactComponent as ICCloseSmall } from '@IconsV2/ic-close-small.svg'
4343
import { ReactComponent as ICCloudVms } from '@IconsV2/ic-cloud-vms.svg'
4444
import { ReactComponent as ICCluster } from '@IconsV2/ic-cluster.svg'
45+
import { ReactComponent as ICClusterIsolated } from '@IconsV2/ic-cluster-isolated.svg'
4546
import { ReactComponent as ICCode } from '@IconsV2/ic-code.svg'
4647
import { ReactComponent as ICContainer } from '@IconsV2/ic-container.svg'
4748
import { ReactComponent as ICCookr } from '@IconsV2/ic-cookr.svg'
@@ -67,6 +68,8 @@ import { ReactComponent as ICEmail } from '@IconsV2/ic-email.svg'
6768
import { ReactComponent as ICEnterpriseFeat } from '@IconsV2/ic-enterprise-feat.svg'
6869
import { ReactComponent as ICEnterpriseTag } from '@IconsV2/ic-enterprise-tag.svg'
6970
import { ReactComponent as ICEnv } from '@IconsV2/ic-env.svg'
71+
import { ReactComponent as ICEnvironment } from '@IconsV2/ic-environment.svg'
72+
import { ReactComponent as ICEnvironmentIsolated } from '@IconsV2/ic-environment-isolated.svg'
7073
import { ReactComponent as ICError } from '@IconsV2/ic-error.svg'
7174
import { ReactComponent as ICExpandRightSm } from '@IconsV2/ic-expand-right-sm.svg'
7275
import { ReactComponent as ICExpandSm } from '@IconsV2/ic-expand-sm.svg'
@@ -148,6 +151,7 @@ import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg'
148151
import { ReactComponent as ICRocketGear } from '@IconsV2/ic-rocket-gear.svg'
149152
import { ReactComponent as ICRocketLaunch } from '@IconsV2/ic-rocket-launch.svg'
150153
import { ReactComponent as ICSelected } from '@IconsV2/ic-selected.svg'
154+
import { ReactComponent as ICShapes } from '@IconsV2/ic-shapes.svg'
151155
import { ReactComponent as ICShieldCheck } from '@IconsV2/ic-shield-check.svg'
152156
import { ReactComponent as ICSlidersVertical } from '@IconsV2/ic-sliders-vertical.svg'
153157
import { ReactComponent as ICSortAscending } from '@IconsV2/ic-sort-ascending.svg'
@@ -237,6 +241,7 @@ export const iconMap = {
237241
'ic-close-large': ICCloseLarge,
238242
'ic-close-small': ICCloseSmall,
239243
'ic-cloud-vms': ICCloudVms,
244+
'ic-cluster-isolated': ICClusterIsolated,
240245
'ic-cluster': ICCluster,
241246
'ic-code': ICCode,
242247
'ic-container': ICContainer,
@@ -263,6 +268,8 @@ export const iconMap = {
263268
'ic-enterprise-feat': ICEnterpriseFeat,
264269
'ic-enterprise-tag': ICEnterpriseTag,
265270
'ic-env': ICEnv,
271+
'ic-environment-isolated': ICEnvironmentIsolated,
272+
'ic-environment': ICEnvironment,
266273
'ic-error': ICError,
267274
'ic-expand-right-sm': ICExpandRightSm,
268275
'ic-expand-sm': ICExpandSm,
@@ -344,6 +351,7 @@ export const iconMap = {
344351
'ic-rocket-gear': ICRocketGear,
345352
'ic-rocket-launch': ICRocketLaunch,
346353
'ic-selected': ICSelected,
354+
'ic-shapes': ICShapes,
347355
'ic-shield-check': ICShieldCheck,
348356
'ic-sliders-vertical': ICSlidersVertical,
349357
'ic-sort-ascending': ICSortAscending,

0 commit comments

Comments
 (0)