Skip to content

Commit 8542271

Browse files
arunjaindevarunjaindev
authored
Merge branch 'develop' into config_file_update
2 parents bdc8331 + 28cea02 commit 8542271

File tree

512 files changed

+5741
-3345
lines changed

Some content is hidden

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

512 files changed

+5741
-3345
lines changed

‎.env

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,9 @@ ENABLE_RESTART_WORKLOAD=false
3232
ENABLE_SCOPED_VARIABLES=true
3333
DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
3434
ANNOUNCEMENT_BANNER_MSG=
35-
LOGIN_PAGE_IMAGE=
36-
LOGIN_PAGE_IMAGE_BG=
3735
HIDE_DEFAULT_CLUSTER=false
3836
GLOBAL_API_TIMEOUT=60000
3937
TRIGGER_API_TIMEOUT=60000
40-
LOGIN_DT_LOGO=
4138
SIDEBAR_DT_LOGO=
4239
ENABLE_EXTERNAL_ARGO_CD=false
4340
API_BATCH_SIZE=20
@@ -66,3 +63,4 @@ FEATURE_ACTION_AUDIOS_ENABLE=true
6663
FEATURE_APPLICATION_TEMPLATES_ENABLE=true
6764
FEATURE_CODE_MIRROR_ENABLE=false
6865
FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
66+
GATEKEEPER_URL=https://license.devtron.ai/dashboard

‎.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ src/components/app/create/CreateApp.tsx
8686
src/components/app/create/validationRules.ts
8787
src/components/app/details/AboutAppInfoModal.tsx
8888
src/components/app/details/AboutTagEditModal.tsx
89-
src/components/app/details/AppHeader.tsx
9089
src/components/app/details/appDetails/AppMetrics.tsx
9190
src/components/app/details/appDetails/AppStatusCard.tsx
9291
src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx

‎.eslintrc.js

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17+
const tsconfigPath = require('./tsconfig.json')
18+
1719
module.exports = {
1820
parser: '@typescript-eslint/parser',
19-
plugins: ['@typescript-eslint', 'react', 'prettier', 'import'],
21+
plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort'],
2022
env: {
2123
browser: true,
2224
es2021: true,
@@ -112,6 +114,26 @@ module.exports = {
112114
'import/named': 'off',
113115
'no-use-before-define': 'off',
114116
'@typescript-eslint/no-use-before-define': 'error',
117+
'simple-import-sort/imports': [
118+
'error',
119+
{
120+
groups: [
121+
// Packages `react` related packages and external packages.
122+
['^react', '^@?\\w'],
123+
// Devtron packages
124+
['^@devtron-labs'],
125+
// Internal packages.
126+
[...Object.keys(tsconfigPath.compilerOptions.paths).map((alias) => alias.replace('/*', ''))],
127+
// Side effect imports.
128+
['^\\u0000'],
129+
// Put same-folder imports, `..` and `.` last. Other relative imports.
130+
['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$',],
131+
// Style imports.
132+
[ '^.+\\.?(css|scss)$'],
133+
],
134+
},
135+
],
136+
'simple-import-sort/exports': 'error',
115137
},
116138
overrides: [
117139
{

‎.storybook/preview-head.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
<link
2-
href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap"
3-
rel="stylesheet"
4-
/>
5-
<link href="https://fonts.googleapis.com/css2?family=Inconsolata&display=swap" rel="stylesheet" />
6-
<link href="https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap" rel="stylesheet" />
1+
<link rel="stylesheet" href="../index.css" />

‎.storybook/preview.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ const preview: Preview = {
5757
<SwitchThemeDialogWrapper />
5858

5959
<div id="animated-dialog-backdrop" />
60+
<div id="visible-modal" />
6061

6162
<BaseConfirmationModal />
6263
</ConfirmationModalProvider>

‎config.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
| HIDE_DEFAULT_CLUSTER | "true" | Hide default cluster |
3131
| HIDE_EXCLUDE_INCLUDE_GIT_COMMITS | "true" | Hide exclude include git commits |
3232
| HIDE_GITOPS_OR_HELM_OPTION | "false" | Enable GitOps and Helm option |
33-
| LOGIN_DT_LOGO | "" | Devtron logo for login page |
34-
| LOGIN_PAGE_IMAGE | "" | Login page image url |
35-
| LOGIN_PAGE_IMAGE_BG | "" | Login page image background color code |
3633
| ORGANIZATION_NAME | "" | Name of the organization |
3734
| POSTHOG_ENABLED | "true" | PostHog integration status |
3835
| POSTHOG_TOKEN | XXXXXXXX | PostHog API token |

‎index.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap');
2+
@import url('https://fonts.googleapis.com/css2?family=Inconsolata&display=swap');
3+
@import url('https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap');
4+
@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;600&display=swap');
5+
16
/*
27
* Although this is duplicated but this would help us with consistent loader in case
38
* the theme is same as the system theme.

‎index.html

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@
1818
<html lang="en">
1919
<head>
2020
<meta charset="utf-8" />
21-
<link
22-
href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap"
23-
rel="stylesheet"
24-
/>
25-
<link href="https://fonts.googleapis.com/css2?family=Inconsolata&display=swap" rel="stylesheet" />
26-
<link
27-
href="https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap"
28-
rel="stylesheet"
29-
/>
3021
<link rel="stylesheet" href="./index.css" />
3122
<link rel="shortcut icon" href="/favicon.ico" />
3223
<script src="/dashboard/env-config.js"></script>

‎nginx.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ http {
1919
sendfile on;
2020
#tcp_nopush on;
2121
keepalive_timeout 65;
22+
2223
gzip on;
24+
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
25+
gzip_vary on;
26+
gzip_min_length 1024;
27+
gzip_proxied any;
28+
gzip_comp_level 6;
29+
gzip_static on;
30+
2331
include /etc/nginx/conf.d/*.conf;
2432
}

‎package.json

Lines changed: 4 additions & 2 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.10.4",
7+
"@devtron-labs/devtron-fe-common-lib": "1.10.19",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",
@@ -42,7 +42,7 @@
4242
"rxjs": "^7.5.4",
4343
"sockjs-client": "1.6.1",
4444
"tippy.js": "^6.3.7",
45-
"vite": "5.4.14",
45+
"vite": "5.4.17",
4646
"vite-plugin-require-transform": "1.0.21",
4747
"vite-plugin-svgr": "^2.4.0",
4848
"xterm": "^4.19.0",
@@ -111,6 +111,7 @@
111111
"eslint-plugin-prettier": "^5.1.2",
112112
"eslint-plugin-react": "^7.33.2",
113113
"eslint-plugin-react-hooks": "^4.6.0",
114+
"eslint-plugin-simple-import-sort": "^12.1.1",
114115
"eslint-plugin-storybook": "^0.8.0",
115116
"husky": "^7.0.4",
116117
"jest-extended": "^2.0.0",
@@ -129,6 +130,7 @@
129130
"ts-jest": "29.2.5",
130131
"ts-node": "10.9.2",
131132
"typescript": "5.5.4",
133+
"vite-plugin-compression2": "^1.3.3",
132134
"vite-plugin-image-optimizer": "^1.1.8",
133135
"vite-plugin-pwa": "^0.21.1",
134136
"vite-tsconfig-paths": "5.0.1"

0 commit comments

Comments
 (0)