avo 3.0.0.beta1 → 3.0.0.pre1

data/app/components/avo/resource_component.rb

@@ -20,14 +20,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def can_detach?
-    return false if @reflection.blank? || @resource.record.blank? || !authorize_association_for(:detach)
-
-    # If the inverse_of is a belongs_to, we need to check if it's optional in order to know if we can detach it.
-    if inverse_of.is_a?(ActiveRecord::Reflection::BelongsToReflection)
-      inverse_of.options[:optional]
-    else
-      true
-    end
+    authorize_association_for(:detach)
   end
 
   def detach_path
@@ -109,7 +102,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def sidebar
-    return if Avo.license.lacks_with_trial(:resource_sidebar)
+    return if Avo::App.license.lacks_with_trial(:resource_sidebar)
 
     @sidebar ||= search_for_sidebar
   end
@@ -120,15 +113,14 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
   def has_reflection_and_is_read_only
     if @reflection.present? && @reflection.active_record.name && @reflection.name
-      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
+      fields = ::Avo::App.resources.get_resource_by_model_class(@reflection.active_record.name).get_field_definitions
       filtered_fields = fields.filter { |f| f.id == @reflection.name }
     else
       return false
     end
 
     if filtered_fields.present?
-      filtered_fields.find { |f| f.id == @reflection.name }.is_disabled?
+      filtered_fields.find { |f| f.id == @reflection.name }.readonly
     else
       false
     end
@@ -173,7 +165,6 @@ 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,
@@ -244,7 +235,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
       data: {
         confirm: "Are you sure you want to detach this #{title}."
       } do
-      control.label || t("avo.detach_item", item: title).humanize
+      control.label || t("avo.detach_item", item: title).capitalize
     end
   end
 
@@ -254,6 +245,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
     a_link create_path,
       color: :primary,
       style: :primary,
+      target: "_top",
       icon: "heroicons/outline/plus",
       data: {
         target: :create
@@ -277,62 +269,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
     end
   end
 
-  def render_link_to(link)
-    a_link link.path,
-      color: link.color,
-      style: link.style,
-      icon: link.icon,
-      icon_class: link.icon_class,
-      title: link.title, target: link.target,
-      class: link.classes,
-      size: link.size,
-      data: {
-        **link.data,
-        tippy: link.title ? :tooltip : nil,
-      } do
-      link.label
-    end
-  end
-
-  def render_action(action)
-    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,
-      style: action.style,
-      icon: action.icon,
-      icon_class: action.icon_class,
-      title: action.title,
-      size: action.size,
-      data: {
-        turbo_frame: "actions_show",
-        action_name: action.action.action_name,
-        tippy: action.title ? :tooltip : nil,
-        action: "click->actions-picker#visitAction",
-      } do
-      action.label
-    end
-  end
-
   def is_a_related_resource?
     @reflection.present? && @resource.record.present?
   end
-
-  def inverse_of
-    current_reflection = @reflection.active_record.reflect_on_all_associations.find do |reflection|
-      reflection.name == @reflection.name.to_sym
-    end
-
-    inverse_of = current_reflection.inverse_of
-
-    if inverse_of.blank? && Rails.env.development?
-      puts "WARNING! Avo uses the 'inverse_of' option to determine the inverse association and figure out if the association permit or not detaching."
-      # Ex: Please configure the 'inverse_of' option for the ':users' association on the 'Project' model.
-      puts "Please configure the 'inverse_of' option for the '#{current_reflection.macro} :#{current_reflection.name}' association on the '#{current_reflection.active_record.name}' model."
-      puts "Otherwise the detach button will be visible by default.\n\n"
-    end
-
-    inverse_of
-  end
 end

data/app/components/avo/resource_sidebar_component.rb

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

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

@@ -1,6 +1,5 @@
 <% 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') %>
@@ -8,7 +7,6 @@
   <% 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,20 +6,18 @@ 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: {}, icon: nil)
+  def initialize(label: nil, path: nil, active: :inclusive, target: nil, data: {})
     @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.mount_path) if URI(path).scheme.present?
+    return !path.include?(Avo::App.mount_path) if URI(path).scheme.present?
 
     false
   end
@@ -30,6 +28,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 gap-1"
+    "px-4 pr-0 flex-1 flex mx-6 leading-none py-2 text-black rounded font-medium hover:bg-gray-100"
   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.has_main_menu? %>
