avo 3.0.0.pre12 → 3.0.0.pre15

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

@@ -2,30 +2,26 @@
 
 class Avo::Index::GridItemComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
+  include Avo::Fields::Concerns::HasHTMLAttributes
 
   attr_reader :parent_resource, :actions
 
   def initialize(resource: nil, reflection: nil, parent_record: nil, parent_resource: nil, actions: nil)
     @resource = resource
     @reflection = reflection
-    @grid_fields = resource.get_grid_fields
     @parent_record = parent_record
     @parent_resource = parent_resource
     @actions = actions
+    @card = Avo::ExecutionContext.new(target: resource.grid_view[:card], resource: resource, record: resource.record).handle
+    @whole_html = Avo::ExecutionContext.new(target: resource.grid_view[:html], resource: resource, record: resource.record).handle
   end
 
   private
 
-  def cover
-    @grid_fields.cover_field
-  end
-
-  def title
-    @grid_fields.title_field
-  end
+  def html(element, type)
+    return "" if @whole_html.nil? || (@html = @whole_html[element]).nil?
 
-  def body
-    @grid_fields.body_field
+    get_html(type, view: :index, element: :wrapper)
   end
 
   def resource_view_path
@@ -40,4 +36,34 @@ class Avo::Index::GridItemComponent < Avo::BaseComponent
 
     helpers.resource_view_path(record: @resource.record, resource: parent_or_child_resource, **args)
   end
+
+  def render_cover
+    return link_to_cover if @card[:cover_url].present?
+
+    link_to resource_view_path do
+      render Avo::Index::GridCoverEmptyStateComponent.new
+    end
+  end
+
+  def link_to_cover
+    classes = "absolute h-full w-full object-cover"
+
+    link_to image_tag(@card[:cover_url], class: classes), resource_view_path, class: classes, title: @card[:title]
+  end
+
+  def render_title
+    return if @card[:title].blank?
+
+    content_tag :div, class: "grid font-semibold leading-tight text-lg mb-2 #{html(:title, :classes)}", style: html(:title, :style) do
+      link_to @card[:title], resource_view_path
+    end
+  end
+
+  def render_body
+    return if @card[:body].blank?
+
+    content_tag :div, class: "text-sm break-words text-gray-500 #{html(:body, :classes)}", style: html(:body, :style) do
+      @card[:body]
+    end
+  end
 end

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

@@ -44,7 +44,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
       }
     end
 
-    helpers.resource_path(record: @resource.record, resource: parent_or_child_resource , **args)
+    helpers.resource_path(record: @resource.record, resource: parent_or_child_resource, **args)
   end
 
   def edit_path
@@ -73,7 +73,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     return @parent_resource if @parent_resource.present?
     return nil if @parent_record.blank?
 
-    ::Avo::App.resources.get_resource_by_model_class @parent_record.class
+    Avo.resource_manager.get_resource_by_model_class @parent_record.class
   end
 
   def is_has_many_association
@@ -81,11 +81,11 @@ 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? "AvoPro::Ordering"
+    return false unless Object.const_defined? "Avo::Pro::Ordering"
 
     return authorize_association_for(:reorder) if @reflection.present?
 
@@ -167,13 +167,13 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
         target: "control:detach",
         control: :detach,
         "resource-id": @resource.record.id,
-        "tippy": "tooltip",
+        tippy: :tooltip,
       }
   end
 
   def render_order_controls(control)
     if can_reorder?
-      render AvoPro::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type
+      render Avo::Pro::Ordering::ButtonsComponent.new resource: @resource, reflection: @reflection, view_type: @view_type
     end
   end
 

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

@@ -17,7 +17,7 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
 
   def encrypted_query
     # TODO: move this to the resource where we can apply the adapter pattern
-    serialized_query = if query.instance_of?(Ransack::Search)
+    serialized_query = if Module.const_defined?("Ransack::Search") && query.instance_of?(Ransack::Search)
       query.context.object.to_sql
     else
       return :select_all_disabled if query.nil? || !query.respond_to?(:all) || !query.all.respond_to?(:to_sql)

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

