diff --git a/app/templates/components/service_nav.html b/app/templates/components/service_nav.html index 93d92bbe3..f3354c210 100644 --- a/app/templates/components/service_nav.html +++ b/app/templates/components/service_nav.html @@ -9,7 +9,7 @@ {{ current_service.name }} {% if not current_service.active %} - Suspended + Archived {% endif %} Switch service diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index a21ad931b..b2bceefad 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -338,7 +338,7 @@ {% if (not current_service.active) and current_user.platform_admin %}

- Service suspended + Service archived
diff --git a/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png index 2f4361ff3..4a3ddddb3 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png index 613da5e12..19e1202af 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png index 6ca982add..ab0d12901 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Data_Retention_Add_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Data_Retention_Add_0_document_0_desktop.png index 0933932c1..6b7506f8b 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Data_Retention_Add_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Data_Retention_Add_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Invite_Org_User_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Invite_Org_User_0_document_0_desktop.png new file mode 100644 index 000000000..1c16c049b Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Invite_Org_User_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Organization_Dashboard_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Organization_Dashboard_0_document_0_desktop.png new file mode 100644 index 000000000..8e18e97e3 Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Organization_Dashboard_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Organization_Team_Members_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Organization_Team_Members_0_document_0_desktop.png new file mode 100644 index 000000000..af2210db6 Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Organization_Team_Members_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Organization_Usage_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Organization_Usage_0_document_0_desktop.png new file mode 100644 index 000000000..45a91ef33 Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Organization_Usage_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Organizations_List_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Organizations_List_0_document_0_desktop.png index 637336d6c..be8f7af42 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Organizations_List_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Organizations_List_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png index ad9005c8c..34a951451 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Trial_Services_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Trial_Services_0_document_0_desktop.png index 82973e3bb..2089d032a 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Trial_Services_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Trial_Services_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_SMS_Prefix_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_SMS_Prefix_0_document_0_desktop.png index 268ba818d..99fa1c35a 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_SMS_Prefix_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_SMS_Prefix_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Service_Template_Usage_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Service_Template_Usage_0_document_0_desktop.png index 84ee15d1f..e87d4b897 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Service_Template_Usage_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Service_Template_Usage_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Service_Usage_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Service_Usage_0_document_0_desktop.png index 181b78a0f..825f6aa4b 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Service_Usage_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Service_Usage_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Set_Template_Letter_Sender_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Set_Template_Letter_Sender_0_document_0_desktop.png index dd8764c5d..74fa7da2f 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Set_Template_Letter_Sender_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Set_Template_Letter_Sender_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Switch_Count_as_Live_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Switch_Count_as_Live_0_document_0_desktop.png index 7db2e57ac..8d67c4556 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Switch_Count_as_Live_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Switch_Count_as_Live_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Switch_Service_Live_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Switch_Service_Live_0_document_0_desktop.png index 009235c26..d6e22daf4 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Switch_Service_Live_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Switch_Service_Live_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_Template_Copy_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Template_Copy_0_document_0_desktop.png index 9abce03c0..7a0888fe2 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_Template_Copy_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Template_Copy_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_User_Profile_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_User_Profile_0_document_0_desktop.png index 87b7eb5d7..3fae0f37a 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_User_Profile_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_User_Profile_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Email_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Email_0_document_0_desktop.png index 481460379..beb4b5536 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Email_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Email_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Mobile_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Mobile_0_document_0_desktop.png index 216cae055..f478a6af8 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Mobile_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Mobile_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Name_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Name_0_document_0_desktop.png index 0a6366a98..c59795e19 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Name_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Name_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Password_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Password_0_document_0_desktop.png index b101e978f..a3f116b2b 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Password_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Password_0_document_0_desktop.png differ diff --git a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Timezone_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Timezone_0_document_0_desktop.png index 377530526..dacdb7cff 100644 Binary files a/backstop_data/bitmaps_reference/backstop_test_User_Profile_Timezone_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_User_Profile_Timezone_0_document_0_desktop.png differ diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index a474c5eaf..50a0a2948 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -1431,7 +1431,7 @@ def test_breadcrumb_shows_if_service_is_suspended( page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) - assert "Suspended" in page.select_one(".navigation-service-name").text + assert "Archived" in page.select_one(".navigation-service-name").text @pytest.mark.parametrize( diff --git a/urls.js b/urls.js index ee5ec8d97..3dc17f76b 100644 --- a/urls.js +++ b/urls.js @@ -3,10 +3,12 @@ const baseUrl = process.env.BACKSTOP_BASE_URL || 'http://localhost:6012'; const TEST_SERVICE_ID = 'da14b8fa-6a9e-4320-8484-9cd6e900c333'; const TEST_TEMPLATE_ID = '31588995-646b-40ae-bed1-617612d9245e'; const TEST_USER_ID = '6af522d0-2915-4e52-83a3-3690455a5fe6'; +const TEST_ORG_ID = 'a134fb9b-ab87-4e76-b216-77cb66a6ee18'; const servicePath = (path = '') => `/services/${TEST_SERVICE_ID}${path}`; const userPath = (path = '') => `/user-profile${path}`; const platformAdminPath = (path = '') => `/platform-admin${path}`; +const orgPath = (path = '') => `/organizations/${TEST_ORG_ID}${path}`; const routes = { public: [ @@ -89,6 +91,10 @@ const routes = { organizations: [ { label: 'Organizations List', path: '/organizations' }, { label: 'Add Organization', path: '/organizations/add' }, + { label: 'Organization Dashboard', path: orgPath() }, + { label: 'Organization Usage', path: orgPath('/usage') }, + { label: 'Organization Team Members', path: orgPath('/users') }, + { label: 'Invite Org User', path: orgPath('/users/invite') }, ], platformAdmin: [