Changeset 12591

Timestamp:

05/17/2023 08:38:01 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: Introduce assigned reviewer functionality.

Previously the group of reviewers was so small that they knew who was handling which submission, now that we have a larger set of reviewers being onboarded we need to keep track of review assignments a bit better.

See #6993.

Location:

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

Files:

• class-customizations.php (modified) (9 diffs)
• list-table/class-plugin-posts.php (modified) (8 diffs)
• metabox/class-reviewer.php (added)

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

@@ -64 +64 @@
                 add_action( 'wp_ajax_plugin-author-lookup', array( __NAMESPACE__ . '\Metabox\Author', 'lookup_author' ) );
                 add_action( 'wp_ajax_plugin-svn-sync', array( __NAMESPACE__ . '\Metabox\Review_Tools', 'svn_sync' ) );
+                add_action( 'wp_ajax_plugin-set-reviewer', array( __NAMESPACE__ . '\Metabox\Reviewer', 'xhr_set_reviewer' ) );
 
                 add_action( 'save_post', array( __NAMESPACE__ . '\Metabox\Release_Confirmation', 'save_post' ) );
                 add_action( 'save_post', array( __NAMESPACE__ . '\Metabox\Author_Notice', 'save_post' ) );
+                add_action( 'save_post', array( __NAMESPACE__ . '\Metabox\Reviewer', 'save_post' ) );
+
+                // Audit logs
+                add_action( 'updated_postmeta', array( $this, 'updated_postmeta' ), 10, 4 );
         }
 
@@ -212 +217 @@
                 }
 
+                // Filter by reviewer.
+                if ( ! empty( $_REQUEST['reviewer'] ) ) {
+                        $meta_query = $query->get( 'meta_query' ) ?: [];
+                        $meta_query[] = [
+                                'key'   => 'assigned_reviewer',
+                                'value' => intval( $_GET['reviewer'] ),
+                        ];
+
+                        $query->set( 'meta_query', $meta_query );
+                }
+
         }
 
@@ -242 +258 @@
 
                 $action = array_intersect(
-                        [ 'plugin_open', 'plugin_close', 'plugin_disable', 'plugin_reject' ],
+                        [ 'plugin_open', 'plugin_close', 'plugin_disable', 'plugin_reject', 'plugin_assign' ],
                         [ $_REQUEST['action'], $_REQUEST['action2'] ]
                 );
@@ -251 +267 @@
 
                 check_admin_referer( 'bulk-posts' );
+
+                $new_status = false;
+                $from_state = false;
+                $meta_data  = false;
 
                 switch( $action ) {
@@ -277 +297 @@
                                 $from_state = [ 'new', 'pending' ];
                                 break;
+                        case 'plugin_assign':
+                                if ( ! isset( $_REQUEST['reviewer'] ) ) {
+                                        return;
+                                }
+
+                                $capability = 'plugin_review';
+                                $from_state = 'any';
+                                $message    = _n_noop( '%s plugin assigned.', '%s plugins assigned.', 'wporg-plugins' );
+                                $meta_data = array(
+                                        'assigned_reviewer'      => intval( $_REQUEST['reviewer'] ),
+                                        'assigned_reviewer_time' => time(),
+                                );
+                                break;
                         default:
                                 return;
@@ -282 +315 @@
 
                 $closed = 0;
-                $plugins  = get_posts( array(
+                $args = array(
                         'post_type'      => 'plugin',
                         'post__in'       => array_map( 'absint', $_REQUEST['post'] ),
-                        'post_status'    => $from_state,
                         'posts_per_page' => count( $_REQUEST['post'] ),
-                ) );
+                );
+                if ( $from_state ) {
+                        $args['post_status'] = $from_state;
+                }
+                $plugins  = get_posts( $args );
 
                 foreach ( $plugins as $plugin ) {
@@ -293 +329 @@
                                 continue;
                         }
-
-                        $updated = wp_update_post( array(
-                                'ID'          => $plugin->ID,
-                                'post_status' => $new_status,
-                        ) );
+                        $updated = false;
+
+                        if ( $new_status ) {
+                                $updated = wp_update_post( array(
+                                        'ID'          => $plugin->ID,
+                                        'post_status' => $new_status,
+                                ) );
+                        }
+                        if ( $meta_data ) {
+                                foreach ( $meta_data as $key => $value ) {
+                                        $updated = update_post_meta( $plugin->ID, $key, $value );
+                                }
+                        }
 
                         if ( $updated && ! is_wp_error( $updated ) ) {
@@ -545 +589 @@
                         __( 'Plugin Controls', 'wporg-plugins' ),
                         array( __NAMESPACE__ . '\Metabox\Controls', 'display' ),
+                        'plugin', 'side', 'high'
+                );
+
+                add_meta_box(
+                        'reviewerdiv',
+                        __( 'Reviewer', 'wporg-plugins' ),
+                        array( __NAMESPACE__ . '\Metabox\Reviewer', 'display' ),
                         'plugin', 'side', 'high'
                 );
@@ -807 +858 @@
                 return $keys;
         }
