Merge branch 'develop' of https://github.com/devtron-labs/dashboard into fix-ng-changes-develop-sync

Author: AbhishekA1509

.env

@@ -61,7 +61,7 @@ FEATURE_CLUSTER_MAP_ENABLE=true
 FEATURE_DEFAULT_LANDING_RB_ENABLE=false
 FEATURE_ACTION_AUDIOS_ENABLE=true
 FEATURE_APPLICATION_TEMPLATES_ENABLE=true
-FEATURE_CODE_MIRROR_ENABLE=false
-FEATURE_EXPERIMENTAL_THEMING_ENABLE=true
+FEATURE_CODE_MIRROR_ENABLE=true
 FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
 GATEKEEPER_URL=https://license.devtron.ai/dashboard
+FEATURE_AI_INTEGRATION_ENABLE=false

.eslintignore

@@ -36,7 +36,6 @@ src/components/ApplicationGroup/SearchBar.tsx
 src/components/CIPipelineN/AdvancedConfigOptions.tsx
 src/components/CIPipelineN/Build.tsx
 src/components/CIPipelineN/CIPipeline.tsx
-src/components/CIPipelineN/ConditionContainer.tsx
 src/components/CIPipelineN/CustomImageTags.tsx
 src/components/CIPipelineN/CustomInputOutputVariables.tsx
 src/components/CIPipelineN/CustomInputVariableSelect.tsx
@@ -86,7 +85,6 @@ src/components/app/create/CreateApp.tsx
 src/components/app/create/validationRules.ts
 src/components/app/details/AboutAppInfoModal.tsx
 src/components/app/details/AboutTagEditModal.tsx
-src/components/app/details/AppHeader.tsx
 src/components/app/details/appDetails/AppMetrics.tsx
 src/components/app/details/appDetails/AppStatusCard.tsx
 src/components/app/details/appDetails/DeploymentStatusDetailModal.tsx
@@ -385,7 +383,6 @@ src/components/v2/values/chartValuesDiff/ProjectUpdateModal.tsx
 src/components/v2/values/common/chartValues.api.ts
 src/components/workflowEditor/CDSuccessModal.tsx
 src/components/workflowEditor/CreateWorkflow.tsx
-src/components/workflowEditor/DeprecatedPipelineWarning.tsx
 src/components/workflowEditor/DeprecatedWarningModal.tsx
 src/components/workflowEditor/EmptyWorkflow.tsx
 src/components/workflowEditor/NoGitOpsConfiguredWarning.tsx

