Skip to content

Commit 9167b2e

Browse files
badal773badal773
authored
Merge branch 'main' into pr-validator-fix
2 parents 99226b4 + 68391b5 commit 9167b2e

File tree

328 files changed

+11636
-11391
lines changed

Some content is hidden

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

328 files changed

+11636
-11391
lines changed

‎.eslintignore

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.eslintrc.js
66
vite.config.mts
77

8-
# The following files have eslint errors/warningssrc/App.tsx
8+
# The following files have eslint errors/warnings
99
src/App.tsx
1010
src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
1111
src/components/AppSelector/AppSelector.tsx
@@ -82,9 +82,7 @@ src/components/ClusterNodes/constants.ts
8282
src/components/Hotjar/Hotjar.tsx
8383
src/components/Jobs/ExpandedRow/ExpandedRow.tsx
8484
src/components/Jobs/JobDetails/JobDetails.tsx
85-
src/components/Jobs/JobList/JobListContainer.tsx
8685
src/components/Jobs/JobList/JobListView.tsx
87-
src/components/Jobs/JobList/JobsList.tsx
8886
src/components/Jobs/Jobs.tsx
8987
src/components/Jobs/JobsEmptyState.tsx
9088
src/components/Jobs/Service.ts
@@ -94,7 +92,6 @@ src/components/ResourceBrowser/ResourceList/ResourceList.component.tsx
9492
src/components/ResourceBrowser/ResourceList/__tests__/Sidebar.test.tsx
9593
src/components/__mocks__/monaco-editor.js
9694
src/components/__mocks__/xterm-webfont.js
97-
src/components/app/EventsLogs.tsx
9895
src/components/app/LogFilter.test.ts
9996
src/components/app/LogFilter.ts
10097
src/components/app/Overview/EnvironmentList.tsx
@@ -104,7 +101,6 @@ src/components/app/Overview/utils.tsx
104101
src/components/app/ResourceTreeNodes.tsx
105102
src/components/app/ResponsiveDrawer.tsx
106103
src/components/app/WebWorker.ts
107-
src/components/app/__tests__/EventsLogs.test.tsx
108104
src/components/app/appLabelCommon.tsx
109105
src/components/app/create/CreateApp.tsx
110106
src/components/app/create/validationRules.ts
@@ -159,16 +155,12 @@ src/components/app/details/triggerView/workflow/nodes/triggerCINode.tsx
159155
src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx
160156
src/components/app/details/triggerView/workflow/nodes/workflow.utils.tsx
161157
src/components/app/grepSSEworker.ts
162-
src/components/app/list-new/AppList.tsx
163158
src/components/app/list-new/AppListService.ts
164159
src/components/app/list-new/GenericAppList.tsx
165160
src/components/app/list-new/HelmAppList.tsx
166-
src/components/app/list/AppListView.tsx
167-
src/components/app/list/DevtronAppListContainer.tsx
168161
src/components/app/list/TriggerUrl.tsx
169162
src/components/app/list/__tests__/AppListView.test.tsx
170163
src/components/app/list/appList.modal.ts
171-
src/components/app/list/appStatus/AppStatus.tsx
172164
src/components/app/list/emptyView/Empty.tsx
173165
src/components/app/list/expandedRow/ExpandedRow.tsx
174166
src/components/app/service.ts
@@ -250,7 +242,6 @@ src/components/cluster/ClusterComponentModal.tsx
250242
src/components/cluster/ClusterForm.tsx
251243
src/components/cluster/ClusterInfoStepsModal.tsx
252244
src/components/cluster/ClusterInstallStatus.tsx
253-
src/components/cluster/Environment.tsx
254245
src/components/cluster/UseNameListDropdown.tsx
255246
src/components/cluster/cluster.service.ts
256247
src/components/cluster/cluster.util.ts
@@ -281,31 +272,27 @@ src/components/common/HiddenInput/HiddenInput.tsx
281272
src/components/common/List/List.tsx
282273
src/components/common/MultiSelect/MultiSelect.tsx
283274
src/components/common/Select/Select.tsx
284-
src/components/common/ToastBody.tsx
285275
src/components/common/ValidateForm/ValidateForm.tsx
286276
src/components/common/eaEmptyState/EAEmptyState.tsx
287277
src/components/common/edge/rectangularEdge.tsx
288278
src/components/common/edge/straightEdge.tsx
289279
src/components/common/errorBoundary.tsx
290-
src/components/common/filter/filters.tsx
291280
src/components/common/formFields/CopyButton.tsx
292281
src/components/common/formFields/CustomPassword.tsx
293282
src/components/common/formFields/DevtronSwitch.tsx
294283
src/components/common/formFields/Typeahead.tsx
295-
src/components/common/formFields/Widgets/Widgets.tsx
296284
src/components/common/helpers/Helpers.tsx
297285
src/components/common/helpers/compareVersion.ts
298286
src/components/common/helpers/isSubset.ts
299287
src/components/common/helpers/time.ts
300-
src/components/common/helpers/util.ts
288+
src/components/common/helpers/utils.tsx
301289
src/components/common/helpers/workflowURL.ts
302290
src/components/common/hooks/FileReader.ts
303291
src/components/common/hooks/__tests__/FileReader.test.tsx
304292
src/components/common/icons/Icons.tsx
305293
src/components/common/lineChart/lineChart.tsx
306294
src/components/common/navigation/Navigation.tsx
307295
src/components/common/navigation/NavigationRoutes.tsx
308-
src/components/common/security/ScanDetailsModal.tsx
309296
src/components/deploymentConfig/ChartSelectorDropdown.tsx
310297
src/components/deploymentConfig/DeploymentConfig.tsx
311298
src/components/deploymentConfig/DeploymentConfig.utils.ts
@@ -418,7 +405,6 @@ src/components/v2/appDetails/appDetails.store.ts
418405
src/components/v2/appDetails/appDetails.type.ts
419406
src/components/v2/appDetails/ea/EAAppDetail.component.tsx
420407
src/components/v2/appDetails/k8Resource/FilterResource.tsx
421-
src/components/v2/appDetails/k8Resource/K8Resource.component.tsx
422408
src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx
423409
src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
424410
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
@@ -441,7 +427,6 @@ src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.ts
441427
src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx
442428
src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx
443429
src/components/v2/appDetails/k8Resource/nodeType/NodeTree.component.tsx
444-
src/components/v2/appDetails/k8Resource/nodeType/PodHeader.component.tsx
445430
src/components/v2/appDetails/k8Resource/nodeType/PodTabSection.tsx
446431
src/components/v2/appDetails/k8Resource/nodeType/__tests__/NodeTree.component.test.ts
447432
src/components/v2/appDetails/k8Resource/nodeType/nodeType.util.ts
@@ -462,7 +447,7 @@ src/components/v2/common/ReactSelectCustomization.tsx
462447
src/components/v2/common/message.ui.tsx
463448
src/components/v2/devtronStackManager/AboutDevtronView.tsx
464449
src/components/v2/devtronStackManager/DevtronStackManager.component.tsx
465-
src/components/v2/devtronStackManager/DevtronStackManager.service.ts
450+
src/components/v2/devtronStackManager/DevtronStackManager.service.tsx
466451
src/components/v2/devtronStackManager/DevtronStackManager.tsx
467452
src/components/v2/devtronStackManager/DevtronStackManager.utils.ts
468453
src/components/v2/devtronStackManager/SuccessModalComponent.tsx
@@ -476,11 +461,9 @@ src/components/v2/utils/useSharedState.ts
476461
src/components/v2/values/ChartValues.component.tsx
477462
src/components/v2/values/chartValuesDiff/ChartRepoSelector.tsx
478463
src/components/v2/values/chartValuesDiff/ChartValuesEditor.tsx
479-
src/components/v2/values/chartValuesDiff/ChartValuesGUIView.tsx
480464
src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx
481465
src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
482466
src/components/v2/values/chartValuesDiff/ChartValuesView.tsx
483-
src/components/v2/values/chartValuesDiff/ChartValuesView.utils.ts
484467
src/components/v2/values/chartValuesDiff/ProjectUpdateModal.tsx
485468
src/components/v2/values/common/chartValues.api.ts
486469
src/components/workflowEditor/CDSuccessModal.tsx