-          <% Avo.main_menu.items.each do |item| %>
+        <% if Avo.plugin_manager.installed?(:avo_menu) && Avo::App.has_main_menu? %>
+          <% Avo::App.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_status ? "bg-green-400" : "bg-orange-400" %>"></div></span>
+          <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>
         <% 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 Avo.plugin_manager.installed?("avo-dashboards")
+    return [] unless defined?(AvoDashboards)
 
-    Avo::Dashboards.dashboard_manager.dashboards_for_navigation
+    AvoDashboards.dashboard_manager.dashboards_for_navigation
   end
 
   def resources
-    Avo.resource_manager.resources_for_navigation helpers._current_user
+    Avo::Current.app.resource_manager.resources_for_navigation helpers._current_user
   end
 
   def tools
-    Avo.tool_manager.tools_for_navigation
+    Avo::App.tools.tools_for_navigation
   end
 
   def stimulus_target

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

@@ -16,32 +16,32 @@
       <% end %>
     </div>
   </div>
-  <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 %>
+  <% 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 %>
             <% end %>
-          <% end %>
-        </div>
-      <% end %>
-      <%# Example link below %>
-      <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
-      <% if can_destroy_user? %>
+          </div>
+        <% end %>
+        <%# Example link below %>
+        <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
         <%= 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 %>
-    <% end %>
+      </div>
     </div>
-  </div>
+  <% end %>
 </div>

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

@@ -18,8 +18,8 @@
     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 %>
+      <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+        <% c.tools do %>
           <% @resource.render_edit_controls.each do |control| %>
             <%= render_control control %>
           <% end %>
@@ -27,7 +27,7 @@
         <%# 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 %>
+          <% c.body do %>
             <div class="divide-y">
               <% main_panel.items.each_with_index do |field, index| %>
                 <%= render field
@@ -40,12 +40,12 @@
           <% end %>
         <% end %>
         <% if sidebar.present? %>
-          <% c.with_sidebar do %>
+          <% c.sidebar do %>
             <%= render sidebar_component form: form %>
           <% end %>
         <% end %>
         <% if Avo.configuration.buttons_on_form_footers %>
-          <% c.with_footer_tools do %>
+          <% c.footer_tools do %>
             <div class="mt-4">
               <%= a_link back_path,
               style: :text,

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_readonly? ? :show : view
   end
 end

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

@@ -6,22 +6,22 @@
     **@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 %>
+    <% c.tools do %>
       <% @resource.render_index_controls(item: singular_resource_name.downcase).each do |control| %>
         <%= render_control control %>
       <% end %>
     <% end %>
-    <% c.with_body do %>
+    <% c.body do %>
       <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 flex-col py-4 gap-4">
+          <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 <%= '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 %>
+              <% if hide_search_input %>
                 <%# Offset for the space-y-2 property when the search is missing %>
                 <div class="-mb-2"></div>
+              <% else %>
+                <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key, via_reflection: via_reflection} %>
               <% end %>
             </div>
 
@@ -34,7 +34,7 @@
             </div>
           </div>
           <% if Avo.avo_filters_installed? && resource.has_filters? %>
-            <%= render Avo::DynamicFilters::FiltersComponent.new resource: resource, turbo_frame: turbo_frame %>
+            <%= render AvoFilters::FiltersComponent.new resource: resource %>
           <% end %>
         </div>
       </div>
@@ -48,17 +48,8 @@
         <% end %>
       <% end %>
     <% end %>
-    <% c.with_bare_content do %>
-     <% if view_type.to_sym == :map %>
-        <% if @resources.present? %>
-          <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 %>
-      <% if view_type.to_sym == :table || view_type.to_sym == :map %>
+    <% c.bare_content do %>
+      <% if view_type.to_sym == :table %>
         <% 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_record: parent_record, discreet_pagination: field&.discreet_pagination %>

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

@@ -89,6 +89,10 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
         args[:via_relation] = @reflection.name
       end
 
+      if @reflection.parent_reflection.present? && @reflection.parent_reflection.inverse_of.present?
+        args[:via_relation] = @reflection.parent_reflection.inverse_of.name
+      end
+
       if @reflection.inverse_of.present?
         args[:via_relation] = @reflection.inverse_of.name
       end
@@ -100,7 +104,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def attach_path
     current_path = CGI.unescape(request.env["PATH_INFO"]).split("/").select(&:present?)
 
-    Avo.root_path(paths: [*current_path, "new"])
+    Avo::App.root_path(paths: [*current_path, "new"])
   end
 
   def singular_resource_name
