yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor getDisplayedFilters and add translations

Browse Source
This commit is contained in:
Mark Kaylor 2023-01-27 17:06:15 +01:00
parent 00db731c6c
commit e38379c828
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/index.js
View File

@ -23,7 +23,6 @@ import PaginationFooter from './PaginationFooter';
import Modal from './Modal';
import Filters from '../../../../../../../admin/src/pages/SettingsPage/components/Filters';
import getDisplayedFilters from './utils/getDisplayedFilters';
import getDefaultMessage, { actionTypes } from './utils/getActionTypesDefaultMessages';
import useAuditLogsData from './hooks/useAuditLogsData';
const ListView = () => {
@ -36,28 +35,7 @@ const ListView = () => {
useFocusWhenNavigate();
const actionOptions = Object.keys(actionTypes).map((action) => {
return {
label: formatMessage(
{
id: `Settings.permissions.auditLogs.${action}`,
defaultMessage: getDefaultMessage(action),
},
{ model: '' }
),
customValue: action,
};
});
const userOptions = users?.results.map((user) => {
return {
label: `${user.firstname} ${user.lastname}`,
// Combobox expects a string value
customValue: user.id.toString(),
};
});
const displayedFilters = getDisplayedFilters({ actionOptions, userOptions });
const displayedFilters = getDisplayedFilters({ formatMessage, users });
const title = formatMessage({
id: 'global.auditLogs',

41
packages/core/admin/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/utils/getDisplayedFilters.js
View File

@ -1,4 +1,5 @@
import ComboboxFilter from '../ComboboxFilter';
import getDefaultMessage, { actionTypes } from './getActionTypesDefaultMessages';
const customOperators = [
{
@ -11,12 +12,36 @@ const customOperators = [
},
];
const getDisplayedFilters = ({ actionOptions, userOptions }) => {
const getDisplayedFilters = ({ formatMessage, users }) => {
const actionOptions = Object.keys(actionTypes).map((action) => {
return {
label: formatMessage(
{
id: `Settings.permissions.auditLogs.${action}`,
defaultMessage: getDefaultMessage(action),
},
{ model: '' }
),
customValue: action,
};
});
const userOptions = users?.results.map((user) => {
return {
label: `${user.firstname} ${user.lastname}`,
// Combobox expects a string value
customValue: user.id.toString(),
};
});
return [
{
name: 'action',
metadatas: {
label: 'Action',
label: formatMessage({
id: 'Settings.permissions.auditLogs.action',
defaultMessage: 'Action',
}),
options: actionOptions,
customOperators,
customInput: ComboboxFilter,
@ -25,13 +50,21 @@ const getDisplayedFilters = ({ actionOptions, userOptions }) => {
},
{
name: 'date',
metadatas: { label: 'Date' },
metadatas: {
label: formatMessage({
id: 'Settings.permissions.auditLogs.date',
defaultMessage: 'Date',
}),
},
fieldSchema: { type: 'datetime' },
},
{
name: 'user',
metadatas: {
label: 'User',
label: formatMessage({
id: 'Settings.permissions.auditLogs.user',
defaultMessage: 'User',
}),
options: userOptions,
customOperators: [
...customOperators,