Merge pull request #2702 from devtron-labs/feat/banner-fix

Feat/banner fix

Author: shivani170

package.json

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

src/App.tsx

@@ -75,18 +75,21 @@ const App = () => {
             exact: true,
             condition: isDirectApprovalNotification && GenericDirectApprovalModal,
             component: <GenericDirectApprovalModal approvalType={approvalType} approvalToken={approvalToken} />,
+            eligibleLocation: `/${approvalType?.toLowerCase()}/approve`,
         },
         {
             path: CommonURLS.LICENSE_AUTH,
             exact: false,
             condition: true,
             component: <ActivateLicense />,
+            eligibleLocation: CommonURLS.LICENSE_AUTH,
         },
         {
             path: URLS.LOGIN,
             exact: false,
             condition: !window._env_.K8S_CLIENT,
             component: <Login />,
+            eligibleLocation: URLS.LOGIN_SSO || URLS.LOGIN_ADMIN,
         },
     ]
 

src/components/common/Banner/Banner.tsx

@@ -164,14 +164,9 @@ export const Banner = () => {
     const baseClassName = `w-100 ${config?.rootClassName || ''} ${getBannerTextColor(bannerVariant)} ${config?.isDismissible ? 'dc__grid banner--row dc__column-gap-16' : 'flex'}`
 
     const shouldShowActionButton = () => {
-        if (bannerVariant === BannerVariant.OFFLINE) return true
         if (bannerVariant === BannerVariant.ANNOUNCEMENT) return !!ANNOUNCEMENT_CONFIG.buttonLink
-        if (
-            bannerVariant === BannerVariant.VERSION_UPDATE ||
-            bannerVariant === BannerVariant.INCOMPATIBLE_MICROSERVICES
-        )
-            return true
-        return false
+        if (bannerVariant === BannerVariant.ONLINE) return false
+        return true
     }
 
     const onClickCloseAnnouncementBanner = () => {

src/components/common/hooks/useVersionUpdate/types.ts

@@ -4,5 +4,6 @@ export interface VersionUpdateProps {
         exact: boolean
         condition: boolean
         component: JSX.Element
+        eligibleLocation: string
     }[]
 }

src/components/common/hooks/useVersionUpdate/useVersionUpdateReload.tsx

@@ -30,8 +30,8 @@ export const useVersionUpdateReload = ({ toastEligibleRoutes }: VersionUpdatePro
 
     const updateToastRef = useRef(null)
 
-    const toastEligibleRoutesMap = toastEligibleRoutes.reduce((acc, { path }) => {
-        acc[path] = true
+    const toastEligibleRoutesMap = toastEligibleRoutes.reduce((acc, { eligibleLocation }) => {
+        acc[eligibleLocation] = true
         return acc
     }, {})
 
@@ -127,7 +127,7 @@ export const useVersionUpdateReload = ({ toastEligibleRoutes }: VersionUpdatePro
 
     const handleAppUpdate = () => {
         dismissToast({ updateToastRef })
-
+        refreshing.current = true
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         updateServiceWorker(true)
     }
@@ -140,7 +140,6 @@ export const useVersionUpdateReload = ({ toastEligibleRoutes }: VersionUpdatePro
             handleAppUpdate()
             refreshing.current = true
         } else {
-            if (typeof setBGUpdated !== 'function') return
             setBGUpdated(true)
         }
     }
@@ -149,7 +148,6 @@ export const useVersionUpdateReload = ({ toastEligibleRoutes }: VersionUpdatePro
         if (!bgUpdated) {
             return
         }
-        dismissToast({ updateToastRef })
         if (toastEligibleRoutesMap[location.pathname]) {
             updateToastRef.current = ToastManager.showToast(
                 {
@@ -198,9 +196,7 @@ export const useVersionUpdateReload = ({ toastEligibleRoutes }: VersionUpdatePro
                 .getRegistrations()
                 .then((registrations) => registrations.forEach((reg) => reg.update()))
             if (doesNeedRefresh && !refreshing.current) {
-                handleNeedRefresh(updateServiceWorker)
-            } else if (bgUpdated) {
-                dismissToast({ updateToastRef })
+                handleAppUpdate()
             }
         }
     }, [location])

src/components/material/MaterialList.tsx

@@ -217,7 +217,7 @@ class MaterialList extends Component<MaterialListProps, MaterialListState> {
             return <ErrorScreenManager code={this.state.statusCode} />
         }
         return (
-            <div className={!this.props.isCreateAppView ? 'form__app-compose' : ''}>
+            <div className={!this.props.isCreateAppView ? 'form__app-compose' : 'flexbox-col dc__gap-16'}>
                 {!this.props.isCreateAppView && (
                     <>
                         {this.renderPageHeader()}
@@ -255,8 +255,7 @@ class MaterialList extends Component<MaterialListProps, MaterialListState> {
                             isTemplateView={this.props.isTemplateView}
                             isCreateAppView={this.props.isCreateAppView}
                             handleSingleGitMaterialUpdate={this.handleSingleGitMaterialUpdate(mat.id)}
-                        />
-                    )
+                        />                    )
                 })}
             </div>
         )

yarn.lock

@@ -1126,10 +1126,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected]0":
-  version "1.13.0-pre-0"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.13.0-pre-0.tgz#38089a2a7ed4e19d9135a9e83b694908e70aaf8c"
-  integrity sha512-+2VLsrsxLLIu4iCeCFixif3rC8+xUvhSdPSb13vez15OT5k7XBAkUYAyHnDqBVh3uTQ3XyQwUONIRv4ffdAg5w==
+"@devtron-labs/[email protected]1":
+  version "1.13.0-pre-1"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.13.0-pre-1.tgz#f84a94fdea17cc4054073d744a176bf63029015f"
+  integrity sha512-LZCcvTpp4knJBL4LhET1XD+eOK8u6etiUooxaTt7GcI8cQLU68dMuAKKqi6wXVVoJ0QSywq5AUadIycRE075XQ==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"