yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-28 01:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17237 from noobCode-69/setting-permission

Browse Source 
Fix settings menu permissions in CE
This commit is contained in:
Gustav Hansen 2023-07-10 13:51:49 +02:00 committed by GitHub
commit f1c4c09e50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
packages/core/admin/admin/src/hooks/useSettingsMenu/index.js
View File

@ -1,4 +1,4 @@
import { useState, useEffect } from 'react'; import { useState, useEffect, useCallback } from 'react';
import { hasPermissions, useRBACProvider, useStrapiApp, useAppInfo } from '@strapi/helper-plugin'; import { hasPermissions, useRBACProvider, useStrapiApp, useAppInfo } from '@strapi/helper-plugin';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
@ -19,25 +19,15 @@ const useSettingsMenu = () => {
const { shouldUpdateStrapi } = useAppInfo(); const { shouldUpdateStrapi } = useAppInfo();
const { settings } = useStrapiApp(); const { settings } = useStrapiApp();
const permissions = useSelector(selectAdminPermissions); const permissions = useSelector(selectAdminPermissions);
const { global: globalLinks, admin: adminLinks } = useEnterprise( const { global: globalLinks, admin: adminLinks } = useEnterprise(
LINKS_CE, LINKS_CE,
async () => (await import('../../../../ee/admin/hooks/useSettingsMenu/constants')).LINKS_EE, async () => (await import('../../../../ee/admin/hooks/useSettingsMenu/constants')).LINKS_EE,
{ {
combine(ceLinks, eeLinks) { combine(ceLinks, eeLinks) {
function addPermissions(link) {
if (!link.id) {
throw new Error('The settings menu item must have an id attribute.');
}
return {
...link,
permissions: permissions.settings?.[link.id]?.main,
};
}
return { return {
admin: [...eeLinks.admin, ...ceLinks.admin].map(addPermissions), admin: [...eeLinks.admin, ...ceLinks.admin],
global: [...ceLinks.global, ...eeLinks.global].map(addPermissions), global: [...ceLinks.global, ...eeLinks.global],
}; };
}, },
defaultValue: { defaultValue: {
@ -47,6 +37,20 @@ const useSettingsMenu = () => {
} }
); );
const addPermissions = useCallback(
(link) => {
if (!link.id) {
throw new Error('The settings menu item must have an id attribute.');
}
return {
...link,
permissions: permissions.settings?.[link.id]?.main,
};
},
[permissions.settings]
);
useEffect(() => { useEffect(() => {
const getData = async () => { const getData = async () => {
const buildMenuPermissions = (sections) => const buildMenuPermissions = (sections) =>
@ -86,26 +90,36 @@ const useSettingsMenu = () => {
}; };
const { global, ...otherSections } = settings; const { global, ...otherSections } = settings;
const sections = formatLinks([ const sections = formatLinks([
{ {
...settings.global, ...settings.global,
links: sortLinks([...settings.global.links, ...globalLinks]).map((link) => ({ links: sortLinks([...settings.global.links, ...globalLinks.map(addPermissions)]).map(
...link, (link) => ({
hasNotification: link.id === '000-application-infos' && shouldUpdateStrapi, ...link,
})), hasNotification: link.id === '000-application-infos' && shouldUpdateStrapi,
})
),
}, },
{ {
id: 'permissions', id: 'permissions',
intlLabel: { id: 'Settings.permissions', defaultMessage: 'Administration Panel' }, intlLabel: { id: 'Settings.permissions', defaultMessage: 'Administration Panel' },
links: adminLinks, links: adminLinks.map(addPermissions),
}, },
...Object.values(otherSections), ...Object.values(otherSections),
]); ]);
getData(); getData();
}, [adminLinks, globalLinks, userPermissions, settings, shouldUpdateStrapi]); }, [adminLinks, globalLinks, userPermissions, settings, shouldUpdateStrapi, addPermissions]);
return { isLoading, menu }; const filterMenu = (menuItem) => {
return {
...menuItem,
links: menuItem.links.filter((link) => link.isDisplayed),
};
};
return { isLoading, menu: menu.map(filterMenu) };
}; };
export default useSettingsMenu; export default useSettingsMenu;

24
packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js
View File

@ -50,17 +50,19 @@ const SettingsNav = ({ menu }) => {
<SubNavSections> <SubNavSections>
{sections.map((section) => ( {sections.map((section) => (
<SubNavSection key={section.id} label={formatMessage(section.intlLabel)}> <SubNavSection key={section.id} label={formatMessage(section.intlLabel)}>
{section.links.map((link) => ( {section.links.map((link) => {
<SubNavLink return (
as={NavLink} <SubNavLink
withBullet={link.hasNotification} as={NavLink}
to={link.to} withBullet={link.hasNotification}
onClick={() => handleClickOnLink(link.to)} to={link.to}
key={link.id} onClick={() => handleClickOnLink(link.to)}
> key={link.id}
{formatMessage(link.intlLabel)} >
</SubNavLink> {formatMessage(link.intlLabel)}
))} </SubNavLink>
);
})}
</SubNavSection> </SubNavSection>
))} ))}
</SubNavSections> </SubNavSections>