Merge pull request #2620 from devtron-labs/chore/sync-qr-dialog-behaviour

chore: sync qr dialog behaviour

Author: arunjaindev

.env

@@ -63,4 +63,4 @@ FEATURE_ACTION_AUDIOS_ENABLE=true
 FEATURE_APPLICATION_TEMPLATES_ENABLE=true
 FEATURE_CODE_MIRROR_ENABLE=false
 FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
-GATEKEEPER_URL=devtron.ai
+GATEKEEPER_URL=https://license.devtron.ai/dashboard

package.json

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

src/App.tsx

@@ -42,7 +42,6 @@ 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'))
@@ -179,8 +178,6 @@ export default function App() {
             defaultRedirection()
         }
 
-        getCentralAPIHealth()
-
         return () => {
             navigator.serviceWorker.removeEventListener('controllerchange', handleControllerChange)
         }

src/components/common/navigation/NavigationRoutes.tsx

@@ -81,7 +81,7 @@ import { DEFAULT_GIT_OPS_FEATURE_FLAGS } from './constants'
 import { ParsedTabsData, ParsedTabsDataV1 } from '../DynamicTabs/types'
 import { SwitchThemeDialog } from '@Pages/Shared'
 import { SwitchThemeDialogProps } from '@Pages/Shared/SwitchThemeDialog/types'
