Merge pull request #1095 from akvo/feature/1094-village-list-has-only…

…-one-option-when-switching-dep-questions [#1094] Village list has only one option when switching from update to new form
akvo · Jan 29, 2024 · c8b7c33 · c8b7c33
2 parents 84c3e4e + f8a9f52
commit c8b7c33
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/src/form/fields/TypeCascade.js b/app/src/form/fields/TypeCascade.js
@@ -72,13 +72,13 @@ const TypeCascade = ({
 
   const initialDropdowns = useMemo(() => {
     const parentIDs = source?.parent_id?.length ? source.parent_id : [0];
-    let filterDs = dataSource.filter(
+    const filterDs = dataSource.filter(
       (ds) =>
-        parentIDs.includes(ds?.parent) || value?.includes(ds?.id) || value?.includes(ds?.parent),
+        parentIDs.includes(ds?.parent) ||
+        parentIDs.includes(ds?.id) ||
+        value?.includes(ds?.id) ||
+        value?.includes(ds?.parent),
     );
-    if (filterDs.length === 0) {
-      filterDs = dataSource.filter((ds) => parentIDs.includes(ds?.id));
-    }
     const groupedDs = groupBy(filterDs, 'parent');
     if (parentIDs.length > 1 && Object.keys(groupedDs).length > 1) {
       const parentOptions = Object.keys(groupedDs).map((keyID) =>