From cd7c1bba21292bc9d255e03d65694586bfbbd698 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Sat, 13 Apr 2024 09:21:48 -0500
Subject: [PATCH] Rename template for grid filters (drop buefy suffix)

also remove some deprecated functions
---
 tailbone/config.py                          | 21 +----
 tailbone/templates/grids/buefy.mako         |  2 +-
 tailbone/templates/grids/filters.mako       | 98 ++++++++++++++-------
 tailbone/templates/grids/filters_buefy.mako | 70 ---------------
 4 files changed, 67 insertions(+), 124 deletions(-)
 delete mode 100644 tailbone/templates/grids/filters_buefy.mako

diff --git a/tailbone/config.py b/tailbone/config.py
index 6106e87e..9326a3cb 100644
--- a/tailbone/config.py
+++ b/tailbone/config.py
@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2023 Lance Edgar
+#  Copyright © 2010-2024 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -61,25 +61,6 @@ def csrf_header_name(config):
     return config.get('tailbone', 'csrf_header_name', default='X-CSRF-TOKEN')
 
 
-def get_buefy_version(config):
-    warnings.warn("get_buefy_version() is deprecated; please use "
-                  "tailbone.util.get_libver() instead",
-                  DeprecationWarning, stacklevel=2)
-
-    version = config.get('tailbone', 'libver.buefy')
-    if version:
-        return version
-
-    return config.get('tailbone', 'buefy_version',
-                      default='latest')
-
-
-def get_buefy_0_8(config, version=None):
-    warnings.warn("get_buefy_0_8() is no longer supported",
-                  DeprecationWarning, stacklevel=2)
-    return False
-
-
 def global_help_url(config):
     return config.get('tailbone', 'global_help_url')
 
diff --git a/tailbone/templates/grids/buefy.mako b/tailbone/templates/grids/buefy.mako
index cbe33062..73c7e415 100644
--- a/tailbone/templates/grids/buefy.mako
+++ b/tailbone/templates/grids/buefy.mako
@@ -136,7 +136,7 @@
         <div class="filters">
           % if grid.filterable:
               ## TODO: stop using |n filter
-              ${grid.render_filters(template='/grids/filters_buefy.mako', allow_save_defaults=allow_save_defaults)|n}
+              ${grid.render_filters(allow_save_defaults=allow_save_defaults)|n}
           % endif
         </div>
       </div>
diff --git a/tailbone/templates/grids/filters.mako b/tailbone/templates/grids/filters.mako
index 857f53b1..5e1fef9b 100644
--- a/tailbone/templates/grids/filters.mako
+++ b/tailbone/templates/grids/filters.mako
@@ -1,38 +1,70 @@
 ## -*- coding: utf-8; -*-
-<div class="newfilters">
 
-  ${h.form(form.action_url, method='get')}
-    ${h.hidden('reset-to-default-filters', value='false')}
-    ${h.hidden('save-current-filters-as-defaults', value='false')}
+<form action="${form.action_url}" method="GET" @submit.prevent="applyFilters()">
 
-    <fieldset>
-      <legend>Filters</legend>
-      % for filtr in form.iter_filters():
-          <div class="filter" id="filter-${filtr.key}" data-key="${filtr.key}"${' style="display: none;"' if not filtr.active else ''|n}>
-            ${h.checkbox('{}-active'.format(filtr.key), class_='active', id='filter-active-{}'.format(filtr.key), checked=filtr.active)}
-            <label for="filter-active-${filtr.key}">${filtr.label}</label>
-            <div class="inputs" style="display: inline-block;">
-              ${form.filter_verb(filtr)}
-              ${form.filter_value(filtr)}
-            </div>
-          </div>
-      % endfor
-    </fieldset>
+  <grid-filter v-for="key in filtersSequence"
+               :key="key"
+               :filter="filters[key]"
+               ref="gridFilters">
+  </grid-filter>
 
