Merge pull request #8383 from cfpb/ans_remove_filter_macro

Remove unused `_filter_selectable` macro
cfpb · May 9, 2024 · d866146 · d866146
2 parents 7a61a60 + 5e3f1b8
commit d866146
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git a/cfgov/v1/jinja2/v1/includes/organisms/filterable-list-controls.html b/cfgov/v1/jinja2/v1/includes/organisms/filterable-list-controls.html
@@ -16,22 +16,6 @@
 
     ========================================================================== #}
 
-{% macro _filter_selectable(type, label_text, id, name, value, required=None, group=None) %}
-    <li class="m-form-field m-form-field--{{ type }}">
-        <input class="a-{{ type }}"
-               type="{{ type }}"
-               value="{{ value }}"
-               id="filter_{{ id }}"
-               name="{{ name }}"
-               {{ 'data-required=' ~ required if required else ''  }}
-               {{ 'data-group=' ~ group if group else ''  }}
-               {{ 'checked' if is_filter_selected(name, value) else '' }}>
-        <label class="a-label"  for="filter_{{ id }}">
-            {{ label_text if label_text else value }}
-        </label>
-    </li>
-{% endmacro %}
-
 {% macro _filter_multiselect( label, data, filter_count ) %}
     <div class="content-l__col
                 content-l__col-1-{{ '3' if filter_count == 3 else '2' }}">

diff --git a/cfgov/v1/jinja2tags/__init__.py b/cfgov/v1/jinja2tags/__init__.py
@@ -16,18 +16,11 @@ def is_filter_selected(context, fieldname, value):
 
     Returns True if fieldname=value is found in the GET data in order to output
     the `checked` attribute on a checkbox or radio button in the
-    _filter_selectable macro (see: filterable-list-controls.html).
+    _render_filter_fields macro (see: filterable-list-controls.html).
     """
     request_get = context["request"].GET
 
-    query_string_values = [
-        k
-        for k in request_get.getlist(fieldname)
-        + request_get.getlist("filter_" + fieldname)
-        if k
-    ]
-
-    return value in query_string_values
+    return value and value in request_get.getlist(fieldname)
 
 
 def unique_id_in_context(context):

diff --git a/cfgov/v1/tests/jinja2tags/test_jinja2tags.py b/cfgov/v1/tests/jinja2tags/test_jinja2tags.py
@@ -31,10 +31,6 @@ def test_query_parameter_defined_multiple_times(self):
         request = self.factory.get("/?foo=bar&foo=baz")
         self.assertEqual(self._render_template_with_request(request), "True")
 
-    def test_query_parameter_also_works_with_filter_prefix(self):
-        request = self.factory.get("/?filter_foo=bar")
-        self.assertEqual(self._render_template_with_request(request), "True")
-
 
 class TestUniqueIdInContext(SimpleTestCase):
     def setUp(self):