From c612d12a107034de03c003406ad05a2f6064460d Mon Sep 17 00:00:00 2001
From: Anna Shamray <anna.shamray@maykinmedia.nl>
Date: Wed, 11 May 2022 12:56:21 +0200
Subject: [PATCH 1/3] :sparkles: show message fir search feedback

---
 src/open_inwoner/search/views.py             | 9 +++++++++
 src/open_inwoner/templates/pages/search.html | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/open_inwoner/search/views.py b/src/open_inwoner/search/views.py
index 9c9e5bdcb6..0fa79a6307 100644
--- a/src/open_inwoner/search/views.py
+++ b/src/open_inwoner/search/views.py
@@ -1,3 +1,4 @@
+from django.contrib import messages
 from django.core.paginator import InvalidPage, Paginator
 from django.http import Http404
 from django.http.response import HttpResponseRedirect
@@ -116,4 +117,12 @@ def form_valid(self, form):
             [f"{key}: {', '.join(value)}" for key, value in search_data.items()]
         )
         form.save()
+
+        messages.add_message(
+            self.request,
+            messages.SUCCESS,
+            _(
+                "Thank you for your feedback. It will help us to improve our search engine"
+            ),
+        )
         return HttpResponseRedirect(http_referer)
diff --git a/src/open_inwoner/templates/pages/search.html b/src/open_inwoner/templates/pages/search.html
index 58b8107f12..bda5112fbf 100644
--- a/src/open_inwoner/templates/pages/search.html
+++ b/src/open_inwoner/templates/pages/search.html
@@ -54,7 +54,7 @@ <h1 class="h1 search-results__title">
         {% endif %}
     {% endrender_form %}
 
-    {% if results %}
+    {% if results and not messages %}
         <div class="grid">
             {% spaceless %}<aside class="grid__sidebar">
                 &nbsp;
@@ -64,7 +64,7 @@ <h1 class="h1 search-results__title">
                     <aside class="feedback">
                         <h4 class="h4">{% trans "Feedback" %}</h4>
                         <p class="p">{% trans "Heeft u gevonden wat u zocht?" %}</p>
-                        {% render_form form=feedback_form method="POST" form_action=request.get_full_path id="feedback_form" %}
+                        {% render_form form=feedback_form method="POST" form_action=request.get_full_path id="feedback_form" show_notifications=True %}
                             {% csrf_token %}
                             {{ feedback_form.errors }}
                             <div class="feedback__options">

From 97cdda4bd14e6fdaae24d410f90e51102317192a Mon Sep 17 00:00:00 2001
From: Anna Shamray <anna.shamray@maykinmedia.nl>
Date: Wed, 11 May 2022 12:57:13 +0200
Subject: [PATCH 2/3] :lipstick: update style for feedback buttons

---
 src/open_inwoner/scss/components/Form/ButtonRadio.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/open_inwoner/scss/components/Form/ButtonRadio.scss b/src/open_inwoner/scss/components/Form/ButtonRadio.scss
index 9cd1310a81..87c9e637eb 100644
--- a/src/open_inwoner/scss/components/Form/ButtonRadio.scss
+++ b/src/open_inwoner/scss/components/Form/ButtonRadio.scss
@@ -4,6 +4,7 @@
 
     &:checked ~ .button-radio__button {
       color: var(--color-primary);
+      cursor: default;
     }
   }
 
@@ -14,6 +15,7 @@
     color: var(--color-gray-lighter);
     display: inline-block;
     padding: 12px;
+    cursor: pointer;
   }
 
   &:first-child {

From a1ef2cfdfa0aeba90c11d5b369c8d96013a74552 Mon Sep 17 00:00:00 2001
From: Anna Shamray <anna.shamray@maykinmedia.nl>
Date: Wed, 11 May 2022 12:57:45 +0200
Subject: [PATCH 3/3] :white_check_mark: test message for search feedback

---
 .../search/tests/test_feedback.py             | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/open_inwoner/search/tests/test_feedback.py b/src/open_inwoner/search/tests/test_feedback.py
index 7578e26180..b3522c575c 100644
--- a/src/open_inwoner/search/tests/test_feedback.py
+++ b/src/open_inwoner/search/tests/test_feedback.py
@@ -1,8 +1,11 @@
 import urllib
 
+from django.contrib import messages
 from django.urls import reverse
+from django.utils.translation import ugettext_lazy as _
 
 from django_webtest import WebTest
+from furl import furl
 
 from open_inwoner.accounts.tests.factories import UserFactory
 from open_inwoner.pdc.tests.factories import CategoryFactory, TagFactory
@@ -149,3 +152,30 @@ def test_positive_feedback_is_saved_with_unauthenticated_user_and_with_filters(
         self.assertTrue(feedback.positive)
         self.assertEqual(feedback.remark, self.feedback.remark)
         self.assertIsNone(feedback.searched_by)
+
+    def test_feedback_form_not_displayed_after_submit(self):
+        params = {"query": self.feedback.search_query}
+        url = furl(reverse("search:search")).add(params).url
+        get_response = self.app.get(url)
+
+        self.assertIsNotNone(get_response.html.find(id="feedback_form"))
+        self.assertEqual(list(get_response.context["messages"]), [])
+
+        feedback_form = get_response.forms["feedback_form"]
+        feedback_form["remark"] = self.feedback.remark
+        feedback_form["positive"] = "true"
+
+        post_response = feedback_form.submit().follow()
+
+        self.assertIsNone(post_response.html.find(id="feedback_form"))
+        post_messages = list(post_response.context["messages"])
+        self.assertEqual(len(post_messages), 1)
+
+        message = post_messages[0]
+        self.assertEqual(message.level, messages.SUCCESS)
+        self.assertEqual(
+            message.message,
+            _(
+                "Thank you for your feedback. It will help us to improve our search engine"
+            ),
+        )