avo 3.0.1.beta24 → 3.0.2

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

@@ -1,47 +1,36 @@
-<%
-  per_page_options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, index_params[:per_page].to_i]
-
-  if parent_record.present?
-    per_page_options.prepend Avo.configuration.via_per_page
-  end
-
-  per_page_options = per_page_options.sort.uniq
-%>
-<% unless @pagy.pages <= 1 && discreet_pagination %>
-  <div class="flex flex-col sm:flex-row items-center justify-between aborder-t aborder-slate-200 rounded-xl space-y-2 sm:space-y-0">
-    <div class="flex-2 sm:flex sm:items-center sm:justify-between">
-      <div>
-        <div class="text-sm leading-5 text-slate-600 flex items-center">
-          <div data-controller="per-page">
-            <div class="flex items-center">
-              <%= select_tag 'per_page',
-                options_for_select(per_page_options, index_params[:per_page]),
-                class: 'appearance-none inline-flex bg-white-100 disabled:bg-white-400 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-600 rounded-md py-1 px-2 leading-tight border border-slate-300 outline-none focus:border-slate-400 outline w-16 mr-1 text-sm',
-                data: {
-                  'turbo-frame': turbo_frame,
-                  'per-page-target': 'selector',
-                  action: 'change->per-page#reload'
-                }
-              %> <%= t('avo.per_page').downcase %>
-            </div>
-            <% per_page_options.each do |option| %>
-              <%= link_to "Change to #{option} items per page", change_items_per_page_url(option), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
-            <% end %>
+<div class="flex flex-col sm:flex-row items-center justify-between aborder-t aborder-slate-200 rounded-xl space-y-2 sm:space-y-0">
+  <div class="flex-2 sm:flex sm:items-center sm:justify-between">
+    <div>
+      <div class="text-sm leading-5 text-slate-600 flex items-center">
+        <div data-controller="per-page">
+          <div class="flex items-center">
+            <%= select_tag 'per_page',
+              options_for_select(per_page_options, index_params[:per_page]),
+              class: 'appearance-none inline-flex bg-white-100 disabled:bg-white-400 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-600 rounded-md py-1 px-2 leading-tight border border-slate-300 outline-none focus:border-slate-400 outline w-16 mr-1 text-sm',
+              data: {
+                'turbo-frame': turbo_frame,
+                'per-page-target': 'selector',
+                action: 'change->per-page#reload'
+              }
+            %> <%= t('avo.per_page').downcase %>
           </div>
+          <% per_page_options.each do |option| %>
+            <%= link_to "Change to #{option} items per page", change_items_per_page_url(option), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+          <% end %>
         </div>
       </div>
     </div>
-    <div class="flex">
-      <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left">
-        <% if @pagy.count > 0 %>
-          <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
-        <% end %>
+  </div>
+  <div class="flex">
+    <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left">
+      <% if @resource.pagination_type.default? %>
+        <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
+      <% end %>
 
-        <% if @pagy.pages > 1 %>
-          <%# @todo: add first & last page. make the first and last buttons rounded %>
-          <%== helpers.pagy_nav @pagy %>
-        <% end %>
-      </div>
+      <% if @pagy.pages > 1 %>
+        <%# @todo: add first & last page. make the first and last buttons rounded %>
+        <%== helpers.pagy_nav @pagy %>
+      <% end %>
     </div>
   </div>
-<% end %>
+</div>

data/app/components/avo/paginator_component.rb

@@ -24,4 +24,22 @@ class Avo::PaginatorComponent < ViewComponent::Base
       helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1)
     end
   end
+
+  def render?
+    return false if discreet_pagination && pagy.pages <= 1
+
+    @pagy.items > 0
+  end
+
+  def per_page_options
+    @per_page_options ||= begin
+      options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, index_params[:per_page].to_i]
+
+      if parent_record.present?
+        options.prepend Avo.configuration.via_per_page
+      end
+
+      options.sort.uniq
+    end
+  end
 end

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

@@ -32,12 +32,12 @@
         </div>
       </div>
       <% if sidebar? %>
-        <div class="w-full sm:w-1/3 flex-shrink-0 h-full <%= white_panel_classes %>">
+        <div class="max-w-full sm:w-1/3 flex-shrink-0 h-full">
           <%= sidebar %>
         </div>
       <% end %>
       <% if bare_sidebar? %>
