avo 3.10.10 → 3.11.0

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

@@ -1,8 +1,8 @@
-<%= content_tag :div, data: data_attributes, class: classes do %>
+<%= content_tag :div, class: classes, data: data_attributes do %>
   <%= render Avo::CoverPhotoComponent.new cover_photo: @cover_photo %>
 
   <% if render_header? %>
-    <div data-target="panel-header" class="flex flex-col flex-1 w-full mb-4">
+    <div data-target="panel-header" class="flex flex-col w-full mb-4">
       <div class="flex justify-center sm:justify-start flex-col sm:flex-row w-full flex-1 has-cover-photo:mt-0">
         <%= render Avo::ProfilePhotoComponent.new profile_photo: @profile_photo %>
         <div class="flex flex-col flex-1 w-full">
@@ -55,9 +55,11 @@
     </div>
   <% end %>
   <% if bare_content? %>
-    <div data-target="panel-bare-content" class="relative <% if sidebar? %> has-sidebar <% end %>">
+    <%= content_tag :div, class: class_names("relative flex flex-1 flex-col", "has-sidebar": sidebar?), data: {
+      target: :"panel-bare-content"
+    } do %>
       <%= bare_content %>
-    </div>
+    <% end %>
   <% end %>
   <% if footer_tools? %>
     <div

data/app/components/avo/resource_component.rb

@@ -36,7 +36,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   def detach_path
     return "/" if @reflection.blank?
 
-    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.record.to_param)
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.record_param)
   end
 
   def can_see_the_edit_button?
@@ -149,6 +149,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
       label: actions_list.label,
       size: actions_list.size,
       icon: actions_list.icon,
+      title: actions_list.title,
       as_row_control: instance_of?(Avo::Index::ResourceControlsComponent)
     )
   end
@@ -174,7 +175,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
         target: "control:destroy",
         control: :destroy,
         tippy: control.title ? :tooltip : nil,
-        "resource-id": @resource.record.id,
+        "resource-id": @resource.record_param,
       } do
       control.label
     end

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

@@ -2,7 +2,7 @@
   data-component-name="<%= self.class.to_s.underscore %>"
   data-component-index="<%= index %>"
   data-resource-name="<%= @resource.class.to_s %>"
-  data-record-id="<%= @resource.record.id %>"
+  data-record-id="<%= @resource.record_param %>"
 >
   <%= render Avo::Items::VisibleItemsComponent.new(
     resource: @resource,

data/app/components/avo/views/resource_edit_component.html.erb

@@ -3,9 +3,9 @@
   data: {
     model_name: @resource.model_name.to_s,
     resource_name: @resource.class.to_s,
-    record_id: @resource.record.id,
+    record_id: @resource.record_param,
     selected_resources_name: @resource.model_key,
-    selected_resources: [@resource.record.id],
+    selected_resources: [@resource.record_param],
     **@resource.stimulus_data_attributes
   } do %>
   <%= render_cards_component %>

data/app/components/avo/views/resource_index_component.html.erb

@@ -11,7 +11,7 @@
       description: description,
       cover_photo: resource.cover_photo,
       data: {component: "resources-index"},
-      display_breadcrumbs: @reflection.blank?
+      display_breadcrumbs: @reflection.blank? || (@reflection.present? && !helpers.turbo_frame_request?)
     ) do |c| %>
     <% c.with_name_slot do %>
       <%= render Avo::PanelNameComponent.new name: title, url: (params[:turbo_frame].present? && linkable?) ? field.frame_url(add_turbo_frame: false) : nil, target: :_blank do |panel_name_component| %>
@@ -78,7 +78,7 @@
       <% end %>
       <% if view_type.to_sym == :table || view_type.to_sym == :map %>
         <% if @records.present? %>
-          <div class="mt-4">
+          <div class="mt-4 w-full">
             <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: turbo_frame || "none", index_params: @index_params, resource: @resource, parent_record: parent_record, discreet_pagination: field&.discreet_pagination %>
           </div>
         <% end %>

data/app/components/avo/views/resource_index_component.rb

