Skip to content

Commit

Permalink
Merge pull request #2562 from Hyperkid123/rename-subscripstions-bundle
Browse files Browse the repository at this point in the history
Rename subs bundle to match the route.
  • Loading branch information
Hyperkid123 authored Jul 11, 2023
2 parents 0812a14 + eeed78c commit 8b94ab8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
5 changes: 2 additions & 3 deletions src/components/AppFilter/useAppFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -24,7 +24,7 @@ export const requiredBundles = [
'settings',
'iam',
'quay',
...(!isProd() ? previewBunldes : isBeta() ? previewBunldes : []),
...(!isProd() ? previewBundles : isBeta() ? previewBundles : []),
];

const bundlesOrder = [
Expand All @@ -39,7 +39,6 @@ const bundlesOrder = [
'iam',
'quay',
'business-services',
'subscription-services',
];

const isITLessEnv = ITLess();
Expand Down
4 changes: 4 additions & 0 deletions src/components/Routes/Routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ const redirects = [
path: '/hac',
to: '/hac/application-pipeline',
},
{
path: '/subscriptions',
to: '/subscriptions/overview',
},
];

export type RoutesProps = {
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useBreadcrumbsLinks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<NavItem, 'href'>[] = navItems.map((item, index) => ({
...item,
/**
Expand Down

0 comments on commit 8b94ab8

Please sign in to comment.