avo 2.46.0 → 3.0.0.pre1

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

@@ -1,18 +1,3 @@
-<% 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 %>
+<%= 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 %>
 <% end %>

data/app/components/avo/profile_item_component.rb

@@ -6,29 +6,17 @@ 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, method: nil, params: {}, classes: "")
+  def initialize(label: nil, icon: nil, path: nil, active: :inclusive, target: nil, title: nil)
     @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/referrer_params_component.html.erb

@@ -1,7 +1,4 @@
-<%# via_association_type is used in has_one create actions %>
-<%= hidden_field_tag :via_association_type, params[:via_association_type] if params[:via_association_type] %>
 <%= hidden_field_tag :via_resource_class, params[:via_resource_class] if params[:via_resource_class] %>
-<%= hidden_field_tag :via_resource_id, params[:via_resource_id] if params[:via_resource_id] %>
+<%= hidden_field_tag :via_record_id, params[:via_record_id] if params[:via_record_id] %>
 <%= hidden_field_tag :via_relation, params[:via_relation] if params[:via_relation] %>
-<%= hidden_field_tag :via_belongs_to_resource_class, params[:via_belongs_to_resource_class] if params[:via_belongs_to_resource_class] %>
 <%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>

data/app/components/avo/resource_component.rb

@@ -20,20 +20,13 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def can_detach?
-    return false if @reflection.blank? || @resource.model.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
     return "/" if @reflection.blank?
 
-    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.to_param)
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.record.to_param)
   end
 
   def can_see_the_edit_button?
@@ -44,7 +37,9 @@ class Avo::ResourceComponent < Avo::BaseComponent
     @resource.authorization.authorize_action(:destroy, raise_exception: false)
   end
 
-  def can_act_on?
+  def can_see_the_actions_button?
+    return false if @actions.blank?
+
     return authorize_association_for(:act_on) if @reflection.present?
 
     @resource.authorization.authorize_action(:act_on, raise_exception: false) && !has_reflection_and_is_read_only
@@ -52,9 +47,9 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
   def destroy_path
     if params[:via_resource_class].present?
-      helpers.resource_path(model: @resource.model, resource: @resource, referrer: back_path)
+      helpers.resource_path(record: @resource.record, resource: @resource, referrer: back_path)
     else
-      helpers.resource_path(model: @resource.model, resource: @resource)
+      helpers.resource_path(record: @resource.record, resource: @resource)
     end
   end
 
@@ -65,9 +60,9 @@ class Avo::ResourceComponent < Avo::BaseComponent
     if @reflection.present?
       # Fetch the appropiate resource
       reflection_resource = field.resource
-      # Fetch the model
-      # Hydrate the resource with the model if we have one
-      reflection_resource.hydrate(model: @parent_model) if @parent_model.present?
+      # Fetch the record
+      # Hydrate the resource with the record if we have one
+      reflection_resource.hydrate(record: @parent_record) if @parent_record.present?
       # Use the related_name as the base of the association
       association_name = @reflection.name
 
@@ -80,16 +75,17 @@ class Avo::ResourceComponent < Avo::BaseComponent
         if service.has_method?(method_name, raise_exception: false)
           # Some policy methods should get the parent record in order to have the necessarry information to do the authorization
           # Example: Post->has_many->Comments
+          #
           # When you want to authorize the creation/attaching of a Comment, you don't have the Comment instance.
           # But you do have the Post instance and you can get that in your policy to authorize against.
           parent_policy_methods = [:view, :create, :attach, :act_on]
 
           record = if parent_policy_methods.include?(policy_method)
             # Use the parent record (Post)
-            reflection_resource.model
+            reflection_resource.record
           else
             # Override the record with the child record (Comment)
-            resource.model
+            resource.record
           end
           policy_result = service.authorize_action(method_name, record: record, raise_exception: false)
         end
@@ -117,23 +113,27 @@ class Avo::ResourceComponent < Avo::BaseComponent
 
   def has_reflection_and_is_read_only
     if @reflection.present? && @reflection.active_record.name && @reflection.name
-      fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).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_readonly?
+      filtered_fields.find { |f| f.id == @reflection.name }.readonly
     else
       false
     end
   end
 
+  def render_control(control)
+    send "render_#{control.type}", control
+  end
+
   private
 
   def via_resource?
-    (params[:via_resource_class].present? || params[:via_relation_class].present?) && params[:via_resource_id].present?
+    (params[:via_resource_class].present? || params[:via_relation_class].present?) && params[:via_record_id].present?
   end
 
   def search_for_sidebar
