From 507f0f3e02be7496d97be060294e8dcb9f9498e9 Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@F612204M.fios-router.home>
Date: Tue, 29 Oct 2024 13:55:46 -0400
Subject: [PATCH 1/6] subject filter for adrs and murs, refinemacros, adjust
 audit constants to accomodate

---
 fec/data/constants.py                         | 144 +++++++++---------
 .../macros/filters/dropdown-json.jinja        |  21 ++-
 .../layouts/legal-doc-search-results.jinja    |  70 ++++++++-
 .../templates/legal-search-results-adrs.jinja |  37 +++++
 .../templates/legal-search-results-murs.jinja |  32 +++-
 .../templates/partials/legal-pagination.jinja |   6 +-
 .../partials/legal-search-results-mur.jinja   |   2 +-
 fec/legal/views.py                            |  55 ++++++-
 8 files changed, 281 insertions(+), 86 deletions(-)

diff --git a/fec/data/constants.py b/fec/data/constants.py
index a669530b3..76d29678f 100644
--- a/fec/data/constants.py
+++ b/fec/data/constants.py
@@ -373,75 +373,27 @@
 primary_category_keys = ['primary_category_id', 'primary_category_name']
 sub_category_keys = ['sub_category_id', 'sub_category_name']
 
-audit_primary_categories_options = [
-    {
-        "primary_category_id": 'all',
-        "primary_category_name": 'All'
-    },
-    {
-        "primary_category_id": '2',
-        "primary_category_name": 'Allocation Issues'
-    },
-    {
-        "primary_category_id": '3',
-        "primary_category_name": 'Disclosure'
-    },
-    {
-        "primary_category_id": '5',
-        "primary_category_name": 'Excessive Contributions'
-    },
-    {
-        "primary_category_id": '1',
-        "primary_category_name": 'Failure to File Reports/Schedules/Notices'
-    },
-    {
-        "primary_category_id": '8',
-        "primary_category_name": 'Loans'
-    },
-    {
-        "primary_category_id": '7',
-        "primary_category_name": 'Misstatement of Financial Activity'
-    },
-    {
-        "primary_category_id": '14',
-        "primary_category_name": 'Net Outstanding Campaign/Convention ' + 'Expenditures/Obligations'
-    },
-    {
-        "primary_category_id": '16',
-        "primary_category_name": 'No Findings or Issues/Not a Committee'
-    },
-    {
-        "primary_category_id": '9',
-        "primary_category_name": 'Other'
-    },
-    {
-        "primary_category_id": '15',
-        "primary_category_name": 'Payments/Disgorgements'
-    },
-    {
-        "primary_category_id": '6',
-        "primary_category_name": 'Prohibited Contributions'
-    },
-    {
-        "primary_category_id": '4',
-        "primary_category_name": 'Recordkeeping'
-    },
-    {
-        "primary_category_id": '17',
-        "primary_category_name": 'Referred Findings Not Listed'
-    },
-    {
-        "primary_category_id": '13',
-        "primary_category_name": 'Repayment to US Treasury'
-    }
-]
+audit_primary_categories_options = OrderedDict([
+    ('all', 'All'),
+    ('2', 'Allocation Issues'),
+    ('3', 'Disclosure'),
+    ('5', 'Excessive Contributions'),
+    ('1', 'Failure to File Reports/Schedules/Notices'),
+    ('8', 'Loans'),
+    ('7', 'Misstatement of Financial Activity'),
+    ('14', 'Net Outstanding Campaign/Convention ' + 'Expenditures/Obligations'),
+    ('16', 'No Findings or Issues/Not a Committee'),
+    ('9', 'Other'),
+    ('15', 'Payments/Disgorgements'),
+    ('6', 'Prohibited Contributions'),
+    ('4', 'Recordkeeping'),
+    ('17', 'Referred Findings Not Listed'),
+    ('13', 'Repayment to US Treasury')
+])
 
-audit_sub_categories_options = [
-    {
-        "sub_category_id": 'all',
-        "sub_category_name": ' '
-    }
-]
+audit_sub_categories_options = OrderedDict([
+    ('all', 'All')
+])
 
 
 table_columns = OrderedDict([
@@ -1036,3 +988,59 @@
     ('7', 'Conciliation: Pre Probable Cause'),
     ('6', 'Conciliation: Probable Cause'),
 ])
+
+
+primary_subject_ids = {
+    "": "All",
+    "1": "Allocation",
+    "2": "Committees",
+    "3": "Contributions",
+    "4": "Disclaimer",
+    "5": "Disbursements",
+    "6": "Electioneering",
+    "7": "Expenditures",
+    "8": "Express Advocacy",
+    "9": "Foreign Nationals",
+    "10": "Fraudulent misrepresentation",
+    "11": "Issue Advocacy",
+    "12": "Knowing and Willful",
+    "13": "Loans",
+    "14": "Non-federal",
+    "15": "Other",
+    "16": "Personal use",
+    "17": "Presidential",
+    "18": "Reporting",
+    "19": "Soft Money",
+}
+
+secondary_subject_placeholder = {
+   "": "All",
+}
+
+secondary_subject_ids = {
+  "2": {
+    "1": "Candidate",
+    "2": "Multi-candidate",
+    "3": "Non-Party",
+    "4": "PAC",
+    "5": "Party",
+    "6": "Political",
+    "7": "Presidential",
+  },
+  "3": {
+    "8": "Corporations",
+    "9": "Excessive",
+    "10": "Exemptions",
+    "11": "In the name of another",
+    "12": "Labor Unions",
+    "13": "Limitations",
+    "14": "National Bank",
+    "15": "Prohibited",
+  },
+  "7": {
+    "10": "Exemptions",
+    "16": "Coordinated",
+    "17": "Limits",
+    "18": "Prohibitions",
+  }
+}
diff --git a/fec/data/templates/macros/filters/dropdown-json.jinja b/fec/data/templates/macros/filters/dropdown-json.jinja
index 2a8c254ca..72e26ca37 100644
--- a/fec/data/templates/macros/filters/dropdown-json.jinja
+++ b/fec/data/templates/macros/filters/dropdown-json.jinja
@@ -1,23 +1,30 @@
-{% macro select_json(name, label, keys, options={}, default=none) %}
+{% macro select_json(name, label, keys, options={}, default=none, show_tooltip_text='') %}
 <div class="filter js-filter js-filter-control" data-filter="select"
 data-validate="false" data-modifies-filter="{{ name }}" data-required-default="{{ default }}">