@@ -7,10 +7,7 @@
     <% c.with_body do %>
       <div class="divide-y">
         <% item.visible_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, form: form) %>
+          <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: field, index: index, view: @view, form: form %>
         <% end %>
       </div>
     <% end %>
@@ -19,4 +16,12 @@
   <%= 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 %>
+      <% item.visible_items.each_with_index do |field, index| %>
+        <%= render Avo::ItemSwitcherComponent.new resource: @resource, item: field, index: index, view: @view, form: form %>
+      <% end %>
+    <% end %>
+  <% end %>
 <% end %>

data/app/components/avo/item_switcher_component.rb

@@ -42,6 +42,7 @@ class Avo::ItemSwitcherComponent < Avo::BaseComponent
   end
 
   def field_component
-    item.component_for_view(@view).new(field: item.hydrate(resource: @resource, view: @view, record: @resource.record), resource: @resource, index: index, form: form)
+    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)
   end
 end

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

@@ -25,7 +25,7 @@
   <% end %>
   <% if body? %>
     <div data-target="panel-body" class="flex flex-col sm:flex-row space-y-4 sm:space-y-0 sm:gap-4 w-full">
-      <div class="relative flex-1 <% if sidebar? %> w-2/3 <% else %> w-full <% end %>">
+      <div class="relative flex-1 w-full <% if sidebar? %> sm:w-2/3 <% end %>">
         <% # The body is wrapped inside another div in order to avoid long & tall panels next to sidebars when the sidebar taller. %>
         <div class="relative <%= white_panel_classes %> <%= @body_classes %>">
           <%= body %>

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

@@ -1,3 +1,18 @@
-<%= link_to path, class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-primary-100 block px-4 py-1 w-full py-3 text-center rounded w-full", target: target, title: title do %>
-  <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
+<% if method.present? %>
+  <%= button_to path,
+    form_class: "flex-1 flex",
+    class: button_classes,
+    target: target,
+    title: title,
+    method: method,
+    params: params do %>
+    <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
+  <% end %>
+<% else %>
+  <%= link_to path,
+    class: button_classes,
+    target: target,
+    title: title do %>
+    <%= helpers.svg(icon, class: 'h-4 mr-1') if icon.present? %> <%= label %>
+  <% end %>
 <% end %>

data/app/components/avo/profile_item_component.rb

@@ -6,17 +6,29 @@ class Avo::ProfileItemComponent < ViewComponent::Base
   attr_reader :path
   attr_reader :active
   attr_reader :target
+  attr_reader :method
+  attr_reader :params
+  attr_reader :classes
 
-  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil)
+  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil, method: nil, params: {}, classes: "")
     @label = label
     @icon = icon
     @path = path
     @active = active
     @target = target
     @title = title
+    @method = method
+    @params = params
+    @classes = classes
   end
 
   def title
     @title || @label
   end
+
+  private
+
+  def button_classes
+    "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-gray-800 font-semibold hover:bg-primary-100 block px-4 py-1 w-full py-3 text-center rounded w-full"
+  end
 end

data/app/components/avo/resource_component.rb

@@ -102,7 +102,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def sidebar
-    return if Avo::App.license.lacks_with_trial(:resource_sidebar)
+    return if Avo.license.lacks_with_trial(:resource_sidebar)
 
     @sidebar ||= search_for_sidebar
   end
@@ -113,7 +113,8 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
   def has_reflection_and_is_read_only
     if @reflection.present? && @reflection.active_record.name && @reflection.name
-      fields = ::Avo::App.resources.get_resource_by_model_class(@reflection.active_record.name).get_field_definitions
+      resource = Avo.resource_manager.get_resource_by_model_class(@reflection.active_record.name).new(params: helpers.params, view: view, user: helpers._current_user)
+      fields = resource.get_field_definitions
       filtered_fields = fields.filter { |f| f.id == @reflection.name }
     else
       return false
