Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: system / user setting for display name not respected in Org Unit tree (DHIS2-15000) #3195

Merged
merged 4 commits into from
May 13, 2024

Conversation

jenniferarnesen
Copy link
Collaborator

@jenniferarnesen jenniferarnesen commented May 6, 2024

Implements DHIS2-15000

Requires dhis2/analytics#1664


Levels seem to get the translation, nameProperty not needed.

Settings: database language: Norwegian
displayName: shortName

For the OU tree, short names don't work. OULevels don't have short names.

ou translated

@jenniferarnesen jenniferarnesen marked this pull request as draft May 6, 2024 11:36
@dhis2-bot
Copy link
Contributor

dhis2-bot commented May 6, 2024

🚀 Deployed on https://pr-3195--dhis2-maps.netlify.app

@dhis2-bot dhis2-bot temporarily deployed to netlify May 6, 2024 12:00 Inactive
@jenniferarnesen jenniferarnesen changed the title fix: org unit tree was not showing short ou names or translated ou names fix: org unit groups was not showing short names May 6, 2024
@jenniferarnesen jenniferarnesen marked this pull request as ready for review May 6, 2024 12:52
@martinkrulltott martinkrulltott changed the title fix: org unit groups was not showing short names fix: system / user setting for display name not respected in Org Unit tree (DHIS2-15000) May 7, 2024
@dhis2-bot dhis2-bot temporarily deployed to netlify May 7, 2024 13:30 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify May 8, 2024 09:59 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify May 10, 2024 07:04 Inactive
Copy link

cypress bot commented May 13, 2024

4 flaky tests on run #3180 ↗︎

0 118 32 0 Flakiness 4

Details:

Merge de38721 into 3c69a86...
Project: maps Commit: e447d69930 ℹ️
Status: Passed Duration: 09:25 💡
Started: May 13, 2024 9:25 AM Ended: May 13, 2024 9:35 AM
Flakiness  systemsettings.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output

Test Artifacts
systemSettings > uses Last 6 months as default relative period Screenshots
Flakiness  basemaps.cy.js • 1 flaky test • e2e-chrome-parallel-2.41

View Output

Test Artifacts
Basemap checks > open map with unknown basemap uses fallback basemap (OSM Light) when system default basemap is invalid Screenshots
Flakiness  filemenu.cy.js • 1 flaky test • e2e-chrome-parallel-2.41

View Output

Test Artifacts
File menu > saves a new map Screenshots
Flakiness  layers/eventlayer.cy.js • 1 flaky test • e2e-chrome-parallel-2.41

View Output

Test Artifacts
Event Layers > shows error if no program selected Screenshots

Review all test suite changes for PR #3195 ↗︎

@jenniferarnesen jenniferarnesen merged commit 8560478 into dev May 13, 2024
20 checks passed
@jenniferarnesen jenniferarnesen deleted the fix/displayname-in-ou-selector branch May 13, 2024 10:50
dhis2-bot added a commit that referenced this pull request May 16, 2024
## [100.5.4](v100.5.3...v100.5.4) (2024-05-16)

### Bug Fixes

* system / user setting for display name not respected in Org Unit tree (DHIS2-15000) ([#3195](#3195)) ([8560478](8560478))
* users losing work when opening as chart ([#3196](#3196)) ([3c69a86](3c69a86))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 100.5.4 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

None yet

3 participants