.eslintrc.js

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+const tsconfigPath = require('./tsconfig.json')
+
 module.exports = {
     parser: '@typescript-eslint/parser',
-    plugins: ['@typescript-eslint', 'react', 'prettier', 'import'],
+    plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort'],
     env: {
         browser: true,
         es2021: true,
@@ -112,6 +114,26 @@ module.exports = {
         'import/named': 'off',
         'no-use-before-define': 'off',
         '@typescript-eslint/no-use-before-define': 'error',
+        'simple-import-sort/imports': [
+            'error',
+            {
+                groups: [
+                    // Packages `react` related packages and external packages.
+                    ['^react', '^@?\\w'],
+                    // Devtron packages
+                    ['^@devtron-labs'],
+                    // Internal packages.
+                    [...Object.keys(tsconfigPath.compilerOptions.paths).map((alias) => alias.replace('/*', ''))],
+                    // Side effect imports.
+                    ['^\\u0000'],
+                    // Put same-folder imports, `..` and `.` last. Other relative imports.
+                    ['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$',],
+                    // Style imports.
+                    [ '^.+\\.?(css|scss)$'],
+                ],
+            },
+        ],
+        'simple-import-sort/exports': 'error',
     },
     overrides: [
         {

.storybook/preview.tsx

@@ -14,6 +14,7 @@ import {
     useTheme,
 } from '@devtron-labs/devtron-fe-common-lib'
 import  { SwitchThemeDialog } from '../src/Pages/Shared'
+import './storybook.css'
 
 const SwitchThemeDialogWrapper = () => {
     const { showThemeSwitcherDialog, themePreference, handleThemeSwitcherDialogVisibilityChange } = useTheme()
@@ -22,7 +23,7 @@ const SwitchThemeDialogWrapper = () => {
     }
 
     return (
-        showThemeSwitcherDialog ? <SwitchThemeDialog initialThemePreference={themePreference} handleClose={handleClose} disableAPICalls /> : null
+        showThemeSwitcherDialog ? <SwitchThemeDialog initialThemePreference={themePreference} handleClose={handleClose} disableAPICalls handleUpdateUserThemePreference={noop} /> : null
     )
 }
 
@@ -37,9 +38,7 @@ const preview: Preview = {
     },
     decorators: (Story) => {
         if (!window._env_) {
-            window._env_ = {
-                FEATURE_EXPERIMENTAL_THEMING_ENABLE: true,
-            } as customEnv
+            window._env_ = {} as customEnv
         }
 
         return (
@@ -58,6 +57,7 @@ const preview: Preview = {
                     <SwitchThemeDialogWrapper />
 
                     <div id="animated-dialog-backdrop" />
+                    <div id="visible-modal" />
 
                     <BaseConfirmationModal />
                 </ConfirmationModalProvider>

.storybook/storybook.css

@@ -0,0 +1,3 @@
+body {
+    background: var(--bg-primary);
+}

config.md

@@ -45,6 +45,9 @@
 | TRIGGER_API_TIMEOUT                          | 60000      | Default timeout for all API requests for Trigger calls (Deploy artifacts, charts) in DASHBOARD                   |
 | FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS | "true" | Would hide the user direct permissions for non-super admin users in User Permissions |
 | FEATURE_ACTION_AUDIOS_ENABLE                 | true         | Would enable audios in dashboard   |
-| FEATURE_EXPERIMENTAL_THEMING_ENABLE                       | true         | Would enable theming in dashboard   |
+| FEATURE_EXTERNAL_FLUX_CD_ENABLE | false |  To enable flux cd option in app list page |
+| FEATURE_BULK_RESTART_WORKLOADS_FROM_RB | deployment,rollout,daemonset,statefulset | Enables the bulk operations in the resource browser for specific workload type. | 
+| FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE | false | If enabled user can pass the manual gitops repo |
+| SENTRY_RELEASE_VERSION |  | Sentry release Version |
 
 # DASHBOARD CONFIG SECRET

nginx.conf

@@ -19,6 +19,14 @@ http {
     sendfile        on;
     #tcp_nopush     on;
     keepalive_timeout  65;
+
     gzip  on;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml;
+    gzip_vary on;
+    gzip_min_length 1024;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_static on;
+
     include /etc/nginx/conf.d/*.conf;
 }

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.10.0-patch-8-ng",
+        "@devtron-labs/devtron-fe-common-lib": "1.12.0-pre-8",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -23,8 +23,6 @@
         "flexsearch": "^0.6.32",
         "jsonpath-plus": "^10.3.0",
         "moment": "^2.29.4",
-        "monaco-editor": "0.44.0",
-        "monaco-yaml": "5.1.1",
         "query-string": "^7.1.1",
         "react": "^17.0.2",
         "react-csv": "^2.2.2",
@@ -33,7 +31,6 @@
         "react-ga4": "^1.4.1",
         "react-gtm-module": "^2.0.11",
         "react-mde": "^11.5.0",
-        "react-monaco-editor": "^0.55.0",
         "react-router-dom": "^5.3.4",
         "react-select": "5.8.0",
         "react-virtualized": "^9.22.5",
@@ -42,7 +39,7 @@
         "rxjs": "^7.5.4",
         "sockjs-client": "1.6.1",
         "tippy.js": "^6.3.7",
-        "vite": "5.4.14",
+        "vite": "5.4.17",
         "vite-plugin-require-transform": "1.0.21",
         "vite-plugin-svgr": "^2.4.0",
         "xterm": "^4.19.0",
@@ -111,6 +108,7 @@
         "eslint-plugin-prettier": "^5.1.2",
         "eslint-plugin-react": "^7.33.2",
         "eslint-plugin-react-hooks": "^4.6.0",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
         "eslint-plugin-storybook": "^0.8.0",
         "husky": "^7.0.4",
         "jest-extended": "^2.0.0",
@@ -129,6 +127,7 @@
         "ts-jest": "29.2.5",
         "ts-node": "10.9.2",
         "typescript": "5.5.4",
+        "vite-plugin-compression2": "^1.3.3",
         "vite-plugin-image-optimizer": "^1.1.8",
         "vite-plugin-pwa": "^0.21.1",
         "vite-tsconfig-paths": "5.0.1"
@@ -145,11 +144,7 @@
         ],
         "setupFilesAfterEnv": [
             "jest-extended"
-        ],
-        "moduleNameMapper": {
-            "monaco-editor": "<rootDir>/node_modules/react-monaco-editor",
-            "monaco-yaml": "<rootDir>/node_modules/react-monaco-editor"
-        }
+        ]
     },
     "resolutions": {
         "nanoid": "^3.3.8",

src/App.tsx

@@ -42,11 +42,11 @@ import {
 } from './components/common'
 import { UPDATE_AVAILABLE_TOAST_PROGRESS_BG, URLS } from './config'
 import { validateToken } from './services/service'
+import ActivateLicense from '@Pages/License/ActivateLicense'
 
 const NavigationRoutes = lazy(() => import('./components/common/navigation/NavigationRoutes'))
 const Login = lazy(() => import('./components/login/Login'))
 const GenericDirectApprovalModal = importComponentFromFELibrary('GenericDirectApprovalModal')
-const ActivateLicense = importComponentFromFELibrary('ActivateLicense', null, 'function')
 
 export default function App() {
     const onlineToastRef = useRef(null)
@@ -160,7 +160,6 @@ export default function App() {
     }
 
     useEffect(() => {
-
         if (navigator.serviceWorker) {
             navigator.serviceWorker.addEventListener('controllerchange', handleControllerChange)
         }
@@ -328,7 +327,7 @@ export default function App() {
                             <div className="full-height-width bg__tertiary">
                                 <Reload />
                             </div>
-                            ) : (
+                        ) : (
                             <ErrorBoundary>
                                 <BreadcrumbStore>
                                     <Switch>
@@ -340,11 +339,9 @@ export default function App() {
                                                 />
                                             </Route>
                                         )}
-                                        {ActivateLicense && (
-                                            <Route path={CommonURLS.LICENSE_AUTH}>
-                                                <ActivateLicense />
-                                            </Route>
-                                        )}
+                                        <Route path={CommonURLS.LICENSE_AUTH}>
+                                            <ActivateLicense />
+                                        </Route>
                                         {!window._env_.K8S_CLIENT && <Route path="/login" component={Login} />}
                                         <Route path="/" render={() => <NavigationRoutes />} />
                                         <Redirect

src/Pages/App/CreateAppModal/AppToCloneSelector.tsx

@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
+import { useState } from 'react'
+
 import {
     AppSelectorNoOptionsMessage as appSelectorNoOptionsMessage,
     ComponentSizeType,
     InfoBlock,
     SelectPicker,
     SelectPickerProps,
 } from '@devtron-labs/devtron-fe-common-lib'
+
 import { appListOptions } from '@Components/AppSelector/AppSelectorUtil'
-import { useState } from 'react'
+
 import { AppToCloneSelectorProps } from './types'
 
 const AppToCloneSelector = ({ isJobView, error, handleCloneIdChange }: AppToCloneSelectorProps) => {
@@ -33,7 +36,7 @@ const AppToCloneSelector = ({ isJobView, error, handleCloneIdChange }: AppToClon
     const onInputChange: SelectPickerProps['onInputChange'] = async (val) => {
         setInputValue(val)
         setAreOptionsLoading(true)
-        const fetchedOptions = await appListOptions(val, isJobView)
+        const fetchedOptions = await appListOptions({ inputValue: val, isJobView })
         setAreOptionsLoading(false)
         setOptions(fetchedOptions)
     }