Merge branch '2135-send-message-flow-h1-changes' of https://github.com/GSA/notifications-admin into 2135-send-message-flow-h1-changes

# Conflicts:
#	app/templates/views/templates/template.html

app/templates/components/folder-path.html

@@ -3,10 +3,10 @@
   service_id,
   template_type,
   current_user,
-  link_current_item=False
+  link_current_item=False,
+  root_element='nav'
 ) %}
-
+  <{{ root_element }} id="breadcrumb-template-folders" class="navigation-service usa-breadcrumb padding-top-0">
-  <nav class="navigation-service usa-breadcrumb padding-top-0">
     {% for folder in folders %}
       {% if loop.last and not link_current_item %}
         {% if folder.template_type or not folder.id %}
@@ -27,7 +27,7 @@
         {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
       {% endif %}
     {% endfor %}
-  </nav>
+  </{{ root_element }}>
 {% endmacro %}
 
 

app/templates/views/templates/choose.html

@@ -37,13 +37,15 @@
         <p class="margin-top-0 margin-bottom-4">
           Every message starts with a template. To send, choose or create a template.
         </p>
-        {# you don't need this unless you're trying to add the parent breadcrumb title to the first page of the flow #}
+        {# you don't need folder_path unless you're trying to add the parent breadcrumb title to the first
-        <!-- {{ folder_path(
+        page of the flow, if that's the case, you'll want to delete line 353 within the test_template_folders.py
+        file. assert len(page.select("nav#breadcrumb-template-folders a")) == len(expected_parent_link_args)#}
+        {{ folder_path(
           folders=template_folder_path,
           service_id=current_service.id,
           template_type=template_type,
           current_user=current_user
-        ) }} -->
+        ) }}
       </div>
       {% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
         <div class="grid-col-2">

app/templates/views/templates/manage-template-folder.html

@@ -3,9 +3,9 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
-{% block service_page_title %}
+{% set page_title = 'Select or create a template' %}
-  {{ page_title_folder_path(template_folder_path) }}
+
-{% endblock %}
+{% block service_page_title %}{{page_title}}{% endblock %}
 
 {% block maincolumn_content %}
 

app/templates/views/templates/template.html

@@ -1,13 +1,13 @@
 {% extends "withnav_template.html" %}
 {% from "components/banner.html" import banner_wrapper %}
-{% from "components/folder-path.html" import folder_path, page_title_folder_path %}
+{% from "components/folder-path.html" import folder_path %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
 {% from "components/components/button/macro.njk" import usaButton %}
 
-{% block service_page_title %}
+{% set page_title = 'Confirm your template' %}
-  {{ page_title_folder_path(current_service.get_template_path(template._template)) }}
+
-{% endblock %}
+{% block service_page_title %}{{page_title}}{% endblock %}
 
 {% block maincolumn_content %}
 
@@ -33,7 +33,7 @@
     <div class="grid-row">
       <div class="grid-col-12">
         <h1 class="font-body-2xl line-height-sans-2 folder-heading margin-top-0">
-          Confirm your template
+          {{page_title}}
         </h1>
         {{ folder_path(
           folders=current_service.get_template_path(template._template),

tests/app/main/views/test_accept_invite.py

@@ -269,7 +269,7 @@ def test_invite_goes_in_session(
     ("user", "landing_page_title"),
     [
         (create_active_user_with_permissions(), "Dashboard"),
-        (create_active_caseworking_user(), "Templates"),
+        (create_active_caseworking_user(), "Select or create a template"),
     ],
 )
 def test_accepting_invite_removes_invite_from_session(

tests/app/main/views/test_template_folders.py

@@ -159,8 +159,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            "folder_one – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Templates folder_one",
+            "Select or create a template",
             [{"template_type": "all"}],
             {"template_folder_id": PARENT_FOLDER_ID},
             ["Email", "Text message"],
@@ -182,8 +182,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            "folder_one – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Templates folder_one",
+            "Select or create a template",
             [{"template_type": "sms"}],
             {"template_type": "sms", "template_folder_id": PARENT_FOLDER_ID},
             ["All", "Email"],
@@ -199,8 +199,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            "folder_one – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Templates folder_one",
+            "Select or create a template",
             [{"template_type": "email"}],
             {"template_type": "email", "template_folder_id": PARENT_FOLDER_ID},
             ["All", "Text message"],
@@ -210,8 +210,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             "There are no email templates in this folder",
         ),
         (
-            "folder_one_one – folder_one – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Templates folder_one folder_one_one",
+            "Select or create a template",
             [
                 {"template_type": "all"},
                 {"template_type": "all", "template_folder_id": PARENT_FOLDER_ID},
@@ -229,8 +229,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            "folder_one_one_one – folder_one_one – folder_one – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Templates folder_one folder_one_one folder_one_one_one",
+            "Select or create a template",
             [
                 {"template_type": "all"},
                 {"template_type": "all", "template_folder_id": PARENT_FOLDER_ID},
@@ -250,8 +250,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            "folder_one_one_one – folder_one_one – folder_one – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Templates folder_one folder_one_one folder_one_one_one",
+            "Select or create a template",
             [
                 {"template_type": "email"},
                 {"template_type": "email", "template_folder_id": PARENT_FOLDER_ID},
@@ -268,8 +268,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             "There are no email templates in this folder",
         ),
         (
-            "folder_two – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Select or create a template folder_two",
+            "Select or create a template",
             [{"template_type": "all"}],
             {"template_folder_id": FOLDER_TWO_ID},
             ["Email", "Text message"],
@@ -279,8 +279,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             "This folder is empty",
         ),
         (
-            "folder_two – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Select or create a template folder_two",
+            "Select or create a template",
             [{"template_type": "sms"}],
             {"template_folder_id": FOLDER_TWO_ID, "template_type": "sms"},
             ["All", "Email"],
@@ -290,8 +290,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             "This folder is empty",
         ),
         (
-            "folder_two – Select or create a template – service one – Notify.gov",
+            "Select or create a template – service one – Notify.gov",
-            "Select or create a template folder_two",
+            "Select or create a template",
             [{"template_type": "all"}],
             {"template_folder_id": FOLDER_TWO_ID, "template_type": "all"},
             ["Email", "Text message"],
@@ -346,13 +346,13 @@ def test_should_show_templates_folder_page(
         **extra_args,
     )
 
-
     assert normalize_spaces(page.select_one("title").text) == expected_page_title
     assert normalize_spaces(page.select_one("h1").text) == expected_title_tag
 
-    assert len(page.select("h2 a")) == len(expected_parent_link_args)
+    # remove this line if you don't want the breadcrumb on the first page
+    assert len(page.select("nav#breadcrumb-template-folders a")) == len(expected_parent_link_args)
 
-    for index, parent_link in enumerate(page.select("h2 a")):
+    for index, parent_link in enumerate(page.select("nav#breadcrumb-template-folders a")):
         assert parent_link["href"] == url_for(
             "main.choose_template",
             service_id=SERVICE_ONE_ID,
@@ -530,7 +530,7 @@ def test_get_manage_folder_page(
         _test_page_title=False,
     )
     assert normalize_spaces(page.select_one("title").text) == (
-        "folder_two – Select or create a template – service one – Notify.gov"
+        "Select or create a template – service one – Notify.gov"
     )
     assert page.select_one("input[name=name]")["value"] == "folder_two"
     delete_link = page.find("a", string="Delete this folder")
@@ -572,7 +572,7 @@ def test_get_manage_folder_viewing_permissions_for_users(
         _test_page_title=False,
     )
     assert normalize_spaces(page.select_one("title").text) == (
-        "folder_two – Select or create a template – service one – Notify.gov"
+        "Select or create a template – service one – Notify.gov"
     )
     form_labels = page.select("legend.usa-legend")
     assert (
@@ -635,7 +635,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_when_no_man
         _test_page_title=False,
     )
     assert normalize_spaces(page.select_one("title").text) == (
-        "folder_two – Select or create a template – service one – Notify.gov"
+        "Select or create a template – service one – Notify.gov"
     )
     form_labels = page.select("legend[class=form-label]")
     assert len(form_labels) == 0
@@ -672,7 +672,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_for_service
         _test_page_title=False,
     )
     assert normalize_spaces(page.select_one("title").text) == (
-        "folder_two – Select or create a template – service one – Notify.gov"
+        "Select or create a template – service one – Notify.gov"
     )
     form_labels = page.select("legend[class=form-label]")
     assert len(form_labels) == 0
@@ -1161,7 +1161,7 @@ def test_should_show_radios_and_buttons_for_move_destination_if_correct_permissi
         FOLDER_TWO_ID,
     ]
     assert [x.text.strip() for x in radio_div.select("label")] == [
-        "Select or create a template",
+        "Templates",
         "folder_one",
         "folder_one_one",
         "folder_one_two",

tests/app/main/views/test_templates.py

@@ -581,9 +581,9 @@ def test_should_be_able_to_view_a_template_with_links(
         _test_page_title=False,
     )
 
-    assert normalize_spaces(page.select_one("h1").text) == ("Review your message")
+    assert normalize_spaces(page.select_one("h1").text) == ("Confirm your template")
     assert normalize_spaces(page.select_one("title").text) == (
-        "Two week reminder – Select or create a template – service one – Notify.gov"
+        "Confirm your template – service one – Notify.gov"
     )
 
     assert [