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

ModelItem ordering fixes #325

Merged
merged 3 commits into from
Jun 21, 2022
Merged

ModelItem ordering fixes #325

merged 3 commits into from
Jun 21, 2022

Conversation

joe-crawford
Copy link
Contributor

@joe-crawford joe-crawford commented Jun 20, 2022

Fixes to ModelItem ordering, resolves gh-320:

  • Sort DataElements by index by default
  • Don't sort by index where listing across multiple parents or including imported items
  • Add tests

…ported

- Add imported DataElement ordering test
- Don't sort by index where indices may not be comparable e.g. when listing all DCs from a DM, or where imported items exist
- Otherwise allow sorting by index
@joe-crawford joe-crawford marked this pull request as draft June 20, 2022 16:23
@joe-crawford joe-crawford changed the title Feature/gh 320 ModelItem ordering fixes Jun 21, 2022
@joe-crawford joe-crawford added this to the 5.2.0 milestone Jun 21, 2022
@joe-crawford
Copy link
Contributor Author

Failing test not related.

@joe-crawford joe-crawford marked this pull request as ready for review June 21, 2022 08:35
@olliefreeman olliefreeman merged commit f91cea4 into develop Jun 21, 2022
@olliefreeman olliefreeman deleted the feature/gh-320 branch June 21, 2022 13:34
@joe-crawford joe-crawford removed this from the 5.2.0 milestone Jul 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Default ordering on Data Elements orders by label rather than index.
2 participants