fix: billing link

Unleash · Aug 17, 2023 · 1be0351 · 1be0351
1 parent 85139ac
commit 1be0351
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/frontend/src/component/admin/adminRoutes.ts b/frontend/src/component/admin/adminRoutes.ts
@@ -90,7 +90,7 @@ export const adminRoutes: INavigationMenuItem[] = [
     {
         path: '/admin/admin-invoices',
         title: 'Billing & invoices',
-        menu: { adminSettings: true, mode: ['pro'], billing: true },
+        menu: { adminSettings: true, billing: true },
         group: 'instance',
     },
     {

diff --git a/frontend/src/component/admin/invoice/InvoiceList.tsx b/frontend/src/component/admin/invoice/InvoiceList.tsx
@@ -115,7 +115,7 @@ const InvoiceList = () => {
                     </div>
                 </PageContent>
             }
-            elseShow={<div>{isLoaded && 'No invoices to show.'}</div>}
+            elseShow={<PageContent>{isLoaded && 'No invoices to show.'}</PageContent>}
         />
     );
 };

diff --git a/frontend/src/component/admin/menu/AdminTabsMenu.tsx b/frontend/src/component/admin/menu/AdminTabsMenu.tsx
@@ -23,7 +23,6 @@ const StyledBadgeContainer = styled('div')(({ theme }) => ({
 export const AdminTabsMenu: VFC = () => {
     const { uiConfig, isPro, isOss } = useUiConfig();
     const { pathname } = useLocation();
-    const navigate = useNavigate();
 
     const activeTab = pathname.split('/')[2];
 

diff --git a/frontend/src/component/admin/useAdminRoutes.ts b/frontend/src/component/admin/useAdminRoutes.ts
@@ -10,8 +10,19 @@ export const useAdminRoutes = () => {
     const showEnterpriseOptionsInPro = Boolean(
         uiConfig?.flags?.frontendNavigationUpdate
     );
+    const routes = [...adminRoutes];
 
-    return adminRoutes
+    if (uiConfig.flags.UNLEASH_CLOUD) {
+        const adminBillingMenuItem = adminRoutes.findIndex(
+            route => route.title === 'Billing & invoices'
+        );
+        routes[adminBillingMenuItem] = {
+            ...routes[adminBillingMenuItem],
+            path: '/admin/billing',
+        };
+    }
+
+    return routes
         .filter(filterByConfig(uiConfig))
         .filter(route =>
             filterAdminRoutes(
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,7 +115,7 @@ const InvoiceList = () => { @@
                         </div>
                     </PageContent>
                 }
-                elseShow={<div>{isLoaded && 'No invoices to show.'}</div>}
+                elseShow={<PageContent>{isLoaded && 'No invoices to show.'}</PageContent>}
             />
         );
     };
@@ Expand Down @@