Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Remove deprecated table filter dropdown partials (#13705)

Damian Legawiece092c0784baa
diff --git a/spree/admin/app/controllers/spree/admin/gift_cards_controller.rb b/spree/admin/app/controllers/spree/admin/gift_cards_controller.rb
index 8b9b0fc0be..fcc176f9eb 100644
--- a/spree/admin/app/controllers/spree/admin/gift_cards_controller.rb
+++ b/spree/admin/app/controllers/spree/admin/gift_cards_controller.rb
@@ -6,8 +6,6 @@ module Spree
before_action :add_breadcrumbs
before_action :load_orders, only: :show
- helper_method :gift_cards_filter_dropdown_value
-
private
def permitted_resource_params
@@ -49,19 +47,6 @@ module Spree
@user = Spree.user_class.find_by_prefix_id(params[:user_id]) if params[:user_id].present?
end
- def gift_cards_filter_dropdown_value
- Spree::Deprecation.warn("gift_cards_filter_dropdown_value is deprecated and will be removed in Spree 5.5")
- if params.dig(:q, :active).present?
- Spree.t('admin.gift_cards.active')
- elsif params.dig(:q, :expired).present?
- Spree.t(:expired)
- elsif params.dig(:q, :redeemed).present?
- Spree.t('admin.gift_cards.redeemed')
- else
- Spree.t('admin.gift_cards.all_statuses')
- end
- end
-
def add_breadcrumbs
if @user.present?
@breadcrumb_icon = 'users'
diff --git a/spree/admin/app/helpers/spree/admin/orders_helper.rb b/spree/admin/app/helpers/spree/admin/orders_helper.rb
index a94ca1b605..a20241866b 100644
--- a/spree/admin/app/helpers/spree/admin/orders_helper.rb
+++ b/spree/admin/app/helpers/spree/admin/orders_helper.rb
@@ -141,24 +141,6 @@ module Spree
}
end
- def order_filter_dropdown_value
- Spree::Deprecation.warn("order_filter_dropdown_value is deprecated and will be removed in Spree 5.5")
-
- if params.dig(:q, :shipment_state_not_in) == ['shipped', 'canceled']
- Spree.t('admin.orders.unfulfilled')
- elsif params.dig(:q, :shipment_state_eq) == 'shipped'
- Spree.t('admin.orders.fulfilled')
- elsif params.dig(:q, :state_in) == ['canceled','partially_canceled']
- Spree.t('admin.orders.canceled')
- elsif params.dig(:q, :refunded)&.present?
- Spree.t('admin.orders.refunded')
- elsif params.dig(:q, :partially_refunded)&.present?
- Spree.t('admin.orders.partially_refunded')
- else
- Spree.t('admin.orders.all_orders')
- end
- end
-
private
def map_to_tax_line(tax_adjustment, for_shipment: false)
diff --git a/spree/admin/app/helpers/spree/admin/products_helper.rb b/spree/admin/app/helpers/spree/admin/products_helper.rb
index 552cf78ee6..f9cce1bac7 100644
--- a/spree/admin/app/helpers/spree/admin/products_helper.rb
+++ b/spree/admin/app/helpers/spree/admin/products_helper.rb
@@ -76,28 +76,6 @@ module Spree
category_tree
end
- def product_filter_status_dropdown_value
- case params.dig(:q, :status_eq)
- when 'active'
- Spree.t('admin.products.active')
- when 'draft'
- Spree.t('admin.products.draft')
- when 'archived'
- Spree.t('admin.products.archived')
- else
- Spree.t('admin.products.all_statuses')
- end
- end
-
- def product_filter_stock_dropdown_value
- if params.dig(:q, :in_stock) == '1'
- Spree.t('admin.products.in_stock')
- elsif params.dig(:q, :out_of_stock) == '1'
- Spree.t('admin.products.out_of_stock')
- else
- Spree.t('admin.products.any_stock')
- end
- end
def show_product_status_help_bubble?
false
@@ -106,11 +84,6 @@ module Spree
def variant_form_stock_location_options
options_for_select(available_stock_locations_list)
end
-
- def product_list_filters_search_form_path
- [:admin, @search]
- end
-
end
end
end
diff --git a/spree/admin/app/helpers/spree/admin/promotions_helper.rb b/spree/admin/app/helpers/spree/admin/promotions_helper.rb
index 614d188f28..6fc89c3d45 100644
--- a/spree/admin/app/helpers/spree/admin/promotions_helper.rb
+++ b/spree/admin/app/helpers/spree/admin/promotions_helper.rb
@@ -1,17 +1,6 @@
module Spree
module Admin
module PromotionsHelper
- def promotion_filter_dropdown_value
- Spree::Deprecation.warn("promotion_filter_dropdown_value is deprecated and will be removed in Spree 5.5")
- if params.dig(:q, :expired)
- Spree.t(:expired)
- elsif params.dig(:q, :active)
- Spree.t(:active)
- else
- Spree.t(:all)
- end
- end
-
def promotion_status(promotion)
if promotion.active?
Spree.t(:active)
diff --git a/spree/admin/app/views/spree/admin/customer_returns/_filters.html.erb b/spree/admin/app/views/spree/admin/customer_returns/_filters.html.erb
deleted file mode 100644
index caacdc5707..0000000000
--- a/spree/admin/app/views/spree/admin/customer_returns/_filters.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
- <%= search_form_for [:admin, @search], url: spree.admin_customer_returns_path, class: "filter-wrap", data: {controller: "filters"} do |f| %>
- <%= render "spree/admin/shared/filters_search_bar",
- param: :number_cont,
- label: Spree.t(:number) %>
-
- <%= render_admin_partials(:customer_returns_filters_partials, f: f) %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
-
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
- <% end %>
\ No newline at end of file
diff --git a/spree/admin/app/views/spree/admin/gift_cards/_filters.html.erb b/spree/admin/app/views/spree/admin/gift_cards/_filters.html.erb
deleted file mode 100644
index 370f1ace56..0000000000
--- a/spree/admin/app/views/spree/admin/gift_cards/_filters.html.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-<% frame_name ||= nil %>
-<% filter_form_url = params[:user_id].present? ? spree.admin_user_gift_cards_path(params[:user_id]) : spree.admin_gift_cards_path %>
-
-<%= search_form_for @search,
- url: filter_form_url,
- class: "filter-wrap",
- data: {
- controller: "filters dialog",
- filters_url_value: request.url
- } do |f| %>
- <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
-
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %>
- <%= render "table_filter_dropdown" %>
- <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %>
- <%= icon "adjustments", class: "mr-1" %>
- <%= Spree.t("admin.filters") %>
- <% end %>
- </div>
-
- <%= drawer(id: 'gift-card-filters-drawer', controller_name: 'dialog') do %>
- <%= drawer_header(Spree.t(:filter), 'dialog') %>
- <div class="drawer-body">
- <% if params[:user_id].blank? %>
- <div class="form-group">
- <%= f.label :users_email_eq, Spree.t(:email) %>
- <%= f.text_field :users_email_eq, class: "form-input", data: {filters_target: :input} %>
- </div>
- <% end %>
-
- <div class="form-group">
- <%= f.label :batch_prefix_eq, Spree.t('admin.gift_card_batches.prefix') %>
- <%= f.text_field :batch_prefix_eq, class: "form-input", data: {filters_target: :input} %>
- </div>
-
- <%= render_admin_partials(:gift_cards_filters_partials, f: f) %>
- </div>
- <div class="drawer-footer">
- <%= drawer_discard_button('dialog') %>
- <div class="form-actions">
- <%= turbo_save_button_tag Spree.t(:filter_results) do %>
- <%= icon("search") %>
- <%= Spree.t(:filter_results) %>
- <% end %>
- </div>
- </div>
- <% end %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
-
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb b/spree/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb
deleted file mode 100644
index c9d94e4ad6..0000000000
--- a/spree/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%= dropdown do %>
- <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
- <span class="text-gray-600 font-normal">Show:</span>
- <%= gift_cards_filter_dropdown_value %>
- <% end %>
- <%= dropdown_menu do %>
-
- <%= active_link_to Spree.t('admin.gift_cards.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: nil, redeemed: nil, partially_redeemed: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[active expired redeemed partially_redeemed] ).all?(&:blank?) %>
-
- <%= link_to Spree.t('admin.gift_cards.active'),
- params.to_unsafe_h.deep_merge({page: nil, q: {active: true, expired: nil, redeemed: nil, partially_redeemed: nil}}),
- class: "dropdown-item #{'active' if params[:q] && params[:q][:active].present?}" %>
-
- <%= link_to params.to_unsafe_h.deep_merge({page: nil, q: {expired: true, active: nil, redeemed: nil, partially_redeemed: nil}}),
- class: "dropdown-item #{'active' if params[:q] && params[:q][:expired].present?}" do %>
- <%= Spree.t(:expired) %>
- <% end %>
-
- <%= link_to params.to_unsafe_h.deep_merge({page: nil, q: {redeemed: true, active: nil, expired: nil, partially_redeemed: nil}}),
- class: "dropdown-item #{'active' if params[:q] && params[:q][:redeemed].present?}" do %>
- <%= Spree.t('admin.gift_cards.redeemed') %>
- <% end %>
-
- <% end %>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb b/spree/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb
deleted file mode 100644
index 5ff1a6ecdb..0000000000
--- a/spree/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters auto-submit"} do |f| %>
- <div class="flex">
- <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, label: Spree.t(:title) %>
-
- <%= select_tag 'q[resource_type_eq]',
- options_for_select(metafield_definition_resource_types, params.dig(:q, :resource_type_eq)),
- {
- include_blank: Spree.t(:all),
- class: 'form-select w-20',
- data: {
- filters_target: :input,
- action: 'auto-submit#submit'
- }
- } %>
- </div>
- <%= render "spree/admin/shared/filter_badge_template" %>
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
\ No newline at end of file
diff --git a/spree/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb b/spree/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb
deleted file mode 100644
index a135b90c08..0000000000
--- a/spree/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters" } do |f| %>
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :email_cont, label: Spree.t(:email) %>
-
- <%= dropdown do %>
- <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
- <span class="text-gray-600 font-normal mr-1">
- <%= Spree.t(:show) %>
- </span>
- <%# Show current filter value %>
- <% current_value =
- if params.dig(:q, :verified).to_s == 'true'
- Spree.t('admin.newsletter_subscribers.verified')
- elsif params.dig(:q, :unverified).to_s == 'true'
- Spree.t('admin.newsletter_subscribers.unverified')
- else
- Spree.t('admin.newsletter_subscribers.all')
- end
- %>
- <%= current_value %>
- <% end %>
- <%= dropdown_menu do %>
- <%= active_link_to Spree.t('admin.newsletter_subscribers.all'),
- params.to_unsafe_h.deep_merge(q: { verified: nil, unverified: nil }),
- class: 'dropdown-item',
- active: params.dig(:q, :verified).blank? && params.dig(:q, :unverified).blank? %>
- <%= active_link_to Spree.t('admin.newsletter_subscribers.verified'),
- params.to_unsafe_h.deep_merge(q: { verified: true, unverified: nil }),
- class: 'dropdown-item',
- active: params.dig(:q, :verified).to_s == 'true' %>
- <%= active_link_to Spree.t('admin.newsletter_subscribers.unverified'),
- params.to_unsafe_h.deep_merge(q: { verified: nil, unverified: true }),
- class: 'dropdown-item',
- active: params.dig(:q, :unverified).to_s == 'true' %>
- <% end %>
- <% end %>
- </div>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/option_types/_filters.html.erb b/spree/admin/app/views/spree/admin/option_types/_filters.html.erb
deleted file mode 100644
index ebd5624100..0000000000
--- a/spree/admin/app/views/spree/admin/option_types/_filters.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>
- <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
-
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/orders/_filters.html.erb b/spree/admin/app/views/spree/admin/orders/_filters.html.erb
deleted file mode 100644
index 73e9bd02fa..0000000000
--- a/spree/admin/app/views/spree/admin/orders/_filters.html.erb
+++ /dev/null
@@ -1,116 +0,0 @@
-<% frame_name ||= nil %>
-
-<% search_form_path = if @user.present?
- spree.admin_user_orders_path(@user)
- elsif @vendor.present? && spree.respond_to?(:admin_vendor_orders_path)
- spree.admin_vendor_orders_path(@vendor)
- elsif controller_name == 'checkouts'
- spree.admin_checkouts_path
- else
- spree.admin_orders_path
- end %>
-
-<%= search_form_for [:admin, @vendor || @user, @search],
- url: search_form_path,
- class: "filter-wrap",
- data: {
- controller: "filters dialog",
- filters_url_value: request.url
- } do |f| %>
- <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
-
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
-
- <% if controller_name == 'checkouts' %>
- <%= render "spree/admin/shared/calendar_range_picker",
- date_from_input_name: "q[created_at_gt]",
- date_to_input_name: "q[created_at_lt]",
- date_from_value: params.dig(:q, :created_at_gt),
- date_to_value: params.dig(:q, :created_at_lt) %>
- <% else %>
- <%= render "spree/admin/shared/calendar_range_picker",
- date_from_input_name: "q[completed_at_gt]",
- date_to_input_name: "q[completed_at_lt]",
- date_from_value: params.dig(:q, :completed_at_gt),
- date_to_value: params.dig(:q, :completed_at_lt) %>
- <% end %>
-
- <%= render "spree/admin/orders/table_filter_dropdown" %>
- <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %>
- <%= icon "adjustments", class: "mr-1" %>
- <%= Spree.t("admin.filters") %>
- <% end %>
- </div>
-
- <%= drawer(id: 'order-filters-drawer', controller_name: 'dialog') do %>
- <%= drawer_header(Spree.t(:filter), 'dialog') %>
- <div class="drawer-body">
- <%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %>
- <%= f.hidden_field :state_not_eq, value: params.dig(:q, :state_not_eq) %>
- <%= f.hidden_field :user_id_eq, value: @user.try(:id) %>
- <%= f.hidden_field :shipment_state_eq, value: params.dig(:q, :shipment_state_eq) %>
- <% Array(params.dig(:q, :shipment_state_not_in)).each do |state| %>
- <%= hidden_field_tag 'q[shipment_state_not_in][]', state %>
- <% end %>
- <%= f.hidden_field :state_eq, value: params.dig(:q, :state_eq) %>
- <% Array(params.dig(:q, :state_in)).each do |state| %>
- <%= hidden_field_tag 'q[state_in][]', state %>
- <% end %>
- <%= f.hidden_field :refunded, value: params.dig(:q, :refunded) %>
- <%= f.hidden_field :partially_refunded, value: params.dig(:q, :partially_refunded) %>
-
-
- <% unless @user %>
- <div class="form-group">
- <%= label_tag :q_bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
- <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-input", data: { filters_target: :input } %>
- </div>
- <div class="form-group">
- <%= label_tag :q_bill_address_lastname_eq, Spree.t(:last_name) %>
- <%= f.text_field :bill_address_lastname_eq, class: "form-input", data: { filters_target: :input } %>
- </div>
- <div class="form-group">
- <%= label_tag :q_email_eq, Spree.t(:email) %>
- <%= f.email_field :email_eq, class: "form-input", data: { filters_target: :input } %>
- </div>
- <% end %>
- <div class="form-group">
- <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
- <%= f.text_field :line_items_variant_sku_eq, class: "form-input", data: { filters_target: :input } %>
- </div>
-
- <div class="form-group">
- <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
- <%= f.select :promotions_id_in,
- Spree::Promotion.applied.pluck(:name, :id),
- { include_blank: true },
- data: {
- controller: "autocomplete-select",
- filters_target: :input,
- } %>
- </div>
- <div class="form-group">
- <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
- <% payment_state_options = Spree::Order::PAYMENT_STATES.map { |state| [Spree.t("payment_states.#{state}"), state] } %>
- <% payment_state_options += [
- [Spree.t('payment_states.refunded'), 'refunded'],
- [Spree.t('payment_states.partially_refunded'), 'partially_refunded']
- ] %>
- <%= f.select :payment_state_eq,
- payment_state_options,
- { include_blank: true },
- { class: "form-select", data: { filters_target: :input } } %>
- </div>
-
- <%= render_admin_partials(:orders_filters_partials, f: f) %>
- </div>
- <div class="drawer-footer">
- <%= drawer_discard_button('dialog') %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
- <% end %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb b/spree/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb
deleted file mode 100644
index 909b3b6ca4..0000000000
--- a/spree/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<% if controller_name == 'orders' %>
- <%= dropdown do %>
- <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
- <span class="text-gray-600 font-normal mr-1">
- <%= Spree.t(:show) %>
- </span>
- <%= order_filter_dropdown_value %>
- <% end %>
- <%= dropdown_menu do %>
- <%= active_link_to Spree.t('admin.orders.all_orders'), params.to_unsafe_h.deep_merge({q: {shipment_state_eq: '', shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: '' }}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[payment_state_not_eq shipment_state_not_in shipment_state_eq state_eq state_in refunded partially_refunded] ).all?(&:blank?) %>
- <%= link_to params.to_unsafe_h.deep_merge({q: {shipment_state_not_in: [:shipped, :canceled], shipment_state_eq: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),
- class: "dropdown-item flex items-center justify-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %>
- <%= Spree.t('admin.orders.unfulfilled') %>
- <% if ready_to_ship_orders_count&.positive? %>
- <span class="badge badge-light ml-2">
- <%= ready_to_ship_orders_count %>
- </span>
- <% end %>
- <% end %>
- <%= link_to Spree.t('admin.orders.fulfilled'),
- params.to_unsafe_h.deep_merge({q: {shipment_state_eq: :shipped, shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),
- class: "dropdown-item #{'active' if params[:q][:shipment_state_eq] == 'shipped'}" %>
- <%= link_to Spree.t('admin.orders.canceled'),
- params.to_unsafe_h.deep_merge({q: {state_eq: nil, state_in: [:canceled, :partially_canceled], shipment_state_not_in: '', shipment_state_eq: '', refunded: '', partially_refunded: ''}}),
- class: "dropdown-item #{'active' if params[:q][:state_in] == ['canceled','partially_canceled']}" %>
- <%= link_to Spree.t('admin.orders.refunded'),
- params.to_unsafe_h.deep_merge({q: {refunded: '1', shipment_state_not_in: '', shipment_state_eq: '', state_eq: '', state_in: '', partially_refunded: ''}}),
- class: "dropdown-item #{'active' if params.dig(:q, :refunded) && params[:q][:refunded].present?}" %>
- <%= link_to Spree.t('admin.orders.partially_refunded'),
- params.to_unsafe_h.deep_merge({q: {partially_refunded: '1', shipment_state_not_in: '', shipment_state_eq: '', state_eq: '', state_in: '', refunded: '' }}),
- class: "dropdown-item #{'active' if params.dig(:q, :partially_refunded) && params[:q][:partially_refunded].present?}" %>
- <% end %>
- <% end %>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/policies/_filters.html.erb b/spree/admin/app/views/spree/admin/policies/_filters.html.erb
deleted file mode 100644
index f92649a433..0000000000
--- a/spree/admin/app/views/spree/admin/policies/_filters.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters" } do |f| %>
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %>
- </div>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
\ No newline at end of file
diff --git a/spree/admin/app/views/spree/admin/products/_filters.html.erb b/spree/admin/app/views/spree/admin/products/_filters.html.erb
deleted file mode 100644
index 3f6e2cfedc..0000000000
--- a/spree/admin/app/views/spree/admin/products/_filters.html.erb
+++ /dev/null
@@ -1,66 +0,0 @@
-<% frame_name ||= nil %>
-
-
-<%= search_form_for product_list_filters_search_form_path,
- class: "filter-wrap",
- data: {
- controller: "filters dialog",
- filters_url_value: request.url
- } do |f| %>
- <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
-
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
- <%= render "spree/admin/products/table_filter_dropdown" %>
- <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %>
- <%= icon "adjustments", class: "mr-1" %>
- <%= Spree.t("admin.filters") %>
- <% end %>
- </div>
-
- <%= drawer(id: 'product-filters-drawer', controller_name: 'dialog') do %>
- <%= drawer_header(Spree.t(:filter), 'dialog') %>
- <div class="drawer-body">
- <%= f.hidden_field :status_eq, value: params.dig(:q, :status_eq) %>
- <div class="form-group">
- <%= f.label :taxons_id_in, Spree.t(:taxons) %>
- <% @categories = current_store.taxons.where(id: params.dig(:q, :taxons_id_in)).pluck(:pretty_name, :id) if params.dig(
- :q,
- :taxons_id_in,
- ) %>
- <%= tom_select_tag "q[taxons_id_in]",
- multiple: true,
- preloaded_options: @categories,
- active_option: params.dig(:q, :taxons_id_in),
- empty_option: Spree.t(:without_taxon),
- url: spree.admin_taxons_select_options_path(format: :json),
- select_data: {
- filters_target: "input",
- } %>
- </div>
-
- <div class="form-group">
- <%= f.label :tags_name_in, Spree.t(:tags) %>
- <%= tom_select_tag "q[tags_name_in]",
- active_option: params[:q][:tags_name_in],
- options: tags_json_array,
- multiple: true,
- value_field: :name,
- select_class: "w-full",
- select_data: {
- filters_target: "input",
- } %>
- </div>
-
- <%= render_admin_partials(:products_filters_partials, f: f) %>
- </div>
- <div class="drawer-footer">
- <%= drawer_discard_button('dialog') %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
- <% end %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
-
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb b/spree/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb
deleted file mode 100644
index 09172a7279..0000000000
--- a/spree/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-<%= dropdown do %>
- <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
- <span class="text-gray-600 font-normal mr-1">
- <%= Spree.t(:show) %>
- </span>
- <% if product_filter_status_dropdown_value == Spree.t('admin.products.all_statuses') && product_filter_stock_dropdown_value == Spree.t('admin.products.any_stock') %>
- <%= Spree.t(:all_products) %>
- <% else %>
- <%= product_filter_status_dropdown_value if product_filter_status_dropdown_value != Spree.t('admin.products.all_statuses') %>
- <% if product_filter_status_dropdown_value != Spree.t('admin.products.all_statuses') && product_filter_stock_dropdown_value != Spree.t('admin.products.any_stock') %>
- and
- <% end %>
- <%= product_filter_stock_dropdown_value if product_filter_stock_dropdown_value != Spree.t('admin.products.any_stock') %>
- <% end %>
- <% end %>
- <%= dropdown_menu do %>
- <h6 class="dropdown-header"><%= Spree.t('admin.products.by_status') %>:</h6>
-
- <%= active_link_to Spree.t('admin.products.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock out_of_stock] ).all?(&:blank?) %>
- <%= link_to Spree.t('admin.products.active'),
- params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: :active}}),
- class: "dropdown-item #{'active' if params[:q][:status_eq] == 'active'}" %>
- <%= link_to Spree.t('admin.products.draft'),
- params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: :draft}}),
- class: "dropdown-item #{'active' if params[:q][:status_eq] == 'draft'}" %>
- <%= link_to Spree.t('admin.products.archived'),
- params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: :archived}}),
- class: "dropdown-item #{'active' if params[:q][:status_eq] == 'archived'}" %>
-
- <div class="dropdown-divider"></div>
-
- <h6 class="dropdown-header"><%= Spree.t('admin.products.by_stock') %>:</h6>
-
- <%= active_link_to Spree.t('admin.products.any_stock'), params.to_unsafe_h.deep_merge({page: nil, q: {in_stock: nil, out_of_stock: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock out_of_stock] ).all?(&:blank?) %>
- <%= link_to Spree.t('admin.products.in_stock'),
- params.to_unsafe_h.deep_merge({page: nil, q: {in_stock: '1', out_of_stock: nil}}),
- class: "dropdown-item #{'active' if params[:q][:in_stock] == '1'}" %>
- <%= link_to Spree.t('admin.products.out_of_stock'),
- params.to_unsafe_h.deep_merge({page: nil, q: {out_of_stock: '1', in_stock: nil}}),
- class: "dropdown-item #{'active' if params[:q][:out_of_stock] == '1'}" %>
- <% end %>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/promotions/_filters.html.erb b/spree/admin/app/views/spree/admin/promotions/_filters.html.erb
deleted file mode 100644
index 016a90049b..0000000000
--- a/spree/admin/app/views/spree/admin/promotions/_filters.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
- <%= render "spree/admin/promotions/table_filter_dropdown" %>
- <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %>
- <%= icon "adjustments", class: "mr-1" %>
- <%= Spree.t("admin.filters") %>
- <% end %>
- </div>
-
- <%= drawer(id: 'promotion-filters-drawer', controller_name: 'dialog') do %>
- <%= drawer_header(Spree.t(:filter), 'dialog') %>
- <div class="drawer-body">
- <div class="form-group">
- <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
- <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-input", data: { filters_target: :input } %>
- </div>
- <%= render_admin_partials(:promotions_filters_partials, f: f) %>
- </div>
- <div class="drawer-footer">
- <%= drawer_discard_button('dialog') %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
- <% end %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
-
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
\ No newline at end of file
diff --git a/spree/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb b/spree/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb
deleted file mode 100644
index de1c7af7bc..0000000000
--- a/spree/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= dropdown do %>
- <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
- <span class="text-gray-600 font-normal mr-1">
- <%= Spree.t(:status) %>
- </span>
- <%= promotion_filter_dropdown_value %>
- <% end %>
- <%= dropdown_menu do %>
- <%= active_link_to 'All Promotions', params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[expired active] ).all?(&:blank?) %>
- <%= link_to Spree.t(:expired),
- params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: true}}),
- class: "dropdown-item #{'active' if params[:q][:expired]}" %>
- <%= link_to Spree.t(:active),
- params.to_unsafe_h.deep_merge({page: nil, q: {active: true, expired: false}}),
- class: "dropdown-item #{'active' if params[:q][:active]}" %>
- <% end %>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/return_authorizations/filters.html.erb b/spree/admin/app/views/spree/admin/return_authorizations/filters.html.erb
deleted file mode 100644
index 69d5c9fd84..0000000000
--- a/spree/admin/app/views/spree/admin/return_authorizations/filters.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path, class: "filter-wrap", data: {controller: "filters"} do |f| %>
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render "spree/admin/shared/filters_search_bar", param: :number_cont %>
-
- <%= dropdown do %>
- <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
- <span class="text-gray-600 font-normal mr-1">
- <%= Spree.t(:show) %>:
- </span>
- <% if params.dig(:q, :state_eq).present? %>
- <%= Spree.t("return_authorization_states.#{params.dig(:q, :state_eq)}") %>
- <% else %>
- <%= Spree.t(:all) %>
- <% end %>
- <% end %>
- <%= dropdown_menu do %>
- <%= active_link_to Spree.t(:all),
- params.to_unsafe_h.deep_merge({ q: { state_eq: "" } }),
- class: "dropdown-item",
- active: (params[:q] || {})[:state_eq].blank? %>
- <%= link_to Spree.t("return_authorization_states.authorized"),
- params.to_unsafe_h.deep_merge({ q: { state_eq: :authorized } }),
- class: "dropdown-item #{"active" if params.dig(:q, :state_eq) == "authorized"}" %>
- <%= link_to Spree.t("return_authorization_states.canceled"),
- params.to_unsafe_h.deep_merge({ q: { state_eq: :canceled } }),
- class: "dropdown-item #{"active" if params.dig(:q, :state_eq) == "canceled"}" %>
- <% end %>
- <% end %>
- </div>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
-
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/stock_items/_filters.html.erb b/spree/admin/app/views/spree/admin/stock_items/_filters.html.erb
deleted file mode 100644
index a682b2f803..0000000000
--- a/spree/admin/app/views/spree/admin/stock_items/_filters.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dialog" } do |f| %>
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>
-
- <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %>
- <%= icon "adjustments", class: "mr-1" %>
- <%= Spree.t("admin.filters") %>
- <% end %>
- </div>
-
- <%= drawer(id: 'stock-items-filters-drawer', controller_name: 'dialog') do %>
- <%= drawer_header(Spree.t(:filter), 'dialog') %>
- <div class="drawer-body">
- <div class="form-group">
- <%= f.label :variant_sku_cont, Spree.t(:sku) %>
- <%= f.text_field :variant_sku_cont, size: 15, class: "form-input", data: {filters_target: :input} %>
- </div>
- <div class="form-group">
- <%= f.label :stock_location_id_eq, Spree.t(:stock_location) %>
- <%= f.select :stock_location_id_eq,
- available_stock_locations_list,
- { include_blank: true },
- data: { controller: 'autocomplete-select' } %>
- </div>
- <%= render_admin_partials(:stock_items_filters_partials, f: f) %>
- </div>
- <div class="drawer-footer">
- <%= drawer_discard_button('dialog') %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
- <% end %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/stock_transfers/_filters.html.erb b/spree/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
deleted file mode 100644
index f0bd75786a..0000000000
--- a/spree/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>
- <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %>
- <%= icon "adjustments", class: "mr-1" %>
- <%= Spree.t("admin.filters") %>
- <% end %>
- </div>
-
- <%= drawer(id: 'stock-transfers-filters-drawer', controller_name: 'dialog') do %>
- <%= drawer_header(Spree.t(:filter), 'dialog') %>
- <div class="drawer-body">
- <div class="form-group">
- <%= f.label :reference_cont, Spree.t(:reference) %>
- <%= f.text_field :reference_cont, include_blank: true, size: 15, class: "form-input", data: { filters_target: :input } %>
- </div>
- <div class="form-group">
- <%= f.label :source_location_id_eq, Spree.t(:source) %>
- <%= f.select :source_location_id_eq,
- available_stock_locations_list,
- { include_blank: true },
- data: {
- filters_target: :input,
- controller: 'autocomplete-select'
- } %>
- </div>
- <div class="form-group">
- <%= f.label :destination_location_id_eq, Spree.t(:destination) %>
- <%= f.select :destination_location_id_eq,
- available_stock_locations_list,
- { include_blank: true },
- data: {
- filters_target: :input,
- controller: 'autocomplete-select'
- } %>
- </div>
- <%= render_admin_partials(:stock_transfers_filters_partials, f: f) %>
- </div>
- <div class="drawer-footer">
- <%= drawer_discard_button('dialog') %>
- <div class="form-actions">
- <%= button Spree.t(:search), "search" %>
- </div>
- </div>
- <% end %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
diff --git a/spree/admin/app/views/spree/admin/taxonomies/filters.html.erb b/spree/admin/app/views/spree/admin/taxonomies/filters.html.erb
deleted file mode 100644
index db76107882..0000000000
--- a/spree/admin/app/views/spree/admin/taxonomies/filters.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>
- <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>
\ No newline at end of file
diff --git a/spree/admin/app/views/spree/admin/users/_filters.html.erb b/spree/admin/app/views/spree/admin/users/_filters.html.erb
deleted file mode 100644
index f7d33fc967..0000000000
--- a/spree/admin/app/views/spree/admin/users/_filters.html.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
- <div class="flex flex-col lg:flex-row gap-2">
- <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
-
- <%= render "spree/admin/shared/calendar_range_picker",
- date_from_input_name: "q[created_at_gt]",
- date_to_input_name: "q[created_at_lt]",
- date_from_value: params.dig(:q, :created_at_gt),
- date_to_value: params.dig(:q, :created_at_lt) %>
-
- <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %>
- <%= icon "adjustments", class: "mr-1" %>
- <%= Spree.t("admin.filters") %>
- <% end %>
- </div>
-
- <%= drawer(id: 'user-filters-drawer', controller_name: 'dialog') do %>
- <%= drawer_header(Spree.t(:filter), 'dialog') %>
- <div class="drawer-body">
- <div class="form-group">
- <%= f.label :bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
- <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-input", data: { filters_target: :input } %>
- </div>
- <div class="form-group">
- <%= f.label :bill_address_lastname_eq, Spree.t(:last_name) %>
- <%= f.text_field :bill_address_lastname_eq, class: "form-input", data: { filters_target: :input } %>
- </div>
- <div class="form-group">
- <%= f.label :addresses_country_name_eq, Spree.t(:location) %>
- <%= tom_select_tag "q[addresses_country_name_eq]",
- active_option: params.dig(:q, :addresses_country_name_eq),
- options: Spree::Country.all.to_tom_select_json,
- value_field: :name,
- select_class: "w-full",
- select_data: {
- filters_target: "input",
- } %>
- </div>
- <div class="form-group">
- <%= f.label :tags_name_in, Spree.t(:tags) %>
- <%= tom_select_tag "q[tags_name_in]",
- active_option: params.dig(:q, :tags_name_in),
- options: user_tags_json_array,
- multiple: true,
- value_field: :name,
- select_class: "w-full",
- select_data: {
- filters_target: "input",
- } %>
- </div>
- <div class="form-group">
- <%= f.label :accepts_email_marketing_eq, Spree.t(:accepts_email_marketing) %>
- <%= f.select :accepts_email_marketing_eq,
- options_for_select([["Yes", true], ["No", false]], params.dig(:q, :accepts_email_marketing_eq)),
- { include_blank: true },
- { class: "form-select", data: { filters_target: :input } } %>
- </div>
- <div class="form-group">
- <%= f.label :spree_roles_name_in, Spree.t(:roles) %>
- <%= tom_select_tag "q[spree_roles_name_in]",
- active_option: params.dig(:q, :spree_roles_name_in),
- options: user_roles_json_array,
- multiple: true,
- value_field: :name,
- select_class: "w-full",
- select_data: {
- filters_target: "input",
- } %>
- </div>
- <%= render_admin_partials(:users_filters_partials, f: f) %>
- </div>
- <div class="drawer-footer">
- <%= drawer_discard_button('dialog') %>
- <%= render 'spree/admin/shared/filter_submit' %>
- </div>
- <% end %>
-
- <%= render "spree/admin/shared/filter_badge_template" %>
-
- <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-<% end %>