@@ -144,20 +144,132 @@ class Avo::ResourceComponent < Avo::BaseComponent
     item&.hydrate(view: view)
   end
 
-  def inverse_of
-    current_reflection = @reflection.active_record.reflect_on_all_associations.find do |reflection|
-      reflection.name == @reflection.name.to_sym
+  def render_back_button(control)
+    return if is_a_related_resource?
+
+    tippy = control.title ? :tooltip : nil
+    a_link back_path,
+      style: :text,
+      title: control.title,
+      data: {tippy: tippy},
+      icon: "arrow-left" do
+      control.label
+    end
+  end
+
+  def render_actions_list(actions_list)
+    return unless can_see_the_actions_button?
+
+    render Avo::ActionsComponent.new(
+      actions: @actions,
+      resource: @resource,
+      view: @view,
+      exclude: actions_list.exclude,
+      style: actions_list.style,
+      color: actions_list.color,
+      label: actions_list.label,
+      size: actions_list.size,
+      as_row_control: instance_of?(Avo::Index::ResourceControlsComponent)
+    )
+  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_link destroy_path,
+      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.record.model_name.name.downcase),
+        turbo_method: :delete,
+        target: "control:destroy",
+        control: :destroy,
+        tippy: control.title ? :tooltip : nil,
+        "resource-id": @resource.record.id,
+      } do
+      control.label
     end
+  end
 
-    inverse_of = current_reflection.inverse_of
+  def render_save_button(control)
+    return unless can_see_the_save_button?
 
-    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"
+    a_button color: :primary,
+      style: :primary,
+      loading: true,
+      type: :submit,
+      icon: "save" do
+      control.label
     end
+  end
+
+  def render_edit_button(control)
+    return unless can_see_the_edit_button?
+
+    a_link edit_path,
+      color: :primary,
+      style: :primary,
+      title: control.title,
+      data: {tippy: control.title ? :tooltip : nil},
+      icon: "edit" do
+      control.label
+    end
+  end
+
+  def render_detach_button(control)
+    return unless is_a_related_resource? && 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 || t("avo.detach_item", item: title).capitalize
+    end
+  end
+
+  def render_create_button(control)
+    return unless can_see_the_create_button?
+
+    a_link create_path,
+      color: :primary,
+      style: :primary,
+      target: "_top",
+      icon: "heroicons/outline/plus",
+      data: {
+        target: :create
+      } do
+      control.label
+    end
+  end
+
+  def render_attach_button(control)
+    return unless can_attach?
+
+    a_link attach_path,
+      icon: "heroicons/outline/link",
+      color: :primary,
+      style: :text,
+      data: {
+        turbo_frame: :attach_modal,
+        target: :attach
+      } do
+      control.label
+    end
+  end
 
-    inverse_of
+  def is_a_related_resource?
+    @reflection.present? && @resource.record.present?
   end
 end

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

@@ -1,9 +1,13 @@
-<div class="resource-sidebar-component divide-y">
+<div class="resource-sidebar-component divide-y"
+  data-component-name="<%= self.class.to_s.underscore%>"
+  data-resource-name="<%= @resource.class.to_s %>"
+  data-record-id="<%= @resource.record.id %>"
+>
   <% fields.each_with_index do |field, index| %>
     <%= render field
       .hydrate(
         resource: resource,
-        model: resource.model,
+        record: resource.record,
         user: resource.user,
         view: view
       ).component_for_view(view)

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::App.root_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,7 +13,7 @@
       <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::App.has_main_menu? %>
+        <% 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 %>
@@ -57,7 +57,14 @@
         <%= render partial: "/avo/partials/sidebar_extra" %>
       </div>
     </div>
-    <%= helpers.render_license_warnings unless Rails.env.production? %>
+    <% 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>
+        <% 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>
+    <% end %>
     <%= render Avo::SidebarProfileComponent.new user: helpers._current_user %>
   </div>
 </div>

data/app/components/avo/sidebar_component.rb

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

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

@@ -16,25 +16,32 @@
       <% end %>
     </div>
   </div>
-  <div class="relative" data-controller="toggle-panel">
-    <a class="flex items-center h-full cursor-pointer" data-control="profile-dots" data-action="click->toggle-panel#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-panel-target="panel"
-    >
-      <% if Avo::App.has_profile_menu? %>
-        <div class="text-black">
-          <% Avo::App.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 %>
-      <%= render "avo/partials/profile_menu_extra" %>
-      <% 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,
@@ -45,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/tab_group_component.html.erb

@@ -32,19 +32,25 @@
       end
 
       if should_lazy_load
