avo 2.16.1.pre.1.nativefields → 2.17.1.pre.1.zeitwerk.eager.load.dir

data/app/components/avo/fields/heading_field/edit_component.html.erb

@@ -1,3 +1,3 @@
 <div <% if @index == 0 %> class="overflow-hidden rounded-t" <% end %> data-field-id="<%= @field.id %>">
-  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.name, as_html: @field.as_html %>
+  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.name, as_html: @field.as_html, empty: @field.empty %>
 </div>

data/app/components/avo/fields/heading_field/show_component.html.erb

@@ -1,3 +1,3 @@
 <div <% if @index == 0 %> class="overflow-hidden rounded-t" <% end %> data-field-id="<%= @field.id %>">
-  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.name, as_html: @field.as_html %>
+  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.name, as_html: @field.as_html, empty: @field.empty %>
 </div>

data/app/components/avo/fields/id_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource, class: 'whitespace-no-wrap w-[1%]' do %>
+<%= index_field_wrapper **field_wrapper_args, class: 'whitespace-no-wrap w-[1%]' do %>
   <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, resource_view_path, title: t('avo.view_item', item: @resource.name).humanize %>
 <% end %>

data/app/components/avo/fields/index_component.rb

@@ -3,13 +3,15 @@
 class Avo::Fields::IndexComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
+  attr_reader :parent_resource
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, index: 0, parent_model: nil)
+  def initialize(field: nil, resource: nil, index: 0, parent_model: nil, parent_resource: nil)
     @field = field
     @resource = resource
     @index = index
     @parent_model = parent_model
+    @parent_resource = parent_resource
     @view = :index
   end
 
@@ -18,11 +20,18 @@ class Avo::Fields::IndexComponent < ViewComponent::Base
 
     if @parent_model.present?
       args = {
-        via_resource_class: @parent_model.class,
+        via_resource_class: @parent_resource.class,
         via_resource_id: @parent_model.id
       }
     end
 
     helpers.resource_view_path(model: @resource.model, resource: @resource, **args)
   end
+
+  def field_wrapper_args
+    {
+      field: @field,
+      resource: @resource
+    }
+  end
 end

data/app/components/avo/fields/number_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
   <%= @field.value %>
 <% end %>

data/app/components/avo/fields/progress_bar_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, flush: true do %>
   <%= render Avo::Fields::Common::ProgressBarComponent.new value: @field.value, display_value: @field.display_value, value_suffix: @field.value_suffix, max: @field.max, view: view %>
 <% end %>

data/app/components/avo/fields/select_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
   <%= @field.label %>
 <% end %>

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

@@ -3,15 +3,19 @@
 class Avo::Fields::ShowComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
+  attr_reader :compact
   attr_reader :field
   attr_reader :index
   attr_reader :resource
+  attr_reader :stacked
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, index: 0, form: nil)
+  def initialize(field: nil, resource: nil, index: 0, form: nil, compact: false, stacked: false)
+    @compact = compact
     @field = field
     @index = index
     @resource = resource
+    @stacked = stacked
     @view = :show
   end
 
@@ -40,9 +44,11 @@ class Avo::Fields::ShowComponent < ViewComponent::Base
 
   def field_wrapper_args
     {
+      compact: compact,
       field: field,
       index: index,
       resource: resource,
+      stacked: stacked,
       view: view
     }
   end

data/app/components/avo/fields/status_field/index_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
   <%= render Avo::Fields::Common::StatusViewerComponent.new label: @field.value, status: @field.status %>
 <% end %>

data/app/components/avo/fields/tags_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, flush: true do %>
   <div class="flex gap-1 items-center flex-nowrap">
     <% value.take(3).each do |item| %>
       <%= render Avo::Fields::TagsField::TagComponent.new(label: label_from_item(item)) %>

data/app/components/avo/fields/text_field/edit_component.html.erb

@@ -4,6 +4,8 @@
     data: @field.get_html(:data, view: view, element: :input),
     disabled: @field.is_readonly?,
     placeholder: @field.placeholder,
-    style: @field.get_html(:style, view: view, element: :input)
+    style: @field.get_html(:style, view: view, element: :input),
+    # value: @field.value,
+    multiple: multiple
   %>
 <% end %>

data/app/components/avo/fields/text_field/index_component.html.erb

