Page MenuHomePhabricator
Create Task
Maniphest T202053

Update headers of the conflicting versions
Closed, ResolvedPublic3 Estimated Story Points
Actions

Assigned To
Andrew-WMDE
Authored By
thiemowmde
Aug 16 2018, 11:17 AM
Tags
Referenced Files
F25678287: Screen Shot 2018-09-06 at 16.21.24.png
Sep 6 2018, 2:41 PM
F25010500: image.png
Aug 16 2018, 11:17 AM
F25010762: image.png
Aug 16 2018, 11:17 AM
F25010408: image.png
Aug 16 2018, 11:17 AM
Subscribers
gerritbot
• Hanna_Petruschat_WMDE
JStrodt_WMDE
• Lea_WMDE
thiemowmde
WMDE-Fisch

Description

Task
Update the headers of the two conflicting versions as shown in the mock:

Screen Shot 2018-09-06 at 16.21.24.png (142×1 px, 26 KB)

Acceptance Criteria

  • The first line identifies the revision version as shown in the mock
  • The time indicator in the first row should always be a round number in the biggest displayable unit for times smaller than a day and never be smaller than 1 second.

Details:

For edits younger than 23 hours: Revision as of 1 second ago (and accordingly for 1 minute ago etc.)
For edits older than 23 hours: Revision as of 00:31, 24 August 2018 (and accordingly for other dates) This is the same format that diff pages use.
  • The second line shows the user name in the published version. Although the mock shows "user:xxx" this should be in the mediawiki default format, like on a regular diff page including links to talk pages and all other relevant links
  • On the user's version, the line says "Not published yet"
  • The third line on both sides contains the edit summary in brackets. Contrary to the mock, the text should be italic
  • If there's no comment the line is empty

Details

SubjectRepoBranchLines +/-
Add missing "hours ago" time format to the headermediawiki/extensions/TwoColConflictmaster+22 -2
Update headersmediawiki/extensions/TwoColConflictmaster+101 -30
Streamline conflict header codemediawiki/extensions/TwoColConflictmaster+18 -33
Use existing diff() method to calculate datetime differencemediawiki/extensions/TwoColConflictmaster+37 -21
Rework headers showing conflicting revision time and user namemediawiki/extensions/TwoColConflictmaster+35 -28
Add tests for "minutes/seconds ago" diff headlinemediawiki/extensions/TwoColConflictmaster+65 -10
Replace custom date/time concatenation with Language::userTimeAndDatemediawiki/extensions/TwoColConflictmaster+6 -8
Remove current time from "Not published yet" messagemediawiki/extensions/TwoColConflictmaster+2 -2
Replace "version" with "revision" in header messagesmediawiki/extensions/TwoColConflictmaster+2 -2
Customize query in gerrit

Related Objects