-        args[:src] = helpers.resource_path(resource: resource, model: resource.model, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
+        args[:src] = helpers.resource_path(resource: resource, record: resource.record, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id)
         args[:loading] = :lazy
       end
     %>
     <%= turbo_frame_tag tab.turbo_frame_id(parent: @group), **args do %>
       <div class="border rounded-lg p-2 -mx-2 -my-2 lg:p-4 lg:-mx-4 lg:-my-4 space-y-4">
-        <%= render Avo::TabSwitcherComponent.new resource: resource, current_tab: tab, group: group, active_tab_name: active_tab_name, view: view, style: tabs_style %>
-        <% if !should_lazy_load && !tab.empty? %>
-          <div class="space-y-12">
-            <% tab.visible_items.each do |item| %>
-              <%= render Avo::ItemSwitcherComponent.new resource: resource, item: item, index: index, form: form, view: @view %>
-            <% end %>
+        <%= render Avo::TabSwitcherComponent.new resource: resource, current_tab: tab, group: group, active_tab_name: active_tab_name, view: view %>
+        <% if should_lazy_load %>
+          <div class="block w-full">
+            <%= render Avo::LoadingComponent.new title: "#{tab.name}" %>
           </div>
+        <% else %>
+          <% if !tab.is_empty? %>
+            <div class="space-y-12">
+              <% tab.visible_items.each do |item| %>
+                <%= render Avo::ItemSwitcherComponent.new resource: resource, item: item, index: index, form: form, view: @view %>
+              <% end %>
+            </div>
+          <% end %>
         <% end %>
       </div>
     <% end %>

data/app/components/avo/tab_group_component.rb

@@ -7,14 +7,13 @@ class Avo::TabGroupComponent < Avo::BaseComponent
   attr_reader :form
   attr_reader :resource
 
-  def initialize(resource:, group:, index:, form:, params:, view:, tabs_style:)
+  def initialize(resource:, group:, index:, form:, params:, view:)
     @resource = resource
     @group = group
     @index = index
     @form = form
     @params = params
     @view = view
-    @tabs_style = tabs_style
 
     @group.index = index
   end
@@ -50,8 +49,4 @@ class Avo::TabGroupComponent < Avo::BaseComponent
       tab.name.to_s == active_tab_name.to_s
     end
   end
-
-  def tabs_style
-    @tabs_style || Avo.configuration.tabs_style
-  end
 end

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

@@ -1,41 +1,18 @@
-<% if style == :tabs %>
-  <div class="flex overflow-auto mac-styled-scrollbar" data-target="tab-switcher" data-style="tabs">
-    <div class="button-group">
-      <% visible_items.each do |tab| %>
-        <%= a_link tab_path(tab),
-          color: selected?(tab) ? :primary : :gray ,
-          rounded: false,
-          size: :sm,
-          class: "active:outline-0 #{selected?(tab) ? "z-20" : "bg-gray-100 border-gray-300"}",
-          title: tab.description,
-          data: {
-            tippy: tab.description.present? ? 'tooltip' : '',
-            selected: selected?(tab),
-            action: 'click->tabs#changeTab',
-            tabs_id_param: tab.name
-          } do %>
-          <%= tab.name %>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
-<% else %>
-  <div class="flex flex-wrap gap-2 p-2 <%= white_panel_classes %>" data-target="tab-switcher" data-style="pills">
-    <% visible_items.each do |tab| %>
-      <%= a_link tab_path(tab),
-      color: selected?(tab) ? :primary : :gray,
-      style: selected?(tab) ? :outline : :text,
-      size: :sm,
-      class: selected?(tab) ? "z-20 bg-primary-100" : "",
-      title: tab.description,
-      data: {
-        tippy: tab.description.present? ? 'tooltip' : '',
-        selected: selected?(tab),
-        action: 'click->tabs#changeTab',
-        tabs_id_param: tab.name
-      } do %>
-        <%= tab.name %>
-      <% end %>
+<div class="flex flex-wrap gap-2 p-2 <%= white_panel_classes %>" data-target="tab-switcher">
+  <% group.visible_items.each do |tab| %>
+    <%= a_link tab_path(tab),
+    color: selected?(tab) ? :primary : :gray,
+    style: selected?(tab) ? :outline : :text,
+    size: :sm,
+    class: selected?(tab) ? "z-20 bg-primary-100" : "",
+    title: tab.description,
+    data: {
+      tippy: tab.description.present? ? 'tooltip' : '',
+      selected: selected?(tab),
+      action: 'click->tabs#changeTab',
+      tabs_id_param: tab.name
+    } do %>
+      <%= tab.name %>
     <% end %>
-  </div>
-<% end %>
+  <% end %>
+</div>