-import { getShowStackManager } from 'src/utils'
+import { EnvironmentDataStateType } from './types'
 
 // Monaco Editor worker initialization
 self.MonacoEnvironment = {
@@ -152,16 +152,12 @@ export default function NavigationRoutes() {
     }
     const [environmentId, setEnvironmentId] = useState(null)
     const contextValue = useMemo(() => ({ environmentId, setEnvironmentId }), [environmentId])
-    const [environmentDataState, setEnvironmentDataState] = useState<
-        Pick<
-            MainContext,
-            'isAirgapped' | 'isManifestScanningEnabled' | 'canOnlyViewPermittedEnvOrgLevel' | 'featureGitOpsFlags'
-        >
-    >({
+    const [environmentDataState, setEnvironmentDataState] = useState<EnvironmentDataStateType>({
         isAirgapped: false,
         isManifestScanningEnabled: false,
         canOnlyViewPermittedEnvOrgLevel: false,
         featureGitOpsFlags: structuredClone(DEFAULT_GIT_OPS_FEATURE_FLAGS),
+        devtronManagedLicensingEnabled: false,
     })
     const [userPreferences, setUserPreferences] = useState<UserPreferencesType>(null)
     const [userPreferencesError, setUserPreferencesError] = useState<ServerErrors>(null)
@@ -173,7 +169,8 @@ export default function NavigationRoutes() {
         appTheme,
     } = useTheme()
 
-    const { isAirgapped, isManifestScanningEnabled, canOnlyViewPermittedEnvOrgLevel } = environmentDataState
+    const { isAirgapped, isManifestScanningEnabled, canOnlyViewPermittedEnvOrgLevel, devtronManagedLicensingEnabled } =
+        environmentDataState
 
     const handleCloseLicenseInfoDialog = () => {
         setLicenseInfoDialogType(null)
@@ -342,6 +339,7 @@ export default function NavigationRoutes() {
             isManifestScanningEnabled: false,
             canOnlyViewPermittedEnvOrgLevel: false,
             featureGitOpsFlags: structuredClone(DEFAULT_GIT_OPS_FEATURE_FLAGS),
+            devtronManagedLicensingEnabled: false,
         }
 
         if (!getEnvironmentData) {
@@ -361,6 +359,7 @@ export default function NavigationRoutes() {
                 isManifestScanningEnabled: result.isManifestScanningEnabled,
                 canOnlyViewPermittedEnvOrgLevel: result.canOnlyViewPermittedEnvOrgLevel,
                 featureGitOpsFlags: parsedFeatureGitOpsFlags,
+                devtronManagedLicensingEnabled: result.devtronManagedLicensingEnabled || false,
             }
         } catch {
             return fallbackResponse
@@ -408,6 +407,7 @@ export default function NavigationRoutes() {
                 isManifestScanningEnabled: environmentDataResponse.isManifestScanningEnabled,
                 canOnlyViewPermittedEnvOrgLevel: environmentDataResponse.canOnlyViewPermittedEnvOrgLevel,
                 featureGitOpsFlags: environmentDataResponse.featureGitOpsFlags,
+                devtronManagedLicensingEnabled: environmentDataResponse.devtronManagedLicensingEnabled,
             })
 
             setServerMode(serverModeResponse)
@@ -484,11 +484,13 @@ export default function NavigationRoutes() {
     }
     const _isOnboardingPage = isOnboardingPage()
 
-    const handleOpenLicenseInfoDialog = (initialDialogTab?: LicenseInfoDialogType.ABOUT | LicenseInfoDialogType.LICENSE) => {
+    const handleOpenLicenseInfoDialog = (
+        initialDialogTab?: LicenseInfoDialogType.ABOUT | LicenseInfoDialogType.LICENSE,
+    ) => {
         setLicenseInfoDialogType(initialDialogTab || LicenseInfoDialogType.ABOUT)
     }
 
-    const showStackManager = getShowStackManager(currentServerInfo.serverInfo?.installationType, !!licenseData)
+    const showStackManager = !devtronManagedLicensingEnabled
 
     return (
         <MainContextProvider

src/components/common/navigation/types.ts

@@ -15,7 +15,12 @@
  */
 
 import { URLS } from '@Config/routes'
-import { customEnv, IconsProps, URLS as CommonURLS } from '@devtron-labs/devtron-fe-common-lib'
+import {
+    customEnv,
+    IconsProps,
+    URLS as CommonURLS,
+    EnvironmentDataValuesDTO,
+} from '@devtron-labs/devtron-fe-common-lib'
 
 export interface NavigationListItemType {
     title: string
@@ -32,3 +37,7 @@ export interface NavigationListItemType {
     moduleName?: string
     moduleNameTrivy?: string
 }
+
+export interface EnvironmentDataStateType extends Omit<EnvironmentDataValuesDTO, 'isAirGapEnvironment'> {
+    isAirgapped: boolean
+}

src/components/v2/devtronStackManager/DevtronStackManager.component.tsx

@@ -81,7 +81,6 @@ import clair from '../../../assets/icons/ic-trivy-to-clair.svg'
 import warn from '../../../assets/icons/ic-error-medium.svg'
 import { SuccessModalComponent } from './SuccessModalComponent'
 import { EMPTY_STATE_STATUS } from '../../../config/constantMessaging'
-import { getShowStackManager } from 'src/utils'
 
 const getInstallationStatusLabel = (
     installationStatus: ModuleStatus,
@@ -254,8 +253,6 @@ export const NavItem = ({
     showInitializing,
     showVersionInfo,
 }: StackManagerNavItemType): JSX.Element => {
-    const { currentServerInfo, licenseData } = useMainContext()
-
     const getNavLink = (route: StackManagerNavLinkType): JSX.Element => {
         return (
             <NavLink
@@ -304,18 +301,12 @@ export const NavItem = ({
         )
     }
 
-    const showAboutDevtronTab = getShowStackManager(currentServerInfo?.serverInfo?.installationType, !!licenseData)
-
     return (
         <div className="flex column left">
             <div className="section-heading cn-6 fs-12 fw-6 pl-8 mb-8 dc__uppercase">Integrations</div>
             {ModulesSection.map((route) => getNavLink(route))}
-            {showAboutDevtronTab && (
-                <>
-                    <hr className="mt-8 mb-8 w-100 checklist__divider" />
-                    {getNavLink(AboutSection)}
-                </>
-            )}
+            <hr className="mt-8 mb-8 w-100 checklist__divider" />
+            {getNavLink(AboutSection)}
         </div>
     )
 }
@@ -917,7 +908,7 @@ export const InstallationWrapper = ({
                                             }}
                                             showTooltip={isInstallButtonDisabled}
                                             text={text}
-                                            startIcon={<Icon />}
+                                            startIcon={Icon ? <Icon /> : null}
                                             fullWidth
                                         />
                                     )}

src/index.tsx

@@ -167,7 +167,7 @@ if (!window || !window._env_) {
         FEATURE_APPLICATION_TEMPLATES_ENABLE: true,
         FEATURE_CODE_MIRROR_ENABLE: true,
         FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE: false,
-        GATEKEEPER_URL: 'devtron.ai',
+        GATEKEEPER_URL: 'https://license.devtron.ai/dashboard',
     }
 }
 

src/utils.tsx

@@ -1126,10 +1126,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected].10":
-  version "1.10.10"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.10.10.tgz#7077bd2af98d8a3a2bceb4fa7685ec01fd4621b2"
-  integrity sha512-3GIlLeuptIgLGbMukAFngLVLkmInuhVbkI+2MCUWMhojM8J3sFsbSRj1Go7/dZCM63IeV2ZffZorTccukP6XrA==
+"@devtron-labs/[email protected].11":
+  version "1.10.11"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.10.11.tgz#3d26a29373cb36d2bec35389d7a67f6a3ca3ee42"
+  integrity sha512-7Pts9Su3jigWtDARNn3JvznS7RZbiBae9nB8FQdI9vgKT1sWLfbapkcgz5A0iXaF72qOmrqVnMEjnnVYh8a8Rw==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"