Page MenuHomePhabricator
Create Task
Maniphest T288282

Build the page delete UI from DeleteAction, not Article
Closed, ResolvedPublic8 Estimated Story Points
Actions

Description

The code responsible for creating the deletion form should live in DeleteAction, not in Article.

Rough plan:

  • Move code from Article to DeleteAction, without changing anything: r712948
  • Remove legacy code from Article after 1 train: r712975
  • Make FileDeleteForm a subclass of DeleteAction, enabled via getActionOverrides(): r711477
  • Clean up DeleteAction and FileDeleteForm: factor out common stuff, fix drifts, reduce differences in showForm: r711605, r711756, r712325, r712715, r712747, r713299, r713327, r713338

[] Make DeleteAction a FormAction

Any further cleanup should be outside of the scope of this task.

Details

Show related patches Customize query in gerrit

Related Objects
Search...

Event Timeline

Daimona created this task.Aug 5 2021, 6:37 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptAug 5 2021, 6:37 PM
Daimona claimed this task.Aug 6 2021, 3:22 PM
Daimona moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-6) board.
gerritbot added a comment.Aug 7 2021, 12:32 AM

Change 710630 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Build the page deletion form in DeleteAction, not Article

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

gerritbot added a project: Patch-For-Review.Aug 7 2021, 12:32 AM
Daimona updated the task description. (Show Details)Aug 9 2021, 5:53 PM
Daimona set the point value for this task to 3.
Daimona added a comment.Aug 9 2021, 6:10 PM

Note for the second bullet (merging FileDeleteForm into DeleteAction): FileDeleteForm was introduced 14 years ago, in commit 65d74391fd69b34541d846ee867d3714d8a13bcd. Since Article and FileDeleteForm do not share any common code path (before WikiPage::doDeleteArticleReal is called) but they serve similar purposes, it's possible that in those 14 years, something was added to Article XOR WikiPage which should've been added to both. I want to analyze those files as of 2007 and diff them carefully to find out if this is the case.

Failing to find those drift would mean that:

  1. The code becomes harder to read, since there are more conditionals for Image vs Article
  2. Once we merge those classes, it won't be as obvious that conditional logic could be the result of a drift (e.g. if somebody doesn't look at the git history and realize that the code was previously split into two files)

So I'm going to try and be very careful before opening the review phase. I will also send preliminary patches if there are many drifts (or big ones) for easing CR and keeping a cleaner git blame.

Daimona updated the task description. (Show Details)Aug 11 2021, 12:07 PM
gerritbot added a comment.Aug 11 2021, 12:50 PM

Change 711477 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Move some methods from FileDeleteForm to a subclass of DeleteAction

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

Daimona updated the task description. (Show Details)Aug 11 2021, 12:53 PM
ldelench_wmf changed the point value for this task from 3 to 5.Aug 11 2021, 2:51 PM
gerritbot added a comment.Aug 11 2021, 5:12 PM

Change 711605 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Clean up DeleteAction and FileDeleteAction, part 1

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

gerritbot added a comment.Aug 11 2021, 10:45 PM

Change 711756 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Further clean up DeleteAction and FileDeleteAction

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

gerritbot added a comment.Aug 12 2021, 1:49 PM

Change 712325 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] DeleteAction-related cleanup, part 3

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

Daimona added a parent task: T288242: Refactoring deletion-related code (UI and backend).Aug 12 2021, 5:46 PM
gerritbot added a comment.Aug 12 2021, 8:29 PM

Change 710630 merged by jenkins-bot:

[mediawiki/core@master] Build the page deletion form in DeleteAction, not Article

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

ReleaseTaggerBot added a project: MW-1.37-notes (1.37.0-wmf.19; 2021-08-16).Aug 12 2021, 9:00 PM
gerritbot added a comment.Aug 12 2021, 11:05 PM

Change 712715 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] DeleteAction: allow easy override of form messages

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

gerritbot added a comment.Aug 12 2021, 11:38 PM

Change 712747 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Final sync of DeleteAction and FileDeleteAction forms

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

Daimona updated the task description. (Show Details)Aug 12 2021, 11:46 PM
Daimona moved this task from In Development 💻 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-6) board.

I still have to write a patch or two for this, but most things are already up for review.

gerritbot added a comment.Aug 13 2021, 2:11 PM

Change 712967 had a related patch set uploaded (by Lucas Werkmeister (WMDE); author: Lucas Werkmeister (WMDE)):

