Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/table-storybook

Author: Elessar1802

.env

@@ -32,12 +32,9 @@ ENABLE_RESTART_WORKLOAD=false
 ENABLE_SCOPED_VARIABLES=true
 DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
 ANNOUNCEMENT_BANNER_MSG=
-LOGIN_PAGE_IMAGE=
-LOGIN_PAGE_IMAGE_BG=
 HIDE_DEFAULT_CLUSTER=false
 GLOBAL_API_TIMEOUT=60000
 TRIGGER_API_TIMEOUT=60000
-LOGIN_DT_LOGO=
 SIDEBAR_DT_LOGO=
 ENABLE_EXTERNAL_ARGO_CD=false
 API_BATCH_SIZE=20
@@ -51,7 +48,6 @@ FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE=false
 HIDE_NETWORK_STATUS_INTERFACE=true
 SYSTEM_CONTROLLER_LISTING_TIMEOUT=300000
 FEATURE_IMAGE_PROMOTION_ENABLE=false
-FEATURE_CD_MANDATORY_PLUGINS_ENABLE=true
 FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS=false
 FEATURE_CONFIG_DRIFT_ENABLE=false
 FEATURE_PROMO_EMBEDDED_BUTTON_TEXT=
@@ -66,5 +62,5 @@ 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_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
+GATEKEEPER_URL=devtron.ai

.storybook/preview-head.html

@@ -1,6 +1 @@
-<link
-    href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap"
-    rel="stylesheet"
-/>
-<link href="https://fonts.googleapis.com/css2?family=Inconsolata&display=swap" rel="stylesheet" />
-<link href="https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap" rel="stylesheet" />
+<link rel="stylesheet" href="../index.css" />

.storybook/preview.tsx

@@ -38,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 (

config.md

@@ -30,9 +30,6 @@
 | HIDE_DEFAULT_CLUSTER                         | "true"     | Hide default cluster                                                                                             |
 | HIDE_EXCLUDE_INCLUDE_GIT_COMMITS             | "true"     | Hide exclude include git commits                                                                                 |
 | HIDE_GITOPS_OR_HELM_OPTION                   | "false"    | Enable GitOps and Helm option                                                                                    |
-| LOGIN_DT_LOGO                                | ""         | Devtron logo for login page                                                                                      |
-| LOGIN_PAGE_IMAGE                             | ""         | Login page image url                                                                                             |
-| LOGIN_PAGE_IMAGE_BG                          | ""         | Login page image background color code                                                                           |
 | ORGANIZATION_NAME                            | ""         | Name of the organization                                                                                         |
 | POSTHOG_ENABLED                              | "true"     | PostHog integration status                                                                                       |
 | POSTHOG_TOKEN                                | XXXXXXXX   | PostHog API token                                                                                                |
@@ -48,6 +45,5 @@
 | 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   |
 
 # DASHBOARD CONFIG SECRET

index.css

@@ -1,3 +1,8 @@
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Inconsolata&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;600&display=swap');
+
 /*
  * Although this is duplicated but this would help us with consistent loader in case
  * the theme is same as the system theme.

index.html

@@ -18,15 +18,6 @@
 <html lang="en">
     <head>
         <meta charset="utf-8" />
-        <link
-            href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap"
-            rel="stylesheet"
-        />
-        <link href="https://fonts.googleapis.com/css2?family=Inconsolata&display=swap" rel="stylesheet" />
-        <link
-            href="https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap"
-            rel="stylesheet"
-        />
         <link rel="stylesheet" href="./index.css" />
         <link rel="shortcut icon" href="/favicon.ico" />
         <script src="/dashboard/env-config.js"></script>

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.10.1-beta-2",
+        "@devtron-labs/devtron-fe-common-lib": "1.10.9",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/App.tsx

@@ -42,10 +42,12 @@ import {
 } from './components/common'
 import { UPDATE_AVAILABLE_TOAST_PROGRESS_BG, URLS } from './config'
 import { validateToken } from './services/service'
+import { getCentralAPIHealth } from './utils'
 
 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)
@@ -159,15 +161,13 @@ export default function App() {
     }
 
     useEffect(() => {
-        if (typeof Storage !== 'undefined') {
-            // TODO (Arun): Remove in next packet
-            localStorage.removeItem('undefined')
-        }
+
         if (navigator.serviceWorker) {
             navigator.serviceWorker.addEventListener('controllerchange', handleControllerChange)
         }
         // If not K8S_CLIENT then validateToken otherwise directly redirect
-        if (!window._env_.K8S_CLIENT) {
+        //  No need to validate token if on license auth page
+        if (!window._env_.K8S_CLIENT && location.pathname !== CommonURLS.LICENSE_AUTH) {
             // By Passing validations for direct email approval notifications
             if (isDirectApprovalNotification) {
                 redirectToDirectApprovalNotification()
@@ -178,6 +178,9 @@ export default function App() {
             setValidating(false)
             defaultRedirection()
         }
+
+        getCentralAPIHealth()
+
         return () => {
             navigator.serviceWorker.removeEventListener('controllerchange', handleControllerChange)
         }
@@ -340,6 +343,11 @@ export default function App() {
                                                 />
                                             </Route>
                                         )}
+                                        {ActivateLicense && (
+                                            <Route path={CommonURLS.LICENSE_AUTH}>
+                                                <ActivateLicense />
+                                            </Route>
+                                        )}
                                         {!window._env_.K8S_CLIENT && <Route path="/login" component={Login} />}
                                         <Route path="/" render={() => <NavigationRoutes />} />
                                         <Redirect

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentConfigCompare/DeploymentConfigCompare.tsx

@@ -459,7 +459,7 @@ export const DeploymentConfigCompare = ({
         classNamePrefix: 'compare-with-environment-selector',
         inputId: 'compare-with-environment-selector',
         name: 'compare-with-environment-selector',
-        variant: SelectPickerVariantType.BORDER_LESS,
+        variant: SelectPickerVariantType.COMPACT,
         value: getSelectPickerOptionByValue(compareEnvironmentSelectorOptions, chartRefId || compareWith, {
             label: BASE_CONFIGURATIONS.name,
             value: '',
@@ -497,7 +497,7 @@ export const DeploymentConfigCompare = ({
             classNamePrefix: 'environment-config-type-selector',
             inputId: `environment-config-type-selector-${isCompare ? 'compare' : 'current'}`,
             name: `environment-config-type-selector-${isCompare ? 'compare' : 'current'}`,
-            variant: SelectPickerVariantType.BORDER_LESS,
+            variant: SelectPickerVariantType.COMPACT,
             isSearchable: false,
             disableDescriptionEllipsis: true,
             value: getSelectPickerOptionByValue(

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

@@ -253,7 +253,7 @@ const DTChartSelector = ({
                     value={selectedOption}
                     onChange={onSelectChartVersion}
                     isSearchable={false}
-                    variant={SelectPickerVariantType.BORDER_LESS}
+                    variant={SelectPickerVariantType.COMPACT}
                     size={ComponentSizeType.small}
                     placeholder="Select version"
                     isDisabled={migratedFrom === PipelineMigratedFromType.ARGO_APPLICATION}