- avo: ransack -> arel

Author: palkan

app/avo/resources/cloud.rb

@@ -3,12 +3,14 @@ class Avo::Resources::Cloud < Avo::BaseResource
 
   self.search = {
     query: -> {
-      query.ransack(
-        participant_full_name_cont: params[:q],
-        participant_email_cont: params[:q],
-        m: "or"
-      ).result(distinct: false)
-    }
+      query.joins(:participant)
+        .merge(Participant.search(params[:q]))
+    },
+    item: -> do
+      {
+        title: "#{record.id} (#{record.participant.full_name} — #{record.participant.email})"
+      }
+    end
   }
 
   class BulkDelete < Avo::BaseAction

app/avo/resources/invitation.rb

@@ -3,12 +3,14 @@ class Avo::Resources::Invitation < Avo::BaseResource
 
   self.search = {
     query: -> {
-      query.ransack(
-        participant_full_name_cont: params[:q],
-        participant_email_cont: params[:q],
-        m: "or"
-      ).result(distinct: false)
-    }
+      query.joins(:participant)
+        .merge(Participant.search(params[:q]))
+    },
+    item: -> do
+      {
+        title: "#{record.id} (#{record.participant.full_name} — #{record.participant.email})"
+      }
+    end
   }
 
   def fields

app/avo/resources/participant.rb

@@ -4,11 +4,7 @@ class Avo::Resources::Participant < Avo::BaseResource
 
   self.search = {
     query: -> {
-      query.ransack(
-        full_name_cont: params[:q],
-        email_cont: params[:q],
-        m: "or"
-      ).result(distinct: false)
+      query.merge(Participant.search(params[:q]))
     }
   }
 

app/models/participant.rb

@@ -15,6 +15,7 @@ class Participant < ApplicationRecord
 
   scope :without_picked_cloud, -> { where.missing(:picked_cloud) }
   scope :without_invitations, -> { where.missing(:invitations) }
+  scope :search, ->(q) { where(arel_table[:full_name].matches("%#{q}%").or(arel_table[:email].matches("%#{q}%"))) }
 
   before_create do
     self.access_token ||= Nanoid.generate(size: 6)