Merge branch 'develop' into feat/chart-card-ui

Author: shivani170

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.15.0-pre-1",
+    "version": "1.15.0-pre-2",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -23,18 +23,25 @@ export const DocLink = <T extends boolean = false>({
     fullWidth = false,
 }: DocLinkProps<T>) => {
     // HOOKS
-    const { isEnterprise, setSidePanelConfig } = useMainContext()
+    const { isEnterprise, setSidePanelConfig, isLicenseDashboard } = useMainContext()
 
     // CONSTANTS
     const documentationLink = getDocumentationUrl({
         docLinkKey,
         isEnterprise,
         isExternalLink,
+        isLicenseDashboard,
     })
 
     // HANDLERS
     const handleClick = (e: MouseEvent<HTMLAnchorElement>) => {
-        if (!isExternalLink && !openInNewTab && !e.metaKey && documentationLink.startsWith(DOCUMENTATION_HOME_PAGE)) {
+        if (
+            !isExternalLink &&
+            !openInNewTab &&
+            !e.metaKey &&
+            !isLicenseDashboard &&
+            documentationLink.startsWith(DOCUMENTATION_HOME_PAGE)
+        ) {
             e.preventDefault()
             setSidePanelConfig((prev) => ({ ...prev, open: true, docLink: documentationLink, reinitialize: true }))
         }

src/Shared/Components/DocLink/DocLink.tsx

@@ -7,6 +7,7 @@ import { DOCUMENTATION } from './constants'
 export type BaseDocLink<T extends boolean> = {
     isExternalLink?: T
     isEnterprise?: boolean
+    isLicenseDashboard?: boolean
     docLinkKey: T extends true ? string : keyof typeof DOCUMENTATION
 }
 

src/Shared/Components/DocLink/types.ts

@@ -7,6 +7,7 @@ export const getDocumentationUrl = <T extends boolean = false>({
     docLinkKey,
     isEnterprise = false,
     isExternalLink,
+    isLicenseDashboard = false,
 }: BaseDocLink<T>) => {
     if (isExternalLink) {
         return docLinkKey
@@ -18,5 +19,7 @@ export const getDocumentationUrl = <T extends boolean = false>({
         return docPath
     }
 
-    return `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/${docPath || ''}?utm-source=product_${isEnterprise ? 'ent' : 'oss'}`
+    const utmPath = !isLicenseDashboard ? `?utm-source=product_${isEnterprise ? 'ent' : 'oss'}` : ''
+
+    return `${DOCUMENTATION_HOME_PAGE}${DOCUMENTATION_VERSION}/${docPath || ''}${utmPath}`
 }

src/Shared/Components/DocLink/utils.tsx

@@ -39,22 +39,19 @@ export interface SidePanelConfig {
     docLink: string | null
 }
 
-export interface MainContext {
-    serverMode: SERVER_MODE
+type CommonMainContextProps = {
     setServerMode: (serverMode: SERVER_MODE) => void
     isHelpGettingStartedClicked: boolean
     showCloseButtonAfterGettingStartedClicked: () => void
-    loginCount: number
     setLoginCount: (loginCount: number) => void
     showGettingStartedCard: boolean
     setShowGettingStartedCard: (showGettingStartedCard: boolean) => void
     isGettingStartedClicked: boolean
     setGettingStartedClicked: (isGettingStartedClicked: boolean) => void
     moduleInInstallingState: string
     setModuleInInstallingState: (moduleInInstallingState: string) => void
-    installedModuleMap: MutableRefObject<Record<string, boolean>>
     currentServerInfo: {
-        serverInfo: ServerInfo
+        serverInfo: ServerInfo | null
         fetchingServerInfo: boolean
     }
     isAirgapped: boolean
@@ -79,31 +76,60 @@ export interface MainContext {
     handleOpenLicenseInfoDialog: (
         initialDialogType?: LicenseInfoDialogType.ABOUT | LicenseInfoDialogType.LICENSE,
     ) => void
-    /**
-     * Data is set only if showLicenseData is received as true
-     */
-    licenseData: DevtronLicenseInfo
     setLicenseData: Dispatch<SetStateAction<DevtronLicenseInfo>>
     canFetchHelmAppStatus: boolean
-    reloadVersionConfig: ReloadVersionConfigTypes
-    intelligenceConfig: IntelligenceConfig
     setIntelligenceConfig: Dispatch<SetStateAction<IntelligenceConfig>>
-
-    sidePanelConfig: SidePanelConfig
     setSidePanelConfig: Dispatch<SetStateAction<SidePanelConfig>>
-
-    /**
-     * Indicates whether the current Devtron instance is running as an Enterprise edition. \
-     * This flag is determined based on server-side configuration.
-     */
-    isEnterprise: boolean
-    /**
-     * Indicates whether the fe-lib modules are available in the current instance. \
-     * Used to conditionally render or enable features that depend on fe-lib
-     */
-    isFELibAvailable: boolean
 }
 
+export type MainContext = CommonMainContextProps &
+    (
+        | {
+              isLicenseDashboard?: never
+              serverMode: SERVER_MODE
+              loginCount: number | null
+              installedModuleMap: MutableRefObject<Record<string, boolean>>
+              /**
+               * Data is set only if showLicenseData is received as true
+               */
+              licenseData: DevtronLicenseInfo
+
+              reloadVersionConfig: ReloadVersionConfigTypes
+              intelligenceConfig: IntelligenceConfig
+
+              sidePanelConfig: SidePanelConfig
+
+              /**
+               * Indicates whether the current Devtron instance is running as an Enterprise edition. \
+               * This flag is determined based on server-side configuration.
+               */
+              isEnterprise: boolean
+              /**
+               * Indicates whether the fe-lib modules are available in the current instance. \
+               * Used to conditionally render or enable features that depend on fe-lib
+               */
+              isFELibAvailable: boolean
+          }
+        | {
+              isLicenseDashboard: true
+              serverMode: null
+              loginCount: null
+              installedModuleMap: null
+              /**
+               * Data is set only if showLicenseData is received as true
+               */
+              licenseData: null
+
+              reloadVersionConfig: null
+              intelligenceConfig: null
+
+              sidePanelConfig: null
+
+              isEnterprise: false
+              isFELibAvailable: false
+          }
+    )
+
 export interface MainContextProviderProps {
     children: ReactNode
     value: MainContext