avo 2.49.0 → 3.0.0.beta1

data/app/components/avo/tab_switcher_component.rb

@@ -9,27 +9,26 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
   attr_reader :current_tab
   attr_reader :tabs
   attr_reader :view
-  attr_reader :style
 
   delegate :white_panel_classes, to: :helpers
 
-  def initialize(resource:, group:, current_tab:, active_tab_name:, view:, style:)
+  def initialize(resource:, group:, current_tab:, active_tab_name:, view:)
     @active_tab_name = active_tab_name
     @resource = resource
     @group = group
     @current_tab = current_tab
     @tabs = group.items
     @view = view
-    @style = style
   end
 
+  #TOD: helper to record:
   def tab_path(tab)
     if is_edit?
-      helpers.edit_resource_path(resource: @resource, model: @resource.model, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
+      helpers.edit_resource_path(resource: @resource, record: @resource.record, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
     elsif is_new?
       helpers.new_resource_path(resource: @resource, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
     else
-      helpers.resource_path(resource: @resource, model: @resource.model, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
+      helpers.resource_path(resource: @resource, record: @resource.record, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
     end
   end
 
@@ -54,38 +53,4 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent
       tab.name.to_s == active_tab_name.to_s
     end
   end
-
-  # Goes through all items and removes the ones that are not supposed to be visible.
-  # Example below:
-  # tabs do
-  #   field :comments, as: :has_many
-  # end
-  # Because the developer hasn't specified that it should be visible on edit views (with the show_on: :edit option),
-  # the field should not be visible in the item switcher either.
-  def visible_items
-    tabs.select do |tab|
-      next false if tab.items.blank?
-      next false if tab.is_field? && !tab.authorized?
-      next false if tab.has_a_single_item? && !single_item_visible?(tab.items.first)
-      next false if !tab.visible?
-      next false if !tab.visible_on?(view)
-
-      true
-    end
-  end
-
-  private
-
-  def single_item_visible?(item)
-    # Item is visible if is not a field or don't have its own panel
-    return true if !item.is_field?
-    return true if !item.has_own_panel?
-
-    return false if !item.visible_on?(view)
-
-    # If item is hydrated with the correct resource and is not authorized, it's not visible
-    return false if item.resource.present? && !item.authorized?
-
-    true
-  end
 end

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

@@ -1,11 +1,10 @@
 <%= content_tag :div,
-  id: helpers.frame_id(@resource),
   data: {
     model_name: @resource.model_name.to_s,
     resource_name: @resource.class.to_s,
-    model_id: @resource.model.id,
+    record_id: @resource.record.id,
     selected_resources_name: @resource.model_key,
-    selected_resources: [@resource.model.id],
+    selected_resources: [@resource.record.id],
     **@resource.stimulus_data_attributes
   } do %>
   <%= form_with model: @resource.record,
@@ -19,43 +18,10 @@
     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.resource_description,
-                                         display_breadcrumbs: display_breadcrumbs?,
-                                         index: 0, data: { panel_id: "main" }) do |c| %>
+      <%= 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 %>
-          <% if back_path.present? %>
-            <%= a_link back_path,
-              style: :text,
-              icon: 'arrow-left' do %>
-              <%= t('avo.cancel').capitalize %>
-            <% end %>
-          <% end %>
-          <% if can_see_the_destroy_button? %>
-            <%= a_link destroy_path,
-              style: :text,
-              color: :red,
-              icon: 'trash',
-              form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-              data: {
-                turbo_confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-                turbo_method: :delete,
-                control: :destroy,
-                'resource-id': @resource.model.id,
-              } do %>
-              <%= t('avo.delete').capitalize %>
-            <% end %>
-          <% end %>
-          <% if can_act_on? %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-          <% end %>
-          <% if can_see_the_save_button? %>
-            <%= a_button color: :primary,
-            style: :primary,
-            loading: true,
-            type: :submit,
-            icon: 'save' do %>
-              <%= t('avo.save').capitalize %>
-            <% end %>
+          <% @resource.render_edit_controls.each do |control| %>
+            <%= render_control control %>
           <% end %>
         <% end %>
         <%# Extract the main panel and display the fields here. %>
@@ -65,7 +31,7 @@
             <div class="divide-y">
               <% main_panel.items.each_with_index do |field, index| %>
                 <%= render field
-                  .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: view_for(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?)
                 %>
@@ -73,7 +39,7 @@
             </div>
           <% end %>
         <% end %>
-        <% if sidebar.present? && sidebar.visible_items.present? %>
+        <% if sidebar.present? %>
           <% c.with_sidebar do %>
             <%= render sidebar_component form: form %>
           <% end %>
@@ -81,12 +47,10 @@
         <% if Avo.configuration.buttons_on_form_footers %>
           <% c.with_footer_tools do %>
             <div class="mt-4">
-              <% if back_path.present? %>
-                <%= a_link back_path,
-                style: :text,
-                icon: 'arrow-left' do %>
-                  <%= t('avo.cancel').capitalize %>
-                <% end %>
+              <%= a_link back_path,
+              style: :text,
+              icon: 'arrow-left' do %>
+                <%= t('avo.cancel').capitalize %>
               <% end %>
               <% if can_see_the_save_button? %>
                 <%= a_button color: :primary,
@@ -104,7 +68,7 @@
       <%= 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 %>
+          <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: item, index: index + 1, view: view, form: form %>
         <% end %>
       <% end %>
     <% end %>

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

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
 class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
-  include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, model: nil, actions: [], view: :edit, display_breadcrumbs: true)
+  def initialize(resource: nil, record: nil, actions: [], view: :edit)
     @resource = resource
-    @model = model
+    @record = record
     @actions = actions
     @view = view
-    @display_breadcrumbs = display_breadcrumbs
   end
 
   def title
@@ -17,12 +15,11 @@ 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?
 
     if is_edit? && Avo.configuration.resource_default_view == :show # via resource show or edit page
-      return helpers.resource_path(model: @resource.model, resource: @resource)
+      return helpers.resource_path(record: @resource.record, resource: @resource)
     end
 
     resources_path
@@ -33,7 +30,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   end
 
   def resource_view_path
-    helpers.resource_view_path(model: association_resource.model, resource: association_resource)
+    helpers.resource_view_path(record: association_resource.record, resource: association_resource)
   end
 
   def can_see_the_destroy_button?
@@ -48,20 +45,12 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     @resource.authorization.authorize_action @view, raise_exception: false
   end
 
-  def display_breadcrumbs?
-    @reflection.blank? && @display_breadcrumbs
-  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?([:edit, :update])
   end
@@ -75,7 +64,7 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   def form_url
     if is_edit?
       helpers.resource_path(
-        model: @resource.model,
+        record: @resource.record,
         resource: @resource
       )
     else
@@ -83,13 +72,13 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
         resource: @resource,
         via_relation_class: params[:via_relation_class],
         via_relation: params[:via_relation],
-        via_resource_id: params[:via_resource_id]
+        via_record_id: params[:via_record_id]
       )
     end
   end
 
   # Render :show view for read only trix fields
   def view_for(field)
-    (field.is_a?(Avo::Fields::TrixField) && field.is_readonly?) ? :show : view
+    field.is_a?(Avo::Fields::TrixField) && field.is_disabled? ? :show : view
   end
 end

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

@@ -1,82 +1,76 @@
 <%= content_tag :div,
   data: {
+    component_name: self.class.to_s.underscore,
     model_name: @resource.model_name.to_s,
     resource_name: @resource.class.to_s,
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
     <% c.with_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).humanize %>
-        <% end %>
-      <% end %>
-      <% if can_act_on? %>
-        <%= 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.humanize(capitalize: false) ) %>
-        <% end %>
+      <% @resource.render_index_controls(item: singular_resource_name.downcase).each do |control| %>
+        <%= render_control control %>
       <% end %>
     <% end %>
     <% c.with_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 %>">
-        <% if show_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 %>
-        <% 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, parent_model: @parent_model %>
-            <%= 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 class="flex flex-col">
+        <%= render scopes_list if can_render_scopes? %>
+        <div class="flex flex-col">
+          <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' unless header_visible? %>">
+            <div class="flex items-center px-4 w-64">
+              <% if show_search_input %>
+                <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key, via_reflection: via_reflection} %>
+              <% else %>
+                <%# Offset for the space-y-2 property when the search is missing %>
+                <div class="-mb-2"></div>
+              <% end %>
+            </div>
+
+            <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
+              <%= render_dynamic_filters_button %>
+
+              <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource, applied_filters: @applied_filters, parent_record: parent_record %>
+
+              <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: turbo_frame } %>
+            </div>
           </div>
