Added Conflict Summary box on the Entity Feed #890
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matthew-white
approved these changes
Nov 7, 2023
- renamed component to EntityConflictSummary - removed space between text and icon of Mark as resolve icon - added transifexKey for markAsResolved - added test for error response in EntityConflictSummary
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes getodk/central#530, closes getodk/central#535
What has been done to verify that this works as intended?
Tested locally and wrote integration tests
Why is this the best possible solution? Were any other approaches considered?
I have created
confirmationcomponent with the intend that this can be used by other pages to show confirmation dialog. I could have created specific modal here like we have done for other cases but I think it's time for a common reusable confirmation component.How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?
None.
Does this change require updates to user documentation? If so, please file an issue here and include the link below.
Should be done as part of release user documentation
Before submitting this PR, please make sure you have:
npm run testandnpm run lintand confirmed all checks still pass OR confirm CircleCI build passes