@@ -165,6 +166,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
       resource: @resource,
       view: @view,
       exclude: actions_list.exclude,
+      include: actions_list.include,
       style: actions_list.style,
       color: actions_list.color,
       label: actions_list.label,
@@ -286,7 +288,8 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def render_action(action)
-    return unless can_see_the_actions_button?
+    return if !can_see_the_actions_button?
+    return if !action.action.visible_in_view(parent_resource: @parent_resource)
 
     a_link action.path,
       color: action.color,

data/app/components/avo/resource_sidebar_component.rb

@@ -16,6 +16,6 @@ class Avo::ResourceSidebarComponent < ViewComponent::Base
   end
 
   def render?
-    Avo::App.license.has_with_trial(:resource_sidebar)
+    Avo.license.has_with_trial(:resource_sidebar)
   end
 end

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

@@ -0,0 +1,3 @@
+<div class="flex flex-col sm:flex-row min-h-14 grow shrink-0" data-component="<%= self.class %>">
+  <%= body %>
+</div>

data/app/components/avo/row_component.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Avo::RowComponent < ViewComponent::Base
+  attr_reader :classes
+
+  renders_one :body
+
+  def initialize(classes: nil, data: {})
+    @classes = classes
+    @data = data
+  end
+end

data/app/components/avo/sidebar/link_component.html.erb

@@ -1,5 +1,6 @@
 <% if path.present? %>
   <%= send link_method, path, class: classes, active: active, target: target, data: data do %>
+    <%= helpers.svg icon, class: "h-4 text-gray-700" if icon.present? %>
     <%= label %>
     <% if target == :_blank %>
       <%= helpers.svg('heroicons/outline/external-link', class: 'self-center ml-auto h-3 mr-2') %>
@@ -7,6 +8,7 @@
   <% end %>
 <% else %>
   <%= content_tag :div, class: classes, active: active, target: target, data: data do %>
+    <%= helpers.svg icon, class: "h-4 text-gray-700" if icon.present? %>
     <%= label %>
   <% end %>
 <% end %>

data/app/components/avo/sidebar/link_component.rb

@@ -6,18 +6,20 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   attr_reader :label
   attr_reader :path
   attr_reader :data
+  attr_reader :icon
 
-  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {})
+  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {}, icon: nil)
     @label = label
     @path = path
     @active = active
     @target = target
     @data = data
+    @icon = icon
   end
 
   def is_external?
     # If the path contains the scheme, check if it includes the root path or not
-    return !path.include?(Avo::App.mount_path) if URI(path).scheme.present?
+    return !path.include?(Avo.mount_path) if URI(path).scheme.present?
 
     false
   end
@@ -28,6 +30,6 @@ class Avo::Sidebar::LinkComponent < ViewComponent::Base
   end
 
   def classes
-    "px-4 pr-0 flex-1 flex mx-6 leading-none py-2 text-black rounded font-medium hover:bg-gray-100"
+    "px-4 pr-0 flex-1 flex mx-6 leading-none py-2 text-black rounded font-medium hover:bg-gray-100 gap-1"
   end
 end

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

@@ -13,8 +13,8 @@
       <div class="space-y-6 mb-4">
         <%= render Avo::Sidebar::LinkComponent.new label: 'Get started', path: helpers.avo.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil? %>
 
-        <% if Avo.plugin_manager.installed?(:avo_menu) && Avo::App.has_main_menu? %>
-          <% Avo::App.main_menu.items.each do |item| %>
+        <% if Avo.plugin_manager.installed?("avo-menu") && Avo.has_main_menu? %>
+          <% Avo.main_menu.items.each do |item| %>
             <%= render Avo::Sidebar::ItemSwitcherComponent.new item: item %>
           <% end %>
         <% else %>
@@ -60,7 +60,7 @@
     <% if Rails.env.development? %>
       <div class="p-4 border-t group">
         <%= link_to helpers.avo.avo_private_status_path, class: "block px-4 py-2 border rounded flex justify-between items-center w-full text-black text-sm" do %>
