avo 2.18.1 → 2.20.0

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

@@ -41,7 +41,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
       }
     end
 
-    helpers.resource_path(model: @resource.model, resource: @resource, **args)
+    helpers.resource_path(model: @resource.model, resource: parent_or_child_resource , **args)
   end
 
   def edit_path
@@ -55,7 +55,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
       }
     end
 
-    helpers.edit_resource_path(model: @resource.model, resource: @resource, **args)
+    helpers.edit_resource_path(model: @resource.model, resource: parent_or_child_resource, **args)
   end
 
   def singular_resource_name

data/app/components/avo/index/table_row_component.html.erb

@@ -17,7 +17,7 @@
     </td>
   <% end %>
   <% @resource.get_fields(reflection: @reflection, only_root: true).each_with_index do |field, index| %>
-    <%= render field.component_for_view(:index).new(field: field, resource: @resource, index: index, parent_model: @parent_model, parent_resource: @parent_resource) %>
+    <%= render field.component_for_view(:index).new(field: field, resource: @resource, reflection: @reflection, index: index, parent_model: @parent_model, parent_resource: @parent_resource) %>
   <% end %>
   <% if Avo.configuration.resource_controls_on_the_right? %>
     <td class="text-right whitespace-nowrap px-2" data-control="resource-controls">

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

@@ -6,7 +6,7 @@
   <%= render Avo::PanelComponent.new(name: item.name, description: item.description, index: index) do |c| %>
     <% c.body do %>
       <div class="divide-y">
-        <% item.items.each_with_index do |field, index| %>
+        <% item.visible_items.each_with_index do |field, index| %>
           <%= render field
             .hydrate(resource: @resource, model: @resource.model, user: resource.user, view: view)
             .component_for_view(view)

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

@@ -4,7 +4,7 @@
       <div class="overflow-hidden flex flex-col">
         <% if display_breadcrumbs? %>
           <div class="breadcrumbs truncate mb-2">
-            <%= helpers.render_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
+            <%= helpers.render_avo_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
           </div>
         <% end %>
         <div class="text-2xl tracking-normal font-semibold text-gray-800 truncate items-center flex flex-1" data-target="title">

data/app/components/avo/resource_component.rb

@@ -92,7 +92,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   end
 
   def sidebar_component(form: nil)
-    Avo::ResourceSidebarComponent.new resource: @resource, fields: sidebar.items, params: params, view: view, form: form
+    Avo::ResourceSidebarComponent.new resource: @resource, fields: sidebar.visible_items, params: params, view: view, form: form
   end
 
   def has_reflection_and_is_read_only

data/app/components/avo/resource_sidebar_component.rb

@@ -5,6 +5,7 @@ class Avo::ResourceSidebarComponent < ViewComponent::Base
   attr_reader :params
   attr_reader :view
   attr_reader :form
+  attr_reader :fields
 
   def initialize(resource: nil, fields: nil, index: nil, params: nil, form: nil, view: nil)
     @resource = resource
@@ -14,12 +15,6 @@ class Avo::ResourceSidebarComponent < ViewComponent::Base
     @form = form
   end
 
-  def fields
-    @fields.filter do |field|
-      field.visible_on? view
-    end
-  end
-
   def render?
     Avo::App.license.has_with_trial(:resource_sidebar)
   end

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

@@ -7,22 +7,28 @@
   <% end %>
 >
   <% if item.name.present? %>
-    <div
-      class="flex justify-between px-10 pr-2 pt-2 pb-0 text-gray-400"
-    >
-      <div class="flex items-center text-xs uppercase font-semibold leading-none">
-        <%= item.name %>
-      </div>
-      <% if collapsable %>
-        <div class="cursor-pointer <%= 'rotate-90' if collapsed %>"
-          data-action="click->menu#triggerCollapse"
+    <% if collapsable %>
+      <div
+        class="flex justify-between cursor-pointer px-10 pr-2 pt-2 pb-0 text-gray-400"
+        data-action="click->menu#triggerCollapse"
+        data-menu-key-param="<%= key %>"
+      >
+        <div class="flex items-center text-xs uppercase font-semibold leading-none">
+          <%= item.name %>
+        </div>
+        <div class="<%= 'rotate-90' if collapsed %>"
           data-menu-target="svg"
