From 1743f3797f6ccb6feb8a41229aef86960beaaf16 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 10 Sep 2019 00:26:02 -0500
Subject: [PATCH] views: factor out `search_form_for` helper.

Refactor search forms to use `search_form_for` so that we can set common
options on all search forms, such as autocomplete="off" (#4162).
---
 app/helpers/application_helper.rb                        | 7 +++++++
 app/views/artist_commentaries/search.html.erb            | 2 +-
 app/views/artist_urls/index.html.erb                     | 2 +-
 app/views/artists/_search.html.erb                       | 2 +-
 app/views/bans/_search.html.erb                          | 2 +-
 app/views/bulk_update_requests/_search.html.erb          | 2 +-
 app/views/comments/search.html.erb                       | 2 +-
 app/views/dmails/_search.html.erb                        | 2 +-
 app/views/mod_actions/_search.html.erb                   | 2 +-
 app/views/moderator/dashboards/_search_activity.html.erb | 2 +-
 app/views/moderator/post/disapprovals/index.html.erb     | 2 +-
 app/views/notes/search.html.erb                          | 2 +-
 app/views/post_appeals/_search.html.erb                  | 2 +-
 app/views/post_approvals/index.html.erb                  | 2 +-
 app/views/post_flags/_search.html.erb                    | 2 +-
 app/views/post_replacements/index.html.erb               | 2 +-
 app/views/saved_searches/index.html.erb                  | 2 +-
 app/views/tag_relationships/_search.html.erb             | 2 +-
 app/views/tags/_search.html.erb                          | 2 +-
 app/views/uploads/_search.html.erb                       | 2 +-
 app/views/users/search.html.erb                          | 2 +-
 21 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 921f183e5..02ddbe8e6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -162,6 +162,13 @@ module ApplicationHelper
     tag.input value: "Preview", type: "button", class: "dtext-preview-button", "data-input-id": input_id, "data-preview-id": preview_id
   end
 
+  def search_form_for(url, classes: "inline-form", &block)
+    defaults = { required: false }
+    html_options = { autocomplete: "off", class: "search-form #{classes}" }
+
+    simple_form_for(:search, method: :get, url: url, defaults: defaults, html: html_options, &block)
+  end
+
   def search_field(method, label: method.titleize, hint: nil, value: nil, **attributes)
     content_tag(:div, class: "input") do
       label_html = label_tag("search_#{method}", label)
diff --git a/app/views/artist_commentaries/search.html.erb b/app/views/artist_commentaries/search.html.erb
index bc8292a63..78b98139a 100644
--- a/app/views/artist_commentaries/search.html.erb
+++ b/app/views/artist_commentaries/search.html.erb
@@ -2,7 +2,7 @@
   <div id="a-search">
     <h1>Search Artist Commentary</h1>
 
-    <%= simple_form_for(:search, url: artist_commentaries_path, method: :get, defaults: { required: false }) do |f| %>
+    <%= search_form_for(artist_commentaries_path) do |f| %>
       <%= f.input :text_matches, label: "Text" %>
       <%= f.input :post_tags_match, label: "Tags", input_html: { data: { autocomplete: "tag-query" } } %>
       <%= f.input :original_present, label: "Original present?", collection: ["yes", "no"] %>
diff --git a/app/views/artist_urls/index.html.erb b/app/views/artist_urls/index.html.erb
index 9dd1e1255..83c22706e 100644
--- a/app/views/artist_urls/index.html.erb
+++ b/app/views/artist_urls/index.html.erb
@@ -1,6 +1,6 @@
 <div id="c-artist-urls">
   <div id="a-index">
-    <%= simple_form_for(:search, url: artist_urls_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+    <%= search_form_for(artist_urls_path) do |f| %>
       <%= f.simple_fields_for :artist do |fa| %>
         <%= fa.input :name, label: "Artist Name", input_html: { value: params.dig(:search, :artist, :name), "data-autocomplete": "artist" } %>
       <% end %>
diff --git a/app/views/artists/_search.html.erb b/app/views/artists/_search.html.erb
index e7b0fa5f2..174900da4 100644
--- a/app/views/artists/_search.html.erb
+++ b/app/views/artists/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, url: artists_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(artists_path) do |f| %>
   <%= f.input :any_name_matches, label: "Name", hint: "Use * for wildcard", input_html: { value: params[:search][:any_name_matches], data: { autocomplete: "artist" }} %>
   <%= f.input :url_matches, label: "URL", as: "string", input_html: { value: params[:search][:url_matches] } %>
   <%= f.input :creator_name, label: "Creator", input_html: { value: params[:search][:creator_name], data: { autocomplete: "user" } } %>
diff --git a/app/views/bans/_search.html.erb b/app/views/bans/_search.html.erb
index 98aacc985..06c569467 100644
--- a/app/views/bans/_search.html.erb
+++ b/app/views/bans/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, method: :get, url: bans_path, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(bans_path) do |f| %>
   <%= f.input :user_name, label: "User", input_html: { value: params[:search][:user_name], data: { autocomplete: "user" } } %>
   <%= f.input :banner_name, label: "Banner", input_html: { value: params[:search][:banner_name], data: { autocomplete: "user" } } %>
   <%= f.input :reason_matches, label: "Reason", hint: "Use * for wildcard", input_html: { value: params[:search][:reason_matches] } %>
diff --git a/app/views/bulk_update_requests/_search.html.erb b/app/views/bulk_update_requests/_search.html.erb
index 768c39c3e..d95e40f05 100644
--- a/app/views/bulk_update_requests/_search.html.erb
+++ b/app/views/bulk_update_requests/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, url: bulk_update_requests_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(bulk_update_requests_path) do |f| %>
   <%= f.input :user_name, label: "Creator", input_html: { value: params[:search][:user_name], data: { autocomplete: "user" } } %>
   <%= f.input :approver_name, label: "Approver", input_html: { value: params[:search][:approver_name], data: { autocomplete: "user" } } %>
   <%= f.input :title_matches, label: "Title", input_html: { value: params[:search][:title_matches] } %>
diff --git a/app/views/comments/search.html.erb b/app/views/comments/search.html.erb
index 2e82a51be..55d72d2f9 100644
--- a/app/views/comments/search.html.erb
+++ b/app/views/comments/search.html.erb
@@ -2,7 +2,7 @@
   <div id="a-search">
     <h1>Search Comments</h1>
 
-    <%= simple_form_for(:search, :method => :get, url: comments_path, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+    <%= search_form_for(comments_path) do |f| %>
       <%= hidden_field_tag "group_by", "comment", :id => "group_by_full" %>
       <%= f.input :creator_name, label: "Commenter", input_html: { data: { autocomplete: "user" } } %>
       <%= f.input :body_matches, label: "Body" %>
diff --git a/app/views/dmails/_search.html.erb b/app/views/dmails/_search.html.erb
index 4dc61e470..32a20ab81 100644
--- a/app/views/dmails/_search.html.erb
+++ b/app/views/dmails/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, url: dmails_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(dmails_path) do |f| %>
   <%= f.hidden_field :folder, value: params[:folder] %>
   <%= f.input :title_matches, label: "Title", hint: "Use * for wildcard", input_html: { value: params[:search][:title_matches] } %>
   <%= f.input :message_matches, label: "Message", hint: "Use * for wildcard", input_html: { value: params[:search][:messages_matches] } %>
diff --git a/app/views/mod_actions/_search.html.erb b/app/views/mod_actions/_search.html.erb
index 00b8c6a2b..7f6f30a0b 100644
--- a/app/views/mod_actions/_search.html.erb
+++ b/app/views/mod_actions/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, method: :get, url: mod_actions_path, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(mod_actions_path) do |f| %>
   <%= f.input :creator_name, label: "Creator", input_html: { value: params[:search][:creator_name], data: { autocomplete: "user" } } %>
   <%= f.input :description_matches, label: "Description" %>
   <%= f.input :category, label: "Category", collection: ModAction.categories.map {|k,v| [k.capitalize.tr("_"," "), v]}, include_blank: true,selected: params[:search][:category] %>
diff --git a/app/views/moderator/dashboards/_search_activity.html.erb b/app/views/moderator/dashboards/_search_activity.html.erb
index 49295d9bb..9dfa5d216 100644
--- a/app/views/moderator/dashboards/_search_activity.html.erb
+++ b/app/views/moderator/dashboards/_search_activity.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, url: moderator_dashboard_path, method: :get) do |f| %>
+<%= search_form_for(moderator_dashboard_path) do |f| %>
   <%= f.input :min_date, as: :date, html5: true, input_html: { value: @dashboard.min_date } %>
   <%= f.input :max_level, collection: User.level_hash.to_a, include_blank: true, selected: @dashboard.max_level %>
   <%= f.submit "Search" %>
diff --git a/app/views/moderator/post/disapprovals/index.html.erb b/app/views/moderator/post/disapprovals/index.html.erb
index 092c9da15..7965a0052 100644
--- a/app/views/moderator/post/disapprovals/index.html.erb
+++ b/app/views/moderator/post/disapprovals/index.html.erb
@@ -2,7 +2,7 @@
   <div id="a-index">
     <h1>Disapprovals</h1>
 
-    <%= simple_form_for(:search, url: moderator_post_disapprovals_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+    <%= search_form_for(moderator_post_disapprovals_path) do |f| %>
       <%= f.input :user_name, label: "Creator", input_html: { value: params[:search][:user_name] } %>
       <%= f.input :post_id, label: "Post ID", input_html: { value: params[:search][:post_id] } %>
       <%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], data: { autocomplete: "tag-query" } } %>
diff --git a/app/views/notes/search.html.erb b/app/views/notes/search.html.erb
index 987fe1dd9..aed18b82a 100644
--- a/app/views/notes/search.html.erb
+++ b/app/views/notes/search.html.erb
@@ -2,7 +2,7 @@
   <div id="a-search">
     <h1>Search Notes</h1>
 
-    <%= simple_form_for(:search, url: notes_path, method: :get, defaults: { required: false }) do |f| %>
+    <%= search_form_for(notes_path) do |f| %>
       <%= f.hidden_field :group_by, value: "note" %>
 
       <%= f.input :body_matches, label: "Body" %>
diff --git a/app/views/post_appeals/_search.html.erb b/app/views/post_appeals/_search.html.erb
index a923564cd..2e8f24bac 100644
--- a/app/views/post_appeals/_search.html.erb
+++ b/app/views/post_appeals/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, url: post_appeals_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(post_appeals_path) do |f| %>
   <%= f.input :reason_matches, label: "Reason", hint: "Use * for wildcard searches", input_html: { value: params[:search][:reason_matches] } %>
   <%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], data: { autocomplete: "tag-query" } } %>
   <%= f.input :post_id, label: "Post ID", input_html: { value: params[:search][:post_id] } %>
