avo 2.45.0 → 3.0.2

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

@@ -1,7 +1,7 @@
 <div data-controller="reload-belongs-to-field"
      data-action="turbo:before-stream-render@document->reload-belongs-to-field#beforeStreamRender"
      data-reload-belongs-to-field-polymorphic-value="<%= is_polymorphic? %>"
-     data-reload-belongs-to-field-searchable-value="<%= @field.searchable %>"
+     data-reload-belongs-to-field-searchable-value="<%= @field.is_searchable? %>"
      data-reload-belongs-to-field-relation-name-value="<%= @field.id %>"
      data-reload-belongs-to-field-target-name-value="<%= form.object_name %>[<%= @field.id_input_foreign_key %>]"
 >
@@ -9,18 +9,18 @@
     <%
       # Set the model keys so we can pass them over
       model_keys = @field.types.map do |type|
-        resource = Avo::App.get_resource_by_model_name(type.to_s)
+        resource = Avo.resource_manager.get_resource_by_model_class(type.to_s)
         [type.to_s, resource.model_key]
       end.to_h
     %>
     <div class="divide-y"
       data-controller="belongs-to-field"
-      data-searchable="<%= @field.searchable %>"
+      data-searchable="<%= @field.is_searchable? %>"
       data-association="<%= @field.id %>"
       data-association-class="<%= @field&.target_resource&.model_class || nil %>"
     >
       <%= field_wrapper **field_wrapper_args, help: @field.polymorphic_help || '' do %>
