Merge branch 'main' into sds-in-collection-exercise

ONSdigital · Sep 14, 2023 · f53e97d · f53e97d
2 parents 14cda40 + 516c15e
commit f53e97d
Show file tree

Hide file tree

Showing 9 changed files with 394 additions and 294 deletions.
diff --git a/Pipfile b/Pipfile
@@ -46,7 +46,7 @@ email_validator = "*"
 [dev-packages]
 black = "*"
 flake8 = "*"
-djlint = "==1.25.0"
+djlint = "*"
 fakeredis = "*"
 freezegun = "*"
 isort = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/_infra/helm/response-operations-ui/Chart.yaml b/_infra/helm/response-operations-ui/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 3.1.33
+version: 3.1.34
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 3.1.33
+appVersion: 3.1.34
diff --git a/response_operations_ui/static/css/main.css b/response_operations_ui/static/css/main.css
diff --git a/response_operations_ui/templates/collection_exercise/ce-header-section.html b/response_operations_ui/templates/collection_exercise/ce-header-section.html
@@ -46,7 +46,7 @@ <h1 name="page-ce-title">{{ce.exerciseRef}} Collection Exercise | {{survey.short
                 "term": "Report:" if ce.state|upper == "LIVE",
                 "descriptions": [
                     {
-                        "description": '<a href="' + url_for('collection_exercise_bp.response_chasing', ce_id=ce.id, survey_id=survey.id) + '"><svg class="ons-svg-icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" focusable="false"><path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/><path d="M0 0h24v24H0z" fill="none"/></svg> Download response report</a>' if (ce.state|upper == "LIVE" or ce.state|upper == "ENDED"),
+                        "description": '<a href="' + url_for('collection_exercise_bp.response_chasing', ce_id=ce.id, survey_id=survey.id) + '"><svg class="ons-icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" focusable="false"><path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/><path d="M0 0h24v24H0z" fill="none"/></svg> Download response report</a>' if (ce.state|upper == "LIVE" or ce.state|upper == "ENDED"),
                         "id": "ce_status"
                     }
                 ]

diff --git a/response_operations_ui/templates/messages.html b/response_operations_ui/templates/messages.html
@@ -174,6 +174,11 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                         {% else %}
                             {% set sentDate = 'Unavailable' %}
                         {% endif %}
+                        {% if message.unread %}
+                            {% set subjectLink = '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' %}
+                        {% else %}
+                            {% set subjectLink = '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>' %}
+                        {% endif %}
 
                         {% do surveyTableDataRows.append(
                             {
@@ -192,7 +197,7 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                                         "id": 'business-name-' + loop.index|string
                                     },
                                     {
-                                        "value": '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' if message.unread else '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>',
+                                        "value": subjectLink,
                                         "data": "Subject"
                                     },
                                     {

diff --git a/response_operations_ui/templates/partials/info-box.html b/response_operations_ui/templates/partials/info-box.html
@@ -1,7 +1,7 @@
 {% if info_message %}
     <div id="success" class="ons-panel ons-panel--success ons-panel--no-title ons-u-mb-m">
         <span class="ons-panel__icon ons-u-fs-">
-            <svg class="ons-svg-icon" viewBox="0 0 13 10" xmlns="http://www.w3.org/2000/svg" focusable="false">
+            <svg class="ons-icon" viewBox="0 0 13 10" xmlns="http://www.w3.org/2000/svg" focusable="false">
                 <path d="M14.35,3.9l-.71-.71a.5.5,0,0,0-.71,0h0L5.79,10.34,3.07,7.61a.51.51,0,0,0-.71,0l-.71.71a.51.51,0,0,0,0,.71l3.78,3.78a.5.5,0,0,0,.71,0h0L14.35,4.6A.5.5,0,0,0,14.35,3.9Z" transform="translate(-1.51 -3.04)" />
             </svg>
         </span>

diff --git a/response_operations_ui/templates/secure-message/misc-inbox.html b/response_operations_ui/templates/secure-message/misc-inbox.html
@@ -144,6 +144,11 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                         {% else %}
                             {% set sentDate = 'Unavailable' %}
                         {% endif %}
+                        {% if message.unread %}
+                            {% set subjectLink = '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' %}
+                        {% else %}
+                            {% set subjectLink = '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>' %}
+                        {% endif %}
 
                         {% do surveyTableDataRows.append(
                             {
@@ -162,7 +167,7 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                                         "id": 'email-address-' + loop.index|string
                                     },
                                     {
-                                        "value": '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' if message.unread else '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>',
+                                        "value": subjectLink,
                                         "data": "Subject"
                                     },
                                     {

diff --git a/response_operations_ui/templates/secure-message/technical-inbox.html b/response_operations_ui/templates/secure-message/technical-inbox.html
@@ -144,6 +144,11 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                     {% else %}
                         {% set sentDate = 'Unavailable' %}
                     {% endif %}
+                    {% if message.unread %}
+                        {% set subjectLink = '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' %}
+                    {% else %}
+                        {% set subjectLink = '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>' %}
+                    {% endif %}
 
                     {% do surveyTableDataRows.append(
                         {
@@ -162,7 +167,7 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                                     "id": 'email-address-' + loop.index|string
                                 },
                                 {
-                                    "value": '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' if message.unread else '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>',
+                                    "value": subjectLink,
                                     "data": "Subject"
                                 },
                                 {