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.

Fixed: no flickering loading filters dropdowns

Damian Legawiec9afe582a1353
diff --git a/admin/app/views/spree/admin/gift_cards/_filters.html.erb b/admin/app/views/spree/admin/gift_cards/_filters.html.erb
index 4498b02cf1..f447eb2fb7 100644
--- a/admin/app/views/spree/admin/gift_cards/_filters.html.erb
+++ b/admin/app/views/spree/admin/gift_cards/_filters.html.erb
@@ -15,7 +15,7 @@
<%= render "table_filter_dropdown" %>
<%= render "spree/admin/shared/filters_button" %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<% if params[:user_id].blank? %>
<div class="form-group">
<%= f.label :users_email_eq, Spree.t(:email) %>
diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erb
index 308a94579a..581b960758 100644
--- a/admin/app/views/spree/admin/orders/_filters.html.erb
+++ b/admin/app/views/spree/admin/orders/_filters.html.erb
@@ -41,7 +41,7 @@
<%= render "spree/admin/orders/table_filter_dropdown" %>
<%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<%= 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) %>
diff --git a/admin/app/views/spree/admin/posts/filters.html.erb b/admin/app/views/spree/admin/posts/filters.html.erb
index a2193b29fc..ef0398c9e2 100644
--- a/admin/app/views/spree/admin/posts/filters.html.erb
+++ b/admin/app/views/spree/admin/posts/filters.html.erb
@@ -4,7 +4,7 @@
<%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<div class="form-group">
<%= f.label :author_id_eq, Spree.t(:author) %>
<%= f.select :author_id_eq,
diff --git a/admin/app/views/spree/admin/products/_filters.html.erb b/admin/app/views/spree/admin/products/_filters.html.erb
index 325e5f0c18..0aab940aa2 100644
--- a/admin/app/views/spree/admin/products/_filters.html.erb
+++ b/admin/app/views/spree/admin/products/_filters.html.erb
@@ -13,7 +13,7 @@
<%= render "spree/admin/products/table_filter_dropdown" %>
<%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<%= f.hidden_field :status_eq, value: params.dig(:q, :status_eq) %>
<div class="form-group">
<%= f.label :taxons_id_in, Spree.t(:taxons) %>
diff --git a/admin/app/views/spree/admin/promotions/_filters.html.erb b/admin/app/views/spree/admin/promotions/_filters.html.erb
index 75885d6df0..ad54c50462 100644
--- a/admin/app/views/spree/admin/promotions/_filters.html.erb
+++ b/admin/app/views/spree/admin/promotions/_filters.html.erb
@@ -4,7 +4,7 @@
<%= render "spree/admin/promotions/table_filter_dropdown" %>
<%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<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-control", data: { filters_target: :input } %>
diff --git a/admin/app/views/spree/admin/stock_items/_filters.html.erb b/admin/app/views/spree/admin/stock_items/_filters.html.erb
index 662bcec70a..25c02db9c3 100644
--- a/admin/app/views/spree/admin/stock_items/_filters.html.erb
+++ b/admin/app/views/spree/admin/stock_items/_filters.html.erb
@@ -4,7 +4,7 @@
<%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<div class="form-group">
<%= f.label :variant_sku_cont, Spree.t(:sku) %>
<%= f.text_field :variant_sku_cont, size: 15, class: "form-control", data: {filters_target: :input} %>
diff --git a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb b/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
index ff23406505..67537e3bae 100644
--- a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
+++ b/admin/app/views/spree/admin/stock_transfers/_filters.html.erb
@@ -3,7 +3,7 @@
<%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>
<%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<div class="form-group">
<%= f.label :reference_cont, Spree.t(:reference) %>
<%= f.text_field :reference_cont, include_blank: true, size: 15, class: "form-control", data: { filters_target: :input } %>
diff --git a/admin/app/views/spree/admin/users/_filters.html.erb b/admin/app/views/spree/admin/users/_filters.html.erb
index 8cf7329cf1..48f87abb23 100644
--- a/admin/app/views/spree/admin/users/_filters.html.erb
+++ b/admin/app/views/spree/admin/users/_filters.html.erb
@@ -4,7 +4,7 @@
<%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<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-control", data: { filters_target: :input } %>
diff --git a/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt b/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt
index c25cf0b1fb..74e8cdc3b5 100644
--- a/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt
+++ b/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt
@@ -3,7 +3,7 @@
<%%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %>
<%%= render 'spree/admin/shared/filters_button' %>
</div>
- <div data-dropdown-target="menu" id="table-filter">
+ <div data-dropdown-target="menu" id="table-filter" class="hidden">
<!-- Add additional filters here -->
<%%= render 'spree/admin/shared/filter_submit' %>
</div>