Merge branch 'main' of https://github.com/devtron-labs/dashboard into chore/sync-activate-license

arunjaindev · arunjaindev · commit d6242427be15 · 2025-04-21T15:49:04.000+05:30
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.11.0-pre-6",
+        "@devtron-labs/devtron-fe-common-lib": "1.11.0-pre-7",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
diff --git a/src/App.tsx b/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
diff --git a/src/Pages/License/ActivateLicense.tsx b/src/Pages/License/ActivateLicense.tsx
@@ -0,0 +1,145 @@
+import { useEffect, useState } from 'react'
+import { useHistory } from 'react-router-dom'
+
+import {
+    ActivateLicenseDialog,
+    API_STATUS_CODES,
+    Button,
+    ButtonVariantType,
+    CONTACT_SUPPORT_LINK,
+    DevtronLicenseCard,
+    DevtronProgressing,
+    ENTERPRISE_SUPPORT_LINK,
+    ErrorScreenManager,
+    getHandleOpenURL,
+    ICDevtronWithBorder,
+    Icon,
+    InfoBlock,
+    LicensingErrorCodes,
+    LoginBanner,
+    URLS,
+    useAsync,
+    useTheme,
+} from '@devtron-labs/devtron-fe-common-lib'
+
+import { getDevtronLicenseInfo } from './service'
+
+const ActivateLicense = () => {
+    const history = useHistory()
+    const [isLoading, licenseData, licenseDataError, reloadLicenseData] = useAsync(getDevtronLicenseInfo, [])
+    const [showActivateDialog, setShowActivateDialog] = useState<boolean>(false)
+    const { appTheme } = useTheme()
+
+    const redirectToLogin = () => {
+        history.replace(URLS.LOGIN_SSO)
+    }
+
+    useEffect(() => {
+        if (isLoading) {
+            return
+        }
+
+        // licenseDataError.code === 404 means, oss and licensing does not exist
+        //  In case licenseStatusError is null, license is valid
+        if (licenseDataError?.code === API_STATUS_CODES.NOT_FOUND || !licenseData.licenseStatusError) {
+            redirectToLogin()
+            return
+        }
+
+        if (licenseData.licenseStatusError.code === LicensingErrorCodes.LicKeyNotFound) {
+            setShowActivateDialog(true)
+        }
+    }, [isLoading, licenseData])
+
+    if (isLoading) {
+        return <DevtronProgressing parentClasses="bg__primary flex full-height-width" classes="icon-dim-80" />
+    }
+
+    if (licenseDataError) {
+        return (
+            <div className="full-height-width bg__tertiary">
+                <ErrorScreenManager code={licenseDataError?.code} reload={reloadLicenseData} />
+            </div>
+        )
+    }
+
+    const handleChangeLicense = () => {
+        setShowActivateDialog(true)
+    }
+
+    const renderInvalidLicenseDialog = () => (
+        <div className="flexbox-col p-36 dc__gap-32 w-400 border__primary br-12">
+            <div className="flexbox-col dc__gap-20">
+                <ICDevtronWithBorder />
+                <div className="flexbox-col dc__gap-4">
+                    <div className="fs-20 lh-1-5 fw-7 cn-9 font-merriweather dc__truncate">
+                        {licenseData.enterpriseName}
+                    </div>
+                    <div className="fs-16 lh-1-5 cr-5 fw-4">Your license key is no longer valid</div>
+                </div>
+            </div>
+            {licenseData.licenseStatusError &&
+            licenseData.licenseStatusError.code !== LicensingErrorCodes.LicenseExpired ? (
+                <InfoBlock
+                    heading="Need help?"
+                    description={
+                        <span>
+                            For further details mail us at&nbsp;
+                            <a href={`mailto:${ENTERPRISE_SUPPORT_LINK}`}>{ENTERPRISE_SUPPORT_LINK}</a> or contact
+                            Devtron Support
+                        </span>
+                    }
+                    variant="help"
+                    buttonProps={{
+                        text: 'Contact Support',
+                        variant: ButtonVariantType.text,
+                        onClick: getHandleOpenURL(CONTACT_SUPPORT_LINK),
+                        dataTestId: 'contact-support',
+                        startIcon: <Icon name="ic-chat-circle-dots" color="B500" size={16} />,
+                    }}
+                    layout="column"
+                />
+            ) : (
+                <DevtronLicenseCard
+                    enterpriseName={licenseData.enterpriseName}
+                    expiryDate={licenseData.expiryDate}
+                    ttl={licenseData.ttl}
+                    licenseStatus={licenseData.licenseStatus}
+                    isTrial={licenseData.isTrial}
+                    licenseSuffix={licenseData.licenseSuffix}
+                    appTheme={appTheme}
+                />
+            )}
+            <div className="flex dc__content-space">
+                <span>Have another license key?</span>
+                <Button
+                    dataTestId="change-license"
+                    text="Change license"
+                    variant={ButtonVariantType.text}
+                    onClick={handleChangeLicense}
+                />
+            </div>
+        </div>
+    )
+
+    return (
+        <div className="full-height-width bg__secondary dc__grid-half">
+            <div className="flexbox p-16">
+                <LoginBanner />
+            </div>
+            <div className="flex">
+                {showActivateDialog ? (
+                    <ActivateLicenseDialog
+                        fingerprint={licenseData.fingerprint || ''}
+                        enterpriseName={licenseData.enterpriseName}
+                        handleLicenseActivateSuccess={redirectToLogin}
+                    />
+                ) : (
+                    renderInvalidLicenseDialog()
+                )}
+            </div>
+        </div>
+    )
+}
+
+export default ActivateLicense
diff --git a/src/Pages/License/service.tsx b/src/Pages/License/service.tsx
@@ -0,0 +1,15 @@
+// NOTE: This API is used to check if the license is valid or not at APP.TSX level
+
+import {
+    DevtronLicenseDTO,
+    DevtronLicenseInfo,
+    get,
+    parseDevtronLicenseData,
+    ROUTES,
+} from '@devtron-labs/devtron-fe-common-lib'
+
+// Only gives complete response if the license is invalid else return only fingerprint
+export const getDevtronLicenseInfo = async (): Promise<DevtronLicenseInfo> => {
+    const { result } = await get<DevtronLicenseDTO>(ROUTES.LICENSE_DATA, { preventLicenseRedirect: true })
+    return parseDevtronLicenseData(result)
+}
diff --git a/src/components/ResourceBrowser/ResourceList/ClusterUpgradeCompatibilityInfo.tsx b/src/components/ResourceBrowser/ResourceList/ClusterUpgradeCompatibilityInfo.tsx
@@ -104,8 +104,8 @@ const ClusterUpgradeCompatibilityInfo = ({
     }
 
     return (
-        <div className="resource-browser">
-            <div className="dc__overflow-auto p-8">
+        <div className="flexbox h-100 dc__overflow-auto">
+            <div className="dc__overflow-auto p-8 w-220 dc__no-shrink">
                 <CollapsibleList tabType="navLink" config={sidebarConfig} onCollapseBtnClick={onCollapseBtnClick} />
             </div>
             <BaseResourceList
diff --git a/src/components/cdPipeline/CDPipeline.tsx b/src/components/cdPipeline/CDPipeline.tsx
@@ -279,6 +279,8 @@ export default function CDPipeline({
 
     const isGitOpsRepoNotConfigured = isExternalArgoPipeline ? false : isGitOpsRepoNotConfiguredProp
 
+    const areMandatoryPluginPossible = !!processPluginData && !isTemplateView
+
     const handleHideScopedVariableWidgetUpdate: PipelineContext['handleHideScopedVariableWidgetUpdate'] = (
         hideScopedVariableWidgetValue: boolean,
     ) => {
@@ -312,7 +314,7 @@ export default function CDPipeline({
         const postBuildPluginIds = getPluginIdsFromBuildStage(form.postBuildStage)
         const uniquePluginIds = Array.from(new Set([...preBuildPluginIds, ...postBuildPluginIds]))
 
-        if (processPluginData) {
+        if (areMandatoryPluginPossible) {
             await getMandatoryPluginData(form, uniquePluginIds)
             return
         }
@@ -448,7 +450,7 @@ export default function CDPipeline({
     }
 
     const getMandatoryPluginData: BuildCDProps['getMandatoryPluginData'] = async (form, requiredPluginIds = []) => {
-        if (!processPluginData || isTemplateView) {
+        if (!areMandatoryPluginPossible) {
             return
         }
 
diff --git a/src/components/globalConfigurations/GlobalConfiguration.tsx b/src/components/globalConfigurations/GlobalConfiguration.tsx
@@ -283,7 +283,7 @@ const NavItem = ({ serverMode }) => {
             moduleName: ModuleNameMap.NOTIFICATION,
             isAvailableInEA: false,
         },
-        ...(window._env_.FEATURE_APPLICATION_TEMPLATES_ENABLE
+        ...(window._env_.FEATURE_APPLICATION_TEMPLATES_ENABLE && DevtronAppTemplates
             ? [
                   {
                       name: 'Application Templates',
diff --git a/yarn.lock b/yarn.lock
@@ -1126,10 +1126,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/devtron-fe-common-lib@1.11.0-pre-6":
-  version "1.11.0-pre-6"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.11.0-pre-6.tgz#e74d94c895e0fdbbe4101341d8d00444a4bdf792"
-  integrity sha512-nNQOtzsXbs+c0H/EcR00ucsl7X/VjeOZ3spWDcZ3PQbSC+kpi4bHkcQFyAv3H2YGf8C6QVNeoTPtmfr+r/Vsmg==
+"@devtron-labs/devtron-fe-common-lib@1.11.0-pre-7":
+  version "1.11.0-pre-7"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.11.0-pre-7.tgz#97dd5ce110cce44ace8651f090e2f8c6efb5adeb"
+  integrity sha512-CMZApIzeQCbV9t4AHRz11yxLuFq4OEdpoEngAovaGo2qp5upAUlN2ADn0i89ziXqOMVEu89xRQ/P3F6IpJRGgQ==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"
@@ -1154,6 +1154,7 @@
     jsonpath-plus "^10.3.0"
     marked "^13.0.3"
     nanoid "^3.3.8"
+    qrcode.react "^4.2.0"
     react-canvas-confetti "^2.0.7"
     react-dates "^21.8.0"
     react-diff-viewer-continued "^3.4.0"
@@ -7274,6 +7275,11 @@ punycode@^2.1.0:
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
+qrcode.react@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/qrcode.react/-/qrcode.react-4.2.0.tgz#1bce8363f348197d145c0da640929a24c83cbca3"
+  integrity sha512-QpgqWi8rD9DsS9EP3z7BT+5lY5SFhsqGjpgW5DY/i3mK4M9DTBNz3ErMi8BWYEfI3L0d8GIbGmcdFAS1uIRGjA==
+
 query-string@^7.1.1:
   version "7.1.3"
   resolved "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz"

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ const NavItem = ({ serverMode }) => {`
`283`	`283`	`moduleName: ModuleNameMap.NOTIFICATION,`
`284`	`284`	`isAvailableInEA: false,`
`285`	`285`	`},`
`286`		`- ...(window._env_.FEATURE_APPLICATION_TEMPLATES_ENABLE`
	`286`	`+ ...(window._env_.FEATURE_APPLICATION_TEMPLATES_ENABLE && DevtronAppTemplates`
`287`	`287`	`? [`
`288`	`288`	`{`
`289`	`289`	`name: 'Application Templates',`