avo 2.43.0 → 3.0.2

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
+    @view = Avo::ViewInquirer.new("index")
     @query = query
+    @scopes = scopes
   end
 
   def title
@@ -73,8 +77,9 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
     if @reflection.present?
       args = {
+        via_resource_class: @parent_resource.class,
         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 +101,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 +122,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 +135,40 @@ 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_dynamic_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",
+        avo_filters_dynamic_filters_component_id_value: dynamic_filters_component_id
+      } 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 +188,34 @@ 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,
+      view: @parent_resource.view
     }
   end
+
+  def header_visible?
+    search_query_present? || filters_present? || has_many_view_types? || has_dynamic_filters?
+  end
+
+  def has_dynamic_filters?
+    Avo.avo_dynamic_filters_installed? && resource.has_filters?
+  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
+
+  # Generate a unique component id for the current component.
+  # This is used to identify the component in the DOM.
+  def dynamic_filters_component_id
+    @dynamic_filters_component_id ||= "dynamic_filters_component_id_#{SecureRandom.hex(3)}"
+  end
 end

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

@@ -2,186 +2,25 @@
   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.to_param],
     **@resource.stimulus_data_attributes
   } do %>
-  <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-    <% c.with_tools do %>
-      <% if @resource.has_show_controls? %>
-        <% @resource.render_show_controls.each do |control| %>
-          <% if control.back_button? %>
-            <%= a_link back_path,
-                style: :text,
-                title: control.title,
-                data: {
-                  tippy: control.title ? :tooltip : nil,
-                },
-                icon: 'arrow-left' do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif control.delete_button? %>
-            <% if can_see_the_destroy_button? %>
-              <%= a_link helpers.resource_path(model: @resource.model, resource: @resource),
-                style: :text,
-                color: :red,
-                icon: 'trash',
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                title: control.title,
-                data: {
-                  turbo_confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-                  turbo_method: :delete,
-                  control: :destroy,
-                  tippy: control.title ? :tooltip : nil,
-                  'resource-id': @resource.model.id,
-                } do %>
-                <%= control.label %>
-              <% end %>
-            <% end %>
-          <% elsif can_act_on? && control.actions_list? %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, include: control.include, style: control.style, color: control.color, label: control.label %>
-          <% elsif control.edit_button? %>
-            <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-              <%= a_link edit_path,
-                  color: :primary,
-                  style: :primary,
-                  title: control.title,
-                  data: {
-                    tippy: control.title ? :tooltip : nil,
-                  },
-                  icon: 'edit' do %>
-                <%= control.label %>
-              <% end %>
-            <% end %>
-          <% elsif control.action? %>
-            <% if render_action_control?(control.action) %>
-              <%= a_link control.path,
-                  color: control.color,
-                  style: control.style,
-                  icon: control.icon,
-                  title: control.title,
-                  data: {
-                    tippy: control.title ? :tooltip : nil,
-                    'turbo-frame': 'actions_show',
-                    'action': 'click->actions-picker#visitAction',
-                  } do %>
-                <%= control.label %>
-              <% end %>
-            <% end %>
-          <% elsif control.link_to? %>
-            <%= a_link control.path,
-                color: control.color,
-                style: control.style,
-                icon: control.icon,
-                title: control.title,
-                target: control.target,
-                class: control.class,
-                data: {
-                  **control.data,
-                  tippy: control.title ? :tooltip : nil,
-                } do %>
-              <%= control.label %>
-            <% end %>
-          <% elsif control.detach_button? %>
-            <% if @reflection.present? && @resource.model.present? && can_detach? %>
-              <%= a_button url: detach_path,
-                icon: 'detach',
-                method: :delete,
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                style: :text,
-                data: {
-                  confirm: "Are you sure you want to detach this #{title}."
-                } do %>
-                <%= control.label %>
-              <% end %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% else %>
-        <% if @reflection.present? && @resource.model.present? %>
-          <% if can_detach? %>
-            <%= a_button url: detach_path,
-                icon: 'detach',
-                method: :delete,
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                style: :text,
-                data: {
-                  confirm: "Are you sure you want to detach this #{title}."
-                } do %>
-              <%= t('avo.detach_item', item: title).humanize %>
-            <% end %>
-          <% end %>
-          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-          <% if can_see_the_edit_button? %>
-            <%= a_link edit_path,
-                color: :primary,
-                style: :primary,
-                icon: 'edit' do %>
-              <%= t('avo.edit').capitalize %>
-            <% end %>
-          <% end %>
-        <% else %>
-          <%= a_link back_path,
-            style: :text,
-            icon: 'arrow-left' do %>
-            <%= t('avo.go_back') %>
-          <% 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 @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-            <%= a_link edit_path,
-              color: :primary,
-              style: :primary,
-              icon: 'edit' do %>
-              <%= t('avo.edit').capitalize %>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% 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, model: @resource.model, 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

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
 class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
-  include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil, reflection: nil, parent_resource: nil, parent_model: nil, resource_panel: nil, actions: [])
+  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
     @resource_panel = resource_panel
     @actions = actions
-    @parent_model = parent_model
+    @parent_record = parent_record
     @parent_resource = parent_resource
-    @view = :show
+    @view = Avo::ViewInquirer.new("show")
+    @display_breadcrumbs = reflection.blank?
   end
 
   def title
@@ -26,7 +28,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
 
   def back_path
     if via_resource?