-        <div class="w-full sm:w-1/3 flex-shrink-0 h-full">
+        <div class="max-w-full sm:w-1/3 flex-shrink-0 h-full">
           <%= bare_sidebar %>
         </div>
       <% end %>

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

@@ -3,4 +3,5 @@
 <%= hidden_field_tag :via_resource_class, params[:via_resource_class] if params[:via_resource_class] %>
 <%= hidden_field_tag :via_record_id, params[:via_record_id] if params[:via_record_id] %>
 <%= hidden_field_tag :via_relation, params[:via_relation] if params[:via_relation] %>
+<%= hidden_field_tag :via_belongs_to_resource_class, params[:via_belongs_to_resource_class] if params[:via_belongs_to_resource_class] %>
 <%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>

data/app/components/avo/resource_component.rb

@@ -113,14 +113,15 @@ class Avo::ResourceComponent < Avo::BaseComponent
     end
   end
 
-  def sidebar
+  def sidebars
     return if Avo.license.lacks_with_trial(:resource_sidebar)
 
-    @sidebar ||= search_for_sidebar
-  end
-
-  def sidebar_component(form: nil)
-    Avo::ResourceSidebarComponent.new resource: @resource, fields: sidebar.visible_items, params: params, view: view, form: form
+    @item.items.select do |item|
+      item.is_sidebar?
+    end
+    .map do |sidebar|
+      sidebar.hydrate(view: view, resource: resource)
+    end
   end
 
   def has_reflection_and_is_read_only
@@ -155,16 +156,8 @@ class Avo::ResourceComponent < Avo::BaseComponent
     (params[:via_resource_class].present? || params[:via_relation_class].present?) && params[:via_record_id].present?
   end
 
-  def search_for_sidebar
-    item = @resource.get_items.find do |item|
-      item.is_sidebar?
-    end
-
-    item&.hydrate(view: view)
-  end
-
   def render_back_button(control)
-    return if is_a_related_resource?
+    return if back_path.blank? || is_a_related_resource?
 
     tippy = control.title ? :tooltip : nil
     a_link back_path,

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

@@ -1,23 +1,16 @@
 <div class="resource-sidebar-component divide-y"
-  data-component-name="<%= self.class.to_s.underscore%>"
+  data-component-name="<%= self.class.to_s.underscore %>"
+  data-component-index="<%= index %>"
   data-resource-name="<%= @resource.class.to_s %>"
   data-record-id="<%= @resource.record.id %>"
 >
-  <% fields.each_with_index do |field, index| %>
-    <%= render field
-      .hydrate(
-        resource: resource,
-        record: resource.record,
-        user: resource.user,
-        view: view
-      ).component_for_view(view)
-      .new(
-        field: field,
-        resource: resource,
-        form: form,
-        stacked: true,
-        index: index
-      )
-    %>
-  <% end %>
+  <%= render Avo::Items::VisibleItemsComponent.new(
+    resource: @resource,
+    item: @sidebar,
+    view: @view,
+    form: @form,
+    field_component_extra_args: {
+      stacked: true
+    }
+  )%>
 </div>

data/app/components/avo/resource_sidebar_component.rb

@@ -6,13 +6,15 @@ class Avo::ResourceSidebarComponent < ViewComponent::Base
   attr_reader :view
   attr_reader :form
   attr_reader :fields
+  attr_reader :index
 
-  def initialize(resource: nil, fields: nil, index: nil, params: nil, form: nil, view: nil)
+  def initialize(resource: nil, sidebar: nil, index: nil, params: nil, form: nil, view: nil)
     @resource = resource
-    @fields = fields
+    @sidebar = sidebar
     @params = params
     @view = view
     @form = form
+    @index = index
   end
 
   def render?

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

@@ -2,7 +2,7 @@
   <div class="flex-1 flex space-x-4 w-full">
     <% if avatar.present? %>
       <div class="relative aspect-square w-10 h-10 overflow-hidden rounded shrink-0">
-        <%= image_tag avatar, class: "object-cover min-w-full min-h-full h-full" %>
+        <%= image_tag helpers.main_app.url_for(avatar), class: "object-cover min-w-full min-h-full h-full" %>
       </div>
     <% end %>
     <div class="flex flex-col pr-3 min-w-0">

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

@@ -47,7 +47,7 @@
           <% if !tab.is_empty? %>
             <div class="space-y-12">
               <% tab.visible_items.each do |item| %>