@@ -66,10 +66,20 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def can_attach?
-    klass = @reflection
-    klass = @reflection.through_reflection if klass.is_a? ::ActiveRecord::Reflection::ThroughReflection
+    return false if has_reflection_and_is_read_only
 
-    @reflection.present? && klass.is_a?(::ActiveRecord::Reflection::HasManyReflection) && !has_reflection_and_is_read_only && authorize_association_for(:attach)
+    reflection_class = if @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
+      @reflection.through_reflection.class
+    else
+      @reflection.class
+    end
+
+    return false unless reflection_class.in? [
+      ActiveRecord::Reflection::HasManyReflection,
+      ActiveRecord::Reflection::HasAndBelongsToManyReflection
+    ]
+
+    authorize_association_for(:attach)
   end
 
   def create_path
@@ -82,7 +92,10 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
         via_record_id: @parent_record.to_param
       }
 
-      if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
+      if @reflection.class.in? [
+        ActiveRecord::Reflection::ThroughReflection,
+        ActiveRecord::Reflection::HasAndBelongsToManyReflection
+      ]
         args[:via_relation] = params[:resource_name]
       end
 

data/app/components/avo/views/resource_show_component.html.erb

@@ -2,9 +2,9 @@
   data: {
     model_name: @resource.model_name.to_s,
     resource_name: @resource.class.to_s,
-    record_id: @resource.record.id,
+    record_id: @resource.record_param,
     selected_resources_name: @resource.model_key,
-    selected_resources: [@resource.record.to_param],
+    selected_resources: [@resource.record_param],
     **@resource.stimulus_data_attributes
   } do %>
   <%= content_tag :div, class: 'space-y-12' do %>

data/app/controllers/avo/actions_controller.rb

@@ -4,7 +4,7 @@ module Avo
   class ActionsController < ApplicationController
     before_action :set_resource_name
     before_action :set_resource
-    before_action :set_record, only: :show, if: ->(request) do
+    before_action :set_record, only: [:show, :handle], if: ->(request) do
       # Try to se the record only if the user is on the record page.
       # set_record will fail if it's tried to be used from the Index page.
       request.params[:id].present?

data/app/controllers/avo/application_controller.rb

@@ -89,7 +89,7 @@ module Avo
 
       return field.use_resource if field&.use_resource.present?
 
-      reflection = @record._reflections.with_indifferent_access[field&.for_attribute || params[:related_name]]
+      reflection = @record.class.reflect_on_association(field&.for_attribute || params[:related_name])
 
       reflected_model = reflection.klass
 

data/app/controllers/avo/associations_controller.rb

@@ -12,6 +12,7 @@ module Avo
     before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy]
     before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy]
     before_action :set_attachment_record, only: [:create, :destroy]
+    before_action :set_attach_fields, only: [:new, :create]
     before_action :authorize_index_action, only: :index
     before_action :authorize_attach_action, only: :new
     before_action :authorize_detach_action, only: :destroy
@@ -54,7 +55,7 @@ module Avo
         end
 
         @options = query.all.map do |record|
-          [@attachment_resource.new(record: record).record_title, record.id]
+          [@attachment_resource.new(record: record).record_title, record.to_param]
         end
       end
     end
@@ -67,6 +68,7 @@ module Avo
               notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name)
           }
         else
+          flash[:error] = t("avo.attachment_failed", attachment_class: @related_resource.name)
           format.turbo_stream {
             render turbo_stream: turbo_stream.append("alerts", partial: "avo/partials/all_alerts")
           }
@@ -78,7 +80,9 @@ module Avo
       association_name = BaseResource.valid_association_name(@record, association_from_params)
 
       perform_action_and_record_errors do
-        if reflection_class == "HasManyReflection"
+        if through_reflection? && additional_params.present?
+          new_join_record.save
+        elsif has_many_reflection? || through_reflection?
           @record.send(association_name) << @attachment_record
         else
           @record.send(:"#{association_name}=", @attachment_record)
