effective_resources 1.9.11 → 1.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612fe4c620f16ea85250d0d20afff1cc730bd9608565aa2eae61227c2e16c561
-  data.tar.gz: 44163d5acae4f3092a7d1c5b1af45f41a6d009035cd5fd3756139105fd99e15d
+  metadata.gz: 7dd0112208ea9815fab0543b91b2ab24fd607d561a49b05d1f19ddffa4e6894b
+  data.tar.gz: b9fc2f5ac59dc2cb164b4397995b81c8b1c855e045c6934fb2081f4ac9381db0
 SHA512:
-  metadata.gz: 01e8d523944f484b841a02d5ccff5ad07b1fd3ddf2f57179a965eed0965125b98e9210589876df52f630195b2eb100a7b921970d364ddf2c0aad59c289e50cec
-  data.tar.gz: 026427c9bf9876675d9dfaa99e5b63c5aafa93ca62f0aaa224d5d8446b823248ef6d9f083405e8900417517c1a8fcbacbbf6c8ae83a657fdf98f1fa653f8ea16
+  metadata.gz: 41562bcb2c1f07e868fcea21088c9b676da9d43b193ad594affde4bc247d47713873f9fb56c63a58ca50b147d0a60905ae476544888e64ce709f22e5cd4dd859
+  data.tar.gz: c0e9b28781244c3638f63ca6a6ce89ea811afe31774acb3911f6cc774ad57d61e4b803dde8423c81c39cb620a64be22a75b9a47e613c6da124a0699222763596

data/app/models/concerns/acts_as_tokened.rb

@@ -40,6 +40,7 @@ module ActsAsTokened
   end
 
   def to_global_id(**params)
+    params[:tenant] = Tenant.current if defined?(Tenant)
     GlobalID.new(URI::GID.build(app: Rails.application.config.global_id.app, model_name: model_name, model_id: to_param, params: params))
   end
 

data/app/models/effective/resources/forms.rb

@@ -21,7 +21,11 @@ module Effective
             collection ||= (klass.const_get(constant_pluralized) rescue nil) if defined?("#{klass.name}::#{constant_pluralized}")
           end
 
-          { as: :select, polymorphic: true, collection: (collection || []) }.compact
+          if collection.present?
+            { as: :select, polymorphic: true, collection: (collection || []) }
+          else
+            { as: :string }
+          end
         when :has_and_belongs_to_many
           { as: :select }.merge(search_form_field_collection(has_and_belongs_to_many(name)))
         when :has_many

data/app/models/effective/resources/relation.rb

@@ -98,8 +98,18 @@ module Effective
           elsif name == :user # Polymorphic user
             relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
           else # Maybe from a string field
-            id ||= Effective::Attribute.new(:integer).parse(term)
-            relation.where("#{sql_column}_id = ? OR #{sql_column}_type = ?", id, (type || term))
+            collection = relation.none
+
+            relation.unscoped.distinct("#{name}_type").pluck("#{name}_type").each do |klass_name|
+              next if klass_name.nil?
+
+              resource = Effective::Resource.new(klass_name)
+              next unless resource.klass.present?
+
+              collection = collection.or(relation.where("#{name}_id": resource.search_any(term), "#{name}_type": klass_name))
+            end
+
+            collection
           end
         when :has_and_belongs_to_many, :has_many, :has_one
           relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.11'.freeze
+  VERSION = '1.9.15'.freeze
 end

data/lib/effective_resources.rb

@@ -52,11 +52,7 @@ module EffectiveResources
   end
 
   def self.transaction(resource = nil, &block)
-    connection = (resource if resource.respond_to?(:transaction))
-    connection ||= (resource.class if resource.class.respond_to?(:transaction))
-    connection ||= '::ApplicationRecord'.safe_constantize
-    connection ||= 'ActiveRecord::Base'.safe_constantize
-
+    connection = 'ActiveRecord::Base'.safe_constantize
     raise('unable to determine transaction class') unless connection.present?
 
     connection.transaction { yield }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.9.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails