From 3a227b6f1e3cc3d5cb76d1936a8209c28d03b3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20de=20Juvigny?= Date: Fri, 13 Jan 2023 10:20:18 +0100 Subject: [PATCH] Add model name to entry events --- .../pages/AuditLogs/ListView/Modal/ActionBody.js | 11 +++++++---- .../pages/AuditLogs/ListView/TableRows/index.js | 14 +++++++++----- .../pages/AuditLogs/ListView/tests/index.test.js | 2 +- .../pages/AuditLogs/ListView/tests/utils/data.js | 6 ++++++ .../utils/getActionTypesDefaultMessages.js | 10 +++++----- packages/core/admin/admin/src/translations/en.json | 10 +++++----- packages/providers/audit-logs-local/lib/index.js | 2 +- 7 files changed, 34 insertions(+), 21 deletions(-) diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js index 2b846d4cde..3c1034b74f 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js @@ -48,10 +48,13 @@ const ActionBody = ({ status, data, formattedDate }) => { id: 'Settings.permissions.auditLogs.action', defaultMessage: 'Action', })} - actionName={formatMessage({ - id: `Settings.permissions.auditLogs.${action}`, - defaultMessage: getDefaultMessage(action), - })} + actionName={formatMessage( + { + id: `Settings.permissions.auditLogs.${action}`, + defaultMessage: getDefaultMessage(action), + }, + { model: payload?.model } + )} /> { const { formatMessage } = useIntl(); const formatTimeStamp = useFormatTimeStamp(); - const getCellValue = ({ type, value }) => { + const getCellValue = ({ type, value, model }) => { if (type === 'date') { return formatTimeStamp(value); } if (type === 'action') { - return formatMessage({ - id: `Settings.permissions.auditLogs.${value}`, - defaultMessage: getDefaultMessage(value), - }); + return formatMessage( + { + id: `Settings.permissions.auditLogs.${value}`, + defaultMessage: getDefaultMessage(value), + }, + { model } + ); } return value || '-'; @@ -46,6 +49,7 @@ const TableRows = ({ headers, rows, onOpenModal }) => { {getCellValue({ type: key, value: cellFormatter ? cellFormatter(data[name]) : data[name], + model: data.payload?.model, })} diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/tests/index.test.js index 320dd07b5c..4eafbae32a 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/tests/index.test.js @@ -96,7 +96,7 @@ describe('ADMIN | Pages | AUDIT LOGS | ListView', () => { await waitFor(() => { expect(screen.getByText('Create role')).toBeInTheDocument(); expect(screen.getByText('Delete role')).toBeInTheDocument(); - expect(screen.getByText('Create entry')).toBeInTheDocument(); + expect(screen.getByText('Create entry (article)')).toBeInTheDocument(); expect(screen.getByText('Admin logout')).toBeInTheDocument(); }); }); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/tests/utils/data.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/tests/utils/data.js index 96964ef4d1..c51131666d 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/tests/utils/data.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/tests/utils/data.js @@ -8,6 +8,7 @@ const TEST_PAGE_DATA = [ fullname: 'test user', email: 'test@test.com', }, + payload: {}, }, { id: 2, @@ -18,12 +19,16 @@ const TEST_PAGE_DATA = [ fullname: 'test user', email: 'test@test.com', }, + payload: {}, }, { id: 3, action: 'entry.create', date: '2022-12-27T17:34:00.673Z', user: null, + payload: { + model: 'article', + }, }, { id: 4, @@ -34,6 +39,7 @@ const TEST_PAGE_DATA = [ fullname: 'test user', email: 'test@test.com', }, + payload: {}, }, ]; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/utils/getActionTypesDefaultMessages.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/utils/getActionTypesDefaultMessages.js index 272a167096..1581552538 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/utils/getActionTypesDefaultMessages.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/AuditLogs/ListView/utils/getActionTypesDefaultMessages.js @@ -1,9 +1,9 @@ const actionTypes = { - 'entry.create': 'Create entry', - 'entry.update': 'Update entry', - 'entry.delete': 'Delete entry', - 'entry.publish': 'Publish entry', - 'entry.unpublish': 'Unpublish entry', + 'entry.create': 'Create entry ({model})', + 'entry.update': 'Update entry ({model})', + 'entry.delete': 'Delete entry ({model})', + 'entry.publish': 'Publish entry ({model})', + 'entry.unpublish': 'Unpublish entry ({model})', 'media.create': 'Create media', 'media.update': 'Update media', 'media.delete': 'Delete media', diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json index ac7c3f57b9..804910aa5b 100644 --- a/packages/core/admin/admin/src/translations/en.json +++ b/packages/core/admin/admin/src/translations/en.json @@ -181,11 +181,11 @@ "Settings.permissions.auditLogs.userId": "User ID", "Settings.permissions.auditLogs.details": "Log Details", "Settings.permissions.auditLogs.listview.header.subtitle": "Logs of all the activities that happened in your environment", - "Settings.permissions.auditLogs.entry.create": "Create entry", - "Settings.permissions.auditLogs.entry.update": "Update entry", - "Settings.permissions.auditLogs.entry.delete": "Delete entry", - "Settings.permissions.auditLogs.entry.publish": "Publish entry", - "Settings.permissions.auditLogs.entry.unpublish": "Unpublish entry", + "Settings.permissions.auditLogs.entry.create": "Create entry ({model})", + "Settings.permissions.auditLogs.entry.update": "Update entry ({model})", + "Settings.permissions.auditLogs.entry.delete": "Delete entry ({model})", + "Settings.permissions.auditLogs.entry.publish": "Publish entry ({model})", + "Settings.permissions.auditLogs.entry.unpublish": "Unpublish entry ({model})", "Settings.permissions.auditLogs.media.create": "Create media", "Settings.permissions.auditLogs.media.update": "Update media", "Settings.permissions.auditLogs.media.delete": "Delete media", diff --git a/packages/providers/audit-logs-local/lib/index.js b/packages/providers/audit-logs-local/lib/index.js index cf8641e3cc..9d96463bf5 100644 --- a/packages/providers/audit-logs-local/lib/index.js +++ b/packages/providers/audit-logs-local/lib/index.js @@ -24,7 +24,7 @@ const provider = { findMany(query) { return strapi.entityService.findPage('admin::audit-log', { populate: ['user'], - fields: ['action', 'date'], + fields: ['action', 'date', 'payload'], ...query, }); },