Skip to content

Commit 757e9c1

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/app-details-chat
2 parents 1a4017d + 0cbc139 commit 757e9c1

File tree

175 files changed

+2916
-5933
lines changed

Some content is hidden

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

175 files changed

+2916
-5933
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,5 @@ GATEKEEPER_URL=https://license.devtron.ai/dashboard
7070
FEATURE_AI_INTEGRATION_ENABLE=false
7171
LOGIN_PAGE_IMAGE=
7272
FEATURE_ASK_DEVTRON_EXPERT=false
73+
FEATURE_MANAGE_TRAFFIC_ENABLE=false
7374
FEATURE_REDFISH_NODE_ENABLE=false

.eslintignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ vite.config.mts
99
src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
1010
src/components/AppSelector/ChartSelector.tsx
1111
src/components/ApplicationGroup/AppGroup.service.ts
12-
src/components/ApplicationGroup/AppGroup.types.ts
1312
src/components/ApplicationGroup/AppGroup.utils.ts
1413
src/components/ApplicationGroup/AppGroupAppFilter.components.tsx
15-
src/components/ApplicationGroup/AppGroupAppFilter.tsx
1614
src/components/ApplicationGroup/AppGroupDetailsRoute.tsx
1715
src/components/ApplicationGroup/AppGroupRoute.tsx
1816
src/components/ApplicationGroup/Constants.ts
@@ -23,7 +21,6 @@ src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx
2321
src/components/ApplicationGroup/Details/EnvCIDetails/__test__/EnvCIDetails.test.tsx
2422
src/components/ApplicationGroup/Details/EnvironmentConfig/__test__/ApplicationRoutes.test.tsx
2523
src/components/ApplicationGroup/Details/EnvironmentConfig/__test__/EnvConfig.test.tsx
26-
src/components/ApplicationGroup/Details/EnvironmentOverview/EnvironmentOverview.tsx
2724
src/components/ApplicationGroup/Details/EnvironmentOverview/HibernateModal.tsx
2825
src/components/ApplicationGroup/Details/EnvironmentOverview/HibernateStatusListDrawer.tsx
2926
src/components/ApplicationGroup/Details/EnvironmentOverview/HibernateStatusRow.tsx
@@ -130,7 +127,6 @@ src/components/app/list/appList.modal.ts
130127
src/components/app/list/emptyView/Empty.tsx
131128
src/components/app/list/expandedRow/ExpandedRow.tsx
132129
src/components/app/service.ts
133-
src/components/app/types.ts
134130
src/components/bulkEdits/BulkEdits.tsx
135131
src/components/bulkEdits/bulkedit.utils.tsx
136132
src/components/cdPipeline/BuildCD.tsx
@@ -358,7 +354,6 @@ src/components/v2/devtronStackManager/DevtronStackManager.component.tsx
358354
src/components/v2/devtronStackManager/DevtronStackManager.service.tsx
359355
src/components/v2/devtronStackManager/DevtronStackManager.tsx
360356
src/components/v2/devtronStackManager/DevtronStackManager.utils.ts
361-
src/components/v2/devtronStackManager/SuccessModalComponent.tsx
362357
src/components/v2/headers/ChartHeader.component.tsx
363358
src/components/v2/headers/EAHeader.component.tsx
364359
src/components/v2/index.tsx
@@ -372,12 +367,10 @@ src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
372367
src/components/v2/values/chartValuesDiff/ChartValuesView.tsx
373368
src/components/v2/values/chartValuesDiff/ProjectUpdateModal.tsx
374369
src/components/v2/values/common/chartValues.api.ts
375-
src/components/workflowEditor/CDSuccessModal.tsx
376370
src/components/workflowEditor/CreateWorkflow.tsx
377371
src/components/workflowEditor/DeprecatedWarningModal.tsx
378372
src/components/workflowEditor/EmptyWorkflow.tsx
379373
src/components/workflowEditor/NoGitOpsConfiguredWarning.tsx
380-
src/components/workflowEditor/NoGitOpsRepoConfiguredWarning.tsx
381374
src/components/workflowEditor/PipelineSelect.tsx
382375
src/components/workflowEditor/Workflow.tsx
383376
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'],

.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
}

.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.

.storybook/storybook.css

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

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN yarn install --frozen-lockfile --network-timeout 600000
1010
COPY . .
1111

1212
RUN echo `git rev-parse --short HEAD` > health.html && \
13+
echo "" >> .env && \
1314
echo "SENTRY_RELEASE_VERSION=dashboard@$(git rev-parse --short HEAD)" >> .env && \
1415
yarn build
1516

0 commit comments

Comments
 (0)