Fix secure message return to inbox (#961)

* Initial commit of fix for return to inbox

* auto patch increment

* Updated code based on comments

* Removed redundent testt

* Temp ignore of vulnerability

* Update gunicorn version

* Have updated the code to return to correct inbox after reassignment

* Updated code and tests based on comments

* Run lint again

* Remove some test code

* Missed 2 old references

* Updated to code and tests based on recommendations and reversion of pipfile lock

* Update gunicorn

* Merge main

* auto patch increment

* Have updated the code based on comments

* Update Ashe to ASHE in tests"

* Update the URLs

---------

Co-authored-by: ras-rm-pr-bot <[email protected]>

_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.84
+version: 3.1.85
 
 # 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.84
+appVersion: 3.1.85

response_operations_ui/templates/conversation-view/cv-back-link.html

@@ -1 +1,4 @@
+{% if thread_data.category != 'SURVEY' %}
+  {% set selected_survey = '' %}
+{% endif %}
 <a href="{{ url_for('messages_bp.view_selected_survey', selected_survey=selected_survey, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) }}" class="ons-u-mb-s" id="back-link">Return to messages</a>

response_operations_ui/views/messages.py

@@ -132,7 +132,7 @@ def view_conversation(thread_id):
                 )
             else:
                 message_controllers.send_message(_get_message_json(form, thread_id=refined_thread[0]["thread_id"]))
-                flash("Message sent.")
+            flash("Message sent.")
             return redirect(
                 url_for(
                     "messages_bp.view_select_survey",