-          <span>Avo Status</span> <span><div class="rounded-full w-4 h-4 <%= Avo::App.instance.app_status ? "bg-green-400" : "bg-orange-400" %>"></div></span>
+          <span>Avo Status</span> <span><div class="rounded-full w-4 h-4 <%= Avo.app_status ? "bg-green-400" : "bg-orange-400" %>"></div></span>
         <% end %>
         <div class="absolute text-xs text-gray-700 group-hover:block hidden text-center w-full -ml-4">👆Visible only in development👆</div>
       </div>

data/app/components/avo/sidebar_component.rb

@@ -7,17 +7,17 @@ class Avo::SidebarComponent < ViewComponent::Base
   end
 
   def dashboards
-    return [] unless defined?(AvoDashboards)
+    return [] unless defined?(Avo::Dashboards)
 
-    AvoDashboards.dashboard_manager.dashboards_for_navigation
+    Avo::Dashboards.dashboard_manager.dashboards_for_navigation
   end
 
   def resources
-    Avo::Current.app.resource_manager.resources_for_navigation helpers._current_user
+    Avo.resource_manager.resources_for_navigation helpers._current_user
   end
 
   def tools
-    Avo::App.tools.tools_for_navigation
+    Avo.tool_manager.tools_for_navigation
   end
 
   def stimulus_target

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

@@ -16,32 +16,32 @@
       <% end %>
     </div>
   </div>
-  <% if can_destroy_user? %>
-    <div class="relative" data-controller="toggle">
-      <a class="flex items-center h-full cursor-pointer" data-control="profile-dots" data-action="click->toggle#togglePanel">
-        <%= helpers.svg 'three-dots', class: 'h-4' %>
-      </a>
-      <div
-        class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full z-40"
-        data-toggle-target="panel"
-        data-transition-enter="transition ease-out duration-100"
-        data-transition-enter-start="transform opacity-0 translate-y-1"
-        data-transition-enter-end="transform opacity-100 translate-y-0"
-        data-transition-leave="transition ease-in duration-75"
-        data-transition-leave-start="transform opacity-100 translate-y-0"
-        data-transition-leave-end="transform opacity-0 translate-y-1"
-      >
-        <% if Avo.plugin_manager.installed?(:avo_menu) && Avo::App.has_profile_menu? %>
-          <div class="text-black space-y-4">
-            <% Avo::App.profile_menu.items.each do |item| %>
-              <% if item.is_a? AvoMenu::Link %>
-                <%= render Avo::ProfileItemComponent.new label: item.name, path: item.path, icon: item.icon %>
-              <% end %>
+  <div class="relative" data-controller="toggle">
+    <a class="flex items-center h-full cursor-pointer" data-control="profile-dots" data-action="click->toggle#togglePanel">
+      <%= helpers.svg 'three-dots', class: 'h-4' %>
+    </a>
+    <div
+      class="hidden absolute flex flex-col inset-auto right-0 -mt-12 bg-white rounded min-w-[200px] shadow-context -translate-y-full z-40"
+      data-toggle-target="panel"
+      data-transition-enter="transition ease-out duration-100"
+      data-transition-enter-start="transform opacity-0 translate-y-1"
+      data-transition-enter-end="transform opacity-100 translate-y-0"
+      data-transition-leave="transition ease-in duration-75"
+      data-transition-leave-start="transform opacity-100 translate-y-0"
+      data-transition-leave-end="transform opacity-0 translate-y-1"
+    >
+      <% if Avo.plugin_manager.installed?("avo-menu") && Avo.has_profile_menu? %>
+        <div class="text-black space-y-4">
+          <% Avo.profile_menu.items.each do |item| %>
+            <% if item.is_a? Avo::Menu::Link %>
+              <%= render Avo::ProfileItemComponent.new label: item.name, path: item.path, icon: item.icon, method: item.method, params: item.params %>
             <% end %>