-  <label for="{{ name }}" class="label">{{ label }}</label>
+  <label for="{{ name }}" class="label t-inline-block">{{ label }}</label>
+  {% if show_tooltip_text != '' %}
+  <div class="tooltip__container">
+    <button class="tooltip__trigger"><span class="u-visually-hidden">Learn more</span></button>
+    <div class="tooltip tooltip--left tooltip--above">
+      <p class="tooltip__content tooltip__content">{{ show_tooltip_text }}</p>
+    </div>
+  </div>
+  {% endif %}
   <select id="{{ name }}" name="{{ name }}">
-    {% for option in options %}
-      <option value={{option[keys[0]]}}>{{ option[keys[1]] }}</option>
+    {% for key,value in options.items() %}
+      <option value="{{ key }}">{{ value }}</option>
     {% endfor %}
   </select>
 </div>
 {% endmacro %}
 
-
 {% macro select_json_indentation(name, label, keys, options={}, default=none) %}
 <div class="filter js-filter js-filter-control sub--filter--indent" data-filter="select" 
 data-validate="false" data-modifies-filter="{{ name }}" data-required-default="{{ default }}">
   <label for="{{ name }}" class="label">{{ label }}</label>
   <select id="{{ name }}" name="{{ name }}">
-    {% for option in options %}
-      <option value={{option[keys[0]]}}>{{ option[keys[1]] }}</option>
+    {% for key,value in options.items() %}
+      <option value="{{ key }}">{{ value }}</option>
     {% endfor %}
   </select>
 </div>
diff --git a/fec/legal/templates/layouts/legal-doc-search-results.jinja b/fec/legal/templates/layouts/legal-doc-search-results.jinja
index 63d4e4cee..596a6b4a1 100644
--- a/fec/legal/templates/layouts/legal-doc-search-results.jinja
+++ b/fec/legal/templates/layouts/legal-doc-search-results.jinja
@@ -134,15 +134,81 @@
                 url.searchParams.append('mur_disposition_category_id', cat);
               }
             });
+          } else if (tag && tag == 'primary_subject_id') { // Check if tag is not null or undefined
+            // Get the index from the tag
+            // const selectedCategories = url.searchParams.getAll('primary_subject_id');
+            // // Remove all instances of 'case_doc_category_id' from the URL
+            url.searchParams.delete('primary_subject_id');
+            url.searchParams.delete('secondary_subject_id');
+          } else if (tag && tag == 'secondary_subject_id') { // Check if tag is not null or undefined
+            // // Get the index from the tag
+            // const selectedCategories = url.searchParams.getAll('primary_subject_id');
+            // Remove all instances of 'case_doc_category_id' from the URL
+            url.searchParams.delete('secondary_subject_id');
           } else {
             // For all other tags, remove the corresponding search parameter
             url.searchParams.delete(tag);
           }
-
+          
+          // Go back to first page in case there are fewer pages in new result set
+          url.searchParams.set('offset', 0)
           // Redirect to the updated URL
           window.location = url.toString();
         });
       });
-    });
+
+      // JS for subject MUR/ADR selects
+      const subject_select = document.getElementById('primary_subject_id');
+      const secondary_select_div = document.querySelector("[data-modifies-filter='secondary_subject_id']");
+      const secondary_select = document.getElementById('secondary_subject_id');
+
+      window.context = {{ context_vars|to_json|safe }};
+      const secondary_subject_ids = window.context.secondary_subject_ids;
+      const primary_subject_id = window.context.primary_subject_id;
+      const secondary_subject_id = window.context.secondary_subject_id;
+
+      // Load secondary select on page load
+      load_secondary_select(primary_subject_id);
+
+      // Add aria attribute to selected option in primary select
+      Array.from(subject_select.options).forEach(option => {
+        if (option.value == primary_subject_id) {
+          //option.selected = 'selected';
+          option.setAttribute('aria-selected', 'true');
+        };
+      });
+
+      // Load secondary select, upon change of primary select
+      subject_select.addEventListener('change', (event) => {
+        const selected_id = event.target.value;
+        load_secondary_select(selected_id);
+      });
+
+      function load_secondary_select(id){
+        // First, reset the secondary select to default
+        secondary_select.replaceChildren(new Option('All', "", false, true))
+        // Populate secondary select options, if applicable
+        if (id in secondary_subject_ids) {
+            // Show secondary select
+            secondary_select_div.style.display = 'block';
+            // Append secondary select options
+            for (const [key, value] of Object.entries(secondary_subject_ids[id])) {
+              //If there is a current secondary_subject_id, append it as the selected option
+              if (key == secondary_subject_id) {
+                secondary_select.append(new Option(value, key, true, true));
+                // Add aria-selected to that option
+                secondary_select.options[secondary_select.selectedIndex].setAttribute('aria-selected', 'true');
+              // Append other options, unselected
+              } else {
+                secondary_select.append(new Option(value, key));
+              };
+            };
+
+        } else {
+            secondary_select_div.style.display = 'none';
+        };
+      };
+   });
+
   </script>
 {% endblock %}