@@ -1,4 +1,4 @@
-<%= index_field_wrapper field: @field, resource: @resource do %>
+<%= index_field_wrapper **field_wrapper_args do %>
   <% if @field.as_html %>
     <%== @field.value %>
   <% elsif @field.protocol.present? %>

data/app/components/avo/fields/trix_field/edit_component.html.erb

@@ -1,4 +1,4 @@
-<%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal, full_width: true do %>
+<%= field_wrapper **field_wrapper_args, full_width: true do %>
   <%= content_tag :div, class: "relative block overflow-x-auto max-w-full",
     data: {
       controller: "trix-field",

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

@@ -1,5 +1,5 @@
 <div data-controller="toggle-panel">
-  <div class="relative w-full flex justify-between z-30">
+  <div class="relative w-full flex justify-between">
     <%= a_button class: 'focus:outline-none',
       color: :primary,
       size: :sm,
@@ -14,7 +14,7 @@
       <% end %>
     <% end %>
     <div
-      class="absolute block inset-auto sm:right-0 top-full bg-white min-w-[300px] mt-2 z-20 shadow-modal rounded divide-y divide-gray-300 <%= 'hidden' unless params[:keep_filters_panel_open] == '1' %>"
+      class="absolute block inset-auto sm:right-0 top-full bg-white min-w-[300px] mt-2 z-40 shadow-modal rounded divide-y divide-gray-300 <%= 'hidden' unless params[:keep_filters_panel_open] == '1' %>"
       data-toggle-panel-target="panel"
     >
       <% @filters.each do |filter| %>

data/app/components/avo/index/grid_cover_empty_state_component.html.erb

@@ -1,3 +1,3 @@
 <div class="absolute bg-gray-50 w-full h-full">
-  <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
+  <%= image_tag Avo.configuration.branding.placeholder, class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
 </div>

data/app/components/avo/index/grid_item_component.html.erb

@@ -2,7 +2,7 @@
   class="relative bg-white rounded shadow-modal flex flex-col group"
   <%== item_selector_init @resource %>
 >
-  <div class="relative w-full pb-3/4 rounded-t overflow-hidden">
+  <%= content_tag :div, class: "relative w-full pb-3/4 rounded-t overflow-hidden #{cover.present? ? cover.get_html(:classes, view: :index, element: :wrapper) : ""}", style: cover.present? ? cover.get_html(:style, view: :index, element: :wrapper) : "" do %>
     <% if @resource.record_selector %>
       <%== item_selector_input floating: true, size: :lg %>
     <% end %>
@@ -17,9 +17,7 @@
         <%= link_to_if cover.link_to_resource, image_tag(helpers.main_app.url_for(cover.value.variant(resize_to_limit: [480, 480])), class: 'absolute h-full w-full object-cover'), resource_view_path, class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
         <%= link_to resource_view_path do %>
-          <div class="absolute bg-gray-100 w-full h-full">
-            <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
-          </div>
+          <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
         <% end %>
       <% end %>
     <% elsif cover.value.present? %>
@@ -27,18 +25,22 @@
     <% else %>
       <%= render Avo::Index::GridCoverEmptyStateComponent.new %>
     <% end %>
-  </div>
-  <div class="grid grid-cols-1 place-content-between p-4 h-full">
+  <% end %>
+  <%= content_tag :div, class: "grid grid-cols-1 place-content-between p-4 h-full" do %>
     <div class="mb-4 h-full flex flex-col space-between">
-      <div class="grid font-semibold leading-tight text-lg mb-2">
-        <%= link_to_if title.link_to_resource, title.value, resource_view_path if title.present? %>
-      </div>
-      <div class="text-sm break-words text-gray-500">
-        <%= body.value if body.present? %>
-      </div>
+      <% if title.present? %>
+        <%= content_tag :div, class: "grid font-semibold leading-tight text-lg mb-2 #{title.get_html(:classes, view: :index, element: :wrapper)}", style: title.get_html(:style, view: :index, element: :wrapper) do %>
+          <%= link_to_if title.link_to_resource, title.value, resource_view_path %>
+        <% end %>
+      <% end %>
+      <% if body.present? %>
+        <%= content_tag :div, class: "text-sm break-words text-gray-500 #{body.get_html(:classes, view: :index, element: :wrapper)}", style: body.get_html(:style, view: :index, element: :wrapper) do %>
+          <%= body.value %>
+        <% end %>
+      <% end %>
     </div>
     <div class="w-full place-self-end">
       <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, view_type: :grid)) %>
     </div>
