Ticket #46895: 46895-3.diff

src/wp-admin/includes/privacy-tools.php

@@ -234 +234 @@
  * @return string The HTML for this group and its items.
  */
 function wp_privacy_generate_personal_data_export_group_html( $group_data ) {
-        $group_html = '<h2>' . esc_html( $group_data['group_label'] ) . '</h2>';
+
+        $group_html  = '<h2>';
+        $group_html .= esc_html( $group_data['group_label'] );
+
+        if ( isset( $group_data['group_count'] ) && $group_data['group_count'] ) {
+                $items_count = count( (array) $group_data['items'] );
+                if ( $items_count > 1 ) {
+                        $group_html .= sprintf( ' <span class="count">(%d)</span>', $items_count );
+                }
+        }
+
+        $group_html .= '</h2>';
 
         if ( ! empty( $group_data['group_description'] ) ) {
                 $group_html .= '<p>' . esc_html( $group_data['group_description'] ) . '</p>';
@@ -621 +632 @@
                 $group_id    = $export_datum['group_id'];
                 $group_label = $export_datum['group_label'];
 
+                $group_count = false;
+                if ( isset( $export_datum['group_count'] ) ) {
+                        $group_count = (bool) $export_datum['group_count'];
+                }
+
                 $group_description = '';
                 if ( ! empty( $export_datum['group_description'] ) ) {
                         $group_description = $export_datum['group_description'];
@@ -629 +645 @@
                 if ( ! array_key_exists( $group_id, $groups ) ) {
                         $groups[ $group_id ] = array(
                                 'group_label'       => $group_label,
+                                'group_count'       => $group_count,
                                 'group_description' => $group_description,
                                 'items'             => array(),
                         );

src/wp-includes/comment.php

@@ -3436 +3436 @@
                 $data_to_export[] = array(
                         'group_id'          => 'comments',
                         'group_label'       => __( 'Comments' ),
+                        'group_count'       => true,
                         'group_description' => __( 'User’s comment data.' ),
                         'item_id'           => "comment-{$comment->comment_ID}",
                         'data'              => $comment_data_to_export,

src/wp-includes/media.php

@@ -4309 +4309 @@
                         $data_to_export[] = array(
                                 'group_id'          => 'media',
                                 'group_label'       => __( 'Media' ),
+                                'group_count'       => true,
                                 'group_description' => __( 'User’s media data.' ),
                                 'item_id'           => "post-{$post->ID}",
                                 'data'              => $post_data_to_export,

tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php

@@ -197 +197 @@
                 $this->assertNotContains( $data['items'][0]['images']['value'], $actual );
                 $this->assertContains( '<th>Images are not allowed</th><td></td>', $actual );
         }
+
+        /**
+         * Test displaying group count.
+         *
+         * @ticket 46895
+         */
+        public function test_group_html_generation_when_group_count_displayed() {
+                $data = array(
+                        'group_label' => 'Test Data Group',
+                        'group_count' => true,
+                        'items'       => array(
+                                array(
+                                        array(
+                                                'name'  => 'Field 1 Name',
+                                                'value' => 'Field 1 Value',
+                                        ),
+                                ),
+                                array(
+                                        array(
+                                                'name'  => 'Field 2 Name',
+                                                'value' => 'Field 2 Value',
+                                        ),
+                                ),
+                        ),
+                );
+
+                $actual = wp_privacy_generate_personal_data_export_group_html( $data );
+
+                $this->assertContains( '<h2>Test Data Group', $actual );
+                $this->assertContains( '<span class="count">(2)</span></h2>', $actual );
+                $this->assertSame( 2, substr_count( $actual, '<table>' ) );
+        }
+
+        /**
+         * Test hiding group count display.
+         *
+         * @ticket 46895
+         */
+        public function test_group_html_generation_when_group_count_not_displayed() {
+                $data = array(
+                        'group_label' => 'Test Data Group',
+                        'group_count' => false,
+                        'items'       => array(
+                                array(
+                                        array(
+                                                'name'  => 'Field 1 Name',
+                                                'value' => 'Field 1 Value',
+                                        ),
+                                ),
+                                array(
+                                        array(
+                                                'name'  => 'Field 2 Name',
+                                                'value' => 'Field 2 Value',
+                                        ),
+                                ),
+                        ),
+                );
+
+                $actual = wp_privacy_generate_personal_data_export_group_html( $data );
+
+                $this->assertContains( '<h2>Test Data Group</h2>', $actual );
+                $this->assertNotContains( '<span class="count">', $actual );
+                $this->assertSame( 2, substr_count( $actual, '<table>' ) );
+        }
+
+        /**
+         * Test group count is not displayed for a single item.
+         *
+         * @ticket 46895
+         */
+        public function test_group_html_generation_should_not_display_group_count_when_single_item() {
+                $data = array(
+                        'group_label' => 'Test Data Group',
+                        'group_count' => true,
+                        'items'       => array(
+                                array(
+                                        array(
+                                                'name'  => 'Field 1 Name',
+                                                'value' => 'Field 1 Value',
+                                        ),
+                                ),
+                        ),
+                );
+
+                $actual = wp_privacy_generate_personal_data_export_group_html( $data );
+
+                $this->assertContains( '<h2>Test Data Group</h2>', $actual );
+                $this->assertNotContains( '<span class="count">', $actual );
+                $this->assertSame( 1, substr_count( $actual, '<table>' ) );
+        }
 }