-          data-menu-key-param="<%= key %>"
           >
           <%= helpers.svg 'heroicons/outline/chevron-down', class: "h-4 mr-0.5"%>
         </div>
-      <% end %>
-    </div>
+      </div>
+    <% else %>
+      <div class="flex justify-between px-10 pr-2 pt-2 pb-0 text-gray-400">
+        <div class="flex items-center text-xs uppercase font-semibold leading-none">
+          <%= item.name %>
+        </div>
+      </div>
+    <% end %>
   <% end %>
   <div class="w-full space-y-1 <%= 'hidden' if collapsed %>" data-menu-target="items">
     <% items.each do |item| %>

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

@@ -1,14 +1,21 @@
-<div class="flex justify-between px-4 pr-2 py-1 text-gray-500">
-  <div class="flex items-center text-sm uppercase font-semibold leading-none space-x-1">
-    <span class="min-w-[20px]"><%= icon %></span> <span><%= label %></span>
-  </div>
-  <% if collapsable %>
-    <div class="cursor-pointer <%= 'rotate-90' if collapsed %>"
-      data-action="click->menu#triggerCollapse"
-      data-menu-key-param="<%= key %>"
+<% if collapsable %>
+  <div class="flex justify-between cursor-pointer px-4 pr-2 py-1 text-gray-500"
+    data-action="click->menu#triggerCollapse"
+    data-menu-key-param="<%= key %>"
+  >
+    <div class="flex items-center text-sm uppercase font-semibold leading-none space-x-1">
+      <span class="min-w-[20px]"><%= icon %></span> <span><%= label %></span>
+    </div>
+    <div class="<%= 'rotate-90' if collapsed %>"
       data-menu-target="svg"
     >
       <%= helpers.svg 'heroicons/outline/chevron-down', class: 'h-5'%>
     </div>
-  <% end %>
-</div>
+  </div>
+<% else %>
+  <div class="flex justify-between px-4 pr-2 py-1 text-gray-500">
+    <div class="flex items-center text-sm uppercase font-semibold leading-none space-x-1">
+      <span class="min-w-[20px]"><%= icon %></span> <span><%= label %></span>
+    </div>
+  </div>
+<% end %>

data/app/components/avo/sidebar_profile_component.rb

@@ -34,7 +34,9 @@ class Avo::SidebarProfileComponent < ViewComponent::Base
   end
 
   def destroy_user_session_path
-    "destroy_#{Avo.configuration.current_user_resource_name}_session_path".to_sym
+    # If `sign_out_path_name` is configured, use it. Otherwise construct the
+    # path name based on `current_user_resource_name`.
+    (Avo.configuration.sign_out_path_name || "destroy_#{Avo.configuration.current_user_resource_name}_session_path").to_sym
   end
 
   def can_destroy_user?

data/app/components/avo/tab_group_component.rb

@@ -39,7 +39,7 @@ class Avo::TabGroupComponent < Avo::BaseComponent
 
   def visible_tabs
     tabs.select do |tab|
-      !tab.empty?
+      tab.visible?
     end
   end
 

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

@@ -40,7 +40,7 @@
               <% end %>
             <% end %>
           <% elsif can_see_the_actions_button? && control.actions_list? %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, style: control.style, color: control.color %>
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, style: control.style, color: control.color, label: control.label %>
           <% elsif control.edit_button? %>
             <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
             <% end %>

data/app/controllers/avo/actions_controller.rb

@@ -51,7 +51,13 @@ module Avo
     end
 
     def set_action
-      @action = action_class.new(model: @model, resource: @resource, user: _current_user, view: @view)
+      @action = action_class.new(
+        model: @model,
+        resource: @resource,
+        user: _current_user,
+        view: @view,
+        arguments: @resource.get_action_arguments(action_class)
+      )
     end
 
     def action_class
@@ -63,8 +69,10 @@ module Avo
     end
 
     def respond(response)
-      response[:type] ||= :reload
       messages = get_messages response
+      return keep_modal_open(messages) if response[:keep_modal_open]
+
+      response[:type] ||= :reload
 
       if response[:type] == :download
         return send_data response[:path], filename: response[:filename]
@@ -73,9 +81,7 @@ module Avo
       respond_to do |format|
         format.html do
           # Flash the messages collected from the action
-          messages.each do |message|
-            flash[message[:type]] = message[:body]
-          end
+          flash_messages messages
 
           if response[:type] == :redirect
             path = response[:path]