Mentioned In
rESCC9e00fde2c56c: Add missing "hours ago" time format to the header
rESCCbcaf39c81343: Update headers
rESCCf3760376aa85: Add tests for "minutes/seconds ago" diff headline
rESCCb325a39d1159: Add tests for "minutes/seconds ago" diff headline
rESCC34a1b7bf2f58: Add tests for "minutes/seconds ago" diff headline
rESCC4490d1cfea2b: Rework headers showing conflicting revision time and user name
rESCC60934632f45a: Rework headers showing conflicting revision time and user name
rESCCcd0a17c1bd1d: Rework headers showing conflicting revision time and user name
rESCC4f246e61b19a: Update headers
rESCC7ab37863cc78: Rework headers showing conflicting revision time and user name
rESCC7c3db0fc179b: Rework headers showing conflicting revision time and user name
rESCC001a47c159f1: Rework headers showing conflicting revision time and user name
rESCC86711276001d: Use MediaWikiTestCase::getTestUser instead of User::newFromName
rESCC183ee0aeb45c: Rework headers showing conflicting revision time and user name
rESCC5cd722727f33: Use MediaWikiTestCase::getTestUser instead of User::newFromName
rESCC92c72903f750: Rework headers showing conflicting revision time and user name
rESCCac834adf7e54: Replace custom date/time concatenation with Language::userTimeAndDate
rESCC50d053e251dc: Replace custom date/time concatenation with Language::userTimeAndDate
rESCCf55e3ce5bacc: Remove current time from "Not published yet" message
rESCCdf365e19b5e5: Replace "version" with "revision" in header messages
rESCCdcfdca04b4ff: Rework headers showing conflicting revision time and user name
rESCCbd2478557305: Use existing diff() method to calculate datetime difference
rESCCb740321bc33a: Streamline conflict header code
rESCC7972155db863: Update headers
rESCCbc1d5646b0ee: Update headers
rESCC7c33be580ef7: Update headers
rESCC2f06560b0f45: [WIP] Update headers
rESCC85b88061712f: [WIP] Update headers
rESCC583e99e0c120: [WIP] Update headers
rESCCcc5fbd68085d: [WIP] Update headers
rESCCadeb4aea8c0c: [WIP] Update headers
rESCC364665ea422c: Rework headers showing conflicting revision time and user name
rESCC11a69040f2dc: Rework headers showing conflicting revision time and user name
rESCCef27e0ecb46b: Rework headers showing conflicting revision time and user name
rESCCcaececb5e295: Rework headers showing conflicting revision time and user name
rESCC8b5c9cfaa469: Remove current time from edit conflict header
rESCCac13be4f38dc: Remove current time from edit conflict header
rESCC3ce107ba5b02: Remove current time from edit conflict header
Mentioned Here
T202052: Change "save" to "publish" in all messages in the TwoColConflict interface

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes
Restricted Application added a project: Design. · View Herald TranscriptAug 16 2018, 11:17 AM
gerritbot subscribed.Aug 16 2018, 11:23 AM

Change 452382 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Remove current time from edit conflict header

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

gerritbot added a project: Patch-For-Review.Aug 16 2018, 11:23 AM
thiemowmde mentioned this in rESCC3ce107ba5b02: Remove current time from edit conflict header.Aug 16 2018, 11:24 AM
Volker_E moved this task from Incoming to WMDE on the Design board.Aug 20 2018, 6:12 PM
WMDE-Fisch set the point value for this task to 1.Aug 21 2018, 9:59 AM
thiemowmde mentioned this in rESCCac13be4f38dc: Remove current time from edit conflict header.Aug 21 2018, 11:10 AM
thiemowmde moved this task from Incoming to Edit Conflict Handling on the TCB-Team (now WMDE-TechWish) board.Aug 29 2018, 9:15 AM
thiemowmde mentioned this in rESCC8b5c9cfaa469: Remove current time from edit conflict header.Aug 29 2018, 12:18 PM
• Hanna_Petruschat_WMDE subscribed.EditedSep 6 2018, 2:41 PM

Thanks for pointing this out. These are very valid usability issues. I made a mock to adapt your suggestion to the current edit conflict layout in development. I'd appreciate your feedback if I understood your concerns right:

Screen Shot 2018-09-06 at 16.21.24.png (142×1 px, 26 KB)

Notes
First line:

  • show whos revision this is
  • in the revision of the other user show how long the publishing is ago

Second line:

  • on the "other user's side" show the user name plus user page and talk page – what to see should be connected to the user's level (admin etc.)
  • on "your side" show "Not published yet"

Third line:

  • show the edit summary on each version
thiemowmde added a comment.Sep 10 2018, 11:13 AM

This is really awesome, thank you very much! I think the addition of the summary lines is very helpful, as well as the additional user links.

Remaining questions:

  1. The mock contains "user:abc". Is the "user:" prefix just part of the example and not meant to appear in the final product? Or is it the namespace and meant to be shown? The latter is typically not done on special pages. If it is, "User:" must be upper case, as well as localized (not in this mock as it is English anyway).
  2. In the line "user:abc (user | talk)" the first two links "user:abc" and "user" point to the same user page, I assume. This might be redundant.
    • "user:abc (talk)" might be enough.
    • Or stick to the common "user:abc (talk | contribs)‎" that is used on almost all other special pages.
  3. "as of 5 minutes ago" is especially nice because it avoids all problems with local timezone offsets. Just a minor question: Typically the conflict happened just a few seconds ago, sometimes even less than a second. What to show then?
