From 1c9db41bb3c09b0f957588f65bf3d8345aa357b0 Mon Sep 17 00:00:00 2001
From: Diego Pucci <diegopucci.me@gmail.com>
Date: Thu, 27 Jun 2024 17:14:12 +0200
Subject: [PATCH 1/3] Add aria-label

---
 .../src/DataTable/components/SelectPageSize.tsx                | 1 +
 .../plugins/plugin-chart-table/src/TableChart.tsx              | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
index d97d6411b7897..726da3666d0c9 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
@@ -37,6 +37,7 @@ function DefaultSelectRenderer({
     <span className="dt-select-page-size form-inline">
       {t('Show')}{' '}
       <select
+        aria-label={t('Show %s entries', current)}
         className="form-control input-sm"
         value={current}
         onBlur={() => {}}
diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
index 37bdbed9d1c78..7855365314cdb 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
@@ -200,6 +200,9 @@ function SelectPageSize({
     <span className="dt-select-page-size form-inline">
       {t('page_size.show')}{' '}
       <select
+        aria-label={`${t('page_size.show')} ${current} ${t(
+          'page_size.entries',
+        )}`}
         className="form-control input-sm"
         value={current}
         onBlur={() => {}}

From 965a720b9e60339efee8049bd5a897cf8531a66b Mon Sep 17 00:00:00 2001
From: Diego Pucci <diegopucci.me@gmail.com>
Date: Fri, 28 Jun 2024 15:26:37 +0200
Subject: [PATCH 2/3] Use %s macro

---
 superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
index 7855365314cdb..9144acec5ec3f 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
@@ -200,7 +200,7 @@ function SelectPageSize({
     <span className="dt-select-page-size form-inline">
       {t('page_size.show')}{' '}
       <select
-        aria-label={`${t('page_size.show')} ${current} ${t(
+        aria-label={`${t('page_size.show %s', current)} ${t(
           'page_size.entries',
         )}`}
         className="form-control input-sm"

From 73f430ddca975b1cb2b407fc8ae3a2a259cc3503 Mon Sep 17 00:00:00 2001
From: Diego Pucci <diegopucci.me@gmail.com>
Date: Fri, 28 Jun 2024 15:46:32 +0200
Subject: [PATCH 3/3] Fix aria-label for 0 values

---
 .../src/DataTable/components/SelectPageSize.tsx      |  8 ++++++--
 .../plugins/plugin-chart-table/src/TableChart.tsx    | 12 +++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
index 726da3666d0c9..02052f103041d 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
@@ -37,7 +37,6 @@ function DefaultSelectRenderer({
     <span className="dt-select-page-size form-inline">
       {t('Show')}{' '}
       <select
-        aria-label={t('Show %s entries', current)}
         className="form-control input-sm"
         value={current}
         onBlur={() => {}}
@@ -49,8 +48,13 @@ function DefaultSelectRenderer({
           const [size, text] = Array.isArray(option)
             ? option
             : [option, option];
+          const sizeLabel = size === 0 ? t('all') : size;
           return (
-            <option key={size} value={size}>
+            <option
+              aria-label={t('Show %s entries', sizeLabel)}
+              key={size}
+              value={size}
+            >
               {text}
             </option>
           );
diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
index 9144acec5ec3f..a87371f440f04 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
@@ -181,10 +181,10 @@ function SearchInput({ count, value, onChange }: SearchInputProps) {
     <span className="dt-global-filter">
       {t('Search')}{' '}
       <input
+        aria-label={t('Search %s records', count)}
         className="form-control input-sm"
         placeholder={tn('search.num_records', count)}
         value={value}
-        aria-label={t('Search %s records', count)}
         onChange={onChange}
       />
     </span>
@@ -200,9 +200,6 @@ function SelectPageSize({
     <span className="dt-select-page-size form-inline">
       {t('page_size.show')}{' '}
       <select
-        aria-label={`${t('page_size.show %s', current)} ${t(
-          'page_size.entries',
-        )}`}
         className="form-control input-sm"
         value={current}
         onBlur={() => {}}
@@ -214,8 +211,13 @@ function SelectPageSize({
           const [size, text] = Array.isArray(option)
             ? option
             : [option, option];
+          const sizeLabel = size === 0 ? t('all') : size;
           return (
-            <option key={size} value={size}>
+            <option
+              aria-label={t('Show %s entries', sizeLabel)}
+              key={size}
+              value={size}
+            >
               {text}
             </option>
           );