Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert DeleteAction to use HTMLForm

Browse source 
This is preparatory work for the switch to FormAction.

Also update a comment in the JS module pointing to removed code.

Change-Id: Icff1123452a40a2bd78af7ea5236083a4ab6a93c
This commit is contained in:
Daimona Eaytoy 2021-08-17 00:35:34 +02:00
parent ede4800fe2
commit 4d57a42b52
2 changed files with 52 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
includes/actions/DeleteAction.php
View file

@ -387,13 +387,9 @@ class DeleteAction extends FormlessAction {
* @param string $reason
*/
protected function showForm( string $reason ): void {
$outputPage = $this->getOutput();
$user = $this->getUser();
$title = $this->getTitle();
$checkWatch = $this->userOptionsLookup->getBoolOption( $user, 'watchdeletion' ) ||
$this->watchlistManager->isWatched( $user, $title );
$fields = [];
$dropDownReason = $this->getFormMsg( self::MSG_REASON_DROPDOWN )->inContentLanguage()->text();
@ -407,41 +403,29 @@ class DeleteAction extends FormlessAction {
$dropDownReason,
[ 'other' => $this->getFormMsg( self::MSG_REASON_DROPDOWN_OTHER )->text() ]
);
$options = Xml::listDropDownOptionsOoui( $options );
$fields[] = new OOUI\FieldLayout(
new OOUI\DropdownInputWidget( [
'name' => 'wpDeleteReasonList',
'inputId' => 'wpDeleteReasonList',
'tabIndex' => 1,
'infusable' => true,
'value' => '',
'options' => $options,
] ),
[
'label' => $this->getFormMsg( self::MSG_COMMENT )->text(),
'align' => 'top',
]
);
$fields['DeleteReasonList'] = [
'type' => 'select',
'id' => 'wpDeleteReasonList',
'tabindex' => 1,
'infusable' => true,
'options' => $options,
'label' => $this->getFormMsg( self::MSG_COMMENT )->text(),
];
// HTML maxlength uses "UTF-16 code units", which means that characters outside BMP
// (e.g. emojis) count for two each. This limit is overridden in JS to instead count
// Unicode codepoints.
$fields[] = new OOUI\FieldLayout(
new OOUI\TextInputWidget( [
'name' => 'wpReason',
'inputId' => 'wpReason',
'tabIndex' => 2,
'maxLength' => CommentStore::COMMENT_CHARACTER_LIMIT,
'infusable' => true,
'value' => $reason,
'autofocus' => true,
] ),
[
'label' => $this->getFormMsg( self::MSG_REASON_OTHER )->text(),
'align' => 'top',
]
);
$fields['Reason'] = [
'type' => 'text',
'id' => 'wpReason',
'tabindex' => 2,
'maxlength' => CommentStore::COMMENT_CHARACTER_LIMIT,
'infusable' => true,
'default' => $reason,
'autofocus' => true,
'label' => $this->getFormMsg( self::MSG_REASON_OTHER )->text(),
];
$delPage = $this->deletePageFactory->newDeletePage( $this->getWikiPage(), $this->getAuthority() );
if ( $delPage->canProbablyDeleteAssociatedTalk()->isGood() ) {
@ -461,78 +445,42 @@ class DeleteAction extends FormlessAction {
}
if ( $user->isRegistered() ) {
$fields[] = new OOUI\FieldLayout(
new OOUI\CheckboxInputWidget( [
'name' => 'wpWatch',
'inputId' => 'wpWatch',
'tabIndex' => 4,
'selected' => $checkWatch,
] ),
[
'label' => $this->msg( 'watchthis' )->text(),
'align' => 'inline',
'infusable' => true,
]
);
$checkWatch = $this->userOptionsLookup->getBoolOption( $user, 'watchdeletion' ) ||
$this->watchlistManager->isWatched( $user, $title );
$fields['Watch'] = [
'type' => 'check',
'id' => 'wpWatch',
'tabindex' => 4,
'default' => $checkWatch,
'label-message' => 'watchthis',
];
}
if ( $this->isSuppressionAllowed() ) {
$fields[] = new OOUI\FieldLayout(
new OOUI\CheckboxInputWidget( [
'name' => 'wpSuppress',
'inputId' => 'wpSuppress',
'tabIndex' => 5,
'selected' => false,
] ),
[
'label' => $this->msg( 'revdelete-suppress' )->text(),
'align' => 'inline',
'infusable' => true,
]
);
$fields['Suppress'] = [
'type' => 'check',
'id' => 'wpSuppress',
'tabindex' => 5,
'default' => false,
'label-message' => 'revdelete-suppress',
];
}
$fields[] = new OOUI\FieldLayout(
new OOUI\ButtonInputWidget( [
'name' => 'wpConfirmB',
'inputId' => 'wpConfirmB',
'tabIndex' => 6,
'value' => $this->getFormMsg( self::MSG_SUBMIT )->text(),
'label' => $this->getFormMsg( self::MSG_SUBMIT )->text(),
'flags' => [ 'primary', 'destructive' ],
'type' => 'submit',
] ),
[
'align' => 'top',
]
);
$fields['ConfirmB'] = [
'type' => 'submit',
'id' => 'wpConfirmB',
'tabindex' => 6,
'buttonlabel' => $this->getFormMsg( self::MSG_SUBMIT )->text(),
'flags' => [ 'primary', 'destructive' ],
];
$fieldset = new OOUI\FieldsetLayout( [
'label' => $this->getFormMsg( self::MSG_LEGEND )->text(),
'id' => 'mw-delete-table',
'items' => $fields,
] );
$form = new OOUI\FormLayout( [
'method' => 'post',
'action' => $this->getFormAction(),
'id' => 'deleteconfirm',
] );
$form->appendContent(
$fieldset,
new OOUI\HtmlSnippet(
Html::hidden( 'wpEditToken', $user->getEditToken( [ 'delete', $title->getPrefixedText() ] ) )
)
);
$outputPage->addHTML(
new OOUI\PanelLayout( [
'classes' => [ 'deletepage-wrapper' ],
'expanded' => false,
'padded' => true,
'framed' => true,
'content' => $form,
] )
);
HTMLForm::factory( 'ooui', $fields, $this->getContext() )
->setWrapperLegendMsg( $this->getFormMsg( self::MSG_LEGEND ) )
->setWrapperAttributes( [ 'id' => 'mw-delete-table' ] )
->suppressDefaultSubmit()
->setAction( $this->getFormAction() )
->setId( 'deleteconfirm' )
->setTokenSalt( [ 'delete', $title->getPrefixedText() ] )
->showAlways();
}
/**

7
resources/src/mediawiki.misc-authed-ooui/action.delete.js
View file

@ -8,11 +8,10 @@
$( function () {
var colonSeparator = mw.msg( 'colon-separator' ),
reasonList = OO.ui.infuse( $( '#wpDeleteReasonList' ).closest( '.oo-ui-widget' ) ),
reason = OO.ui.infuse( $( '#wpReason' ).closest( '.oo-ui-widget' ) ),
reasonList = OO.ui.infuse( $( '#wpDeleteReasonList' ) ),
reason = OO.ui.infuse( $( '#wpReason' ) ),
filterFunction = function ( input ) {
// Should be built the same as in Article::delete()
// and SpecialRevisionDelete::submit()
// Should be built the same as in DeleteAction::getDeleteReason()
var comment = reasonList.getValue();
if ( comment === 'other' ) {
comment = input;