@@ -121,29 +125,19 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
       return
     end
 
-    @resource.description
-  end
-
-  def show_search_input
-    return false unless authorized_to_search?
-    return false unless resource.class.search_query.present?
-    return false if field&.hide_search_input
-
-    true
+    @resource.resource_description
   end
 
-  def authorized_to_search?
-    # Hide the search if the authorization prevents it
-    return true unless resource.authorization.respond_to?(:has_action_method?)
-    return true unless resource.authorization.has_action_method?("search")
+  def hide_search_input
+    return true unless @resource.search_query.present?
 
-    resource.authorization.authorize_action("search", raise_exception: false)
+    field&.hide_search_input || 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
+    return if AvoFilters.configuration.always_expanded
 
     a_button size: :sm,
       color: :primary,
@@ -152,21 +146,21 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
         controller: "avo-filters",
         action: "click->avo-filters#toggleFiltersArea",
       } do
-      Avo::DynamicFilters.configuration.button_label
+      AvoFilters.configuration.button_label
     end
   end
 
   def scopes_list
-    Avo::Pro::Scopes::ListComponent.new(
+    AvoPro::Scopes::ListComponent.new(
       scopes: scopes,
       resource: resource,
       turbo_frame: turbo_frame,
-      parent_record: parent_record
+      parent_record: parent_record,
     )
   end
 
   def can_render_scopes?
-    defined?(Avo::Pro)
+    defined?(AvoPro)
   end
 
   private
@@ -191,11 +185,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? && Avo::DynamicFilters.configuration.always_expanded)
+    search_query_present? || filters_present? || has_many_view_types? || (Avo.avo_filters_installed? && resource.has_filters? && AvoFilters.configuration.always_expanded)
   end
 
   def search_query_present?
-    @resource.class.search_query.present?
+    @resource.search_query.present?
   end
 
   def filters_present?

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

@@ -7,14 +7,14 @@
     selected_resources: [@resource.record.id],
     **@resource.stimulus_data_attributes
   } 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 %>
+  <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
+    <% c.tools do %>
       <% @resource.render_show_controls.each do |control| %>
         <%= render_control control %>
       <% end %>
     <% end %>
     <% if main_panel.present? %>
-      <% c.with_body do %>
+      <% c.body do %>
         <%# the overflow helps with long values %>
         <div class="divide-y overflow-auto">
           <% main_panel.items.each_with_index do |field, index| %>
@@ -28,7 +28,7 @@
       <% end %>
     <% end %>
     <% if sidebar.present? %>
-      <% c.with_sidebar do %>
+      <% c.sidebar do %>
         <%= render sidebar_component %>
       <% end %>
     <% end %>

data/app/controllers/avo/actions_controller.rb

@@ -31,10 +31,12 @@ module Avo
         resource: resource
       }
 
-      args[:records] = if @selected_query.present?
-        @resource.model_class.find_by_sql decrypted_query
-      else
-        @resource.find_record resource_ids, params: params
+      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)
@@ -45,7 +47,7 @@ module Avo
     private
 
     def action_params
-      params.permit(:authenticity_token, :resource_name, :action_id, :button, fields: {})
+      params.permit(:authenticity_token, :resource_name, :action_id, fields: {})
     end
 
     def set_action
@@ -53,14 +55,17 @@ module Avo
         record: @record,
         resource: @resource,
         user: _current_user,
-        view: :new, # force the action view to in order to render new-related fields (hidden field)
-        arguments: decrypted_arguments || {}
+        view: @view,
+        arguments: @resource.get_action_arguments(action_class)
       )
     end
 
     def action_class
+      klass_name = params[:action_id].gsub("avo_actions_", "").camelize
+      klass_name = "Avo::Actions::#{klass_name}"
+
       Avo::BaseAction.descendants.find do |action|
-        action.to_s == params[:action_id]
+        action.to_s == klass_name
       end
     end
 
@@ -80,8 +85,13 @@ module Avo
           flash_messages messages
 
           if response[:type] == :redirect
-            redirect_to Avo::ExecutionContext.new(target: response[:path]).handle,
-              **{allow_other_host: response[:allow_other_host], status: response[:status]}.compact
+            path = response[:path]
+
+            if path.respond_to? :call
+              path = instance_eval(&path)
+            end
+
+            redirect_to path
           elsif response[:type] == :reload
             redirect_back fallback_location: resources_path(resource: @resource)
           end
@@ -112,16 +122,6 @@ 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]