diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json index b42f51ba0c..9f617c9c73 100644 --- a/packages/core/admin/admin/src/translations/en.json +++ b/packages/core/admin/admin/src/translations/en.json @@ -181,11 +181,12 @@ "Settings.permissions.auditLogs.action": "Action", "Settings.permissions.auditLogs.date": "Date", "Settings.permissions.auditLogs.user": "User", + "Settings.permissions.auditLogs.user.fullname": "{firstname} {lastname}", "Settings.permissions.auditLogs.userId": "User ID", "Settings.permissions.auditLogs.details": "Log Details", "Settings.permissions.auditLogs.payload": "Payload", "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.create": "Create entry {model, select, model ({model}) other {}}", "Settings.permissions.auditLogs.entry.update": "Update entry", "Settings.permissions.auditLogs.entry.delete": "Delete entry", "Settings.permissions.auditLogs.entry.publish": "Publish entry", @@ -848,4 +849,4 @@ "request.error.model.unknown": "This model doesn't exist", "skipToContent": "Skip to content", "submit": "Submit" -} +} \ No newline at end of file diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js index b0ece7c47a..6a49f65d94 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/Modal/ActionBody.js @@ -49,11 +49,11 @@ const ActionBody = ({ status, data, formattedDate }) => { id: 'Settings.permissions.auditLogs.action', defaultMessage: 'Action', })} - actionName={getActionMessage( - formatMessage({ + actionName={formatMessage( + { id: `Settings.permissions.auditLogs.${action}`, defaultMessage: getDefaultMessage(action), - }), + }, { model: payload?.model } )} /> diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js index f6904043a8..e743092021 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/TableRows/index.js @@ -8,7 +8,7 @@ import { Tbody, Td, Tr } from '@strapi/design-system/Table'; import Eye from '@strapi/icons/Eye'; import { onRowClick, stopPropagation } from '@strapi/helper-plugin'; import useFormatTimeStamp from '../hooks/useFormatTimeStamp'; -import { getActionMessage, getDefaultMessage } from '../utils/formatMessage'; +import { getDefaultMessage } from '../utils/formatMessage'; const TableRows = ({ headers, rows, onOpenModal }) => { const { formatMessage } = useIntl(); @@ -20,11 +20,11 @@ const TableRows = ({ headers, rows, onOpenModal }) => { } if (type === 'action') { - return getActionMessage( - formatMessage({ + return formatMessage( + { id: `Settings.permissions.auditLogs.${value}`, defaultMessage: getDefaultMessage(value), - }), + }, { model } ); } diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/formatMessage.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/formatMessage.js index fa193c4808..4486f0485f 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/formatMessage.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/formatMessage.js @@ -32,11 +32,3 @@ export const actionTypes = { export const getDefaultMessage = (value) => { return actionTypes[value] || value; }; - -export const getActionMessage = (message, action) => { - if (message.includes('entry')) { - return `${message} (${action.model})`; - } - - return message; -}; diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js index 00618bf28a..9e9ecdb519 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js @@ -25,7 +25,16 @@ const getDisplayedFilters = ({ formatMessage, users }) => { const userOptions = users?.results.map((user) => { return { - label: `${user.firstname} ${user.lastname}`, + label: formatMessage( + { + id: 'Settings.permissions.auditLogs.user.fullname', + defaultMessage: '{firstname} {lastname}', + }, + { + firstname: user.firstname, + lastname: user.lastname, + } + ), // Combobox expects a string value customValue: user.id.toString(), };