-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Create flag and update label for a conflicted post #14104
Create flag and update label for a conflicted post #14104
Conversation
- Create a BOOL flag for a post that has a conflict in the `dateModified` property between the local and web versions - Update the status on the PostCard and PostCompact cells to display ‘Version Conflict` in `error` coloring, when a post has a version conflict
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good work here @embryoconcepts.
Left a few suggestions for unit tests and a question about the conflict logic.
WordPress/WordPressTest/ViewRelated/Post/Views/PostCardStatusViewModelTests.swift
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you so much for the changes @embryoconcepts!
Almost there!
WordPress/WordPressTest/ViewRelated/Post/Views/PostCardStatusViewModelTests.swift
Outdated
Show resolved
Hide resolved
WordPress/WordPressTest/ViewRelated/Post/Views/PostCardStatusViewModelTests.swift
Outdated
Show resolved
Hide resolved
be0c1fd
to
0d13cda
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just minor changes @embryoconcepts and we would be good to go! o/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@embryoconcepts All good to go. Just one detail:
Can you please remove Localizable.strings
? We should not change this file (you can see a warning above about it).
7701696
into
wordpress-mobile:issue/13683_conflict-resolution-dialog
dateModified
property between the local and web versionsin
error` coloring, when a post has a version conflictNOTES:
isConflicted
, but I felthasVersionConflict
was more precise, and more future-proof (ie, there may be other types of conflicts in the future, and this leaves room for those namesFixes (in part) #13683
To test:
PR submission checklist:
RELEASE-NOTES.txt
if necessary.