Merge pull request #2374 from techmatters/CHI-2808-cherry_pick

CHI-2808: cherry pick
techmatters · Jul 1, 2024 · 721bd00 · 721bd00
2 parents bc66bd9 + 350b693
commit 721bd00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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" }
     ]
   },

diff --git 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<Props> = ({
   };
 
   const targetObject: FormTargetObject = {
-    id: currentRoute.id,
+    id: currentRoute.caseId,
     type: 'case',
   };
 

diff --git a/plugin-hrm-form/src/maskIdentifiers/index.ts b/plugin-hrm-form/src/maskIdentifiers/index.ts
@@ -76,12 +76,15 @@ export const maskManagerStringsWithIdentifiers = <T extends Strings<string> & {
 export const maskMessageListWithIdentifiers = () => {
   const can = getInitializedCan();
   const maskIdentifiers = !can(PermissionActions.VIEW_IDENTIFIERS);
+
   if (!maskIdentifiers) return;
 
   MessagingCanvas.defaultProps.memberDisplayOptions = {
     theirDefaultName: 'XXXXXX',
     theirFriendlyNameOverride: false,
     yourFriendlyNameOverride: true,
   };
-  MessageList.Content.remove('0');
+  MessageList.Content.remove('0', {
+    if: ({ conversation }) => conversation?.source?.attributes?.channel_type === 'web',
+  });
 };