feat: WIP

Author: blocknotes

app/views/administrate_ransack/_filters.erb

@@ -0,0 +1,55 @@
+<% content_for(:stylesheet) do %>
+<style>
+  .main-content__header {
+    display: grid;
+  }
+  .main-content__header > div {
+    text-align: right;
+  }
+  .main-content__header > .ransack-search {
+    order: 2;
+    text-align: initial;
+  }
+
+  .ransack-search form {
+    grid-column-start: 1;
+    grid-column-end: 3;
+
+    display: grid;
+    grid-auto-flow: column;
+    grid-gap: 4px;
+  }
+
+  .ransack-search .filter > * {
+    margin-bottom: 4px;
+  }
+
+  .ransack-search .ransack-controls {
+    text-align: right;
+    margin: auto 0;
+  }
+
+  .ransack-search .selectize-input {
+    min-height: 39px;
+  }
+</style>
+<% end %>
+
+<% render 'administrate_ransack/javascript' %>
+
+<div class="ransack-search">
+  <% form_path = [namespace, @ransack_results] %>
+  <%= search_form_for(form_path, html: { 'data-administrate-ransack-filters': '1' }) do |f| %>
+    <% @fields.each do |field, field_conf| %>
+      <% type, param, options, label = field_conf %>
+      <div class="filter filter-<%= field.to_s.parameterize %> <%= type %>">
+        <% attrs = { form: f, model: @model, field: field, label: label, type: type, param: param, options: options } %>
+        <%= render "administrate_ransack/components/field_#{type}", attrs %>
+      </div>
+    <% end %>
+
+    <div class="ransack-controls">
+      <button type="submit" class="button--alt">search</button>
+    </div>
+  <% end %>
+</div>

app/views/administrate_ransack/_filters.html.erb

@@ -10,7 +10,7 @@
 
       // selectize setup
       $(function () {
-        $('.filters select').selectize();
+        $('.ransack-search select').selectize();
       });
     });
   </script>

app/views/administrate_ransack/_javascript.html.erb

@@ -1,5 +1,4 @@
-<% field_key = model.ransackable_scopes.include?(field) ? field : "#{field}_eq" %>
 <% values = [[t('administrate_ransack.filters.no'), false], [t('administrate_ransack.filters.yes'), true]] %>
 
 <%= form.label(label, class: 'filter-label') %>
-<%= form.select(field_key, values, include_blank: true) %>
+<%= form.select(param, values, include_blank: true) %>

app/views/administrate_ransack/components/_field_boolean.html.erb

@@ -1,4 +1,2 @@
-<% field_key = model.ransackable_scopes.include?(field) ? field : "#{field}_eq" %>
-
 <%= form.label(label, class: 'filter-label') %>
-<%= form.number_field(field_key) %>
+<%= form.number_field(param) %>

app/views/administrate_ransack/components/_field_number.html.erb

@@ -1,4 +1,2 @@
-<% field_key = model.ransackable_scopes.include?(field) ? field : "#{field}_cont" %>
-
 <%= form.label(label, class: 'filter-label') %>
-<%= form.search_field(field_key) %>
+<%= form.search_field(param) %>

app/views/administrate_ransack/components/_field_string.html.erb

@@ -2,15 +2,15 @@
 
 module AdministrateRansack
   FILTERS = {
-    'Administrate::Field::BelongsTo' => 'field_belongs_to',
-    'Administrate::Field::Boolean' => 'field_boolean',
-    'Administrate::Field::Date' => 'field_date',
-    'Administrate::Field::DateTime' => 'field_date',
-    'Administrate::Field::Email' => 'field_string',
-    'Administrate::Field::HasMany' => 'field_has_many',
-    'Administrate::Field::Number' => 'field_number',
-    'Administrate::Field::Select' => 'field_select',
-    'Administrate::Field::String' => 'field_string',
-    'Administrate::Field::Text' => 'field_string'
+    'Administrate::Field::BelongsTo' => :belongs_to,
+    'Administrate::Field::Boolean' => :boolean,
+    'Administrate::Field::Date' => :date,
+    'Administrate::Field::DateTime' => :date,
+    'Administrate::Field::Email' => :string,
+    'Administrate::Field::HasMany' => :has_many,
+    'Administrate::Field::Number' => :number,
+    'Administrate::Field::Select' => :select,
+    'Administrate::Field::String' => :string,
+    'Administrate::Field::Text' => :string
   }.freeze
 end

lib/administrate_ransack/filters.rb