@@ -114,5 +120,21 @@ module Avo
         purpose: :select_all
       )
     end
+
+    def flash_messages(messages)
+      messages.each do |message|
+        flash[message[:type]] = message[:body]
+      end
+    end
+
+    def keep_modal_open(messages)
+      flash_messages messages
+
+      respond_to do |format|
+        format.turbo_stream do
+          render "keep_modal_open"
+        end
+      end
+    end
   end
 end

data/app/controllers/avo/application_controller.rb

@@ -1,8 +1,15 @@
 module Avo
   class ApplicationController < ::ActionController::Base
+    if defined?(Pundit::Authorization)
+      Avo::ApplicationController.include Pundit::Authorization
+    elsif defined?(Pundit)
+      Avo::ApplicationController.include Pundit
+    end
+
     include Pagy::Backend
     include Avo::ApplicationHelper
     include Avo::UrlHelpers
+    include Avo::Concerns::Breadcrumbs
 
     protect_from_forgery with: :exception
     around_action :set_avo_locale

data/app/controllers/avo/base_controller.rb

@@ -2,6 +2,8 @@ require_dependency "avo/application_controller"
 
 module Avo
   class BaseController < ApplicationController
+    include Avo::Concerns::FiltersSessionHandler
+
     before_action :set_resource_name
     before_action :set_resource
     before_action :hydrate_resource
@@ -57,7 +59,9 @@ module Avo
 
       # Apply filters to the current query
       filters_to_be_applied.each do |filter_class, filter_value|
-        @query = filter_class.safe_constantize.new.apply_query request, @query, filter_value
+        @query = filter_class.safe_constantize.new(
+          arguments: @resource.get_filter_arguments(filter_class)
+        ).apply_query request, @query, filter_value
       end
 
       extra_pagy_params = {}
@@ -222,6 +226,9 @@ module Avo
         @errors = Array.wrap(exception.message)
       end
 
+      # Add the errors from the model
+      @errors = Array.wrap([@errors, @model.errors.full_messages]).compact
+
       succeeded
     end
 
@@ -302,26 +309,31 @@ module Avo
     end
 
     def set_filters
-      @filters = @resource.get_filters.map do |filter_class|
-        filter = filter_class.new
-
-        filter
-      end
+      @filters = @resource
+        .get_filters
+        .map do |filter|
+          filter[:class].new arguments: filter[:arguments]
+        end
+        .select do |filter|
+          filter.visible_in_view(resource: @resource, parent_model: @parent_model, parent_resource: @parent_resource)
+        end
     end
 
     def set_actions
       @actions = @resource
         .get_actions
         .map do |action|
-          action.new(model: @model, resource: @resource, view: @view)
+          action[:class].new(model: @model, resource: @resource, view: @view, arguments: action[:arguments])
         end
         .select do |action|
-          action.visible_in_view
+          action.visible_in_view(parent_model: @parent_model, parent_resource: @parent_resource)
         end
     end
 
     def set_applied_filters
-      @applied_filters = Avo::Filters::BaseFilter.decode_filters(params[Avo::Filters::BaseFilter::PARAM_KEY])
+      reset_filters if params[:reset_filter]
+
+      @applied_filters = Avo::Filters::BaseFilter.decode_filters(fetch_filters)
 
       # Some filters react to others and will have to be merged into this
       @applied_filters = @applied_filters.merge reactive_filters
@@ -334,16 +346,16 @@ module Avo
 
       # Go through all filters
       @resource.get_filters
-        .select do |filter_class|
-          filter_class.instance_methods(false).include? :react
+        .select do |filter|
+          filter[:class].instance_methods(false).include? :react
         end
-        .each do |filter_class|
+        .each do |filter|
           # Run the react method if it's present
-          reaction = filter_class.new.react
+          reaction = filter[:class].new(arguments: filter[:arguments]).react
 
           next if reaction.nil?
 
-          filter_reactions[filter_class.to_s] = filter_class.new.react
+          filter_reactions[filter[:class].to_s] = reaction
         end
 
       filter_reactions
@@ -353,11 +365,11 @@ module Avo
     def filters_to_be_applied
       filter_defaults = {}
 
