From 5304c0f7a9c50f5d06873d8e9ef767846e0463b6 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jbobel@flexion.us>
Date: Mon, 23 Oct 2023 14:36:10 -0400
Subject: [PATCH 1/2] 801 - Moving Send message link from inside the side nav
 to a button

---
 app/templates/main_nav.html                        | 14 ++++++++------
 tests/app/main/test_permissions.py                 |  2 --
 .../main/views/accounts/test_choose_accounts.py    |  2 +-
 tests/app/test_navigation.py                       |  5 ++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html
index 75ca2a318..ab08552a6 100644
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -1,13 +1,15 @@
 {% if help %}
   {% include 'partials/tour.html' %}
 {% else %}
-<nav class="nav margin-bottom-5">
+<nav class="nav">
+  <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">
   {% if current_user.has_permissions() %}
     {% if current_user.has_permissions('view_activity') %}
       <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('dashboard') }}" href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">Dashboard</a></li>
     {% endif %}
-      <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('templates') }}" href="{{ url_for('.choose_template', service_id=current_service.id) }}">Send messages</a></li>
+      {# <li class="usa-sidenav__item"><a class="{{ main_navigation.is_selected('templates') }}" href="{{ url_for('.choose_template', service_id=current_service.id) }}">Send messages</a></li> #}
     {% if not current_user.has_permissions('view_activity') %}
       <li class="usa-sidenav__item"><a class="{{ casework_navigation.is_selected('sent-messages') }}" href="{{ url_for('.view_notifications', service_id=current_service.id, status='sending,delivered,failed') }}">Sent messages</a></li>
     {% endif %}
@@ -27,8 +29,8 @@
   {% endif %}
   </ul>
 </nav>
-    <div>
-        <p class="usa--body bold margin-bottom-1">Messages Left Across Services</p>
-        <p>{{ daily_global_messages_remaining }}</p>
-    </div>
+<div>
+    <p class="usa--body bold ">Messages Left Across Services</p>
+    <p>{{ daily_global_messages_remaining }}</p>
+</div>
 {% endif %}
diff --git a/tests/app/main/test_permissions.py b/tests/app/main/test_permissions.py
index a0104924e..e5aedb376 100644
--- a/tests/app/main/test_permissions.py
+++ b/tests/app/main/test_permissions.py
@@ -122,7 +122,6 @@ def test_service_navigation_for_org_user(
         (
             [],
             (
-                "Send messages",
                 "Sent messages",
                 "Team members",
             ),
@@ -131,7 +130,6 @@ def test_service_navigation_for_org_user(
         (
             [ORGANISATION_ID],
             (
-                "Send messages",
                 "Sent messages",
                 "Team members",
                 "Usage",
diff --git a/tests/app/main/views/accounts/test_choose_accounts.py b/tests/app/main/views/accounts/test_choose_accounts.py
index 7d47c2a95..9222cfe22 100644
--- a/tests/app/main/views/accounts/test_choose_accounts.py
+++ b/tests/app/main/views/accounts/test_choose_accounts.py
@@ -361,7 +361,7 @@ def test_should_show_back_to_service_if_user_belongs_to_service(
 ):
     mock_get_service.return_value = service_one
     expected_page_text = (
-        "Test Service Switch service " "" "Dashboard " "Send messages " "Team members"
+        "Test Service Switch service " "Dashboard" "Team members"
     )  # TODO: set sidebar variables in common test module
 
     page = client_request.get(
diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py
index e24b4f145..cdf1db4dc 100644
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -354,7 +354,6 @@ def test_raises_on_invalid_navigation_item(client_request, navigation_instance):
 @pytest.mark.parametrize(
     ("endpoint", "selected_nav_item"),
     [
-        ("main.choose_template", "Send messages"),
         ("main.manage_users", "Team members"),
     ],
 )
@@ -444,7 +443,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 Team members"
+        "Sent messages Team members"
     )
 
 
@@ -459,5 +458,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 Team members"
+        "Sent messages Team members"
     )

From c290e60a6c527ca20659561a6d1fe7a05e836953 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jbobel@flexion.us>
Date: Tue, 24 Oct 2023 12:24:14 -0400
Subject: [PATCH 2/2] Fixing tests

---
 tests/app/main/test_permissions.py                    | 3 +++
 tests/app/main/views/accounts/test_choose_accounts.py | 2 +-
 tests/app/test_navigation.py                          | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/app/main/test_permissions.py b/tests/app/main/test_permissions.py
index e5aedb376..fea2c2fb5 100644
--- a/tests/app/main/test_permissions.py
+++ b/tests/app/main/test_permissions.py
@@ -111,6 +111,7 @@ def test_service_navigation_for_org_user(
         service_id=SERVICE_ONE_ID,
     )
     assert [item.text.strip() for item in page.select("nav.nav a")] == [
+        "Send messages",
         "Usage",
         "Team members",
     ]
@@ -122,6 +123,7 @@ def test_service_navigation_for_org_user(
         (
             [],
             (
+                "Send messages",
                 "Sent messages",
                 "Team members",
             ),
@@ -130,6 +132,7 @@ def test_service_navigation_for_org_user(
         (
             [ORGANISATION_ID],
             (
+                "Send messages",
                 "Sent messages",
                 "Team members",
                 "Usage",
diff --git a/tests/app/main/views/accounts/test_choose_accounts.py b/tests/app/main/views/accounts/test_choose_accounts.py
index 9222cfe22..464d7b98e 100644
--- a/tests/app/main/views/accounts/test_choose_accounts.py
+++ b/tests/app/main/views/accounts/test_choose_accounts.py
@@ -361,7 +361,7 @@ def test_should_show_back_to_service_if_user_belongs_to_service(
 ):
     mock_get_service.return_value = service_one
     expected_page_text = (
-        "Test Service Switch service " "Dashboard" "Team members"
+        "Test Service Switch service " "Send messages " "Dashboard " "Team members"
     )  # TODO: set sidebar variables in common test module
 
     page = client_request.get(
diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py
index cdf1db4dc..5ae9a42d9 100644
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -422,9 +422,9 @@ def test_navigation_urls(
     mock_get_api_keys,
 ):
     page = client_request.get("main.choose_template", service_id=SERVICE_ONE_ID)
-    assert [a["href"] for a in page.select(".nav.margin-bottom-5 a")] == [
-        "/services/{}".format(SERVICE_ONE_ID),
+    assert [a["href"] for a in page.select(".nav a")] == [
         "/services/{}/templates".format(SERVICE_ONE_ID),
+        "/services/{}".format(SERVICE_ONE_ID),
         "/services/{}/users".format(SERVICE_ONE_ID),
         "/services/{}/usage".format(SERVICE_ONE_ID),
         "/services/{}/service-settings".format(SERVICE_ONE_ID),
@@ -443,7 +443,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) == (
-        "Sent messages Team members"
+        "Send messages Sent messages Team members"
     )
 
 
@@ -458,5 +458,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) == (
-        "Sent messages Team members"
+        "Send messages Sent messages Team members"
     )