Fix EE settings menu

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: [
+      links: adminLinks,
-        {
-          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,
-        },
-      ],
     },
     ...otherSections,
   ];

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];

packages/core/admin/admin/src/hooks/useSettingsMenu/utils/customAdminLinks.js

@@ -0,0 +1 @@
+export default [];

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;

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;

packages/core/admin/ee/admin/hooks/useSettingsMenu/utils/customGlobalLinks.js

@@ -12,17 +12,6 @@ const ssoGlobalRoutes = strapi.features.isEnabled(strapi.features.SSO)
     ]
   : [];
 
-const auditLogsRoutes = [
+const customGlobalLinks = [...ssoGlobalRoutes];
-  // 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];
 
 export default customGlobalLinks;