avo 2.11.0 → 2.11.1.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb9e406c79af9dcca77ccea6f411fa429550de8555f388b79d60af3b2ce7825
-  data.tar.gz: 97aafbd2536588e5065b75674b18720f26ceb59dbdb0860c1fb5d5ea4a7aef24
+  metadata.gz: 794b7326ae2257afd693641ff51ba513d09d4729a77a671a96f1291f0b31b8e3
+  data.tar.gz: a3b8b5d2f19e9ac16164ae6cb634a0f53d92da7af1b4bc3c829704327f112c91
 SHA512:
-  metadata.gz: a2d14c10d9e28687eca060949975278e020c63fb19935e5d05f4d4c6813bed779fc609bf0a72f831c784236b8122d545c04ce47d8b43463919f259b010201c6a
-  data.tar.gz: 47d92e0cd4e94c2fffb1e0440f66deded02442f18c1eac9b7bfa22f403f11f9122d4353c1b882b7572b9fada13fd53ce193d66c923d12b034625c9c1a5b67e3f
+  metadata.gz: 15b95f8cef9a7ec9af6a272dd2abddbb7d8471f5edefb568b16e84f3b26165f7ac4f913974d70291463c8fcbc4427d7608a41a01c0167864d0368178ebf1e755
+  data.tar.gz: 7a7b600d0cc554e8aa30377199dad939e82c8165310b9f81cfe911c06a4d3cac3c72617fdad432475cd61bfcb60a1d00ee5ba4101a2d204940f48f6c6f03ba72

data/Gemfile

@@ -121,8 +121,6 @@ gem "hotwire-rails"
 
 gem "active_link_to"
 
-gem "view_component"
-
 gem "addressable"
 
 gem "appraisal"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.11.0)
+    avo (2.11.1.pre.3)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -16,7 +16,7 @@ PATH
       pagy
       pundit
       rails (>= 6.0)
-      view_component
+      view_component (= 2.60)
       zeitwerk
 
 GEM
@@ -201,7 +201,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.11.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n_data (0.15.0)
       simple_po_parser (~> 1.1)
