From 82318387dede431a38fdd9e95497cadbedb90f33 Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Wed, 24 Feb 2021 14:34:56 +0000
Subject: [PATCH] Add hidden text for pills on job page

The links in the blue boxes on the job page needed hidden text so that
they work out of context. This changes the text from "10 sending" to "10
sending text messages" (with the message type hidden text).
---
 app/main/views/jobs.py             | 19 ++++++++++++++-----
 app/templates/components/pill.html |  2 +-
 tests/app/main/views/test_jobs.py  |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 393ab813e..5d60ba998 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -29,7 +29,7 @@ from app import (
     notification_api_client,
     service_api_client,
 )
-from app.formatters import get_time_left
+from app.formatters import get_time_left, message_count_noun
 from app.main import main
 from app.main.forms import SearchNotificationsForm
 from app.models.job import Job
@@ -336,6 +336,7 @@ def get_status_filters(service, message_type, statistics):
 
 
 def _get_job_counts(job):
+    job_type = job.template_type
     return [
         (
             label,
@@ -349,19 +350,27 @@ def _get_job_counts(job):
             count
         ) for label, query_param, count in [
             [
-                'total', '',
+                f'''total<span class="govuk-visually-hidden">
+                 {message_count_noun(job.notification_count, job_type)}</span>''',
+                '',
                 job.notification_count
             ],
             [
-                'sending', 'sending',
+                f'''sending<span class="govuk-visually-hidden">
+                 {message_count_noun(job.notifications_sending, job_type)}</span>''',
+                'sending',
                 job.notifications_sending
             ],
             [
-                'delivered', 'delivered',
+                f'''delivered<span class="govuk-visually-hidden">
+                 {message_count_noun(job.notifications_delivered, job_type)}</span>''',
+                'delivered',
                 job.notifications_delivered
             ],
             [
-                'failed', 'failed',
+                f'''failed<span class="govuk-visually-hidden">
+                 {message_count_noun(job.notifications_failed, job_type)}</span>''',
+                'failed',
                 job.notifications_failed
             ]
         ]
diff --git a/app/templates/components/pill.html b/app/templates/components/pill.html
index 7024fc494..a07d0e8e0 100644
--- a/app/templates/components/pill.html
+++ b/app/templates/components/pill.html
@@ -18,7 +18,7 @@
           {% if show_count %}
             {{ big_number(count, **big_number_args) }}
           {% endif %}
-            <div class="pill-item__label{% if not show_count %} pill-item--centered{% endif %}">{{ label }}</div>
+            <div class="pill-item__label{% if not show_count %} pill-item--centered{% endif %}">{{ label | safe }}</div>
           </a>
         </li>
       {% endfor %}
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index 44a0e945c..4f9a420b5 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -190,7 +190,7 @@ def test_should_show_job_in_progress(
         normalize_spaces(link.text)
         for link in page.select('.pill a:not(.pill-item--selected)')
     ] == [
-        '10 sending', '0 delivered', '0 failed'
+        '10 sending text messages', '0 delivered text messages', '0 failed text messages'
     ]
     assert page.select_one('p.hint').text.strip() == 'Report is 50% complete…'
 
@@ -215,7 +215,7 @@ def test_should_show_job_without_notifications(
         normalize_spaces(link.text)
         for link in page.select('.pill a:not(.pill-item--selected)')
     ] == [
-        '10 sending', '0 delivered', '0 failed'
+        '10 sending text messages', '0 delivered text messages', '0 failed text messages'
     ]
     assert page.select_one('p.hint').text.strip() == 'Report is 50% complete…'
     assert page.select_one('tbody').text.strip() == 'No messages to show yet…'