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

Append correct paths for org units #220

Merged
merged 8 commits into from
Mar 6, 2019
Merged

Append correct paths for org units #220

merged 8 commits into from
Mar 6, 2019

Conversation

neeilya
Copy link
Contributor

@neeilya neeilya commented Feb 27, 2019

Relates to DHIS2-5987.

This PR covers some edge cases for "Open as map" feature and contains:

  • Fix for generating correct paths for ou dimension items (with / prefix) and supplying them to current analytical object in user data store
  • Fix for generating correct parentGraphMap from current analytical object
  • Fix for generating complete correct parentGraphMap for current analytical object
  • Fix for generating correct parentGraphMap value for root organisation unit upon orgunit selection in OrgUnitDimension dialog.
  • Tests

P.s. I had to reimplement removeLastPathSegment function which was earlier imported from @dhis2/d2-ui-org-unit-dialog component, since importing causes circular dependency error (presumably coming from d2).

@neeilya neeilya requested a review from joakimia March 5, 2019 14:24
Copy link
Contributor

@joakimia joakimia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested the branch,
Root and Sub-org units have correct path appended:

"dimension": "ou",
"items": [
{
"id": "DiszpKrYNg8",
"name": "Ngelehun CHC",
"path": "/ImspTQPwCqd/O6uvpzGd5pu/YuQRtpLP10I/DiszpKrYNg8"
},
{
"id": "g8upMTyEZGZ",
"name": "Njandama MCHP",
"path": "/ImspTQPwCqd/O6uvpzGd5pu/YuQRtpLP10I/g8upMTyEZGZ"
}
]
}

@neeilya neeilya merged commit d50f634 into master Mar 6, 2019
@neeilya neeilya deleted the feature/open-as-map branch March 6, 2019 15:39
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 33.0.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 32.1.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 33.1.13 🎉

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
Development

Successfully merging this pull request may close these issues.

None yet

3 participants