‎.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ module.exports = {
4040
'airbnb',
4141
'airbnb/hooks',
4242
'prettier',
43+
'plugin:storybook/recommended',
4344
],
4445
rules: {
4546
'prettier/prettier': ['error'],

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@ playwright/.auth/
3636
.npmrc
3737

3838
package-lock.json
39+
40+
*storybook.log
41+
storybook-static

‎.storybook/main.ts

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import type { StorybookConfig } from '@storybook/react-vite'
2+
3+
const config: StorybookConfig = {
4+
stories: [
5+
{
6+
directory: '../src/stories',
7+
files: '*.stories.@(ts|tsx)',
8+
titlePrefix: 'Design System/',
9+
},
10+
],
11+
addons: [
12+
'@storybook/addon-links',
13+
'@storybook/addon-essentials',
14+
'@chromatic-com/storybook',
15+
'@storybook/addon-interactions',
16+
'@storybook/addon-a11y',
17+
],
18+
framework: {
19+
name: '@storybook/react-vite',
20+
options: {},
21+
},
22+
typescript: {
23+
// Disabled to prevent connection lost issue while linking common lib locally
24+
reactDocgen: false,
25+
},
26+
core: {
27+
disableTelemetry: true,
28+
},
29+
}
30+
export default config

‎.storybook/preview-head.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
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" />

‎.storybook/preview.tsx

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import React from 'react'
2+
import type { Preview } from '@storybook/react'
3+
import '../src/css/application.scss'
4+
import { BrowserRouter } from 'react-router-dom'
5+
import { ToastManagerContainer } from '@devtron-labs/devtron-fe-common-lib'
6+
7+
const preview: Preview = {
8+
parameters: {
9+
controls: {
10+
matchers: {
11+
color: /(background|color)$/i,
12+
date: /Date$/i,
13+
},
14+
},
15+
backgrounds: {
16+
values: [
17+
{
18+
name: 'Light',
19+
value: 'var(--N0)',
20+
},
21+
{
22+
name: 'Dark',
23+
value: 'var(--N700)',
24+
},
25+
],
26+
default: 'Light',
27+
},
28+
},
29+
tags: ['autodocs'],
30+
decorators: (Story) => (
31+
<>
32+
<BrowserRouter>
33+
<Story />
34+
</BrowserRouter>
35+
<ToastManagerContainer />
36+
</>
37+
),
38+
}
39+
40+
export default preview

‎Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ COPY yarn.lock .
66

77
RUN yarn install --network-timeout 600000
88

9+
COPY src/ src
10+
COPY nginx.conf .
11+
COPY tsconfig.json .
12+
COPY vite.config.mts .
913
COPY . .
1014

1115
RUN echo `git rev-parse --short HEAD` > health.html

‎Dockerfile.storybook

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM node:20-alpine AS builder
2+
3+
WORKDIR /app
4+
COPY package.json .
5+
COPY yarn.lock .
6+
7+
RUN yarn install --network-timeout 600000
8+
9+
COPY . .
10+
11+
RUN yarn build-storybook
12+
13+
FROM nginx:stable
14+
15+
COPY --from=builder /app/storybook-static/ /usr/share/nginx/html
16+
WORKDIR /usr/share/nginx/html
17+
18+
CMD ["/bin/bash", "-c", "nginx -g \"daemon off;\""]
19+
EXPOSE 80

‎package.json

Lines changed: 17 additions & 10 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": "0.3.0-patch-1",
7+
"@devtron-labs/devtron-fe-common-lib": "0.4.0-patch-1",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",
@@ -40,14 +40,13 @@
4040
"react-monaco-editor": "^0.55.0",
4141
"react-router-dom": "^5.3.4",
4242
"react-select": "5.8.0",
43-
"react-toastify": "^8.2.0",
4443
"react-virtualized": "^9.22.5",
4544
"recharts": "^2.1.9",
4645
"rollup-plugin-node-polyfills": "0.2.1",
4746
"rxjs": "^7.5.4",
4847
"sockjs-client": "1.6.1",
4948
"tippy.js": "^6.3.7",
50-
"vite": "5.4.2",
49+
"vite": "5.4.6",
5150
"vite-plugin-require-transform": "1.0.21",
5251
"vite-plugin-svgr": "^2.4.0",
5352
"xterm": "^4.19.0",
@@ -70,7 +69,9 @@
7069
"test-coverage": "npm run test -- --coverage --watchAll=false",
7170
"test:ci": "jest --watchAll=false --ci --json --coverage --testLocationInResults --outputFile=report.json",
7271
"jest": "jest",
73-
"lint-staged": "lint-staged"
72+
"lint-staged": "lint-staged",
73+
"storybook": "IS_STORYBOOK=true storybook dev -p 6006",
74+
"build-storybook": "IS_STORYBOOK=true storybook build"
7475
},
7576
"browserslist": [
7677
">0.2%",
@@ -79,8 +80,18 @@
7980
"not op_mini all"
8081
],
8182
"devDependencies": {
83+
"@chromatic-com/storybook": "^1.8.0",
8284
"@playwright/test": "^1.32.1",
8385
"@sentry/cli": "^2.2.0",
86+
"@storybook/addon-a11y": "^8.2.9",
87+
"@storybook/addon-actions": "^8.2.9",
88+
"@storybook/addon-essentials": "^8.2.9",
89+
"@storybook/addon-interactions": "^8.2.9",
90+
"@storybook/addon-links": "^8.2.9",
91+
"@storybook/blocks": "^8.2.9",
92+
"@storybook/react": "^8.2.9",
93+
"@storybook/react-vite": "^8.2.9",
94+
"@storybook/test": "^8.2.9",
8495
"@testing-library/jest-dom": "^5.16.2",
8596
"@testing-library/react": "^12.1.4",
8697
"@types/jest": "^27.4.1",
@@ -104,6 +115,7 @@
104115
"eslint-plugin-prettier": "^5.1.2",
105116
"eslint-plugin-react": "^7.33.2",
106117
"eslint-plugin-react-hooks": "^4.6.0",
118+
"eslint-plugin-storybook": "^0.8.0",
107119
"husky": "^7.0.4",
108120
"jest-extended": "^2.0.0",
109121
"jest-junit": "^13.0.0",
@@ -113,6 +125,7 @@
113125
"prettier": "^3.1.1",
114126
"react-test-render": "^1.1.2",
115127
"sass": "^1.69.7",
128+
"storybook": "^8.2.9",
116129
"ts-jest": "29.2.5",
117130
"ts-node": "10.9.2",
118131
"typescript": "5.5.4",
@@ -144,11 +157,5 @@
144157
"monaco-editor": "<rootDir>/node_modules/react-monaco-editor",
145158
"monaco-yaml": "<rootDir>/node_modules/react-monaco-editor"
146159
}
147-
},
148-
"resolutions": {
149-
"**/@typescript-eslint/eslint-plugin": "^4.33.0",
150-
"**/@typescript-eslint/parser": "^4.33.0",
151-
"react": "^17.0.2",
152-
"@types/react": "17.0.39"
153160
}
154161
}

0 commit comments

Comments
 (0)