Merge branch 'release-candidate-v0.41.0' into fix/cm-secret-wrapper

Author: RohitRaj011

.env

@@ -60,7 +60,6 @@ FEATURE_SWAP_TRAFFIC_ENABLE=false
 FEATURE_RB_SYNC_CLUSTER_ENABLE=true
 FEATURE_BULK_RESTART_WORKLOADS_FROM_RB=deployment,rollout,daemonset,statefulset
 FEATURE_DEFAULT_MERGE_STRATEGY=
-FEATURE_CLUSTER_MAP_ENABLE=true
 FEATURE_DEFAULT_LANDING_RB_ENABLE=false
 FEATURE_ACTION_AUDIOS_ENABLE=true
 FEATURE_APPLICATION_TEMPLATES_ENABLE=true

.eslintignore

@@ -126,7 +126,6 @@ src/components/app/list/appList.modal.ts
 src/components/app/list/emptyView/Empty.tsx
 src/components/app/list/expandedRow/ExpandedRow.tsx
 src/components/app/service.ts
-src/components/bulkEdits/BulkEdits.tsx
 src/components/bulkEdits/bulkedit.utils.tsx
 src/components/cdPipeline/BuildCD.tsx
 src/components/cdPipeline/CDPipeline.tsx
@@ -370,7 +369,6 @@ src/components/workflowEditor/workflowEditor.tsx
 src/config/constants.ts
 src/config/routes.ts
 src/config/utils.ts
-src/index.tsx
 src/services/fetchWithFullRoute.ts
 src/services/service.ts
 src/services/service.types.ts

.eslintrc.js

@@ -18,7 +18,7 @@ const tsconfigPath = require('./tsconfig.json')
 
 module.exports = {
     parser: '@typescript-eslint/parser',
-    plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort'],
+    plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort', '@tanstack/query'],
     env: {
         browser: true,
         es2021: true,
@@ -42,6 +42,7 @@ module.exports = {
         'airbnb',
         'airbnb/hooks',
         'prettier',
+        'plugin:@tanstack/query/recommended',
     ],
     rules: {
         'prettier/prettier': ['error'],
@@ -126,9 +127,9 @@ module.exports = {
                     // Side effect imports.
                     ['^\\u0000'],
                     // Put same-folder imports, `..` and `.` last. Other relative imports.
-                    ['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$',],
+                    ['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],
                     // Style imports.
-                    [ '^.+\\.?(css|scss)$'],
+                    ['^.+\\.?(css|scss)$'],
                 ],
             },
         ],

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.18.1",
+        "@devtron-labs/devtron-fe-common-lib": "1.18.1-pre-5",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -70,12 +70,14 @@
     "devDependencies": {
         "@playwright/test": "^1.32.1",
         "@sentry/cli": "^2.2.0",
+        "@tanstack/eslint-plugin-query": "<5",
         "@testing-library/jest-dom": "^5.16.2",
         "@testing-library/react": "^12.1.4",
         "@types/jest": "^27.4.1",
         "@types/node": "20.11.0",
         "@types/react": "17.0.39",
         "@types/react-csv": "^1.1.3",
+        "@types/react-dates": "^21.8.6",
         "@types/react-dom": "17.0.13",
         "@types/react-router-dom": "^5.3.3",
         "@types/react-transition-group": "^4.4.4",

src/App.tsx

@@ -168,8 +168,6 @@ const App = () => {
                         <Route path="/" render={() => <NavigationRoutes reloadVersionConfig={reloadVersionConfig} />} />
                         <Redirect to={window._env_.K8S_CLIENT ? '/' : `${URLS.LOGIN_SSO}${location.search}`} />
                     </Switch>
-                    <div id="visible-modal" />
-                    <div id="visible-modal-2" />
                 </BreadcrumbStore>
             </ErrorBoundary>
         )

src/Pages/App/CreateAppModal/CreateAppModal.component.tsx

@@ -36,7 +36,7 @@ import { getHostURLConfiguration } from '@Services/service'
 
 import ApplicationInfoForm from './ApplicationInfoForm'
 import { CloneApplicationSelectionList } from './CloneApplicationSelectionList'
-import { createAppInitialFormErrorState, createAppInitialFormState } from './constants'
+import { createAppInitialFormErrorState, createAppInitialFormState, PROJECT_SELECT_INPUT_ID } from './constants'
 import HeaderSection from './HeaderSection'
 import { createApp } from './service'
 import Sidebar from './Sidebar'
@@ -374,7 +374,7 @@ const CreateAppModal = ({ isJobView, handleClose }: CreateAppModalProps) => {
     }
 
     return (
-        <Drawer position="right" width="1024px" onEscape={handleClose}>
+        <Drawer position="right" width="1024px" onEscape={handleClose} initialFocus={`#${PROJECT_SELECT_INPUT_ID}`}>
             <div className="h-100 bg__modal--primary flexbox-col dc__overflow-hidden">
                 <HeaderSection isJobView={isJobView} handleClose={handleClose} isCloseDisabled={isSubmitting} />
                 <div className="flexbox flex-grow-1 dc__overflow-hidden">

src/Pages/App/CreateAppModal/ProjectSelector.tsx

@@ -24,6 +24,7 @@ import {
 
 import { ReactComponent as ICFolderColor } from '@Icons/ic-folder-color.svg'
 
+import { PROJECT_SELECT_INPUT_ID } from './constants'
 import { CreateAppFormStateType, ProjectSelectorProps } from './types'
 
 const ProjectSelector = ({ selectedProjectId, handleProjectIdChange, error }: ProjectSelectorProps) => {
@@ -47,7 +48,7 @@ const ProjectSelector = ({ selectedProjectId, handleProjectIdChange, error }: Pr
         <div className="w-300">
             <SelectPicker
                 icon={<ICFolderColor />}
-                inputId="project"
+                inputId={PROJECT_SELECT_INPUT_ID}
                 options={projectOptions}
                 label="Project"
                 required
@@ -60,7 +61,6 @@ const ProjectSelector = ({ selectedProjectId, handleProjectIdChange, error }: Pr
                 value={selectedProject}
                 onChange={handleChange}
                 error={error}
-                autoFocus
             />
         </div>
     )

src/Pages/App/CreateAppModal/constants.ts

@@ -39,3 +39,5 @@ export const createAppInitialFormErrorState: CreateAppFormErrorStateType = {
     gitMaterials: null,
     workflowConfig: null,
 }
+
+export const PROJECT_SELECT_INPUT_ID = 'project'

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DTChartSelector.tsx

@@ -120,7 +120,7 @@ const ChartSelectorDropdown = ({
                     />
                 </div>
             </PopupMenu.Button>
-            <PopupMenu.Body rootClassName="dc__overflow-auto mxh-350 w-400 dc__border br-4">
+            <PopupMenu.Body noBackDrop rootClassName="dc__overflow-auto mxh-350 w-400 dc__border br-4">
                 <>
                     {customCharts.length > 0 && (
                         <div