[mediawiki/extensions/WikibaseLexeme@master] Temporarily skip LexemePageTest

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

gerritbot added a comment.Aug 13 2021, 2:34 PM

Change 712967 merged by jenkins-bot:

[mediawiki/extensions/WikibaseLexeme@master] Temporarily skip LexemePageTest

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

gerritbot added a comment.Aug 13 2021, 3:24 PM

Change 712975 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Remove Article::delete() Article::confirmDelete() and ImagePage::delete()

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

Daimona updated the task description. (Show Details)Aug 13 2021, 3:47 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-7); removed Community-Tech (CommTech-Sprint-6).Aug 16 2021, 1:52 PM
ldelench_wmf moved this task from Ready 🎬 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-7) board.
gerritbot added a comment.Aug 16 2021, 5:39 PM

Change 713299 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Make DeleteAction and FileDeleteAction share showForm

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

gerritbot added a comment.Aug 16 2021, 9:19 PM

Change 713327 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Deprecate $hasHistory param to ContentHandler::getAutoDeleteReason()

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

gerritbot added a comment.Aug 16 2021, 10:36 PM

Change 713338 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Convert DeleteAction to use HTMLForm

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

Daimona updated the task description. (Show Details)Aug 16 2021, 10:39 PM
Daimona updated the task description. (Show Details)Aug 16 2021, 10:46 PM
gerritbot added a comment.Aug 17 2021, 4:26 PM

Change 713490 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@master] Rearrange code in DeleteAction

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

Daimona mentioned this in T288758: Introduce a new DeletePage service.Aug 19 2021, 2:19 PM
DannyS712 mentioned this in T254434: Provide a list instead of "Warning: Other pages link to or transclude the page you are about to delete.".Aug 22 2021, 10:48 AM
DannyS712 mentioned this in T289421: When hooks prevent file deletion, reason isn't shown.Aug 22 2021, 10:55 AM
• NRodriguez changed the point value for this task from 5 to 8.Aug 26 2021, 5:36 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-8); removed Community-Tech (CommTech-Sprint-7).Aug 30 2021, 8:42 PM
ldelench_wmf moved this task from Ready 🎬 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-8) board.
ldelench_wmf moved this task from Backlog to 🌟Top Priority on the Undelete-Associated-Talk-Page (2021) board.Aug 30 2021, 8:51 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-9); removed Community-Tech (CommTech-Sprint-8).Sep 13 2021, 7:42 PM
ldelench_wmf moved this task from Ready 🎬 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-9) board.
gerritbot added a comment.Sep 14 2021, 10:53 AM

Change 720851 had a related patch set uploaded (by Daimona Eaytoy; author: Daimona Eaytoy):

[mediawiki/core@REL1_37] Remove Article::delete() Article::confirmDelete() and ImagePage::delete()

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

gerritbot added a comment.Sep 16 2021, 6:33 PM

Change 712975 merged by jenkins-bot:

[mediawiki/core@master] Remove Article::delete() Article::confirmDelete() and ImagePage::delete()

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

ReleaseTaggerBot added a project: MW-1.38-notes (1.38.0-wmf.1; 2021-09-21).Sep 16 2021, 7:00 PM
gerritbot added a comment.Sep 17 2021, 3:17 AM

Change 720851 merged by jenkins-bot:

[mediawiki/core@REL1_37] Remove Article::delete() Article::confirmDelete() and ImagePage::delete()

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

ReleaseTaggerBot edited projects, added MW-1.37-notes; removed MW-1.37-notes (1.37.0-wmf.19; 2021-08-16).Sep 17 2021, 4:00 AM
MusikAnimal updated the task description. (Show Details)Sep 27 2021, 8:22 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-10); removed Community-Tech (CommTech-Sprint-9).Sep 27 2021, 8:36 PM
ldelench_wmf moved this task from Ready 🎬 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-10) board.
gerritbot added a comment.Sep 27 2021, 10:54 PM

Change 711477 merged by jenkins-bot:

[mediawiki/core@master] Move some methods from FileDeleteForm to a subclass of DeleteAction

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

gerritbot added a comment.Oct 6 2021, 1:58 AM

Change 711605 merged by jenkins-bot:

[mediawiki/core@master] Clean up DeleteAction and FileDeleteAction, part 1

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