-          </div>
-        <% end %>
-        <%# Example link below %>
-        <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
+          <% end %>
+        </div>
+      <% end %>
+      <%# Example link below %>
+      <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
+      <% if can_destroy_user? %>
         <%= button_to helpers.main_app.send(destroy_user_session_path),
           form: { "data-turbo" => "false" },
           method: :delete,
@@ -52,7 +52,7 @@
           form_class: 'flex-1' do %>
           <%= helpers.svg 'logout', class: 'h-4 mr-1' %> <%= t('avo.sign_out') %>
         <% end %>
-      </div>
+    <% end %>
     </div>
-  <% end %>
+  </div>
 </div>

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

@@ -79,6 +79,6 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
 
   # Render :show view for read only trix fields
   def view_for(field)
-    (field.is_a? Avo::Fields::TrixField) && field.is_disabled? ? :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

@@ -34,7 +34,7 @@
             </div>
           </div>
           <% if Avo.avo_filters_installed? && resource.has_filters? %>
-            <%= render AvoFilters::FiltersComponent.new resource: resource, turbo_frame: turbo_frame %>
+            <%= render Avo::DynamicFilters::FiltersComponent.new resource: resource, turbo_frame: turbo_frame %>
           <% end %>
         </div>
       </div>

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

@@ -100,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
@@ -126,7 +126,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
   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
@@ -143,7 +143,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def render_dynamic_filters_button
     return unless Avo.avo_filters_installed?
     return unless resource.has_filters?
-    return if AvoFilters.configuration.always_expanded
+    return if Avo::DynamicFilters.configuration.always_expanded
 
     a_button size: :sm,
       color: :primary,
@@ -152,12 +152,12 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
         controller: "avo-filters",
         action: "click->avo-filters#toggleFiltersArea",
       } do
-      AvoFilters.configuration.button_label
+      Avo::DynamicFilters.configuration.button_label
     end
   end
 
   def scopes_list
-    AvoPro::Scopes::ListComponent.new(
+    Avo::Pro::Scopes::ListComponent.new(
       scopes: scopes,
       resource: resource,
       turbo_frame: turbo_frame,
@@ -166,7 +166,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def can_render_scopes?
-    defined?(AvoPro)
+    defined?(Avo::Pro)
   end
 
   private
@@ -191,11 +191,11 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def header_visible?
-    search_query_present? || filters_present? || has_many_view_types? || (Avo.avo_filters_installed? && resource.has_filters? && AvoFilters.configuration.always_expanded)
+    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.search_query.present?
+    @resource.class.search_query.present?
   end
 
   def filters_present?

data/app/controllers/avo/actions_controller.rb

@@ -31,12 +31,10 @@ module Avo
         resource: resource
       }
 
-      unless @action.standalone
-        args[:records] = if @selected_query.present?
-          @resource.model_class.find_by_sql decrypted_query
-        else
-          @resource.find_record resource_ids, params: params
-        end
+      args[:records] = if @selected_query.present?
+        @resource.model_class.find_by_sql decrypted_query
+      else
+        @resource.find_record resource_ids, params: params
       end
 
       performed_action = @action.handle_action(**args)
@@ -47,7 +45,7 @@ module Avo
     private
 
     def action_params
-      params.permit(:authenticity_token, :resource_name, :action_id, fields: {})
+      params.permit(:authenticity_token, :resource_name, :action_id, :button, fields: {})
     end
 
     def set_action
@@ -56,7 +54,7 @@ module Avo
         resource: @resource,
         user: _current_user,
         view: @view,
-        arguments: @resource.get_action_arguments(action_class)
+        arguments: decrypted_arguments || {}
       )
     end
 
@@ -113,6 +111,16 @@ module Avo
       )
     end
 
+    def decrypted_arguments
+      arguments = params[:arguments] || params.dig(:fields, :arguments)
+      return if arguments.blank?
+
+      Avo::Services::EncryptionService.decrypt(
+        message: Base64.decode64(arguments),
+        purpose: :action_arguments
+      )
+    end
+
     def flash_messages(messages)
       messages.each do |message|
         flash[message[:type]] = message[:body]