@@ -5,11 +5,10 @@
 module AdministrateRansack
   module Searchable
     def filter_resources(resources, search_term:)
-      options = respond_to?(:ransack_options, true) ? ransack_options : {}
-      distinct = respond_to?(:ransack_result_distinct, true) ? ransack_result_distinct : true
-      query = params[:q] || parse_search_term(search_term)
-      @ransack_results = prepare_search(resource_collection: resources, query_params: query, options: options)
-      @ransack_results.result(distinct: distinct)
+      query = params[:q] || parse_search_term(search_term, model: resources.klass)
+      @ransack_results = prepare_search(resource_collection: resources, query_params: query)
+      setup_view_attrs(dashboard:, model: resources.klass)
+      prepare_result(@ransack_results)
     end
 
     # ref => https://github.com/thoughtbot/administrate/blob/v0.18.0/app/helpers/administrate/application_helper.rb#L72-L78
@@ -18,7 +17,7 @@ def sanitized_order_params(page, current_field_name)
       association_params = collection_names.map do |assoc_name|
         { assoc_name => %i[order direction page per_page] }
       end
-      params.permit(:search, :id, :page, :per_page, association_params, q: {})
+      params.permit(:search, :id, :page, :per_page, :utf8, :_page, association_params, q: {})
     end
 
     class << self
@@ -29,12 +28,18 @@ def prepended(base)
 
     private
 
-    def parse_search_term(search_term)
-      terms = search_term.split.map { _1.split(':') }.select { |k, v| v.present? && k.present? }
-      terms.to_h.transform_keys { "#{_1}_cont" }
+    def parse_search_term(search_term, model:)
+      return {} if search_term.blank?
+
+      terms_regex = /(\w+):"([^"]+)"|(\w+):'([^']+)'|(\w+):(\w+)/
+      terms = search_term.scan(terms_regex).map(&:compact)
+      terms.to_h.transform_keys do |key|
+        model.ransackable_attributes.include?(key) ? "#{key}_cont" : key
+      end
     end
 
-    def prepare_search(resource_collection:, query_params:, options:)
+    def prepare_search(resource_collection:, query_params:)
+      options = respond_to?(:ransack_options, true) ? ransack_options : {}
       resource_collection.ransack(query_params, **options)
     rescue ArgumentError => e
       if defined?(Ransack::InvalidSearchError) && e.is_a?(Ransack::InvalidSearchError) # rubocop:disable Style/GuardClause
@@ -52,5 +57,42 @@ def ransack_invalid_search_error(error)
         flash.now[:alert] = I18n.t('administrate_ransack.errors.invalid_search', default: error.message)
       end
     end
+
+    def setup_view_attrs(dashboard:, model:)
+      @model = model
+      @fields = prepare_fields_for(dashboard:)
+    end
+
+    def prepare_fields_for(dashboard:)
+      dashboard_class = dashboard.class
+      fields = defined?(dashboard_class::RANSACK_SEARCH) ? dashboard_class::RANSACK_SEARCH : {}
+      ret = fields.to_h do |field, conf|
+        [field, eval_type(dashboard:, field:, conf:)]
+      end
+    end
+
+    def eval_type(dashboard:, field:, conf:)
+      param = "#{field}_eq"
+      type =
+        if conf.blank?
+          field_type = dashboard.attribute_type_for(field).to_s
+          AdministrateRansack::FILTERS[field_type]
+        elsif conf.is_a?(Hash)
+          type = (conf[:type] || :string).to_sym
+          param = "#{field}_cont" if type == :string
+          param = field.to_s if conf[:scope]
+          param = conf[:param] if conf[:param].present?
+          type
+        else
+          type = conf
+        end
+
+      [type, param, {}, field.to_s]
+    end
+
+    def prepare_result(ransack_results)
+      distinct = respond_to?(:ransack_result_distinct, true) ? ransack_result_distinct : true
+      ransack_results.result(distinct: distinct)
+    end
   end
 end

lib/administrate_ransack/searchable.rb

@@ -99,4 +99,20 @@ class PostDashboard < Administrate::BaseDashboard
   # def display_resource(post)
   #   "Post ##{post.id}"
   # end
+
+  RANSACK_SEARCH = {
+    title: {
+      type: :string,
+      # param: :title_cont
+    },
+    published: :boolean,
+    position: :number,
+    by_category: {
+      type: :string,
+      scope: true
+    },
+    dt: :date,
+  }.freeze
+
+  # RANSACK_SEARCH = %i[title published dt].freeze
 end