From 132283fca7a4187ca3c92d6767cb0892701ef6b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Maro=C5=A1i?= Date: Mon, 10 Jul 2023 09:45:16 +0200 Subject: [PATCH] Rename subs bundle to match the route. --- src/components/AppFilter/useAppFilter.ts | 5 ++--- src/components/Routes/Routes.tsx | 4 ++++ src/hooks/useBreadcrumbsLinks.ts | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/AppFilter/useAppFilter.ts b/src/components/AppFilter/useAppFilter.ts index 37a8d3a2e..c71dc4b27 100644 --- a/src/components/AppFilter/useAppFilter.ts +++ b/src/components/AppFilter/useAppFilter.ts @@ -13,7 +13,7 @@ export type AppFilterBucket = { links: NavItem[]; }; -const previewBunldes = ['business-services', 'subscription-services']; +const previewBundles = ['business-services', 'subscriptions']; export const requiredBundles = [ 'application-services', @@ -24,7 +24,7 @@ export const requiredBundles = [ 'settings', 'iam', 'quay', - ...(!isProd() ? previewBunldes : isBeta() ? previewBunldes : []), + ...(!isProd() ? previewBundles : isBeta() ? previewBundles : []), ]; const bundlesOrder = [ @@ -39,7 +39,6 @@ const bundlesOrder = [ 'iam', 'quay', 'business-services', - 'subscription-services', ]; const isITLessEnv = ITLess(); diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx index b15701035..61a4754c2 100644 --- a/src/components/Routes/Routes.tsx +++ b/src/components/Routes/Routes.tsx @@ -30,6 +30,10 @@ const redirects = [ path: '/hac', to: '/hac/application-pipeline', }, + { + path: '/subscriptions', + to: '/subscriptions/overview', + }, ]; export type RoutesProps = { diff --git a/src/hooks/useBreadcrumbsLinks.ts b/src/hooks/useBreadcrumbsLinks.ts index 7ccb2e6ba..f75eb6437 100644 --- a/src/hooks/useBreadcrumbsLinks.ts +++ b/src/hooks/useBreadcrumbsLinks.ts @@ -33,7 +33,7 @@ const useBreadcrumbsLinks = () => { appFragments.pop(); // Match first parent route. Routes are taken directly from router definitions. const fallbackMatch = matchRoutes(wildCardRoutes, activeItem.href) || []; - const fallbackMatchFragments = fallbackMatch?.[0].pathnameBase.split('/'); + const fallbackMatchFragments = fallbackMatch?.[0]?.pathnameBase.split('/'); const groupFragments: Required[] = navItems.map((item, index) => ({ ...item, /**