From 6c1090ecb277c10a79f05bae099dd7bdfd1c272e Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 26 Mar 2024 16:06:13 -0400 Subject: [PATCH] 1252 - add back blue boxes for pending and delivered --- app/templates/partials/count.html | 48 ++----------------------------- tests/app/main/views/test_jobs.py | 5 ++-- 2 files changed, 5 insertions(+), 48 deletions(-) diff --git a/app/templates/partials/count.html b/app/templates/partials/count.html index 17321d67f..188884cdf 100644 --- a/app/templates/partials/count.html +++ b/app/templates/partials/count.html @@ -1,49 +1,7 @@ {% from "components/pill.html" import pill %}
- {% if notifications_deleted %} -
- {% for label, query_param, url, count in counts %} - {% if query_param == 'pending' %} -
- - - {% if count is number %} - {% if currency %} - {{ "{}{:,.2f}".format(currency, count) }} - {% else %} - {{ "{:,}".format(count) }} - {% endif %} - {% else %} - {{ count }} - {% endif %} - - {{ query_param }} - -
- {% else %} -
- - - {% if count is number %} - {% if currency %} - {{ "{}{:,.2f}".format(currency, count) }} - {% else %} - {{ "{:,}".format(count) }} - {% endif %} - {% else %} - {{ count }} - {% endif %} - - {{ label }} - -
- {% endif %} - {% endfor %} -
- {% else %} -
- {{ pill(counts, request.args.get('status', '')) }} -
- {% endif %} +
+ {{ pill(counts, request.args.get('status', '')) }} +
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index 3076fe88f..cbee48ccc 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -320,15 +320,14 @@ def test_should_show_old_job( service_id=SERVICE_ONE_ID, job_id=fake_uuid, ) - assert not page.select(".pill") assert not page.select("p.hint") assert not page.select("a[download]") assert page.select_one("tbody").text.strip() == expected_message assert [ - normalize_spaces(column.text) for column in page.select("main .grid-col-3") + normalize_spaces(column.text) for column in page.select("main .pill .pill-item") ] == [ "1 total text messages", - "1 pending", + "1 pending text message", "0 delivered text messages", "0 failed text messages", ]