avo 2.11.3.pre.3 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33a3f78d32b04247f263b94f22dcfbc0e825e3ea99a311c1642866b30a46524f
-  data.tar.gz: 7344cfbc9197ac2537003045a2ab340165ba4964b095ef914e6ca49852881373
+  metadata.gz: 16af345f63f08dc026b6c1a29ce0938d7a0aad278a53884e542b8f31a17c34fa
+  data.tar.gz: ed4abef748fbe4e8e22edecd85ea70f361875e30f28ffdbddfb648fbf9cde226
 SHA512:
-  metadata.gz: 25e7ee4600617e4786e3b0c43e6b1f03fa4e3e14ab861745d5c9915352cdeb2c66e4d1444ebf1e834c6cb82fea7d854f3440b274ca90a946630279370928cc69
-  data.tar.gz: 4363ffce5ed2b2172d0c992d98dd8c9bcc8c68e82e7e48dfec8040efe877f8b2aab9203e538110f1ac3a2f77fa2f2d90caa573fc24f7eddc6af6f619da791966
+  metadata.gz: 98d1460f53524d1747ac7db6a85c1c3e0e033d6ad42f624d699865500fa34079f30ea08d0a698ee756771269fb1b6d6e51d30a7663b008366a860dad6b1b6ed2
+  data.tar.gz: df8cd199ec20e5cf1f17a407ebcd6aa0d020254eedaf8b514a517d4c800d2a923bc4bd131aec1d1967b713be49f12d56167fc69efa4b638a17570967a568f312

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.11.3.pre.3)
+    avo (2.13.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -136,7 +136,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (4.2.0)
+    chartkick (4.2.1)
     childprocess (4.1.0)
     concurrent-ruby (1.1.10)
     countries (4.2.1)
@@ -252,8 +252,6 @@ 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

data/README.md

@@ -3,6 +3,7 @@
 ![reviewdog](https://github.com/avo-hq/avo/workflows/reviewdog/badge.svg)
 [![codecov](https://codecov.io/gh/avo-hq/avo/branch/master/graph/badge.svg?token=Q2LMFE4989)](https://codecov.io/gh/avo-hq/avo)
 [![Maintainability](https://api.codeclimate.com/v1/badges/676a0afa2cc79f03aa29/maintainability)](https://codeclimate.com/github/avo-hq/avo/maintainability)
+[![Open Source Helpers](https://www.codetriage.com/avo-hq/avo/badges/users.svg)](https://www.codetriage.com/avo-hq/avo)
 
 ![](./public/avo-assets/logo-on-white.png)
 
@@ -73,7 +74,7 @@ Please read the [UPGRADE_GUIDE.MD](https://docs.avohq.io/2.0/upgrade.html)
 
 Please read the [RELEASE.MD](./RELEASE.MD)
 
-# ✨ Contributors
+# ✨ [Contributors](https://avohq.io/contributors)
 
 <a href="https://github.com/avo-hq/avo/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=avo-hq/avo" />

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

@@ -3,9 +3,9 @@
   data-actions-picker-enabled-class="text-black hover:bg-blue-500 hover:text-white"
   data-actions-picker-disabled-class="cursor-wait text-gray-500"
 >
-  <%= a_button style: :outline,
+  <%= a_button style: @style,
     type: :button,
-    color: :primary,
+    color: @color,
     class: "focus:outline-none",
     icon: 'arrow-circle-right',
     icon_class: 'transform rotate-90',
@@ -18,7 +18,7 @@
     data-toggle-panel-target="panel"
   >
     <div class="w-full space divide-y">
-      <% @actions.each_with_index do |action, index| %>
+      <% actions.each_with_index do |action, index| %>
         <%= link_to action_path(action.param_id),
           data: {
             'turbo-frame': 'actions_show',

data/app/components/avo/actions_component.rb

@@ -3,14 +3,23 @@
 class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(actions: [], resource: nil, view: nil)
-    @actions = actions
+  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :blue)
+    @actions = actions || []
     @resource = resource
     @view = view
+    @exclude = exclude
+    @color = color
+    @style = style
   end
 
   def render?
-    @actions.present?
+    actions.present?
+  end
+
+  def actions
+    @actions.select do |action|
+      !action.class.in?(@exclude)
+    end
   end
 
   # When running an action for one record we should do it on a special path.

data/app/components/avo/button_component.rb

@@ -43,9 +43,7 @@ class Avo::ButtonComponent < ViewComponent::Base
     classes = "button-component inline-flex flex-grow-0 items-center font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-70 border justify-center active:outline active:outline-1 #{@class}"
 
     classes += " rounded" if @rounded.present?
-
     classes += style_classes
-
     classes += horizontal_padding_classes
     classes += vertical_padding_classes
     classes += text_size_classes
@@ -151,7 +149,7 @@ class Avo::ButtonComponent < ViewComponent::Base
   def style_classes
     case @style
     when :primary
-      " bg-primary-500 text-white border-primary-500 hover:bg-primary-600 hover:border-primary-600 active:border-primary-700 active:outline-primary-700 active:bg-primary-600"
+      " bg-#{@color}-500 text-white border-#{@color}-500 hover:bg-#{@color}-600 hover:border-#{@color}-600 active:border-#{@color}-700 active:outline-#{@color}-700 active:bg-#{@color}-600"
     when :outline
       " bg-white text-#{@color}-500 border-#{@color}-500 hover:bg-#{@color}-100 active:bg-#{@color}-100 active:border-#{@color}-500 active:outline-#{@color}-500"
     when :text

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

@@ -1,19 +1,19 @@
 <div class="relative flex-1 flex flex-col justify-between h-full"
-  data-controller="card"
-  data-card-target="card"
+  data-controller="dashboard-card"
+  data-dashboard-card-target="card"
   data-refresh-every="<%= @card.refresh_every %>"
   data-card-id="<%= @card.id %>"
   data-card-index="<%= @card.index %>">
   <% if @card.class.display_header %>
     <div class="px-4 pt-4">
-      <div class="flex justify-between items-center">
-        <div class="text-sm font-bold text-gray-700 leading-none">
-          <%= @card.label %>
-        </div>
-        <div class="flex" data-controller="select">
+      <div class="flex justify-between items-center min-h-6">
+          <div class="text-base font-bold text-gray-700 leading-none">
+            <%= @card.label %>
+          </div>
+        <div data-controller="select">
           <% if @card.type.in?([:metric, :chartkick, :partial]) && @card.ranges.present? %>
             <%= select_tag "#{@card.id}_#{@card.index}_range", options_for_select(@card.ranges, @card.range),
-              class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-xs text-blue-gray-700 disabled:text-blue-gray-700 leading-none rounded-md py-px px-2 border outline-none outline w-24',
+              class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-sm text-blue-gray-700 disabled:text-blue-gray-700 leading-none rounded-md py-px px-2 leading-tight border outline-none outline w-24',
               data: {
                 target: 'select',
                 action: 'change->select#onChange'

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), @link, title: @title %>
+<%= link_to_if @link_to_resource.present?, image_tag(url.to_s, class: classes, width: options[:size], height: options[:size]), @link, title: @title %>

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

@@ -7,7 +7,6 @@
       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,
@@ -15,7 +14,6 @@
       data: {
         'date-field-target': 'fakeInput',
         placeholder: @field.placeholder,
-        relative: @field.relative,
         **@field.get_html(:data, view: view, element: :input)
       },
       disabled: @field.readonly,
@@ -28,7 +26,6 @@
       data: {
         'date-field-target': 'input',
         placeholder: @field.placeholder,
-        relative: @field.relative,
         **@field.get_html(:data, view: view, element: :input)
       },
       disabled: @field.readonly,

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

@@ -15,7 +15,6 @@
       data: {
         'date-field-target': 'fakeInput',
         placeholder: @field.placeholder,
-        relative: @field.relative,
         **@field.get_html(:data, view: view, element: :input)
       },
       disabled: @field.readonly,
@@ -28,7 +27,6 @@
       data: {
         'date-field-target': 'input',
         placeholder: @field.placeholder,
-        relative: @field.relative,
         **@field.get_html(:data, view: view, element: :input)
       },
       disabled: @field.readonly,

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

@@ -3,7 +3,7 @@
     <%= render(Avo::LoadingComponent.new(title: @field.name)) %>
   </turbo-frame>
 <% else %>
-  <%= render Avo::PanelComponent.new(title: @field.name) do |c| %>
+  <%= render Avo::PanelComponent.new(name: @field.name) do |c| %>
     <% c.tools do %>
       <% if !@field.readonly && can_attach? %>
         <%= a_link attach_path, icon: 'heroicons/outline/link', color: :primary, 'data-turbo-frame': 'attach_modal' do %>

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# require_relative 'item_labels'
-
 class Avo::Fields::TagsField::ShowComponent < Avo::Fields::ShowComponent
   include Avo::Fields::Concerns::ItemLabels
 end

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

@@ -9,7 +9,7 @@
   <% else %>
     <div class="popover inline-block"
       data-controller="popover"
-      data-popover-translate-x="-100%"
+      data-popover-translate-x="<%= Avo.configuration.resource_controls_placement == :left ? '20%' : '-100%' %>"
       data-popover-translate-y="-32px"
       data-action="mouseover->popover#mouseOver mouseout->popover#mouseOut"
       >

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

@@ -58,7 +58,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def singular_resource_name
     if @reflection.present?
-      reflection_resource.name
+      field&.name&.singularize || reflection_resource.name
     else
       @resource.singular_name.present? ? @resource.singular_name : @resource.model_class.model_name.name.downcase
     end

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

@@ -3,7 +3,7 @@
     <%= render item.partial, tool: item, form: @form %>
   <% end %>
 <% elsif item.is_panel? %>
-  <%= render Avo::PanelComponent.new(title: item.name, description: item.description, index: index, view: view) do |c| %>
+  <%= render Avo::PanelComponent.new(name: item.name, description: item.description, index: index) do |c| %>
     <% c.body do %>
       <div class="divide-y">
         <% item.items.each_with_index do |field, index| %>

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

@@ -17,7 +17,7 @@
         <% end %>
       </div>
       <% if tools.present? %>
-        <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">
+        <div class="flex-1 w-full flex flex-wrap flex-col sm:flex-row xl:justify-end sm:items-end gap-2 mt-4 xl:mt-0" data-target="panel-tools">
           <%= tools %>
         </div>
       <% end %>

data/app/components/avo/panel_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::PanelComponent < ViewComponent::Base
-  attr_reader :title
+  attr_reader :title # deprecating title in favor of name
   attr_reader :name
   attr_reader :classes
 
@@ -11,9 +11,9 @@ class Avo::PanelComponent < ViewComponent::Base
   renders_one :footer_tools
   renders_one :footer
 
-  def initialize(title: nil, name: nil, description: nil, body_classes: nil, data: {}, display_breadcrumbs: false, index: nil, classes: nil, view: nil)
+  def initialize(name: nil, description: nil, body_classes: nil, data: {}, display_breadcrumbs: false, index: nil, classes: nil, **args)
     # deprecating title in favor of name
-    @title = title
+    @title = args[:title]
     @name = name || title
     @description = description
     @classes = classes
@@ -21,7 +21,6 @@ class Avo::PanelComponent < ViewComponent::Base
     @data = data
     @display_breadcrumbs = display_breadcrumbs
     @index = index
-    @view = view
   end
 
   private

data/app/components/avo/resource_component.rb

@@ -22,6 +22,12 @@ class Avo::ResourceComponent < Avo::BaseComponent
     authorize_association_for("detach")
   end
 
+  def detach_path
+    return "/" if @reflection.blank?
+
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
+  end
+
   def can_see_the_edit_button?
     @resource.authorization.authorize_action(:edit, raise_exception: false)
   end
@@ -30,10 +36,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
     @resource.authorization.authorize_action(:destroy, raise_exception: false)
   end
 
-  def detach_path
-    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
-  end
-
   def destroy_path
     helpers.resource_path(model: @resource.model, resource: @resource)
   end

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

@@ -25,7 +25,7 @@
       # On edit screens we want to load each tab because we wnst the DOM to have the fields present on form submission.
       # If you have a field which is in the second tab and it's required, the form submission will fail because the required field is not in view, and we don't want that.
       # We also want to load the current tab
-      should_lazy_load = if @view.to_s.in?(['edit', 'new'])
+      should_lazy_load = if @view.to_s.in?(['edit', 'new', 'update', 'create'])
         false
       else
         !is_current_tab

data/app/components/avo/tab_switcher_component.rb

@@ -30,11 +30,11 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
   end
 
   def is_edit?
-    @view == :edit
+    @view.in?([:edit, :update])
   end
 
   def is_new?
-    @view == :new
+    @view.in?([:new, :create])
   end
 
   def is_initial_load?

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

@@ -15,7 +15,7 @@
     },
     multipart: true do |form| %>
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
-    <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+    <%= 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,

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

@@ -35,26 +35,6 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     @resource.authorization.authorize_action @view, raise_exception: false
   end
 
-  def is_edit?
-    view == :edit
-  end
-
-  def form_url
-    if is_edit?
-      helpers.resource_path(
-        model: @resource.model,
-        resource: @resource
-      )
-    else
-      helpers.resources_path(
-        resource: @resource,
-        via_relation_class: params[:via_relation_class],
-        via_relation: params[:via_relation],
-        via_resource_id: params[:via_resource_id]
-      )
-    end
-  end
-
   private
 
   def via_index?
@@ -62,7 +42,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def is_edit?
-    view == :edit
+    view.in?([:edit, :update])
   end
 
   def form_method

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

@@ -1,126 +1,78 @@
 <%= content_tag :div,
-  class: 'space-y-6',
   data: {
     **@resource.stimulus_data_attributes
   } do %>
-  <%= render Avo::CardsListComponent.new parent: @resource %>
-  <%= content_tag :div, class: "space-y-12" do %>
-    <%= render Avo::PanelComponent.new(title: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
-      <% c.tools do %>
-        <% if can_attach? %>
-          <%= a_link attach_path,
+  <%= render Avo::PanelComponent.new(name: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
+    <% c.tools do %>
+      <% if can_attach? %>
+        <%= a_link attach_path,
           icon: 'heroicons/outline/link',
           color: :primary,
           style: :text,
           'data-turbo-frame': 'attach_modal',
           'data-target': 'attach' do %>
-            <%= t('avo.attach_item', item: singular_resource_name).capitalize %>
-          <% end %>
+          <%= t('avo.attach_item', item: singular_resource_name).capitalize %>
         <% end %>
-        <% if can_see_the_actions_button? %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-        <% end %>
-        <% if can_see_the_create_button? %>
-          <%= a_link create_path,
+      <% end %>
+      <% if can_see_the_actions_button? %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+      <% end %>
+      <% if can_see_the_create_button? %>
+        <%= a_link create_path,
           icon: 'heroicons/outline/plus',
           'data-target': 'create',
           style: :primary,
           color: :primary do %>
-            <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
-          <% end %>
+          <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
         <% end %>
       <% end %>
-      <% c.body do %>
-        <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' if @resource.search_query.nil? && @filters.empty? && available_view_types.count <= 1 %>"
+    <% end %>
+    <% c.body do %>
+      <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' if @resource.search_query.nil? && @filters.empty? && available_view_types.count <= 1 %>"
         data-selected-resources-name="<%= @resource.model_key %>"
         data-selected-resources="[]"
       >
-          <% if @resource.search_query.present? %>
-            <div class="flex items-center px-4 w-64">
-              <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key} %>
-            </div>
-          <% else %>
-            <%# Offset for the space-y-2 property when the search is missing %>
-            <div class="-mb-2"></div>
-          <% end %>
-          <% if @filters.present? || available_view_types.count > 1 %>
-            <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
-              <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource, applied_filters: @applied_filters %>
-              <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if available_view_types.count > 1 %>
-            </div>
-          <% end %>
-        </div>
-        <% if view_type.to_sym == :table %>
-          <% if @resources.present? %>
-            <div class="w-full overflow-auto flex flex-col mt-0 mac-styled-scrollbar">
-              <div class="relative flex-1 flex">
-                <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
-              </div>
-            </div>
-          <% else %>
-            <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
-          <% end %>
+        <% unless hide_search_input %>
+          <div class="flex items-center px-4 w-64">
+            <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key, via_reflection: via_reflection} %>
+          </div>
+        <% else %>
+          <%# Offset for the space-y-2 property when the search is missing %>
+          <div class="-mb-2"></div>
         <% end %>
-      <% end %>
-      <% c.bare_content do %>
-        <% if view_type.to_sym == :table %>
-          <% if @models.present? %>
-            <div class="mt-4">
-              <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
+        <% if @filters.present? || available_view_types.count > 1 %>
+          <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
+            <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource, applied_filters: @applied_filters %>
+            <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if available_view_types.count > 1 %>
+          </div>
+        <% end %>
+      </div>
+      <% if view_type.to_sym == :table %>
+        <% if @resources.present? %>
+          <div class="w-full overflow-auto flex flex-col mt-0 mac-styled-scrollbar">
+            <div class="relative flex-1 flex">
+              <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
             </div>
-          <% end %>
+          </div>
+        <% else %>
+          <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
         <% end %>
-        <% if view_type.to_sym == :grid %>
-          <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
-          <div class="mt-6">
+      <% end %>
+    <% end %>
+    <% c.bare_content do %>
+      <% if view_type.to_sym == :table %>
+        <% if @models.present? %>
+          <div class="mt-4">
             <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
           </div>
-          <% if view_type.to_sym == :table %>
-            <% 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)) %>
-                </div>
-              <% else %>
-                <%# Offset for the space-y-2 property when the serach is missing %>
-                <div class="-mb-2"></div>
-              <% end %>
-              <% if @filters.present? || available_view_types.count > 1 %>
-                <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
-                  <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource, applied_filters: @applied_filters %>
-                  <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if available_view_types.count > 1 %>
-                </div>
-              <% end %>
-            </div>
-            <% if view_type.to_sym == :table %>
-              <% 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)) %>
-                  </div>
-                </div>
-              <% else %>
-                <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
-              <% end %>
-            <% end %>
-          <% end %>
-          <% c.bare_content do %>
-            <% if view_type.to_sym == :table %>
-              <% if @models.present? %>
-                <div class="mt-4">
-                  <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model %>
-                </div>
-              <% end %>
-            <% end %>
-            <% if view_type.to_sym == :grid %>
-              <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
-              <div class="mt-6">
-                <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model %>
-              </div>
-            <% end %>
-          <% end %>
         <% end %>
       <% end %>
+      <% if view_type.to_sym == :grid %>
+        <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
+        <div class="mt-6">
+          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
+        </div>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -124,6 +124,8 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
   def singular_resource_name
     if @reflection.present?
+      return name.singularize if field.present?
+
       reflection_resource.name
     else
       @resource.singular_name || @resource.model_class.model_name.name.downcase
@@ -141,6 +143,12 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @resource.resource_description
   end
 
+  def hide_search_input
+    return true unless @resource.search_query.present?
+
+    field&.hide_search_input || false
+  end
+
   private
 
   def reflection_model_class
@@ -151,4 +159,15 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     field.custom_name? ? field.name : field.plural_name
   end
 
+  def via_reflection
+    return unless @reflection.present?
+
+    {
+      association: 'has_many',
+      association_id: @reflection.name,
+      class: reflection_model_class,
+      id: @parent_model.id
+    }
+  end
+
 end