-        <% end %>
+          <% if Avo.avo_filters_installed? && resource.has_filters? %>
+            <%= render Avo::DynamicFilters::FiltersComponent.new resource: resource, turbo_frame: turbo_frame %>
+          <% end %>
+        </div>
       </div>
-      <% if view_type.to_sym == :map %>
+      <% if view_type.to_sym == :table %>
         <% if @resources.present? %>
-          <div>
-            <%= render(Avo::Index::ResourceMapComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
+          <div class="w-full relative flex-1 flex mt-0">
+            <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: parent_record, parent_resource: parent_resource, pagy: @pagy, query: query, actions: actions)) %>
           </div>
         <% else %>
           <%= helpers.empty_state by_association: params[:related_name].present?, view_type: view_type, add_background: true %>
         <% end %>
       <% end %>
-      <% if view_type.to_sym == :table %>
+    <% end %>
+    <% c.with_bare_content do %>
+     <% if view_type.to_sym == :map %>
         <% if @resources.present? %>
-          <div class="w-full relative flex-1 flex mt-0">
-            <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
+          <div>
+            <%= render(Avo::Index::ResourceMapComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
           </div>
         <% else %>
           <%= helpers.empty_state by_association: params[:related_name].present?, view_type: view_type, add_background: true %>
         <% end %>
       <% end %>
-    <% end %>
-    <% c.with_bare_content do %>
       <% if view_type.to_sym == :table || view_type.to_sym == :map %>
-        <% if @models.present? %>
+        <% if @records.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 %>
+            <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_record: parent_record, discreet_pagination: field&.discreet_pagination %>
           </div>
         <% end %>
       <% end %>
       <% if view_type.to_sym == :grid %>
-        <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource) %>
+        <div id="records_panel">
+          <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: parent_record, parent_resource: parent_resource, actions: actions) %>
+        </div>
         <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 %>
