fix: filter data elements and tracked entity attributes

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

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/..._modules/capture-core/metaDataStoreLoaders/programs/quickStoreOperations/storePrograms.js b/..._modules/capture-core/metaDataStoreLoaders/programs/quickStoreOperations/storePrograms.js
@@ -31,7 +31,7 @@ const convert = (() => {
 
     const getProgramStageDataElements = programStageDataElements =>
         (programStageDataElements || [])
-            .filter(programStageDataElement => programStageDataElement.dataElement)
+            .filter(programStageDataElement => programStageDataElement.dataElement?.id)
             .map((programStageDataElement) => {
                 programStageDataElement.dataElement.translations =
                     // $FlowFixMe[incompatible-type] automated comment
@@ -58,6 +58,7 @@ const convert = (() => {
 
     const getProgramTrackedEntityAttributes = programAttributes =>
         (programAttributes || [])
+            .filter(({ trackedEntityAttribute }) => trackedEntityAttribute?.id)
             .map(pa => getProgramTrackedEntityAttribute(pa));
 
     return (response: apiProgramsResponse) => {

diff --git a/...e/metaDataStoreLoaders/trackedEntityTypes/quickStoreOperations/storeTrackedEntityTypes.js b/...e/metaDataStoreLoaders/trackedEntityTypes/quickStoreOperations/storeTrackedEntityTypes.js
@@ -15,6 +15,7 @@ const convert = (() => {
 
     const getTrackedEntityTypeAttributes = trackedEntityTypeAttributes =>
         (trackedEntityTypeAttributes || [])
+            .filter(({ trackedEntityAttribute }) => trackedEntityAttribute?.id)
             .map(trackedEntityTypeAttribute => getTrackedEntityTypeAttribute(trackedEntityTypeAttribute));
 
     return response =>