@@ -90,9 +94,9 @@ module Avo
     def destroy
       association_name = BaseResource.valid_association_name(@record, @field.for_attribute || params[:related_name])
 
-      if reflection.instance_of? ActiveRecord::Reflection::ThroughReflection
+      if through_reflection?
         join_record.destroy!
-      elsif reflection_class == "HasManyReflection"
+      elsif has_many_reflection?
         @record.send(association_name).delete @attachment_record
       else
         @record.send(:"#{association_name}=", nil)
@@ -106,7 +110,7 @@ module Avo
     private
 
     def set_reflection
-      @reflection = @record._reflections.with_indifferent_access[association_from_params]
+      @reflection = @record.class.reflect_on_association(association_from_params)
     end
 
     def set_attachment_class
@@ -132,12 +136,11 @@ module Avo
     end
 
     def reflection_class
-      reflection = @record._reflections.with_indifferent_access[association_from_params]
-
-      klass = reflection.class.name.demodulize.to_s
-      klass = reflection.through_reflection.class.name.demodulize.to_s if klass == "ThroughReflection"
-
-      klass
+      if @reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
+        @reflection.through_reflection.class
+      else
+        @reflection.class
+      end
     end
 
     def authorize_if_defined(method, record = @record)
@@ -172,21 +175,55 @@ module Avo
       @field&.for_attribute || params[:related_name]
     end
 
-    def reflection
-      @record.class.reflections.with_indifferent_access[association_from_params]
-    end
-
     def source_foreign_key
-      reflection.source_reflection.foreign_key
+      @reflection.source_reflection.foreign_key
     end
 
     def through_foreign_key
-      reflection.through_reflection.foreign_key
+      @reflection.through_reflection.foreign_key
     end
 
     def join_record
-      reflection.through_reflection.klass.find_by(source_foreign_key => @attachment_record.id,
+      @reflection.through_reflection.klass.find_by(source_foreign_key => @attachment_record.id,
         through_foreign_key => @record.id)
     end
+
+    def has_many_reflection?
+      reflection_class.in? [
+        ActiveRecord::Reflection::HasManyReflection,
+        ActiveRecord::Reflection::HasAndBelongsToManyReflection
+      ]
+    end
+
+    def through_reflection?
+      @reflection.instance_of? ActiveRecord::Reflection::ThroughReflection
+    end
+
+    def additional_params
+      @additional_params ||= params[:fields].permit(@attach_fields&.map(&:id))
+    end
+
+    def set_attach_fields
+      @attach_fields = if @field.attach_fields.present?
+        Avo::FieldsExecutionContext.new(target: @field.attach_fields)
+          .detect_fields
+          .items_holder
+          .items
+      end
+    end
+
+    def new_join_record
+      @resource.fill_record(
+        @reflection.through_reflection.klass.new,
+        additional_params.merge(
+          {
+            source_foreign_key => @attachment_record.id,
+            through_foreign_key => @record.id
+          }
+        ),
+        fields: @attach_fields,
+        extra_params: [source_foreign_key, through_foreign_key]
+      )
+    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -18,6 +18,11 @@ module Avo
 
     def index
       @page_title = @resource.plural_name.humanize
+
+      if @reflection.present? && !turbo_frame_request?
+        add_breadcrumb @record.class.to_s.pluralize, resources_path(resource: @parent_resource)
+        add_breadcrumb @parent_resource.record_title, resource_path(record: @record, resource: @parent_resource)
+      end
       add_breadcrumb @resource.plural_name.humanize
 
       set_index_params
@@ -121,7 +126,7 @@ module Avo
     def create
       # This means that the record has been created through another parent record and we need to attach it somehow.
       if params[:via_record_id].present? && params[:via_belongs_to_resource_class].nil?
-        @reflection = @record._reflections.with_indifferent_access[params[:via_relation]]
+        @reflection = @record.class.reflect_on_association(params[:via_relation])
         # Figure out what kind of association does the record have with the parent record
 
         # Fills in the required info for belongs_to and has_many
@@ -134,7 +139,7 @@ module Avo
         end
 
         # For when working with has_one, has_one_through, has_many_through, has_and_belongs_to_many, polymorphic
-        if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
+        if @reflection.is_a?(ActiveRecord::Reflection::ThroughReflection) || @reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
           # find the record
           via_resource = Avo.resource_manager.get_resource_by_model_class(params[:via_relation_class])
           @related_record = via_resource.find_record params[:via_record_id], params: params

data/app/controllers/avo/search_controller.rb

@@ -129,7 +129,7 @@ module Avo
       end
 
       {
-        _id: record.id,
+        _id: record.to_param,
         _label: highlighted_title,
         _url: resource.class.fetch_search(:result_path, record: resource.record) || record_path
       }

data/app/helpers/avo/application_helper.rb

@@ -134,7 +134,7 @@ module Avo
     end
 
     def frame_id(resource)
-      ["frame", resource.model_name.singular, resource.record.id].compact.join("-")
+      ["frame", resource.model_name.singular, resource.record_param].compact.join("-")
     end
 
     def chart_color(index)

data/app/javascript/avo.base.js

@@ -49,6 +49,14 @@ function initTippy() {
 
       return title
     },
+    onShow(tooltipInstance) {
+      // Don't render tooltip if there is no content.
+      if (tooltipInstance.props.content === null || tooltipInstance.props.content.length === 0) {
+        return false
+      }
+
+      return tooltipInstance
+    },
   })
 }
 

