From 7e9c1f5df1e8a0583f05f8af56ac52c73da8c4fb Mon Sep 17 00:00:00 2001
From: Curtis Conard <cconard96@gmail.com>
Date: Sun, 22 Sep 2024 20:54:26 -0400
Subject: [PATCH] fix search export button

---
 .../components/search/controls.html.twig      | 47 ++++++++++---------
 tests/cypress/support/cypress-axe.js          |  1 +
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/templates/components/search/controls.html.twig b/templates/components/search/controls.html.twig
index a7d768ecef0..a45ee7381f9 100644
--- a/templates/components/search/controls.html.twig
+++ b/templates/components/search/controls.html.twig
@@ -197,65 +197,66 @@
                 {% endif %}
 
                 {% if count > 0 %}
-                    <div class="d-inline-block" title="{{ __("Export") }}" data-bs-toggle="tooltip" data-bs-placement="top" role="none">
-                        <button class="dropdown-toggle btn btn-sm btn-ghost-secondary" type="button" id="dropdown-export-{{ rand }}"
-                                data-bs-toggle="dropdown" aria-expanded="false" data-bs-popper-config='{"strategy":"fixed"}'>
+                    <button class="dropdown-toggle btn btn-sm btn-ghost-secondary" type="button" name="export" id="dropdown-export-{{ rand }}"
+                            data-bs-toggle="dropdown" aria-expanded="false" data-bs-popper-config='{"strategy":"fixed"}'>
+                        <span title="{{ __("Export") }}" data-bs-toggle="tooltip" data-bs-placement="top">
                             <i id="export_dropdown_icon" class="ti ti-download"></i>
-                        </button>
-                    </div>
+                        </span>
+                    </button>
                     {% set exporthref = path('/front/report.dynamic.php') ~ "?" ~ {
                         'item_type': itemtype,
                         'sort': sort,
                         'order': order,
                         'start': start,
                     }|url_encode ~ '&' ~ posthref %}
-                    <div class="dropdown-menu" style="z-index: 10001" aria-labelledby="dropdown-export-{{ rand }}">
-                        <h6 class="dropdown-header">{{ __("Current page") }}</h6>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::PDF_OUTPUT_LANDSCAPE') }}">
+                    <div class="dropdown-menu" style="z-index: 10001" aria-labelledby="dropdown-export-{{ rand }}" role="menu">
+                        <div role="separator"><h6 class="dropdown-header">{{ __("Current page") }}</h6></div>
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::PDF_OUTPUT_LANDSCAPE') }}" role="menuitem">
                             <i class="ti ti-file-type-pdf"></i>
-                            {{ __('landscape PDF') }}
+                            {{- __('Landscape PDF') -}}
                         </a>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::PDF_OUTPUT_PORTRAIT') }}">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::PDF_OUTPUT_PORTRAIT') }}" role="menuitem">
                             <i class="ti ti-file-type-pdf"></i>
-                            {{ __('portrait PDF') }}
+                            {{ __('Portrait PDF') }}
                         </a>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::CSV_OUTPUT') }}">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::CSV_OUTPUT') }}" role="menuitem">
                             <i class="ti ti-file-type-csv"></i>
                             {{ __('CSV') }}
                         </a>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::ODS_OUTPUT') }}">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::ODS_OUTPUT') }}" role="menuitem">
                             <i class="ti ti-file-spreadsheet"></i>
                             {{ __('ODS') }}
                         </a>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::XLSX_OUTPUT') }}">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=' ~ constant('Search::XLSX_OUTPUT') }}" role="menuitem">
                             <i class="ti ti-file-spreadsheet"></i>
                             {{ __('XLSX') }}
                         </a>
                         <hr class="dropdown-divider">
-                        <h6 class="dropdown-header">{{ __("All pages") }}</h6>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::PDF_OUTPUT_LANDSCAPE') }}">
+                        <div role="separator"><h6 class="dropdown-header">{{ __("All pages") }}</h6></div>
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::PDF_OUTPUT_LANDSCAPE') }}" role="menuitem">
                             <i class="ti ti-file-type-pdf"></i>
-                            {{ __('landscape PDF') }}
+                            {{ __('Landscape PDF') }}
                         </a>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::PDF_OUTPUT_PORTRAIT') }}">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::PDF_OUTPUT_PORTRAIT') }}" role="menuitem">
                             <i class="ti ti-file-type-pdf"></i>
-                            {{ __('portrait PDF') }}
+                            {{ __('Portrait PDF') }}
                         </a>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::CSV_OUTPUT') }}">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::CSV_OUTPUT') }}" role="menuitem">
                             <i class="ti ti-file-type-csv"></i>
                             {{ __('CSV') }}
                         </a>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::ODS_OUTPUT') }}">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::ODS_OUTPUT') }}" role="menuitem">
                             <i class="ti ti-file-spreadsheet"></i>
                             {{ __('ODS') }}
                         </a>
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::XLSX_OUTPUT') }}">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::XLSX_OUTPUT') }}" role="menuitem">
                             <i class="ti ti-file-spreadsheet"></i>
                             {{ __('XLSX') }}
                         </a>
                         {% if itemtype != 'Stat' %}
                         <hr class="dropdown-divider">
-                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::NAMES_OUTPUT') }}" id="copy_names_to_clipboard">
+                        <a class="dropdown-item" href="{{ exporthref ~ '&display_type=-' ~ constant('Search::NAMES_OUTPUT') }}"
+                           id="copy_names_to_clipboard" role="menuitem">
                             <i class="ti ti-copy"></i>
                             {{ __('Copy names to clipboard') }}
                         </a>
diff --git a/tests/cypress/support/cypress-axe.js b/tests/cypress/support/cypress-axe.js
index 0b3ada2d755..94404fccd9f 100644
--- a/tests/cypress/support/cypress-axe.js
+++ b/tests/cypress/support/cypress-axe.js
@@ -53,6 +53,7 @@ Cypress.Commands.add('injectAndCheckA11y', {prevSubject: 'optional'}, (subject)
             ['div.fileupload'], // JQuery File upload library is not under our control and has some known issues
             ['.alert'], // Default Bootstrap/Tabler alert colors don't meet contrast requirements at any level of WCAG.
             ['.nav-pills .nav-link.active'],
+            ['span[aria-label]'], // aria-label attribute cannot be used on a span with no valid role attribute. Done by bootstrap.
 
             // Below are items that do not need to be validated
             ['.sf-toolbar'], // Symfony profiler