Skip to content

Commit f3078b7

Browse files
authored
Merge pull request #767 from devtron-labs/release-candidate-v0.37.0
chore: merge rc-v0.37.0
2 parents 1b29827 + 1eecf5c commit f3078b7

File tree

100 files changed

+1815
-1044
lines changed

Some content is hidden

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

100 files changed

+1815
-1044
lines changed

package-lock.json

Lines changed: 27 additions & 61 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.14.2",
3+
"version": "1.15.0",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -122,7 +122,6 @@
122122
"qrcode.react": "^4.2.0",
123123
"react-canvas-confetti": "^2.0.7",
124124
"react-dates": "^21.8.0",
125-
"react-diff-viewer-continued": "^3.4.0",
126125
"react-draggable": "^4.4.5",
127126
"react-international-phone": "^4.5.0",
128127
"react-virtualized-sticky-tree": "^3.0.0-beta18",

src/Assets/IconV2/ic-app-template.svg

Lines changed: 23 additions & 0 deletions
Loading

src/Assets/IconV2/ic-devtron-app.svg

Lines changed: 23 additions & 0 deletions
Loading

src/Assets/IconV2/ic-devtron-job.svg

Lines changed: 10 additions & 0 deletions
Loading

src/Assets/IconV2/ic-email.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-key-enter.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-spray-can.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/Img/empty-create.png

49.4 KB
Loading

src/Common/Constants.ts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,10 @@ export const Host = window?.__ORCHESTRATOR_ROOT__ ?? '/orchestrator'
1919

2020
export const DOCUMENTATION_HOME_PAGE = 'https://docs.devtron.ai'
2121
export const DEVTRON_HOME_PAGE = 'https://devtron.ai/'
22-
export const DOCUMENTATION_VERSION = '/v/v0.7'
22+
export const DOCUMENTATION_VERSION = '/devtron/v0.7'
2323
export const DISCORD_LINK = 'https://discord.devtron.ai/'
2424
export const DEFAULT_JSON_SCHEMA_URI = 'https://json-schema.org/draft/2020-12/schema'
25-
export const DOCUMENTATION = {
26-
APP_METRICS: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/applications/app-details/app-metrics`,
27-
APP_TAGS: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/applications/create-application#tags`,
28-
APP_OVERVIEW_TAGS: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/applications/overview#manage-tags`,
29-
BLOB_STORAGE: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/getting-started/install/installation-configuration#configuration-of-blob-storage`,
30-
GLOBAL_CONFIG_BUILD_INFRA: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/global-configurations/build-infra`,
31-
ENTERPRISE_LICENSE: `${DOCUMENTATION_HOME_PAGE}/enterprise-license`,
32-
KUBE_CONFIG: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/resource-browser#running-kubectl-commands-locally`,
33-
TENANT_INSTALLATION: `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/usage/software-distribution-hub/tenants`,
34-
}
25+
export const LICENSE_DASHBOARD_HOME_PAGE = 'https://license.devtron.ai/dashboard'
3526

3627
export const PATTERNS = {
3728
STRING: /^[a-zA-Z0-9_]+$/,
@@ -51,11 +42,13 @@ export const PATTERNS = {
5142
CONFIG_MAP_AND_SECRET_KEY: /^[-._a-zA-Z0-9]+$/,
5243
CONFIGMAP_AND_SECRET_NAME: /^[a-z0-9][a-z0-9-.]*[a-z0-9]$/,
5344
ALPHANUMERIC_WITH_SPECIAL_CHAR_AND_SLASH: /^[A-Za-z0-9._/-]+$/, // allow alphanumeric,(.) ,(-),(_),(/)
45+
EMAIL: /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
5446
}
5547

5648
const GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP = '/global-config/templates/devtron-apps'
5749

5850
export const URLS = {
51+
LOGIN: '/login',
5952
LOGIN_SSO: '/login/sso',
6053
PERMISSION_GROUPS: '/global-config/auth/groups',
6154
APP: '/app',

0 commit comments

Comments
 (0)