Merge pull request #2987 from GSA/fix-retention-days-display

Fix "Data available for X days" text disappearing on job details page

app/main/views/jobs.py

@@ -77,6 +77,11 @@ def view_job(service_id, job_id):
         counts=_get_job_counts(job),
         notifications=notifications,
         more_than_one_page=more_than_one_page,
+        uploaded_file_name=job.original_file_name,
+        time_left=get_time_left(job.created_at),
+        service_data_retention_days=current_service.get_days_of_retention(
+            job.template_type, number_of_days="seven_day"
+        ),
         download_link=(
             url_for(
                 ".view_job_csv",

app/templates/partials/jobs/notifications.html

@@ -30,9 +30,8 @@
         </p>
       {% elif notifications  and time_left != "Data no longer available" %}
         <p class="margin-bottom-3">
-          <a href="{{ download_link }}" download class="usa-link font-heading-md">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
+          <a href="{{ download_link }}" download class="usa-link">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
-          &emsp;
+          <span id="time-left" class="margin-left-2">{{ time_left }}</span>
-          <span id="time-left">{{ time_left }}</span>
         </p>
       {% endif %}
 

tests/app/main/views/test_jobs.py

@@ -117,6 +117,7 @@ def test_get_jobs_should_tell_user_if_more_than_one_page(
     service_one,
     mock_get_job,
     mock_get_service_template,
+    mock_get_service_data_retention,
 ):
     page = client_request.get(
         "main.view_job",
@@ -133,6 +134,7 @@ def test_should_show_job_in_progress(
     mock_get_service_template,
     mock_get_job_in_progress,
     fake_uuid,
+    mock_get_service_data_retention,
 ):
     page = client_request.get(
         "main.view_job",
@@ -149,6 +151,7 @@ def test_should_show_job_without_notifications(
     mock_get_service_template,
     mock_get_job_in_progress,
     fake_uuid,
+    mock_get_service_data_retention,
 ):
     page = client_request.get(
         "main.view_job",
@@ -164,6 +167,7 @@ def test_should_show_job_with_sending_limit_exceeded_status(
     mock_get_service_template,
     mock_get_job_with_sending_limits_exceeded,
     fake_uuid,
+    mock_get_service_data_retention,
 ):
     page = client_request.get(
         "main.view_job",
@@ -224,6 +228,7 @@ def test_should_show_old_job(
     processing_started,
     expected_message,
     active_user_with_permissions,
+    mock_get_service_data_retention,
 ):
     mocker.patch(
         "app.job_api_client.get_job",
@@ -254,6 +259,7 @@ def test_should_show_scheduled_job(
     mock_get_service_template,
     mock_get_scheduled_job,
     fake_uuid,
+    mock_get_service_data_retention,
 ):
     page = client_request.get(
         "main.view_job",