data/app/views/avo/actions/show.html.erb

@@ -11,7 +11,7 @@
     class="hidden text-slate-800"
   >
     <%= form_with scope: 'fields',
-      url: Avo::Services::URIService.parse(@resource.records_path).append_paths("actions").to_s,
+      url: @action.link_arguments(resource: @resource).first,
       local: true,
       html: {
         novalidate: true,
@@ -29,7 +29,6 @@
       <div class="flex-1 flex">
         <%= @action.get_message %>
       </div>
-      <%= hidden_field_tag :action_id, @action.to_param %>
       <%= form.hidden_field :avo_resource_ids, value: params[:id] || params[:resource_ids], 'data-action-target': 'resourceIds' %>
       <%= form.hidden_field :avo_selected_query, 'data-action-target': 'selectedAllQuery' %>
       <%= form.hidden_field :arguments, value: params[:arguments] %>
@@ -58,7 +57,8 @@
             size: :sm,
             data: {
               target: :submit_action,
-            }, autofocus: @fields.reject { |field| field.is_a?(Avo::Fields::HiddenField) }.empty? do %>
+            },
+            autofocus: @fields.reject { |field| field.is_a?(Avo::Fields::HiddenField) }.empty? do %>
           <%= @action.confirm_button_label %>
         <% end %>
       <% end %>

data/app/views/avo/associations/new.html.erb

@@ -18,31 +18,56 @@
     } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
       <% c.with_heading do %>
-        <%= t 'avo.choose_item', item: @related_resource.name.downcase %>
+        <%= t 'avo.choose_item', item: @field.name.singularize.downcase %>
       <% end %>
 
       <div class="flex-1 flex items-center justify-center px-0 lg:px-8 text-lg mt-8 mb-12">
