feat(all-transactions): turn filter, order and search into a single bar

app/templates/monthly_overview/pages/overview.html

@@ -152,7 +152,7 @@
               <i class="fa-solid fa-filter fa-fw"></i>
             </button>
 
-            {# 2. Search box #}
+            {# Search box #}
             <label for="quick-search">
             </label>
             <input type="search"
@@ -170,7 +170,7 @@
                          show <.transaction/> in <#transactions-list/>
                          when its textContent.toLowerCase() contains my value.toLowerCase()">
 
-            {# 3. Order by icon dropdown #}
+            {# Order by icon dropdown #}
             <button class="btn btn-secondary dropdown-toggle dropdown-toggle-no-icon" type="button"
                     data-bs-toggle="dropdown" aria-expanded="false"
                     title="{% translate 'Order by' %}">

app/templates/transactions/fragments/list_all.html

@@ -5,31 +5,38 @@
 
 <div id="transactions-list">
   {% for x in transactions_by_date %}
-    <div id="{{ x.grouper|slugify }}"
+    <div id="{{ x.grouper|slugify }}" class="transactions-divider"
-         _="on htmx:afterSettle from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
+         _="on htmx:afterSwap from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
-      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body">
+      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body transactions-divider-title">
         <a class="text-decoration-none d-inline-block w-100"
            role="button"
            data-bs-toggle="collapse"
            data-bs-target="#c-{{ x.grouper|slugify }}-collapse"
            id="c-{{ x.grouper|slugify }}-collapsible"
-           aria-expanded="true"
+           aria-expanded="false"
            aria-controls="c-{{ x.grouper|slugify }}-collapse">
         {{ x.grouper }}
         </a>
       </div>
-      <div class="collapse" id="c-{{ x.grouper|slugify }}-collapse"
+      <div class="collapse transactions-divider-collapse" id="c-{{ x.grouper|slugify }}-collapse"
            _="on shown.bs.collapse sessionStorage.setItem(the closest parent @id, 'true')
               on hidden.bs.collapse sessionStorage.setItem(the closest parent @id, 'false')
-              on htmx:afterSettle from #transactions
+              on htmx:afterSettle from #transactions or toggle
                 set state to sessionStorage.getItem(the closest parent @id)
                 if state is 'true' or state is null
                   add .show to me
                   set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to true
-                end">
+                else
+                  remove .show from me
+                  set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to false
+                end
+              on show
+                add .show to me
+                set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to true">
         <div class="d-flex flex-column">
         {% for transaction in x.list %}
-          <c-transaction.item :transaction="transaction"></c-transaction.item>
+          <c-transaction.item
+            :transaction="transaction"></c-transaction.item>
         {% endfor %}
         </div>
       </div>

app/templates/transactions/pages/transactions.html

@@ -8,45 +8,101 @@
   <div class="container px-md-3 py-3 column-gap-5">
     <div class="row gx-xl-4 gy-3">
       <div class="col-12 col-xl-8 order-2 order-xl-1">
-        <div class="row mb-1">
+        <div class="mb-3">
-          <div class="col-sm-6 col-12">
+          {# Hidden select to hold the order value and preserve the original update trigger #}
-            {#        Filter transactions button #}
+          <select name="order" id="order" class="d-none" _="on change trigger updated on window">
-            <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle" type="button"
+            <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
-                    data-bs-toggle="collapse" data-bs-target="#collapse-filter" aria-expanded="false"
+            <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
-                    aria-controls="collapse-filter">
+            <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
-              <i class="fa-solid fa-filter fa-fw me-2"></i>{% translate 'Filter transactions' %}
-            </button>
-          </div>
-          {#        Ordering button#}
-          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
-            <div class="text-sm-end" _="on change trigger updated on window">
-              <label for="order">{% translate "Order by" %}</label>
-              <select
-                  class="tw:border-0 tw:focus-visible:outline-0 w-full pe-2 tw:leading-normal text-bg-tertiary tw:font-medium rounded bg-body text-body"
-                  name="order" id="order">
-                <option value="default"
-                        {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
-                <option value="older"
-                        {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
-                <option value="newer"
-                        {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
           </select>
+
+          {# Main control bar with filter, search, and ordering #}
+          <div class="input-group">
+
+            <button class="btn btn-secondary position-relative" type="button"
+                    data-bs-toggle="collapse" data-bs-target="#collapse-filter"
+                    aria-expanded="false" aria-controls="collapse-filter" id="filter-button" hx-preserve
+                    title="{% translate 'Filter transactions' %}">
+              <i class="fa-solid fa-filter fa-fw"></i>
+            </button>
+
+            {# Search box #}
+            <label for="quick-search">
+            </label>
+            <input type="search"
+                   class="form-control"
+                   placeholder="{% translate 'Search' %}"
+                   hx-preserve
+                   id="quick-search"
+                   _="on input or search or htmx:afterSwap from window
+                         if my value is empty
+                           trigger toggle on <.transactions-divider-collapse/>
+                         else
+                           trigger show on <.transactions-divider-collapse/>
+                         end
+                         show <.transactions-divider-title/> when my value is empty
+                         show <.transaction/> in <#transactions-list/>
+                         when its textContent.toLowerCase() contains my value.toLowerCase()">
+
+            {# Order by icon dropdown #}
+            <button class="btn btn-secondary dropdown-toggle dropdown-toggle-no-icon" type="button"
+                    data-bs-toggle="dropdown" aria-expanded="false"
+                    title="{% translate 'Order by' %}">
+              <i class="fa-solid fa-sort fa-fw"></i>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-end">
+              <li>
+                <button class="dropdown-item {% if order == 'default' %}active{% endif %}" type="button"
+                        _="on click remove .active from .dropdown-item in the closest <ul/>
+                           then add .active to me
+                           then set the value of #order to 'default'
+                           then trigger change on #order">
+                  {% translate 'Default' %}
+                </button>
+              </li>
+              <li>
+                <button class="dropdown-item {% if order == 'older' %}active{% endif %}" type="button"
+                        _="on click remove .active from .dropdown-item in the closest <ul/>
+                           then add .active to me
+                           then set the value of #order to 'older'
+                           then trigger change on #order">
+                  {% translate 'Oldest first' %}
+                </button>
+              </li>
+              <li>
+                <button class="dropdown-item {% if order == 'newer' %}active{% endif %}" type="button"
+                        _="on click remove .active from .dropdown-item in the closest <ul/>
+                           then add .active to me
+                           then set the value of #order to 'newer'
+                           then trigger change on #order">
+                  {% translate 'Newest first' %}
+                </button>
+              </li>
+            </ul>
           </div>
-          </div>
+
-        </div>
           {# Filter transactions form #}
-        <div class="collapse" id="collapse-filter">
+          <div class="collapse" id="collapse-filter" hx-preserve>
             <div class="card card-body">
-            <form _="on change or submit or search trigger updated on window end
+              <div class="text-end">
+                <button class="btn btn-outline-danger btn-sm tw:w-fit"
+                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
+              </div>
+
+              <form _="on change or submit or search trigger updated on window
                          install init_tom_select
                          install init_datepicker"
-                  id="filter">
+                    id="filter" class="mt-3">
                 {% crispy filter.form %}
               </form>
-            <button class="btn btn-outline-danger btn-sm"
+
+              <div class="text-end">
+                <button class="btn btn-outline-danger btn-sm tw:w-fit"
                         _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
               </div>
             </div>
+          </div>
+        </div>
         <div id="transactions"
              class="show-loading"
              hx-get="{% url 'transactions_all_list' %}"