+          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_record: parent_record, discreet_pagination: field&.discreet_pagination %>
         </div>
       <% end %>
     <% end %>

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

@@ -4,35 +4,39 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
+  attr_reader :scopes, :query, :turbo_frame, :parent_record, :parent_resource, :resource, :actions
+
   def initialize(
     resource: nil,
     resources: nil,
-    models: [],
+    records: [],
     pagy: nil,
     index_params: {},
     filters: [],
     actions: [],
     reflection: nil,
     turbo_frame: "",
-    parent_model: nil,
+    parent_record: nil,
     parent_resource: nil,
     applied_filters: [],
-    query: nil
+    query: nil,
+    scopes: nil
   )
     @resource = resource
     @resources = resources
-    @models = models
+    @records = records
     @pagy = pagy
     @index_params = index_params
     @filters = filters
     @actions = actions
     @reflection = reflection
     @turbo_frame = turbo_frame
-    @parent_model = parent_model
+    @parent_record = parent_record
     @parent_resource = parent_resource
     @applied_filters = applied_filters
     @view = :index
     @query = query
+    @scopes = scopes
   end
 
   def title
@@ -74,7 +78,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     if @reflection.present?
       args = {
         via_relation_class: reflection_model_class,
-        via_resource_id: @parent_model.to_param
+        via_record_id: @parent_record.to_param
       }
 
       if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
@@ -96,7 +100,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def attach_path
     current_path = CGI.unescape(request.env["PATH_INFO"]).split("/").select(&:present?)
 
-    Avo::App.root_path(paths: [*current_path, "new"])
+    Avo.root_path(paths: [*current_path, "new"])
   end
 
   def singular_resource_name
@@ -117,12 +121,12 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
       return
     end
 
-    @resource.resource_description
+    @resource.description
   end
 
   def show_search_input
     return false unless authorized_to_search?
-    return false unless @resource.search_query.present?
+    return false unless resource.class.search_query.present?
     return false if field&.hide_search_input
 
     true
@@ -130,9 +134,39 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
   def authorized_to_search?
     # Hide the search if the authorization prevents it
-    return true unless @resource.authorization.has_action_method?("search")
+    return true unless resource.authorization.respond_to?(:has_action_method?)
+    return true unless resource.authorization.has_action_method?("search")
+
+    resource.authorization.authorize_action("search", raise_exception: false)
+  end
+
+  def render_dynamic_filters_button
+    return unless Avo.avo_filters_installed?
+    return unless resource.has_filters?
+    return if Avo::DynamicFilters.configuration.always_expanded
+
+    a_button size: :sm,
+      color: :primary,
+      icon: "filter",
+      data: {
+        controller: "avo-filters",
+        action: "click->avo-filters#toggleFiltersArea",
+      } do
+      Avo::DynamicFilters.configuration.button_label
+    end
+  end
+
+  def scopes_list
+    Avo::Pro::Scopes::ListComponent.new(
+      scopes: scopes,
+      resource: resource,
+      turbo_frame: turbo_frame,
+      parent_record: parent_record
+    )
+  end
 
-    @resource.authorization.authorize_action("search", raise_exception: false)
+  def can_render_scopes?
+    defined?(Avo::Pro)
   end
 
   private
@@ -152,7 +186,23 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
       association: "has_many",
       association_id: @reflection.name,
       class: reflection_model_class,
-      id: @parent_model.to_param
+      id: @parent_record.to_param
     }
   end
+
+  def header_visible?
+    search_query_present? || filters_present? || has_many_view_types? || (Avo.avo_filters_installed? && resource.has_filters? && Avo::DynamicFilters.configuration.always_expanded)
+  end
+
+  def search_query_present?
+    @resource.class.search_query.present?
+  end
+
+  def filters_present?
+    @filters.present?
+  end
+
+  def has_many_view_types?
+    available_view_types.count > 1
+  end
 end