@@ -252,6 +252,8 @@ GEM
     nokogiri (1.13.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.7-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -388,10 +390,10 @@ GEM
     turbo-rails (1.0.1)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    view_component (2.57.1)
+    view_component (2.60.0)
       activesupport (>= 5.0.0, < 8.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -481,7 +483,6 @@ DEPENDENCIES
   standard
   test-prof
   tzinfo-data
-  view_component
   web-console (>= 3.3.0)
   webdrivers
   webmock

data/app/assets/stylesheets/avo.css

@@ -16,6 +16,7 @@
 @import './css/breadcrumbs.css';
 @import './css/search.css';
 @import './css/active-storage.css';
+@import './css/sidebar.css';
 @import './css/spinner.css';
 @import './css/tags.css';
 
@@ -69,10 +70,6 @@ body {
   @apply opacity-0 translate-y-1;
 }
 
-.application-sidebar .active:hover,
-.application-sidebar .active {
-  @apply bg-blue-100 text-blue-500;
-}
 
 .turbo-progress-bar {
   @apply bg-blue-400;

data/app/assets/stylesheets/css/sidebar.css

@@ -0,0 +1,28 @@
+.application-sidebar .active:hover,
+.application-sidebar .active {
+  @apply bg-blue-100 text-blue-500;
+}
+
+.content-area {
+  /* remove the left padding. */
+  .main-content-area {
+    @apply lg:pl-0;
+  }
+
+  /* Hide the sidebar by default. */
+  .avo-sidebar {
+    @apply lg:hidden;
+  }
+
+  &.sidebar-open {
+    /* Add padding to the main area to allow for the sidebar to expand. */
+    .main-content-area {
+      @apply lg:pl-64;
+    }
+
+    /* Show the sidebar. */
+    .avo-sidebar {
+      @apply lg:block;
+    }
+  }
+}

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

@@ -5,5 +5,9 @@
     date_field_format_value: @field.format,
   } do %>
     <%= @field.formatted_value %>
+    <% if params[:avo_debug].present? %>
+      <!-- Raw value: -->
+      <!-- <%= @field.formatted_value.inspect %> -->
+    <% end %>
   <% end %>
 <% end %>

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

@@ -2,6 +2,7 @@
    <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
+    date_field_enable_time_value: true,
     date_field_format_value: @field.format,
     date_field_timezone_value: @field.timezone,
     date_field_picker_format_value: @field.picker_format,

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

@@ -2,6 +2,7 @@
   <%= content_tag :div, data: {
     controller: "date-field",
     date_field_view_value: @view,
+    date_field_enable_time_value: true,
     date_field_format_value: @field.format,
     date_field_timezone_value: @field.timezone,
     date_field_picker_format_value: @field.picker_format,

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

@@ -7,7 +7,7 @@
     <% c.tools do %>
       <% if !@field.readonly && can_attach? %>
         <%= a_link attach_path, icon: 'heroicons/outline/link', color: :primary, 'data-turbo-frame': 'attach_modal' do %>
-          <%= t('avo.attach_item', item: @field.name) %>
+          <%= t('avo.attach_item', item: @field.name.downcase) %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -4,19 +4,20 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   include Avo::ApplicationHelper
 
   def can_attach?
-    attach_policy = true
+    policy_result = true
+
     if @field.present?
       reflection_resource = @field.target_resource
       if reflection_resource.present? && @resource.present?
-        method_name = ("attach_#{reflection_resource.model_key}?").to_sym
-        defined_policy_methods = @resource.authorization.defined_methods(@resource.model_class, raise_exception: false)
+        method_name = "attach_#{@field.id}?".to_sym
 
-        if defined_policy_methods.present? && defined_policy_methods.include?(method_name)
-          attach_policy = @resource.authorization.authorize_action(method_name, raise_exception: false)
+        if @resource.authorization.has_method?(method_name, raise_exception: false)
+          policy_result = @resource.authorization.authorize_action(method_name, raise_exception: false)
         end
       end
     end
-    attach_policy
+
+    policy_result
   end
 
   def attach_path

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

@@ -1,6 +1,8 @@
 <%= index_field_wrapper field: @field, resource: @resource do %>
   <% if @field.as_html %>
     <%== @field.value %>
+  <% elsif @field.protocol.present? %>
+    <%= link_to @field.value, "#{@field.protocol}:#{@field.value}" %>
   <% else %>
     <%= link_to_if @field.link_to_resource, @field.value, resource_path %>
   <% end %>

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

@@ -1,6 +1,8 @@
 <%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
   <% if @field.as_html %>
     <%== @field.value %>
+  <% elsif @field.protocol.present? %>
+    <%= link_to @field.value, "#{@field.protocol}:#{@field.value}" %>
   <% else %>
     <%= @field.value %>
   <% end %>

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

@@ -17,4 +17,8 @@
       <%= content %>
     <% end %>
   <% end %>
+  <% if params[:avo_debug].present? %>
+    <!-- Raw value: -->
+    <!-- <%= @field.value.inspect %> -->
+  <% end %>
 <% end %>

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
-  def initialize(resource: nil, reflection: nil, parent_model: nil, view_type: :table)
+  def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, view_type: :table)
     @resource = resource
     @reflection = reflection
     @parent_model = parent_model
+    @parent_resource = parent_resource
     @view_type = view_type
   end
 
@@ -12,7 +13,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     @reflection.present? &&
       @resource.model.present? &&
       is_has_many_association &&
-      authorize_association_for("detach")
+      authorize_association_for(:detach)
   end
 
   def can_edit?
@@ -22,8 +23,9 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_view?
-    return authorize_association_for(:view) if @reflection.present?
+    return authorize_association_for(:show) if @reflection.present?
 
+    # Even if there's a @reflection object present, for show we're going to fallback to the original policy.
     @resource.authorization.authorize_action(:show, raise_exception: false)
   end
 
@@ -42,7 +44,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def edit_path
     # Add the `view` param to let Avo know where to redirect back when the user clicks the `Cancel` button.
-    args = {via_view: 'index'}
+    args = {via_view: "index"}
 
     if @parent_model.present?
       args = {
@@ -73,6 +75,6 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def referrer_path
-    Avo::App.root_path(paths: ['resources', params[:resource_name], params[:id], params[:related_name]], query: request.query_parameters.to_h)
+    Avo::App.root_path(paths: ["resources", params[:resource_name], params[:id], params[:related_name]], query: request.query_parameters.to_h)
   end
 end

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

@@ -4,7 +4,7 @@
     <tbody class="divide-y">
       <% @resources.each_with_index do |resource, index| %>
         <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model), expires_in: 1.day do %>
-          <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model) %>
+          <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource) %>
         <% end %>
       <% end %>
     </tbody>

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceTableComponent < ViewComponent::Base
-  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil)
+  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: nil)
     @resources = resources
     @resource = resource
     @reflection = reflection
     @parent_model = parent_model
