avo 2.29.0 → 2.29.1.pre.pr1652

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572070da39670d32588de6616a4b51015615efe3482ea813fe148035bba33cf7
-  data.tar.gz: 9a1056b36ab1d3ceebd06eeb505fb5641f41d9ddbe943e48e87627030df2edb0
+  metadata.gz: 7d2125434870241611526a666d97850dd666741c17ebe191c8496dfc0804faf0
+  data.tar.gz: f05693aeee46a349b98329592a9f4bc0ae1b35f6922e8fd83d7ef7dd120bbc3d
 SHA512:
-  metadata.gz: 95570888ee4d613f5062f3cf924aa7af69d1b6675a042da4a0ed75131a5e858ab451ab4d23c85ceed79c1a8f57508ef2dda4540cdbc7462f96ff251e1f70a20c
-  data.tar.gz: 3941183c0d08772696b52fdc5bac795d35002d87309dd7d5963d1f9b4d7b1107354ba3cf0d116a8752af35ec54a39e0f89de4c05df2e67df28aaa1b062aa1f39
+  metadata.gz: 70967faaf46f6552646994b4cf3d5d080b8059d2909826169ac63021b11699875d4c3d81282eb9f65e074b208711b2260d220656cde4aa422503569070176421
+  data.tar.gz: 300be7ff2c5c9d04ada4995820318ec3076c6a1ba5954c1ccc88792d35117e1db13d3e89f84d41c8db44f322cc1df19fe7625b3d86772813e96a58f11cb1379a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.29.0)
+    avo (2.29.1.pre.pr1652)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/components/avo/fields/belongs_to_field/edit_component.rb

@@ -31,6 +31,10 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
     @resource.model["#{@field.foreign_key}_type"]
   end
 
+  def polymorphic_resource
+    ::Avo::App.get_resource_by_model_name(polymorphic_class)
+  end
+
   # Get the polymorphic id
   def polymorphic_id
     @resource.model["#{@field.foreign_key}_id"]
@@ -44,7 +48,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
     return @polymorphic_record if @polymorphic_record.present?
 
-    @polymorphic_record = @resource.find_record polymorphic_id, query: polymorphic_class.safe_constantize, params: params
+    @polymorphic_record = polymorphic_resource.find_record polymorphic_id, query: polymorphic_class.safe_constantize, params: params
 
     @polymorphic_record
   end

data/app/components/avo/fields/has_one_field/show_component.rb

@@ -36,11 +36,15 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   end
 
   def create_path
+    association_id = @field.resource.model_class._reflections[@field.id.to_s].inverse_of.name
+
     args = {
-      via_relation: @resource.singular_model_key,
+      via_relation: association_id,
       via_relation_class: @resource.model_class.to_s,
-      via_resource_id: @resource.model.to_param
+      via_resource_id: @resource.model.to_param,
+      via_association_type: :has_one
     }
+
     helpers.new_resource_path(resource: @field.target_resource, **args)
   end
 end

data/app/components/avo/referrer_params_component.html.erb

@@ -1,3 +1,5 @@
+<%# via_association_type is used in has_one create actions %>
+<%= hidden_field_tag :via_association_type, params[:via_association_type] if params[:via_association_type] %>
 <%= hidden_field_tag :via_resource_class, params[:via_resource_class] if params[:via_resource_class] %>
 <%= hidden_field_tag :via_resource_id, params[:via_resource_id] if params[:via_resource_id] %>
 <%= hidden_field_tag :via_relation, params[:via_relation] if params[:via_relation] %>

data/app/controllers/avo/base_controller.rb

@@ -151,7 +151,12 @@ module Avo
           @related_record = via_resource.find_record params[:via_resource_id], params: params
           association_name = BaseResource.valid_association_name(@model, params[:via_relation])
 
-          @model.send(association_name) << @related_record
+          if params[:via_association_type] == "has_one"
+            # On has_one scenarios we should switch the @record and @related_record
+            @related_record.send("#{@reflection.parent_reflection.inverse_of.name}=", @model)
+          else
+            @model.send(association_name) << @related_record
+          end
         end
       end
 

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/base_resource.rb

@@ -382,7 +382,8 @@ module Avo
 
             if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params[:via_relation_class])
               # set the value to the actual record
-              value = @params[:via_relation_class].safe_constantize.find(@params[:via_resource_id])
+              via_resource = ::Avo::App.get_resource_by_model_name(@params[:via_relation_class])
+              value = via_resource.find_record(@params[:via_resource_id])
             elsif reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
               resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
               model = resource.find_record @params[:via_resource_id], params: params

data/lib/avo/fields/has_one_field.rb

@@ -33,7 +33,8 @@ module Avo
           related_model = nil
         else
           related_class = model.class.reflections[name.to_s.downcase].class_name
-          related_model = related_class.safe_constantize.find value
+          related_resource = ::Avo::App.get_resource_by_model_name(related_class)
+          related_model = related_resource.find_record value
         end
 
         model.public_send("#{key}=", related_model)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.29.0" unless const_defined?(:VERSION)
+  VERSION = "2.29.1.pre.pr1652" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.29.0
+  version: 2.29.1.pre.pr1652
 platform: ruby
 authors:
 - Adrian Marin
@@ -1696,6 +1696,7 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
+- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1956,9 +1957,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: