diff --git a/packages/acl/src/acl-available-action.ts b/packages/acl/src/acl-available-action.ts index 2bcd0b52f..2bb4667a3 100644 --- a/packages/acl/src/acl-available-action.ts +++ b/packages/acl/src/acl-available-action.ts @@ -6,5 +6,5 @@ export interface AvailableActionOptions { } export class AclAvailableAction { - constructor(private name: string, private options: AvailableActionOptions) {} + constructor(public name: string, public options: AvailableActionOptions) {} } diff --git a/packages/plugin-acl/src/actions/available-actions.ts b/packages/plugin-acl/src/actions/available-actions.ts index 97120ab30..4eb17f922 100644 --- a/packages/plugin-acl/src/actions/available-actions.ts +++ b/packages/plugin-acl/src/actions/available-actions.ts @@ -1,11 +1,15 @@ - const availableActionResource = { name: 'availableActions', actions: { async list(ctx, next) { const acl = ctx.app.acl; const availableActions = acl.getAvailableActions(); - ctx.body = Array.from(availableActions.entries()).map((item) => item[1]); + ctx.body = Array.from(availableActions.entries()).map(([, { name, options }]) => { + return { + ...options, + name, + }; + }); await next(); }, }, diff --git a/packages/server/src/acl/available-action.ts b/packages/server/src/acl/available-action.ts index 41c5cf84e..5db264bf7 100644 --- a/packages/server/src/acl/available-action.ts +++ b/packages/server/src/acl/available-action.ts @@ -4,28 +4,28 @@ const availableActions: { [key: string]: AvailableActionOptions; } = { create: { - displayName: 't("Create")', + displayName: '{{ t("Create") }}', type: 'new-data', }, import: { - displayName: 't("Import")', + displayName: '{{ t("Import") }}', type: 'new-data', }, export: { - displayName: 't("Import")', + displayName: '{{ t("Export") }}', type: 'new-data', }, view: { - displayName: 't("View")', + displayName: '{{ t("View") }}', type: 'old-data', aliases: ['get', 'list'], }, update: { - displayName: 't("Edit")', + displayName: '{{ t("Edit") }}', type: 'old-data', }, destroy: { - displayName: 't("Delete")', + displayName: '{{ t("Delete") }}', type: 'old-data', }, };