ReleaseTaggerBot edited projects, added MW-1.38-notes (1.38.0-wmf.4; 2021-10-12); removed MW-1.38-notes (1.38.0-wmf.1; 2021-09-21).Oct 6 2021, 2:00 AM
MusikAnimal updated the task description. (Show Details)Oct 6 2021, 2:10 AM
gerritbot added a comment.Oct 6 2021, 11:31 PM

Change 711756 merged by jenkins-bot:

[mediawiki/core@master] Clean up DeleteAction and FileDeleteAction, part 2

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

gerritbot added a comment.Oct 8 2021, 9:22 PM

Change 712325 merged by jenkins-bot:

[mediawiki/core@master] DeleteAction-related cleanup, part 3

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

ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-11); removed Community-Tech (CommTech-Sprint-10).Oct 11 2021, 1:52 PM
ldelench_wmf moved this task from Ready 🎬 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-11) board.
gerritbot added a comment.Oct 12 2021, 8:02 PM

Change 712715 merged by jenkins-bot:

[mediawiki/core@master] DeleteAction: allow easy override of form messages

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

ReleaseTaggerBot edited projects, added MW-1.38-notes (1.38.0-wmf.5; 2021-10-19); removed MW-1.38-notes (1.38.0-wmf.4; 2021-10-12).Oct 12 2021, 9:00 PM
gerritbot added a comment.Oct 14 2021, 6:24 AM

Change 712747 merged by jenkins-bot:

[mediawiki/core@master] Final sync of DeleteAction and FileDeleteAction forms

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

ldelench_wmf moved this task from CommTech-Sprint-11 to CommTech-Sprint-12 on the Community-Tech board.Oct 25 2021, 8:00 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-12); removed Community-Tech (CommTech-Sprint-11).
ldelench_wmf moved this task from Ready 🎬 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-12) board.
Daimona updated the task description. (Show Details)Nov 8 2021, 6:42 PM
ldelench_wmf moved this task from CommTech-Sprint-12 to CommTech-Sprint-13 on the Community-Tech board.Nov 8 2021, 9:59 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-13); removed Community-Tech (CommTech-Sprint-12).
ldelench_wmf moved this task from Ready 🎬 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-13) board.
gerritbot added a comment.Nov 9 2021, 8:52 PM

Change 713299 merged by jenkins-bot:

[mediawiki/core@master] Make DeleteAction and FileDeleteAction share showForm

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

ReleaseTaggerBot edited projects, added MW-1.38-notes (1.38.0-wmf.9; 2021-11-16); removed MW-1.38-notes (1.38.0-wmf.5; 2021-10-19).Nov 9 2021, 9:00 PM
AntiCompositeNumber mentioned this in T295435: Deleting redirects in file: namespace tries to delete the redirect target, not the redirect.Nov 10 2021, 3:07 AM
gerritbot added a comment.Nov 15 2021, 4:57 PM

Change 713327 merged by jenkins-bot:

[mediawiki/core@master] Deprecate $hasHistory param to ContentHandler::getAutoDeleteReason()

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

Daimona updated the task description. (Show Details)Nov 15 2021, 5:56 PM
Daimona added a comment.Nov 15 2021, 6:01 PM

This is ready for QA, but my suggestion is to test it together with T288758, once the last two patches (r730775 and r730197) are merged.

ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-14); removed Community-Tech (CommTech-Sprint-13).Nov 22 2021, 9:34 PM
ldelench_wmf moved this task from Ready 🎬 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-14) board.Nov 22 2021, 9:37 PM
Daimona moved this task from Review/Feedback 💬 to QA 🐛 on the Community-Tech (CommTech-Sprint-14) board.Nov 23 2021, 10:08 AM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-15); removed Community-Tech (CommTech-Sprint-14).Dec 3 2021, 7:49 PM
ldelench_wmf moved this task from Ready 🎬 to QA 🐛 on the Community-Tech (CommTech-Sprint-15) board.Dec 3 2021, 7:53 PM
dom_walden closed this task as Resolved.Dec 6 2021, 12:40 PM
dom_walden moved this task from QA 🐛 to Done 🏁 on the Community-Tech (CommTech-Sprint-15) board.
dom_walden subscribed.

Testing for this was done as part of T288758#7549416.

I assume product sign-off can be done as part of that ticket as well. Moving directly to Done and Resolving.

SBisson subscribed.May 16 2023, 1:26 AM

I see that "[] Make DeleteAction a FormAction" was crossed out from the task description. Was there any blocker for this part or any reason why this was not pursued?

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