darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-08 22:23:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3863 from alphagov/show-suspended

Browse Source 
Show service suspension in breadcrumb
This commit is contained in:
Ben Thorner
2021-04-28 14:59:56 +01:00
committed by GitHub
parent c7840496d3 b43eb3a591
commit bfc55b45ca
3 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/components/navigation.scss
View File

@@ -34,6 +34,12 @@
box-shadow: 0 -3px 0 0 $grey-3; box-shadow: 0 -3px 0 0 $grey-3;
} }
&--suspended {
background: $grey-3;
color: mix($grey-1, $text-colour);
box-shadow: 0 -3px 0 0 $grey-3;
}
&--live { &--live {
// This uses new Design System colours to match .govuk-tag--red // This uses new Design System colours to match .govuk-tag--red
background: #F6D7D2; background: #F6D7D2;

22
app/templates/withnav_template.html
View File

@@ -17,16 +17,18 @@
{% endif %} {% endif %}
<div class="navigation-service-name govuk-!-font-weight-bold"> <div class="navigation-service-name govuk-!-font-weight-bold">
{{ current_service.name }} {{ current_service.name }}
{% if current_service.has_permission('broadcast') %} {% if not current_service.active %}
{% if current_service.trial_mode %} <span class="navigation-service-type navigation-service-type--suspended">Suspended</span>
<span class="navigation-service-type navigation-service-type--training">Training {% elif current_service.has_permission('broadcast') %}
{% else %} {% if current_service.trial_mode %}
<span class="navigation-service-type navigation-service-type--live">Live <span class="navigation-service-type navigation-service-type--training">Training
{% endif %} {% else %}
{% if current_service.allowed_broadcast_provider %} <span class="navigation-service-type navigation-service-type--live">Live
({{ current_service.allowed_broadcast_provider }}) {% endif %}
{% endif %} {% if current_service.allowed_broadcast_provider %}
</span> ({{ current_service.allowed_broadcast_provider }})
{% endif %}
</span>
{% endif %} {% endif %}
</div> </div>
<a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a> <a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>

23
tests/app/main/views/test_dashboard.py
View File

@@ -1713,6 +1713,29 @@ def test_org_breadcrumbs_show_if_user_is_platform_admin(
) )
def test_breadcrumb_shows_if_service_is_suspended(
mocker,
mock_get_template_statistics,
mock_get_service_templates_when_no_templates_exist,
mock_has_no_jobs,
mock_get_usage,
mock_get_free_sms_fragment_limit,
mock_get_returned_letter_statistics_with_no_returned_letters,
active_user_with_permissions,
client_request,
):
service_one_json = service_json(
SERVICE_ONE_ID,
active=False,
users=[active_user_with_permissions['id']],
)
mocker.patch('app.service_api_client.get_service', return_value={'data': service_one_json})
page = client_request.get('main.service_dashboard', service_id=SERVICE_ONE_ID)
assert 'Suspended' in page.select_one('.navigation-service-name').text
@pytest.mark.parametrize('permissions', ( @pytest.mark.parametrize('permissions', (
['email', 'sms'], ['email', 'sms'],
['email', 'sms', 'letter'], ['email', 'sms', 'letter'],