Steps:
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Resolved | WMDE-Fisch | T245410 Neither column of a conflict should be selected by default | |||
| Stalled | None | T245505 Non-JS error handling when a conflict is submitted with no column selected | |||
| Stalled | None | T248573 Allow Non-JS validation by re-populating the form | |||
| Resolved | WMDE-Fisch | T246870 Non-JS conflict resolution might ignore reverts in specific cases | |||
| Resolved | WMDE-Fisch | T246781 Non-JS conflict resolution might forget about edits made in the UI |
OK first things I want to mention here:
I will first add a fallback for that in any case where the selection is incomplete, we will keep the article untouched.
@WMDE-Fisch Sorry to step on yr toes here, but I wanted to mention that I'm adding Less styles and JS for the other half of this task, so you might want to just do the server-side validation and set the mw-twocolconflict-no-selection class on the row.
Yes. But just to be aware here: I'll add this basic "last-resort" fallback that we at least do not blindly overwrite the current revision with something bogus. Using this as a basis I would add the detailed error handling that kicks in before that and could eventually completely replace the fallback.
I don't quite understand, but we have the option of not deploying any changes to make the radio buttons unselected, until after the correct server-side error handling is in place.
Change 573544 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Do not edit the page when selection is incomplete
Change 573555 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/TwoColConflict@master] Error style for conflict rows
Change 573555 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Error style for conflict rows
Change 574799 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] [POC] Non-JS validation of a POSTed conflict resolution
Change 574813 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Remove extra submit flag in favor of content values
Change 574813 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Remove extra submit flag in favor of content values
This is in a bad position. The implementation turns out to be non-trivial no matter what we decide. Needs a product perspective. Needs iteration on UX requirements.
Change 573544 abandoned by WMDE-Fisch:
Do not edit the page when selection is incomplete
Reason:
Fixed with a better approach in I2c8a403d6d2fb9fa3c481dc274312d921a31a715
Change 578322 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] [WIP][POC] Resume to conflict when incomplete
Change 578479 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/core@master] [WIP][POC] Force edit conflict to compare older versions
Together with @Lena_WMDE and @awight we decided on stalling that issue for the moment. Since all currently considered solutions would still need more work and might even still leave some uncertainty.
We also decided that for now, the default of pre-selecting the "other" side should be switch to the "your" side for the following reasons:
We also decided that for now, the default of pre-selecting the "other" side should be switch to the "your" side […]
That's a bad decision with ugly social, almost moral implications. I'm very sorry, but I can not support this. I will absolutely explain this, but would like to do this in person, not here.
Change 578516 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Select the "your" side by default
Change 578516 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Select the "your" side by default
Finally, PM and I had a chance to talk. We decided to continue with the decision previously made (that is selecting the right side by default, as done by patch https://gerrit.wikimedia.org/r/578516), collect user input during the small default phase, and possibly change the decision before the feature becomes the default for all wikis. Main motivation for this way forward is that we want to collect user feedback for the "your side selected" solution right now, and possibly collect more user input for the "nothing selected" solution later.
Change 580177 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Add browser test for nojs handling
Should this be brought into the current sprint? There are still a few points of work remaining for the browser test and maybe other final details.
The browser test is done. Should we consider this done, or is there a specific cleanup you still want to do?
Change 580177 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Add browser test for nojs handling
The task is about the non-js error handling. So I guess its not done when looking at the bigger picture. But it's done for what we wanted to/could do for now. So if we close this ticket we should create at least a new one with a summary on the ideas / options.
This needs demo instructions, and maybe should be declined. It's a bit tricky because the no-JS form doesn't allow this use case any more.
It should return exactly the same view, with contents unchanged, and all selectable rows highlighted in red. Call to action text should appear.
Stalled, so moved to watching. The only "new" thing that happened in this sprint is the browser test. Nothing to demo here.