-                <%= render Avo::ItemSwitcherComponent.new resource: resource, item: item, index: index, form: form, view: @view %>
+                <%= render Avo::Items::SwitcherComponent.new resource: resource, item: item, index: index, form: form, view: @view %>
               <% end %>
             </div>
           <% end %>

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

@@ -1,4 +1,5 @@
 <%= content_tag :div,
+  id: helpers.frame_id(@resource),
   data: {
     model_name: @resource.model_name.to_s,
     resource_name: @resource.class.to_s,
@@ -19,39 +20,21 @@
     multipart: true do |form| %>
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
     <%= content_tag :div, class: 'space-y-12' do %>
-      <%= render Avo::PanelComponent.new(name: title, description: @resource.description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-        <% c.with_tools do %>
-          <% @resource.render_edit_controls.each do |control| %>
-            <%= render_control control %>
-          <% 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.with_body do %>
-            <div class="divide-y">
-              <% main_panel.items.each_with_index do |field, index| %>
-                <%= render field
-                  .hydrate(resource: @resource, record: @resource.record, user: @resource.user, view: view_for(field))
-                  .component_for_view(view_for field)
-                  .new(field: field, resource: @resource, index: index, form: form, compact: sidebar.present?)
-                %>
-              <% end %>
-            </div>
-          <% end %>
-        <% end %>
-        <% if sidebar.present? %>
-          <% c.with_sidebar do %>
-            <%= render sidebar_component form: form %>
-          <% end %>
-        <% end %>
-      <% end %>
-      <%= content_tag :div, class: 'space-y-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 %>
-        <% end %>
+      <% @resource.get_items.each_with_index do |item, index| %>
+        <%= render Avo::Items::SwitcherComponent.new(
+          resource: @resource,
+          reflection: @reflection,
+          item: item,
+          index: index + 1,
+          view: @view,
+          parent_resource: @parent_resource,
+          parent_record: @parent_record,
+          form: form,
+          parent_component: self,
+          actions: @actions
+        )%>
       <% end %>
+
       <% if Avo.configuration.buttons_on_form_footers %>
         <%= render Avo::PanelComponent.new do |c| %>
           <% c.with_footer_tools do %>

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

@@ -3,11 +3,14 @@
 class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, record: nil, actions: [], view: "edit")
+  attr_reader :actions, :display_breadcrumbs
+
+  def initialize(resource: nil, record: nil, actions: [], view: "edit", display_breadcrumbs: true)
     @resource = resource
     @record = record
     @actions = actions
     @view = Avo::ViewInquirer.new(view)
+    @display_breadcrumbs = @reflection.blank? && display_breadcrumbs
   end
 
   def title
@@ -15,6 +18,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def back_path
+    return if via_belongs_to?
     return resource_view_path if via_resource?
     return resources_path if via_index?
 
@@ -45,12 +49,25 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     @resource.authorization.authorize_action @view, raise_exception: false
   end
 
+  def controls
+    @resource.render_edit_controls
+  end
+
+  # Render :show view for read only trix fields
+  def view_for(field)
+    field.is_a?(Avo::Fields::TrixField) && field.is_disabled? ? :show : view
+  end
+
   private
 
   def via_index?
     params[:via_view] == "index"
   end
 
+  def via_belongs_to?
+    params[:via_belongs_to_resource_class].present?
+  end
+
   def is_edit?
     view.in?(%w[edit update])
   end
@@ -76,9 +93,4 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
       )
     end
   end
-
-  # Render :show view for read only trix fields
-  def view_for(field)
-    field.is_a?(Avo::Fields::TrixField) && field.is_disabled? ? :show : view
-  end
 end

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

@@ -77,6 +77,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
     if @reflection.present?
       args = {
+        via_resource_class: @parent_resource.class,
         via_relation_class: reflection_model_class,
         via_record_id: @parent_record.to_param
       }

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

@@ -7,39 +7,20 @@
     selected_resources: [@resource.record.to_param],
     **@resource.stimulus_data_attributes
   } do %>
