From ec806ce38551189762f2d6e92b1a9f47d18d88e1 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 24 Sep 2024 07:11:08 -0700
Subject: [PATCH 01/11] 1937b

---
 app/templates/components/main_nav.html | 2 +-
 app/templates/components/org_nav.html  | 2 +-
 tests/end_to_end/conftest.py           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/components/main_nav.html b/app/templates/components/main_nav.html
index 597ccf45b..118442095 100644
--- a/app/templates/components/main_nav.html
+++ b/app/templates/components/main_nav.html
@@ -1,7 +1,7 @@
 {% if help %}
   {% include 'partials/tour.html' %}
 {% else %}
-<nav class="nav margin-bottom-4">
+<nav id="nav-main-nav" aria-label="Main navigation" class="nav margin-bottom-4">
   <a class="usa-button margin-top-1 margin-bottom-5 width-full"
     href="{{ url_for('.choose_template', service_id=current_service.id) }}">Send messages</a>
   <ul class="usa-sidenav">
diff --git a/app/templates/components/org_nav.html b/app/templates/components/org_nav.html
index 7d156635c..c29b41be2 100644
--- a/app/templates/components/org_nav.html
+++ b/app/templates/components/org_nav.html
@@ -1,4 +1,4 @@
-<nav class="nav margin-bottom-4">
+<nav id="nav-org-nav" aria-label="Organization navigation" class="nav margin-bottom-4">
   <ul class="usa-sidenav">
     <li class="usa-sidenav__item"><a class="usa-link{{ org_navigation.is_selected('dashboard') }}" href="{{ url_for('.organization_dashboard', org_id=current_org.id) }}">Usage</a></li>
     <li class="usa-sidenav__item"><a class="usa-link{{ org_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_org_users', org_id=current_org.id) }}">Team members</a></li>
diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index d9bd8786c..119d21734 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -36,5 +36,5 @@ def check_axe_report(page):
     for violation in results["violations"]:
         assert violation["impact"] in [
             "minor",
-            "moderate",
+            # "moderate",
         ], f"Accessibility violation: {violation}"

From 73852a54f239a37f88d59b501bea195f1c58aef5 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 24 Sep 2024 07:36:21 -0700
Subject: [PATCH 02/11] add aria-labels

---
 app/templates/views/templates/_template_list.html | 2 +-
 app/templates/views/templates/choose-reply.html   | 2 +-
 app/templates/views/templates/copy.html           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index ee4450106..6f161c4a7 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -21,7 +21,7 @@
   {% endif %}
 </p>
 {% else %}
-<nav id="template-list">
+<nav id="template-list" aria-label="Template list">
   {% set checkboxes_data = [] %}
 
   {% if not current_user.has_permissions('manage_templates') %}
diff --git a/app/templates/views/templates/choose-reply.html b/app/templates/views/templates/choose-reply.html
index d3c786bbf..69bbe4770 100644
--- a/app/templates/views/templates/choose-reply.html
+++ b/app/templates/views/templates/choose-reply.html
@@ -37,7 +37,7 @@
 
     {{ live_search(target_selector='#template-list .template-list-item', show=True, form=search_form) }}
 
-    <nav id="template-list">
+    <nav id="template-list" aria-label="Choose reply">
       <ul>
       {% for item in templates_and_folders %}
         <li class="template-list-item {% if item.ancestors %}template-list-item-hidden-by-default{% endif %} {% if not item.ancestors %}template-list-item-without-ancestors{% endif %}">
diff --git a/app/templates/views/templates/copy.html b/app/templates/views/templates/copy.html
index 086936b7a..a45851977 100644
--- a/app/templates/views/templates/copy.html
+++ b/app/templates/views/templates/copy.html
@@ -25,7 +25,7 @@
         form=search_form,
         autofocus=True
       ) }}
-      <nav id="template-list">
+      <nav id="template-list" aria-label="Copy template list">
         <ul>
         {% for item in services_templates_and_folders %}
 

From 5ee559da10249a8440a13a77103d66d97c0db7ab Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 24 Sep 2024 07:44:43 -0700
Subject: [PATCH 03/11] try adding service nav

---
 app/templates/components/service_nav.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/templates/components/service_nav.html b/app/templates/components/service_nav.html
