From f763e9505a9159abb6e2213df84dee7da1f0cd3e Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Thu, 5 Nov 2020 08:39:23 -0500
Subject: [PATCH 1/3] Add captions to user and space grid pages

---
 .../public/management/users/users_grid/users_grid_page.tsx   | 5 +++++
 .../__snapshots__/spaces_grid_pages.test.tsx.snap            | 2 ++
 .../public/management/spaces_grid/spaces_grid_page.tsx       | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
index 2b7ed0079f291..b92d9f2298a0a 100644
--- a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
@@ -260,6 +260,11 @@ export class UsersGridPage extends Component<Props, State> {
             {
               <EuiInMemoryTable
                 itemId="username"
+                tableCaption={i18n.translate('xpack.security.management.users.tableCaption', {
+                  defaultMessage: 'List of {count} users.',
+                  values: { count: this.state.visibleUsers.length },
+                })}
+                rowHeader="username"
                 columns={columns}
                 selection={selectionConfig}
                 pagination={pagination}
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
index f4f92a26028ad..f59b66265ddd2 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
@@ -112,6 +112,7 @@ exports[`SpacesGridPage renders as expected 1`] = `
       }
       pagination={true}
       responsive={true}
+      rowHeader="name"
       search={
         Object {
           "box": Object {
@@ -120,6 +121,7 @@ exports[`SpacesGridPage renders as expected 1`] = `
         }
       }
       sorting={true}
+      tableCaption="List of 0 spaces."
       tableLayout="fixed"
     />
   </EuiPageContent>
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index b40f34273d99f..0c218b6665f0a 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -110,6 +110,11 @@ export class SpacesGridPage extends Component<Props, State> {
         <EuiInMemoryTable
           itemId={'id'}
           items={this.state.spaces}
+          tableCaption={i18n.translate('xpack.spaces.management.spacesGridPage.tableCaption', {
+            defaultMessage: 'List of {count} spaces.',
+            values: { count: this.state.spaces.length },
+          })}
+          rowHeader="name"
           columns={this.getColumnConfig()}
           hasActions
           pagination={true}

From ec96ee36f9e5e57e88ce35e61fd96735f780dc8c Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Thu, 5 Nov 2020 13:04:31 -0500
Subject: [PATCH 2/3] Address PR feedback: reword captions

---
 .../public/management/users/users_grid/users_grid_page.tsx      | 2 +-
 .../spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap   | 2 +-
 .../spaces/public/management/spaces_grid/spaces_grid_page.tsx   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
index b92d9f2298a0a..352817573cd06 100644
--- a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
@@ -261,7 +261,7 @@ export class UsersGridPage extends Component<Props, State> {
               <EuiInMemoryTable
                 itemId="username"
                 tableCaption={i18n.translate('xpack.security.management.users.tableCaption', {
-                  defaultMessage: 'List of {count} users.',
+                  defaultMessage: 'Users',
                   values: { count: this.state.visibleUsers.length },
                 })}
                 rowHeader="username"
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
index f59b66265ddd2..497b13642b81b 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
@@ -121,7 +121,7 @@ exports[`SpacesGridPage renders as expected 1`] = `
         }
       }
       sorting={true}
-      tableCaption="List of 0 spaces."
+      tableCaption="Kibana spaces"
       tableLayout="fixed"
     />
   </EuiPageContent>
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index 0c218b6665f0a..ae10c469e88d3 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -111,7 +111,7 @@ export class SpacesGridPage extends Component<Props, State> {
           itemId={'id'}
           items={this.state.spaces}
           tableCaption={i18n.translate('xpack.spaces.management.spacesGridPage.tableCaption', {
-            defaultMessage: 'List of {count} spaces.',
+            defaultMessage: 'Kibana spaces',
             values: { count: this.state.spaces.length },
           })}
           rowHeader="name"

From 8845314b951c26e2269ea5d866797184983a7aae Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Thu, 5 Nov 2020 14:02:14 -0500
Subject: [PATCH 3/3] remove unused i18n values

---
 .../public/management/users/users_grid/users_grid_page.tsx       | 1 -
 .../spaces/public/management/spaces_grid/spaces_grid_page.tsx    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
index 352817573cd06..37747f9a1ccfa 100644
--- a/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
+++ b/x-pack/plugins/security/public/management/users/users_grid/users_grid_page.tsx
@@ -262,7 +262,6 @@ export class UsersGridPage extends Component<Props, State> {
                 itemId="username"
                 tableCaption={i18n.translate('xpack.security.management.users.tableCaption', {
                   defaultMessage: 'Users',
-                  values: { count: this.state.visibleUsers.length },
                 })}
                 rowHeader="username"
                 columns={columns}
diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index ae10c469e88d3..68c4a4ff02b94 100644
--- a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -112,7 +112,6 @@ export class SpacesGridPage extends Component<Props, State> {
           items={this.state.spaces}
           tableCaption={i18n.translate('xpack.spaces.management.spacesGridPage.tableCaption', {
             defaultMessage: 'Kibana spaces',
-            values: { count: this.state.spaces.length },
           })}
           rowHeader="name"
           columns={this.getColumnConfig()}