diff --git a/fec/legal/templates/legal-search-results-adrs.jinja b/fec/legal/templates/legal-search-results-adrs.jinja
index 3e3849542..be3ab3bb7 100644
--- a/fec/legal/templates/legal-search-results-adrs.jinja
+++ b/fec/legal/templates/legal-search-results-adrs.jinja
@@ -1,5 +1,6 @@
 {% extends "layouts/legal-doc-search-results.jinja" %}
 {% import 'macros/legal.jinja' as legal %}
+{% import 'macros/filters/dropdown-json.jinja' as dropdown %}
 {% set document_type_display_name = 'Alternative Dispute Resolution' %}
 
 {% block header %}
@@ -57,11 +58,33 @@
         </div>
       </div>
     </div>
+    {{
+  	  dropdown.select_json(
+          'primary_subject_id',
+          'Case subject',
+          options=constants.primary_subject_ids,
+          default=""
+      )
+    }}
+    {{
+  	  dropdown.select_json_indentation(
+        'secondary_subject_id',
+        'Secondary case subject',
+        options=constants.secondary_subject_placeholder,
+        default=""
+      )
+    }}
     
     <div class="filter">
       <button type="submit" class="button button--cta">Apply filters</button>
     </div>
   </div>
+  <style>
+  [data-modifies-filter='secondary_subject_id']{
+display: none;
+  }
+
+  </style>
 {% endblock %}
 
 {% block message %}
@@ -115,6 +138,16 @@
           {% endfor %}
         </li>
       {% endif %}
+      {% if primary_subject_id or secondary_subject_id_name  %}
+        <li data-tag-category="primary_subject_id" class="tag__category tag__category__range--date">
+        {% if primary_subject_id_name and primary_subject_id %}
+          <div data-removable="true" class="tag__item">{{ primary_subject_id_name }}<button class="button js-close tag__remove" data-tag="primary_subject_id"><span class="u-visually-hidden">Remove</span></button></div>
+        {% endif %}
+        {% if secondary_subject_id_name %}
+          <div data-removable="true" class="tag__item">{{ secondary_subject_id_name }}<button class="button js-close tag__remove" data-tag="secondary_subject_id"><span class="u-visually-hidden">Remove</span></button></div>
+        {% endif %}
+        </li>
+      {% endif %}
     </ul>
   </div>
 </div>
@@ -130,3 +163,7 @@
     {% include 'partials/legal-pagination.jinja' %}
   {% endwith %}
 {% endblock %}
+{% block scripts %}
+  {# super loads scripts from parent #}
+  {{ super() }}
+{% endblock %}
diff --git a/fec/legal/templates/legal-search-results-murs.jinja b/fec/legal/templates/legal-search-results-murs.jinja
index cb1af56a5..b7e1348df 100644
--- a/fec/legal/templates/legal-search-results-murs.jinja
+++ b/fec/legal/templates/legal-search-results-murs.jinja
@@ -1,6 +1,7 @@
 {% extends "layouts/legal-doc-search-results.jinja" %}
 {% import 'macros/legal.jinja' as legal %}
 {% import 'macros/filters/checkbox.jinja' as checkbox %}
+{% import 'macros/filters/dropdown-json.jinja' as dropdown %}
 {% set document_type_display_name = 'Closed Matters Under Review' %}
 
 {% block header %}
@@ -71,6 +72,25 @@
         prefix='mur_disposition_category_id',
         show_tooltip_text='Final disposition does not search archived cases'
         ) }}
+
+        {{
+          dropdown.select_json(
+              'primary_subject_id',
+              'Case subject',
+              options=constants.primary_subject_ids,
+              default="",
+              show_tooltip_text='Case subject does not search archived cases'
+
+          )
+        }}
+        {{
+          dropdown.select_json_indentation(
+            'secondary_subject_id',
+            'Secondary case subject',
+            options=constants.secondary_subject_placeholder,
+            default=""
+          )
+        }}
     </div>
   </div>
   <div class="filters__inner">
@@ -137,6 +157,16 @@
           {% endfor %}
         </li>
       {% endif %}
+      {% if primary_subject_id or secondary_subject_id_name  %}
+        <li data-tag-category="primary_subject_id" class="tag__category tag__category__range--date">
+        {% if primary_subject_id_name and primary_subject_id %}
+          <div data-removable="true" class="tag__item">{{ primary_subject_id_name }}<button class="button js-close tag__remove" data-tag="primary_subject_id"><span class="u-visually-hidden">Remove</span></button></div>
+        {% endif %}
+        {% if secondary_subject_id_name %}
+          <div data-removable="true" class="tag__item">{{ secondary_subject_id_name }}<button class="button js-close tag__remove" data-tag="secondary_subject_id"><span class="u-visually-hidden">Remove</span></button></div>
+        {% endif %}
+        </li>
+      {% endif %}
     </ul>
   </div>
 </div>
@@ -195,7 +225,7 @@
       location.reload();
   };
 
