From a5dd4215a218fdbb8033e641452cc2766c900f82 Mon Sep 17 00:00:00 2001
From: Jenny Bonsak <jenny.bonsak@gmail.com>
Date: Tue, 12 Sep 2023 16:22:28 +0200
Subject: [PATCH] facets: convert number to locale, a11y improvements

---
 .../components/InvenioSearchPagination.js     |  4 +--
 .../invenio_search_ui/components/SearchApp.js |  7 +++++-
 .../components/common/facets.js               | 25 +++++++++++++------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/InvenioSearchPagination.js b/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/InvenioSearchPagination.js
index 86c6d350..504436ea 100644
--- a/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/InvenioSearchPagination.js
+++ b/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/InvenioSearchPagination.js
@@ -18,7 +18,7 @@ export const InvenioSearchPagination = ({ paginationOptions, total }) => {
         {total && <Count
           label={() => (
             <Trans>
-              <b>{{ total }}</b> results found
+              <b>{total.toLocaleString("en-US")}</b> results found
             </Trans>
           )}
         />}
@@ -66,7 +66,7 @@ export const InvenioSearchPagination = ({ paginationOptions, total }) => {
           label={() => (
             <span className="rel-mr-2">
               <Trans>
-                <b>{{ total }}</b> results found
+                <b>{total.toLocaleString("en-US")}</b> results found
               </Trans>
             </span>
           )}
diff --git a/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/SearchApp.js b/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/SearchApp.js
index 34dba238..8a90a88c 100644
--- a/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/SearchApp.js
+++ b/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/SearchApp.js
@@ -133,6 +133,7 @@ export const SearchApp = ({ config, appName }) => {
                 <Grid.Row columns={columnsAmount}>
                   {facetsAvailable && (
                     <GridResponsiveSidebarColumn
+                      ariaLabel={i18next.t("Search filters")}
                       mobile={4}
                       tablet={4}
                       computer={4}
@@ -145,7 +146,11 @@ export const SearchApp = ({ config, appName }) => {
                     </GridResponsiveSidebarColumn>
                   )}
 
-                  <Grid.Column {...resultsPaneLayout}>
+                  <Grid.Column
+                    as="section"
+                    aria-label={i18next.t("Search results")}
+                    {...resultsPaneLayout}
+                  >
                     <SearchAppResultsPane
                       layoutOptions={config.layoutOptions} appName={appName} buildUID={buildUID}
                     />
diff --git a/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/common/facets.js b/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/common/facets.js
index a605c152..a019bf54 100644
--- a/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/common/facets.js
+++ b/invenio_search_ui/assets/semantic-ui/js/invenio_search_ui/components/common/facets.js
@@ -20,7 +20,7 @@ import { BucketAggregation, Toggle, buildUID } from "react-searchkit";
 
 export const ContribSearchAppFacets = ({ aggs, toggle, help, appName }) => {
   return (
-    <aside aria-label={i18next.t("filters")} id="search-filters">
+    <>
       {toggle && (
         <Toggle
           title={i18next.t("Versions")}
@@ -44,7 +44,7 @@ export const ContribSearchAppFacets = ({ aggs, toggle, help, appName }) => {
           </Card.Content>
         </Card>
       )}
-    </aside>
+    </>
   );
 };
 
@@ -104,6 +104,7 @@ export const ContribParentFacetValue = ({
             icon="angle right"
             className="transparent"
             onClick={() => setIsActive(!isActive)}
+            aria-expanded={isActive}
             aria-label={
               i18next.t("Show all sub facets of ") + bucket.label || keyField
             }
@@ -111,13 +112,17 @@ export const ContribParentFacetValue = ({
           <Checkbox
             label={bucket.label || keyField}
             id={`${keyField}-facet-checkbox`}
-            aria-describedby={`${keyField}-count`}
             value={keyField}
             checked={isSelected}
             onClick={() => onFilterClicked(keyField)}
           />
-          <Label circular id={`${keyField}-count`} className="facet-count">
-            {bucket.doc_count}
+          <Label
+            circular
+            role="note"
+            aria-label={`${bucket.doc_count} results for ${bucket.label || keyField}`}
+            className="facet-count"
+          >
+            {bucket.doc_count.toLocaleString("en-US")}
           </Label>
         </List.Content>
       </Accordion.Title>
@@ -146,12 +151,16 @@ export const ContribFacetValue = ({
         onClick={() => onFilterClicked(keyField)}
         label={bucket.label || keyField}
         id={`${keyField}-facet-checkbox`}
-        aria-describedby={`${keyField}-count`}
         value={keyField}
         checked={isSelected}
       />
-      <Label circular id={`${keyField}-count`} className="facet-count">
-        {bucket.doc_count}
+      <Label
+        circular
+        role="note"
+        aria-label={`${bucket.doc_count} results for ${bucket.label || keyField}`}
+        className="facet-count"
+      >
+        {bucket.doc_count.toLocaleString("en-US")}
       </Label>
     </List.Content>
   );