-        <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [::Avo::App.get_resource_by_model_name(type.to_s).name, type.to_s] },
+        <%= @form.select @field.type_input_foreign_key, @field.types.map { |type| [Avo.resource_manager.get_resource_by_model_class(type.to_s).name, type.to_s] },
         {
           value: @field.value,
           include_blank: @field.placeholder,
@@ -47,91 +47,87 @@
           data-belongs-to-field-target="type"
           data-type="<%= type %>"
         >
-          <%= field_wrapper **field_wrapper_args, label: ::Avo::App.get_resource_by_model_name(type.to_s).name do %>
-            <div class="flex flex-col gap-1">
-              <% if @field.searchable %>
-                <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
-                  disabled: disabled,
-                  field: @field,
-                  foreign_key: @field.id_input_foreign_key,
-                  model_key: model_keys[type.to_s],
-                  polymorphic_record: polymorphic_record,
-                  resource: @resource,
-                  style: @field.get_html(:style, view: view, element: :input),
-                  type: type,
-                  classes: classes("w-full"),
-                  view: view
-              %>
-              <% else %>
-                <%= @form.select @field.id_input_foreign_key,
-                options_for_select(@field.values_for_type(type), @resource.present? && @resource.model.present? ? @resource.model[@field.id_input_foreign_key] : nil),
-                {
-                  value: @resource.model[@field.id_input_foreign_key].to_s,
-                  include_blank: @field.placeholder,
-                },
-                {
-                  class: classes("w-full"),
-                  data: @field.get_html(:data, view: view, element: :input),
-                  disabled: disabled
-                }
-              %>
-                <%
-                # If the select field is disabled, no value will be sent. It's how HTML works.
-                # Thus the extra hidden field to actually send the related id to the server.
-                if disabled %>
-                  <%= @form.hidden_field @field.id_input_foreign_key %>
-                <% end %>
+          <%= field_wrapper **field_wrapper_args, label: Avo.resource_manager.get_resource_by_model_class(type.to_s).name do %>
+            <% if @field.is_searchable? %>
+              <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
+                disabled: disabled,
+                field: @field,
+                foreign_key: @field.id_input_foreign_key,
+                model_key: model_keys[type.to_s],
+                polymorphic_record: polymorphic_record,
+                resource: @resource,
+                style: @field.get_html(:style, view: view, element: :input),
+                type: type,
+                classes: classes("w-full"),
+                view: view
+            %>
+            <% else %>
+              <%= @form.select @field.id_input_foreign_key,
+              options_for_select(@field.values_for_type(type), @resource.present? && @resource.record.present? ? @resource.record[@field.id_input_foreign_key] : nil),
+              {
+                value: @resource.record[@field.id_input_foreign_key].to_s,
+                include_blank: @field.placeholder,
+              },
+              {
+                class: classes("w-full"),
+                data: @field.get_html(:data, view: view, element: :input),
+                disabled: disabled
+              }
+            %>
+              <%
+              # If the select field is disabled, no value will be sent. It's how HTML works.
+              # Thus the extra hidden field to actually send the related id to the server.
+              if disabled %>
+                <%= @form.hidden_field @field.id_input_foreign_key %>
               <% end %>
-              <% create_href = create_path(::Avo::App.get_resource_by_model_name(type.to_s)) %>
-              <% if !disabled && create_href.present? %>
-                <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
-                            create_href,
-                            class: "text-sm"
-                %>
-              <% end %>
-            </div>
+            <% end %>
+            <% create_href = create_path(Avo.resource_manager.get_resource_by_model_class(type.to_s)) %>
+            <% if !disabled && create_href.present? %>
+              <%= link_to t("avo.create_new_item", item: type.to_s.downcase),
+                          create_href,
+                          class: "text-sm"
+              %>
+            <% end %>
           <% end %>
         </div>
       <% end %>
     </div>
   <% else %>
     <%= field_wrapper **field_wrapper_args do %>
-      <div class="flex flex-col gap-1">
-        <% if @field.searchable %>
-          <%= render Avo::Fields::BelongsToField::AutocompleteComponent.new form: @form,
-            field: @field,
-            model_key: @field.target_resource&.model_key,
-            foreign_key: @field.id_input_foreign_key,
-            resource: @resource,
+      <% if @field.is_searchable? %>
+        <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: @form,
+          field: @field,
+          model_key: @field.target_resource&.model_key,
+          foreign_key: @field.id_input_foreign_key,
+          resource: @resource,
+          disabled: disabled,
+          classes: classes("w-full"),
+          view: view,
+          style: @field.get_html(:style, view: view, element: :input)
+        %>
+      <% else %>
+        <%= @form.select @field.id_input_foreign_key, @field.options,
+          {
+            include_blank: @field.placeholder,
+            value: @field.value
+          },
+          {
+            class: classes("w-full"),
+            data: @field.get_html(:data, view: view, element: :input),
             disabled: disabled,
-            classes: classes("w-full"),
-            view: view,
             style: @field.get_html(:style, view: view, element: :input)
-          %>
-        <% else %>
-          <%= @form.select @field.id_input_foreign_key, @field.options,
-            {
-              include_blank: @field.placeholder,
-              value: @field.value
-            },
-            {
-              class: classes("w-full"),
-              data: @field.get_html(:data, view: view, element: :input),
-              disabled: disabled,
-              style: @field.get_html(:style, view: view, element: :input)
-            }
-          %>
-          <%
-            # If the select field is disabled, no value will be sent. It's how HTML works.
-            # Thus the extra hidden field to actually send the related id to the server.
-            if disabled %>
-            <%= @form.hidden_field @field.id_input_foreign_key %>
-          <% end %>
-        <% end %>
-        <% if !disabled && create_path.present? %>
-          <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
+          }
+        %>
+        <%
+          # If the select field is disabled, no value will be sent. It's how HTML works.
+          # Thus the extra hidden field to actually send the related id to the server.
+          if disabled %>
+          <%= @form.hidden_field @field.id_input_foreign_key %>
         <% end %>
-      </div>
+      <% end %>
+      <% if !disabled && create_path.present? %>
+        <%= link_to t("avo.create_new_item", item: @field.name.downcase), create_path, class: "text-sm" %>
+      <% end %>
     <% end %>
   <% end %>
 </div>

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
-  def initialize(**args)
-    super(**args)
+  def initialize(...)
+    super(...)
 
     @polymorphic_record = nil
   end
@@ -28,16 +28,16 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
   # Get the polymorphic class
   def polymorphic_class
-    @resource.model["#{@field.foreign_key}_type"]
+    @resource.record["#{@field.foreign_key}_type"]
   end
 
   def polymorphic_resource
-    ::Avo::App.get_resource_by_model_name(polymorphic_class)
+    Avo.resource_manager.get_resource_by_model_class(polymorphic_class)
   end
 
   # Get the polymorphic id
   def polymorphic_id
-    @resource.model["#{@field.foreign_key}_id"]
+    @resource.record["#{@field.foreign_key}_id"]
   end
 
   # Get the actual resource
@@ -63,7 +63,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
     helpers.new_resource_path(**{
       via_relation: @field.id.to_s,
       resource: target_resource || @field.target_resource,
-      via_resource_id: resource.model.to_param,
+      via_record_id: resource.record.to_param,
       via_belongs_to_resource_class: resource.class.name
     }.compact)
   end
@@ -71,6 +71,6 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   private
 
   def visit_through_association?
-    @field.target_resource.class.to_s == params[:via_resource_class].to_s
+    @field.target_resource.to_s == params[:via_resource_class].to_s
   end
 end

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

@@ -1,4 +1,4 @@
 <%= index_field_wrapper **field_wrapper_args do %>
-  <%= link_to @field.label, helpers.resource_view_path(model: @field.value, resource: @field.target_resource)
+  <%= link_to @field.label, helpers.resource_view_path(record: @field.value, resource: @field.target_resource)
  %>
 <% end %>

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

@@ -3,10 +3,10 @@
 class Avo::Fields::BelongsToField::ShowComponent < Avo::Fields::ShowComponent
   def resource_view_path
     helpers.resource_view_path(
-      model: @field.value,
+      record: @field.value,
       resource: @field.target_resource,
       via_resource_class: @resource.class.to_s,
-      via_resource_id: @resource.model.to_param
+      via_record_id: @resource.record.to_param
     )
   end
 end

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

@@ -3,7 +3,7 @@
     <%= @form.check_box @field.id,
       value: @field.value,
       checked: @field.value,
-      class: "text-lg h-4 w-4 checked:bg-primary-400 focus:checked:!bg-primary-400 #{@field.get_html(:classes, view: view, element: :input)}",
+      class: "text-lg h-4 w-4 checked:bg-primary-400 focus:checked:!bg-primary-400 rounded #{@field.get_html(:classes, view: view, element: :input)}",
       data: @field.get_html(:data, view: view, element: :input),
       disabled: disabled?,
       style: @field.get_html(:style, view: view, element: :input)

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

@@ -1,3 +1,3 @@
-<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, center_content: true, flush: true do %>
+<%= index_field_wrapper **field_wrapper_args, dash_if_blank: false, flush: true do %>
   <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: @field.value %>
 <% end %>

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

@@ -1,8 +1,8 @@
 <%= field_wrapper **field_wrapper_args do %>
   <div class="flex items-center">
     <div class="space-y-2">
-      <% model_param_key = model_name_from_record_or_class(@resource.model).param_key %>
-      <%= check_box_tag "#{model_name_from_record_or_class(@resource.model).param_key}[#{@field.id}][]", '', true, { class: "hidden" } %>
+      <% model_param_key = model_name_from_record_or_class(@resource.record).param_key %>
+      <%= check_box_tag "#{model_param_key}[#{@field.id}][]", '', true, { class: "hidden" } %>
       <% @field.options.each do |id, label| %>
         <%
           checked = false
@@ -18,7 +18,7 @@
         %>
         <label class="block">
           <%= check_box_tag "#{model_param_key}[#{@field.id}][]", id, checked, {
-              class: "w-4 h-4 #{@field.get_html(:classes, view: view, element: :input)}",
+              class: "w-4 h-4 rounded checked:bg-primary-400 focus:checked:!bg-primary-400 #{@field.get_html(:classes, view: view, element: :input)}",
               data: @field.get_html(:data, view: view, element: :input),
               disabled: disabled?,
               id: "#{model_param_key}_#{@field.id}_#{id}",

data/app/components/avo/fields/common/badge_viewer_component.rb

@@ -17,7 +17,7 @@ class Avo::Fields::Common::BadgeViewerComponent < ViewComponent::Base
     background = :info
 
     @options.invert.each do |values, type|
-      if [values].flatten.map { |value| value }.include? @value
+      if [values].flatten.map { |value| value.to_s }.include? @value.to_s
         background = type.to_sym
         next
       end

data/app/components/avo/fields/common/boolean_check_component.html.erb

@@ -1,12 +1 @@
-<%
-  classes = 'h-6 float-left mr-1'
-
-  if @checked
-    classes += ' text-green-600'
-    icon = 'heroicons/outline/check-circle'
-  else
-    classes += ' text-red-500'
-    icon = 'heroicons/outline/x-circle'
-  end
-%>
-<%= helpers.svg "#{icon}.svg", class: classes %>
+<%= helpers.svg "#{@icon}.svg", class: @classes %>

data/app/components/avo/fields/common/boolean_check_component.rb

@@ -2,6 +2,7 @@
 
 class Avo::Fields::Common::BooleanCheckComponent < ViewComponent::Base
   def initialize(checked: false)
-    @checked = checked
+    @icon = checked ? "heroicons/outline/check-circle" : "heroicons/outline/x-circle"
+    @classes = "h-6 #{checked ? "text-green-600" : "text-red-500"}"
   end
 end

data/app/components/avo/fields/common/boolean_group_component.html.erb

@@ -6,8 +6,8 @@
         @options.each do |id, label|
           checked = @value.present? && @value[id.to_s].present?
       %>
-      <div class="flex flex-nowrap">
-        <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: checked %>
+        <div class="flex flex-nowrap">
+          <%= render Avo::Fields::Common::BooleanCheckComponent.new checked: checked %>
           <div class="ml-px text-left py-px"><%= label %></div>
         </div>
       <% end %>

data/app/components/avo/fields/common/files/view_type/grid_item_component.rb

@@ -42,9 +42,9 @@ class Avo::Fields::Common::Files::ViewType::GridItemComponent < ViewComponent::B
     record_persisted?
   end
 
-  # If model is not persistent blob is automatically destroyed otherwise it can be "lost" on storage
+  # If record is not persistent blob is automatically destroyed otherwise it can be "lost" on storage
   def record_persisted?
-    return true if @resource.model.persisted?
+    return true if @resource.record.persisted?
 
     ActiveStorage::Blob.destroy(file.blob_id) if file.blob_id.present?
     false

data/app/components/avo/fields/common/gravatar_viewer_component.html.erb

@@ -9,4 +9,4 @@
   url = URI::HTTPS.build(host: "www.gravatar.com", path: "/avatar/#{@md5}", query: query)
   classes = @rounded ? 'rounded-full' : ''
 %>
-<%= link_to_if @link_to_resource.present?, image_tag(url.to_s, class: classes, width: options[:size], height: options[:size]), @link, title: @title %>
+<%= link_to_if @link_to_record.present?, image_tag(url.to_s, class: classes, width: options[:size], height: options[:size]), @link, title: @title %>

data/app/components/avo/fields/common/gravatar_viewer_component.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 class Avo::Fields::Common::GravatarViewerComponent < ViewComponent::Base
-  def initialize(md5: nil, link: nil, default: nil, size: nil, rounded: false, link_to_resource: false, title: nil)
+  def initialize(md5: nil, link: nil, default: nil, size: nil, rounded: false, link_to_record: false, title: nil)
     @md5 = md5
     @link = link
     @default = default
     @size = size
     @rounded = rounded
-    @link_to_resource = link_to_resource
+    @link_to_record = link_to_record
     @title = title
   end
 end

data/app/components/avo/fields/common/heading_component.html.erb

@@ -1,14 +1,9 @@
 <div class="flex items-start py-1 leading-tight bg-gray-100 text-gray-500 text-xs">
   <div class="py-2 px-6 h-full w-full">
-    <% if empty %>
-    <% elsif value.present? %>
-      <% if as_html %>
-        <%= sanitize value %>
-      <% else %>
-        <div class="font-semibold uppercase"><%= value %></div>
-      <% end %>
+    <% if as_html %>
+      <%= sanitize value %>
     <% else %>
-      —
+      <div class="font-semibold uppercase"><%= value %></div>
     <% end %>
   </div>
 </div>

data/app/components/avo/fields/common/heading_component.rb

@@ -3,11 +3,9 @@
 class Avo::Fields::Common::HeadingComponent < ViewComponent::Base
   attr_reader :value
   attr_reader :as_html
-  attr_reader :empty
 
-  def initialize(value:, as_html:, empty:)
+  def initialize(value:, as_html:)
     @value = value
     @as_html = as_html
-    @empty = empty
   end
 end

data/app/components/avo/fields/common/key_value_component.html.erb

@@ -3,7 +3,7 @@
   data-key-value-target="controller"
   data-options="<%= @field.options.to_json %>"
   data-input-classes="<%= input_classes %>"
-  data-editable="<%= @view.in?([:edit, :new]) %>"
+  data-editable="<%= @view.form? %>"
 >
   <div class="w-full flex flex-col">
     <div class="flex w-full">
@@ -14,7 +14,7 @@
         <div class="w-1/2 py-3 px-3 uppercase font-semibold text-xs text-white">
           <%= @field.value_label %>
         </div>
-        <% if @view.in?([:edit, :new]) %>
+        <% if @view.form? %>
           <div class="flex items-center justify-center p-2 px-3 border-l border-gray-600">
             <a href="javascript:void(0);"
               title="<%= @field.action_text %>"

data/app/components/avo/fields/common/key_value_component.rb

@@ -5,9 +5,9 @@ class Avo::Fields::Common::KeyValueComponent < ViewComponent::Base
 
   attr_reader :view
 
-  def initialize(field:, form: nil, view: :show)
+  def initialize(field:, form: nil, view: "show")
     @field = field
     @form = form
-    @view = view
+    @view = Avo::ViewInquirer.new(view)
   end
 end

data/app/components/avo/fields/common/progress_bar_component.rb

@@ -7,19 +7,13 @@ class Avo::Fields::Common::ProgressBarComponent < ViewComponent::Base
   attr_reader :max
   attr_reader :view
 
-  def initialize(value:, display_value: false, value_suffix: nil, max: 100, view: :index)
+  def initialize(value:, display_value: false, value_suffix: nil, max: 100, view: "index")
     @value = value
     @display_value = display_value
     @value_suffix = value_suffix
     @max = max
-    @view = view
+    @view = Avo::ViewInquirer.new(view)
   end
 
-  def show?
-    view == :show
-  end
-
-  def index?
-    view == :index
-  end
+  delegate :show?, :index?, to: :view
 end

data/app/components/avo/fields/common/status_viewer_component.html.erb

@@ -2,12 +2,15 @@
   classes = "inline-block"
   classes += " text-red-600" if @status == 'failed'
   classes += " text-green-600" if @status == 'success'
+  classes += " text-gray-600" if @status == 'neutral'
 %>
 <div class="flex flex-shrink-0 <%= classes %> items-center">
   <% if @status == 'success' %>
     <%= helpers.svg 'heroicons/solid/check-circle', class: 'h-4' %>
   <% elsif @status == 'failed' %>
     <%= helpers.svg 'heroicons/solid/x-circle', class: 'h-4' %>
+  <% elsif @status == 'neutral' %>
+    <%= helpers.svg 'heroicons/solid/minus-circle', class: 'h-4' %>
   <% elsif @status == 'loading' %>
     <div class="spinner">
       <div class="double-bounce1 bg-gray-600"></div>

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

@@ -20,11 +20,11 @@ class Avo::Fields::EditComponent < ViewComponent::Base
     @multiple = multiple
     @resource = resource
     @stacked = stacked
-    @view = :edit
+    @view = Avo::ViewInquirer.new("edit")
   end
 
   def classes(extra_classes = "")
-    helpers.input_classes("#{@field.get_html(:classes, view: view, element: :input)} #{extra_classes}", has_error: @field.model_errors.include?(@field.id))
+    helpers.input_classes("#{@field.get_html(:classes, view: view, element: :input)} #{extra_classes}", has_error: @field.record_errors.include?(@field.id))
   end
 
   def render?

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

@@ -1,6 +1,6 @@
 <%= index_field_wrapper **field_wrapper_args, flush: true do %>
   <% if @field.value.present? %>
-    <%= link_to_if @field.link_to_resource.present?,
+    <%= link_to_if @field.link_to_record.present?,
                    image_tag(@field.value,
                              height: @field.height,
                              style: "border-radius: #{@field.radius}px; max-height: #{@field.height}#{@field.height.to_s&.ends_with?('px') ? '' : 'px'};"),

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

@@ -1,9 +1,9 @@
 <%= index_field_wrapper **field_wrapper_args, flush: flush? do %>
   <% if @field.value.present? %>
     <% if @field.value.attached? && @field.value.representable? && @field.is_image %>
-      <%= link_to_if @field.link_to_resource, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_view_path, class: 'block' %>
+      <%= link_to_if @field.link_to_record, image_tag(helpers.main_app.url_for(@field.value), class: 'h-10'), resource_view_path, class: 'block' %>
     <% elsif @field.value.attached? && @field.is_audio %>
-      <%= link_to_if @field.link_to_resource, audio_tag(helpers.main_app.url_for(@field.value), controls: true, preload: false, class: 'max-h-full h-10'), resource_view_path, class: 'block h-8' %>
+      <%= link_to_if @field.link_to_record, audio_tag(helpers.main_app.url_for(@field.value), controls: true, preload: false, class: 'max-h-full h-10'), resource_view_path, class: 'block h-8' %>
     <% else %>
       <%= @field.value.filename %>
     <% end %>

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

@@ -4,7 +4,7 @@
     default: @field.default,
     size: @field.size,
     rounded: @field.rounded,
-    link_to_resource: @field.link_to_resource,
+    link_to_record: @field.link_to_record,
     link: resource_view_path,
     title: t('avo.view_item', item: @resource.name).humanize
   )

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

@@ -1,3 +1,3 @@
 <%= index_field_wrapper **field_wrapper_args do %>
-  <%= link_to @field.label, helpers.resource_path(model: @field.value, resource: @field.target_resource) %>
+  <%= link_to @field.label, helpers.resource_path(record: @field.value, resource: @field.target_resource) %>
 <% end %>

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

@@ -9,8 +9,9 @@
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
           color: :primary,
+          style: :text,
           'data-turbo-frame': 'attach_modal' do %>
-          <%= t('avo.attach_item', item: @field.name.downcase) %>
+          <%= t('avo.attach_item', item: @field.name.humanize(capitalize: false)) %>
         <% end %>
       <% end %>
       <% if !@field.is_readonly? && !@field.is_disabled? && can_see_the_create_button? %>
@@ -20,7 +21,7 @@
           'data-turbo-frame': '_top',
           style: :primary,
           color: :primary do %>
-          <%= t('avo.create_new_item', item: @field.name.downcase ) %>
+          <%= t('avo.create_new_item', item: @field.name.humanize(capitalize: false) ) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -21,7 +21,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   end
 
   def attach_path
-    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.to_param, @field.id)
+    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.record.to_param, @field.id)
   end
 
   def can_see_the_create_button?
@@ -41,7 +41,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
     args = {
       via_relation: association_id,
       via_relation_class: @resource.model_class.to_s,
-      via_resource_id: @resource.model.to_param,
+      via_record_id: @resource.record.to_param,
       via_association_type: :has_one
     }
 

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, empty: @field.empty %>
+  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.value, as_html: @field.as_html %>
 </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, empty: @field.empty %>
+  <%= render Avo::Fields::Common::HeadingComponent.new value: @field.value, as_html: @field.as_html %>
 </div>

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

@@ -1,3 +1,3 @@
 <%= 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 %>
+  <% link_to_if (@field.link_to_record or Avo.configuration.id_links_to_resource), @field.value, resource_view_path, title: t('avo.view_item', item: @resource.name).humanize %>
 <% end %>