avo 2.43.0 → 3.0.2

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

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
-  def initialize(resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, view_type: :table)
+  include Avo::ApplicationHelper
+
+  def initialize(resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, view_type: :table, actions: nil)
     @resource = resource
     @reflection = reflection
-    @parent_model = parent_model
+    @parent_record = parent_record
     @parent_resource = parent_resource
     @view_type = view_type
+    @actions = actions
   end
 
   def can_detach?
@@ -20,7 +23,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def can_view?
-    return false if Avo.configuration.resource_default_view == :edit
+    return false if Avo.configuration.resource_default_view.edit?
 
     return authorize_association_for(:show) if @reflection.present?
 
@@ -28,37 +31,31 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     @resource.authorization.authorize_action(:show, raise_exception: false)
   end
 
-  def can_reorder?
-    return authorize_association_for(:reorder) if @reflection.present?
-
-    @resource.authorization.authorize_action(:reorder, raise_exception: false)
-  end
-
   def show_path
     args = {}
 
-    if @parent_model.present?
+    if @parent_record.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.to_param
+        via_record_id: @parent_record.to_param
       }
     end
 
-    helpers.resource_path(model: @resource.model, resource: parent_or_child_resource , **args)
+    helpers.resource_path(record: @resource.record, resource: parent_or_child_resource, **args)
   end
 
   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"}
 
-    if @parent_model.present?
+    if @parent_record.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.to_param
+        via_record_id: @parent_record.to_param
       }
     end
 
-    helpers.edit_resource_path(model: @resource.model, resource: parent_or_child_resource, **args)
+    helpers.edit_resource_path(record: @resource.record, resource: parent_or_child_resource, **args)
   end
 
   def singular_resource_name
@@ -71,9 +68,9 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
 
   def parent_resource
     return @parent_resource if @parent_resource.present?
-    return nil if @parent_model.blank?
+    return nil if @parent_record.blank?
 
-    ::Avo::App.get_resource_by_model_name @parent_model.class
+    Avo.resource_manager.get_resource_by_model_class @parent_record.class
   end
 
   def is_has_many_association?
@@ -81,6 +78,116 @@ 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.root_path(paths: ["resources", params[:resource_name], params[:id], params[:related_name]], query: request.query_parameters.to_h)
+  end
+
+  def can_reorder?
+    return false unless Object.const_defined? "Avo::Pro::Ordering"
+
+    return authorize_association_for(:reorder) if @reflection.present?
+
+    @resource.authorization.authorize_action(:reorder, raise_exception: false)
+  end
+
+  private
+
+  def render_edit_button(control)
+    return unless can_edit?
+
+    link_to helpers.svg("edit", class: svg_classes),
+      edit_path,
+      class: "flex items-center",
+      title: control.title,
+      data: {
+        target: "control:edit",
+        control: :edit,
+        "resource-id": @resource.record.id,
+        tippy: "tooltip",
+      }
+  end
+
+  def render_show_button(control)
+    return unless can_view?
+
+    link_to helpers.svg("eye", class: svg_classes),
+      show_path,
+      class: "flex items-center",
+      title: control.title,
+      data: {
+        target: "control:view",
+        control: :show,
+        tippy: "tooltip",
+      }
+  end
+
+  def render_delete_button(control)
+    # If the resource is a related resource, we use the can_delete? policy method because it uses
+    # authorize_association_for(:destroy).
+    # Otherwise we use the can_see_the_destroy_button? policy method becuse it do no check for assiciation
+    # only for authorize_action .
+    policy_method = is_a_related_resource? ? :can_delete? : :can_see_the_destroy_button?
+    return unless send policy_method
+
+    a_button url: helpers.resource_path(record: @resource.record, resource: @resource),
+      style: :icon,
+      color: :gray,
+      icon: "trash",
+      form_class: "flex flex-col sm:flex-row sm:inline-flex",
+      title: control.title,
+      method: :delete,
+      params: hidden_params,
+      data: {
+        turbo_frame: params[:turbo_frame],
+        turbo_confirm: control.confirmation_message,
+        turbo_method: :delete,
+        target: "control:destroy",
+        control: :destroy,
+        tippy: control.title ? :tooltip : nil,
+        "resource-id": @resource.record.id,
+      }
+  end
+
+  def render_detach_button(control)
+    return unless can_detach?
+
+    a_button url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.record.id),
+      style: :icon,
+      color: :gray,
+      icon: "detach",
+      form_class: "flex items-center",
+      title: control.title,
+      method: :delete,
+      params: hidden_params,
+      data: {
+        turbo_frame: params[:turbo_frame],
+        turbo_confirm: control.confirmation_message,
+        target: "control:detach",
+        control: :detach,
+        "resource-id": @resource.record.id,
+        tippy: :tooltip,
+      }
+  end
+
+  def render_order_controls(control)
+    if can_reorder?
+      render Avo::Pro::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type
+    end
+  end
+
+  def svg_classes
+    "text-gray-600 h-6 hover:text-gray-600"
+  end
+
+  def hidden_params
+    hidden = {}
+
+    hidden[:view_type] = params[:view_type] if params[:view_type]
+
+    if params[:turbo_frame]
+      hidden[:turbo_frame] = params[:turbo_frame]
+      hidden[:referrer] = referrer_path
+    end
+
+    hidden
   end
 end

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

