avo 2.28.3.pre.pr1646 → 2.29.1.pre.pr1652

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527b4a8adeef6e5f6833c8329a66e2c5ced407a38f78956c4927f42af9967e93
-  data.tar.gz: e90ddb57665013a527f4cf1fe815578e3126af4b1225f96687b37386131cb9c5
+  metadata.gz: 7d2125434870241611526a666d97850dd666741c17ebe191c8496dfc0804faf0
+  data.tar.gz: f05693aeee46a349b98329592a9f4bc0ae1b35f6922e8fd83d7ef7dd120bbc3d
 SHA512:
-  metadata.gz: ab734f7daa2221975ef03005c5b7a94e75db330055de4e90efc540d91e2d9816ee3c89013f13b7d195010df224569849f449e3460010991ed1ec59c1a5bdabb6
-  data.tar.gz: a6b2a63cfdba2692203888b799c4e3c12414ece3cfc5017ce26a2dc453477c7e0f3d3065780add4232af92343915e3a8d98faa65f9ae07b4b5ab45d40d74360a
+  metadata.gz: 70967faaf46f6552646994b4cf3d5d080b8059d2909826169ac63021b11699875d4c3d81282eb9f65e074b208711b2260d220656cde4aa422503569070176421
+  data.tar.gz: 300be7ff2c5c9d04ada4995820318ec3076c6a1ba5954c1ccc88792d35117e1db13d3e89f84d41c8db44f322cc1df19fe7625b3d86772813e96a58f11cb1379a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.28.3.pre.pr1646)
+    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/app/helpers/avo/application_helper.rb

@@ -102,16 +102,15 @@ module Avo
     end
 
     def root_path_without_url
-      Avo::App.root_path
-        .to_s
-        .delete_prefix(request.base_url.to_s)
-        .delete_suffix("/")
-        .gsub("/?", "?")
-        .query = ""
+      "#{Avo.configuration.prefix_path}#{mount_path}"
     rescue
       Avo.configuration.root_path
     end
 
+    def mount_path
+      Avo::Engine.routes.find_script_name(params.permit!.to_h.symbolize_keys)
+    end
+
     private
 
     # Taken from the original library

data/app/javascript/js/controllers/fields/tags_field_controller.js

@@ -60,6 +60,10 @@ export default class extends BaseController {
         },
         originalInputValueFormat: (valuesArr) => valuesArr.map((item) => item.value),
       })
+    } else {
+      options = merge(options, {
+        originalInputValueFormat: (valuesArr) => valuesArr.map((item) => item.value).join(','),
+      })
     }
 
     return options

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/configuration.rb

@@ -42,6 +42,7 @@ module Avo
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
     attr_accessor :resources
+    attr_accessor :prefix_path
     attr_writer :branding
 
     def initialize
@@ -94,6 +95,7 @@ module Avo
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
       @resources = nil
+      @prefix_path = nil
     end
 
     def current_user_method(&block)
@@ -117,8 +119,8 @@ module Avo
     end
 
     def namespace
-      if computed_root_path.present?
-        computed_root_path.delete "/"
+      if Avo.configuration.root_path.present?
+        Avo.configuration.root_path.delete "/"
       else
         root_path.delete "/"
       end
@@ -130,10 +132,6 @@ module Avo
       @root_path
     end
 
-    def computed_root_path
-      Avo.configuration.root_path
-    end
-
     def feature_enabled?(feature)
       !@disabled_features.map(&:to_sym).include?(feature.to_sym)
     end

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.28.3.pre.pr1646" unless const_defined?(:VERSION)
+  VERSION = "2.29.1.pre.pr1652" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -2,6 +2,8 @@
 Avo.configure do |config|
   ## == Routing ==
   config.root_path = '/<%= options[:path] %>'
+  # used only when you have custom `map` configuration in your config.ru
+  # config.prefix_path = "/internal"
 
   # Where should the user be redirected when visting the `/<%= options[:path] %>` url
   # config.home_path = nil