From 5eac95732b13444201dae42c664936e0d68099d9 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 4 Oct 2024 10:34:26 +0530 Subject: [PATCH] fix: Update translation payload for audit logs (#10217) Vue i18n would automatically merge arrays previously, it does not do so now. This PR fixes it by cleaning up the payload before passing it for translation --- .../dashboard/settings/auditlogs/Index.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue index ec6242adb..bf385084e 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/auditlogs/Index.vue @@ -35,13 +35,19 @@ const fetchAuditLogs = page => { }; const generateLogText = auditLogItem => { - const translationPayload = generateTranslationPayload( - auditLogItem, - agentList.value - ); + const payload = generateTranslationPayload(auditLogItem, agentList.value); const translationKey = generateLogActionKey(auditLogItem); - return t(translationKey, translationPayload); + const joinIfArray = value => { + return Array.isArray(value) ? value.join(', ') : value; + }; + + const mergedPayload = { + ...payload, + attributes: joinIfArray(payload.attributes), + values: joinIfArray(payload.values), + }; + return t(translationKey, mergedPayload); }; const onPageChange = page => {