+    @parent_resource = parent_resource
   end
 end

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

@@ -14,7 +14,7 @@
   <% end %>
   <td class="text-right whitespace-nowrap px-2">
     <div class="flex items-center justify-end flex-grow-0 h-full w-full">
-      <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, view_type: :table)) %>
+      <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, view_type: :table)) %>
     </div>
   </td>
 </tr>

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

@@ -3,9 +3,10 @@
 class Avo::Index::TableRowComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
-  def initialize(resource: nil, reflection: nil, parent_model: nil)
+  def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil)
     @resource = resource
     @reflection = reflection
     @parent_model = parent_model
+    @parent_resource = parent_resource
   end
 end

data/app/components/avo/item_switcher_component.rb

@@ -28,6 +28,8 @@ class Avo::ItemSwitcherComponent < Avo::BaseComponent
       return false if in_reflection? && item.hidden_in_reflection?
     end
 
+    return false if item.is_main_panel?
+
     true
   end
 

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

@@ -34,10 +34,8 @@
     </div>
   <% end %>
   <% if footer_tools? %>
-    <div class="<%= white_panel_classes %> p-4 flex-1 flex flex-col xl:flex-row justify-between mt-6">
-      <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
-        <%= footer_tools %>
-      </div>
+    <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
+      <%= footer_tools %>
     </div>
   <% end %>
   <% if footer? %>

data/app/components/avo/panel_component.rb

@@ -47,8 +47,4 @@ class Avo::PanelComponent < ViewComponent::Base
   def render_header?
     @name.present? || description.present? || tools.present? || display_breadcrumbs?
   end
-
-  def render_footer_tools?
-    footer_tools.present?
-  end
 end

data/app/components/avo/resource_component.rb

@@ -39,52 +39,39 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def authorize_association_for(policy_method)
-    association_policy = true
+    policy_result = true
 
     if @reflection.present?
+      # Fetch the appropiate resource
       reflection_resource = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name)
+      # Fetch the model
+      # Hydrate the resource with the model if we have one
       reflection_resource.hydrate(model: @parent_model) if @parent_model.present?
-      association_name = params["related_name"]
+      # Use the related_name as the base of the association
+      association_name = @reflection.name
 
       if association_name.present?
         method_name = "#{policy_method}_#{association_name}?".to_sym
+        # Prepare the authorization service
+        service = reflection_resource.authorization
 
-        if reflection_resource.authorization.has_method?(method_name, raise_exception: false)
-          association_policy = reflection_resource.authorization.authorize_action(method_name, raise_exception: false)
+        if service.has_method?(method_name, raise_exception: false)
+          policy_result = service.authorize_action(method_name, raise_exception: false)
         end
       end
     end
 
-    association_policy
+    policy_result
   end
 