-
+  // JS for final disposition filter
   // Allow the selected-item button to uncheck box in list above
   $(document).on('click','.dropdown__item',  function(e){
       const btn = $(this).find('.dropdown__item--selected');
diff --git a/fec/legal/templates/partials/legal-pagination.jinja b/fec/legal/templates/partials/legal-pagination.jinja
index 5ae590d3b..e9529f8ed 100644
--- a/fec/legal/templates/partials/legal-pagination.jinja
+++ b/fec/legal/templates/partials/legal-pagination.jinja
@@ -31,7 +31,7 @@
     {% endif %}
 
     {% if current_page > 1 %}
-      <a class="paginate_button previous" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&offset={{ offset - limit }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">Previous</a>
+      <a class="paginate_button previous" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}&offset={{ offset - limit }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">Previous</a>
     {% else %}
       <span class="paginate_button previous is-disabled">Previous</span>
     {% endif %}
@@ -41,12 +41,12 @@
       {% if page == current_page %}
         <span class="paginate_button current">{{ page }}</span>
       {% else %}
-        <a class="paginate_button" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&offset={{ page_offset }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">{{ page }}</a>
+        <a class="paginate_button" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}&offset={{ page_offset }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">{{ page }}</a>
       {% endif %}
     {% endfor %}
 
     {% if offset + limit < total_all %}
-      <a class="paginate_button next" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&offset={{ offset + limit }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">Next</a>
+      <a class="paginate_button next" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}&offset={{ offset + limit }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">Next</a>
     {% else %}
       <span class="paginate_button next is-disabled">Next</span>
     {% endif %}
diff --git a/fec/legal/templates/partials/legal-search-results-mur.jinja b/fec/legal/templates/partials/legal-search-results-mur.jinja
index e41d12acb..5adbe3401 100644
--- a/fec/legal/templates/partials/legal-search-results-mur.jinja
+++ b/fec/legal/templates/partials/legal-search-results-mur.jinja
@@ -60,7 +60,7 @@
               {{ disposition }} ({{ disposition_dict[disposition] }} respondents){% if not loop.last %};&nbsp;{% endif %}
             {% endfor %}
           {% else %}
-            <strong>Disposition(s):</strong> Not available for archived cases
+             Case details preview not available for archived cases
           {% endif %}
           </div>
           <div class="legal-search-result__hit u-padding--left--small split__cell">
diff --git a/fec/legal/views.py b/fec/legal/views.py
index 78889e81b..a94127285 100644
--- a/fec/legal/views.py
+++ b/fec/legal/views.py
@@ -283,6 +283,8 @@ def legal_doc_search_mur(request):
     case_max_close_date = request.GET.get('case_max_close_date', '')
     case_doc_category_ids = request.GET.getlist('case_doc_category_id', [])
     mur_disposition_category_ids = request.GET.getlist('mur_disposition_category_id', [])
+    primary_subject_id = request.GET.get('primary_subject_id', '')
+    secondary_subject_id = request.GET.get('secondary_subject_id', '')
 
     query, query_exclude = parse_query(original_query)
 
@@ -307,7 +309,9 @@ def legal_doc_search_mur(request):
         case_min_close_date=case_min_close_date,
         case_max_close_date=case_max_close_date,
         case_doc_category_id=case_doc_category_ids,
-        mur_disposition_category_id=mur_disposition_category_ids
+        mur_disposition_category_id=mur_disposition_category_ids,
+        primary_subject_id=primary_subject_id,
+        secondary_subject_id=secondary_subject_id,
     )
 
     # Define MUR document categories dictionary
@@ -332,10 +336,23 @@ def legal_doc_search_mur(request):
     mur_disposition_category_ids_list = {**mur_disposition_category_ids_display, **suggested_mur_disposition_category_ids}
     # Get list of selected names
     selected_mur_disposition_names = [mur_disposition_category_ids_list.get(id) for id in mur_disposition_category_ids]
-    
-    # Pass chosen ids to Javascript
+
+    # Get primary_subject_id_name from dict
+    primary_subject_id_name = constants.primary_subject_ids.get(primary_subject_id, '')
+    secondary_subject_ids = constants.secondary_subject_ids
+
+    def get_secondary_subject_name(id):
+        for key in secondary_subject_ids:
+            if id in secondary_subject_ids[key]:
+                return secondary_subject_ids[key][id]
+    secondary_subject_id_name = get_secondary_subject_name(secondary_subject_id)
+
+    # For Javascript
     context_vars = {
         "mur_disposition_category_id": mur_disposition_category_ids,
+        'primary_subject_id': primary_subject_id,
+        'secondary_subject_id': secondary_subject_id,
+        'secondary_subject_ids': secondary_subject_ids,
     }
 
     for mur in results['murs']:
@@ -370,7 +387,11 @@ def legal_doc_search_mur(request):
         'mur_disposition_category_ids': mur_disposition_category_ids,
         'selected_mur_disposition_names': selected_mur_disposition_names,
         'mur_disposition_category_ids_display': mur_disposition_category_ids_display,
-        'suggested_mur_disposition_category_ids' : suggested_mur_disposition_category_ids,
+        'suggested_mur_disposition_category_ids': suggested_mur_disposition_category_ids,
+        'primary_subject_id': primary_subject_id,
+        'secondary_subject_id': secondary_subject_id,
+        'primary_subject_id_name': primary_subject_id_name,
+        'secondary_subject_id_name': secondary_subject_id_name,
         'is_loading': True,  # Indicate that the page is loading initially
         "context_vars": context_vars,
     })
@@ -388,6 +409,8 @@ def legal_doc_search_adr(request):
     case_min_close_date = request.GET.get('case_min_close_date', '')
     case_max_close_date = request.GET.get('case_max_close_date', '')
     case_doc_category_ids = request.GET.getlist('case_doc_category_id', [])
+    primary_subject_id = request.GET.get('primary_subject_id', '')
+    secondary_subject_id = request.GET.get('secondary_subject_id', '')
 
     query, query_exclude = parse_query(original_query)
 
@@ -404,6 +427,8 @@ def legal_doc_search_adr(request):
         case_min_close_date=case_min_close_date,
         case_max_close_date=case_max_close_date,
         case_doc_category_id=case_doc_category_ids,
+        primary_subject_id=primary_subject_id,
+        secondary_subject_id=secondary_subject_id,
     )
 
     # Define ADR document categories dictionary
@@ -426,6 +451,23 @@ def legal_doc_search_adr(request):
             # Checks for document keyword text match
             doc['text_match'] = str(index) in adr['document_highlights']
 
+    # Get primary_subject_id_name from dict
+    primary_subject_id_name = constants.primary_subject_ids.get(primary_subject_id, '')
+    secondary_subject_ids = constants.secondary_subject_ids
+
+    def get_secondary_subject_name(id):
+        for key in secondary_subject_ids:
+            if id in secondary_subject_ids[key]:
+                return secondary_subject_ids[key][id]
+    secondary_subject_id_name = get_secondary_subject_name(secondary_subject_id)
+
+    # For Javascript
+    context_vars = {
+        'primary_subject_id': primary_subject_id,
+        'secondary_subject_id': secondary_subject_id,
+        'secondary_subject_ids': secondary_subject_ids,
+    }
+
     return render(request, 'legal-search-results-adrs.jinja', {
         'parent': 'legal',
         'results': results,
@@ -441,6 +483,11 @@ def legal_doc_search_adr(request):
         'social_image_identifier': 'legal',
         'selected_doc_category_ids': case_doc_category_ids,
         'selected_doc_category_names': adr_document_category_names,
+        'primary_subject_id': primary_subject_id,
+        'secondary_subject_id': secondary_subject_id,
+        'primary_subject_id_name': primary_subject_id_name,
+        'secondary_subject_id_name': secondary_subject_id_name,
+        "context_vars": context_vars,
         'is_loading': True,  # Indicate that the page is loading initially
     })
 

From b817408f5bce3a22ce7d512155152627f8d13b96 Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@F612204M.fios-router.home>
Date: Tue, 29 Oct 2024 23:25:56 -0400
Subject: [PATCH 2/6] rm unused css, misc fixes and cleanup

---
 .../macros/filters/dropdown-json.jinja        |  2 +-
 .../layouts/legal-doc-search-results.jinja    |  9 ++--
 .../templates/legal-search-results-adrs.jinja | 49 ++++++++++---------
 .../templates/legal-search-results-murs.jinja |  2 +-
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/fec/data/templates/macros/filters/dropdown-json.jinja b/fec/data/templates/macros/filters/dropdown-json.jinja
index 72e26ca37..eee85eabf 100644
--- a/fec/data/templates/macros/filters/dropdown-json.jinja
+++ b/fec/data/templates/macros/filters/dropdown-json.jinja
@@ -3,7 +3,7 @@
 data-validate="false" data-modifies-filter="{{ name }}" data-required-default="{{ default }}">
   <label for="{{ name }}" class="label t-inline-block">{{ label }}</label>
   {% if show_tooltip_text != '' %}
-  <div class="tooltip__container">
+  <div class="tooltip__container u-margin--bottom">
     <button class="tooltip__trigger"><span class="u-visually-hidden">Learn more</span></button>
     <div class="tooltip tooltip--left tooltip--above">
       <p class="tooltip__content tooltip__content">{{ show_tooltip_text }}</p>
diff --git a/fec/legal/templates/layouts/legal-doc-search-results.jinja b/fec/legal/templates/layouts/legal-doc-search-results.jinja
index 596a6b4a1..69a815196 100644
--- a/fec/legal/templates/layouts/legal-doc-search-results.jinja
+++ b/fec/legal/templates/layouts/legal-doc-search-results.jinja
@@ -161,13 +161,13 @@
       const subject_select = document.getElementById('primary_subject_id');
       const secondary_select_div = document.querySelector("[data-modifies-filter='secondary_subject_id']");
       const secondary_select = document.getElementById('secondary_subject_id');
-
-      window.context = {{ context_vars|to_json|safe }};
+       
+      // The window.context is declared in the child templates (MUR/ADR)
       const secondary_subject_ids = window.context.secondary_subject_ids;
       const primary_subject_id = window.context.primary_subject_id;
       const secondary_subject_id = window.context.secondary_subject_id;
 
-      // Load secondary select on page load
+      // Populate secondary select on page load
       load_secondary_select(primary_subject_id);
 
       // Add aria attribute to selected option in primary select
@@ -187,7 +187,7 @@
       function load_secondary_select(id){
         // First, reset the secondary select to default
         secondary_select.replaceChildren(new Option('All', "", false, true))
-        // Populate secondary select options, if applicable
+        // Show and populate secondary select options, if applicable
         if (id in secondary_subject_ids) {
             // Show secondary select
             secondary_select_div.style.display = 'block';
@@ -209,6 +209,5 @@
         };
       };
    });
