From 11bb64ef6013d51f5ffedcc714377971733bb58c Mon Sep 17 00:00:00 2001 From: Martin Ohlson Date: Tue, 7 May 2024 15:26:07 +0200 Subject: [PATCH 1/3] fix: pass displayNameProp to OrgUnitDimension --- src/pages/view/TitleBar/FilterDialog.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/view/TitleBar/FilterDialog.js b/src/pages/view/TitleBar/FilterDialog.js index 10e15b1aa..f1586e612 100644 --- a/src/pages/view/TitleBar/FilterDialog.js +++ b/src/pages/view/TitleBar/FilterDialog.js @@ -110,6 +110,7 @@ const FilterDialog = ({ )} selected={selectedItems} onSelect={onSelectItems} + displayNameProp={userSettings.displayProperty} /> ) default: From 12355fd082f432091b346fb00a59d7864b8ebe98 Mon Sep 17 00:00:00 2001 From: Martin Ohlson Date: Tue, 7 May 2024 15:26:16 +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 fd392c504..6e6d399f4 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "^26.6.5", + "@dhis2/analytics": "999.9.9-ouname-alpha.1", "@dhis2/app-runtime": "^3.10.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", diff --git a/yarn.lock b/yarn.lock index 1ed96ddc8..197c1b0a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2245,10 +2245,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 255275880fe5845cb10a83710e72e881a86ea4d8 Mon Sep 17 00:00:00 2001 From: Martin Ohlson Date: Fri, 10 May 2024 09:03:05 +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 6e6d399f4..44e4d9ed8 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "999.9.9-ouname-alpha.1", + "@dhis2/analytics": "^26.6.9", "@dhis2/app-runtime": "^3.10.2", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.3", diff --git a/yarn.lock b/yarn.lock index 197c1b0a5..4a24f6ec6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2245,10 +2245,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"