Page MenuHomePhabricator
Create Task
Maniphest T310290

Improve how Citoid reference context items are defined
Closed, ResolvedPublic
Actions

Assigned To
ppelberg
Authored By
matmarex
Jun 9 2022, 2:44 PM
Tags
Referenced Files
F35301770: Screenshot 2022-07-04 at 12.28.40.png
Jul 4 2022, 11:40 AM
F35301776: Screenshot 2022-07-04 at 12.36.12.png
Jul 4 2022, 11:40 AM
F35222374: image.png
Jun 9 2022, 2:48 PM
Subscribers
Aklapper
EAkinloose
Esanders
Etonkovidova
matmarex
santhosh

Description

@Esanders has proposed some patches to improve how Citoid reference context items are defined. They look good to me but I'd like us to do QA review to confirm that everything works correctly. Someone should also confirm that this doesn't negatively affect ContentTranslation, which has its own hacks on top of our hacks (last discussed in T232330).

Testing

  • In VE, find or create an automatic reference for a book/website/news/journal
  • Check that clicking on the reference in VE shows just one context item of the correct type:

image.png (160×426 px, 26 KB)

Details

SubjectRepoBranchLines +/-
VE: Make CitoidReferenceContextItem a real classmediawiki/extensions/Citoidmaster+80 -76
CitationContextItem: Manually suppress the generic context itemmediawiki/extensions/Citemaster+5 -0
Update VE core submodule to master (78ab52b71)mediawiki/extensions/VisualEditormaster+1 -1
ModeledFactory: Allow candidates to suppress other candidates when matchingVisualEditor/VisualEditormaster+24 -2
Customize query in gerrit

Related Objects

Event Timeline

matmarex created this task.Jun 9 2022, 2:44 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJun 9 2022, 2:44 PM
gerritbot added a comment.Jun 9 2022, 2:44 PM

Change 802160 had a related patch set uploaded (by Bartosz Dziewoński; author: Esanders):

[VisualEditor/VisualEditor@master] ModeledFactory: Allow candidates to suppress other candidates when matching

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

gerritbot added a project: Patch-For-Review.Jun 9 2022, 2:44 PM

Change 802163 had a related patch set uploaded (by Bartosz Dziewoński; author: Esanders):

[mediawiki/extensions/Cite@master] CitationContextItem: Manually suppress the generic context item

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

gerritbot added a comment.Jun 9 2022, 2:44 PM

Change 802166 had a related patch set uploaded (by Bartosz Dziewoński; author: Esanders):

[mediawiki/extensions/Citoid@master] VE: Make CitoidReferenceContextItem a real class

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

Esanders updated the task description. (Show Details)Jun 9 2022, 2:48 PM
gerritbot added a comment.Jun 9 2022, 2:56 PM

Change 802160 merged by jenkins-bot:

[VisualEditor/VisualEditor@master] ModeledFactory: Allow candidates to suppress other candidates when matching

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

gerritbot added a comment.Jun 9 2022, 2:57 PM

Change 804332 had a related patch set uploaded (by Bartosz Dziewoński; author: Bartosz Dziewoński):

[mediawiki/extensions/VisualEditor@master] Update VE core submodule to master (78ab52b71)

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

gerritbot added a comment.Jun 9 2022, 3:13 PM

Change 804332 merged by jenkins-bot:

[mediawiki/extensions/VisualEditor@master] Update VE core submodule to master (78ab52b71)

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

gerritbot added a comment.Jun 9 2022, 3:15 PM

Change 802163 merged by jenkins-bot:

[mediawiki/extensions/Cite@master] CitationContextItem: Manually suppress the generic context item

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

gerritbot added a comment.Jun 9 2022, 3:15 PM

Change 802166 merged by jenkins-bot:

[mediawiki/extensions/Citoid@master] VE: Make CitoidReferenceContextItem a real class

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

Maintenance_bot removed a project: Patch-For-Review.Jun 9 2022, 3:30 PM
ReleaseTaggerBot added a project: MW-1.39-notes (1.39.0-wmf.16; 2022-06-13).Jun 9 2022, 4:00 PM
matmarex moved this task from To Triage to Triaged on the VisualEditor board.Jun 9 2022, 4:17 PM
matmarex added a project: Editing-team (Kanban Board).
matmarex moved this task from Incoming to QA on the Editing-team (Kanban Board) board.
matmarex added a project: Editing QA.
matmarex added subscribers: Etonkovidova, santhosh.Jun 9 2022, 4:21 PM

FYI @Etonkovidova @santhosh – we've refactored some of the code that the fix for T232330 in ContentTranslation depended on. I think everything in ContentTranslation should work correctly without any changes, but we'd appreciate if you could double-check. (You might also be able to simplify the code added in that task using the new suppresses property, but it may not be worth the effort.)

Esanders added a comment.Jun 9 2022, 4:33 PM
In T310290#7992777, @matmarex wrote:

FYI @Etonkovidova @santhosh – we've refactored some of the code that the fix for T232330 in ContentTranslation depended on. I think everything in ContentTranslation should work correctly without any changes, but we'd appreciate if you could double-check. (You might also be able to simplify the code added in that task using the new suppresses property, but it may not be worth the effort.)

CX is sub-classing the template-specific context items and re-registering them with the same name, so it will be unaffected by this change, and also there is nothing to be made cleaner with suppresses (that was for when we were re-registering the parent class and thus breaking the inheritance).

I've tested locally and it works fine. I've also submitted https://gerrit.wikimedia.org/r/c/mediawiki/extensions/ContentTranslation/+/804350 as a minor cleanup, which is not dependent on the changes in this task.

EAkinloose edited projects, added Verified; removed Editing QA.Jul 4 2022, 11:40 AM
EAkinloose subscribed.

Clicking on the reference shows just one context item of the correct type. See

Screenshot 2022-07-04 at 12.36.12.png (256×876 px, 20 KB)

Screenshot 2022-07-04 at 12.28.40.png (322×838 px, 40 KB)

EAkinloose moved this task from QA to Ready for Sign Off on the Editing-team (Kanban Board) board.Jul 4 2022, 11:40 AM
ppelberg closed this task as Resolved.Jul 8 2022, 12:47 AM
ppelberg claimed this task.
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