-
   </script>
 {% endblock %}
diff --git a/fec/legal/templates/legal-search-results-adrs.jinja b/fec/legal/templates/legal-search-results-adrs.jinja
index be3ab3bb7..9fc05e706 100644
--- a/fec/legal/templates/legal-search-results-adrs.jinja
+++ b/fec/legal/templates/legal-search-results-adrs.jinja
@@ -58,33 +58,31 @@
         </div>
       </div>
     </div>
-    {{
-  	  dropdown.select_json(
-          'primary_subject_id',
-          'Case subject',
-          options=constants.primary_subject_ids,
+  </div>
+  <div class="js-accordion accordion--neutral" data-content-prefix="filter" data-open-first="true">
+    <button type="button" class="js-accordion-trigger accordion__button">Case details</button>
+    <div class="accordion__content">
+      {{
+        dropdown.select_json(
+            'primary_subject_id',
+            'Case subject',
+            options=constants.primary_subject_ids,
+            default=""
+        )
+      }}
+      {{
+        dropdown.select_json_indentation(
+          'secondary_subject_id',
+          'Secondary case subject',
+          options=constants.secondary_subject_placeholder,
           default=""
-      )
-    }}
-    {{
-  	  dropdown.select_json_indentation(
-        'secondary_subject_id',
-        'Secondary case subject',
-        options=constants.secondary_subject_placeholder,
-        default=""
-      )
-    }}
-    
-    <div class="filter">
-      <button type="submit" class="button button--cta">Apply filters</button>
+        )
+      }}
     </div>
   </div>
