Skip to content

Commit 633efc6

Browse files
RohitRaj011RohitRaj011
authored
Merge branch 'develop' into chore/revamp-manifest-component-header
2 parents 5cac6b0 + 4d33571 commit 633efc6

File tree

132 files changed

+5538
-3820
lines changed

Some content is hidden

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

132 files changed

+5538
-3820
lines changed

‎.eslintignore

Lines changed: 41 additions & 96 deletions
Large diffs are not rendered by default.

‎.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module.exports = {
3939
'plugin:@typescript-eslint/eslint-recommended',
4040
'airbnb',
4141
'airbnb/hooks',
42-
'plugin:prettier/recommended',
42+
'prettier',
4343
],
4444
rules: {
4545
'prettier/prettier': ['error'],
@@ -138,5 +138,5 @@ module.exports = {
138138
},
139139
'import/ignore': ['\\.png$', '\\.jpg$', '\\.svg$'],
140140
},
141-
ignorePatterns: ['.eslintrc.cjs', 'vite.config.ts'],
141+
ignorePatterns: ['.eslintrc.cjs', 'vite.config.mts'],
142142
}

‎package.json

Lines changed: 18 additions & 18 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.2.20",
7+
"@devtron-labs/devtron-fe-common-lib": "0.2.24",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",
@@ -15,7 +15,7 @@
1515
"@tippyjs/react": "4.2.6",
1616
"@typeform/embed-react": "2.20.0",
1717
"@types/marked": "4.0.8",
18-
"@vitejs/plugin-react": "^4.0.0",
18+
"@vitejs/plugin-react": "4.3.1",
1919
"command-line-parser": "^0.2.10",
2020
"compute-histogram": "^0.9.11",
2121
"dayjs": "^1.11.8",
@@ -47,7 +47,7 @@
4747
"rxjs": "^7.5.4",
4848
"sockjs-client": "1.6.1",
4949
"tippy.js": "^6.3.7",
50-
"vite": "^4.5.3",
50+
"vite": "5.4.2",
5151
"vite-plugin-require-transform": "1.0.21",
5252
"vite-plugin-svgr": "^2.4.0",
5353
"xterm": "^4.19.0",
@@ -84,16 +84,16 @@
8484
"@testing-library/jest-dom": "^5.16.2",
8585
"@testing-library/react": "^12.1.4",
8686
"@types/jest": "^27.4.1",
87-
"@types/node": "^18.16.3",
87+
"@types/node": "20.11.0",
8888
"@types/react": "17.0.39",
8989
"@types/react-csv": "^1.1.3",
9090
"@types/react-dom": "17.0.13",
9191
"@types/react-router-dom": "^5.3.3",
9292
"@types/react-transition-group": "^4.4.4",
9393
"@types/recharts": "^1.8.23",
9494
"@types/recompose": "^0.30.10",
95-
"@typescript-eslint/eslint-plugin": "^6.17.0",
96-
"@typescript-eslint/parser": "^6.17.0",
95+
"@typescript-eslint/eslint-plugin": "8.3.0",
96+
"@typescript-eslint/parser": "8.3.0",
9797
"env-cmd": "10.1.0",
9898
"eslint": "^8.56.0",
9999
"eslint-config-airbnb": "^19.0.4",
@@ -113,18 +113,18 @@
113113
"prettier": "^3.1.1",
114114
"react-test-render": "^1.1.2",
115115
"sass": "^1.69.7",
116-
"ts-jest": "^27.1.3",
117-
"ts-node": "^10.7.0",
118-
"typescript": "^4.6.2",
119-
"vite-plugin-pwa": "0.17.4",
120-
"vite-tsconfig-paths": "^4.3.2",
121-
"vitest": "^0.33.0",
122-
"workbox-core": "^7.0.0",
123-
"workbox-navigation-preload": "7.0.0",
124-
"workbox-precaching": "^7.0.0",
125-
"workbox-routing": "^7.0.0",
126-
"workbox-strategies": "7.0.0",
127-
"workbox-window": "7.0.0",
116+
"ts-jest": "29.2.5",
117+
"ts-node": "10.9.2",
118+
"typescript": "5.5.4",
119+
"vite-plugin-pwa": "0.20.2",
120+
"vite-tsconfig-paths": "5.0.1",
121+
"vitest": "2.0.5",
122+
"workbox-core": "7.1.0",
123+
"workbox-navigation-preload": "7.1.0",
124+
"workbox-precaching": "7.1.0",
125+
"workbox-routing": "7.1.0",
126+
"workbox-strategies": "7.1.0",
127+
"workbox-window": "7.1.0",
128128
"worker-loader": "3.0.8"
129129
},
130130
"jest": {

‎src/Pages/App/Details/ExternalFlux/ExternalFluxAppDetails.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ const ExternalFluxAppDetails = () => {
5050
},
5151
)
5252