thiemowmde mentioned this in rESCCcaececb5e295: Rework headers showing conflicting revision time and user name.Sep 11 2018, 1:29 PM
thiemowmde mentioned this in rESCCef27e0ecb46b: Rework headers showing conflicting revision time and user name.Sep 12 2018, 5:36 PM
thiemowmde mentioned this in rESCC11a69040f2dc: Rework headers showing conflicting revision time and user name.Sep 14 2018, 1:55 PM
thiemowmde mentioned this in rESCC364665ea422c: Rework headers showing conflicting revision time and user name.Sep 14 2018, 4:46 PM
• Lea_WMDE renamed this task from Remove current time from edit conflict header to Update headers of the conflicting versions.Oct 2 2018, 10:58 AM
• Lea_WMDE removed thiemowmde as the assignee of this task.
• Lea_WMDE triaged this task as Medium priority.
• Lea_WMDE updated the task description. (Show Details)
• Lea_WMDE updated the task description. (Show Details)Oct 2 2018, 12:44 PM
• Lea_WMDE updated the task description. (Show Details)
• Lea_WMDE updated the task description. (Show Details)Oct 2 2018, 12:51 PM
• Lea_WMDE changed the point value for this task from 1 to 3.
• Lea_WMDE moved this task from Backlog to Tickets ready for pickup on the Two-Column-Edit-Conflict-Merge board.Oct 2 2018, 12:58 PM
WMDE-Fisch updated the task description. (Show Details)Oct 9 2018, 1:13 PM
WMDE-Fisch edited projects, added WMDE-QWERTY-Sprint-2018-10-09; removed Patch-For-Review.Oct 9 2018, 1:17 PM
WMDE-Fisch moved this task from Tickets ready for pickup to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.
Andrew-WMDE claimed this task.Oct 10 2018, 8:48 AM
Andrew-WMDE moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2018-10-09 board.
gerritbot added a comment.Oct 10 2018, 1:52 PM

Change 465631 had a related patch set uploaded (by Andrew-WMDE; owner: Andrew-WMDE):
[mediawiki/extensions/TwoColConflict@master] [WIP] Update headers

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

gerritbot added a project: Patch-For-Review.Oct 10 2018, 1:52 PM
Andrew-WMDE mentioned this in rESCCadeb4aea8c0c: [WIP] Update headers.Oct 10 2018, 1:57 PM
thiemowmde added a comment.Oct 10 2018, 2:09 PM

Notes for @Andrew-WMDE and possibly WMDE-Design:

  • Linker::revUserTools is the function that combines the user and tools links in one call.
  • MediaWiki core provides messages for hours-ago, minutes-ago, and seconds-ago.
  • There is also an ago message we could use together with with the messages for days, weeks, months, and years. However, I suggest to not use these because conflicts that old are super-unlikely, but the code for this would be pretty complex. Instead, I would start showing the formatted date and time when a conflict happened more than 23 hours ago.

So we would have:

  • "1 second ago" to "59 seconds ago" (Note that <1 seconds are always shown as "1 second ago".)
  • "1 minute ago" to "59 minutes ago"
  • "1 hour ago" to "23 hours ago"
  • The normal "23:59, 10 October 2018" for everything after that.

@Hanna_Petruschat_WMDE, what do you think?

Andrew-WMDE mentioned this in rESCCcc5fbd68085d: [WIP] Update headers.Oct 10 2018, 3:38 PM
Andrew-WMDE mentioned this in rESCC583e99e0c120: [WIP] Update headers.Oct 10 2018, 4:23 PM
JStrodt_WMDE subscribed.Oct 12 2018, 10:11 AM

Please use this text schema for the header in the other user's column:

  • For edits younger than 23 hours: Revision as of 1 second ago (and accordingly for 1 minute ago etc.)
  • For edits older than 23 hours: Revision as of 00:31, 24 August 2018 (and accordingly for other dates) This is the same format that diff pages use.
WMDE-Fisch mentioned this in rESCC85b88061712f: [WIP] Update headers.Oct 12 2018, 6:11 PM
WMDE-Fisch mentioned this in rESCC2f06560b0f45: [WIP] Update headers.Oct 16 2018, 12:04 PM
Andrew-WMDE mentioned this in rESCC7c33be580ef7: Update headers.Oct 17 2018, 8:34 PM
WMDE-Fisch mentioned this in rESCCbc1d5646b0ee: Update headers.Oct 18 2018, 9:58 AM
Andrew-WMDE mentioned this in rESCC7972155db863: Update headers.Oct 18 2018, 1:41 PM
Andrew-WMDE moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2018-10-09 board.Oct 18 2018, 1:45 PM
gerritbot added a comment.Oct 19 2018, 1:48 PM

