fix: filter option sets

dhis2 · Oct 12, 2023 · 8dc1e4d · 8dc1e4d
1 parent ad1ae4f
commit 8dc1e4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "Capture",
   "homepage": ".",
   "version": "36.2.0",
-  "cacheVersion": "2",
+  "cacheVersion": "3",
   "private": false,
   "dependencies": {
     "@dhis2/app-runtime": "^2.6.1",

diff --git a/src/core_modules/capture-core/metaDataStoreLoaders/optionSets/loadOptionSets.js b/src/core_modules/capture-core/metaDataStoreLoaders/optionSets/loadOptionSets.js
@@ -93,13 +93,15 @@ const getCacheOptionSets = (optionSets: Array<ApiOptionSet>, optionGroupsByOptio
         version: optionSet.version,
         valueType: optionSet.valueType,
         translations: optionSet.translations,
-        options: optionSet.options && [...optionSet.options.values()].map(option => ({
-            id: option.id,
-            displayName: option.displayName,
-            code: option.code,
-            style: option.style,
-            translations: option.translations,
-        })),
+        options: optionSet.options && [...optionSet.options.values()]
+            .filter(option => option && option.id)
+            .map(option => ({
+                id: option.id,
+                displayName: option.displayName,
+                code: option.code,
+                style: option.style,
+                translations: option.translations,
+            })),
         optionGroups: optionGroupsByOptionSet[optionSet.id] && optionGroupsByOptionSet[optionSet.id].map(optionGroup => ({
             id: optionGroup.id,
             displayName: optionGroup.displayName,