-  </div>
+  <% end %>
 </div>

data/app/components/avo/index/grid_item_component.rb

@@ -32,7 +32,7 @@ class Avo::Index::GridItemComponent < ViewComponent::Base
 
     if @parent_model.present?
       args = {
-        via_resource_class: parent_resource.model_class,
+        via_resource_class: parent_resource.class.to_s,
         via_resource_id: @parent_model.id
       }
     end

data/app/components/avo/index/ordering/buttons_component.html.erb

@@ -22,7 +22,7 @@
       %>
       <%= helpers.svg('switch-vertical', class: 'text-gray-400 h-6 hover:text-gray-600') %>
     <% end %>
-    <div class="flex hidden absolute max-w-xs bg-white rounded p-2 z-40" data-popover-target="content">
+    <div class="flex hidden absolute max-w-xs bg-white rounded p-2" data-popover-target="content">
       <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :higher, svg: 'arrow-up' %>
       <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :lower, svg: 'arrow-down' %>
       <%= render Avo::Index::Ordering::ButtonComponent.new resource: @resource, reflection: @reflection, direction: :to_top, svg: 'download-solid-reversed' %>

data/app/components/avo/index/resource_controls_component.rb

@@ -36,7 +36,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
     if @parent_model.present?
       args = {
-        via_resource_class: parent_resource.model_class,
+        via_resource_class: parent_resource.class.to_s,
         via_resource_id: @parent_model.id
       }
     end
@@ -50,7 +50,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
     if @parent_model.present?
       args = {
-        via_resource_class: parent_resource.model_class,
+        via_resource_class: parent_resource.class.to_s,
         via_resource_id: @parent_model.id
       }
     end

data/app/components/avo/index/table_row_component.html.erb

@@ -17,7 +17,7 @@
     </td>
   <% end %>
   <% @resource.get_fields(reflection: @reflection, only_root: true).each_with_index do |field, index| %>
-    <%= render field.component_for_view(:index).new(field: field, resource: @resource, index: index, parent_model: @parent_model) %>
+    <%= render field.component_for_view(:index).new(field: field, resource: @resource, index: index, parent_model: @parent_model, parent_resource: @parent_resource) %>
   <% end %>
   <% if Avo.configuration.resource_controls_on_the_right? %>
     <td class="text-right whitespace-nowrap px-2" data-control="resource-controls">

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

@@ -24,8 +24,15 @@
     </div>
   <% end %>
   <% if body? %>
-    <div class="relative <%= white_panel_classes %> <%= @body_classes %>">
-      <%= body %>
+    <div class="flex flex-col sm:flex-row space-y-4 sm:space-y-0 sm:gap-4 w-full">
+      <div class="relative flex-1 overflow-auto <%= white_panel_classes %> <%= @body_classes %> <% if sidebar? %> w-2/3 <% end %>">
+        <%= body %>
+      </div>
+      <% if sidebar? %>
+        <div class="w-full sm:w-1/3 flex-shrink-0 h-full <%= white_panel_classes %>">
+          <%= sidebar %>
+        </div>
+      <% end %>
     </div>
   <% end %>
   <% if bare_content? %>

data/app/components/avo/panel_component.rb

@@ -5,8 +5,11 @@ class Avo::PanelComponent < ViewComponent::Base
   attr_reader :name
   attr_reader :classes
 
+  delegate :white_panel_classes, to: :helpers
+
   renders_one :tools
   renders_one :body
+  renders_one :sidebar
   renders_one :bare_content
   renders_one :footer_tools
   renders_one :footer
@@ -25,10 +28,6 @@ class Avo::PanelComponent < ViewComponent::Base
 
   private
 
-  def white_panel_classes
-    "bg-white rounded shadow"
-  end
-
   def data_attributes
     @data.merge({"panel-index": @index})
   end

data/app/components/avo/resource_component.rb

@@ -85,6 +85,16 @@ class Avo::ResourceComponent < Avo::BaseComponent
     end
   end
 
