Merge pull request #15568 from strapi/audit-logs/ee-admin

[Audit logs] Move admin code to EE folder

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,30 +23,7 @@ const init = (initialState, { settings, shouldUpdateStrapi }) => {
     {
       id: 'permissions',
       intlLabel: { id: 'Settings.permissions', defaultMessage: 'Administration Panel' },
-      links: [
-        {
-          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,
-        },
-        {
-          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,
   ];

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/admin/src/index.js

@@ -12,6 +12,7 @@ window.strapi = {
   telemetryDisabled: process.env.STRAPI_TELEMETRY_DISABLED ?? false,
   features: {
     SSO: 'sso',
+    auditLogs: 'audit-logs',
   },
   projectType: 'Community',
 };

packages/core/admin/admin/src/pages/SettingsPage/utils/defaultRoutes.js

@@ -57,17 +57,6 @@ const defaultRoutes = [
     to: '/settings/users/:id',
     exact: true,
   },
-  {
-    async Component() {
-      const component = await import(
-        /* webpackChunkName: "admin-audit-logs" */ '../pages/AuditLogs/ProtectedListPage'
-      );
-
-      return component;
-    },
-    to: '/settings/audit-logs',
-    exact: true,
-  },
   {
     async Component() {
       const component = await import(

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

@@ -0,0 +1,17 @@
+import adminPermissions from '../../../../../admin/src/permissions';
+
+const auditLogsRoutes = strapi.features.isEnabled(strapi.features.auditLogs)
+  ? [
+      {
+        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/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/index.js → packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/index.js

@@ -13,7 +13,7 @@ import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
 import { Main } from '@strapi/design-system/Main';
 import { useLocation } from 'react-router-dom';
 import { useQuery } from 'react-query';
-import adminPermissions from '../../../../../permissions';
+import adminPermissions from '../../../../../../../admin/src/permissions';
 import TableRows from './TableRows';
 import tableHeaders from './utils/tableHeaders';
 import PaginationFooter from './PaginationFooter';

packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ProtectedListPage/index.js → packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ProtectedListPage/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { CheckPagePermissions } from '@strapi/helper-plugin';
-import adminPermissions from '../../../../../permissions';
+import adminPermissions from '../../../../../../../admin/src/permissions';
 import ListView from '../ListView';
 
 const ProtectedListPage = () => (

packages/core/admin/ee/admin/pages/SettingsPage/utils/customRoutes.js

@@ -14,4 +14,18 @@ if (strapi.features.isEnabled(strapi.features.SSO)) {
   });
 }
 
+if (strapi.features.isEnabled(strapi.features.auditLogs)) {
+  routes.push({
+    async Component() {
+      const component = await import(
+        /* webpackChunkName: "audit-logs-settings-page" */ '../pages/AuditLogs/ProtectedListPage'
+      );
+
+      return component;
+    },
+    to: '/settings/audit-logs',
+    exact: true,
+  });
+}
+
 export default routes;