53-
useEffect(() => {
54-
return () => {
53+
useEffect(
54+
() => () => {
5555
IndexStore.publishAppDetails({} as AppDetails, AppType.EXTERNAL_FLUX_APP)
5656
clearTimeout(initTimer)
57-
}
58-
}, [])
57+
},
58+
[],
59+
)
5960

6061
useEffect(() => {
6162
if (appDetailsResult && !appDetailsError) {

‎src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.tsx

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -331,18 +331,14 @@ export const AppConfig = ({ appName, resourceKind, filteredEnvIds }: AppConfigPr
331331

332332
const reloadWorkflows = async () => {
333333
const response = await getWorkflowList(appId)
334-
setState((prevState) => {
335-
return {
336-
...prevState,
337-
canDeleteApp: response.result.workflows.length === 0,
338-
workflowsRes: response.result,
339-
}
340-
})
334+
setState((prevState) => ({
335+
...prevState,
336+
canDeleteApp: response.result.workflows.length === 0,
337+
workflowsRes: response.result,
338+
}))
341339
}
342340

343-
const redirectToWorkflowEditor = () => {
344-
return getAppComposeURL(appId, APP_COMPOSE_STAGE.WORKFLOW_EDITOR, isJob)
345-
}
341+
const redirectToWorkflowEditor = () => getAppComposeURL(appId, APP_COMPOSE_STAGE.WORKFLOW_EDITOR, isJob)
346342

347343
const deleteAppHandler = () => {
348344
deleteApp(appId)
@@ -392,14 +388,12 @@ export const AppConfig = ({ appName, resourceKind, filteredEnvIds }: AppConfigPr
392388
const reloadEnvironments = () => {
393389
fetchEnvironments()
394390
.then(({ updatedEnvs, isBaseConfigProtectionEnabled, configProtections }) => {
395-
setState((prevState) => {
396-
return {
397-
...prevState,
398-
environmentList: updatedEnvs,
399-
isBaseConfigProtected: isBaseConfigProtectionEnabled,
400-
configProtectionData: configProtections,
401-
}
402-
})
391+
setState((prevState) => ({
392+
...prevState,
393+
environmentList: updatedEnvs,
394+
isBaseConfigProtected: isBaseConfigProtectionEnabled,
395+
configProtectionData: configProtections,
396+
}))
403397
})
404398
.catch((errors) => {
405399
showError(errors)

‎src/Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.utils.ts

Lines changed: 42 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -28,44 +28,42 @@ const isCommonUnlocked = (stage, isGitOpsConfigurationRequired) =>
2828
stage === STAGE_NAME.CD_PIPELINE ||
2929
stage === STAGE_NAME.CHART_ENV_CONFIG
3030

31-
export const isUnlocked = (stage: string, isGitOpsConfigurationRequired?: boolean): AppStageUnlockedType => {
32-
return {
33-
material:
34-
stage === STAGE_NAME.APP ||
35-
stage === STAGE_NAME.GIT_MATERIAL ||
36-
stage === STAGE_NAME.CI_CONFIG ||
37-
stage === STAGE_NAME.CI_PIPELINE ||
38-
stage === STAGE_NAME.DEPLOYMENT_TEMPLATE ||
39-
stage === STAGE_NAME.GITOPS_CONFIG ||
40-
stage === STAGE_NAME.CD_PIPELINE ||
41-
stage === STAGE_NAME.CHART_ENV_CONFIG,
42-
dockerBuildConfig:
43-
stage === STAGE_NAME.GIT_MATERIAL ||
44-
stage === STAGE_NAME.CI_CONFIG ||
45-
stage === STAGE_NAME.CI_PIPELINE ||
46-
stage === STAGE_NAME.DEPLOYMENT_TEMPLATE ||
47-
stage === STAGE_NAME.GITOPS_CONFIG ||
48-
stage === STAGE_NAME.CD_PIPELINE ||
49-
stage === STAGE_NAME.CHART_ENV_CONFIG,
50-
deploymentTemplate:
51-
stage === STAGE_NAME.CI_CONFIG ||
52-
stage === STAGE_NAME.CI_PIPELINE ||
53-
stage === STAGE_NAME.DEPLOYMENT_TEMPLATE ||
54-
stage === STAGE_NAME.GITOPS_CONFIG ||
55-
stage === STAGE_NAME.CD_PIPELINE ||
56-
stage === STAGE_NAME.CHART_ENV_CONFIG,
57-
gitOpsConfig:
58-
stage === STAGE_NAME.CI_PIPELINE ||
59-
stage === STAGE_NAME.DEPLOYMENT_TEMPLATE ||
60-
stage === STAGE_NAME.GITOPS_CONFIG ||
61-
stage === STAGE_NAME.CD_PIPELINE ||
62-
stage === STAGE_NAME.CHART_ENV_CONFIG,
63-
workflowEditor: isCommonUnlocked(stage, isGitOpsConfigurationRequired),
64-
configmap: isCommonUnlocked(stage, isGitOpsConfigurationRequired),
65-
secret: isCommonUnlocked(stage, isGitOpsConfigurationRequired),
66-
envOverride: isCommonUnlocked(stage, isGitOpsConfigurationRequired),
67-
}
68-
}
31+
export const isUnlocked = (stage: string, isGitOpsConfigurationRequired?: boolean): AppStageUnlockedType => ({
32+
material:
33+
stage === STAGE_NAME.APP ||
34+
stage === STAGE_NAME.GIT_MATERIAL ||
35+
stage === STAGE_NAME.CI_CONFIG ||
36+
stage === STAGE_NAME.CI_PIPELINE ||
37+
stage === STAGE_NAME.DEPLOYMENT_TEMPLATE ||
38+
stage === STAGE_NAME.GITOPS_CONFIG ||
39+
stage === STAGE_NAME.CD_PIPELINE ||
40+
stage === STAGE_NAME.CHART_ENV_CONFIG,
41+
dockerBuildConfig:
42+
stage === STAGE_NAME.GIT_MATERIAL ||
43+
stage === STAGE_NAME.CI_CONFIG ||
44+
stage === STAGE_NAME.CI_PIPELINE ||
45+
stage === STAGE_NAME.DEPLOYMENT_TEMPLATE ||
46+
stage === STAGE_NAME.GITOPS_CONFIG ||
47+
stage === STAGE_NAME.CD_PIPELINE ||
48+
stage === STAGE_NAME.CHART_ENV_CONFIG,
49+
deploymentTemplate:
50+
stage === STAGE_NAME.CI_CONFIG ||
51+
stage === STAGE_NAME.CI_PIPELINE ||
52+
stage === STAGE_NAME.DEPLOYMENT_TEMPLATE ||
53+
stage === STAGE_NAME.GITOPS_CONFIG ||
54+
stage === STAGE_NAME.CD_PIPELINE ||
55+
stage === STAGE_NAME.CHART_ENV_CONFIG,
56+
gitOpsConfig:
57+
stage === STAGE_NAME.CI_PIPELINE ||
58+
stage === STAGE_NAME.DEPLOYMENT_TEMPLATE ||
59+
stage === STAGE_NAME.GITOPS_CONFIG ||
60+
stage === STAGE_NAME.CD_PIPELINE ||
61+
stage === STAGE_NAME.CHART_ENV_CONFIG,
62+
workflowEditor: isCommonUnlocked(stage, isGitOpsConfigurationRequired),
63+
configmap: isCommonUnlocked(stage, isGitOpsConfigurationRequired),
64+
secret: isCommonUnlocked(stage, isGitOpsConfigurationRequired),
65+
envOverride: isCommonUnlocked(stage, isGitOpsConfigurationRequired),
66+
})
6967

7068
export const getCompletedStep = (
7169
_isUnlocked: AppStageUnlockedType,
@@ -301,14 +299,12 @@ export const isCDPipelineCreated = (responseArr: AppConfigStatusItemType[]) => {
301299

302300
export const transformEnvConfig = ({ resourceConfig }: EnvConfigDTO) => {
303301
const updatedEnvConfig = resourceConfig.reduce<EnvConfigType>(
304-
(acc, curr) => {
305-
return {
306-
...acc,
307-
deploymentTemplate: curr.type === ConfigResourceType.DeploymentTemplate ? curr : acc.deploymentTemplate,
308-
configmaps: curr.type === ConfigResourceType.ConfigMap ? [...acc.configmaps, curr] : acc.configmaps,
309-
secrets: curr.type === ConfigResourceType.Secret ? [...acc.secrets, curr] : acc.secrets,
310-
}
311-
},
302+
(acc, curr) => ({
303+
...acc,
304+
deploymentTemplate: curr.type === ConfigResourceType.DeploymentTemplate ? curr : acc.deploymentTemplate,
305+
configmaps: curr.type === ConfigResourceType.ConfigMap ? [...acc.configmaps, curr] : acc.configmaps,
306+
secrets: curr.type === ConfigResourceType.Secret ? [...acc.secrets, curr] : acc.secrets,
307+
}),
312308
{
313309
deploymentTemplate: null,
314310
configmaps: [],

0 commit comments

Comments
 (0)