From c54e9cd4de4965781f187050925e4894792d19ee Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Wed, 15 Jul 2020 12:28:42 +0200
Subject: [PATCH 1/2] Convert search form label into button

---
 app/assets/stylesheets/alchemy/search.scss         | 14 ++++++++++++--
 .../admin/partials/_remote_search_form.html.erb    | 12 ++++++------
 .../alchemy/admin/partials/_search_form.html.erb   | 10 +++++-----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/alchemy/search.scss b/app/assets/stylesheets/alchemy/search.scss
index fb4b38dbb3..5bef78116f 100644
--- a/app/assets/stylesheets/alchemy/search.scss
+++ b/app/assets/stylesheets/alchemy/search.scss
@@ -11,9 +11,19 @@
     top: 9px;
   }
 
-  label {
-    display: block;
+  button {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 30px;
     height: inherit;
+    appearance: none;
+    background-color: transparent;
+    border: 0 none;
+    border-radius: 0;
+    box-shadow: none;
+    margin: 0;
+    padding: 0;
   }
 }
 
diff --git a/app/views/alchemy/admin/partials/_remote_search_form.html.erb b/app/views/alchemy/admin/partials/_remote_search_form.html.erb
index 4df6521bf8..c427148497 100644
--- a/app/views/alchemy/admin/partials/_remote_search_form.html.erb
+++ b/app/views/alchemy/admin/partials/_remote_search_form.html.erb
@@ -5,13 +5,13 @@
   <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
   <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
   <div class="search_field">
-    <label>
+    <button type="submit">
       <%= render_icon('search') %>
-      <%= f.search_field resource_handler.search_field_name,
-        placeholder: Alchemy.t(:search),
-        class: 'search_input_field',
-        id: nil %>
-    </label>
+    </button>
+    <%= f.search_field resource_handler.search_field_name,
+      placeholder: Alchemy.t(:search),
+      class: 'search_input_field',
+      id: nil %>
     <%= link_to render_icon(:times, size: 'xs'), url_for(
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
diff --git a/app/views/alchemy/admin/partials/_search_form.html.erb b/app/views/alchemy/admin/partials/_search_form.html.erb
index 995ef95dea..de5fd05651 100644
--- a/app/views/alchemy/admin/partials/_search_form.html.erb
+++ b/app/views/alchemy/admin/partials/_search_form.html.erb
@@ -2,12 +2,12 @@
 
 <%= search_form_for @query, url: url, class: 'search_form' do |f| %>
   <div class="search_field">
-    <label>
+    <button type="submit">
       <%= render_icon('search') %>
-      <%= f.search_field resource_handler.search_field_name,
-        class: 'search_input_field',
-        placeholder: Alchemy.t(:search) %>
-    </label>
+    </button>
+    <%= f.search_field resource_handler.search_field_name,
+      class: 'search_input_field',
+      placeholder: Alchemy.t(:search) %>
     <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
       <%= f.hidden_field field %>
     <% end %>

From ac924805bba1a777607dd3e662a1ab0286353118 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Wed, 15 Jul 2020 16:02:17 +0200
Subject: [PATCH 2/2] Full text search should respect filters

---
 .../admin/partials/_remote_search_form.html.erb | 11 ++++++-----
 .../admin/partials/_search_form.html.erb        |  2 +-
 .../alchemy/admin/resources/index.html.erb      |  5 ++++-
 .../admin/resources_integration_spec.rb         | 17 +++++++++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/views/alchemy/admin/partials/_remote_search_form.html.erb b/app/views/alchemy/admin/partials/_remote_search_form.html.erb
index c427148497..aae009426b 100644
--- a/app/views/alchemy/admin/partials/_remote_search_form.html.erb
+++ b/app/views/alchemy/admin/partials/_remote_search_form.html.erb
@@ -1,6 +1,7 @@
-<%= search_form_for @query, url: url_for(
-    action: 'index',
-    size: @size
+<%= search_form_for @query, url: url_for({
+      action: 'index',
+      size: @size,
+    }.merge(search_filter_params.except(:q))
   ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
   <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
   <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
@@ -12,13 +13,13 @@
       placeholder: Alchemy.t(:search),
       class: 'search_input_field',
       id: nil %>
-    <%= link_to render_icon(:times, size: 'xs'), url_for(
+    <%= link_to render_icon(:times, size: 'xs'), url_for({
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
         content_id: @content.blank? ? '' : @content.id,
         size: @size,
         overlay: true
-      ),
+      }.merge(search_filter_params.except(:q))),
       remote: true,
       class: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),
diff --git a/app/views/alchemy/admin/partials/_search_form.html.erb b/app/views/alchemy/admin/partials/_search_form.html.erb
index de5fd05651..d6abdf8087 100644
--- a/app/views/alchemy/admin/partials/_search_form.html.erb
+++ b/app/views/alchemy/admin/partials/_search_form.html.erb
@@ -1,4 +1,4 @@
-<%- url ||= resource_url_proxy.url_for(action: 'index') -%>
+<%- url ||= resource_url_proxy.url_for({ action: 'index' }.merge(search_filter_params.except(:q))) -%>
 
 <%= search_form_for @query, url: url, class: 'search_form' do |f| %>
   <div class="search_field">
diff --git a/app/views/alchemy/admin/resources/index.html.erb b/app/views/alchemy/admin/resources/index.html.erb
index c3659f7bd5..21e7413335 100644
--- a/app/views/alchemy/admin/resources/index.html.erb
+++ b/app/views/alchemy/admin/resources/index.html.erb
@@ -21,7 +21,10 @@
     dialog: false,
     if_permitted_to: [:index, resource_model]
   ) %>
-  <%= render 'alchemy/admin/partials/search_form' %>
+  <%= render 'alchemy/admin/partials/search_form', additional_params: [
+    resource_has_filters ? :filter : nil,
+    resource_has_tags ? :tagged_with : nil
+  ].compact %>
 <% end %>
 
 <div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
diff --git a/spec/features/admin/resources_integration_spec.rb b/spec/features/admin/resources_integration_spec.rb
index 0e1fffe762..40a6e6117e 100644
--- a/spec/features/admin/resources_integration_spec.rb
+++ b/spec/features/admin/resources_integration_spec.rb
@@ -222,5 +222,22 @@
       expect(page).to have_content("Hovercar Expo")
       expect(page).to have_content("Horse Expo")
     end
+
+    context "full text search" do
+      it "should respect filters" do
+        visit "/admin/events?filter=future"
+
+        expect(page).to have_content("Hovercar Expo")
+        expect(page).to_not have_content("Car Expo")
+        expect(page).to_not have_content("Horse Expo")
+
+        page.find(".search_input_field").set("Horse")
+        page.find(".search_field button").click
+
+        expect(page).to_not have_content("Hovercar Expo")
+        expect(page).to_not have_content("Car Expo")
+        expect(page).to_not have_content("Horse Expo")
+      end
+    end
   end
 end