-        <% if @field.is_searchable? %>
-          <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: form,
-            classes: input_classes("w-full"),
-            field: @field,
-            model_key: @field.target_resource&.model_key,
-            foreign_key: 'related_id',
-            resource: @resource,
-            view: :new
-          %>
-        <% else %>
-          <div class="flex-1 flex flex-col items-center justify-center px-0 md:px-24 text-base">
-            <%= form.select :related_id, options_for_select(@options, nil),
-              {
+        <div class="flex-1 flex flex-col items-center justify-center px-0 md:px-24 text-base">
+          <div class="w-full">
+            <% if @field.is_searchable? %>
+              <%= field_wrapper stacked: true,
+                field: @field,
+                view: Avo::ViewInquirer.new("edit"),
+                form:,
+                index: 0,
+                resource: @resource,
+                label_for: @field.id,
+                label: @field.name.singularize.downcase do %>
+                <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: form,
+                  classes: input_classes("w-full"),
+                  field: @field,
+                  model_key: @field.target_resource&.model_key,
+                  foreign_key: 'related_id',
+                  resource: @resource,
+                  view: :new
+                %>
+              <% end %>
+            <% else %>
+              <%= avo_edit_field :related_id,
+                as: :select,
+                form: form,
+                name: @field.name.singularize,
+                options: options_for_select(@options,
+                nil),
                 include_blank: t('avo.choose_an_option'),
-              },
-              {
-                class: input_classes('w-full'),
-              }
-            %>
+                stacked: true,
+                classes: 'w-full'
+              %>
+            <% end %>
+            <% @attach_fields&.each_with_index do |field, index| %>
+              <%= render(Avo::Items::SwitcherComponent.new(
+                resource: @related_resource,
+                item: field,
+                index: index + 1,
+                view: @view,
+                form: form,
+                field_component_extra_args: {
+                  stacked: true,
+                classes: 'w-full'}
+              )) %>
+            <% end %>
           </div>
-        <% end %>
+        </div>
       </div>
 
       <% c.with_controls do %>

data/app/views/avo/base/close_modal_and_reload_field.turbo_stream.erb

@@ -2,7 +2,7 @@
 
 <turbo-stream action="update-belongs-to"
               data-relation-name="<%= params[:via_relation] %>"
-              data-target-record-id="<%= @record.id %>"
+              data-target-record-id="<%= @record.to_param %>"
               data-target-resource-label="<%= @resource.record_title %>"
               data-target-resource-class="<%= @record.class.name %>">
 </turbo-stream>

data/app/views/layouts/avo/application.html.erb

@@ -18,13 +18,12 @@
       <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
     <% else %>
       <%= javascript_include_tag "avo.base", "data-turbo-track": "reload", defer: true %>
-      <% if Rails.env.development? %>
+      <% if Rails.env.development? && defined?(Hotwire::Livereload) %>
         <%= javascript_include_tag "hotwire-livereload", defer: true %>
       <% end %>
     <% end %>
     <%= render Avo::AssetManager::JavascriptComponent.new asset_manager: Avo.asset_manager %>
     <%= render partial: "avo/partials/head" %>
-    <%= turbo_refreshes_with method: :replace, scroll: :reset %>
     <%= content_for :head %>
   </head>
   <body class="bg-application os-mac">

data/config/initializers/pagy.rb

@@ -1,6 +1,6 @@
 require "pagy/extras/trim"
 require "pagy/extras/countless"
-if ::Pagy::VERSION > ::Gem::Version.new("9.0")
+if ::Pagy::VERSION >= ::Gem::Version.new("9.0")
   require "pagy/extras/size"
 end
 

data/lib/avo/base_action.rb

@@ -33,6 +33,7 @@ module Avo
     delegate :avo, to: :view_context
     delegate :main_app, to: :view_context
     delegate :to_param, to: :class
+    delegate :link_arguments, to: :class
 
     class << self
       delegate :context, to: ::Avo::Current

data/lib/avo/engine.rb

@@ -49,11 +49,15 @@ module Avo
       # This undoes Rails' previous nested directories behavior in the `app` dir.
       # More on this: https://github.com/fxn/zeitwerk/issues/250
       avo_directory = Rails.root.join("app", "avo").to_s
-      ActiveSupport::Dependencies.autoload_paths.delete(avo_directory)
+      engine_avo_directory = Avo::Engine.root.join("app", "avo").to_s
 
-      if Dir.exist?(avo_directory)
-        Rails.autoloaders.main.push_dir(avo_directory, namespace: Avo)
-        app.config.watchable_dirs[avo_directory] = [:rb]
+      [avo_directory, engine_avo_directory].each do |directory_path|
+        ActiveSupport::Dependencies.autoload_paths.delete(directory_path)
+
+        if Dir.exist?(directory_path)
+          Rails.autoloaders.main.push_dir(directory_path, namespace: Avo)
+          app.config.watchable_dirs[directory_path] = [:rb]
+        end
       end
     end
 

