Merge pull request #460 from EyeSeeTea/development

Release 2.6.3
EyeSeeTea · Sep 2, 2024 · bcb749a · bcb749a
2 parents 19ef0e7 + 3b250d8
commit bcb749a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "d2-dataset-configuration",
-    "version": "2.6.2",
+    "version": "2.6.3",
     "description": "Dataset Configuration User Interface",
     "main": "src/index.html",
     "scripts": {

diff --git a/src/models/DataSetStore.js b/src/models/DataSetStore.js
@@ -427,11 +427,16 @@ export default class DataSetStore {
         const projectCountryCode =
             project && project.code ? project.code.slice(0, 2).toUpperCase() : null;
 
+        const dataSetCountryIds = _(toArray(dataset.organisationUnits))
+            .map(ou => ou.path.split("/")[3])
+            .uniq()
+            .value();
+
         if (projectCountryCode && countriesByCode[projectCountryCode]) {
             return [countriesByCode[projectCountryCode]];
         } else {
             return _(countriesById)
-                .at(toArray(dataset.organisationUnits).map(ou => ou.id))
+                .at(dataSetCountryIds)
                 .compact()
                 .value();
         }

diff --git a/src/models/dataset.js b/src/models/dataset.js
@@ -35,7 +35,7 @@ export function getProject(d2, config, dataset) {
             .filter()
             .on("categories.id")
             .equals(config.categoryProjectsId)
-            .list({ fields: "id,displayName", paging: false })
+            .list({ fields: "id,code,displayName", paging: false })
             .then(collection => collection.toArray())
             .then(projects =>
                 _(projects).find(project => _.includes(dataset.name, project.displayName))