From e46a69c849631fecfdaca12430ac903d1b6d3cbd Mon Sep 17 00:00:00 2001
From: Jen Jones Arnesen <jennifer@dhis2.org>
Date: Mon, 6 May 2024 13:34:27 +0200
Subject: [PATCH 1/3] fix: provide nameProp to OrgUnitDimension

---
 src/components/orgunits/OrgUnitSelect.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/orgunits/OrgUnitSelect.js b/src/components/orgunits/OrgUnitSelect.js
index 36f361018..55d49f5b3 100644
--- a/src/components/orgunits/OrgUnitSelect.js
+++ b/src/components/orgunits/OrgUnitSelect.js
@@ -1,4 +1,4 @@
-import { OrgUnitDimension } from '@dhis2/analytics'
+import { OrgUnitDimension, useCachedDataQuery } from '@dhis2/analytics'
 import { CenteredContent, CircularLoader, Help } from '@dhis2/ui'
 import cx from 'classnames'
 import PropTypes from 'prop-types'
@@ -23,6 +23,7 @@ const OrgUnitSelect = ({
     hideGroupSelect = false,
     warning,
 }) => {
+    const { nameProperty } = useCachedDataQuery()
     const { roots, levels, loading, error } = useOrgUnits()
     const rows = useSelector((state) => state.layerEdit.rows)
     const dispatch = useDispatch()
@@ -84,6 +85,7 @@ const OrgUnitSelect = ({
                     hideLevelSelect={hideLevelSelect}
                     hideGroupSelect={hideGroupSelect}
                     warning={!hasOrgUnits ? warning : null}
+                    displayNameProp={nameProperty}
                 />
             </div>
             {!hideAssociatedGeometry && <AssociatedGeometrySelect />}

From 90c1290246372660aca175571d458ca4152c0296 Mon Sep 17 00:00:00 2001
From: Martin Ohlson <martin@moid.se>
Date: Tue, 7 May 2024 15:26:59 +0200
Subject: [PATCH 2/3] chore: bump analytics to latest alpha

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f899103c1..e27c101ac 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
         "start-server-and-test": "^2.0.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "^26.6.5",
+        "@dhis2/analytics": "999.9.9-ouname-alpha.1",
         "@dhis2/app-runtime": "3.9.4",
         "@dhis2/app-runtime-adapter-d2": "^1.1.0",
         "@dhis2/app-service-alerts": "3.9.4",
diff --git a/yarn.lock b/yarn.lock
index 1d16e278e..b20cc09e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2016,10 +2016,10 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2/analytics@^26.6.5":
-  version "26.6.5"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.5.tgz#44ee29a279c37f3969096d859bc0f07d953e3f42"
-  integrity sha512-ob6kNEEkIAC50RtKuUZWi8Y04uwsPHK/EiYhzxZkSOdS5wFm8X+88KZrD//fILXQjwMhJvl/4+F/T0qVxOF/jQ==
+"@dhis2/analytics@999.9.9-ouname-alpha.1":
+  version "999.9.9-ouname-alpha.1"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-999.9.9-ouname-alpha.1.tgz#c2a5f27429e02b762f3344fdcbacb985199f30da"
+  integrity sha512-xFHCM2zPSt/eaOdk+V5uE4m2YxdW5Pn3cK0zJVKctS864tLXMNVCORQ+eDYQfl7lwbWm92Ax05z9L4StizEYtw==
   dependencies:
     "@dhis2/d2-ui-rich-text" "^7.4.1"
     "@dhis2/multi-calendar-dates" "1.0.0"

From de38721f7b1c7b193423ca954ea36c47b7a2d194 Mon Sep 17 00:00:00 2001
From: Martin Ohlson <martin@moid.se>
Date: Fri, 10 May 2024 09:01:43 +0200
Subject: [PATCH 3/3] chore: bump analytics to latest

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e27c101ac..3da8866fe 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
         "start-server-and-test": "^2.0.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "999.9.9-ouname-alpha.1",
+        "@dhis2/analytics": "^26.6.9",
         "@dhis2/app-runtime": "3.9.4",
         "@dhis2/app-runtime-adapter-d2": "^1.1.0",
         "@dhis2/app-service-alerts": "3.9.4",
diff --git a/yarn.lock b/yarn.lock
index b20cc09e8..9d0e27a3f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2016,10 +2016,10 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2/analytics@999.9.9-ouname-alpha.1":
-  version "999.9.9-ouname-alpha.1"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-999.9.9-ouname-alpha.1.tgz#c2a5f27429e02b762f3344fdcbacb985199f30da"
-  integrity sha512-xFHCM2zPSt/eaOdk+V5uE4m2YxdW5Pn3cK0zJVKctS864tLXMNVCORQ+eDYQfl7lwbWm92Ax05z9L4StizEYtw==
+"@dhis2/analytics@^26.6.9":
+  version "26.6.9"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.6.9.tgz#932847c4bee3dd720d5d0b872c6b11eeae8b260c"
+  integrity sha512-AcU5FKH1Rmi8GdgqdJ1aOPqTKhztLafhzKNvGBdb5rSNR8/KS2djyTxxPhL0fdusu+1Rc04RFSkOLajq3ChVrQ==
   dependencies:
     "@dhis2/d2-ui-rich-text" "^7.4.1"
     "@dhis2/multi-calendar-dates" "1.0.0"