Skip to content

Commit 83651b7

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/react-query-setup
2 parents 00a0852 + 0665233 commit 83651b7

File tree

348 files changed

+25257
-21181
lines changed

Some content is hidden

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

348 files changed

+25257
-21181
lines changed

.env

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,10 @@ FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
6969
GATEKEEPER_URL=https://license.devtron.ai/dashboard
7070
FEATURE_AI_INTEGRATION_ENABLE=false
7171
LOGIN_PAGE_IMAGE=
72+
FEATURE_ASK_DEVTRON_EXPERT=false
7273
FEATURE_MANAGE_TRAFFIC_ENABLE=false
7374
FEATURE_REDFISH_NODE_ENABLE=false
75+
FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false
76+
FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE=false
77+
FEATURE_FLUX_DEPLOYMENTS_ENABLE=false
78+
FEATURE_LINK_EXTERNAL_FLUX_ENABLE=false

.eslintignore

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ src/components/app/details/appDetails/utils.tsx
8888
src/components/app/details/cIDetails/CIDetails.tsx
8989
src/components/app/details/cIDetails/cIDetails.util.tsx
9090
src/components/app/details/cdDetails/CDDetails.tsx
91-
src/components/app/details/cdDetails/service.ts
9291
src/components/app/details/cicdHistory/History.components.tsx
9392
src/components/app/details/main.tsx
9493
src/components/app/details/metrics/BenchmarkModal.tsx
@@ -127,7 +126,6 @@ src/components/app/list/appList.modal.ts
127126
src/components/app/list/emptyView/Empty.tsx
128127
src/components/app/list/expandedRow/ExpandedRow.tsx
129128
src/components/app/service.ts
130-
src/components/app/types.ts
131129
src/components/bulkEdits/BulkEdits.tsx
132130
src/components/bulkEdits/bulkedit.utils.tsx
133131
src/components/cdPipeline/BuildCD.tsx
@@ -154,17 +152,12 @@ src/components/charts/discoverChartDetail/About.tsx
154152
src/components/charts/discoverChartDetail/ChartDeploymentList.tsx
155153
src/components/charts/discoverChartDetail/DiscoverChartDetails.tsx
156154
src/components/charts/list/ChartGroup.tsx
157-
src/components/charts/list/ChartListPopUp.tsx
158155
src/components/charts/list/ChartListPopUpRow.tsx
159-
src/components/charts/list/Deployed.tsx
160156
src/components/charts/list/DeployedChartFilters.tsx
161157
src/components/charts/list/DiscoverCharts.tsx
162158
src/components/charts/modal/ChartGroupBasicDeploy.tsx
163159
src/components/charts/modal/CreateChartGroup.tsx
164160
src/components/charts/useChartGroup.ts
165-
src/components/charts/util/ChartGroupCard.tsx
166-
src/components/charts/util/ChartSelect.tsx
167-
src/components/charts/util/ChartValueSelect.tsx
168161
src/components/checkList/AllChartsCheck.tsx
169162
src/components/checkList/AllCheckModal.tsx
170163
src/components/checkList/AppCheckList.tsx
@@ -191,7 +184,6 @@ src/components/ciPipeline/ConfigureWebhook.tsx
191184
src/components/ciPipeline/ExternalCIPipeline.tsx
192185
src/components/ciPipeline/LinkedCIPipelineEdit.tsx
193186
src/components/ciPipeline/LinkedCIPipelineView.tsx
194-
src/components/ciPipeline/SourceMaterials.tsx
195187
src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx
196188
src/components/ciPipeline/Webhook/webhook.service.ts
197189
src/components/ciPipeline/Webhook/webhook.utils.ts
@@ -241,7 +233,6 @@ src/components/common/hooks/__tests__/FileReader.test.tsx
241233
src/components/common/icons/Icons.tsx
242234
src/components/common/lineChart/lineChart.tsx
243235
src/components/common/navigation/Navigation.tsx
244-
src/components/common/navigation/NavigationRoutes.tsx
245236
src/components/dockerRegistry/Docker.tsx
246237
src/components/dockerRegistry/ManageRegistry.tsx
247238
src/components/dockerRegistry/service.tsx
@@ -355,7 +346,6 @@ src/components/v2/devtronStackManager/DevtronStackManager.component.tsx
355346
src/components/v2/devtronStackManager/DevtronStackManager.service.tsx
356347
src/components/v2/devtronStackManager/DevtronStackManager.tsx
357348
src/components/v2/devtronStackManager/DevtronStackManager.utils.ts
358-
src/components/v2/devtronStackManager/SuccessModalComponent.tsx
359349
src/components/v2/headers/ChartHeader.component.tsx
360350
src/components/v2/headers/EAHeader.component.tsx
361351
src/components/v2/index.tsx
@@ -373,7 +363,6 @@ src/components/workflowEditor/CreateWorkflow.tsx
373363
src/components/workflowEditor/DeprecatedWarningModal.tsx
374364
src/components/workflowEditor/EmptyWorkflow.tsx
375365
src/components/workflowEditor/NoGitOpsConfiguredWarning.tsx
376-
src/components/workflowEditor/NoGitOpsRepoConfiguredWarning.tsx
377366
src/components/workflowEditor/PipelineSelect.tsx
378367
src/components/workflowEditor/Workflow.tsx
379368
src/components/workflowEditor/nodes/CDNode.tsx

.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ module.exports = {
4242
'airbnb',
4343
'airbnb/hooks',
4444
'prettier',
45-
'plugin:storybook/recommended',
4645
],
4746
rules: {
4847
'prettier/prettier': ['error'],

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
cache: 'yarn'
2626

2727
- name: Install dependencies
28-
run: yarn install --frozen-lockfile
28+
run: yarn install --immutable
2929

3030
- name: Check linting issues
3131
run: yarn lint

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,12 @@ storybook-static
4343
.yalc
4444
yalc.lock
4545
.build-cache
46+
47+
.yarn/*
48+
!.yarn/cache
49+
!.yarn/patches
50+
!.yarn/plugins
51+
!.yarn/releases
52+
!.yarn/sdks
53+
!.yarn/versions
54+
.pnp.*

.lintstagedrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"*.{js,jsx,ts,tsx}": [
3-
"yarn eslint"
3+
"eslint"
44
]
55
}

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.11.0
1+
v22

.storybook/main.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.

.storybook/preview-head.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

.storybook/preview.tsx

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)