+
+        /**
+         * Watch for post_meta updates and log accordingly.
+         */
+        public function updated_postmeta( $meta_id, $post_id, $meta_key, $meta_value ) {
+                if ( 'assigned_reviewer' === $meta_key && $meta_value ) {
+                        $reviewer = get_user_by( 'id', $meta_value );
+                        Tools::audit_log(
+                                sprintf(
+                                        'Assigned to <a href="%s">%s</a>.',
+                                        esc_url( 'https://profiles.wordpress.org/' . $reviewer->user_nicename . '/' ),
+                                        $reviewer->display_name ?: $reviewer->user_login
+                                ),
+                                get_post( $post_id )
+                        );
+                } elseif ( 'assigned_reviewer' === $meta_key && ! $meta_value ) {
+                        Tools::audit_log( 'Unassigned.', get_post( $post_id ) );
+                }
+        }
 }

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

@@ -95 +95 @@
                 }
 
+                if ( current_user_can( 'plugin_review' ) ) {
+                        $actions['plugin_assign'] = __( 'Assign reviewer', 'wporg-plugins' );
+                }
+
                 return $actions;
         }
@@ -105 +109 @@
                 $post_type     = $this->screen->post_type;
                 $posts_columns = array(
-                        'cb'     => '<input type="checkbox" />',
+                        'cb'       => '<input type="checkbox" />',
                         /* translators: manage posts column name */
-                        'title'  => _x( 'Title', 'column name', 'wporg-plugins' ),
-                        'author' => __( 'Submitter', 'wporg-plugins' ),
+                        'title'    => _x( 'Title', 'column name', 'wporg-plugins' ),
+                        'author'   => __( 'Submitter', 'wporg-plugins' ),
+                        'reviewer' => __( 'Assigned Reviewer', 'wporg-plugins' ),
                 );
 
