From 10013a19aabdd20be2a5dfdc4585a46e1a186211 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 5 Nov 2018 13:58:22 +0000
Subject: [PATCH] Add live search to letter brandings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Matches what we do for email branding, makes the one you’re lookig for
quicker to find.
---
 app/main/views/service_settings.py            |  1 +
 .../service-settings/set-letter-branding.html | 22 +++++++++----------
 tests/app/main/views/test_service_settings.py |  6 ++---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 0801167bf..8d7bd2360 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -891,6 +891,7 @@ def set_letter_branding(service_id):
     return render_template(
         'views/service-settings/set-letter-branding.html',
         form=form,
+        search_form=SearchTemplatesForm(),
     )
 
 
diff --git a/app/templates/views/service-settings/set-letter-branding.html b/app/templates/views/service-settings/set-letter-branding.html
index de1adfe66..bff40fd2a 100644
--- a/app/templates/views/service-settings/set-letter-branding.html
+++ b/app/templates/views/service-settings/set-letter-branding.html
@@ -1,5 +1,6 @@
 {% extends "withnav_template.html" %}
 {% from "components/radios.html" import radios %}
+{% from "components/live-search.html" import live_search %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
@@ -10,17 +11,14 @@
 {% block maincolumn_content %}
 
   <h1 class="heading-large">Set letter branding</h1>
-  <div class="grid-row">
-    <div class="column-three-quarters">
-      {% call form_wrapper() %}
-        {{ radios(form.dvla_org_id) }}
-        {{ page_footer(
-          'Save',
-          back_link=url_for('.service_settings', service_id=current_service.id),
-          back_link_text='Back to settings'
-        ) }}
-      {% endcall %}
-    </div>
-  </div>
+  {% call form_wrapper() %}
+    {{ live_search(target_selector='.multiple-choice', show=True, form=search_form, label='Search by name') }}
+    {{ radios(form.dvla_org_id) }}
+    {{ page_footer(
+      'Save',
+      back_link=url_for('.service_settings', service_id=current_service.id),
+      back_link_text='Back to settings'
+    ) }}
+  {% endcall %}
 
 {% endblock %}
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index 41f3c5b7c..1e61d704c 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -2116,13 +2116,13 @@ def test_set_letter_branding_prepopulates(
     assert response.status_code == 200
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
 
-    for element in {'label', 'input[type=radio]'}:
+    for element in {'label[for^=dvla_org_id]', 'input[type=radio]'}:
         assert len(page.select(element)) == len(expected_items)
 
     for index, expected_item in enumerate(expected_items):
         expected_value, expected_label = expected_item
-        assert normalize_spaces(page.select('label')[index].text) == expected_label
-        assert page.select('input')[index]['value'] == expected_value
+        assert normalize_spaces(page.select('label[for^=dvla_org_id]')[index].text) == expected_label
+        assert page.select('input[type=radio]')[index]['value'] == expected_value
 
     assert len(page.select('input[checked]')) == 1
     assert page.select('input[checked]')[0]['value'] == expected_selected