data/lib/avo/fields/base_field.rb

@@ -242,7 +242,7 @@ module Avo
       end
 
       def record_errors
-        record.nil? ? {} : record.errors
+        record.present? ? record.errors : {}
       end
 
       def type
@@ -313,7 +313,7 @@ module Avo
       def get_resource_by_model_class(model_class)
         resource = Avo.resource_manager.get_resource_by_model_class(model_class)
 
-        resource || (raise Avo::MissingResourceError.new(model_class))
+        resource || (raise Avo::MissingResourceError.new(model_class, id))
       end
     end
   end

data/lib/avo/fields/belongs_to_field.rb

@@ -125,7 +125,7 @@ module Avo
         end
 
         query.all.map do |record|
-          [resource.new(record: record).record_title, record.id]
+          [resource.new(record: record).record_title, record.to_param]
         end
       end
 
@@ -204,13 +204,19 @@ module Avo
           record.send(:"#{polymorphic_as}_type=", valid_model_class)
 
           # If the type is blank, reset the id too.
-          if valid_model_class.blank?
+          id_from_param = params["#{polymorphic_as}_id"]
+
+          if valid_model_class.blank? || id_from_param.blank?
             record.send(:"#{polymorphic_as}_id=", nil)
           else
-            record.send(:"#{polymorphic_as}_id=", params["#{polymorphic_as}_id"])
+            record_id = target_resource(record:, polymorphic_model_class: value.safe_constantize).find_record(id_from_param).id
+
+            record.send(:"#{polymorphic_as}_id=", record_id)
           end
         else
-          record.send(:"#{key}=", value)
+          record_id = value.blank? ? value : target_resource(record:).find_record(value).id
+
+          record.send(:"#{key}=", record_id)
         end
 
         record
@@ -231,19 +237,19 @@ module Avo
         id
       end
 
-      def target_resource
+      def target_resource(record: @record, polymorphic_model_class: value&.class)
         @target_resource ||= if use_resource.present?
           use_resource
         elsif is_polymorphic?
-          if value.present?
-            get_resource_by_model_class(value.class)
+          if polymorphic_model_class.present?
+            get_resource_by_model_class(polymorphic_model_class)
           else
             return nil
           end
         else
           reflection_key = polymorphic_as || id
 
-          reflection_object = @record._reflections.with_indifferent_access[reflection_key]
+          reflection_object = record.class.reflect_on_association(reflection_key)
 
           if reflection_object.klass.present?
             get_resource_by_model_class(reflection_object.klass.to_s)

data/lib/avo/fields/concerns/is_required.rb

@@ -13,7 +13,7 @@ module Avo
         private
 
         def required_from_validators
-          return false if record.nil?
+          return false unless record.present?
 
           validators.any? do |validator|
             validator.is_a? ActiveModel::Validations::PresenceValidator

data/lib/avo/fields/has_base_field.rb

@@ -13,6 +13,7 @@ module Avo
       attr_accessor :discreet_pagination
       attr_accessor :hide_search_input
       attr_reader :link_to_child_resource
+      attr_reader :attach_fields
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -27,6 +28,7 @@ module Avo
         @link_to_child_resource = args[:link_to_child_resource] || false
         @reloadable = args[:reloadable].present? ? args[:reloadable] : false
         @linkable = args[:linkable].present? ? args[:linkable] : false
+        @attach_fields = args[:attach_fields]
       end
 
       def field_resource
@@ -59,7 +61,7 @@ module Avo
       end
 
       def target_resource
-        reflection = @record._reflections.with_indifferent_access[association_name]
+        reflection = @record.class.reflect_on_association(association_name)
 
         if reflection.klass.present?
           get_resource_by_model_class(reflection.klass.to_s)

data/lib/avo/fields/has_one_field.rb

@@ -19,7 +19,7 @@ module Avo
 
       def frame_url
         Avo::Services::URIService.parse(field_resource.record_path)
-          .append_paths(id, value.id)
+          .append_paths(id, value.to_param)
           .append_query(query_params)
           .to_s
       end