Page MenuHomePhabricator
Create Task
Maniphest T244237

Implement basic UI for the talk page resolution suggestion
Closed, ResolvedPublic3 Estimated Story Points
Actions

Description

This is about the basic implementation for the UI according to the following mock:

4.0 EC For Discussion Pages Main Page.jpg (1×1 px, 472 KB)

The ticket includes:

  • Showing the two two different additions underneath each other
  • Showing the (potentially two) collapsed and expandable copy blocks above and below
  • The clickable edit icon on your addition
  • The edit mode on your addition like it is implemented in the normal UI
  • Submitting the edits and the preview

The ticket does not include

  • The drag and drop functionality
  • The popup for that usecase

Details

Show related patches Customize query in gerrit

Related Objects
Search...

Event Timeline

thiemowmde created this task.Feb 4 2020, 2:13 PM
Restricted Application added a project: TCB-Team (now WMDE-TechWish). · View Herald TranscriptFeb 4 2020, 2:13 PM
Restricted Application added a subscriber: Aklapper. · View Herald Transcript
thiemowmde added a project: WMDE-QWERTY-Sprint-2020-02-04.Feb 4 2020, 2:14 PM
thiemowmde set the point value for this task to 8.
thiemowmde added subscribers: awight, WMDE-Fisch.
thiemowmde removed a project: WMDE-QWERTY-Sprint-2020-02-04.Feb 4 2020, 2:28 PM
Lena_WMDE moved this task from Backlog to Product backlog on the Two-Column-Edit-Conflict-Merge board.Feb 18 2020, 8:59 AM
WMDE-Fisch renamed this task from Add code to auto-resolve talk page conflicts to Implement basic UI for the resolution suggestion.Mar 18 2020, 11:44 AM
WMDE-Fisch added a project: WMDE-QWERTY-Sprint-2020-03-18.
WMDE-Fisch updated the task description. (Show Details)
WMDE-Fisch added a parent task: T230231: Allow resolution suggestions of edit conflicts on talk pages.
WMDE-Fisch mentioned this in T247957: Add drag and drop functionality to the resolution suggestion.Mar 18 2020, 11:53 AM
WMDE-Fisch moved this task from Product backlog to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.Mar 18 2020, 12:26 PM
WMDE-Fisch claimed this task.Mar 18 2020, 2:00 PM
WMDE-Fisch moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2020-03-18 board.
awight claimed this task.Mar 19 2020, 4:37 PM

Stealing the task. Hopefully this is the one we were talking about?

gerritbot added a comment.Mar 20 2020, 12:40 PM

Change 582014 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/TwoColConflict@master] Return suggested text blocks for talk conflicts

https://gerrit.wikimedia.org/r/582014

gerritbot added a project: Patch-For-Review.Mar 20 2020, 12:40 PM
gerritbot added a comment.Mar 20 2020, 1:39 PM

Change 582026 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/TwoColConflict@master] Extract styled textbox into a class

https://gerrit.wikimedia.org/r/582026

gerritbot added a comment.Mar 20 2020, 2:02 PM

Change 582030 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/TwoColConflict@master] Rough UI for talk page use case

https://gerrit.wikimedia.org/r/582030

gerritbot added a comment.Mar 20 2020, 2:29 PM

Change 582050 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/TwoColConflict@master] Disable editing on old and other for talk pages

https://gerrit.wikimedia.org/r/582050

gerritbot added a comment.Mar 21 2020, 12:05 AM

Change 582264 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/TwoColConflict@master] Support preview for talk page case

https://gerrit.wikimedia.org/r/582264

gerritbot added a comment.Mar 21 2020, 12:25 AM

Change 582267 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/TwoColConflict@master] Submit data for talk page use case

https://gerrit.wikimedia.org/r/582267

awight moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2020-03-18 board.Mar 21 2020, 12:28 AM

Still needs tests, but I've written the basic functionality first to unblock other work, and will move the task to review for visibility.

awight added a comment.Mar 23 2020, 10:18 AM

We should enable the feature flag on the beta cluster once patches are merged, so that daily browser tests pass and so that the feature can be demoed.

gerritbot added a comment.Mar 23 2020, 10:28 AM

Change 582026 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Extract styled textbox into a class

https://gerrit.wikimedia.org/r/582026

gerritbot added a comment.Mar 23 2020, 10:46 AM

Change 582050 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Disabled style of editable box

