From 2ab7244beb622e682f2c364fafde487d3f21a1cd Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 21 Jan 2025 10:46:30 -0800
Subject: [PATCH] fix test and arrival session

---
 app/main/views/jobs.py                  |  2 +-
 app/templates/partials/jobs/status.html | 34 ++++++++++++++-----------
 app/templates/views/jobs/job.html       | 12 +++++++++
 tests/app/main/views/test_jobs.py       |  2 +-
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index d7a1d9bf4..bb95f630e 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -401,7 +401,7 @@ def get_job_partials(job):
     )
 
     if request.referrer is not None:
-        session["arrived_from_preview_page"] = "check" in request.referrer
+        session["arrived_from_preview_page"] = ("check" in request.referrer) or ("help=0" in request.referrer)
     else:
         session["arrived_from_preview_page"] = False
 
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index 41beb1cde..0f3288813 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -1,5 +1,3 @@
-{% from "components/ajax-block.html" import ajax_block %}
-
 {% set display_message_status %}
 {% if job.template.content %}
   <h2 class="sms-message-header">Message</h2>
@@ -10,7 +8,7 @@
   <div>
     <ul class="usa-icon-list">
       <li class="usa-icon-list__item">
-        <img src="{{asset_url('img/material-icons/description.svg')}}" alt="">
+        <img src="{{ url_for('static', filename='img/material-icons/description.svg') }}" alt="">
         <div class="usa-icon-list__content">
           <h3>{{ job.original_file_name }}</h3>
         </div>
@@ -20,9 +18,10 @@
 {% endif %}
 <h2>Delivery Status</h2>
 {% endset %}
+
 <div class="ajax-block-container">
   <p class='bottom-gutter'>
-    {% if not job.finished_processing or arrived_from_preview_page_url %}
+    {% if not job.finished_processing %}
       {% if job.scheduled_for %}
         <div class="usa-alert usa-alert--info">
           <div class="usa-alert__body">
@@ -34,23 +33,15 @@
         </div>
         {{display_message_status}}
       {% else %}
-        {% if job.finished_processing or job.processing_started %}
+        {% if job.processing_started %}
           <div class="usa-alert usa-alert--success">
             <div class="usa-alert__body">
               <h2 class="usa-alert__heading">
-                {% if job.finished_processing %}
-                  Your message has been sent
-                {% else %}
-                  Your message is sending
-                {% endif %}
+                Your message is sending
               </h2>
               <p class="usa-alert__text">
                 {{ job.template_name }} - {{ current_service.name }}
-                {% if job.finished_processing %}
-                  was sent on {{job.processing_started|format_datetime_normal}}
-                {% else %}
-                  has been sending since {{job.processing_started| format_datetime_normal}}
-                {% endif %} by {{ job.created_by.name }}
+                has been sending since {{job.processing_started| format_datetime_normal}} by {{ job.created_by.name }}
               </p>
             </div>
           </div>
@@ -69,6 +60,19 @@
         {% endif %}
         {{display_message_status}}
       {% endif %}
+    {% elif arrived_from_preview_page_url %}
+      <div class="usa-alert usa-alert--success">
+        <div class="usa-alert__body">
+          <h2 class="usa-alert__heading">
+              Your message has been sent
+          </h2>
+          <p class="usa-alert__text">
+            {{ job.template_name }} - {{ current_service.name }}
+              was sent on {{job.processing_started|format_datetime_normal}} by {{ job.created_by.name }}
+          </p>
+        </div>
+      </div>
+      {{display_message_status}}
     {% endif %}
   </p>
   {% if job.status == 'sending limits exceeded'%}
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index 4c8a7d1fc..1643715f4 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -11,6 +11,18 @@
 {% block maincolumn_content %}
 
     {{ page_header("Message status") }}
+    {% if not job.processing_finished %}
+      <div
+        data-module="update-content"
+        data-resource="{{ updates_url }}"
+        data-key="status"
+        data-form=""
+      >
+    {% endif %}
+      {{ partials['status']|safe }}
+    {% if not job.processing_finished  %}
+      </div>
+    {% endif %}
     {% if not finished %}
       <div
         data-module="update-content"
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index ab09f7ecd..a32480983 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -269,7 +269,7 @@ def test_should_show_job_with_sending_limit_exceeded_status(
         pytest.param(
             datetime(2020, 1, 1, 0, 0, 0),
             datetime(2020, 1, 9, 6, 0, 1),
-            ("No messages to show yet…"),
+            ("These messages have been deleted because they were sent more than 7 days ago"),
         ),
         # Created a while ago, started exactly 24h ago
         # ---