@@ -1,14 +1,16 @@
 <% if @resources.present?%>
   <div class="w-full grid grid-cols-1 xs:grid-cols-2 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6 mt-8"
+  data-component-name="<%= self.class.to_s.underscore %>"
   data-selected-resources-name="<%= @resource.model_key %>" data-selected-resources="[]">
     <% @resources.each_with_index do |resource, index| %>
-      <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model) do %>
-        <%= render(Avo::Index::GridItemComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
+      <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_record) do %>
+        <%= render(Avo::Index::GridItemComponent.new(resource: resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, actions: actions)) %>
       <% end %>
     <% end %>
   </div>
 <% else %>
-  <div class="bg-white rounded shadow-panel">
+  <div class="bg-white rounded shadow-panel"
+    data-component-name="<%= self.class.to_s.underscore %>">
     <%= helpers.empty_state by_association: params[:related_name].present?, view_type: :grid %>
   </div>
 <% end %>

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

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

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

@@ -5,7 +5,7 @@
     </div>
     <% if render_table? %>
       <div class="overflow-auto <%= table_component_order_class %>">
-        <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
+        <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
       </div>
     <% end %>
   </div>

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

@@ -7,12 +7,12 @@ module Avo
     class ResourceMapComponent < ViewComponent::Base
       attr_reader :resources
 
-      def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, pagy: nil, query: nil)
+      def initialize(resources: nil, resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, pagy: nil, query: nil)
         super
         @resources = resources
         @resource = resource
         @reflection = reflection
-        @parent_model = parent_model
+        @parent_record = parent_record
         @parent_resource = parent_resource
         @pagy = pagy
         @query = query
@@ -66,7 +66,7 @@ module Avo
 
         resources
           .map do |resource|
-            Avo::Hosts::ResourceRecordHost.new(block: marker_proc, resource: resource, record: resource.record).handle
+            Avo::ExecutionContext.new(target: marker_proc, record: resource.record).handle
           end
           .compact
           .filter do |coordinates|

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

@@ -1,4 +1,5 @@
 <div class="w-full relative overflow-auto mac-styled-scrollbar"
+  data-component-name="<%= self.class.to_s.underscore %>"
   data-controller="item-select-all"
   data-resource-name="<%= @resource.model_key %>"
   data-item-select-all-selected-all-value="false"
@@ -11,7 +12,7 @@
     <div class="absolute z-30 w-full ml-10 pt-px hidden" data-item-select-all-target="selectAllOverlay">
       <div class="bg-white flex items-center h-9 mt-0.5">
         <div class="mt-1.5" data-item-select-all-target="unselectedMessage">
-          <%= t "avo.x_records_selected_from_a_total_of_x_html", selected: pagy.in, count: pagy.count %>
+          <%= selected_page_label %>
           <%= a_link request.url,
             size: :xs,
             color: :primary,
@@ -22,7 +23,7 @@
           <% end %>
         </div>
         <div class="mt-1.5" data-item-select-all-target="selectedMessage" class="hidden">
-          <%= t "avo.x_records_selected_from_all_pages_html", count: pagy.count %>
+          <%= selected_all_label %>
           <%= a_link request.url,
             size: :xs,
             color: :primary,
@@ -39,8 +40,8 @@
     <%= 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 %>
-          <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource) %>
+        <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_record), expires_in: 1.day do %>
+          <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, actions: @actions) %>
         <% end %>
       <% end %>
     </tbody>

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

@@ -4,22 +4,39 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
   include Avo::ApplicationHelper
   attr_reader :pagy, :query
 
-  def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, pagy: nil, query: nil)
+  def initialize(resources: nil, resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, pagy: nil, query: nil, actions: nil)
     @resources = resources
     @resource = resource
     @reflection = reflection
-    @parent_model = parent_model
+    @parent_record = parent_record
     @parent_resource = parent_resource
     @pagy = pagy
     @query = query
+    @actions = actions
   end
 
   def encrypted_query
-    return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)
+    # TODO: move this to the resource where we can apply the adapter pattern
+    if Module.const_defined?("Ransack::Search") && query.instance_of?(Ransack::Search)
+      @query = @query.result
+    end
 
