Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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.15.1-pre-3",
"version": "1.15.1-pre-4",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand Down
3 changes: 3 additions & 0 deletions src/Assets/IconV2/ic-cluster-isolated.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/Assets/IconV2/ic-cluster.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-environment-isolated.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-environment.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-shapes.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/Common/Constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,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',
Comment thread
AbhishekA1509 marked this conversation as resolved.
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
Expand All @@ -90,6 +91,7 @@ export const ROUTES = {
APP: 'app',
APP_ARTIFACT_PROMOTE_MATERIAL: 'app/artifact/promotion-request/material',
APP_TEMPLATE_DATA: 'app/template/data',
ENVIRONMENT_CATEGORIES: 'env/categories',
PROJECT_LIST_MIN: 'team/autocomplete',
USER_CHECK_ROLE: 'user/check/roles',
IMAGE_TAGGING: 'app/image-tagging',
Expand Down
8 changes: 8 additions & 0 deletions src/Common/Types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1081,3 +1081,11 @@ export interface EnvAppsMetaDTO {
appCount: number
apps: AppMeta[]
}

Comment thread
AbhishekA1509 marked this conversation as resolved.
export interface ClusterEnvironmentCategoryDTO {
Comment thread
AbhishekA1509 marked this conversation as resolved.
id: number
name: string
description?: string
}

export interface ClusterEnvironmentCategoryType extends ClusterEnvironmentCategoryDTO {}
8 changes: 8 additions & 0 deletions src/Shared/Components/Icon/Icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,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'
Expand All @@ -67,6 +68,8 @@ import { ReactComponent as ICEmail } from '@IconsV2/ic-email.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'
Expand Down Expand Up @@ -148,6 +151,7 @@ import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg'
import { ReactComponent as ICRocketGear } from '@IconsV2/ic-rocket-gear.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'
Expand Down Expand Up @@ -237,6 +241,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,
Expand All @@ -263,6 +268,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,
Expand Down Expand Up @@ -344,6 +351,7 @@ export const iconMap = {
'ic-rocket-gear': ICRocketGear,
'ic-rocket-launch': ICRocketLaunch,
'ic-selected': ICSelected,
'ic-shapes': ICShapes,
'ic-shield-check': ICShieldCheck,
'ic-sliders-vertical': ICSlidersVertical,
'ic-sort-ascending': ICSortAscending,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const SelectPicker = <OptionValue, IsMulti extends boolean>({
error,
icon,
helperText,
placeholder = 'Select a option',
placeholder = 'Select an option',
label,
showSelectedOptionIcon = true,
size = ComponentSizeType.medium,
Expand Down