chore: Remove unused codes, Update plugin-upload.js

Author: kofimokome

src/js/_enqueues/admin/plugin-upload.js

@@ -107,7 +107,7 @@ function pluginUploadSuccess( fileObj, serverData ) {
 			);
 		}
 		action_selector.append(
-			`<li><button class="button activate-button cancel-overwrite" data-file="${fileObj.id}" data-attachment="${ data.attachment_id }"> ${ plugin_upload_intl.cancel } </button></li>`
+			`<li><button class="button activate-button cancel-overwrite" data-file="${ fileObj.id }" data-attachment="${ data.attachment_id }"> ${ plugin_upload_intl.cancel } </button></li>`
 		);
 		action_selector.append(
 			`<li><a href="#TB_inline?&inlineId=plugin-modal-window-${ fileObj.id }&width=700" class="thickbox" data-title="${ data.plugin.Name } ${ data.plugin.Version }">${ plugin_upload_intl.more_details }</a></li>`
@@ -132,7 +132,7 @@ function pluginUploadSuccess( fileObj, serverData ) {
 			} );
 	} else {
 		action_selector.append(
-			`<li><button class="button activate-button activate-plugin button-primary" data-name="${data.plugin.Name}" data-path="${data.path}"> ${ plugin_upload_intl.activate } </button></li>`
+			`<li><button class="button activate-button activate-plugin button-primary" data-name="${ data.plugin.Name }" data-path="${ data.path }"> ${ plugin_upload_intl.activate } </button></li>`
 		);
 
 		jQuery( '.button.activate-plugin' )
@@ -141,7 +141,7 @@ function pluginUploadSuccess( fileObj, serverData ) {
 				const button = jQuery( this );
 				const path = button.data( 'path' );
 				const name = button.data( 'name' );
-				activatePlugin( path,name, button );
+				activatePlugin( path, name, button );
 			} );
 	}
 }
@@ -176,47 +176,50 @@ function overwritePlugin( attachment_id, button ) {
  	const formData = new FormData();
 	formData.append( '_wpnonce', upload_plugin_nonce );
 	formData.append( 'action', 'upload-plugin' );
-	button.prop( 'disabled', true );
+ 	button.prop( 'disabled', true );
 	button.text( plugin_upload_intl.processing + '...' );
-
+	const cancel_overwrite_button = button.parent().parent().find( '.cancel-overwrite' );
+	cancel_overwrite_button.prop( 'disabled', true );
 	jQuery.ajax( {
 		type: 'POST',
 		url: ajaxurl + '?package=' + attachment_id + '&overwrite=update-plugin',
 		data: formData,
 		processData: false, // Important: tell jQuery not to process the data.
 		contentType: false, // Important: tell jQuery not to set contentType.
 
-		success: function (  ) {
+		success: function () {
 			button.text( plugin_upload_intl.updated );
 		},
-		error: function (  ) {
+		error: function () {
 			button.prop( 'disabled', false );
+			cancel_overwrite_button.prop( 'disabled', false );
 			button.text( plugin_upload_intl.activation_failed );
 		},
 	} );
 }
 
-function cancelOverwritePlugin( file_id ,attachment_id, button ) {
- 	const formData = new FormData();
+function cancelOverwritePlugin( file_id, attachment_id, button ) {
+	const formData = new FormData();
 	formData.append( '_wpnonce', cancel_overwrite_nonce );
 	formData.append( 'action', 'cancel-plugin-overwrite' );
 	button.prop( 'disabled', true );
 	button.text( plugin_upload_intl.processing + '...' );
-
+	const overwrite_button = button.parent().parent().find( '.overwrite-plugin' );
+	overwrite_button.prop( 'disabled', true );
 	jQuery.ajax( {
 		type: 'POST',
 		url: ajaxurl + '?package=' + attachment_id,
 		data: formData,
 		processData: false, // Important: tell jQuery not to process the data.
 		contentType: false, // Important: tell jQuery not to set contentType.
 
-		success: function (  ) {
+		success: function () {
 			// Remove element from the dom.
-			 jQuery( '#plugin-item-' + file_id ).remove();
-
+			jQuery( '#plugin-item-' + file_id ).remove();
 		},
-		error: function (  ) {
+		error: function () {
 			button.prop( 'disabled', false );
+			overwrite_button.prop( 'disabled', false );
 			button.text( plugin_upload_intl.cancel_failed );
 		},
 	} );
@@ -237,10 +240,10 @@ function activatePlugin( path, name, button ) {
 		processData: false, // Important: tell jQuery not to process the data
 		contentType: false, // Important: tell jQuery not to set contentType
 
-		success: function (  ) {
+		success: function () {
 			button.text( plugin_upload_intl.activated );
 		},
-		error: function (  ) {
+		error: function () {
 			button.prop( 'disabled', false );
 			button.text( plugin_upload_intl.failed );
 		},

src/wp-admin/includes/ajax-actions.php

@@ -4570,7 +4570,6 @@ function wp_ajax_upload_plugin() {
 	}
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
 	$file_upload = new File_Upload_Upgrader( 'pluginzip', 'package' );
 
 	$nonce = 'upload-plugin';
@@ -4587,7 +4586,7 @@ function wp_ajax_upload_plugin() {
 	$status = array();
 	$plugin = $skin->upgrader->new_plugin_data;
 
-	$can_override = $skin->can_override_plugin();
+	$can_override = $skin->can_overwrite_plugin();
 
 	if ( $can_override ) {
 		$status['successCode']       = 'can_override';

src/wp-admin/includes/class-wp-ajax-upgrader-skin.php

@@ -102,13 +102,13 @@ public function get_error_messages() {
 	}
 
 	/**
-	 * Checks if the plugin can be overwritten and outputs the HTML for overwriting a plugin on upload.
+	 * Checks if the plugin can be overwritten and outputs an array of changes for overwriting a plugin on upload.
 	 *
 	 * @since 6.9.0
 	 *
 	 * @return bool|array Whether the plugin can be overwritten and an array of changes returned.
 	 */
-	public function can_override_plugin() {
+	public function can_overwrite_plugin() {
 		if ( ! is_wp_error( $this->result ) || 'folder_exists' !== $this->result->get_error_code() ) {
 			return false;
 		}
@@ -135,10 +135,9 @@ public function can_override_plugin() {
 
 		$rows = array(
 			'Downgrade' => version_compare( $current_plugin_data['Version'], $new_plugin_data['Version'], '>' ),
-			'Plugin'    => array( __( 'Old' ), __( 'New' ) ),
 		);
 
-		$fields = array( __( 'Name' ), __( 'Version' ), __( 'Author' ), __( 'RequiresWP' ), __( 'RequiresPHP' ) );
+		$fields = array( 'Name', 'Version', 'Author', 'RequiresWP', 'RequiresPHP' );
 
 		$is_same_plugin = true; // Let's consider only these rows.