Change 468579 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Streamline conflict header code

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

thiemowmde mentioned this in rESCCb740321bc33a: Streamline conflict header code.Oct 19 2018, 1:49 PM
gerritbot added a comment.Oct 22 2018, 12:06 PM

Change 468959 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Use existing diff() method to calculate datetime difference

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

thiemowmde mentioned this in rESCCbd2478557305: Use existing diff() method to calculate datetime difference.Oct 22 2018, 12:06 PM
• Lea_WMDE added a project: WMDE-QWERTY-Sprint-2018-10-23.Oct 23 2018, 12:55 PM
• Lea_WMDE moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2018-10-23 board.
thiemowmde mentioned this in rESCCdcfdca04b4ff: Rework headers showing conflicting revision time and user name.Oct 24 2018, 9:38 AM
gerritbot added a comment.Oct 24 2018, 9:47 AM

Change 469397 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Replace "version" with "revision" in header messages

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

thiemowmde mentioned this in rESCCdf365e19b5e5: Replace "version" with "revision" in header messages.Oct 24 2018, 9:49 AM
gerritbot added a comment.Oct 24 2018, 9:54 AM

Change 469401 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Remove current time from "Not published yet" message

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

thiemowmde mentioned this in rESCCf55e3ce5bacc: Remove current time from "Not published yet" message.Oct 24 2018, 9:55 AM
gerritbot added a comment.Oct 24 2018, 10:04 AM

Change 469404 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Replace custom date/time concatenation with Language::userTimeAndDate

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

thiemowmde mentioned this in rESCC50d053e251dc: Replace custom date/time concatenation with Language::userTimeAndDate.Oct 24 2018, 10:06 AM
thiemowmde mentioned this in rESCCac834adf7e54: Replace custom date/time concatenation with Language::userTimeAndDate.Oct 24 2018, 10:22 AM
gerritbot added a comment.Oct 24 2018, 3:24 PM

Change 469397 merged by Thiemo Kreuz (WMDE):
[mediawiki/extensions/TwoColConflict@master] Replace "version" with "revision" in header messages

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

ReleaseTaggerBot added a project: MW-1.33-notes (1.33.0-wmf.2; 2018-10-30).Oct 24 2018, 4:00 PM
gerritbot added a comment.Oct 25 2018, 8:43 AM

Change 469401 merged by Thiemo Kreuz (WMDE):
[mediawiki/extensions/TwoColConflict@master] Remove current time from "Not published yet" message

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

gerritbot added a comment.Oct 25 2018, 8:44 AM

Change 469404 merged by Thiemo Kreuz (WMDE):
[mediawiki/extensions/TwoColConflict@master] Replace custom date/time concatenation with Language::userTimeAndDate

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

thiemowmde mentioned this in rESCC92c72903f750: Rework headers showing conflicting revision time and user name.Oct 25 2018, 9:06 AM
thiemowmde mentioned this in rESCC5cd722727f33: Use MediaWikiTestCase::getTestUser instead of User::newFromName.Oct 25 2018, 9:13 AM
thiemowmde mentioned this in rESCC183ee0aeb45c: Rework headers showing conflicting revision time and user name.Oct 25 2018, 9:27 AM
thiemowmde mentioned this in rESCC86711276001d: Use MediaWikiTestCase::getTestUser instead of User::newFromName.Oct 25 2018, 9:32 AM
thiemowmde mentioned this in rESCC001a47c159f1: Rework headers showing conflicting revision time and user name.Oct 25 2018, 9:34 AM
thiemowmde mentioned this in rESCC7c3db0fc179b: Rework headers showing conflicting revision time and user name.Oct 25 2018, 2:18 PM
thiemowmde mentioned this in rESCC7ab37863cc78: Rework headers showing conflicting revision time and user name.Oct 25 2018, 2:44 PM
thiemowmde mentioned this in rESCC4f246e61b19a: Update headers.Oct 26 2018, 9:57 AM
WMDE-Fisch mentioned this in rESCCcd0a17c1bd1d: Rework headers showing conflicting revision time and user name.Oct 28 2018, 5:07 PM
thiemowmde mentioned this in rESCC60934632f45a: Rework headers showing conflicting revision time and user name.Oct 29 2018, 8:17 AM
thiemowmde mentioned this in rESCC4490d1cfea2b: Rework headers showing conflicting revision time and user name.Oct 29 2018, 12:39 PM
gerritbot added a comment.Oct 29 2018, 8:13 PM

