Skip to content

Commit 6c679b2

Browse files
committed
Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/devtron-license
2 parents 5a68c16 + 3822516 commit 6c679b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1284
-70
lines changed

package-lock.json

Lines changed: 234 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 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.9.5-beta-13",
3+
"version": "1.9.8-beta-1",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -108,6 +108,7 @@
108108
"@replit/codemirror-indentation-markers": "6.5.3",
109109
"@replit/codemirror-vscode-keymap": "6.0.2",
110110
"@types/react-dates": "^21.8.6",
111+
"@xyflow/react": "12.4.2",
111112
"@uiw/codemirror-extensions-hyper-link": "4.23.10",
112113
"@uiw/codemirror-theme-github": "4.23.7",
113114
"@uiw/react-codemirror": "4.23.7",

src/Assets/IconV2/ic-card-stack.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-copy.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-new.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Common/Constants.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ export const PATTERNS = {
5050
ALPHANUMERIC_WITH_SPECIAL_CHAR_AND_SLASH: /^[A-Za-z0-9._/-]+$/, // allow alphanumeric,(.) ,(-),(_),(/)
5151
}
5252

53+
const GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP = '/global-config/templates/devtron-apps'
54+
5355
export const URLS = {
5456
LOGIN_SSO: '/login/sso',
5557
PERMISSION_GROUPS: '/global-config/auth/groups',
@@ -80,9 +82,15 @@ export const URLS = {
8082
NETWORK_STATUS_INTERFACE: '/network-status-interface',
8183
RESOURCE_BROWSER: '/resource-browser',
8284
COMPARE_CLUSTERS: '/compare-clusters',
85+
APP_CONFIG: 'edit',
86+
GLOBAL_CONFIG: '/global-config',
8387
CONFIG_DRIFT: 'config-drift',
88+
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP,
89+
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_CREATE: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/create`,
90+
// NOTE: using appId since we are re-using AppConfig component
91+
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_DETAIL: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/detail/:appId`,
8492
LICENSE_AUTH: '/license-auth',
85-
}
93+
} as const
8694

8795
export const ROUTES = {
8896
APP: 'app',
@@ -142,8 +150,9 @@ export const ROUTES = {
142150
CD_TRIGGER_POST: 'app/cd-pipeline/trigger',
143151
DELETE_RESOURCE: 'k8s/resource/delete',
144152
NODE_CAPACITY: 'k8s/capacity/node',
153+
RESOURCE_TEMPLATE: 'resource/template',
145154
ENVIRONMENT_DATA: 'global/environment-variables',
146-
}
155+
} as const
147156

148157
export enum KEY_VALUE {
149158
KEY = 'key',

0 commit comments

Comments
 (0)