From ef34f24fe22be867c8dce52548655e181665e12e Mon Sep 17 00:00:00 2001 From: Gianfranco Paoloni Date: Fri, 28 Jun 2024 18:15:41 -0300 Subject: [PATCH 1/3] fix: bug preventing download of documents - wrong id being passed --- plugin-hrm-form/src/components/case/ViewCaseItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-hrm-form/src/components/case/ViewCaseItem.tsx b/plugin-hrm-form/src/components/case/ViewCaseItem.tsx index 4d9663f643..4d39fd63ce 100644 --- a/plugin-hrm-form/src/components/case/ViewCaseItem.tsx +++ b/plugin-hrm-form/src/components/case/ViewCaseItem.tsx @@ -104,7 +104,7 @@ const ViewCaseItem: React.FC = ({ }; const targetObject: FormTargetObject = { - id: currentRoute.id, + id: currentRoute.caseId, type: 'case', }; From afea07cd6383d3a14db12b9065ae750e1ca5da09 Mon Sep 17 00:00:00 2001 From: Stephen Hand Date: Mon, 24 Jun 2024 20:57:51 +0100 Subject: [PATCH 2/3] Only remove first message from list on web tasks when masking identifiers (cherry picked from commit 1ac2c1fbf2b92dabeed4d6b99782ed473388b628) --- plugin-hrm-form/src/maskIdentifiers/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugin-hrm-form/src/maskIdentifiers/index.ts b/plugin-hrm-form/src/maskIdentifiers/index.ts index 7ce4c1331d..f57191aa2e 100644 --- a/plugin-hrm-form/src/maskIdentifiers/index.ts +++ b/plugin-hrm-form/src/maskIdentifiers/index.ts @@ -76,6 +76,7 @@ export const maskManagerStringsWithIdentifiers = & { export const maskMessageListWithIdentifiers = () => { const can = getInitializedCan(); const maskIdentifiers = !can(PermissionActions.VIEW_IDENTIFIERS); + if (!maskIdentifiers) return; MessagingCanvas.defaultProps.memberDisplayOptions = { @@ -83,5 +84,7 @@ export const maskMessageListWithIdentifiers = () => { theirFriendlyNameOverride: false, yourFriendlyNameOverride: true, }; - MessageList.Content.remove('0'); + MessageList.Content.remove('0', { + if: ({ conversation }) => conversation?.source?.attributes?.channel_type === 'web', + }); }; From 350b6932c5c60f011ca8f5c54a765393b96efde4 Mon Sep 17 00:00:00 2001 From: Stephen Hand Date: Mon, 1 Jul 2024 08:58:49 +0100 Subject: [PATCH 3/3] Fix form definitions --- .../form-definitions/zm/v1/tabbedForms/CaseInformationTab.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/CaseInformationTab.json b/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/CaseInformationTab.json index 4f5c144a6e..c5a9be30a2 100644 --- a/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/CaseInformationTab.json +++ b/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/CaseInformationTab.json @@ -26,7 +26,7 @@ { "value": "Referrals to school counsellors", "label": "Referrals to school counsellors" }, { "value": "Reports to Child Sexual Abuse Material", "label": "Reports to Child Sexual Abuse Material" }, { "value": "Reports to PSEA point person", "label": "Reports to PSEA point person" }, - {"value": "One Stop Centres"}, + { "value": "One Stop Centres", "label": "One Stop Centres" }, { "value": "Other", "label": "Other" } ] },