Merge pull request #1209 from NHSDigital/12482-remove-warning-notif-banners

Remove warning notification banner type

Author: malcolmbaig

manage_breast_screening/auth/views.py

@@ -71,7 +71,7 @@ def cis2_callback(request):
         token = client.authorize_access_token(request)
     except MismatchingStateError:
         logger.exception("CIS2 callback failed: OAuth state mismatch")
-        messages.warning(request, "Your login session expired. Please try again.")
+        messages.info(request, "Your login session expired. Please try again.")
         return redirect(reverse("auth:login"))
     except OAuthError as e:
         if e.error == "invalid_client" and e.description == "JWT is not valid":
@@ -80,7 +80,7 @@ def cis2_callback(request):
             )
         else:
             logger.exception("CIS2 callback failed: OAuth error")
-        messages.warning(request, "There was a problem logging in. Please try again.")
+        messages.info(request, "There was a problem logging in. Please try again.")
         return redirect(reverse("auth:login"))
 
     id_token_userinfo = token.get("userinfo")

manage_breast_screening/core/jinja2/layout-app.jinja

@@ -68,21 +68,13 @@
         request, message_type='success'
       ) %}
 
-    {% set warning_notification_params = get_notification_banner_params(
-        request, message_type='warning'
-      ) %}
-
     {% if success_notification_params %}
       {{ notificationBanner(success_notification_params) }}
     {% endif %}
 
     {% if info_notification_params %}
       {{ notificationBanner(info_notification_params) }}
     {% endif %}
-
-    {% if warning_notification_params %}
-      {{ notificationBanner(warning_notification_params) }}
-    {% endif %}
   {% endblock flash_messages %}
 
   {% block page_content %}

manage_breast_screening/core/jinja2/workflow_step.jinja

@@ -28,10 +28,6 @@
           request, message_type='success'
         ) %}
 
-      {% set warning_notification_params = get_notification_banner_params(
-          request, message_type='warning'
-        ) %}
-
       {% if success_notification_params %}
         {{ notificationBanner(success_notification_params) }}
       {% endif %}
@@ -40,10 +36,6 @@
         {{ notificationBanner(info_notification_params) }}
       {% endif %}
 
-      {% if warning_notification_params %}
-        {{ notificationBanner(warning_notification_params) }}
-      {% endif %}
-
       <div class="nhsuk-grid-row">
         <div class="nhsuk-grid-column-two-thirds">
           {{ form_error_summary(form) }}

manage_breast_screening/core/template_helpers.py

@@ -1,4 +1,4 @@
-from django.contrib.messages import INFO, SUCCESS, WARNING, get_messages
+from django.contrib.messages import INFO, SUCCESS, get_messages
 from django.urls import reverse
 from django.utils.html import conditional_escape as django_html_escape
 from django.utils.safestring import SafeData, SafeString, mark_safe
@@ -88,12 +88,12 @@ def message_with_heading(heading: str, html=None) -> SafeString:
 def get_notification_banner_params(
     request, message_type="info", disable_auto_focus=False
 ):
-    levels = {"info": INFO, "warning": WARNING, "success": SUCCESS}
+    levels = {"info": INFO, "success": SUCCESS}
     try:
         level = levels[message_type]
     except KeyError:
         raise ValueError(
-            f"message_type must be one of {{info, warning, success}}; got {message_type}"
+            f"message_type must be one of {{info, success}}; got {message_type}"
         )
 
     messages = [message for message in get_messages(request) if message.level == level]

manage_breast_screening/core/tests/test_template_helpers.py

@@ -1,6 +1,6 @@
 import pytest
 from django.contrib.auth.models import AnonymousUser
-from django.contrib.messages import ERROR, INFO, SUCCESS, WARNING
+from django.contrib.messages import ERROR, INFO, SUCCESS
 from django.contrib.messages.storage.base import Message
 from django.test import RequestFactory
 from django.utils.safestring import mark_safe
@@ -73,7 +73,6 @@ def dummy_request(self):
         request._messages = [
             Message(message="abc", level=INFO),
             Message(message="def", level=SUCCESS),
-            Message(message="warning!", level=WARNING),
             Message(message="error!!!", level=ERROR),
         ]
         return request
@@ -86,14 +85,10 @@ def test_success_banner_with_text_message(self, dummy_request):
         result = get_notification_banner_params(dummy_request, "success")
         assert result == {"text": "def", "type": "success", "role": "alert"}
 
-    def test_warning_banner_with_text_message(self, dummy_request):
-        result = get_notification_banner_params(dummy_request, "warning")
-        assert result == {"text": "warning!", "type": "warning", "role": "alert"}
-
     def test_invalid_message_type(self, dummy_request):
         with pytest.raises(
             ValueError,
-            match="message_type must be one of {info, warning, success}; got error",
+            match="message_type must be one of {info, success}; got error",
         ):
             get_notification_banner_params(dummy_request, "error")
 

manage_breast_screening/mammograms/views/add_multiple_images_information_view.py

@@ -51,7 +51,7 @@ def post(self, request, *args, **kwargs):
         if form.is_stale():
             messages.add_message(
                 request,
-                messages.WARNING,
+                messages.INFO,
                 "The image details have changed. Please review and continue.",
             )
             return redirect(

manage_breast_screening/mammograms/views/appointment_workflow_views.py

@@ -140,7 +140,7 @@ def form_valid(self, form):
         except (IntegrityError, DatabaseError):
             messages.add_message(
                 self.request,
-                messages.WARNING,
+                messages.INFO,
                 "Unable to complete all sections. Please try again.",
             )
             return redirect(
@@ -419,7 +419,7 @@ def _handle_html(self, request, section, existing_review):
             if existing_review.reviewed_by != request.user:
                 messages.add_message(
                     request,
-                    messages.WARNING,
+                    messages.INFO,
                     f"This section has already been reviewed by {existing_review.reviewed_by.get_full_name()}",
                 )
         else: