Skip to content

Commit

Permalink
Privacy: Add "Mark as completed" action.
Browse files Browse the repository at this point in the history 
Props garrett-eclipse, ocean90, joostdevalk, mista-flo, helen.
Fixes #46619.


git-svn-id: https://develop.svn.wordpress.org/trunk@49258 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
@helen
helen committed Oct 20, 2020
1 parent 18c1ab8 commit 0d2249c
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 33 deletions.
51 changes: 41 additions & 10 deletions src/wp-admin/includes/class-wp-privacy-data-export-requests-list-table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,56 @@ public function column_email( $item ) {
/** This filter is documented in wp-admin/includes/ajax-actions.php */
$exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
$exporters_count = count( $exporters );
$status = $item->status;
$request_id = $item->ID;
$nonce = wp_create_nonce( 'wp-privacy-export-personal-data-' . $request_id );

$download_data_markup = '<div class="export-personal-data" ' .
$download_data_markup = '<span class="export-personal-data" ' .
'data-exporters-count="' . esc_attr( $exporters_count ) . '" ' .
'data-request-id="' . esc_attr( $request_id ) . '" ' .
'data-nonce="' . esc_attr( $nonce ) .
'">';

$download_data_markup .= '<span class="export-personal-data-idle"><button type="button" class="button-link export-personal-data-handle">' . __( 'Download Personal Data' ) . '</button></span>' .
'<span class="export-personal-data-processing hidden">' . __( 'Downloading Data...' ) . ' <span class="export-progress"></span></span>' .
'<span class="export-personal-data-success hidden"><button type="button" class="button-link export-personal-data-handle">' . __( 'Download Personal Data Again' ) . '</button></span>' .
$download_data_markup .= '<span class="export-personal-data-idle"><button type="button" class="button-link export-personal-data-handle">' . __( 'Download personal data' ) . '</button></span>' .
'<span class="export-personal-data-processing hidden">' . __( 'Downloading data...' ) . ' <span class="export-progress"></span></span>' .
'<span class="export-personal-data-success hidden"><button type="button" class="button-link export-personal-data-handle">' . __( 'Download personal data again' ) . '</button></span>' .
'<span class="export-personal-data-failed hidden">' . __( 'Download failed.' ) . ' <button type="button" class="button-link">' . __( 'Retry' ) . '</button></span>';

$download_data_markup .= '</div>';
$download_data_markup .= '</span>';

$row_actions = array(
'download-data' => $download_data_markup,
);
$row_actions['download-data'] = $download_data_markup;

if ( 'request-completed' !== $status ) {
$complete_request_markup = '<span>';
$complete_request_markup .= sprintf(
'<a href="%s" class="complete-request" aria-label="%s">%s</a>',
esc_url(
wp_nonce_url(
add_query_arg(
array(
'action' => 'complete',
'request_id' => array( $request_id ),
),
admin_url( 'export-personal-data.php' )
),
'bulk-privacy_requests'
)
),
esc_attr(
sprintf(
/* translators: %s: Request email. */
__( 'Mark export request for &#8220;%s&#8221; as completed.' ),
$item->email
)
),
__( 'Complete request' )
);
$complete_request_markup .= '</span>';
}

if ( ! empty ( $complete_request_markup ) ) {
$row_actions['complete-request'] = $complete_request_markup;
}

return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) );
}
Expand Down Expand Up @@ -99,8 +130,8 @@ public function column_next_steps( $item ) {
'">';

?>
<span class="export-personal-data-idle"><button type="button" class="button-link export-personal-data-handle"><?php _e( 'Send Export Link' ); ?></button></span>
<span class="export-personal-data-processing hidden"><?php _e( 'Sending Email...' ); ?> <span class="export-progress"></span></span>
<span class="export-personal-data-idle"><button type="button" class="button-link export-personal-data-handle"><?php _e( 'Send export link' ); ?></button></span>
<span class="export-personal-data-processing hidden"><?php _e( 'Sending email...' ); ?> <span class="export-progress"></span></span>
<span class="export-personal-data-success success-message hidden"><?php _e( 'Email sent.' ); ?></span>
<span class="export-personal-data-failed hidden"><?php _e( 'Email could not be sent.' ); ?> <button type="button" class="button-link export-personal-data-handle"><?php _e( 'Retry' ); ?></button></span>
<?php
Expand Down
55 changes: 43 additions & 12 deletions src/wp-admin/includes/class-wp-privacy-data-removal-requests-list-table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,30 +47,61 @@ public function column_email( $item ) {
$row_actions = array();

// Allow the administrator to "force remove" the personal data even if confirmation has not yet been received.
$status = $item->status;
$status = $item->status;
$request_id = $item->ID;
$row_actions = array();
if ( 'request-confirmed' !== $status ) {
/** This filter is documented in wp-admin/includes/ajax-actions.php */
$erasers = apply_filters( 'wp_privacy_personal_data_erasers', array() );
$erasers_count = count( $erasers );
$request_id = $item->ID;
$nonce = wp_create_nonce( 'wp-privacy-erase-personal-data-' . $request_id );

$remove_data_markup = '<div class="remove-personal-data force-remove-personal-data" ' .
$remove_data_markup = '<span class="remove-personal-data force-remove-personal-data" ' .
'data-erasers-count="' . esc_attr( $erasers_count ) . '" ' .
'data-request-id="' . esc_attr( $request_id ) . '" ' .
'data-nonce="' . esc_attr( $nonce ) .
'">';

$remove_data_markup .= '<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle">' . __( 'Force Erase Personal Data' ) . '</button></span>' .
'<span class="remove-personal-data-processing hidden">' . __( 'Erasing Data...' ) . ' <span class="erasure-progress"></span></span>' .
$remove_data_markup .= '<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle">' . __( 'Force erase personal data' ) . '</button></span>' .
'<span class="remove-personal-data-processing hidden">' . __( 'Erasing data...' ) . ' <span class="erasure-progress"></span></span>' .
'<span class="remove-personal-data-success hidden">' . __( 'Erasure completed.' ) . '</span>' .
'<span class="remove-personal-data-failed hidden">' . __( 'Force Erasure has failed.' ) . ' <button type="button" class="button-link remove-personal-data-handle">' . __( 'Retry' ) . '</button></span>';
'<span class="remove-personal-data-failed hidden">' . __( 'Force erasure has failed.' ) . ' <button type="button" class="button-link remove-personal-data-handle">' . __( 'Retry' ) . '</button></span>';

$remove_data_markup .= '</div>';
$remove_data_markup .= '</span>';

$row_actions['remove-data'] = $remove_data_markup;
}

$row_actions = array(
'remove-data' => $remove_data_markup,
if ( 'request-completed' !== $status ) {
$complete_request_markup = '<span>';
$complete_request_markup .= sprintf(
'<a href="%s" class="complete-request" aria-label="%s">%s</a>',
esc_url(
wp_nonce_url(
add_query_arg(
array(
'action' => 'complete',
'request_id' => array( $request_id ),
),
admin_url( 'erase-personal-data.php' )
),
'bulk-privacy_requests'
)
),
esc_attr(
sprintf(
/* translators: %s: Request email. */
__( 'Mark export request for &#8220;%s&#8221; as completed.' ),
$item->email
)
),
__( 'Complete request' )
);
$complete_request_markup .= '</span>';
}

if ( ! empty ( $complete_request_markup ) ) {
$row_actions['complete-request'] = $complete_request_markup;
}

return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) );
Expand Down Expand Up @@ -105,10 +136,10 @@ public function column_next_steps( $item ) {
'">';

?>
<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle"><?php _e( 'Erase Personal Data' ); ?></button></span>
<span class="remove-personal-data-processing hidden"><?php _e( 'Erasing Data...' ); ?> <span class="erasure-progress"></span></span>
<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle"><?php _e( 'Erase personal data' ); ?></button></span>
<span class="remove-personal-data-processing hidden"><?php _e( 'Erasing data...' ); ?> <span class="erasure-progress"></span></span>
<span class="remove-personal-data-success success-message hidden" ><?php _e( 'Erasure completed.' ); ?></span>
<span class="remove-personal-data-failed hidden"><?php _e( 'Data Erasure has failed.' ); ?> <button type="button" class="button-link remove-personal-data-handle"><?php _e( 'Retry' ); ?></button></span>
<span class="remove-personal-data-failed hidden"><?php _e( 'Data erasure has failed.' ); ?> <button type="button" class="button-link remove-personal-data-handle"><?php _e( 'Retry' ); ?></button></span>
<?php

echo '</div>';
Expand Down
41 changes: 30 additions & 11 deletions src/wp-admin/includes/class-wp-privacy-requests-table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function get_columns() {
'email' => __( 'Requester' ),
'status' => __( 'Status' ),
'created_timestamp' => __( 'Requested' ),
'next_steps' => __( 'Next Steps' ),
'next_steps' => __( 'Next steps' ),
);
return $columns;
}
Expand Down Expand Up @@ -210,15 +210,17 @@ protected function get_views() {
*/
protected function get_bulk_actions() {
return array(
'delete' => __( 'Delete Requests' ),
'resend' => __( 'Resend Confirmation Requests' ),
'resend' => __( 'Resend confirmation requests' ),
'complete' => __( 'Mark requests as completed' ),
'delete' => __( 'Delete requests' ),
);
}

/**
* Process bulk actions.
*
* @since 4.9.6
* @since 5.6.0 Added support for the `complete` action.
*/
public function process_bulk_action() {
$action = $this->current_action();
Expand All @@ -231,26 +233,28 @@ public function process_bulk_action() {
}

switch ( $action ) {
case 'delete':
case 'resend':
foreach ( $request_ids as $request_id ) {
if ( wp_delete_post( $request_id, true ) ) {
$count ++;
$resend = _wp_privacy_resend_request( $request_id );

if ( $resend && ! is_wp_error( $resend ) ) {
$count++;
}
}

add_settings_error(
'bulk_action',
'bulk_action',
/* translators: %d: Number of requests. */
sprintf( _n( 'Deleted %d request.', 'Deleted %d requests.', $count ), $count ),
sprintf( _n( 'Re-sent %d request.', 'Re-sent %d requests.', $count ), $count ),
'success'
);
break;
case 'resend':
case 'complete':
foreach ( $request_ids as $request_id ) {
$resend = _wp_privacy_resend_request( $request_id );
$result = _wp_privacy_completed_request( $request_id );

if ( $resend && ! is_wp_error( $resend ) ) {
if ( $result && ! is_wp_error( $result ) ) {
$count++;
}
}
Expand All @@ -259,7 +263,22 @@ public function process_bulk_action() {
'bulk_action',
'bulk_action',
/* translators: %d: Number of requests. */
sprintf( _n( 'Re-sent %d request.', 'Re-sent %d requests.', $count ), $count ),
sprintf( _n( '%d request marked as complete.', '%d requests marked as complete.', $count ), $count ),
'success'
);
break;
case 'delete':
foreach ( $request_ids as $request_id ) {
if ( wp_delete_post( $request_id, true ) ) {
$count ++;
}
}

add_settings_error(
'bulk_action',
'bulk_action',
/* translators: %d: Number of requests. */
sprintf( _n( 'Deleted %d request.', 'Deleted %d requests.', $count ), $count ),
'success'
);
break;
Expand Down

0 comments on commit 0d2249c

Please sign in to comment.