-    Avo::Services::EncryptionService.encrypt(
-      message: query.all.to_sql,
-      purpose: :select_all
-    )
+    Avo::Services::EncryptionService.encrypt(message: @query, purpose: :select_all, serializer: Marshal)
+  end
+
+  def selected_page_label
+    if @resource.pagination_type.countless?
+      t "avo.x_records_selected_from_page_html", selected: pagy.in
+    else
+      t "avo.x_records_selected_from_a_total_of_x_html", selected: pagy.in, count: pagy.count
+    end
+  end
+
+  def selected_all_label
+    if @resource.pagination_type.countless?
+      t "avo.records_selected_from_all_pages_html"
+    else
+      t "avo.x_records_selected_from_all_pages_html", count: pagy.count
+    end
   end
 end

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

@@ -1,28 +1,32 @@
+<%# hover:z-[21] removed from tr class to solve flickering actions component on row controls and z-20 changed to z-21%>
 <tr
-  class="bg-white hover:bg-gray-50 hover:shadow-row hover:z-[21] relative z-20 border-b"
+  class="bg-white hover:bg-gray-50 hover:shadow-row relative z-21 border-b"
+  data-component-name="<%= self.class.to_s.underscore %>"
   <%== item_selector_init @resource %>
+  data-resource-name="<%= @resource.class.to_s %>"
+  data-record-id="<%= @resource.record.id %>"
 >
   <% if @resource.record_selector %>
     <td class="w-10">
       <div class="flex justify-center h-full">
-        <%== item_selector_input floating: false %>
+        <%= item_selector_input floating: false %>
       </div>
     </td>
   <% end %>
   <% if Avo.configuration.resource_controls_on_the_left? %>
     <td class="text-right whitespace-nowrap px-2" data-control="resource-controls">
       <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, parent_resource: @parent_resource, view_type: :table)) %>
+        <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, view_type: :table, actions: @actions)) %>
       </div>
     </td>
   <% end %>
   <% @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, reflection: @reflection, index: index, parent_model: @parent_model, parent_resource: @parent_resource) %>
+    <%= render field.component_for_view(:index).new(field: field, resource: @resource, reflection: @reflection, index: index, parent_record: @parent_record, parent_resource: @parent_resource) %>
   <% end %>
   <% if Avo.configuration.resource_controls_on_the_right? %>
     <td class="text-right whitespace-nowrap px-2" data-control="resource-controls">
       <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, parent_resource: @parent_resource, view_type: :table)) %>
+        <%= render(Avo::Index::ResourceControlsComponent.new(resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, view_type: :table, actions: @actions)) %>
       </div>
     </td>
   <% end %>

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

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

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

@@ -0,0 +1,25 @@
+<%= render Avo::PanelComponent.new(**args) do |c| %>
+  <% if @is_main_panel %>
+    <% c.with_tools do %>
+      <% controls.each do |control| %>
+        <%= render_control control %>
+      <% end %>
+    <% end %>
+  <% end %>
+   <% c.with_body do %>
+    <% content_tag :div, class: "divide-y overflow-auto" do %>
+      <%= render Avo::Items::VisibleItemsComponent.new resource: @resource, item: @item, view: @view, form: @form %>
+    <% end %>
+  <% end %>
+   <% if sidebars.any? { |sidebar| sidebar.visible_items.any? } %>
+    <% c.with_sidebar do %>
+      <div class="justify-between space-y-4">
+        <% sidebars.each_with_index do |sidebar, index| %>
+          <div class="<%= helpers.white_panel_classes if sidebar.panel_wrapper? %>">
+            <%= render Avo::ResourceSidebarComponent.new resource: @resource, sidebar: sidebar, params: params, view: view, form: @form, index: index %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/avo/items/panel_component.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class Avo::Items::PanelComponent < Avo::ResourceComponent
+  include Avo::ApplicationHelper
+
+  def initialize(form:, item:, is_main_panel:, resource:, view:, actions: nil, index: nil, parent_component: nil, parent_record: nil, parent_resource: nil, reflection: nil)
+    @actions = actions
+    @form = form
+    @index = index
+    @is_main_panel = is_main_panel
+    @item = item
+    @parent_component = parent_component
+    @parent_record = parent_record
+    @parent_resource = parent_resource
+    @reflection = reflection
+    @resource = resource
+    @view = view
+  end
+
+  delegate :controls,
+    :title,
+    :back_path,
+    :edit_path,
+    :can_see_the_destroy_button?,
+    :can_see_the_save_button?,
+    :view_for,
+    :display_breadcrumbs,
+    to: :@parent_component
+
+  def args
+    if @is_main_panel
+      {
+        name: title,
+        description: @resource.description,
+        display_breadcrumbs: display_breadcrumbs,
+        index: 0,
+        data: {panel_id: "main"}
+      }
+    else
+      {name: @item.name, description: @item.description, index: @index}
+    end
+  end
+end