Change 470461 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Add tests for "minutes/seconds ago" diff headline

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

thiemowmde mentioned this in rESCC34a1b7bf2f58: Add tests for "minutes/seconds ago" diff headline.Oct 29 2018, 8:16 PM
thiemowmde mentioned this in rESCCb325a39d1159: Add tests for "minutes/seconds ago" diff headline.Oct 30 2018, 8:39 AM
thiemowmde mentioned this in rESCCf3760376aa85: Add tests for "minutes/seconds ago" diff headline.Oct 30 2018, 8:42 AM
thiemowmde moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2018-10-23 board.Oct 30 2018, 9:03 AM
gerritbot added a comment.Oct 30 2018, 5:34 PM

Change 452382 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Rework headers showing conflicting revision time and user name

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

gerritbot added a comment.Oct 30 2018, 5:34 PM

Change 470461 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Add tests for "minutes/seconds ago" diff headline

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

ReleaseTaggerBot edited projects, added MW-1.33-notes (1.33.0-wmf.3; 2018-11-06); removed MW-1.33-notes (1.33.0-wmf.2; 2018-10-30).Oct 30 2018, 6:00 PM
thiemowmde mentioned this in rESCCbcaf39c81343: Update headers.Oct 31 2018, 11:13 AM
gerritbot added a comment.Oct 31 2018, 12:03 PM

Change 468959 abandoned by Thiemo Kreuz (WMDE):
Use existing diff() method to calculate datetime difference

Reason:
Obsolete via I88c724e.

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

gerritbot added a comment.Oct 31 2018, 12:04 PM

Change 468579 abandoned by Thiemo Kreuz (WMDE):
Streamline conflict header code

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

gerritbot added a comment.Oct 31 2018, 3:12 PM

Change 465631 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Update headers

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

Andrew-WMDE moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2018-10-23 board.Oct 31 2018, 3:14 PM
• Lea_WMDE updated the task description. (Show Details)Nov 1 2018, 10:52 AM
• Lea_WMDE added a comment.Nov 1 2018, 10:55 AM

Can you help me how I can test this? In the simulation there are no edit summaries, and the revision of the other side is from February, not really anything recent :)
Everything else looks good!

thiemowmde added a comment.Nov 1 2018, 1:43 PM

There is no way to have a summary line in the simulation, and we did not said we want to add one. There are a few ways to fix this:

  • We could add an input field for a summary line to the simulation special page. This is probably worth a few story points.
  • We could add a dummy summary line that's always the same when using the simulation special page (probably worth 1 point).
  • I could demo these summary lines via a quick hack on my laptop.

To test the "minutes/seconds ago" feature you can do an edit to the page shortly before you simulate a conflict.

gerritbot added a comment.Nov 1 2018, 5:15 PM

Change 471048 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Add missing "hours ago" time format to the header

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

thiemowmde moved this task from Demo to Review on the WMDE-QWERTY-Sprint-2018-10-23 board.Nov 1 2018, 5:15 PM
thiemowmde mentioned this in rESCC9e00fde2c56c: Add missing "hours ago" time format to the header.Nov 1 2018, 5:18 PM
gerritbot added a comment.Nov 2 2018, 4:40 PM

Change 471048 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Add missing "hours ago" time format to the header

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

thiemowmde moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2018-10-23 board.Nov 2 2018, 7:53 PM
• Lea_WMDE closed this task as Resolved.Nov 5 2018, 8:41 AM
• Lea_WMDE moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2018-10-23 board.
thiemowmde removed a project: TCB-Team (now WMDE-TechWish).Jan 7 2022, 3:28 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