-      @resource.get_filters.each do |filter_class|
-        filter = filter_class.new
+      @resource.get_filters.each do |filter|
+        filter = filter[:class].new arguments: filter[:arguments]
 
         unless filter.default.nil?
-          filter_defaults[filter_class.to_s] = filter.default
+          filter_defaults[filter.class.to_s] = filter.default
         end
       end
 
@@ -476,7 +488,7 @@ module Avo
     end
 
     def destroy_fail_message
-      @errors.present? ? @errors.first : t("avo.failed")
+      @errors.present? ? @errors.join(". ") : t("avo.failed")
     end
 
     def after_destroy_path

data/app/controllers/avo/dashboards/cards_controller.rb

@@ -0,0 +1,37 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  module Dashboards
+    class CardsController < ApplicationController
+      before_action :set_dashboard
+      before_action :set_card
+      before_action :detect_chartkick
+
+      def show
+        render(:chartkick_missing) unless @chartkick_installed
+      end
+
+      private
+
+      def set_dashboard
+        @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
+
+        raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
+      end
+
+      def set_card
+        @card = @dashboard.item_at_index(params[:index].to_i).tap do |card|
+          card.hydrate(dashboard: @dashboard, params: params)
+        end
+      end
+
+      def detect_chartkick
+        @chartkick_installed = if @card.class.ancestors.map(&:to_s).include?("Avo::Dashboards::ChartkickCard")
+          defined?(Chartkick)
+        else
+          true
+        end
+      end
+    end
+  end
+end

data/app/controllers/avo/dashboards_controller.rb

@@ -5,6 +5,7 @@ module Avo
     before_action :set_dashboard, only: :show
 
     def show
+      @page_title = @dashboard.name
     end
 
     private

data/app/helpers/avo/application_helper.rb

@@ -102,7 +102,11 @@ module Avo
     end
 
     def root_path_without_url
-      Avo::App.root_path.to_s.delete_prefix(request.base_url.to_s).delete_suffix "/"
+      Avo::App.root_path
+        .to_s
+        .delete_prefix(request.base_url.to_s)
+        .delete_suffix("/")
+        .gsub("/?", "?")
     rescue
       Avo.configuration.root_path
     end

data/app/javascript/js/controllers/search_controller.js

