From 3e7a4f78f3e9e32f393638941c955638db189f8b Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 12 Oct 2023 10:21:11 -0400 Subject: [PATCH 1/5] Committing before merge --- app/main/views/index.py | 20 ++++++------- app/navigation.py | 2 ++ app/templates/admin_template.html | 7 ++++- app/templates/service_navigation.html | 2 +- .../views/dashboard/write-first-messages.html | 4 +-- app/templates/views/user-profile.html | 6 ++-- app/templates/withoutnav_template.html | 4 +-- .../views/accounts/test_choose_accounts.py | 30 ++++++++++--------- tests/app/main/views/test_user_profile.py | 6 ++-- 9 files changed, 45 insertions(+), 36 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index 9ad92a2857..5c13835f7b 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -227,7 +227,7 @@ def terms(): ) -@main.route("/features/using-notify") +@main.route("/features/using_notify") @user_is_logged_in def using_notify(): return ( @@ -236,7 +236,7 @@ def using_notify(): ) -@main.route("/using-notify/delivery-status") +@main.route("/using_notify/delivery-status") @user_is_logged_in def message_status(): return render_template( @@ -251,7 +251,7 @@ def get_started_old(): return redirect(url_for(".get_started"), 301) -@main.route("/using-notify/get-started") +@main.route("/using_notify/get-started") @user_is_logged_in def get_started(): return render_template( @@ -260,7 +260,7 @@ def get_started(): ) -@main.route("/using-notify/who-its-for") +@main.route("/using_notify/who-its-for") def who_its_for(): return redirect(url_for(".features"), 301) @@ -271,7 +271,7 @@ def trial_mode(): return redirect(url_for(".trial_mode_new"), 301) -@main.route("/using-notify/trial-mode") +@main.route("/using_notify/trial-mode") def trial_mode_new(): return render_template( "views/trial-mode.html", @@ -279,7 +279,7 @@ def trial_mode_new(): ) -@main.route("/using-notify/guidance") +@main.route("/using_notify/guidance") @user_is_logged_in def guidance_index(): return render_template( @@ -288,7 +288,7 @@ def guidance_index(): ) -@main.route("/using-notify/guidance/branding-and-customisation") +@main.route("/using_notify/guidance/branding-and-customisation") @user_is_logged_in def branding_and_customisation(): return render_template( @@ -297,7 +297,7 @@ def branding_and_customisation(): ) -@main.route("/using-notify/guidance/create-and-send-messages") +@main.route("/using_notify/guidance/create-and-send-messages") @user_is_logged_in def create_and_send_messages(): return render_template( @@ -306,7 +306,7 @@ def create_and_send_messages(): ) -@main.route("/using-notify/guidance/edit-and-format-messages") +@main.route("/using_notify/guidance/edit-and-format-messages") @user_is_logged_in def edit_and_format_messages(): return render_template( @@ -315,7 +315,7 @@ def edit_and_format_messages(): ) -@main.route("/using-notify/guidance/send-files-by-email") +@main.route("/using_notify/guidance/send-files-by-email") @user_is_logged_in def send_files_by_email(): return render_template( diff --git a/app/navigation.py b/app/navigation.py index 8fb06f7f58..a7317f4997 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -61,6 +61,8 @@ class HeaderNavigation(Navigation): "message_status", "guidance_index", }, + "accounts-or-dashboard": { + }, "pricing": { "how_to_pay", "billing_details", diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 5e37462625..eb3bb6613d 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -75,6 +75,11 @@ ] %} {% else %} {% set navigation = [ + { + "href": url_for("main.show_accounts_or_dashboard"), + "text": "Current Service", + "active": header_navigation.is_selected('accounts-or-dashboard') + }, { "href": url_for('main.get_started'), "text": "Using Notify", @@ -92,7 +97,7 @@ }, { "href": url_for('main.user_profile'), - "text": current_user.name, + "text": "User Profile", "active": header_navigation.is_selected('user-profile') }, { diff --git a/app/templates/service_navigation.html b/app/templates/service_navigation.html index 28f26fda79..4cd23f252f 100644 --- a/app/templates/service_navigation.html +++ b/app/templates/service_navigation.html @@ -7,7 +7,7 @@ {% endmacro %} -
+
{% if current_service.organization_id %} {% if current_user.platform_admin or (current_user.belongs_to_organization(current_service.organization_id) and current_service.live) %} diff --git a/app/templates/views/dashboard/write-first-messages.html b/app/templates/views/dashboard/write-first-messages.html index a588d2b40b..2d2e30e75b 100644 --- a/app/templates/views/dashboard/write-first-messages.html +++ b/app/templates/views/dashboard/write-first-messages.html @@ -1,4 +1,4 @@ -

Get started

- +

Get started

+ Create your first template diff --git a/app/templates/views/user-profile.html b/app/templates/views/user-profile.html index b12be10193..5eabb8ff57 100644 --- a/app/templates/views/user-profile.html +++ b/app/templates/views/user-profile.html @@ -3,16 +3,16 @@ {% from "components/table.html" import mapping_table, row, text_field, optional_text_field, edit_field, field, boolean_field with context %} {% block per_page_title %} - Your profile + User profile {% endblock %} {% block maincolumn_content %} -

Your profile

+

User profile

{% call mapping_table( - caption='Your profile', + caption='User profile', field_headings_visible=False, caption_visible=False ) %} diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html index 7836106b0b..d315890861 100644 --- a/app/templates/withoutnav_template.html +++ b/app/templates/withoutnav_template.html @@ -4,9 +4,9 @@ {% block beforeContent %} {% if current_service and current_service.active and current_user.is_authenticated and current_user.belongs_to_service(current_service.id) %} -
+ {% endif %} {% block backLink %}{% endblock %} {% endblock %} diff --git a/tests/app/main/views/accounts/test_choose_accounts.py b/tests/app/main/views/accounts/test_choose_accounts.py index 6976b3aeaa..eb66479823 100644 --- a/tests/app/main/views/accounts/test_choose_accounts.py +++ b/tests/app/main/views/accounts/test_choose_accounts.py @@ -256,21 +256,23 @@ def test_choose_account_should_should_organizations_link_for_platform_admin( ] == expected_headings -def test_choose_account_should_show_back_to_service_link( - client_request, - mock_get_orgs_and_services, - mock_get_organization, - mock_get_organization_services, -): - resp = client_request.get("main.choose_account") +# Moving the back to service link into the top navigation - service_navigation = resp.find( - "div", {"class": "navigation-service usa-breadcrumb"} - ) - back_to_service_link = service_navigation.a +# def test_choose_account_should_show_back_to_service_link( +# client_request, +# mock_get_orgs_and_services, +# mock_get_organization, +# mock_get_organization_services, +# ): +# resp = client_request.get("main.choose_account") - assert back_to_service_link["href"] == url_for("main.show_accounts_or_dashboard") - assert back_to_service_link.text == "Back to service one" +# service_navigation = resp.find( +# "div", {"class": "navigation-service usa-breadcrumb"} +# ) +# back_to_service_link = service_navigation.a + +# assert back_to_service_link["href"] == url_for("main.show_accounts_or_dashboard") +# assert back_to_service_link.text == "Back to service one" def test_choose_account_should_not_show_back_to_service_link_if_no_service_in_session( @@ -322,7 +324,7 @@ def test_choose_account_should_not_show_back_to_service_link_if_service_archived assert normalize_spaces(page.select_one("h1").text) == "Choose service" if active: - assert page.select_one(".navigation-service a") is not None + assert page.select_one(".navigation-service a") is None else: assert page.select_one(".navigation-service a") is None diff --git a/tests/app/main/views/test_user_profile.py b/tests/app/main/views/test_user_profile.py index 9b171a173f..047e52cf94 100644 --- a/tests/app/main/views/test_user_profile.py +++ b/tests/app/main/views/test_user_profile.py @@ -17,7 +17,7 @@ def test_should_show_overview_page( client_request, ): page = client_request.get("main.user_profile") - assert page.select_one("h1").text.strip() == "Your profile" + assert page.select_one("h1").text.strip() == "User profile" assert "Use platform admin view" not in page assert "Security keys" not in page @@ -27,7 +27,7 @@ def test_overview_page_shows_disable_for_platform_admin( ): client_request.login(platform_admin_user) page = client_request.get("main.user_profile") - assert page.select_one("h1").text.strip() == "Your profile" + assert page.select_one("h1").text.strip() == "User profile" disable_platform_admin_row = page.select_one("#disable-platform-admin") assert ( " ".join(disable_platform_admin_row.text.split()) @@ -365,7 +365,7 @@ def test_non_gov_user_cannot_see_change_email_link( client_request.login(api_nongov_user_active) page = client_request.get("main.user_profile") assert not page.find("a", {"href": url_for("main.user_profile_email")}) - assert page.select_one("h1").text.strip() == "Your profile" + assert page.select_one("h1").text.strip() == "User profile" def test_non_gov_user_cannot_access_change_email_page( From 3106b85e088d5847063bec2c2aaedaa271da1c5d Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 12 Oct 2023 13:40:41 -0400 Subject: [PATCH 2/5] - Updated navigation file to show active atate in top nav - Changing route back to - instead of _ so it won't break tests, also it was a mistake --- app/navigation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/navigation.py b/app/navigation.py index a7317f4997..abfae91579 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -62,6 +62,7 @@ class HeaderNavigation(Navigation): "guidance_index", }, "accounts-or-dashboard": { + "usage", }, "pricing": { "how_to_pay", From 167023c7a729966fa7e93356bb41bc79e1e4e608 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 12 Oct 2023 13:52:03 -0400 Subject: [PATCH 3/5] - Updated nav to allow for the active state throughout Service sub-nav - Fixed test for using-notify broken link --- app/main/views/index.py | 18 +++++----- app/navigation.py | 73 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 9 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index 5c13835f7b..30818db998 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -236,7 +236,7 @@ def using_notify(): ) -@main.route("/using_notify/delivery-status") +@main.route("/using-notify/delivery-status") @user_is_logged_in def message_status(): return render_template( @@ -251,7 +251,7 @@ def get_started_old(): return redirect(url_for(".get_started"), 301) -@main.route("/using_notify/get-started") +@main.route("/using-notify/get-started") @user_is_logged_in def get_started(): return render_template( @@ -260,7 +260,7 @@ def get_started(): ) -@main.route("/using_notify/who-its-for") +@main.route("/using-notify/who-its-for") def who_its_for(): return redirect(url_for(".features"), 301) @@ -271,7 +271,7 @@ def trial_mode(): return redirect(url_for(".trial_mode_new"), 301) -@main.route("/using_notify/trial-mode") +@main.route("/using-notify/trial-mode") def trial_mode_new(): return render_template( "views/trial-mode.html", @@ -279,7 +279,7 @@ def trial_mode_new(): ) -@main.route("/using_notify/guidance") +@main.route("/using-notify/guidance") @user_is_logged_in def guidance_index(): return render_template( @@ -288,7 +288,7 @@ def guidance_index(): ) -@main.route("/using_notify/guidance/branding-and-customisation") +@main.route("/using-notify/guidance/branding-and-customisation") @user_is_logged_in def branding_and_customisation(): return render_template( @@ -297,7 +297,7 @@ def branding_and_customisation(): ) -@main.route("/using_notify/guidance/create-and-send-messages") +@main.route("/using-notify/guidance/create-and-send-messages") @user_is_logged_in def create_and_send_messages(): return render_template( @@ -306,7 +306,7 @@ def create_and_send_messages(): ) -@main.route("/using_notify/guidance/edit-and-format-messages") +@main.route("/using-notify/guidance/edit-and-format-messages") @user_is_logged_in def edit_and_format_messages(): return render_template( @@ -315,7 +315,7 @@ def edit_and_format_messages(): ) -@main.route("/using_notify/guidance/send-files-by-email") +@main.route("/using-notify/guidance/send-files-by-email") @user_is_logged_in def send_files_by_email(): return render_template( diff --git a/app/navigation.py b/app/navigation.py index abfae91579..b96750dc9a 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -62,7 +62,80 @@ class HeaderNavigation(Navigation): "guidance_index", }, "accounts-or-dashboard": { + "conversation", + "inbox", + "monthly", + "service_dashboard", + "template_usage", + "view_notification", + "view_notifications", + "action_blocked", + "add_service_template", + "check_messages", + "check_notification", + "choose_template", + "choose_template_to_copy", + "confirm_redact_template", + "conversation_reply", + "copy_template", + "delete_service_template", + "edit_service_template", + "manage_template_folder", + "send_messages", + "send_one_off", + "send_one_off_step", + "send_one_off_to_myself", + "set_sender", + "set_template_sender", + "view_template", + "view_template_version", + "view_template_versions", + "uploads", + "view_job", + "view_jobs", + "confirm_edit_user_email", + "confirm_edit_user_mobile_number", + "edit_user_email", + "edit_user_mobile_number", + "edit_user_permissions", + "invite_user", + "manage_users", + "remove_user_from_service", "usage", + "email_branding_govuk", + "email_branding_govuk_and_org", + "email_branding_organization", + "email_branding_request", + "email_branding_something_else", + "estimate_usage", + "link_service_to_organization", + "request_to_go_live", + "service_add_email_reply_to", + "service_add_sms_sender", + "service_confirm_delete_email_reply_to", + "service_confirm_delete_sms_sender", + "service_edit_email_reply_to", + "service_edit_sms_sender", + "service_email_reply_to", + "service_name_change", + "service_preview_email_branding", + "service_set_auth_type", + "service_set_channel", + "send_files_by_email_contact_details", + "service_set_email_branding", + "service_set_inbound_number", + "service_set_inbound_sms", + "service_set_international_sms", + "service_set_reply_to_email", + "service_set_sms_prefix", + "service_verify_reply_to_address", + "service_verify_reply_to_address_updates", + "service_settings", + "service_sms_senders", + "set_free_sms_allowance", + "set_message_limit", + "set_rate_limit", + "submit_request_to_go_live", }, "pricing": { "how_to_pay", From a34ab8c9723e57925a22fb1ba85f0ffac1c63b5d Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 12 Oct 2023 15:16:03 -0400 Subject: [PATCH 4/5] Adding nav item for platform admin as well --- app/templates/admin_template.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 35543f3a19..5e31451caf 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -43,6 +43,11 @@ {% if current_user.is_authenticated %} {% if current_user.platform_admin %} {% set navigation = [ + { + "href": url_for("main.show_accounts_or_dashboard"), + "text": "Current Service", + "active": header_navigation.is_selected('accounts-or-dashboard') + }, { "href": url_for('main.get_started'), "text": "Using Notify", From 195af626c632a0449a110470034e3064e1bde75a Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Fri, 13 Oct 2023 12:26:25 -0400 Subject: [PATCH 5/5] Slight change from caps to lowercase --- app/templates/admin_template.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 5e31451caf..2709582e4a 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -45,7 +45,7 @@ {% set navigation = [ { "href": url_for("main.show_accounts_or_dashboard"), - "text": "Current Service", + "text": "Current service", "active": header_navigation.is_selected('accounts-or-dashboard') }, { @@ -82,7 +82,7 @@ {% set navigation = [ { "href": url_for("main.show_accounts_or_dashboard"), - "text": "Current Service", + "text": "Current service", "active": header_navigation.is_selected('accounts-or-dashboard') }, { @@ -102,7 +102,7 @@ }, { "href": url_for('main.user_profile'), - "text": "User Profile", + "text": "User profile", "active": header_navigation.is_selected('user-profile') }, {