-    <div class="buttons">
-      <button type="submit" id="apply-filters">Apply Filters</button>
-      <select id="add-filter">
-        <option value="">Add a Filter</option>
-        % for filtr in form.iter_filters():
-            <option value="${filtr.key}"${' disabled="disabled"' if filtr.active else ''|n}>${filtr.label}</option>
-        % endfor
-      </select>
-      <button type="button" id="default-filters">Default View</button>
-      <button type="button" id="clear-filters">No Filters</button>
-      % if allow_save_defaults and request.user:
-          <button type="button" id="save-defaults">Save Defaults</button>
-      % endif
-    </div>
+  <b-field grouped>
 
-  ${h.end_form()}
-</div><!-- newfilters -->
+    <b-button type="is-primary"
+              native-type="submit"
+              icon-pack="fas"
+              icon-left="check"
+              class="control">
+      Apply Filters
+    </b-button>
+
+    <b-button v-if="!addFilterShow"
+              icon-pack="fas"
+              icon-left="plus"
+              class="control"
+              @click="addFilterButton">
+      Add Filter
+    </b-button>
+
+    <b-autocomplete v-if="addFilterShow"
+                    ref="addFilterAutocomplete"
+                    :data="addFilterChoices"
+                    v-model="addFilterTerm"
+                    placeholder="Add Filter"
+                    field="key"
+                    :custom-formatter="filtr => filtr.label"
+                    open-on-focus
+                    keep-first
+                    icon-pack="fas"
+                    clearable
+                    clear-on-select
+                    @select="addFilterSelect"
+                    @keydown.native="addFilterKeydown">
+    </b-autocomplete>
+
+    <b-button @click="resetView()"
+              icon-pack="fas"
+              icon-left="home"
+              class="control">
+      Default View
+    </b-button>
+
+    <b-button @click="clearFilters()"
+              icon-pack="fas"
+              icon-left="trash"
+              class="control">
+      No Filters
+    </b-button>
+
+    % if allow_save_defaults and request.user:
+        <b-button @click="saveDefaults()"
+                  icon-pack="fas"
+                  icon-left="save"
+                  class="control">
+          Save Defaults
+        </b-button>
+    % endif
+
+  </b-field>
+
+</form>
diff --git a/tailbone/templates/grids/filters_buefy.mako b/tailbone/templates/grids/filters_buefy.mako
deleted file mode 100644
index 5e1fef9b..00000000
--- a/tailbone/templates/grids/filters_buefy.mako
+++ /dev/null
@@ -1,70 +0,0 @@
-## -*- coding: utf-8; -*-
-
-<form action="${form.action_url}" method="GET" @submit.prevent="applyFilters()">
-
-  <grid-filter v-for="key in filtersSequence"
-               :key="key"
-               :filter="filters[key]"
-               ref="gridFilters">
-  </grid-filter>
-
-  <b-field grouped>
-
-    <b-button type="is-primary"
-              native-type="submit"
-              icon-pack="fas"
-              icon-left="check"
-              class="control">
-      Apply Filters
-    </b-button>
-
-    <b-button v-if="!addFilterShow"
-              icon-pack="fas"
-              icon-left="plus"
-              class="control"
-              @click="addFilterButton">
-      Add Filter
-    </b-button>
-
-    <b-autocomplete v-if="addFilterShow"
-                    ref="addFilterAutocomplete"
-                    :data="addFilterChoices"
-                    v-model="addFilterTerm"
-                    placeholder="Add Filter"
-                    field="key"
-                    :custom-formatter="filtr => filtr.label"
-                    open-on-focus
-                    keep-first
-                    icon-pack="fas"
-                    clearable
-                    clear-on-select
-                    @select="addFilterSelect"
-                    @keydown.native="addFilterKeydown">
-    </b-autocomplete>
-
-    <b-button @click="resetView()"
-              icon-pack="fas"
-              icon-left="home"
-              class="control">
-      Default View
-    </b-button>
-
-    <b-button @click="clearFilters()"
-              icon-pack="fas"
-              icon-left="trash"
-              class="control">
-      No Filters
-    </b-button>
-
-    % if allow_save_defaults and request.user:
-        <b-button @click="saveDefaults()"
-                  icon-pack="fas"
-                  icon-left="save"
-                  class="control">
-          Save Defaults
-        </b-button>
-    % endif
-
-  </b-field>
-
-</form>