Ticket #46098: 46098-pp-notice-js.diff

src/wp-admin/includes/admin-filters.php

@@ -142 +142 @@
 add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 100 );
 
 // Show a "postbox" with the text suggestions for a privacy policy.
-add_action( 'admin_notices', array( 'WP_Privacy_Policy_Content', 'notice' ) );
+add_action( 'admin_print_scripts', array( 'WP_Privacy_Policy_Content', 'notice' ) );
 
 // Add the suggested policy text from WordPress.
 add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 1 );

src/wp-admin/includes/misc.php

@@ -1621 +1621 @@
          * @param WP_Post|null $post The currently edited post. Default null.
          */
         public static function notice( $post = null ) {
-                $post = get_post( $post );
+                if ( ! get_current_screen()->is_block_editor() ) {
+                        return;
+                }
+
+                if ( is_null( $post ) ) {
+                        global $post;
+                } else {
+                        $post = get_post( $post );
+                }
 
                 if ( ! ( $post instanceof WP_Post ) ) {
                         return;
@@ -1637 +1645 @@
                         return;
                 }
 
-                ?>
-                <div class="notice notice-warning inline wp-pp-notice">
-                        <p>
-                        <?php
-                        /* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */
-                        printf(
-                                __( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
-                                admin_url( 'tools.php?wp-privacy-policy-guide=1' ),
-                                'target="_blank"',
-                                sprintf(
-                                        '<span class="screen-reader-text"> %s</span>',
-                                        /* translators: accessibility text */
-                                        __( '(opens in a new tab)' )
-                                )
-                        );
-                        ?>
-                        </p>
-                </div>
-                <?php
+                $message = __( 'Need help putting together your new Privacy Policy page? Check out our guide for recommendations on what content to include, along with policies suggested by your plugins and theme.' );
+                $action = array(
+                        'url'   => admin_url( 'tools.php?wp-privacy-policy-guide=1' ),
+                        'label' => __( 'View Guide' ),
+                );
 
+                wp_enqueue_script( 'wp-notices' );
+                wp_add_inline_script(
+                        'wp-notices',
+                        sprintf(
+                                'wp.data.dispatch( "core/notices" ).createWarningNotice( "%s", { actions: [ %s ] } )',
+                                $message,
+                                wp_json_encode( $action )
+                        ),
+                        'after'
+                );
         }
 
         /**