Skip to content

Commit 01d76bc

Browse files
author
Mukul Tayal
committed
Merge branch 'main' of https://github.com/devtron-labs/dashboard into terminal_events-to-sentry
2 parents 281baf8 + df74a43 commit 01d76bc

File tree

719 files changed

+77981
-38842
lines changed

Some content is hidden

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

719 files changed

+77981
-38842
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ HIDE_DEPLOYMENT_GROUPS=true
2323
HIDE_GITOPS_OR_HELM_OPTION=true
2424
CONFIGURABLE_TIMEOUT=
2525
HIDE_APPLICATION_GROUPS=true
26-
REACT_APP_K8S_CLIENT=false
26+
K8S_CLIENT=false
2727
CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL=7000
2828
CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7
2929
ENABLE_CHART_SEARCH_IN_HELM_DEPLOY=false

.env.development

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
REACT_APP_ORCHESTRATOR_ROOT="/orchestrator"
2-
REACT_APP_GRAFANA_ORG_ID=2
3-
REACT_APP_K8S_CLIENT=false
1+
VITE_ORCHESTRATOR_ROOT="/orchestrator"
2+
VITE_GRAFANA_ORG_ID=2
3+
VITE_K8S_CLIENT=false
4+
VITE_NODE_ENV="development"
5+
BASE_URL="/dashboard"

.env.k8sApp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
HIDE_DISCORD=true
1+
VITE_HIDE_DISCORD=true
22
K8S_CLIENT=true

.env.production

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
REACT_APP_ORCHESTRATOR_ROOT="/orchestrator"
2-
REACT_APP_GRAFANA_ORG_ID=2
1+
VITE_ORCHESTRATOR_ROOT="/orchestrator"
2+
VITE_GRAFANA_ORG_ID=2
3+
VITE_NODE_ENV="production"
4+
BASE_URL="/dashboard"

.eslintignore

100644100755
Lines changed: 35 additions & 113 deletions
Large diffs are not rendered by default.

.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ module.exports = {
22
parser: '@typescript-eslint/parser',
33
plugins: ['@typescript-eslint', 'react', 'prettier'],
44
env: {
5-
commonjs: true,
65
browser: true,
76
// ESLint 6 supports till ES2020 only
87
es2020: true,
@@ -112,5 +111,5 @@ module.exports = {
112111
extensions: ['.js', '.jsx', '.ts', '.tsx'],
113112
},
114113
},
115-
},
114+
}
116115
}

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Use Node.js
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version-file: '.nvmrc'
2626
cache: 'yarn'

.github/workflows/playwright.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
timeout-minutes: 60
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-node@v3
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-node@v4
1414
with:
1515
node-version: 16
1616
- name: Install dependencies
@@ -19,7 +19,7 @@ jobs:
1919
run: npx playwright install --with-deps
2020
- name: Run Playwright tests
2121
run: npx playwright test
22-
- uses: actions/upload-artifact@v3
22+
- uses: actions/upload-artifact@v4
2323
if: always()
2424
with:
2525
name: playwright-report

.github/workflows/test-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Checkout
8-
uses: actions/checkout@v3
8+
uses: actions/checkout@v4
99
- name: Jest coverage report
1010
uses: ArtiomTr/[email protected]
1111
id: coverage

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# production
1212
/build
13+
/dist
1314

1415
# misc
1516
.DS_Store

0 commit comments

Comments
 (0)