-  def split_panel_fields
-    initialize_panels
-    @resource.get_fields.each do |field|
-      case field.class.to_s
-      when "Avo::Fields::HasOneField"
-        @has_one_panels << field
-      when "Avo::Fields::HasManyField"
-        @has_many_panels << field
-      when "Avo::Fields::HasAndBelongsToManyField"
-        @has_as_belongs_to_many_panels << field
-      else
-        @fields_by_panel[field.panel_name] ||= []
-        @fields_by_panel[field.panel_name] << field
-      end
+  def main_panel
+    @resource.get_items.find do |item|
+      item.is_main_panel?
     end
   end
 
   private
 
-  def initialize_panels
-    @fields_by_panel = {}
-    @has_one_panels = []
-    @has_many_panels = []
-    @has_as_belongs_to_many_panels = []
-    @resource_tools = @resource.tools
-  end
-
   def via_resource?
     params[:via_resource_class].present? && params[:via_resource_id].present?
   end

data/app/components/avo/sidebar/link_component.rb

@@ -14,7 +14,10 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   end
 
   def is_external?
-    URI(path).scheme.present?
+    # If the path contains the scheme, check if it includes the root path or not
+    return !path.include?(Avo::App.root_path) if URI(path).scheme.present?
+
+    false
   end
 
   # For external links active_link_to marks them all as active.

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

@@ -1,6 +1,6 @@
 <div
-  class="fixed z-[60] t-0 application-sidebar w-64 hidden lg:flex flex-1 border-r lg:border-none bg-none h-[calc(100vh-4rem)] bg-gray-25 lg:bg-transparent <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
-  data-mobile-target="sidebar"
+  class="avo-sidebar fixed z-[60] t-0 application-sidebar w-64 hidden lg:flex flex-1 border-r lg:border-none bg-none h-[calc(100vh-4rem)] bg-gray-25 lg:bg-transparent <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>";
+  data-sidebar-target="sidebar"
 >
   <div class="flex flex-col w-full h-full">
     <div class="flex-1 flex flex-col justify-between overflow-auto h-full pt-3 scroll-shadows">

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

@@ -5,8 +5,7 @@
     controller: "tabs",
     tabs_view_value: view,
     tabs_active_tab_value: active_tab_name
-  },
-  class: 'space-y-12' do %>
+  } do %>
   <% visible_tabs.each_with_index do |tab, index| %>
     <%
       args = {

data/app/components/avo/tab_switcher_component.rb

@@ -80,6 +80,10 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
         visible = item.visible?
       end
 
+      if item.respond_to?(:authorized?)
+        visible = item.authorized?
+      end
+
       visible
     end
   end

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

@@ -33,20 +33,42 @@
           <% 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)
+                .component_for_view(view)
+                .new(field: field, resource: @resource, index: index, form: form)
+              %>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
       <% if Avo.configuration.buttons_on_form_footers %>
         <% c.footer_tools do %>
-          <%= a_link back_path, icon: 'arrow-left' do %>
-            <%= t('avo.cancel').capitalize %>
-          <% end %>
-          <% if can_see_the_save_button? %>
-            <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
-              <%= t('avo.save').capitalize %>
+          <div class="mt-4">
+            <%= a_link back_path,
+              style: :text,
+              icon: 'arrow-left' do %>
+              <%= t('avo.cancel').capitalize %>
             <% end %>
-          <% end %>
+            <% if can_see_the_save_button? %>
+              <%= a_button color: :primary,
+                style: :primary,
+                loading: true,
+                type: :submit,
+                icon: 'save' do %>
+                <%= t('avo.save').capitalize %>
+              <% end %>
+            <% end %>
+          </div>
         <% end %>
       <% end %>
     <% end %>
-    <%= content_tag :div, class: 'space-y-12' do %>
+    <%= content_tag :div, class: 'space-y-12 mt-12' do %>
       <% @resource.get_items.each_with_index do |item, index| %>
         <% next if item.nil? %>
         <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: @view, form: form %>

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

@@ -11,8 +11,6 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     @model = model
     @actions = actions
     @view = view
-
-    split_panel_fields
   end
 
   def title
