Skip to content

Commit 2fca72f

Browse files
authored
Merge pull request #2868 from devtron-labs/release-candidate-v0.41.0
chore: merge rc-v0.41.0
2 parents 633aa8b + ea3648f commit 2fca72f

File tree

209 files changed

+5279
-2677
lines changed

Some content is hidden

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

209 files changed

+5279
-2677
lines changed

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ FEATURE_SWAP_TRAFFIC_ENABLE=false
6060
FEATURE_RB_SYNC_CLUSTER_ENABLE=true
6161
FEATURE_BULK_RESTART_WORKLOADS_FROM_RB=deployment,rollout,daemonset,statefulset
6262
FEATURE_DEFAULT_MERGE_STRATEGY=
63-
FEATURE_CLUSTER_MAP_ENABLE=true
6463
FEATURE_DEFAULT_LANDING_RB_ENABLE=false
6564
FEATURE_ACTION_AUDIOS_ENABLE=true
6665
FEATURE_APPLICATION_TEMPLATES_ENABLE=true

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ src/components/app/list/appList.modal.ts
126126
src/components/app/list/emptyView/Empty.tsx
127127
src/components/app/list/expandedRow/ExpandedRow.tsx
128128
src/components/app/service.ts
129-
src/components/bulkEdits/BulkEdits.tsx
130129
src/components/bulkEdits/bulkedit.utils.tsx
131130
src/components/cdPipeline/BuildCD.tsx
132131
src/components/cdPipeline/CDPipeline.tsx
@@ -370,7 +369,6 @@ src/components/workflowEditor/workflowEditor.tsx
370369
src/config/constants.ts
371370
src/config/routes.ts
372371
src/config/utils.ts
373-
src/index.tsx
374372
src/services/fetchWithFullRoute.ts
375373
src/services/service.ts
376374
src/services/service.types.ts

.eslintrc.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const tsconfigPath = require('./tsconfig.json')
1818

1919
module.exports = {
2020
parser: '@typescript-eslint/parser',
21-
plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort'],
21+
plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort', '@tanstack/query'],
2222
env: {
2323
browser: true,
2424
es2021: true,
@@ -42,6 +42,7 @@ module.exports = {
4242
'airbnb',
4343
'airbnb/hooks',
4444
'prettier',
45+
'plugin:@tanstack/query/recommended',
4546
],
4647
rules: {
4748
'prettier/prettier': ['error'],
@@ -126,9 +127,9 @@ module.exports = {
126127
// Side effect imports.
127128
['^\\u0000'],
128129
// Put same-folder imports, `..` and `.` last. Other relative imports.
129-
['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$',],
130+
['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],
130131
// Style imports.
131-
[ '^.+\\.?(css|scss)$'],
132+
['^.+\\.?(css|scss)$'],
132133
],
133134
},
134135
],

package.json

Lines changed: 3 additions & 1 deletion
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": "1.18.1",
7+
"@devtron-labs/devtron-fe-common-lib": "1.19.0",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",
@@ -70,12 +70,14 @@
7070
"devDependencies": {
7171
"@playwright/test": "^1.32.1",
7272
"@sentry/cli": "^2.2.0",
73+
"@tanstack/eslint-plugin-query": "<5",
7374
"@testing-library/jest-dom": "^5.16.2",
7475
"@testing-library/react": "^12.1.4",
7576
"@types/jest": "^27.4.1",
7677
"@types/node": "20.11.0",
7778
"@types/react": "17.0.39",
7879
"@types/react-csv": "^1.1.3",
80+
"@types/react-dates": "^21.8.6",
7981
"@types/react-dom": "17.0.13",
8082
"@types/react-router-dom": "^5.3.3",
8183
"@types/react-transition-group": "^4.4.4",

src/App.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ const App = () => {
168168
<Route path="/" render={() => <NavigationRoutes reloadVersionConfig={reloadVersionConfig} />} />
169169
<Redirect to={window._env_.K8S_CLIENT ? '/' : `${URLS.LOGIN_SSO}${location.search}`} />
170170
</Switch>
171-
<div id="visible-modal" />
172-
<div id="visible-modal-2" />
173171
</BreadcrumbStore>
174172
</ErrorBoundary>
175173
)

src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/CDPipelineDeploymentAppType.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright (c) 2024. Devtron Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
import { DeploymentAppTypes } from '@devtron-labs/devtron-fe-common-lib'
218

319
import { DeploymentAppRadioGroup } from '@Components/v2/values/chartValuesDiff/ChartValuesView.component'
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1+
/*
2+
* Copyright (c) 2024. Devtron Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
export * from './CDPipelineDeploymentAppType'

src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/types.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright (c) 2024. Devtron Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
import { DeploymentAppRadioGroupType } from '@Components/v2/values/chartValuesDiff/ChartValuesView.type'
218

319
export interface CDPipelineDeploymentAppTypeProps

src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CDStepperContent.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright (c) 2024. Devtron Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
import { ChangeEvent, useState } from 'react'
218
import { useHistory } from 'react-router-dom'
319

src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CICDStepper.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright (c) 2024. Devtron Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
import { Icon } from '@devtron-labs/devtron-fe-common-lib'
218

319
import { CICDStepperProps } from './types'

0 commit comments

Comments
 (0)