Changeset 13017

Timestamp:

12/06/2023 04:28:05 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: Reviewer tools: Make the Reviewer column sortable.

Fixes #7147.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin

Files:

• class-customizations.php (modified) (3 diffs)
• list-table/class-plugin-posts.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -30 +30 @@
                 add_filter( 'dashboard_glance_items', array( $this, 'plugin_glance_items' ) );
 
+                add_filter( 'query_vars', array( $this, 'query_vars' ) );
                 add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
 
@@ -190 +191 @@
 
         /**
+         * Filter the query vars used in wp-admin.
+         */
+        public function query_vars( $query_vars ) {
+                $query_vars[] = 'reviewer';
+
+                return $query_vars;
+        }
+
+        /**
          * Filter the query in wp-admin to list only plugins relevant to the current user.
          *
@@ -215 +225 @@
 
                 // Filter by reviewer.
-                if ( ! empty( $_REQUEST['reviewer'] ) ) {
+                if ( isset( $query->query['reviewer'] ) && strlen( $query->query['reviewer'] ) ) {
                         $meta_query = $query->get( 'meta_query' ) ?: [];
-                        $meta_query[] = [
+                        $meta_query['assigned_reviewer'] = [
                                 'key'   => 'assigned_reviewer',
-                                'value' => intval( $_GET['reviewer'] ),
+                                'value' => intval( $query->query['reviewer'] ),
+                                'type'  => 'unsigned',
+                        ];
+
+                        // Query for no assignee.
+                        if ( ! $meta_query['assigned_reviewer']['value'] ) {
+                                $meta_query['assigned_reviewer']['compare'] = 'NOT EXISTS';
+                        }
+
+                        $query->set( 'meta_query', $meta_query );
+                }
+
+                if ( 'assigned_reviewer_time' === $query->query['orderby'] ?? '' ) {
+                        $meta_query = $query->get( 'meta_query' ) ?: [];
+
+                        $meta_query['assigned_reviewer_time'] = [
+                                'key'     => 'assigned_reviewer_time',
+                                'type'    => 'unsigned',
                         ];
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php

@@ -8 +8 @@
 
 class Plugin_Posts extends \WP_Posts_List_Table {
+
+        protected $column_order = [
+                'cb',
+                'title',
+                'author',
+                'reviewer',
+                'comments',
+        ];
+
+        /**
+         * Engage the filters.
+         */
+        public function __construct() {
+                parent::__construct();
+
+                add_filter( "manage_{$this->screen->post_type}_posts_columns", [ $this, 'filter_columns' ], 100 );
+                add_filter( "manage_{$this->screen->id}_sortable_columns", [ $this, 'filter_sortable_columns' ], 100 );
+        }
+
+        /**
+         * Add the custom columns and set the order.
+         */
+        public function filter_columns( $columns ) {
+                // Rename some columns.
+                $columns['author']   = __( 'Submitter', 'wporg-plugins' );
+                $columns['reviewer'] = __( 'Assigned Reviewer', 'wporg-plugins' );
+                $columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Internal Notes', 'wporg-plugins' ) . '"><span class="screen-reader-text">' . __( 'Internal Notes', 'wporg-plugins' ) . '</span></span>';
+
+                // We don't want the stats column.
+                unset( $columns['stats'] );
+
+                $columns = array_merge( array_flip( $this->column_order ), $columns );
+
+                return $columns;
+        }
+
+        /**
+         * The sortable columns.
+         */
+        public function filter_sortable_columns( $columns ) {
+                $columns[ 'reviewer' ] = [ 'assigned_reviewer_time', 'asc' ];
+
+                return $columns;
+        }
 
         /**
@@ -100 +144 @@
 
                 return $actions;
-        }
-
-        /**
-         *
-         * @return array
-         */
-        public function get_columns() {
-                $post_type     = $this->screen->post_type;
-                $posts_columns = array(
-                        'cb'       => '<input type="checkbox" />',
-                        /* translators: manage posts column name */
-                        'title'    => _x( 'Title', 'column name', 'wporg-plugins' ),
-                        'author'   => __( 'Submitter', 'wporg-plugins' ),
-                        'reviewer' => __( 'Assigned Reviewer', 'wporg-plugins' ),
-                );
-
-                $taxonomies = get_object_taxonomies( $post_type, 'objects' );
-                $taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
-                $taxonomies = apply_filters( "manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type );
-                $taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
-
-                foreach ( $taxonomies as $taxonomy ) {
-                        $column_key                   = 'taxonomy-' . $taxonomy;
-                        $posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
-                }
-
-                $posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Internal Notes', 'wporg-plugins' ) . '"><span class="screen-reader-text">' . __( 'Internal Notes', 'wporg-plugins' ) . '</span></span>';
-                $posts_columns['date']     = __( 'Date', 'wporg-plugins' );
-
-                /**
-                 * Filter the columns displayed in the Plugins list table.
-                 *
-                 * @param array  $posts_columns An array of column names.
-                 * @param string $post_type     The post type slug.
-                 */
-                $posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
-
-                /**
-                 * Filter the columns displayed in the Plugins list table.
-                 *
-                 * The dynamic portion of the hook name, `$post_type`, refers to the post type slug.
-                 *
-                 * @param array $post_columns An array of column names.
-                 */
-                return apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
         }