Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-25 00:07:47 +01:00
Code Issues Projects Releases Wiki Activity

fix: hide pro routes (#3409)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2023-03-28 15:12:24 +02:00 committed by GitHub
parent 214a3e6e5b
commit 39acf9f104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/component/menu/Header/Header.tsx
View File

@ -120,7 +120,7 @@ const Header: VFC = () => {
const [admin, setAdmin] = useState(false); const [admin, setAdmin] = useState(false);
const { permissions } = useAuthPermissions(); const { permissions } = useAuthPermissions();
const { uiConfig, isOss } = useUiConfig(); const { uiConfig, isOss, isPro, isEnterprise } = useUiConfig();
const smallScreen = useMediaQuery(theme.breakpoints.down('md')); const smallScreen = useMediaQuery(theme.breakpoints.down('md'));
const [openDrawer, setOpenDrawer] = useState(false); const [openDrawer, setOpenDrawer] = useState(false);
@ -140,8 +140,13 @@ const Header: VFC = () => {
const routes = getRoutes(); const routes = getRoutes();
const filterByEnterprise = (route: INavigationMenuItem): boolean => { const filterByMode = (route: INavigationMenuItem): boolean => {
return !route.menu.isEnterprise || !isOss(); const { mode } = route.menu;
return (
!mode ||
(mode.includes('pro') && isPro()) ||
(mode.includes('enterprise') && isEnterprise())
);
}; };
const filteredMainRoutes = { const filteredMainRoutes = {
@ -159,7 +164,7 @@ const Header: VFC = () => {
), ),
adminRoutes: adminMenuRoutes adminRoutes: adminMenuRoutes
.filter(filterByConfig(uiConfig)) .filter(filterByConfig(uiConfig))
.filter(filterByEnterprise) .filter(filterByMode)
.map(route => ({ .map(route => ({
...route, ...route,
path: route.path.replace('/*', ''), path: route.path.replace('/*', ''),

8
frontend/src/component/menu/routes.ts
View File

@ -461,7 +461,7 @@ export const adminMenuRoutes: INavigationMenuItem[] = [
{ {
path: '/admin/groups', path: '/admin/groups',
title: 'Groups', title: 'Groups',
menu: { adminSettings: true }, menu: { adminSettings: true, mode: ['enterprise'] },
flag: UG, flag: UG,
}, },
{ {
@ -483,12 +483,12 @@ export const adminMenuRoutes: INavigationMenuItem[] = [
{ {
path: '/admin/service-accounts', path: '/admin/service-accounts',
title: 'Service accounts', title: 'Service accounts',
menu: { adminSettings: true, isEnterprise: true }, menu: { adminSettings: true, mode: ['enterprise'] },
}, },
{ {
path: '/admin/network/*', path: '/admin/network/*',
title: 'Network', title: 'Network',
menu: { adminSettings: true }, menu: { adminSettings: true, mode: ['pro', 'enterprise'] },
configFlag: 'networkViewEnabled', configFlag: 'networkViewEnabled',
}, },
{ {
@ -505,7 +505,7 @@ export const adminMenuRoutes: INavigationMenuItem[] = [
{ {
path: '/admin/admin-invoices', path: '/admin/admin-invoices',
title: 'Billing & invoices', title: 'Billing & invoices',
menu: { adminSettings: true, isEnterprise: true }, menu: { adminSettings: true, mode: ['pro'] },
}, },
]; ];

2
frontend/src/interfaces/route.ts
View File

@ -28,5 +28,5 @@ interface IRouteMenu {
mobile?: boolean; mobile?: boolean;
advanced?: boolean; advanced?: boolean;
adminSettings?: boolean; adminSettings?: boolean;
isEnterprise?: boolean; mode?: Array<'pro' | 'enterprise'>;
} }