Skip to content

Commit 21811ee

Browse files
committed
Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/deployment-status-modal
2 parents 49b5b41 + d68e7cc commit 21811ee

File tree

204 files changed

+2485
-2360
lines changed

Some content is hidden

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

204 files changed

+2485
-2360
lines changed

.env

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ ENABLE_RESTART_WORKLOAD=false
3232
ENABLE_SCOPED_VARIABLES=true
3333
DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
3434
ANNOUNCEMENT_BANNER_MSG=
35+
ANNOUNCEMENT_BANNER_TYPE=help
36+
ANNOUNCEMENT_BANNER_BUTTON_TEXT=
37+
ANNOUNCEMENT_BANNER_BUTTON_LINK=
3538
HIDE_DEFAULT_CLUSTER=false
3639
GLOBAL_API_TIMEOUT=60000
3740
TRIGGER_API_TIMEOUT=60000
@@ -61,6 +64,8 @@ FEATURE_CLUSTER_MAP_ENABLE=true
6164
FEATURE_DEFAULT_LANDING_RB_ENABLE=false
6265
FEATURE_ACTION_AUDIOS_ENABLE=true
6366
FEATURE_APPLICATION_TEMPLATES_ENABLE=true
64-
FEATURE_CODE_MIRROR_ENABLE=false
67+
FEATURE_CODE_MIRROR_ENABLE=true
6568
FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
6669
GATEKEEPER_URL=https://license.devtron.ai/dashboard
70+
FEATURE_AI_INTEGRATION_ENABLE=false
71+
LOGIN_PAGE_IMAGE=

.eslintignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
vite.config.mts
77

88
# The following files have eslint errors/warnings
9-
src/App.tsx
109
src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
1110
src/components/AppSelector/ChartSelector.tsx
1211
src/components/ApplicationGroup/AppGroup.service.ts
@@ -330,7 +329,6 @@ src/components/v2/appDetails/ReleaseStatusEmptyState.tsx
330329
src/components/v2/appDetails/SyncError.component.tsx
331330
src/components/v2/appDetails/__tests__/index.store.test.ts
332331
src/components/v2/appDetails/appDetails.api.ts
333-
src/components/v2/appDetails/appDetails.type.ts
334332
src/components/v2/appDetails/ea/EAAppDetail.component.tsx
335333
src/components/v2/appDetails/k8Resource/FilterResource.tsx
336334
src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
@@ -367,7 +365,6 @@ src/components/v2/devtronStackManager/DevtronStackManager.service.tsx
367365
src/components/v2/devtronStackManager/DevtronStackManager.tsx
368366
src/components/v2/devtronStackManager/DevtronStackManager.utils.ts
369367
src/components/v2/devtronStackManager/SuccessModalComponent.tsx
370-
src/components/v2/headers/AppHeader.component.tsx
371368
src/components/v2/headers/ChartHeader.component.tsx
372369
src/components/v2/headers/EAHeader.component.tsx
373370
src/components/v2/index.tsx

config.md

Lines changed: 50 additions & 49 deletions
Large diffs are not rendered by default.

nginx-default.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
server {
22
listen 8080;
3+
listen [::]:8080;
34
root /usr/share/nginx/html;
45
index index.html index.htm;
56

package.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.12.0-beta-5",
7+
"@devtron-labs/devtron-fe-common-lib": "1.13.0-pre-3",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",
@@ -23,8 +23,6 @@
2323
"flexsearch": "^0.6.32",
2424
"jsonpath-plus": "^10.3.0",
2525
"moment": "^2.29.4",
26-
"monaco-editor": "0.44.0",
27-
"monaco-yaml": "5.1.1",
2826
"query-string": "^7.1.1",
2927
"react": "^17.0.2",
3028
"react-csv": "^2.2.2",
@@ -33,7 +31,6 @@
3331
"react-ga4": "^1.4.1",
3432
"react-gtm-module": "^2.0.11",
3533
"react-mde": "^11.5.0",
36-
"react-monaco-editor": "^0.55.0",
3734
"react-router-dom": "^5.3.4",
3835
"react-select": "5.8.0",
3936
"react-virtualized": "^9.22.5",
@@ -147,11 +144,7 @@
147144
],
148145
"setupFilesAfterEnv": [
149146
"jest-extended"
150-
],
151-
"moduleNameMapper": {
152-
"monaco-editor": "<rootDir>/node_modules/react-monaco-editor",
153-
"monaco-yaml": "<rootDir>/node_modules/react-monaco-editor"
154-
}
147+
]
155148
},
156149
"resolutions": {
157150
"nanoid": "^3.3.8",

0 commit comments

Comments
 (0)