-  <style>
-  [data-modifies-filter='secondary_subject_id']{
-display: none;
-  }
-
-  </style>
+  <div class="filters__inner">
+    <button type="submit" class="button button--cta">Apply filters</button>
+  </div>
 {% endblock %}
 
 {% block message %}
@@ -166,4 +164,7 @@ display: none;
 {% block scripts %}
   {# super loads scripts from parent #}
   {{ super() }}
+  <script>
+     window.context = {{ context_vars|to_json|safe }};
+  </script>
 {% endblock %}
diff --git a/fec/legal/templates/legal-search-results-murs.jinja b/fec/legal/templates/legal-search-results-murs.jinja
index b7e1348df..a4b2ae8fe 100644
--- a/fec/legal/templates/legal-search-results-murs.jinja
+++ b/fec/legal/templates/legal-search-results-murs.jinja
@@ -243,7 +243,7 @@
   setTimeout(function() {
   (function() {
   //Create an object of the mur_disposition_category_id parameter value(s) from the request
-  const queryFields = {'mur_disposition_category_id':window.context.mur_disposition_category_id}
+  const queryFields = {'mur_disposition_category_id': window.context.mur_disposition_category_id}
   // Create an array to hold checkbox html elements
   const queryBoxes = [];
   // Iterate the key/vals of queryFields

From 469262ad8f96a083e96a8cb222631464bcf884de Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@F612204M.fios-router.home>
Date: Thu, 31 Oct 2024 13:38:09 -0400
Subject: [PATCH 3/6] conditional pagination params so  irrelevant params dont
 show up on other pages(AFs Statutes) that share parent template

---
 fec/legal/templates/partials/legal-pagination.jinja | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fec/legal/templates/partials/legal-pagination.jinja b/fec/legal/templates/partials/legal-pagination.jinja
index e9529f8ed..0421c5045 100644
--- a/fec/legal/templates/partials/legal-pagination.jinja
+++ b/fec/legal/templates/partials/legal-pagination.jinja
@@ -31,7 +31,7 @@
     {% endif %}
 
     {% if current_page > 1 %}
-      <a class="paginate_button previous" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}&offset={{ offset - limit }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">Previous</a>
+      <a class="paginate_button previous" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}{% if primary_subject_id or secondary_subject_id %}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}{% endif %}offset={{ offset - limit }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">Previous</a>
     {% else %}
       <span class="paginate_button previous is-disabled">Previous</span>
     {% endif %}
@@ -41,12 +41,12 @@
       {% if page == current_page %}
         <span class="paginate_button current">{{ page }}</span>
       {% else %}
-        <a class="paginate_button" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}&offset={{ page_offset }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">{{ page }}</a>
+        <a class="paginate_button" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}{% if primary_subject_id or secondary_subject_id %}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}{% endif %}&offset={{ page_offset }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">{{ page }}</a>
       {% endif %}
     {% endfor %}
 
     {% if offset + limit < total_all %}
-      <a class="paginate_button next" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}&offset={{ offset + limit }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">Next</a>
+      <a class="paginate_button next" href="/data/legal/search/{{ result_type }}/?search={{ query }}&case_respondents={{ case_respondents }}{% for category_id in selected_doc_category_ids %}&case_doc_category_id={{ category_id }}{% endfor %}{% for category_id in mur_disposition_category_ids %}&mur_disposition_category_id={{ category_id }}{% endfor %}&case_min_open_date={{ case_min_open_date }}&case_max_open_date={{ case_max_open_date }}&case_min_close_date={{ case_min_close_date }}&case_max_close_date={{ case_max_close_date }}{% if primary_subject_id or secondary_subject_id %}&primary_subject_id={{ primary_subject_id }}&secondary_subject_id={{ secondary_subject_id }}{% endif %}&offset={{ offset + limit }}&limit={{ limit }}&sort={{ sort }}#results-{{ result_type }}">Next</a>
     {% else %}
       <span class="paginate_button next is-disabled">Next</span>
     {% endif %}

From 75553d0d420f43302fced9fe5310840cc27c98a6 Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@F612204M.fios-router.home>
Date: Fri, 1 Nov 2024 01:11:10 -0400
Subject: [PATCH 4/6] rm adr subject filter, adjust js to accommodate

---
 .../layouts/legal-doc-search-results.jinja    | 95 ++++++++++---------
 .../templates/legal-search-results-adrs.jinja | 35 -------
 .../templates/legal-search-results-murs.jinja |  3 +
 fec/legal/views.py                            | 29 +-----
 4 files changed, 53 insertions(+), 109 deletions(-)

diff --git a/fec/legal/templates/layouts/legal-doc-search-results.jinja b/fec/legal/templates/layouts/legal-doc-search-results.jinja
index 69a815196..7bce67b20 100644
--- a/fec/legal/templates/layouts/legal-doc-search-results.jinja
+++ b/fec/legal/templates/layouts/legal-doc-search-results.jinja
@@ -156,58 +156,59 @@
           window.location = url.toString();
         });
       });
-
+     
       // JS for subject MUR/ADR selects
