Changeset 49582

Timestamp:

11/12/2020 08:40:13 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Administration: Make sure auto-update counts properly update when bulk deleting plugins or themes.

Props pbiron, noisysocks, desrosj, audrasjb, hellofromTonya.
Fixes #50870.

Location:

trunk/src

Files:

• js/_enqueues/wp/updates.js (modified) (5 diffs)
• wp-admin/includes/class-wp-ms-themes-list-table.php (modified) (2 diffs)
• wp-admin/includes/class-wp-plugins-list-table.php (modified) (1 diff)

trunk/src/js/_enqueues/wp/updates.js

@@ -9 +9 @@
 
 /**
- * @param {jQuery}  $                                   jQuery object.
- * @param {object}  wp                                  WP object.
- * @param {object}  settings                            WP Updates settings.
- * @param {string}  settings.ajax_nonce                 Ajax nonce.
- * @param {object=} settings.plugins                    Base names of plugins in their different states.
- * @param {Array}   settings.plugins.all                Base names of all plugins.
- * @param {Array}   settings.plugins.active             Base names of active plugins.
- * @param {Array}   settings.plugins.inactive           Base names of inactive plugins.
- * @param {Array}   settings.plugins.upgrade            Base names of plugins with updates available.
- * @param {Array}   settings.plugins.recently_activated Base names of recently activated plugins.
- * @param {object=} settings.themes                     Plugin/theme status information or null.
- * @param {number}  settings.themes.all                 Amount of all themes.
- * @param {number}  settings.themes.upgrade             Amount of themes with updates available.
- * @param {number}  settings.themes.disabled            Amount of disabled themes.
- * @param {object=} settings.totals                     Combined information for available update counts.
- * @param {number}  settings.totals.count               Holds the amount of available updates.
+ * @param {jQuery}  $                                        jQuery object.
+ * @param {object}  wp                                       WP object.
+ * @param {object}  settings                                 WP Updates settings.
+ * @param {string}  settings.ajax_nonce                      Ajax nonce.
+ * @param {object=} settings.plugins                         Base names of plugins in their different states.
+ * @param {Array}   settings.plugins.all                     Base names of all plugins.
+ * @param {Array}   settings.plugins.active                  Base names of active plugins.
+ * @param {Array}   settings.plugins.inactive                Base names of inactive plugins.
+ * @param {Array}   settings.plugins.upgrade                 Base names of plugins with updates available.
+ * @param {Array}   settings.plugins.recently_activated      Base names of recently activated plugins.
+ * @param {Array}   settings.plugins['auto-update-enabled']  Base names of plugins set to auto-update.
+ * @param {Array}   settings.plugins['auto-update-disabled'] Base names of plugins set to not auto-update.
+ * @param {object=} settings.themes                          Slugs of themes in their different states.
+ * @param {Array}   settings.themes.all                      Slugs of all themes.
+ * @param {Array}   settings.themes.upgrade                  Slugs of themes with updates available.
+ * @param {Arrat}   settings.themes.disabled                 Slugs of disabled themes.
+ * @param {Array}   settings.themes['auto-update-enabled']   Slugs of themes set to auto-update.
+ * @param {Array}   settings.themes['auto-update-disabled']  Slugs of themes set to not auto-update.
+ * @param {object=} settings.totals                          Combined information for available update counts.
+ * @param {number}  settings.totals.count                    Holds the amount of available updates.
  */
 (function( $, wp, settings ) {
@@ -1008 +1012 @@
             }
 
+            if ( -1 !== _.indexOf( plugins['auto-update-enabled'], response.plugin ) ) {
+                plugins['auto-update-enabled'] = _.without( plugins['auto-update-enabled'], response.plugin );
+                if ( plugins['auto-update-enabled'].length ) {
+                    $views.find( '.auto-update-enabled .count' ).text( '(' + plugins['auto-update-enabled'].length + ')' );
+                } else {
+                    $views.find( '.auto-update-enabled' ).remove();
+                }
+            }
+
+            if ( -1 !== _.indexOf( plugins['auto-update-disabled'], response.plugin ) ) {
+                plugins['auto-update-disabled'] = _.without( plugins['auto-update-disabled'], response.plugin );
+                if ( plugins['auto-update-disabled'].length ) {
+                    $views.find( '.auto-update-disabled .count' ).text( '(' + plugins['auto-update-disabled'].length + ')' );
+                } else {
+                    $views.find( '.auto-update-disabled' ).remove();
+                }
+            }
+
             plugins.all = _.without( plugins.all, response.plugin );
 
@@ -1506 +1528 @@
                 var $views     = $( '.subsubsub' ),
                     $themeRow  = $( this ),
-                    totals     = settings.themes,
+                    themes     = settings.themes,
                     deletedRow = wp.template( 'item-deleted-row' );
 
@@ -1522 +1544 @@
 
                 // Remove theme from update count.
-                if ( $themeRow.hasClass( 'update' ) ) {
-                    totals.upgrade--;
+                if ( -1 !== _.indexOf( themes.upgrade, response.slug ) ) {
+                    themes.upgrade = _.without( themes.upgrade, response.slug );
                     wp.updates.decrementCount( 'theme' );
                 }
 
                 // Remove from views.
-                if ( $themeRow.hasClass( 'inactive' ) ) {
-                    totals.disabled--;
-                    if ( totals.disabled ) {
-                        $views.find( '.disabled .count' ).text( '(' + totals.disabled + ')' );
+                if ( -1 !== _.indexOf( themes.disabled, response.slug ) ) {
+                    themes.disabled = _.without( themes.disabled, response.slug );
+                    if ( themes.disabled.length ) {
+                        $views.find( '.disabled .count' ).text( '(' + themes.disabled.length + ')' );                       
                     } else {
                         $views.find( '.disabled' ).remove();
@@ -1537 +1559 @@
                 }
 
+                if ( -1 !== _.indexOf( themes['auto-update-enabled'], response.slug ) ) {
+                    themes['auto-update-enabled'] = _.without( themes['auto-update-enabled'], response.slug );
+                    if ( themes['auto-update-enabled'].length ) {
+                        $views.find( '.auto-update-enabled .count' ).text( '(' + themes['auto-update-enabled'].length + ')' );
+                    } else {
+                        $views.find( '.auto-update-enabled' ).remove();
+                    }
+                }
+    
+                if ( -1 !== _.indexOf( themes['auto-update-disabled'], response.slug ) ) {
+                    themes['auto-update-disabled'] = _.without( themes['auto-update-disabled'], response.slug );
+                    if ( themes['auto-update-disabled'].length ) {
+                        $views.find( '.auto-update-disabled .count' ).text( '(' + themes['auto-update-disabled'].length + ')' );
+                    } else {
+                        $views.find( '.auto-update-disabled' ).remove();
+                    }
+                }
+
+                themes.all = _.without( themes.all, response.slug );
+
                 // There is always at least one theme available.
-                $views.find( '.all .count' ).text( '(' + --totals.all + ')' );
+                $views.find( '.all .count' ).text( '(' + themes.all.length + ')' );
             } );
         }

trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -207 +207 @@
         }
 
-        $totals = array();
+        $totals    = array();
+        $js_themes = array();
         foreach ( $themes as $type => $list ) {
-            $totals[ $type ] = count( $list );
+            $totals[ $type ]    = count( $list );
+            $js_themes[ $type ] = array_keys( $list );
         }
 
@@ -226 +228 @@
             '_wpUpdatesItemCounts',
             array(
-                'themes' => $totals,
+                'themes' => $js_themes,
                 'totals' => wp_get_update_data(),
             )

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -318 +318 @@
         $js_plugins = array();
         foreach ( $plugins as $key => $list ) {
-            $js_plugins[ $key ] = array_keys( (array) $list );
+            $js_plugins[ $key ] = array_keys( $list );
         }