diff --git a/app/views/post_approvals/index.html.erb b/app/views/post_approvals/index.html.erb
index 8a960e8f5..e29379047 100644
--- a/app/views/post_approvals/index.html.erb
+++ b/app/views/post_approvals/index.html.erb
@@ -3,7 +3,7 @@
     <h1>Approvals</h1>
     <%= render "posts/partials/common/inline_blacklist" %>
 
-    <%= simple_form_for(:search, url: post_approvals_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+    <%= search_form_for(post_approvals_path) do |f| %>
       <%= f.input :user_name, label: "Approver", input_html: { value: params[:search][:user_name], data: { autocomplete: "user" } } %>
       <%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], data: { autocomplete: "tag-query" } } %>
       <%= f.submit "Search" %>
diff --git a/app/views/post_flags/_search.html.erb b/app/views/post_flags/_search.html.erb
index c1fee8ae7..0a21bdf3e 100644
--- a/app/views/post_flags/_search.html.erb
+++ b/app/views/post_flags/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, url: post_flags_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(post_flags_path) do |f| %>
   <%= f.input :reason_matches, label: "Reason", hint: "Use * for wildcard searches", input_html: { value: params[:search][:reason_matches] } %>
   <%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], data: { autocomplete: "tag-query" } } %>
   <%= f.input :post_id, label: "Post ID", input_html: { value: params[:search][:post_id] } %>
