Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make search easier to override and adapt to custom use cases #2096

Merged
merged 2 commits into from
Feb 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions app/controllers/administrate/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ class ApplicationController < ActionController::Base
def index
authorize_resource(resource_class)
search_term = params[:search].to_s.strip
resources = Administrate::Search.new(scoped_resource,
dashboard,
search_term).run
resources = filter_resources(scoped_resource, search_term: search_term)
resources = apply_collection_includes(resources)
resources = order.apply(resources)
resources = resources.page(params[:_page]).per(records_per_page)
Expand Down Expand Up @@ -81,6 +79,14 @@ def destroy

private

def filter_resources(resources, search_term:)
Administrate::Search.new(
resources,
dashboard,
search_term,
).run
end

def after_resource_destroyed_path(_requested_resource)
{ action: :index }
end
Expand Down
26 changes: 26 additions & 0 deletions spec/example_app/app/controllers/admin/log_entries_controller.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
module Admin
class LogEntriesController < Admin::ApplicationController
def filter_resources(resources, search_term:)
return resources if search_term.blank?

customer_ids = Customer.where(
[
"name ILIKE ?",
"%#{search_term}%",
],
).pluck(:id)
order_ids = Order.joins(:customer).where(
[
"customers.name ILIKE ?",
"%#{search_term}%",
],
).pluck(:id)

customers_filter = resources.where(
logeable_type: "Customer",
logeable_id: customer_ids,
)
orders_filter = resources.where(
logeable_type: "Order",
logeable_id: order_ids,
)
customers_filter.or(orders_filter)
end
end
end
32 changes: 32 additions & 0 deletions spec/example_app/spec/features/log_search_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
require "rails_helper"

RSpec.feature "Log search", type: :feature do
it "filters logs related to a customer name", :js do
c1 = create(:customer, name: "John Petrucci")
c2 = create(:customer, name: "John Myung")
c3 = create(:customer, name: "James LaBrie")
o1a = create(:order, customer: c1)
o2 = create(:order, customer: c2)
o3 = create(:order, customer: c3)
o1b = create(:order, customer: c1)

[c1, c2, o1a, c3, o2, o3, o1b].each do |record|
create(:log_entry, logeable: record)
end

visit admin_log_entries_path
expect(page).to have_records_table(rows: 7)

fill_in :search, with: "John"
submit_search
expect(page).to have_records_table(rows: 5)
end

def have_records_table(rows:)
have_css("[role=main] table tr[data-url]", count: rows)
end

def submit_search
page.execute_script("$('.search').submit()")
end
end