data/app/components/avo/items/switcher_component.html.erb

@@ -0,0 +1,17 @@
+<% if item.is_panel? || item.is_main_panel? %>
+  <%= render panel_component %>
+<% elsif item.is_tool? %>
+  <% if item&.partial.present? %>
+    <%= render item.partial, tool: item, form: @form %>
+  <% end %>
+<% elsif item.is_tab_group? %>
+  <%= render tab_group_component %>
+<% elsif item.is_field? %>
+  <%= render field_component %>
+<% elsif item.is_row? %>
+  <%= render Avo::RowComponent.new do |c| %>
+    <% c.with_body do %>
+      <%= render Avo::Items::VisibleItemsComponent.new resource: @resource, item: @item, view: @view, form: @form %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/components/avo/items/switcher_component.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+class Avo::Items::SwitcherComponent < Avo::BaseComponent
+  include Turbo::FramesHelper
+
+  attr_reader :resource
+  attr_reader :reflection
+  attr_reader :index
+  attr_reader :item
+  attr_reader :view
+
+  def initialize(
+    resource: nil,
+    reflection: nil,
+    item: nil,
+    index: nil,
+    view: nil,
+    form: nil,
+    parent_resource: nil,
+    parent_record: nil,
+    parent_component: nil,
+    actions: nil,
+    field_component_extra_args: {}
+  )
+    @resource = resource
+    @reflection = reflection
+    @form = form
+    @index = index
+    @item = item
+    @view = view
+    @parent_resource = parent_resource
+    @parent_record = parent_record
+    @parent_component = parent_component
+    @actions = actions
+    @field_component_extra_args = field_component_extra_args
+  end
+
+  def form
+    @form || nil
+  end
+
+  def render?
+    # Stops rendering if the field should be hidden in reflections
+    if item.is_field?
+      return false if in_reflection? && item.hidden_in_reflection?
+    end
+
+    true
+  end
+
+  def in_reflection?
+    @reflection.present?
+  end
+
+  def tab_group_component
+    Avo::TabGroupComponent.new resource: @resource, group: item.hydrate(view: view), index: index, params: params, form: form, view: view
+  end
+
+  def field_component
+    final_item = item.dup.hydrate(resource: @resource, record: @resource.record, user: resource.user, view: view)
+    final_item.component_for_view(@view).new(field: final_item, resource: @resource, index: index, form: form, **@field_component_extra_args)
+  end
+
+  def panel_component
+    Avo::Items::PanelComponent.new(
+      actions: @actions,
+      form: form,
+      index: index,
+      is_main_panel: item.is_main_panel?,
+      item: item.hydrate(view: view),
+      parent_component: @parent_component,
+      parent_record: @parent_record,
+      parent_resource: @parent_resource,
+      reflection: @reflection,
+      resource: @resource,
+      view: view
+    )
+  end
+end

data/app/components/avo/items/visible_items_component.html.erb

@@ -0,0 +1,10 @@
+<% @item.visible_items.each_with_index do |field, index| %>
+  <%= render Avo::Items::SwitcherComponent.new(
+    resource: @resource,
+    item: field,
+    index: index,
+    view: @view,
+    form: @form,
+    field_component_extra_args: @field_component_extra_args,
+  )%>
+<% end %>

data/app/components/avo/items/visible_items_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Avo::Items::VisibleItemsComponent < ViewComponent::Base
+  def initialize(resource:, item:, view:, form:, field_component_extra_args: {})
+    @resource = resource
+    @item = item
+    @view = view
+    @form = form
+    @field_component_extra_args = field_component_extra_args
+  end
+end

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

@@ -3,17 +3,16 @@
   data-modal-target="modal"
 >
   <div aria-expanded="true" class="modal-overlay absolute w-full h-full bg-opacity-25 bg-gray-800 flex justify-center items-center" data-action="click->modal#close"></div>
-  <div aria-expanded="true" role="dialog" aria-modal="true" class="modal-body rounded-lg inset-auto bg-white flex z-50 relative shadow-modal overflow-auto  <%= width_classes %> <%= height_classes %>">
+  <div aria-expanded="true" role="dialog" aria-modal="true" class="modal-body rounded-lg inset-auto bg-white flex z-50 relative shadow-modal overflow-auto <%= width_classes %> <%= height_classes %>">
     <div class="flex-1 flex flex-col justify-between">
       <div>
         <% if heading? %>
-          <div class="p-6 text-2xl tracking-normal font-semibold text-black">
+          <div class="p-6 pb-0 text-2xl tracking-normal font-semibold text-black">
             <%= heading %>
           </div>
         <% end %>
-
         <% if content? %>
-          <div class="px-6 text-base text-gray-500 <%= body_class %>">
+          <div class="p-6 text-base text-gray-500">
             <%= content %>
           </div>
         <% end %>