avo 1.22.1 → 1.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '04783e6660bd1ebada3544318b2f48082e3e43eb4bc7ee3df2986a9951d04090'
-  data.tar.gz: 6e997ae6e0dbb4eaa7828b669b73efd811370c0cfb5213d405f15bdd41bb9240
+  metadata.gz: d1b3e02ee566af1fcf8ac642f0b59693fc9ca60840f5a57e46c0e57df32831c9
+  data.tar.gz: 621dc29f10b4693db5e09531fb7cd8cd591666e0be8d098d3927a48e0e2cb0dd
 SHA512:
-  metadata.gz: d61380b2f4c216d4ff1bd4e3e2f882500ba5e09835712d0661e8a79afd505f4b308ab7f30b41fcd95750e061003ca79a25b826e94eb9d007ba786923ce18740c
-  data.tar.gz: 383afdfdc9eaaa92e00b6b91895a1b14ebff2d1655e3c605e39838e6640e9ff9f74eebef1f0322d2eedd402b11060b2b02d4d933a7823edbd7343f47e3a5cd35
+  metadata.gz: 325009723e404b72ab8ff8cde8c0491ecf4c520b075b7731ee837c56998f1c45d57b50805ebbce1358dfff3b9f7e6b8a53d3ada14a9fe365523a6a3f077dbf29
+  data.tar.gz: de4a2bcb927f0d1eb4053185e3683c0d44d06c0fce7848f3740edaee52cdabfc3c6a5cde067b6ad9f8506013ea8eb214639073e19793cc9fc4e51b72bbdcaf38

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.22.1)
+    avo (1.22.2)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/db/factories.rb

@@ -42,11 +42,11 @@ FactoryBot.define do
   end
 
   factory :comment do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)) }
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join(' ') }
   end
 
   factory :review do
-    body { Faker::Lorem.paragraphs(number: rand(4...10)) }
+    body { Faker::Lorem.paragraphs(number: rand(4...10)).join(' ') }
   end
 
   factory :person do

data/lib/avo/base_resource.rb

@@ -127,23 +127,29 @@ module Avo
           field.visible?
         end
         .select do |field|
+          is_valid = true
+
           # Strip out the reflection field in index queries with a parent association.
           if reflection.present?
-            if reflection.options.present? &&
-                field.respond_to?(:polymorphic_as) &&
-                field.polymorphic_as.to_s == reflection.options[:as].to_s
-              next
-            end
-
-            if field.respond_to?(:foreign_key) &&
-                reflection.respond_to?(:foreign_key) &&
-                reflection.foreign_key != field.foreign_key &&
-                @params[:resource_name] == field.resource.model_key
-              next
+            # regular non-polymorphic association
+            # we're matching the reflection inverse_of foriegn key with the field's foreign_key
+            if field.is_a?(Avo::Fields::BelongsToField)
+              if field.respond_to?(:foreign_key) &&
+                reflection.inverse_of.foreign_key == field.foreign_key
+                is_valid = false
+              end
+
+              # polymorphic association
+              if field.respond_to?(:foreign_key) &&
+                field.is_polymorphic? &&
+                reflection.respond_to?(:polymorphic?) &&
+                reflection.inverse_of.foreign_key == field.reflection.foreign_key
+                is_valid = false
+              end
             end
           end
 
-          true
+          is_valid
         end
 
       if panel.present?

data/lib/avo/fields/belongs_to_field.rb

@@ -136,6 +136,8 @@ module Avo
 
       def is_polymorphic?
         polymorphic_as.present?
+      rescue
+        false
       end
 
       def foreign_key
@@ -154,6 +156,13 @@ module Avo
         nil
       end
 
+      # Get the model reflection instance
+      def reflection
+        reflection_for_key(id)
+      rescue
+        nil
+      end
+
       def relation_model_class
         @resource.model_class
       end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.22.1"
+  VERSION = "1.22.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 1.22.1
+  version: 1.22.2
 platform: ruby
 authors:
 - Adrian Marin