avo 2.9.2.pre1 → 2.10.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec2fea3d7eaa7759c9864553df3ed3e2375691e8e77616526a3bdf24a9b7c095
-  data.tar.gz: f958e3660b85e7f55352ca3680b1cbc6db6f5241a4b67335cc734c32f042c4b6
+  metadata.gz: eaf0eb69447308c9c5124d557cacfcc5fce7ad1ee307980ea1601671e861346b
+  data.tar.gz: 1e1b14789776d3d3382fca548f8ab1f18d05996ce39fce98091a75723e3b9dd0
 SHA512:
-  metadata.gz: 184f093da1d7adec6414db22ca03f8222103768c35c382c3c0806311665094e02f0573889769f42ff100e3eb82a0f1e3d43a77fd10ad6c22d5357c6ec1a4fdbf
-  data.tar.gz: 03b309a8cff875d3aa1459a51d1196881ac03eae9935b3a4edf152125216bacbfbc0d468afdeb0e1f4da7998adcb468c0639615e396b4f5554e1f597b6f67ee2
+  metadata.gz: 7c42723dfef266320c8b26820c3e9d4670b2c7ce1dccfc49f808cd035d751711479753bb441d15e7b62190b3550d9ea8d435dfe47289c0a8aaa431de37127bc4
+  data.tar.gz: 8ea62dec974fc99d1f75f4e38a168738be810e118d99526f3cc166b9a12c1c13a8cfa33310fa6af24be32a838cb4e7cbd6f42c10108b76956a2b268525210992

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.9.2.pre1)
+    avo (2.10.3.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -22,40 +22,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actioncable (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionmailbox (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      actionview (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionmailer (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.6)
-      actionview (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionpack (6.1.6.1)
+      actionview (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actiontext (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionview (6.1.6.1)
+      activesupport (= 6.1.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -65,22 +65,22 @@ GEM
       addressable
     active_median (0.3.3)
       activesupport (>= 5.2)
-    activejob (6.1.4.6)
-      activesupport (= 6.1.4.6)
+    activejob (6.1.6.1)
+      activesupport (= 6.1.6.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.6)
-      activesupport (= 6.1.4.6)
-    activerecord (6.1.4.6)
-      activemodel (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-    activestorage (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      marcel (~> 1.0.0)
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activestorage (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.6)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -138,7 +138,7 @@ GEM
       xpath (~> 3.2)
     chartkick (4.2.0)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     countries (4.2.1)
       i18n_data (~> 0.15.0)
       sixarm_ruby_unaccent (~> 1.1)
@@ -201,7 +201,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     i18n_data (0.15.0)
       simple_po_parser (~> 1.1)
@@ -219,7 +219,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.14.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -238,7 +238,7 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     msgpack (1.4.4)
     multi_xml (0.6.0)
     net-protocol (0.1.2)
@@ -249,10 +249,10 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.4)
+    nokogiri (1.13.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-linux)
+    nokogiri (1.13.7-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
@@ -267,23 +267,23 @@ GEM
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.4.6)
-      actioncable (= 6.1.4.6)
-      actionmailbox (= 6.1.4.6)
-      actionmailer (= 6.1.4.6)
-      actionpack (= 6.1.4.6)
-      actiontext (= 6.1.4.6)
-      actionview (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activemodel (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.1.6.1)
+      actioncable (= 6.1.6.1)
+      actionmailbox (= 6.1.6.1)
+      actionmailer (= 6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actiontext (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.6)
+      railties (= 6.1.6.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -292,13 +292,13 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    railties (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -372,7 +372,7 @@ GEM
     spring (4.0.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (4.0.2)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
@@ -393,7 +393,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    view_component (2.49.1)
+    view_component (2.57.1)
       activesupport (>= 5.0.0, < 8.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -416,7 +416,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -69,6 +69,10 @@ Please read [CONTRIBUTING.MD](./CONTRIBUTING.MD)
 
 Please read the [UPGRADE_GUIDE.MD](https://docs.avohq.io/2.0/upgrade.html)
 
+# Release schedule
+
+Please read the [RELEASE.MD](./RELEASE.MD)
+
 # ✨ Contributors
 
 <a href="https://github.com/avo-hq/avo/graphs/contributors">

data/app/assets/stylesheets/css/buttons.css

@@ -1,8 +1,11 @@
 .button-group {
   @apply flex;
+
   .button-component {
+    @apply -mr-px;
+
     &:first-child {
-      @apply rounded-l -mr-px;
+      @apply rounded-l;
     }
 
     &:last-child {

data/app/components/avo/actions_component.rb

@@ -43,10 +43,14 @@ class Avo::ActionsComponent < ViewComponent::Base
   end
 
   def single_record_path(id)
-    "#{@resource.record_path}/actions/#{id}"
+    Avo::Services::URIService.parse(@resource.record_path)
+      .append_paths("actions", id)
+      .to_s
   end
 
   def many_records_path(id)
-    "#{@resource.records_path}/actions/#{id}"
+    Avo::Services::URIService.parse(@resource.records_path)
+      .append_paths("actions", id)
+      .to_s
   end
 end

data/app/components/avo/base_component.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::BaseComponent < ViewComponent::Base
+  include Turbo::FramesHelper
+
   def has_with_trial(ability)
     ::Avo::App.license.has_with_trial(ability)
   end

data/app/components/avo/button_component.rb

@@ -26,9 +26,11 @@ class Avo::ButtonComponent < ViewComponent::Base
   def args
     if @args[:loading]
       @args[:"data-controller"] = "loading-button"
+      @args[:"data-loading-button-confirmed-value"] = false
+      @args[:"data-action"] = "click->loading-button#attemptSubmit"
 
       if @args[:confirm]
-        @args[:"data-avo-confirm"] = @args.delete(:confirm)
+        @args[:"data-loading-button-confirmation-message-value"] = @args.delete(:confirm)
       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, :create]) %>"
+  data-editable="<%= @view.in?([:edit, :new]) %>"
 >
   <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, :create]) %>
+        <% if @view.in?([:edit, :new]) %>
           <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/single_file_viewer_component.rb

@@ -10,7 +10,7 @@ class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
   end
 
   def destroy_path
-    "#{@resource.record_path}/active_storage_attachments/#{id}/#{file.id}"
+    Avo::Services::URIService.parse(@resource.record_path).append_paths("active_storage_attachments", id, file.id).to_s
   end
 
   def id

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

@@ -1,9 +1,15 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <%= @form.select @field.id, @field.select_options, { selected: @field.value, prompt: @field.placeholder },
+  <%= @form.select @field.id, @field.select_options, {
+      selected: @field.value,
+      include_blank: @field.include_blank
+    },
+    aria: {
+      placeholder: @field.placeholder
+    },
     class: classes("w-full"),
     data: @field.get_html(:data, view: view, element: :input),
     disabled: @field.readonly,
-    placeholder: @field.placeholder,
-    style: @field.get_html(:style, view: view, element: :input)
+    style: @field.get_html(:style, view: view, element: :input),
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder
   %>
 <% end %>

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

@@ -1,13 +1,32 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <div data-controller="date-field">
-    <%= @form.date_field @field.id,
+  <%= content_tag :div, data: {
+      controller: "date-field",
+      date_field_view_value: @view,
+      date_field_enable_time_value: false,
+      date_field_format_value: @field.format,
+      date_field_picker_format_value: @field.picker_format,
+      date_field_first_day_of_week_value: @field.first_day_of_week,
+      date_field_disable_mobile_value: @field.disable_mobile,
+      date_field_relative_value: @field.relative,
+  } do %>
+    <%= datetime_field "fake_#{@field.id}", "fake",
+      value: @field.edit_formatted_value,
       class: classes("w-full"),
+      data: {
+        'date-field-target': 'fakeInput',
+        placeholder: @field.placeholder,
+        relative: @field.relative,
+        **@field.get_html(:data, view: view, element: :input)
+      },
+      disabled: @field.readonly,
+      placeholder: @field.placeholder,
+      style: @field.get_html(:style, view: view, element: :input)
+    %>
+    <%= @form.text_field @field.id,
+      value: @field.edit_formatted_value,
+      class: classes("w-full hidden"),
       data: {
         'date-field-target': 'input',
-        'first-day-of-week': @field.first_day_of_week,
-        'picker-format': @field.picker_format,
-        'enable-time': false,
-        format: @field.format,
         placeholder: @field.placeholder,
         relative: @field.relative,
         **@field.get_html(:data, view: view, element: :input)
@@ -16,5 +35,5 @@
       placeholder: @field.placeholder,
       style: @field.get_html(:style, view: view, element: :input)
     %>
-  </div>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,9 @@
 <%= index_field_wrapper field: @field, resource: @resource do %>
-  <%= @field.formatted_value %>
+   <%= content_tag :div, data: {
+    controller: "date-field",
+    date_field_view_value: @view,
+    date_field_format_value: @field.format,
+  } do %>
+    <%= @field.formatted_value %>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,9 @@
 <%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
-  <%= @field.formatted_value %>
+  <%= content_tag :div, data: {
+    controller: "date-field",
+    date_field_view_value: @view,
+    date_field_format_value: @field.format,
+  } do %>
+    <%= @field.formatted_value %>
+  <% end %>
 <% end %>

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

@@ -5,6 +5,7 @@
       date_field_enable_time_value: true,
       date_field_picker_format_value: @field.picker_format,
       date_field_first_day_of_week_value: @field.first_day_of_week,
+      date_field_disable_mobile_value: @field.disable_mobile,
       date_field_time24_hr_value: @field.time_24hr,
       date_field_timezone_value: @field.timezone,
   } do %>

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

@@ -3,6 +3,7 @@
 class Avo::Fields::EditComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
+  attr_reader :field
   attr_reader :view
 
   def initialize(field: nil, resource: nil, index: 0, form: nil, displayed_in_modal: false)
@@ -17,4 +18,8 @@ class Avo::Fields::EditComponent < ViewComponent::Base
   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))
   end
+
+  def render?
+    !field.computed
+  end
 end

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

@@ -7,6 +7,7 @@
 
   <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
     <%= @form.file_field @field.id,
+      accept: @field.accept,
       data: @field.get_html(:data, view: view, element: :input),
       direct_upload: @field.direct_upload,
       disabled: @field.readonly,

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

@@ -4,6 +4,7 @@
   <% if @resource.authorization.authorize_action(:upload_attachments?, raise_exception: false) %>
     <div class="mt-2">
       <%= @form.file_field @field.id,
+        accept: @field.accept,
         data: @field.get_html(:data, view: view, element: :input),
         direct_upload: @field.direct_upload,
         disabled: @field.readonly,

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

@@ -1,12 +1,16 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <%= @form.select @field.id, @field.options_for_select, { selected: @field.value, prompt: @field.placeholder }, {
-      aria: {
-        placeholder: @field.placeholder
-      },
-      class: classes("w-full"),
-      data: @field.get_html(:data, view: view, element: :input),
-      disabled: @field.readonly,
-      style: @field.get_html(:style, view: view, element: :input),
-      value: @field.model.present? ? @field.model[@field.id] : @field.value
-    } %>
+  <%= @form.select @field.id, @field.options_for_select, {
+      selected: @field.value,
+      include_blank: @field.include_blank
+    },
+    aria: {
+      placeholder: @field.placeholder
+    },
+    class: classes("w-full"),
+    data: @field.get_html(:data, view: view, element: :input),
+    disabled: @field.readonly,
+    style: @field.get_html(:style, view: view, element: :input),
+    value: @field.model.present? ? @field.model[@field.id] : @field.value,
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder
+  %>
 <% end %>

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

@@ -5,7 +5,7 @@ class Avo::Fields::ShowComponent < ViewComponent::Base
 
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, index: 0)
+  def initialize(field: nil, resource: nil, index: 0, form: nil)
     @field = field
     @resource = resource
     @index = index

data/app/components/avo/index/ordering/button_component.rb

@@ -18,20 +18,6 @@ class Avo::Index::Ordering::ButtonComponent < Avo::Index::Ordering::BaseComponen
   end
 
   def order_path(args)
-    if reflection.present?
-      path = "#{::Avo::App.root_path}/resources/#{reflection_parent_resource.route_key}/#{params[:id]}/#{field.id}/#{resource.model.id}/order"
-    else
-      path = "#{::Avo::App.root_path}/resources/#{resource.route_key}/#{resource.model.id}/order"
-    end
-
-    if args.present?
-      string_args = args.map do |key, value|
-        "#{key}=#{value}"
-      end.join('&')
-
-      path = "#{path}?#{string_args}"
-    end
-
-    path
+    Avo::App.view_context.avo.reorder_order_path(resource.route_key, resource.model.id, **args)
   end
 end

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

@@ -46,7 +46,7 @@
         }
       %>
       <%= hidden_field_tag :turbo_frame, params[:turbo_frame], id: "turbo_frame_detach_#{@resource.model.id}" if params[:turbo_frame] %>
-      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= hidden_field_tag :referrer, referrer_path, id: "referrer_detach_#{@resource.model.id}" if params[:turbo_frame] %>
     <% end %>
   <% end %>
 
@@ -71,7 +71,7 @@
       %>
       <%= form.hidden_field :view_type, value: params[:view_type], id: "turbo_view_type_#{@resource.model.id}" if params[:view_type] %>
       <%= form.hidden_field :turbo_frame, value: params[:turbo_frame], id: "turbo_frame_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
-      <%= form.hidden_field :referrer, value: request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= form.hidden_field :referrer, value: referrer_path, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
     <% end %>
   <% end %>
 </div>

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

@@ -41,7 +41,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def edit_path
-    #Add the `view` param to let Avo know where to redirect back when the user clicks the `Cancel` button.
+    # Add the `view` param to let Avo know where to redirect back when the user clicks the `Cancel` button.
     args = {via_view: 'index'}
 
     if @parent_model.present?
@@ -71,4 +71,8 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   def is_has_many_association
     @reflection.is_a?(::ActiveRecord::Reflection::HasManyReflection) || @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
   end
+
+  def referrer_path
+    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

@@ -1,6 +1,6 @@
 <div class="w-full ">
   <table class="w-full px-4 bg-white" data-resource-name='<%= @resource.model_key %>' data-controller='item-select-all'>
-    <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(reflection: @reflection)} %>
+    <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(reflection: @reflection, only_root: true)} %>
     <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 %>

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

@@ -9,7 +9,7 @@
       </div>
     </td>
   <% end %>
-  <% @resource.get_fields(reflection: @reflection).each_with_index do |field, index| %>
+  <% @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) %>
   <% end %>
   <td class="text-right whitespace-nowrap px-2">

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

@@ -0,0 +1,19 @@
+<% if item.is_tool? %>
+  <% if item&.partial.present? %>
+    <%= render item.partial, tool: item %>
+  <% end %>
+<% elsif item.is_panel? %>
+  <%= render Avo::PanelComponent.new(title: item.name, description: item.description, index: index, view: view) do |c| %>
+    <% c.body do %>
+      <div class="divide-y">
+        <% item.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 %>
+<% elsif item.is_tab_group? %>
+  <%= render tab_group_component %>
+<% elsif item.is_field? %>
+  <%= render field_component %>
+<% end %>