From ed1a53588f66b334136ab5cf2472745dedf8513f Mon Sep 17 00:00:00 2001 From: Jake Spurlock Date: Sun, 6 Oct 2019 06:54:13 +0000 Subject: [PATCH] Privacy: Ensure that sending email, and remove data follow the same user experience. Both personal data request processes should follow the same convention. Fixes: #43974. Props: garrett-eclipse, kjellr, Kerfred, birgire, marybaum, SergeyBiryukov. git-svn-id: https://develop.svn.wordpress.org/trunk@46412 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/_enqueues/admin/privacy-tools.js | 9 ++++++++- src/wp-includes/script-loader.php | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/js/_enqueues/admin/privacy-tools.js b/src/js/_enqueues/admin/privacy-tools.js index bf8d49f221..802ec88f4b 100644 --- a/src/js/_enqueues/admin/privacy-tools.js +++ b/src/js/_enqueues/admin/privacy-tools.js @@ -71,7 +71,13 @@ jQuery( document ).ready( function( $ ) { clearResultsAfterRow( $requestRow ); function onExportDoneSuccess( zipUrl ) { + var summaryMessage = strings.emailSent; + setActionState( $action, 'export-personal-data-success' ); + + appendResultsAfterRow( $requestRow, 'notice-success', summaryMessage, [] ); + $this.hide(); + if ( 'undefined' !== typeof zipUrl ) { window.location = zipUrl; } else if ( ! sendAsEmail ) { @@ -168,7 +174,8 @@ jQuery( document ).ready( function( $ ) { classes = 'notice-warning'; } } - appendResultsAfterRow( $requestRow, 'notice-success', summaryMessage, messages ); + appendResultsAfterRow( $requestRow, classes, summaryMessage, messages ); + $this.hide(); } function onErasureFailure() { diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 247c5f7188..ee36191ec2 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -1801,6 +1801,7 @@ function wp_default_scripts( &$scripts ) { 'noneRemoved' => __( 'Personal data was found for this user but was not erased.' ), 'someNotRemoved' => __( 'Personal data was found for this user but some of the personal data found was not erased.' ), 'removalError' => __( 'An error occurred while attempting to find and erase personal data.' ), + 'emailSent' => __( 'The personal data export link for this user was sent.' ), 'noExportFile' => __( 'No personal data export file was generated.' ), 'exportError' => __( 'An error occurred while attempting to export personal data.' ), )