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.

Sign up for GitHub

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

Jump to bottom

--[BUGFIX] Make sure empty Markerset subconfigs are removed when appropriate #2434

Merged
merged 3 commits into from
Jul 24, 2024
Merged

--[BUGFIX] Make sure empty Markerset subconfigs are removed when appropriate #2434

merged 3 commits into from
Jul 24, 2024

Conversation

jturner65
Copy link
Contributor

@jturner65 jturner65 commented Jul 23, 2024 •
edited
Loading

Motivation and Context

If all the markers in a markerset are removed, the markerset should also be removed. This should apply to all levels of the hierarchy, so that empty (sub)objects are not written to JSON on save.

How Has This Been Tested

Locally c++ and python tests pass

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have completed my CLA (see CONTRIBUTING)
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Jul 23, 2024
@jturner65 jturner65 requested review from 0mdc and aclegg3 July 23, 2024 16:52
@jturner65 jturner65 marked this pull request as ready for review July 23, 2024 16:52
0mdc
0mdc approved these changes Jul 23, 2024
View reviewed changes
Copy link
Contributor

@0mdc 0mdc left a comment

Choose a reason for hiding this comment

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

LGTM!

jturner65 added 2 commits July 24, 2024 10:03
@jturner65
--cleanup configuration; handle get attempt from non-existing subconfig
8785153 
Instead of asserting, return a warning along with an empty vector <T> if the named subconfig is not found. This is consistent with the behavior of other indirect subconfig queries.
@jturner65
--handle if the 'markers' subconfig does not exist in a MarkerSet
4449493 
It is possible to have a JSON marker set object associated with a link and task that lists no points. Due to the markersets being managed generically as nested configurations, with access accomplished via static casting, it is then possible to access a MarkerSet object that may not have a "markers" subconfig. This is a reasonable state, and should result in an assertion when attempting to query the MarkerSet.
@jturner65 jturner65 merged commit 0b58d04 into main Jul 24, 2024
9 of 10 checks passed
@jturner65 jturner65 deleted the Bugfix_Markers branch July 24, 2024 15:35
@jturner65 jturner65 mentioned this pull request Jul 25, 2024
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0mdc 0mdc 0mdc approved these changes

@aclegg3 aclegg3 Awaiting requested review from aclegg3

Assignees
No one assigned
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jturner65 @0mdc @facebook-github-bot