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 adding annotations on top of boundary #226

Merged
merged 3 commits into from
Dec 6, 2022
Merged

Conversation

rajadain
Copy link
Contributor

@rajadain rajadain commented Dec 5, 2022

Overview

Previously, the annotation clicks would be captured by the polygon. Now we mark it as not interactive if the user cannot write or if the shape is not in edit mode, which allows the clicks to pass through to the map, allowing Validators to add annotations within the boundary.

Also removes the Archived tab in the submissions list.

Closes #225
Closes #227

Demo

2022-12-05.15.20.11.mp4

image

Testing Instructions

  • Check out this branch and server
  • Go to http://localhost:4545/ and login as a Validator
  • Pick an In Review submission and go to the details and draw page
  • Try adding annotations
    • Ensure you can add annotations both inside and outside the shape
    • Ensure you can delete annotations both inside and outside the shape
  • With a sample annotation within and outside the boundary, mark that boundary as Needs Revisions
  • Logout and log back in as a Contributor
  • Pick the Needs Revisions submission and amend it
    • Ensure you can access annotations within and without the shape
    • Ensure you can edit the shape
  • Go to /submissions/
    • Ensure you don't see an Archived tab, or Active tab

Checklist

  • fixup! commits have been squashed
  • CHANGELOG.md updated with summary of features or fixes, following Keep a Changelog guidelines
  • README.md updated if necessary to reflect the changes
  • CI passes after rebase

Previously, the annotation clicks would be captured by the polygon.
Now we mark it as not interactive if the user cannot write or if
the shape is not in edit mode, which allows the clicks to pass
through to the map, allowing Validators to add annotations within
the boundary.
@rajadain rajadain added the Task 3.6 Front-end implementation label Dec 5, 2022
Copy link
Contributor

@mstone121 mstone121 left a comment

Choose a reason for hiding this comment

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

👍

The Archived facility will be implemented in the future. Removing
that tab, and tabs in general, entirely for now.
@rajadain
Copy link
Contributor Author

rajadain commented Dec 6, 2022

Thanks for reviewing! I just added 4477531 to remove the Archived tab. Feel free to take another cursory look. Else will merge soon.

@mstone121
Copy link
Contributor

Feel free to take another cursory look.

Looks good!

@rajadain rajadain merged commit 0ccd2a8 into develop Dec 6, 2022
@rajadain rajadain deleted the tt/fix-annotations branch December 6, 2022 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Task 3.6 Front-end implementation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hide "Archived" in the UI Unable to add note within shape
2 participants