-  <%= render_cards_component %>
-  <%= render Avo::PanelComponent.new(name: title, description: @resource.description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-    <% c.with_tools do %>
-      <% @resource.render_show_controls.each do |control| %>
-        <%= render_control control %>
-      <% end %>
-    <% end %>
-    <% if main_panel.present? %>
-      <% c.with_body do %>
-        <%# the overflow helps with long values %>
-        <div class="divide-y overflow-auto">
-          <% main_panel.items.each_with_index do |field, index| %>
-            <%= render field
-              .hydrate(resource: @resource, record: @resource.record, user: @resource.user, view: view)
-              .component_for_view(view)
-              .new(field: field, resource: @resource, index: index, compact: sidebar.present?)
-            %>
-          <% end %>
-        </div>
-      <% end %>
-    <% end %>
-    <% if sidebar.present? %>
-      <% c.with_sidebar do %>
-        <%= render sidebar_component %>
-      <% end %>
-    <% end %>
-  <% end %>
-  <% if @reflection.blank? %>
-    <%= 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 %>
-      <% end %>
+  <%= content_tag :div, class: 'space-y-12' do %>
+    <%= render_cards_component %>
+    <% @resource.get_items.each_with_index do |item, index| %>
+      <%= render Avo::Items::SwitcherComponent.new(
+        resource: @resource,
+        reflection: @reflection,
+        item: item,
+        index: index + 1,
+        view: @view,
+        parent_resource: @parent_resource,
+        parent_record: @parent_record,
+        parent_component: self,
+        actions: @actions
+      )%>
     <% end %>
   <% end %>
   <% if should_display_invalid_fields_errors? %>

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

@@ -3,6 +3,8 @@
 class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   include Avo::ApplicationHelper
 
+  attr_reader :actions, :display_breadcrumbs
+
   def initialize(resource: nil, reflection: nil, parent_resource: nil, parent_record: nil, resource_panel: nil, actions: [])
     @resource = resource
     @reflection = reflection
@@ -11,6 +13,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     @parent_record = parent_record
     @parent_resource = parent_resource
     @view = Avo::ViewInquirer.new("show")
+    @display_breadcrumbs = reflection.blank?
   end
 
   def title
@@ -44,6 +47,14 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     helpers.edit_resource_path(record: @resource.record, resource: @resource, **args)
   end
 
+  def controls
+    @resource.render_show_controls
+  end
+
+  def view_for(field)
+    @view
+  end
+
   private
 
   # In development and test environments we should show the invalid field errors

data/app/controllers/avo/actions_controller.rb

@@ -10,13 +10,13 @@ module Avo
       request.params[:id].present?
     end
     before_action :set_action, only: [:show, :handle]
+    before_action :verify_authorization, only: [:show, :handle]
 
     def show
       # Se the view to :new so the default value gets prefilled
       @view = Avo::ViewInquirer.new("new")
 
       @resource.hydrate(record: @record, view: @view, user: _current_user, params: params)
-      @record = ActionModel.new @action.get_attributes_for_action
     end
 
     def handle
@@ -83,8 +83,6 @@ module Avo
       end
     end
 
-    private
-
     def get_messages(response)
       default_message = {
         type: :info,
@@ -126,9 +124,13 @@ module Avo
 
       respond_to do |format|
         format.turbo_stream do
-          render "keep_modal_open"
+          render partial: "avo/partials/flash_alerts"
         end
       end
     end
+
+    def verify_authorization
+      raise Avo::NotAuthorizedError.new unless @action.authorized?
+    end
   end
 end

data/app/controllers/avo/application_controller.rb

@@ -10,7 +10,6 @@ module Avo
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
     include Avo::Concerns::Breadcrumbs
-    include Pagy::Backend
 
     protect_from_forgery with: :exception
     around_action :set_avo_locale
@@ -130,7 +129,7 @@ module Avo
     end
 
     def set_record
-      @record = @resource.find_record(params[:id], query: model_find_scope, params: params)
+      @record = @resource.find_record(params[:id], query: model_scope, params: params)
       @resource.hydrate(record: @record)
     end
 
@@ -139,15 +138,11 @@ module Avo
       @related_record = if @field.is_a? Avo::Fields::HasOneField
         @record.send association_name
       else
-        @related_resource.find_record params[:related_id], query: eager_load_files(@related_resource, @record.send(association_name)), params: params
+        @related_resource.find_record params[:related_id], query: @record.send(association_name), params: params
       end
       @related_resource.hydrate(record: @related_record)
     end
 
-    def model_find_scope
-      eager_load_files(@resource, model_scope)
-    end
-
     def model_scope
       # abort @resource.inspect
       @resource.class.find_scope
@@ -203,32 +198,6 @@ module Avo
       @authorization.set_record(class_to_authorize).authorize_action action_to_authorize.to_sym
     end
 
-    def eager_load_files(resource, query)
-      # Get the non-computed file fields and try to eager load them
-      attachment_fields = resource
-        .attachment_fields
-        .reject do |field|
-          field.computed
-        end
-
-      if attachment_fields.present?
-        attachment_fields.map do |field|
-          attachment = case field.class.to_s
-          when "Avo::Fields::FileField"
-            "attachment"
-          when "Avo::Fields::FilesField"
-            "attachments"
-          else
-            "attachment"
-          end
-
-          return query.includes "#{field.id}_#{attachment}": :blob
-        end
-      end
-
-      query
-    end
-
     def _authenticate!
       instance_eval(&Avo.configuration.authenticate)
     end

data/app/controllers/avo/base_controller.rb

@@ -34,9 +34,6 @@ module Avo
         @query = @query.includes(*@resource.includes)
       end
 
-      # Eager load the active storage attachments
-      @query = eager_load_files(@resource, @query)
-
       # Sort the items
       if @index_params[:sort_by].present?
         unless @index_params[:sort_by].eql? :created_at
@@ -60,17 +57,9 @@ module Avo
         ).apply_query request, @query, filter_value
       end
 
-      extra_pagy_params = {}
-
-      # Reset open filters when a user navigates to a new page
-      extra_pagy_params[:keep_filters_panel_open] = if params[:keep_filters_panel_open] == "1"
-        "0"
-      end
-
       safe_call :set_and_apply_scopes
       safe_call :apply_dynamic_filters
-
-      @pagy, @records = pagy(pagy_query, items: @index_params[:per_page], link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"", size: [1, 2, 2, 1], params: extra_pagy_params)
+      apply_pagination
 
       # Create resources for each record
       @resources = @records.map do |record|
@@ -109,6 +98,11 @@ module Avo
       @record = @resource.model_class.new
       @resource = @resource.hydrate(record: @record, view: :new, user: _current_user)
 
+      # Handle special cases when creating a new record via a belongs_to relationship
+      if params[:via_belongs_to_resource_class].present?
+        return render turbo_stream: turbo_stream.append('attach_modal', partial: 'avo/base/new_via_belongs_to')
+      end
+
       set_actions
 
       @page_title = @resource.default_panel_name.to_s
@@ -134,7 +128,7 @@ module Avo
       @resource.hydrate(record: @record, view: :new, user: _current_user)
 
       # This means that the record has been created through another parent record and we need to attach it somehow.
-      if params[:via_record_id].present?
+      if params[:via_record_id].present? && params[:via_belongs_to_resource_class].nil?
         @reflection = @record._reflections[params[:via_relation]]
         # Figure out what kind of association does the record have with the parent record
 
@@ -433,15 +427,19 @@ module Avo
     end
 
     def create_success_action
+      return render "close_modal_and_reload_field" if params[:via_belongs_to_resource_class].present?
+
       respond_to do |format|
         format.html { redirect_to after_create_path, notice: create_success_message}
       end
     end
 
     def create_fail_action
+      flash.now[:error] = create_fail_message
+
       respond_to do |format|
-        flash.now[:error] = create_fail_message
         format.html { render :new, status: :unprocessable_entity }
+        format.turbo_stream { render "create_fail_action" }
       end
     end
 
@@ -456,7 +454,12 @@ module Avo
     def after_create_path
       # If this is an associated record return to the association show page
       if is_associated_record?
-        parent_resource = Avo.resource_manager.get_resource_by_model_class(params[:via_relation_class])
+        parent_resource = if params[:via_resource_class].present?
+          Avo.resource_manager.get_resource(params[:via_resource_class])
+        else
+          Avo.resource_manager.get_resource_by_model_class(params[:via_relation_class])
+        end
+
         association_name = BaseResource.valid_association_name(@record, params[:via_relation])
 
         return resource_view_path(
@@ -508,8 +511,10 @@ module Avo
     end
 
     def destroy_fail_action
+      flash[:error] = destroy_fail_message
+
       respond_to do |format|
-        format.html { redirect_back fallback_location: params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), error: destroy_fail_message }
+        format.turbo_stream { render partial: "avo/partials/flash_alerts" }
       end
     end
 
@@ -579,5 +584,9 @@ module Avo
         "That component was fetched from 'self.components' option inside '#{@resource.class}' resource."
       end
     end
+
+    def apply_pagination
+      @pagy, @records = @resource.apply_pagination(index_params: @index_params, query: pagy_query)
+    end
   end
 end