Merge pull request #566 from ChildMindInstitute/release/2025.01.1

fix: match single/multi selection option via it's value instead of in…
ChildMindInstitute · Jan 14, 2025 · f745b52 · f745b52
2 parents 3e08d19 + e2b7ced
commit f745b52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/entities/activity/ui/items/ActionPlan/phrasalData.test.ts b/src/entities/activity/ui/items/ActionPlan/phrasalData.test.ts
@@ -34,7 +34,7 @@ describe('Action Plan', () => {
         name,
         responseType: type,
         responseValues: {
-          options: options.map((option) => ({ text: option })),
+          options: options.map((option, value) => ({ text: option, value })),
         },
         answer,
       }) as never as ItemRecord;

diff --git a/src/entities/activity/ui/items/ActionPlan/phrasalData.ts b/src/entities/activity/ui/items/ActionPlan/phrasalData.ts
@@ -100,8 +100,12 @@ export const extractActivitiesPhrasalData = (items: ItemRecord[]): ActivitiesPhr
       const selectFieldData: ActivityPhrasalArrayFieldData = {
         type: 'array',
         values: item.answer
-          .map((value) => item.responseValues.options[parseInt(value, 10)]?.text)
-          .filter((value) => !!value),
+          .map(
+            (value) =>
+              item.responseValues.options.find((option) => option.value === parseInt(value, 10))
+                ?.text,
+          )
+          .filter((value): value is string => !!value),
         context: fieldDataContext,
       };
       fieldData = selectFieldData;