+  def sidebar
+    return if Avo::App.license.lacks_with_trial(:resource_sidebar)
+
+    @sidebar ||= search_for_sidebar
+  end
+
+  def sidebar_component(form: nil)
+    Avo::ResourceSidebarComponent.new resource: @resource, fields: sidebar.items, params: params, view: view, form: form
+  end
+
   def has_reflection_and_is_read_only
     if @reflection.present? && @reflection.active_record.name && @reflection.name
       fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).get_field_definitions
@@ -105,4 +115,12 @@ class Avo::ResourceComponent < Avo::BaseComponent
   def via_resource?
     (params[:via_resource_class].present? || params[:via_relation_class].present?) && params[:via_resource_id].present?
   end
+
+  def search_for_sidebar
+    item = @resource.get_items.find do |item|
+      item.is_sidebar?
+    end
+
+    item&.hydrate(view: view)
+  end
 end

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

@@ -0,0 +1,19 @@
+<div class="resource-sidebar-component divide-y">
+  <% fields.each_with_index do |field, index| %>
+    <%= render field
+      .hydrate(
+        resource: resource,
+        model: resource.model,
+        user: resource.user,
+        view: view
+      ).component_for_view(view)
+      .new(
+        field: field,
+        resource: resource,
+        form: form,
+        stacked: true,
+        index: index
+      )
+    %>
+  <% end %>
+</div>

data/app/components/avo/resource_sidebar_component.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Avo::ResourceSidebarComponent < ViewComponent::Base
+  attr_reader :resource
+  attr_reader :params
+  attr_reader :view
+  attr_reader :form
+
+  def initialize(resource: nil, fields: nil, index: nil, params: nil, form: nil, view: nil)
+    @resource = resource
+    @fields = fields
+    @params = params
+    @view = view
+    @form = form
+  end
+
+  def fields
+    @fields.filter do |field|
+      field.visible_on? view
+    end
+  end
+
+  def render?
+    Avo::App.license.has_with_trial(:resource_sidebar)
+  end
+end

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

@@ -22,7 +22,7 @@
         <%= helpers.svg 'three-dots', class: 'h-4' %>
       </a>
       <div
-        class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full"
+        class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full z-40"
         data-toggle-panel-target="panel"
       >
         <% if Avo::App.has_profile_menu? %>

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

@@ -20,13 +20,13 @@
     </div>
   </div>
 <% else %>
-  <div class="flex flex-wrap gap-2" data-target="tab-switcher" data-style="pills">
+  <div class="flex flex-wrap gap-2 p-2 <%= white_panel_classes %>" data-target="tab-switcher" data-style="pills">
     <% visible_items.each do |tab| %>
       <%= a_link tab_path(tab),
       color: selected?(tab) ? :primary : :gray,
       style: selected?(tab) ? :outline : :text,
       size: :sm,
-      class: selected?(tab) ? "z-20" : "",
+      class: selected?(tab) ? "z-20 bg-primary-100" : "",
       title: tab.description,
       data: {
         tippy: tab.description.present? ? 'tooltip' : '',

data/app/components/avo/tab_switcher_component.rb

@@ -11,6 +11,8 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
   attr_reader :view
   attr_reader :style
 
+  delegate :white_panel_classes, to: :helpers
+
   def initialize(resource:, group:, current_tab:, active_tab_name:, view:, style:)
     @active_tab_name = active_tab_name
     @resource = resource

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

@@ -19,12 +19,12 @@
       <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
         <% c.tools do %>
           <%= a_link back_path,
-        style: :text,
-        icon: 'arrow-left' do %>
-          <%= t('avo.cancel').capitalize %>
-        <% end %>
-        <% if can_see_the_destroy_button? %>
-          <%= a_link destroy_path,
+            style: :text,
+            icon: 'arrow-left' do %>
+            <%= t('avo.cancel').capitalize %>
+          <% end %>
+          <% if can_see_the_destroy_button? %>
+            <%= a_link destroy_path,
             method: :delete,
             local: true,
             style: :text,
@@ -37,36 +37,42 @@
               control: :destroy,
               'resource-id': @resource.model.id,
             } do %>
-            <%= t('avo.delete').capitalize %>
+              <%= t('avo.delete').capitalize %>
+            <% end %>
           <% end %>
