From c5c20a3ce0e33e3032243beddc6ff386681c0831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20de=20Juvigny?= Date: Wed, 25 Jan 2023 11:28:23 +0100 Subject: [PATCH] Fix EE settings menu --- .../admin/src/hooks/useSettingsMenu/init.js | 20 ++---------------- .../hooks/useSettingsMenu/utils/adminLinks.js | 4 ++++ .../useSettingsMenu/utils/customAdminLinks.js | 1 + .../utils/defaultAdminLinks.js | 21 +++++++++++++++++++ .../useSettingsMenu/utils/customAdminLinks.js | 16 ++++++++++++++ .../utils/customGlobalLinks.js | 13 +----------- 6 files changed, 45 insertions(+), 30 deletions(-) create mode 100644 packages/core/admin/admin/src/hooks/useSettingsMenu/utils/adminLinks.js create mode 100644 packages/core/admin/admin/src/hooks/useSettingsMenu/utils/customAdminLinks.js create mode 100644 packages/core/admin/admin/src/hooks/useSettingsMenu/utils/defaultAdminLinks.js create mode 100644 packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customAdminLinks.js diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js index a3cb9ebd61..a017f6d7c3 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js @@ -1,7 +1,7 @@ import omit from 'lodash/omit'; import sortLinks from './utils/sortLinks'; -import adminPermissions from '../../permissions'; import formatLinks from './utils/formatLinks'; +import adminLinks from './utils/adminLinks'; import globalLinks from './utils/globalLinks'; const init = (initialState, { settings, shouldUpdateStrapi }) => { @@ -23,23 +23,7 @@ const init = (initialState, { settings, shouldUpdateStrapi }) => { { id: 'permissions', intlLabel: { id: 'Settings.permissions', defaultMessage: 'Administration Panel' }, - links: [ - { - intlLabel: { id: 'global.roles', defaultMessage: 'Roles' }, - to: '/settings/roles', - id: 'roles', - isDisplayed: false, - permissions: adminPermissions.settings.roles.main, - }, - { - intlLabel: { id: 'global.users' }, - // Init the search params directly - to: '/settings/users?pageSize=10&page=1&sort=firstname', - id: 'users', - isDisplayed: false, - permissions: adminPermissions.settings.users.main, - }, - ], + links: adminLinks, }, ...otherSections, ]; diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/adminLinks.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/adminLinks.js new file mode 100644 index 0000000000..b4a2b02cf1 --- /dev/null +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/adminLinks.js @@ -0,0 +1,4 @@ +import customAdminLinks from 'ee_else_ce/hooks/useSettingsMenu/utils/customAdminLinks'; +import defaultAdminLinks from './defaultAdminLinks'; + +export default [...customAdminLinks, ...defaultAdminLinks]; diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/customAdminLinks.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/customAdminLinks.js new file mode 100644 index 0000000000..d6d1738de6 --- /dev/null +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/customAdminLinks.js @@ -0,0 +1 @@ +export default []; diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/defaultAdminLinks.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/defaultAdminLinks.js new file mode 100644 index 0000000000..28d0644fb0 --- /dev/null +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/utils/defaultAdminLinks.js @@ -0,0 +1,21 @@ +import adminPermissions from '../../../permissions'; + +const defaultAdminLinks = [ + { + intlLabel: { id: 'global.roles', defaultMessage: 'Roles' }, + to: '/settings/roles', + id: 'roles', + isDisplayed: false, + permissions: adminPermissions.settings.roles.main, + }, + { + intlLabel: { id: 'global.users' }, + // Init the search params directly + to: '/settings/users?pageSize=10&page=1&sort=firstname', + id: 'users', + isDisplayed: false, + permissions: adminPermissions.settings.users.main, + }, +]; + +export default defaultAdminLinks; diff --git a/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customAdminLinks.js b/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customAdminLinks.js new file mode 100644 index 0000000000..fb2ada0acf --- /dev/null +++ b/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customAdminLinks.js @@ -0,0 +1,16 @@ +import adminPermissions from '../../../../../admin/src/permissions'; + +const auditLogsRoutes = [ + // TODO check if feature enabled + { + intlLabel: { id: 'global.auditLogs', defaultMessage: 'Audit Logs' }, + to: '/settings/audit-logs?pageSize=50&page=1&sort=date:DESC', + id: 'auditLogs', + isDisplayed: false, + permissions: adminPermissions.settings.auditLogs.main, + }, +]; + +const customAdminLinks = [...auditLogsRoutes]; + +export default customAdminLinks; diff --git a/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js b/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js index 28da37efaa..ec5e790c8b 100644 --- a/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js +++ b/packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js @@ -12,17 +12,6 @@ const ssoGlobalRoutes = strapi.features.isEnabled(strapi.features.SSO) ] : []; -const auditLogsRoutes = [ - // TODO check if feature enabled - { - intlLabel: { id: 'global.auditLogs', defaultMessage: 'Audit Logs' }, - to: '/settings/audit-logs?pageSize=50&page=1&sort=date:DESC', - id: 'auditLogs', - isDisplayed: false, - permissions: adminPermissions.settings.auditLogs.main, - }, -]; - -const customGlobalLinks = [...ssoGlobalRoutes, ...auditLogsRoutes]; +const customGlobalLinks = [...ssoGlobalRoutes]; export default customGlobalLinks;