diff --git a/app/views/post_replacements/index.html.erb b/app/views/post_replacements/index.html.erb
index 427b22c91..31b8fcdfd 100644
--- a/app/views/post_replacements/index.html.erb
+++ b/app/views/post_replacements/index.html.erb
@@ -4,7 +4,7 @@
 
     <%= render "posts/partials/common/inline_blacklist" %>
 
-    <%= simple_form_for(:search, url: post_replacements_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+    <%= search_form_for(post_replacements_path) do |f| %>
       <%= f.input :creator_name, label: "Replacer", input_html: { value: params[:search][:creator_name], data: { autocomplete: "user" } } %>
       <%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], data: { autocomplete: "tag-query" } } %>
       <%= f.submit "Search" %>
diff --git a/app/views/saved_searches/index.html.erb b/app/views/saved_searches/index.html.erb
index 746c6b07c..cc4b1a21e 100644
--- a/app/views/saved_searches/index.html.erb
+++ b/app/views/saved_searches/index.html.erb
@@ -7,7 +7,7 @@
       <% end %>
     </h1>
 
-    <%= simple_form_for(:search, url: saved_searches_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+    <%= search_form_for(saved_searches_path) do |f| %>
       <%= f.input :query_ilike, label: "Query", input_html: { value: params[:search][:query_ilike] } %>
       <%= f.input :label, label: "Label", input_html: { value: params[:search][:label] } %>
       <%= f.submit "Search" %>
diff --git a/app/views/tag_relationships/_search.html.erb b/app/views/tag_relationships/_search.html.erb
index 993e9e054..25769c9b9 100644
--- a/app/views/tag_relationships/_search.html.erb
+++ b/app/views/tag_relationships/_search.html.erb
@@ -1,6 +1,6 @@
 <%# url %>
 
-<%= simple_form_for(:search, method: :get, url: url, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(url) do |f| %>
   <%= f.input :name_matches, label: "Name", input_html: { value: params[:search][:name_matches], data: { autocomplete: "tag" } } %>
   <%= f.input :status, label: "Status", collection: %w[Approved Active Pending Deleted Retired Processing Queued], include_blank: true, selected: params[:search][:status] %>
   <%= f.simple_fields_for :antecedent_tag do |fa| %>
diff --git a/app/views/tags/_search.html.erb b/app/views/tags/_search.html.erb
index ff8100fec..3e83c5b18 100644
--- a/app/views/tags/_search.html.erb
+++ b/app/views/tags/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, url: tags_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(tags_path) do |f| %>
   <%= f.input :name_matches, label: "Name", hint: "Use * for wildcard", input_html: { value: params[:search][:name_matches], data: { autocomplete: "tag" } } %>
   <%= f.input :category, label: "Category", collection: TagCategory.canonical_mapping.to_a, include_blank: true,selected: params[:search][:category] %>
   <%= f.input :order, collection: [%w[Newest date], %w[Count count], %w[Name name]], include_blank: false, selected: params[:search][:order] %>
diff --git a/app/views/uploads/_search.html.erb b/app/views/uploads/_search.html.erb
index 8b7fa3e03..e90f300a4 100644
--- a/app/views/uploads/_search.html.erb
+++ b/app/views/uploads/_search.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(:search, url: uploads_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+<%= search_form_for(uploads_path) do |f| %>
   <%= f.input :uploader_name, label: "Uploader", input_html: { value: params[:search][:uploader_name], data: { autocomplete: "user" } } %>
   <%= f.input :post_tags_match, label: "Post Tags", input_html: { value: params[:search][:post_tags_match] } %>
   <%= f.input :source_matches, label: "Source", input_html: { value: params[:search][:source_matches] } %>
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index 830769a54..f05264413 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -1,6 +1,6 @@
 <div id="c-users">
   <div id="a-search">
-    <%= simple_form_for(:search, url: users_path, method: :get, defaults: { required: false }, html: { class: "inline-form" }) do |f| %>
+    <%= search_form_for(users_path) do |f| %>
       <%= f.input :name_matches, label: "Name", hint: "Use * for wildcard", input_html: { value: params[:search][:name_matches], data: { autocomplete: "user" } } %>
       <%= f.input :inviter_name, label: "Inviter Name", hint: "Use * for wildcard", input_html: { value: params.dig(:search, :inviter_name), data: { autocomplete: "user" } } %>