@@ -76,7 +76,7 @@ export default class extends Controller {
     // This line fixes a bug where the search box would be duplicated on back navigation.
     this.autocompleteTarget.innerHTML = ''
 
-    autocomplete({
+    const { destroy } = autocomplete({
       container: this.autocompleteTarget,
       placeholder: this.translationKeys.placeholder,
       translations: {
@@ -101,7 +101,7 @@ export default class extends Controller {
     })
 
     // document.addEventListener('turbo:before-render', destroy)
-    // this.destroyMethod = destroy
+    this.destroyMethod = destroy
 
     // When using search for belongs-to
     if (this.buttonTarget.dataset.shouldBeDisabled !== 'true') {
@@ -109,6 +109,15 @@ export default class extends Controller {
     }
   }
 
+  disconnect() {
+    // Don't leave open autocompletes around when disconnected. Otherwise it will still
+    // be visible when navigating back to this page.
+    if (this.destroyMethod) {
+      this.destroyMethod()
+      this.destroyMethod = null
+    }
+  }
+
   addSource(resourceName, data) {
     const that = this
 

data/app/views/avo/actions/keep_modal_open.turbo_stream.erb

@@ -0,0 +1,5 @@
+<turbo-stream action="append" target="alerts">
+  <template>
+    <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+  </template>
+</turbo-stream>

data/app/views/avo/actions/show.html.erb

@@ -34,7 +34,8 @@
         </div>
       <% end %>
       <% c.controls do %>
-        <%= a_button data: { action: 'click->modal#close' },
+        <%= a_button type: :button,
+          data: { action: 'click->modal#close' },
           size: :sm,
           color: :gray do %>
           <%= @action.cancel_button_label %>

data/app/views/avo/partials/_branding.html.erb

@@ -3,3 +3,4 @@
     <%= Avo.configuration.branding.css_colors %>
   }
 </style>
+<%= favicon_link_tag Avo.configuration.branding.favicon %>

data/app/views/layouts/avo/application.html.erb

@@ -46,7 +46,7 @@
     <%= turbo_frame_tag 'actions_show' %>
     <%= turbo_frame_tag 'attach_modal' %>
     <%= turbo_frame_tag 'destroy_attachment_form' %>
-    <%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-50 pointer-events-none" do %>
+    <%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-[100] pointer-events-none" do %>
       <%= render Avo::FlashAlertsComponent.new flashes: flash %>
       <% # In case we have other general error messages %>
       <% if @errors.present? %>

data/avo.gemspec

@@ -35,14 +35,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", ">= 6.0"
   spec.add_dependency "actionview", ">= 6.0"
   spec.add_dependency "pagy"
-  spec.add_dependency "zeitwerk"
+  spec.add_dependency "zeitwerk", ">= 2.6.2"
   spec.add_dependency "httparty"
   spec.add_dependency "active_link_to"
   spec.add_dependency "view_component"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
-  spec.add_dependency "breadcrumbs_on_rails"
   spec.add_dependency "dry-initializer"
   spec.add_dependency "docile"
   spec.add_dependency "inline_svg"

data/bin/init

@@ -9,7 +9,17 @@ app_root do
   )
 
   header 'Configuring git'
-  run! 'git remote add upstream https://github.com/avo-hq/avo.git'
+  target_upstream = "https://github.com/avo-hq/avo.git"
+  current_upstream = `git config --get remote.upstream.url`.chomp
+  if current_upstream.nil? || current_upstream.empty?
+    puts "Adding new remote 'upstream' to #{target_upstream}"
+    run! "git remote add upstream #{target_upstream}"
+  elsif current_upstream != target_upstream
+    puts "Updating existing remote 'upstream' to #{target_upstream}"
+    run! "git remote set-url upstream #{target_upstream}"
+  else
+    puts "Remote 'upstream' already points to #{target_upstream}, no change"
+  end
 
   header 'Installing gems'
   run! 'bundle install'

data/bin/test

@@ -7,6 +7,7 @@ export NODE_ENV="test"
 if [[ -z "$1" ]] || [[ "$1" == "unit" ]]; then
   bundle exec rspec ./spec --tag type:feature
   bundle exec rspec ./spec --tag type:controller
+  bundle exec rspec ./spec --tag type:component
 fi;
 
 # Run system tests

data/config/routes.rb

@@ -7,7 +7,7 @@ Avo::Engine.routes.draw do
   post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
 
   resources :dashboards do
-    resources :cards
+    resources :cards, controller: "dashboards/cards"
   end
 
   scope "avo_api", as: "avo_api" do
@@ -33,7 +33,7 @@ Avo::Engine.routes.draw do
 
     # Generate resource routes as below:
     # resources :posts
-    Avo::DynamicRouter.routes(self)
+    Avo::DynamicRouter.routes
 
     # Associations
     get "/:resource_name/:id/:related_name/new", to: "associations#new", as: "associations_new"

data/db/factories.rb

@@ -60,6 +60,16 @@ FactoryBot.define do
     type { "Spouse" }
   end
 
+  factory :sibling do
+    name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
+    type { "Sibling" }
+  end
+
+  factory :brother do
+    name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
+    type { "Brother" }
+  end
+
   factory :fish do
     name { %w[Tilapia Salmon Trout Catfish Pangasius Carp].sample }
   end

data/lib/avo/app.rb

@@ -17,6 +17,17 @@ module Avo
     class_attribute :error_messages
 
     class << self
+      def eager_load(entity)
+        paths = Avo::ENTITIES.fetch entity
+
+        return unless paths.present?
+
+        pathname = Rails.root.join(*paths)
+        if pathname.directory?
+          Rails.autoloaders.main.eager_load_dir(pathname.to_s)
+        end
+      end
+
       def boot
         init_fields
 
@@ -91,7 +102,7 @@ module Avo
           has_model = resource.model_class.present?
 
           unless has_model
-            possible_model = resource.class.to_s.gsub 'Resource', ''
+            possible_model = resource.class.to_s.gsub "Resource", ""
 
             Avo::App.error_messages.push({
               url: "https://docs.avohq.io/2.0/resources.html#custom-model-class",
@@ -119,6 +130,8 @@ module Avo
       end
 
       def init_dashboards
+        eager_load :dashboards unless Rails.application.config.eager_load
+
         self.dashboards = Dashboards::BaseDashboard.descendants
           .select do |dashboard|
             dashboard != Dashboards::BaseDashboard