index e3826d279..4bd6aafb9 100644
--- a/app/templates/components/service_nav.html
+++ b/app/templates/components/service_nav.html
@@ -1,3 +1,4 @@
+<nav id="nav-service-nav" aria-label="Service navigation">
 <div class="navigation-service margin-top-5 display-flex flex-align-end flex-justify border-bottom padding-bottom-1">
   {% if current_service.organization_id %}
     {% if current_user.platform_admin or
@@ -13,3 +14,4 @@
   </div>
   <a href="{{ url_for('main.choose_account') }}" class="usa-link">Switch service</a>
 </div>
+</nav>

From 5caa26e93c26a39bcc3e00d34aed9a2945d72a6f Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 24 Sep 2024 07:52:10 -0700
Subject: [PATCH 04/11] try adding service nav

---
 app/templates/components/service_nav.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/components/service_nav.html b/app/templates/components/service_nav.html
index 4bd6aafb9..dfd2362bd 100644
--- a/app/templates/components/service_nav.html
+++ b/app/templates/components/service_nav.html
@@ -1,4 +1,4 @@
-<nav id="nav-service-nav" aria-label="Service navigation">
+<main id="nav-service-nav" aria-label="Service navigation">
 <div class="navigation-service margin-top-5 display-flex flex-align-end flex-justify border-bottom padding-bottom-1">
   {% if current_service.organization_id %}
     {% if current_user.platform_admin or
@@ -14,4 +14,4 @@
   </div>
   <a href="{{ url_for('main.choose_account') }}" class="usa-link">Switch service</a>
 </div>
-</nav>
+</main>

From 14b37524ae558e34b1cb9c4c00eb094bb9fb266d Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 24 Sep 2024 08:02:32 -0700
Subject: [PATCH 05/11] revert to nav

---
 app/templates/components/service_nav.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/components/service_nav.html b/app/templates/components/service_nav.html
index dfd2362bd..4bd6aafb9 100644
--- a/app/templates/components/service_nav.html
+++ b/app/templates/components/service_nav.html
@@ -1,4 +1,4 @@
-<main id="nav-service-nav" aria-label="Service navigation">
+<nav id="nav-service-nav" aria-label="Service navigation">
 <div class="navigation-service margin-top-5 display-flex flex-align-end flex-justify border-bottom padding-bottom-1">
   {% if current_service.organization_id %}
     {% if current_user.platform_admin or
@@ -14,4 +14,4 @@
   </div>
   <a href="{{ url_for('main.choose_account') }}" class="usa-link">Switch service</a>
 </div>
-</main>
+</nav>

From 899347d34904c22f6fcad33352c0fccc9f2dc105 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 24 Sep 2024 08:23:17 -0700
Subject: [PATCH 06/11] fix tests

---
 tests/app/test_navigation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py
index 58ff9f342..527e85554 100644
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -424,7 +424,7 @@ def test_caseworkers_get_caseworking_navigation(
     client_request.login(active_caseworking_user)
     page = client_request.get("main.choose_template", service_id=SERVICE_ONE_ID)
     assert normalize_spaces(page.select_one("header + .grid-container nav").text) == (
-        "Send messages Sent messages"
+        "service one Switch service"
     )
 
 
@@ -439,5 +439,5 @@ def test_caseworkers_see_jobs_nav_if_jobs_exist(
     client_request.login(active_caseworking_user)
     page = client_request.get("main.choose_template", service_id=SERVICE_ONE_ID)
     assert normalize_spaces(page.select_one("header + .grid-container nav").text) == (
-        "Send messages Sent messages"
+        "service one Switch service"
     )

From 99ce42fc4ac499fbb1768769e8ac789f1e821618 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 24 Sep 2024 08:44:01 -0700
Subject: [PATCH 07/11] revert test setting to ignore moderate failures

---
 tests/end_to_end/conftest.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index 119d21734..155a24b80 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -29,12 +29,10 @@ def check_axe_report(page):
 
     results = axe.run(page)
 
-    # TODO we are setting this to critical for now
-    # to keep tests passing.  Once the serious and
-    # moderate issues are fixed, we will set this
-    # 'moderate'
+    # TODO fix remaining 'moderate' failures
+    # so we can set the level we skip to minor only
     for violation in results["violations"]:
         assert violation["impact"] in [
             "minor",
-            # "moderate",
+            "moderate",
         ], f"Accessibility violation: {violation}"

From 67ad9148d6a17271bdfd61083ff0bd187eff9e82 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 25 Sep 2024 13:58:54 -0400
Subject: [PATCH 08/11] Testing back button for a11y issues

---
 app/templates/components/components/back-link/template.njk | 4 +++-
 tests/end_to_end/conftest.py                               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/templates/components/components/back-link/template.njk b/app/templates/components/components/back-link/template.njk
index 25e611b06..42b0174e3 100644
--- a/app/templates/components/components/back-link/template.njk
+++ b/app/templates/components/components/back-link/template.njk
@@ -1,2 +1,4 @@
-<a href="{%- if params.href %}{{ params.href }}{% else %}#{% endif -%}" class="usa-link usa-back-link display-inline-flex margin-bottom-3 {%- if params.classes %} {{ params.classes }}{% endif -%}"
+<nav class="usa-breadcrumb" aria-label="Back button">
+  <a href="{%- if params.href %}{{ params.href }}{% else %}#{% endif -%}" class="usa-link usa-back-link display-inline-flex margin-bottom-3 {%- if params.classes %} {{ params.classes }}{% endif -%}"
   {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>{{ (params.html | safe if params.html else (params.text if params.text else 'Back')) }}</a>
+</nav>
diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index 155a24b80..64ccfe786 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -34,5 +34,5 @@ def check_axe_report(page):
     for violation in results["violations"]:
         assert violation["impact"] in [
             "minor",
-            "moderate",
+            # "moderate",
         ], f"Accessibility violation: {violation}"

From 72eff3235e6e59ca17db824aaad9baf41b2ca746 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 25 Sep 2024 15:15:50 -0400
Subject: [PATCH 09/11] Making sure it's testing against this code

---
 app/templates/components/components/back-link/template.njk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/components/components/back-link/template.njk b/app/templates/components/components/back-link/template.njk
index 42b0174e3..073523c9c 100644
--- a/app/templates/components/components/back-link/template.njk
+++ b/app/templates/components/components/back-link/template.njk
@@ -1,4 +1,4 @@
 <nav class="usa-breadcrumb" aria-label="Back button">
-  <a href="{%- if params.href %}{{ params.href }}{% else %}#{% endif -%}" class="usa-link usa-back-link display-inline-flex margin-bottom-3 {%- if params.classes %} {{ params.classes }}{% endif -%}"
+  <a href="{%- if params.href %}{{ params.href }}{% else %}#{% endif -%}" class="usa-link usa-back-link display-inline-flex {%- if params.classes %} {{ params.classes }}{% endif -%}"
   {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>{{ (params.html | safe if params.html else (params.text if params.text else 'Back')) }}</a>
 </nav>

From e0fb031cf5a5654c2f93a4be00584674dc177772 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 25 Sep 2024 15:29:58 -0400
Subject: [PATCH 10/11] Semantic update

---
 app/templates/components/components/back-link/template.njk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/components/components/back-link/template.njk b/app/templates/components/components/back-link/template.njk
index 073523c9c..aba4e4d95 100644
--- a/app/templates/components/components/back-link/template.njk
+++ b/app/templates/components/components/back-link/template.njk
@@ -1,4 +1,4 @@
-<nav class="usa-breadcrumb" aria-label="Back button">
-  <a href="{%- if params.href %}{{ params.href }}{% else %}#{% endif -%}" class="usa-link usa-back-link display-inline-flex {%- if params.classes %} {{ params.classes }}{% endif -%}"
-  {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>{{ (params.html | safe if params.html else (params.text if params.text else 'Back')) }}</a>
+<nav class="usa-breadcrumb" aria-label="Breadcrumb">
+  <a href="{{ params.href or '#' }}" class="usa-link usa-back-link display-inline-flex {{ params.classes or '' }}"
+  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}" {% endfor %}>{{ params.html | safe or params.text or 'Back' }}</a>
 </nav>

From 647b37ae61741ae7705bcfd0172e2a8426f7c5d5 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 25 Sep 2024 16:19:00 -0400
Subject: [PATCH 11/11] Removing moderate violations for the a11y scan

---
 tests/end_to_end/conftest.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index 64ccfe786..5aa908de4 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -34,5 +34,4 @@ def check_axe_report(page):
     for violation in results["violations"]:
         assert violation["impact"] in [
             "minor",
-            # "moderate",
         ], f"Accessibility violation: {violation}"