From 89610cd3f37828f902afa45b8c6bbde660732ffd Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Wed, 30 Mar 2022 22:21:35 +0200
Subject: [PATCH 1/4] fix(Variants Table Fitler): narrow search field

The search field was visually pushed to the side, because the "with deleted" checkbox was not always visible.
---
 .../spree/admin/variants/_table_filter.html.erb   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/backend/app/views/spree/admin/variants/_table_filter.html.erb b/backend/app/views/spree/admin/variants/_table_filter.html.erb
index 27ce6cb3dd0..12e8646d79c 100644
--- a/backend/app/views/spree/admin/variants/_table_filter.html.erb
+++ b/backend/app/views/spree/admin/variants/_table_filter.html.erb
@@ -4,14 +4,13 @@
 
 <% content_for :table_filter do %>
   <%= form_for :variant_search, url: spree.admin_product_variants_path(product), method: :get do |f| %>
-    <div class="col-10">
-      <div data-hook="admin_variants_index_search" class="field">
-        <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
-        <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
+    <div class="row">
+      <div class="col-10">
+        <div data-hook="admin_variants_index_search" class="field">
+          <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
+          <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
+        </div>
       </div>
-    </div>
-
-    <% if product.variants.with_discarded.discarded.any? %>
       <div class="col-2">
         <div class="field checkbox">
           <label>
@@ -20,7 +19,7 @@
           </label>
         </div>
       </div>
-    <% end %>
+    </div>
 
     <div class="actions filter-actions">
       <%= f.button :search %>

From 40e22abe7e3ffd0058d58040491f0edce36953ee Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Wed, 30 Mar 2022 22:26:37 +0200
Subject: [PATCH 2/4] fix(Variants Table): Show no search results alert

The "No search results" warning was never displayed, because the table was hidden if no variants were found.

Also make the warning a warning and translate it properly.
---
 backend/app/views/spree/admin/variants/_table.html.erb | 8 +++++---
 backend/app/views/spree/admin/variants/index.html.erb  | 2 +-
 core/config/locales/en.yml                             | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/app/views/spree/admin/variants/_table.html.erb b/backend/app/views/spree/admin/variants/_table.html.erb
index 88804421631..003292369e8 100644
--- a/backend/app/views/spree/admin/variants/_table.html.erb
+++ b/backend/app/views/spree/admin/variants/_table.html.erb
@@ -40,9 +40,11 @@
       </td>
     </tr>
     <% end %>
-    <% if variants.empty? %>
-      <tr><td colspan="4"><%= t('spree.none') %></td></tr>
-    <% end %>
   </tbody>
 </table>
+<% if variants.empty? %>
+  <div class="alert alert-warning">
+    <%= t('.no_variants_found', term: params[:variant_search_term]) %>
+  </div>
+<% end %>
 <%= paginate variants, theme: "solidus_admin" %>
diff --git a/backend/app/views/spree/admin/variants/index.html.erb b/backend/app/views/spree/admin/variants/index.html.erb
index f9a583e0f97..7eaea5379d3 100644
--- a/backend/app/views/spree/admin/variants/index.html.erb
+++ b/backend/app/views/spree/admin/variants/index.html.erb
@@ -14,7 +14,7 @@
   <% end %>
 <% end %>
 
-<% if @product.variants.with_discarded.any? %>
+<% if @product.variants.with_discarded.any? || params[:variant_search_term].present? %>
   <%= render "table_filter", product: @product %>
   <%= render "table", variants: @variants %>
 <% else %>
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 2d92b651652..64541f65f35 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1004,6 +1004,8 @@ en:
           use_product_tax_category: Use Product Tax Category
         new:
           new_variant: New Variant
+        table:
+          no_variants_found: No variants found for '%{term}'
         table_filter:
           show_deleted: Show Deleted Variants
     administration: Administration

From 57ff32ccffc4863cf5d6b6cb9837aa348943c72e Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Wed, 30 Mar 2022 22:23:39 +0200
Subject: [PATCH 3/4] fix(Variants Table): Remove superfluous table column

---
 backend/app/views/spree/admin/variants/_table.html.erb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/app/views/spree/admin/variants/_table.html.erb b/backend/app/views/spree/admin/variants/_table.html.erb
index 003292369e8..f51f8f277ec 100644
--- a/backend/app/views/spree/admin/variants/_table.html.erb
+++ b/backend/app/views/spree/admin/variants/_table.html.erb
@@ -3,10 +3,9 @@
 <table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
   <colgroup>
     <col style="width: 5%" />
-    <col style="width: 25%" />
-    <col style="width: 20%" />
+    <col style="width: 35%" />
     <col style="width: 20%" />
-    <col style="width: 15%" />
+    <col style="width: 25%" />
     <col style="width: 15%" />
   </colgroup>
   <thead data-hook="variants_header">

From dc21ab8aeefb9a3bd9d5c28f9aca8c92cf905c76 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Wed, 30 Mar 2022 22:22:05 +0200
Subject: [PATCH 4/4] fix(Variants Table Filter): Translate filter button

---
 backend/app/views/spree/admin/variants/_table_filter.html.erb | 2 +-
 backend/spec/features/admin/products/variant_spec.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/app/views/spree/admin/variants/_table_filter.html.erb b/backend/app/views/spree/admin/variants/_table_filter.html.erb
index 12e8646d79c..a3ffc28df82 100644
--- a/backend/app/views/spree/admin/variants/_table_filter.html.erb
+++ b/backend/app/views/spree/admin/variants/_table_filter.html.erb
@@ -22,7 +22,7 @@
     </div>
 
     <div class="actions filter-actions">
-      <%= f.button :search %>
+      <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
     </div>
   <% end %>
 <% end %>
diff --git a/backend/spec/features/admin/products/variant_spec.rb b/backend/spec/features/admin/products/variant_spec.rb
index 4132f8d4ed9..2b8445e3348 100644
--- a/backend/spec/features/admin/products/variant_spec.rb
+++ b/backend/spec/features/admin/products/variant_spec.rb
@@ -65,7 +65,7 @@
       it 'allows to display deleted variants with a filter' do
         visit spree.admin_product_variants_path(product)
         check 'Show Deleted Variants'
-        click_button 'search'
+        click_button 'Filter Results'
 
         expect(page).to have_content(discarded_variant.sku)
       end