From 4cdec58cc9727b4c0f1a82fbc7f4f1cbe8145a47 Mon Sep 17 00:00:00 2001 From: Carlos Miceli Date: Fri, 4 Apr 2025 18:12:15 -0300 Subject: [PATCH 1/2] add count to message --- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- src/languages/params.ts | 2 +- src/libs/ReportActionsUtils.ts | 5 +++-- src/types/onyx/OriginalMessage.ts | 3 +++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index d997ae3a1310..f7facbaa5576 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -4872,7 +4872,7 @@ const translations = { updateTagName: ({tagListName, newName, oldName}: UpdatedPolicyTagNameParams) => `updated the tag list "${tagListName}" by changing the tag "${oldName}" to "${newName}`, updateTagEnabled: ({tagListName, tagName, enabled}: UpdatedPolicyTagParams) => `${enabled ? 'enabled' : 'disabled'} the tag "${tagName}" on the list "${tagListName}"`, deleteTag: ({tagListName, tagName}: UpdatedPolicyTagParams) => `removed the tag "${tagName}" from the list "${tagListName}"`, - deleteMultipleTags: ({tagListName}: UpdatedPolicyTagParams) => `removed multiple tags from the list "${tagListName}"`, + deleteMultipleTags: ({count, tagListName}: UpdatedPolicyTagParams) => `removed "${count}" tags from the list "${tagListName}"`, updateTag: ({tagListName, newValue, tagName, updatedField, oldValue}: UpdatedPolicyTagFieldParams) => { if (oldValue) { return `updated the tag "${tagName}" on the list "${tagListName}" by changing the ${updatedField} to "${newValue}" (previously "${oldValue}")`; diff --git a/src/languages/es.ts b/src/languages/es.ts index ef5aed7390f2..c0c2ff654194 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4923,7 +4923,7 @@ const translations = { updateTagName: ({tagListName, newName, oldName}: UpdatedPolicyTagNameParams) => `actualizó la lista de etiquetas "${tagListName}" cambiando la etiqueta "${oldName}" a "${newName}"`, updateTagEnabled: ({tagListName, tagName, enabled}: UpdatedPolicyTagParams) => `${enabled ? 'habilitó' : 'deshabilitó'} la etiqueta "${tagName}" en la lista "${tagListName}"`, deleteTag: ({tagListName, tagName}: UpdatedPolicyTagParams) => `eliminó la etiqueta "${tagName}" de la lista "${tagListName}"`, - deleteMultipleTags: ({tagListName}: UpdatedPolicyTagParams) => `eliminó múltiples etiquetas de la lista "${tagListName}"`, + deleteMultipleTags: ({count, tagListName}: UpdatedPolicyTagParams) => `eliminó "${count}" etiquetas de la lista "${tagListName}"`, updateTag: ({tagListName, newValue, tagName, updatedField, oldValue}: UpdatedPolicyTagFieldParams) => { if (oldValue) { return `actualizó la etiqueta "${tagName}" en la lista "${tagListName}" cambiando el ${updatedField} a "${newValue}" (previamente "${oldValue}")`; diff --git a/src/languages/params.ts b/src/languages/params.ts index b452aae2e998..be56fa8bdccd 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -303,7 +303,7 @@ type UpdatedPolicyCurrencyParams = {oldCurrency: string; newCurrency: string}; type UpdatedPolicyCategoryParams = {categoryName: string; oldValue?: boolean}; -type UpdatedPolicyTagParams = {tagListName: string; tagName?: string; enabled?: boolean}; +type UpdatedPolicyTagParams = {tagListName: string; tagName?: string; enabled?: boolean, count?: string}; type UpdatedPolicyTagNameParams = {oldName: string; newName: string; tagListName: string}; diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index fdf492cf159d..5656d646f6f8 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -1957,7 +1957,7 @@ function getWorkspaceCategoryUpdateMessage(action: ReportAction): string { } function getWorkspaceTagUpdateMessage(action: ReportAction): string { - const {tagListName, tagName, enabled, newName, newValue, oldName, oldValue, updatedField} = + const {tagListName, tagName, enabled, newName, newValue, oldName, oldValue, updatedField, count} = getOriginalMessage(action as ReportAction) ?? {}; if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG && tagListName && tagName) { @@ -1974,8 +1974,9 @@ function getWorkspaceTagUpdateMessage(action: ReportAction): string { }); } - if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_MULTIPLE_TAGS && tagListName) { + if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_MULTIPLE_TAGS && count && tagListName) { return translateLocal('workspaceActions.deleteMultipleTags', { + count, tagListName, }); } diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts index 3d6484543bfc..0689e16dd043 100644 --- a/src/types/onyx/OriginalMessage.ts +++ b/src/types/onyx/OriginalMessage.ts @@ -388,6 +388,9 @@ type OriginalMessagePolicyChangeLog = { /** Updated tag list name */ tagListName?: string; + /** Count of elements updated */ + count?: string; + /** Updated tag enabled/disabled value */ enabled?: boolean; From 7355fd9a71f7246855978a42e96cce77f4b9a1fb Mon Sep 17 00:00:00 2001 From: Carlos Miceli Date: Fri, 4 Apr 2025 19:18:37 -0300 Subject: [PATCH 2/2] prettier --- src/languages/params.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/params.ts b/src/languages/params.ts index be56fa8bdccd..6d347b7d9562 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -303,7 +303,7 @@ type UpdatedPolicyCurrencyParams = {oldCurrency: string; newCurrency: string}; type UpdatedPolicyCategoryParams = {categoryName: string; oldValue?: boolean}; -type UpdatedPolicyTagParams = {tagListName: string; tagName?: string; enabled?: boolean, count?: string}; +type UpdatedPolicyTagParams = {tagListName: string; tagName?: string; enabled?: boolean; count?: string}; type UpdatedPolicyTagNameParams = {oldName: string; newName: string; tagListName: string};