avo 4.0.0.beta.43 → 4.0.0.beta.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c7b20a4be4b85ecfdc9ddfa3555ff9879a93e198444117995d5114b283008d
-  data.tar.gz: d616fda1761657b357ca2019b05618113b1082d12e78d955aa64cd50af10e96f
+  metadata.gz: 8064e5a8cb35e019ad3441160ab0042c555245551448e325b6e3ef20c912064c
+  data.tar.gz: 25f326ee60b97ff335284db6014f8d4b8c688e4e531d3ac507be3625bfbcf87a
 SHA512:
-  metadata.gz: 766ba7782e99ffe20da840c7c3259efe126558aade7c362eecb9aae00672e09ca95294aa9231530ab724591d7c449976a4911732f1b8eeca2bfefa1995baf168
-  data.tar.gz: ee155888e963b4d2f417522044d12b3f26507308e19146cdb3bd8100d3e2808fd9dab9842addab04106683ce33e6d474c7b0b38dd64c7d612811b30acdcf15b3
+  metadata.gz: 03bebbb26c91ab42c36eaa1534cd2a2bec2bec51ec4a60f61ec37f9b6e337b293afe049a0d925b363c34d96e5674d536d35af0ed132a763e24def378e88dd505
+  data.tar.gz: 16c16b4ec4b80a2875bfb61b95bae1ae462b9849075aedc399f3010625127f4a634c9395ab756a90324c3a36a2ddde0ee19fd9902f98d19ae2c8d867b9a2bd1c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (4.0.0.beta.43)
+    avo (4.0.0.beta.44)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/assets/builds/avo/application.css

@@ -2748,9 +2748,6 @@
   .text-amber-700 {
     color: var(--color-amber-700);
   }
-  .text-black {
-    color: var(--color-black);
-  }
   .text-blue-500 {
     color: var(--color-blue-500);
   }

data/lib/avo/fields/belongs_to_field.rb

@@ -119,11 +119,7 @@ module Avo
         resource = target_resource
         resource = Avo.resource_manager.get_resource_by_model_class model if model.present?
 
-        query = resource.query_scope
-
-        if attach_scope.present?
-          query = Avo::ExecutionContext.new(target: attach_scope, query: query, parent: get_record).handle
-        end
+        query = scoped_target_query(resource, get_record)
 
         query.all.limit(Avo.configuration.associations_lookup_list_limit).map do |record|
           [resource.new(record: record).record_title, record.to_param]
@@ -212,12 +208,18 @@ module Avo
           if valid_model_class.blank? || id_from_param.blank?
             record.send(:"#{polymorphic_as}_id=", nil)
           else
-            record_id = target_resource(record:, polymorphic_model_class: value.safe_constantize).find_record(id_from_param).id
+            target = target_resource(record:, polymorphic_model_class: value.safe_constantize)
+            record_id = target.find_record(id_from_param, query: scoped_target_query(target, record, for_find: true)).id
 
             record.send(:"#{polymorphic_as}_id=", record_id)
           end
         else
-          record_id = value.blank? ? value : target_resource(record:).find_record(value).send(reflection.association_primary_key)
+          target = target_resource(record:)
+          record_id = if value.blank?
+            value
+          else
+            target.find_record(value, query: scoped_target_query(target, record, for_find: true)).send(reflection.association_primary_key)
+          end
 
           record.send(:"#{key}=", record_id)
         end
@@ -325,6 +327,15 @@ module Avo
 
       private
 
+      def scoped_target_query(resource, parent_record, for_find: false)
+        resource_class = resource.is_a?(Class) ? resource : resource.class
+        query = for_find ? resource_class.find_scope : resource_class.query_scope
+
+        return query if attach_scope.blank?
+
+        Avo::ExecutionContext.new(target: attach_scope, query: query, parent: parent_record).handle
+      end
+
       def get_model_class(record)
         if record.nil?
           @resource.model_class

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "4.0.0.beta.43" unless const_defined?(:VERSION)
+  VERSION = "4.0.0.beta.44" unless const_defined?(:VERSION)
 end