-      const subject_select = document.getElementById('primary_subject_id');
-      const secondary_select_div = document.querySelector("[data-modifies-filter='secondary_subject_id']");
-      const secondary_select = document.getElementById('secondary_subject_id');
-       
-      // The window.context is declared in the child templates (MUR/ADR)
-      const secondary_subject_ids = window.context.secondary_subject_ids;
-      const primary_subject_id = window.context.primary_subject_id;
-      const secondary_subject_id = window.context.secondary_subject_id;
-
-      // Populate secondary select on page load
-      load_secondary_select(primary_subject_id);
-
-      // Add aria attribute to selected option in primary select
-      Array.from(subject_select.options).forEach(option => {
-        if (option.value == primary_subject_id) {
-          //option.selected = 'selected';
-          option.setAttribute('aria-selected', 'true');
-        };
-      });
+      // The window.context is declared in the child templates (MURm, ADR(maybe later))
+      if (window.context && window.context.result_type == 'murs') {
+        const secondary_subject_ids = window.context.secondary_subject_ids;
+        const primary_subject_id = window.context.primary_subject_id;
+        const secondary_subject_id = window.context.secondary_subject_id;
+      
+        const subject_select = document.getElementById('primary_subject_id');
+        const secondary_select_div = document.querySelector("[data-modifies-filter='secondary_subject_id']");
+        const secondary_select = document.getElementById('secondary_subject_id');
+
+        // Populate secondary select on page load
+        load_secondary_select(primary_subject_id);
+        
+        // Add aria attribute to selected option in primary select
+        Array.from(subject_select.options).forEach(option => {
+          if (option.value == primary_subject_id) {
+            option.setAttribute('aria-selected', 'true');
+          };
+        });
 
-      // Load secondary select, upon change of primary select
-      subject_select.addEventListener('change', (event) => {
-        const selected_id = event.target.value;
-        load_secondary_select(selected_id);
-      });
+        // Load secondary select, upon change of primary select
+        subject_select.addEventListener('change', (event) => {
+          const selected_id = event.target.value;
+          load_secondary_select(selected_id);
+        });
 
-      function load_secondary_select(id){
-        // First, reset the secondary select to default
-        secondary_select.replaceChildren(new Option('All', "", false, true))
-        // Show and populate secondary select options, if applicable
-        if (id in secondary_subject_ids) {
-            // Show secondary select
-            secondary_select_div.style.display = 'block';
-            // Append secondary select options
-            for (const [key, value] of Object.entries(secondary_subject_ids[id])) {
-              //If there is a current secondary_subject_id, append it as the selected option
-              if (key == secondary_subject_id) {
-                secondary_select.append(new Option(value, key, true, true));
-                // Add aria-selected to that option
-                secondary_select.options[secondary_select.selectedIndex].setAttribute('aria-selected', 'true');
-              // Append other options, unselected
-              } else {
-                secondary_select.append(new Option(value, key));
+        function load_secondary_select(id){
+          // First, reset the secondary select to default
+          secondary_select.replaceChildren(new Option('All', "", false, true))
+          // Show and populate secondary select options, if applicable
+          if (id in secondary_subject_ids) {
+              // Show secondary select
+              secondary_select_div.style.display = 'block';
+              // Append secondary select options
+              for (const [key, value] of Object.entries(secondary_subject_ids[id])) {
+                //If there is a current secondary_subject_id, append it as the selected option
+                if (key == secondary_subject_id) {
+                  secondary_select.append(new Option(value, key, true, true));
+                  // Add aria-selected to that option
+                  secondary_select.options[secondary_select.selectedIndex].setAttribute('aria-selected', 'true');
+                // Append other options, unselected
+                } else {
+                  secondary_select.append(new Option(value, key));
+                };
               };
-            };
 
-        } else {
-            secondary_select_div.style.display = 'none';
+          } else {
+              secondary_select_div.style.display = 'none';
+          };
         };
-      };
-   });
+      }
+    });
   </script>
 {% endblock %}
diff --git a/fec/legal/templates/legal-search-results-adrs.jinja b/fec/legal/templates/legal-search-results-adrs.jinja
index 9fc05e706..6103cd308 100644
--- a/fec/legal/templates/legal-search-results-adrs.jinja
+++ b/fec/legal/templates/legal-search-results-adrs.jinja
@@ -59,32 +59,10 @@
       </div>
     </div>
   </div>
-  <div class="js-accordion accordion--neutral" data-content-prefix="filter" data-open-first="true">
-    <button type="button" class="js-accordion-trigger accordion__button">Case details</button>
-    <div class="accordion__content">
-      {{
-        dropdown.select_json(
-            'primary_subject_id',
-            'Case subject',
-            options=constants.primary_subject_ids,
-            default=""
-        )
-      }}
-      {{
-        dropdown.select_json_indentation(
-          'secondary_subject_id',
-          'Secondary case subject',
-          options=constants.secondary_subject_placeholder,
-          default=""
-        )
-      }}
-    </div>
-  </div>
   <div class="filters__inner">
     <button type="submit" class="button button--cta">Apply filters</button>
   </div>
 {% endblock %}
-
 {% block message %}
 <div class="data-container__tags u-no-padding-left">
   <div class="row">
@@ -136,16 +114,6 @@
           {% endfor %}
         </li>
       {% endif %}
-      {% if primary_subject_id or secondary_subject_id_name  %}
-        <li data-tag-category="primary_subject_id" class="tag__category tag__category__range--date">
-        {% if primary_subject_id_name and primary_subject_id %}
-          <div data-removable="true" class="tag__item">{{ primary_subject_id_name }}<button class="button js-close tag__remove" data-tag="primary_subject_id"><span class="u-visually-hidden">Remove</span></button></div>
-        {% endif %}
-        {% if secondary_subject_id_name %}
-          <div data-removable="true" class="tag__item">{{ secondary_subject_id_name }}<button class="button js-close tag__remove" data-tag="secondary_subject_id"><span class="u-visually-hidden">Remove</span></button></div>
-        {% endif %}
-        </li>
-      {% endif %}
     </ul>
   </div>
 </div>
@@ -164,7 +132,4 @@
 {% block scripts %}
   {# super loads scripts from parent #}
   {{ super() }}
-  <script>
-     window.context = {{ context_vars|to_json|safe }};
-  </script>
 {% endblock %}
diff --git a/fec/legal/templates/legal-search-results-murs.jinja b/fec/legal/templates/legal-search-results-murs.jinja
index a4b2ae8fe..f444aece7 100644
--- a/fec/legal/templates/legal-search-results-murs.jinja
+++ b/fec/legal/templates/legal-search-results-murs.jinja
@@ -185,6 +185,9 @@
 {% endblock %}
 
 {% block scripts %}
+  <script>
+   window.context = {{ context_vars|to_json|safe }};
+  </script>
   {# super loads scripts from parent #}
   {{ super() }}
   <script>
diff --git a/fec/legal/views.py b/fec/legal/views.py
index a94127285..d45c3386c 100644
--- a/fec/legal/views.py
+++ b/fec/legal/views.py
@@ -349,7 +349,8 @@ def get_secondary_subject_name(id):
 
     # For Javascript
     context_vars = {
-        "mur_disposition_category_id": mur_disposition_category_ids,
+        'result_type': 'murs',
+        'mur_disposition_category_id': mur_disposition_category_ids,
         'primary_subject_id': primary_subject_id,
         'secondary_subject_id': secondary_subject_id,
         'secondary_subject_ids': secondary_subject_ids,
@@ -409,8 +410,6 @@ def legal_doc_search_adr(request):
     case_min_close_date = request.GET.get('case_min_close_date', '')
     case_max_close_date = request.GET.get('case_max_close_date', '')
     case_doc_category_ids = request.GET.getlist('case_doc_category_id', [])
-    primary_subject_id = request.GET.get('primary_subject_id', '')
-    secondary_subject_id = request.GET.get('secondary_subject_id', '')
 
     query, query_exclude = parse_query(original_query)
 
@@ -427,8 +426,6 @@ def legal_doc_search_adr(request):
         case_min_close_date=case_min_close_date,
         case_max_close_date=case_max_close_date,
         case_doc_category_id=case_doc_category_ids,
-        primary_subject_id=primary_subject_id,
-        secondary_subject_id=secondary_subject_id,
     )
 
     # Define ADR document categories dictionary
@@ -451,23 +448,6 @@ def legal_doc_search_adr(request):
             # Checks for document keyword text match
             doc['text_match'] = str(index) in adr['document_highlights']
 
-    # Get primary_subject_id_name from dict
-    primary_subject_id_name = constants.primary_subject_ids.get(primary_subject_id, '')
-    secondary_subject_ids = constants.secondary_subject_ids
-
-    def get_secondary_subject_name(id):
-        for key in secondary_subject_ids:
-            if id in secondary_subject_ids[key]:
-                return secondary_subject_ids[key][id]
-    secondary_subject_id_name = get_secondary_subject_name(secondary_subject_id)
-
-    # For Javascript
-    context_vars = {
-        'primary_subject_id': primary_subject_id,
-        'secondary_subject_id': secondary_subject_id,
-        'secondary_subject_ids': secondary_subject_ids,
-    }
-
     return render(request, 'legal-search-results-adrs.jinja', {
         'parent': 'legal',
         'results': results,
@@ -483,11 +463,6 @@ def get_secondary_subject_name(id):
         'social_image_identifier': 'legal',
         'selected_doc_category_ids': case_doc_category_ids,
         'selected_doc_category_names': adr_document_category_names,
-        'primary_subject_id': primary_subject_id,
-        'secondary_subject_id': secondary_subject_id,
-        'primary_subject_id_name': primary_subject_id_name,
-        'secondary_subject_id_name': secondary_subject_id_name,
-        "context_vars": context_vars,
         'is_loading': True,  # Indicate that the page is loading initially
     })
 

From a50f759c4c83325227a1512b8ef83f15938e31ed Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@F612204M.fios-router.home>
Date: Fri, 1 Nov 2024 10:22:23 -0400
Subject: [PATCH 5/6] rm unused import

---
 fec/legal/templates/legal-search-results-adrs.jinja | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fec/legal/templates/legal-search-results-adrs.jinja b/fec/legal/templates/legal-search-results-adrs.jinja
index 6103cd308..c9da5d43d 100644
--- a/fec/legal/templates/legal-search-results-adrs.jinja
+++ b/fec/legal/templates/legal-search-results-adrs.jinja
@@ -1,6 +1,5 @@
 {% extends "layouts/legal-doc-search-results.jinja" %}
 {% import 'macros/legal.jinja' as legal %}
-{% import 'macros/filters/dropdown-json.jinja' as dropdown %}
 {% set document_type_display_name = 'Alternative Dispute Resolution' %}
 
 {% block header %}

From ca94b30c3a3f74af89a54b8c1179d415ab6d5f35 Mon Sep 17 00:00:00 2001
From: John Carroll <jcarroll@F612204M.fios-router.home>
Date: Sun, 3 Nov 2024 18:53:34 -0500
Subject: [PATCH 6/6] styling on sub-select and success msg

---
 fec/fec/static/scss/components/_filters.scss | 22 +++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/fec/fec/static/scss/components/_filters.scss b/fec/fec/static/scss/components/_filters.scss
index 9a51664ac..80506682d 100644
--- a/fec/fec/static/scss/components/_filters.scss
+++ b/fec/fec/static/scss/components/_filters.scss
@@ -240,6 +240,7 @@ $filter-button-width: u(4.6rem);
   }
 
   select {
+    width: 100%;
     max-width: 26rem;
   }
 
@@ -250,12 +251,27 @@ $filter-button-width: u(4.6rem);
   }
 
   &.sub--filter--indent {
-    border-left: 3px solid $gray;
+    position: relative;
     padding-left: 5%;
-
-    select, input {
+  
+    select {
       width: 100%;
     }
+
+    &::before {
+      display: block;
+      position: absolute;
+      left: 0;
+      content: '';
+      height: 6rem;
+      border-left: 3px solid $gray;
+    }
+
+    .filter__message {
+      border-left: 3px solid $gray;
+      padding: 5% 0 0 5%;
+      margin: -5% 0 4% -5.2%;
+    }
   }
 }