@@ -24,12 +22,10 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
       helpers.resource_path(model: params[:via_resource_class].safe_constantize, resource: relation_resource, resource_id: params[:via_resource_id])
     elsif via_index?
       helpers.resources_path(resource: @resource)
-    else # via resource show page
-      if is_edit?
-        helpers.resource_path(model: @resource.model, resource: @resource)
-      else
-        helpers.resources_path(resource: @resource)
-      end
+    elsif is_edit? # via resource show page
+      helpers.resource_path(model: @resource.model, resource: @resource)
+    else
+      helpers.resources_path(resource: @resource)
     end
   end
 

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

@@ -51,7 +51,7 @@
         <% if @resources.present? %>
           <div class="w-full overflow-auto flex flex-col mt-0">
             <div class="relative flex-1 flex">
-              <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
+              <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
             </div>
           </div>
         <% else %>

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

@@ -15,6 +15,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     reflection: nil,
     turbo_frame: "",
     parent_model: nil,
+    parent_resource: nil,
     applied_filters: []
   )
     @resource = resource
@@ -27,6 +28,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @reflection = reflection
     @turbo_frame = turbo_frame
     @parent_model = parent_model
+    @parent_resource = parent_resource
     @applied_filters = applied_filters
     @view = :index
   end
@@ -52,7 +54,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   # The Create button is dependent on the new? policy method.
   # The create? should be called only when the user clicks the Save button so the developers gets access to the params from the form.
   def can_see_the_create_button?
-    return authorize_association_for("create") if @reflection.present?
+    return authorize_association_for(:create) if @reflection.present?
 
     @resource.authorization.authorize_action(:new, raise_exception: false) && !has_reflection_and_is_read_only
   end
@@ -60,7 +62,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def can_see_the_actions_button?
     return false if @actions.blank?
 
-    return authorize_association_for("act_on") if @reflection.present?
+    return authorize_association_for(:act_on) if @reflection.present?
 
     @resource.authorization.authorize_action(:act_on, raise_exception: false) && !has_reflection_and_is_read_only
   end
@@ -69,7 +71,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     klass = @reflection
     klass = @reflection.through_reflection if klass.is_a? ::ActiveRecord::Reflection::ThroughReflection
 
-    @reflection.present? && klass.is_a?(::ActiveRecord::Reflection::HasManyReflection) && !has_reflection_and_is_read_only && authorize_association_for("attach")
+    @reflection.present? && klass.is_a?(::ActiveRecord::Reflection::HasManyReflection) && !has_reflection_and_is_read_only && authorize_association_for(:attach)
   end
 
   def has_reflection_and_is_read_only

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

@@ -19,8 +19,8 @@
             } do %>
             <%= t('avo.detach_item', item: title).capitalize %>
           <% end %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
         <% end %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
         <% if can_see_the_edit_button? %>
           <%= a_link edit_path,
             color: :primary,
@@ -64,8 +64,20 @@
         <% end %>
       <% end %>
     <% end %>
+    <% 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)
+              .component_for_view(view)
+              .new(field: field, resource: @resource, index: index)
+            %>
+          <% end %>
+        </div>
+      <% end %>
+    <% end %>
   <% end %>
-  <%= content_tag :div, class: 'space-y-12' do %>
+  <%= content_tag :div, class: 'space-y-12 mt-12' do %>
     <% @resource.get_items.each_with_index do |item, index| %>
       <% next if item.nil? %>
       <%= render Avo::ItemSwitcherComponent.new resource: @resource, reflection: @reflection, item: item, index: index + 1, view: @view %>

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

@@ -4,14 +4,14 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, reflection: nil, parent_model: nil, resource_panel: nil, actions: [])
+  def initialize(resource: nil, reflection: nil, parent_resource: nil, parent_model: nil, resource_panel: nil, actions: [])
     @resource = resource
     @reflection = reflection
     @resource_panel = resource_panel
     @actions = actions
+    @parent_model = parent_model
+    @parent_resource = parent_resource
     @view = :show
-
-    split_panel_fields
   end
 
   def title