Merge remote-tracking branch 'upstream/master'

EyeSeeTea · Sep 19, 2024 · f8e17c3 · f8e17c3
2 parents 0e26198 + fa8c979
commit f8e17c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bulk-load",
     "description": "Bulk importing made easy",
-    "version": "3.24.0",
+    "version": "3.24.1",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",

diff --git a/src/data/Dhis2TrackedEntityInstances.ts b/src/data/Dhis2TrackedEntityInstances.ts
@@ -456,12 +456,12 @@ async function getTeisFromApi(options: {
 
     const ouModeQuery =
         ouMode === "SELECTED" || ouMode === "CHILDREN" || ouMode === "DESCENDANTS"
-            ? { orgUnitMode: ouMode, orgUnit: orgUnits?.map(({ id }) => id) }
-            : { orgUnitMode: ouMode };
+            ? { ouMode: ouMode, orgUnit: orgUnits?.map(({ id }) => id) }
+            : { ouMode: ouMode };
 
     const filters: TrackedEntityGetRequest = {
         ...ouModeQuery,
-        order: "created:asc",
+        order: "createdAt:asc",
         program: program.id,
         pageSize: pageSize,
         page: page,