@@ -411 +416 @@
                         $mine_inner_html = sprintf(
                                 _nx(
-                                        'Mine <span class="count">(%s)</span>',
-                                        'Mine <span class="count">(%s)</span>',
+                                        'My Plugins <span class="count">(%s)</span>',
+                                        'My Plugins <span class="count">(%s)</span>',
                                         $user_post_count,
                                         'posts',
@@ -448 +453 @@
 
                 $status_links['all'] = $this->get_edit_link( $all_args, $all_inner_html, $class );
+
+                // Assigned to me.
+                if ( current_user_can( 'plugin_review' ) ) {
+                        $assigned_count = $wpdb->get_var( $wpdb->prepare(
+                                "SELECT COUNT(p.ID)
+                                FROM $wpdb->posts p
+                                        JOIN $wpdb->postmeta pm ON p.ID = pm.post_id
+                                WHERE pm.meta_key = 'assigned_reviewer' AND pm.meta_value = %d AND p.post_status NOT IN( 'approved', 'publish' )",
+                                get_current_user_id()
+                        ) );
+
+                        $assigned_args = array(
+                                'post_type' => $post_type,
+                                'reviewer'  => get_current_user_id(),
+                        );
+
+                        $assigned_label = sprintf(
+                                _nx(
+                                        'Assigned to Me <span class="count">(%s)</span>',
+                                        'Assigned to Me <span class="count">(%s)</span>',
+                                        $assigned_count,
+                                        'posts',
+                                        'wporg-plugins'
+                                ),
+                                number_format_i18n( $assigned_count )
+                        );
+
+                        $status_links['assigned'] = $this->get_edit_link( $assigned_args, $assigned_label, ( ($_REQUEST['reviewer'] ?? 0) === get_current_user_id() ? 'current' : '' ) );
+                }
+
                 if ( $mine ) {
                         $status_links['mine'] = $mine;
@@ -519 +554 @@
                 parent::extra_tablenav( $which );
 
+                if ( 'top' === $which ) {
+                        // The first is the reviewer filter, the second is the assign review bulk action.
+                        ?>
+                        <fieldset class="alignleft actions filter-reviewer">
+                                <?php
+                                wp_dropdown_users( [
+                                        'name'              => 'reviewer',
+                                        'selected'          => intval( $_REQUEST['reviewer'] ?? 0 ),
+                                        'show_option_none'  => __( 'All Reviewers', 'wporg-plugins' ),
+                                        'option_none_value' => 0,
+                                        'role__in'          => [ 'plugin_admin', 'plugin_reviewer' ],
+                                ] );
+                                submit_button( __( 'Filter', 'wporg-plugins' ), 'secondary', false, false );
+                                ?>
+                        </fieldset>
+                        <fieldset class="alignleft actions hide-if-js bulk-plugin_assign" disabled="disabled">
+                                <?php
+                                wp_dropdown_users( [
+                                        'name'              => 'reviewer',
+                                        'selected'          => 0,
+                                        'show_option_none'  => __( 'Assign Review to ...', 'wporg-plugins' ),
+                                        'option_none_value' => 0,
+                                        'role__in'          => [ 'plugin_admin', 'plugin_reviewer' ],
+                                ] );
+                                submit_button( __( 'Assign', 'wporg-plugins' ), 'primary', false, false );
+                                ?>
+                        </fieldset>
+                        <?php
+                }
+
                 // TODO: This shouldn't have inline CSS/JS.
 
@@ -530 +595 @@
                                         <?php endforeach; ?>
                                 </select>
+                                <span class="actions bulk-plugin_close">
+                                        <?php submit_button( __( 'Close', 'wporg-plugins' ), 'primary', 'bulk_close', false ); ?>
+                                </span>
+                                <span class="actions bulk-plugin_disable">
+                                        <?php submit_button( __( 'Disable', 'wporg-plugins' ), 'primary', 'bulk_close', false ); ?>
+                                </span>
                         </fieldset>
                         <style>
@@ -543 +614 @@
                                                 $tablenav = $this.parents('form').find( '.tablenav.top' );
 
-                                        $tablenav.find( '.actions.bulk-plugin_close, .actions.bulk-plugin_disable' ).prop( 'disabled', true ).hide();
+                                        $tablenav.find( '.actions.bulk-plugin_close, .actions.bulk-plugin_disable, .actions.bulk-plugin_assign' ).prop( 'disabled', true ).hide();
                                         $tablenav.find( '.actions.bulk-' + val ).prop( 'disabled', false ).show();
                                 } );
@@ -551 +622 @@
                 }
         }
+
+        /**
+         * The custom Assigned Reviewer column.
+         */
+        public function column_reviewer( $post ) {
+                $reviewer_id   = (int) ( $post->assigned_reviewer ?? 0 );
+                $reviewer      = $reviewer_id ? get_user_by( 'id', $reviewer_id ) : false;
+                $reviewer_time = (int) ( $post->assigned_reviewer_time ?? 0 );
+
+                if ( $reviewer ) {
+                        printf(
+                                "<a href='%s'>%s</a><br><span>%s</span>",
+                                add_query_arg( [ 'reviewer' => $reviewer_id ] ),
+                                $reviewer->display_name ?: $reviewer->user_login,
+                                sprintf(
+                                        /* translators: %s The time/date different, '1 hour' */
+                                        __( '%s ago', 'wporg-plugins' ),
+                                        human_time_diff( $reviewer_time )
+                                )
+                        );
+                }
+        }
 }