-      helpers.resource_path(model: association_resource.model_class, resource: association_resource, resource_id: params[:via_resource_id])
+      helpers.resource_path(record: association_resource.model_class, resource: association_resource, resource_id: params[:via_record_id])
     else
       helpers.resources_path(resource: @resource)
     end
@@ -38,20 +40,24 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
     if via_resource?
       args = {
         via_resource_class: params[:via_resource_class],
-        via_resource_id: params[:via_resource_id]
+        via_record_id: params[:via_record_id]
       }
     end
 
-    helpers.edit_resource_path(model: @resource.model, resource: @resource, **args)
+    helpers.edit_resource_path(record: @resource.record, resource: @resource, **args)
+  end
+
+  def controls
+    @resource.render_show_controls
   end
 
-  def render_action_control?(action)
-    can_act_on? && action.visible_in_view(parent_resource: @parent_resource)
+  def view_for(field)
+    @view
   end
 
   private
 
-  # In development and test environments we shoudl show the invalid field errors
+  # In development and test environments we should show the invalid field errors
   def should_display_invalid_fields_errors?
     (Rails.env.development? || Rails.env.test?) && @resource.invalid_fields.present?
   end

data/app/controllers/avo/actions_controller.rb

@@ -4,42 +4,30 @@ module Avo
   class ActionsController < ApplicationController
     before_action :set_resource_name
     before_action :set_resource
-    before_action :set_model, only: :show, if: ->(request) do
-      # Try to se the model only if the user is on the record page.
-      # set_model will fail if it's tried to be used from the Index page.
+    before_action :set_record, only: :show, if: ->(request) do
+      # Try to se the record only if the user is on the record page.
+      # set_record will fail if it's tried to be used from the Index page.
       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 = :new
+      @view = Avo::ViewInquirer.new("new")
 
-      @resource.hydrate(model: @model, view: @view, user: _current_user, params: params)
-      @model = ActionModel.new @action.get_attributes_for_action
+      @resource.hydrate(record: @record, view: @view, user: _current_user, params: params)
     end
 
     def handle
       resource_ids = action_params[:fields][:avo_resource_ids].split(",")
-      @selected_query = action_params[:fields][:avo_selected_query]
 
-      fields = action_params[:fields].except(:avo_resource_ids, :avo_selected_query)
-
-      args = {
-        fields: fields,
+      performed_action = @action.handle_action(
+        fields: action_params[:fields].except(:avo_resource_ids, :avo_selected_query),
         current_user: _current_user,
-        resource: resource
-      }
-
-      unless @action.standalone
-        args[:models] = if @selected_query.present?
-          @resource.model_class.find_by_sql decrypted_query
-        else
-          @resource.find_record resource_ids, params: params
-        end
-      end
-
-      performed_action = @action.handle_action(**args)
+        resource: resource,
+        query: decrypted_query || @resource.find_record(resource_ids, params: params)
+      )
 
       respond performed_action.response
     end
@@ -52,19 +40,17 @@ module Avo
 
     def set_action
       @action = action_class.new(
-        model: @model,
+        record: @record,
         resource: @resource,
         user: _current_user,
         view: :new, # force the action view to in order to render new-related fields (hidden field)
-        arguments: @resource.get_action_arguments(action_class)
+        arguments: decrypted_arguments || {}
       )
     end
 
     def action_class
-      klass_name = params[:action_id].gsub("avo_actions_", "").camelize
-
       Avo::BaseAction.descendants.find do |action|
-        action.to_s == klass_name
+        action.to_s == params[:action_id]
       end
     end
 
@@ -79,27 +65,24 @@ module Avo
       end
 
       respond_to do |format|
-        format.html do
+        format.turbo_stream do
           # Flash the messages collected from the action
           flash_messages messages
 
           if response[:type] == :redirect
-            path = response[:path]
-
-            if path.respond_to? :call
-              path = instance_eval(&path)
-            end
-
-            redirect_to path, **{allow_other_host: response[:allow_other_host], status: response[:status]}.compact
-          elsif response[:type] == :reload
+            render turbo_stream: turbo_stream.redirect_to(
+              Avo::ExecutionContext.new(target: response[:path]).handle,
+              nil,
+              response[:redirect_args][:turbo_frame],
+              **response[:redirect_args].except(:turbo_frame)
+            )
+          else
             redirect_back fallback_location: resources_path(resource: @resource)
           end
         end
       end
     end
 
-    private
-
     def get_messages(response)
       default_message = {
         type: :info,
@@ -115,9 +98,18 @@ module Avo
     end
 
     def decrypted_query
+      return if (encrypted_query = action_params[:fields][:avo_selected_query]).blank?
+
+      Avo::Services::EncryptionService.decrypt(message: encrypted_query, purpose: :select_all, serializer: Marshal)
+    end
+
+    def decrypted_arguments
+      arguments = params[:arguments] || params.dig(:fields, :arguments)
+      return if arguments.blank?
+
       Avo::Services::EncryptionService.decrypt(
-        message: @selected_query,
-        purpose: :select_all
+        message: Base64.decode64(arguments),
+        purpose: :action_arguments
       )
     end
 
@@ -136,5 +128,9 @@ module Avo
         end
       end
     end
+
+    def verify_authorization
+      raise Avo::NotAuthorizedError.new unless @action.authorized?
+    end
   end
 end