-        <% end %>
-        <% if can_see_the_actions_button? %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-        <% end %>
-        <% if can_see_the_save_button? %>
-          <%= a_button color: :primary,
+          <% if can_see_the_actions_button? %>
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+          <% end %>
+          <% if can_see_the_save_button? %>
+            <%= a_button color: :primary,
             style: :primary,
             loading: true,
             type: :submit,
             icon: 'save' do %>
-            <%= t('avo.save').capitalize %>
+              <%= t('avo.save').capitalize %>
+            <% end %>
           <% end %>
         <% end %>
-      <% end %>
-      <%# Extract the main panel and display the fields here. %>
-      <%# This way we'll be able to render the footer buttons under the main fields. %>
-      <% if main_panel.present? %>
-        <% c.body do %>
-          <div class="divide-y">
-            <% main_panel.items.each_with_index do |field, index| %>
-              <%= render field.hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view_for(field))
-                .component_for_view(view_for field)
-                .new(field: field, resource: @resource, index: index, form: form)
-              %>
+        <%# Extract the main panel and display the fields here. %>
+        <%# This way we'll be able to render the footer buttons under the main fields. %>
+        <% if main_panel.present? %>
+          <% c.body do %>
+            <div class="divide-y">
+              <% main_panel.items.each_with_index do |field, index| %>
+                <%= render field
+                  .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view_for(field))
+                  .component_for_view(view_for field)
+                  .new(field: field, resource: @resource, index: index, form: form, compact: sidebar.present?)
+                %>
               <% end %>
             </div>
           <% end %>
         <% end %>
+        <% if sidebar.present? %>
+          <% c.sidebar do %>
+            <%= render sidebar_component form: form %>
+          <% end %>
+        <% end %>
         <% if Avo.configuration.buttons_on_form_footers %>
           <% c.footer_tools do %>
             <div class="mt-4">

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

@@ -31,7 +31,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def resource_view_path
-    helpers.resource_view_path(model: relation_resource.model, resource: relation_resource)
+    helpers.resource_view_path(model: association_resource.model, resource: association_resource)
   end
 
   def can_see_the_destroy_button?

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

@@ -160,14 +160,20 @@
       <% c.body do %>
         <div class="divide-y">
           <% main_panel.items.each_with_index do |field, index| %>
-            <%= render field.hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view)
+            <%= render field
+              .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view)
               .component_for_view(view)
-              .new(field: field, resource: @resource, index: index)
+              .new(field: field, resource: @resource, index: index, compact: sidebar.present?)
             %>
           <% end %>
         </div>
       <% end %>
     <% end %>
+    <% if sidebar.present? %>
+      <% c.sidebar do %>
+        <%= render sidebar_component %>
+      <% end %>
+    <% end %>
   <% end %>
   <% if @reflection.blank? %>
     <%= content_tag :div, class: 'space-y-12 mt-12' do %>

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

@@ -26,7 +26,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
 
   def back_path
     if via_resource?
-      helpers.resource_path(model: params[:via_resource_class].safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
+      helpers.resource_path(model: association_resource.model_class, resource: association_resource, resource_id: params[:via_resource_id])
     else
       helpers.resources_path(resource: @resource)
     end

data/app/controllers/avo/actions_controller.rb

@@ -48,11 +48,19 @@ module Avo
     end
 
     def set_action
-      action_class = params[:action_id].gsub("avo_actions_", "").camelize.safe_constantize
-
       @action = action_class.new(model: @model, resource: @resource, user: _current_user, view: :edit)
     end
 
+    def action_class
+      klass_name = params[:action_id].gsub("avo_actions_", "").camelize
+
+      valid_klass = Avo::BaseAction.descendants.find do |action|
+        action.to_s == klass_name
+      end
+
+      valid_klass
+    end
+
     def respond(response)
       response[:type] ||= :reload
       messages = get_messages response

data/app/controllers/avo/application_controller.rb

@@ -143,10 +143,12 @@ module Avo
     end
 
     def set_related_model
+      association_name = BaseResource.valid_association_name(@model, params[:related_name])
+
       @related_model = if @field.is_a? Avo::Fields::HasOneField
-        @model.send params[:related_name]
+        @model.send association_name
       else
-        eager_load_files(@related_resource, @model.send(params[:related_name])).find params[:related_id]
+        eager_load_files(@related_resource, @model.send(association_name)).find params[:related_id]
       end
     end