https://gerrit.wikimedia.org/r/582050

ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.25; 2020-03-24).Mar 23 2020, 11:00 AM
gerritbot added a comment.Mar 24 2020, 9:28 AM

Change 583045 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Heavily simplify mw.libs.twoColConflict.split.merger()

https://gerrit.wikimedia.org/r/583045

gerritbot added a comment.Mar 24 2020, 9:44 AM

Change 583046 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Streamline ResolutionSuggester implementation

https://gerrit.wikimedia.org/r/583046

gerritbot added a comment.Mar 24 2020, 9:57 AM

Change 583047 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Add validation method for talk page special case

https://gerrit.wikimedia.org/r/583047

gerritbot added a comment.Mar 24 2020, 3:54 PM

Change 583045 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Heavily simplify mw.libs.twoColConflict.split.merger()

https://gerrit.wikimedia.org/r/583045

ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.26; 2020-03-31); removed MW-1.35-notes (1.35.0-wmf.25; 2020-03-24).Mar 24 2020, 4:00 PM
gerritbot added a comment.Mar 25 2020, 10:36 PM

Change 583046 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Streamline ResolutionSuggester implementation

https://gerrit.wikimedia.org/r/583046

gerritbot added a comment.Mar 26 2020, 2:54 PM

Change 582264 abandoned by Awight:
Support preview for talk page case

Reason:
This became one line, so squashed into its parent.

https://gerrit.wikimedia.org/r/582264

gerritbot added a comment.Mar 26 2020, 4:48 PM

Change 583682 had a related patch set uploaded (by Awight; owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] [WIP] Add validation method for talk page special case

https://gerrit.wikimedia.org/r/583682

gerritbot added a comment.Mar 27 2020, 2:14 PM

Change 582267 abandoned by Awight:
Allow single-column conflict resolution to validate

Reason:
Suggest I4418ed86816 instead.

https://gerrit.wikimedia.org/r/582267

Lena_WMDE added a project: WMDE-QWERTY-Sprint-2020-04-01.Apr 1 2020, 10:43 AM
Lena_WMDE changed the point value for this task from 8 to 1.
Lena_WMDE changed the point value for this task from 1 to 3.
awight moved this task from Sprint Backlog to Review on the WMDE-QWERTY-Sprint-2020-04-01 board.Apr 1 2020, 10:49 AM
gerritbot added a comment.Apr 2 2020, 10:36 AM

Change 585467 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/TwoColConflict@master] [WIP] Basic talk page use case browser tests

https://gerrit.wikimedia.org/r/585467

gerritbot added a comment.Apr 2 2020, 12:42 PM

Change 582014 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Return suggested text blocks for talk conflicts

https://gerrit.wikimedia.org/r/582014

gerritbot added a comment.Apr 2 2020, 12:42 PM

Change 582030 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Rough UI for talk page use case

https://gerrit.wikimedia.org/r/582030

gerritbot added a comment.Apr 2 2020, 12:42 PM

Change 583682 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Add validation method for talk page special case

https://gerrit.wikimedia.org/r/583682

ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.27; 2020-04-07); removed MW-1.35-notes (1.35.0-wmf.26; 2020-03-31).Apr 2 2020, 1:00 PM
gerritbot added a comment.Apr 2 2020, 4:03 PM

Change 583047 abandoned by Thiemo Kreuz (WMDE):
[POC] Add validation method for talk page special case

Reason:
Obsolete via I4418ed8.

https://gerrit.wikimedia.org/r/583047

awight moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2020-04-01 board.Apr 6 2020, 1:35 PM

Tests are still pending code review, otherwise this is done. So I'll move it to "demo".

awight renamed this task from Implement basic UI for the resolution suggestion to Implement basic UI for the talk page resolution suggestion.Apr 7 2020, 8:11 PM
thiemowmde closed this task as Resolved.Apr 14 2020, 11:52 AM
thiemowmde moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2020-04-01 board.

Closing for now to clean up our boards. We won't forget about the browser test. The patch is there.

gerritbot added a comment.Apr 20 2020, 9:34 AM

Change 585467 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Basic talk page use case browser tests

https://gerrit.wikimedia.org/r/585467

Maintenance_bot removed a project: Patch-For-Review.Apr 20 2020, 10:10 AM
ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.30; 2020-04-28); removed MW-1.35-notes (1.35.0-wmf.27; 2020-04-07).Apr 20 2020, 2:00 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits