avo 2.19.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b092c8d9df1951b5ccd6a07b31c8c96a6cb68846ab2b2342f43082449a5ced
-  data.tar.gz: 5bb4985123f45ad9aeca49892559d43a80130a29ff823fc6c7f35127e5de3e5c
+  metadata.gz: 032f3c926677645e9939a30205693425f4c44c4db874d7e30849c600e13be8a1
+  data.tar.gz: 110d46843bf447a9e1a1215e3d4e17e4c8bf64ca4f88889d72a504c6b9cef06e
 SHA512:
-  metadata.gz: e28f40d6e4559541cd2e08a76753ef87bcbfe54a48bd3ba2c7ea368436762bb287ddbac6641df9b18f6196071dd6bd7bb3f5e2f6e0bb95e2b7b10a5ab0cc6a2b
-  data.tar.gz: c6a64520f187b1e725b167bc396e23d6177c9c83e8f5ff2864a56cd12aed87ec757bfd34ee76955e93718268e888c9693dfa6899d6633e37f93874d2d86cbd73
+  metadata.gz: feed3402af12295a712d16f45ced2248c6fcb0663cdad1d4e3b160f9d706e26322ce2966f64f1f6d0fe622f13f2019be8b12d8c16afa7f009ddefe175fd0a7f5
+  data.tar.gz: 28c50de8194d7c649b2c629c988511f1470b00dbaa5d7a60013f743959fecff0b7e97e5c5383548552e412bdea05b9224910c38d681ddbefea25116ade529145

data/Gemfile

@@ -121,8 +121,7 @@ gem "appraisal"
 
 gem 'meta-tags'
 
-gem 'breadcrumbs_on_rails'
-
+gem 'manifester'
 
 # Search
 gem 'ransack'

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    avo (2.19.0)
+    avo (2.20.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
       addressable
-      breadcrumbs_on_rails
       docile
       dry-initializer
       httparty
@@ -127,8 +126,6 @@ GEM
     bootsnap (1.13.0)
       msgpack (~> 1.2)
     brakeman (5.3.1)
-    breadcrumbs_on_rails (4.1.0)
-      railties (>= 5.0)
     builder (3.2.4)
     bump (0.10.0)
     bundler-integrity (1.0.9)
@@ -238,6 +235,9 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    manifester (0.1.8)
+      rails (>= 6.0)
+      zeitwerk
     marcel (1.0.2)
     matrix (0.4.2)
     meta-tags (2.17.0)
@@ -409,7 +409,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.2.0)
-    view_component (2.74.1)
+    view_component (2.77.0)
       activesupport (>= 5.0.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -454,7 +454,6 @@ DEPENDENCIES
   aws-sdk-s3
   bootsnap (>= 1.4.2)
   brakeman
-  breadcrumbs_on_rails
   bump
   bundler-integrity (~> 1.0)
   byebug
@@ -482,6 +481,7 @@ DEPENDENCIES
   jsbundling-rails
   launchy
   listen (>= 3.5.1)
+  manifester
   meta-tags
   net-smtp
   pg (>= 0.18, < 2.0)

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

@@ -1,18 +1,18 @@
 <div class="relative flex-1 flex flex-col justify-between h-full"
   data-controller="dashboard-card"
   data-dashboard-card-target="card"
-  data-refresh-every="<%= @card.refresh_every %>"
-  data-card-id="<%= @card.id %>"
-  data-card-index="<%= @card.index %>">
-  <% if @card.class.display_header %>
+  data-refresh-every="<%= card.refresh_every %>"
+  data-card-id="<%= card.id %>"
+  data-card-index="<%= card.index %>">
+  <% if card.class.display_header %>
     <div class="px-4 pt-4">
       <div class="flex justify-between items-center min-h-6">
         <div class="text-base font-bold text-gray-700 leading-none">
-          <%= @card.label %>
+          <%= card.label %>
         </div>
         <div data-controller="select">
-          <% if @card.type.in?([:metric, :chartkick, :partial]) && @card.ranges.present? %>
-            <%= select_tag "#{@card.id}_#{@card.index}_range", options_for_select(@card.ranges, @card.range),
+          <% if card.type.in?([:metric, :chartkick, :partial]) && card.ranges.present? %>
+            <%= select_tag "#{card.id}_#{card.index}_range", options_for_select(card.ranges, card.range),
               class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-sm text-blue-gray-700 disabled:text-blue-gray-700 leading-none rounded-md py-px px-2 leading-tight border outline-none outline w-24',
               data: {
                 target: 'select',
@@ -24,18 +24,18 @@
       </div>
     </div>
   <% end %>
-  <% if @card.type == :chartkick %>
-    <%= render 'chartkick_card', card: @card %>
-  <% elsif @card.type === :partial %>
-    <%= render @card.class.partial %>
-  <% elsif @card.type === :metric %>
+  <% if card.type == :chartkick %>
+    <%= render 'chartkick_card', card: card %>
+  <% elsif card.type === :partial %>
+    <%= render card.class.partial %>
+  <% elsif card.type === :metric %>
     <div class="flex-1 flex px-4 pb-4">
-      <%= render 'metric_card', card: @card %>
+      <%= render 'metric_card', card: card %>
     </div>
   <% end %>
-  <% if @card.description.present? %>
+  <% if card.description.present? %>
     <%= content_tag :div, class: "absolute inset-auto bottom-0 right-0 mb-4 mr-4",
-      title: @card.description,
+      title: card.description,
       data: {
         target: 'card-description',
         tippy: 'tooltip',

data/app/components/avo/card_component.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Avo::CardComponent < ViewComponent::Base
+  attr_reader :card
+
   def initialize(card: nil)
     @card = card
 
@@ -8,16 +10,16 @@ class Avo::CardComponent < ViewComponent::Base
   end
 
   def render?
-    !@card.nil?
+    card.present?
   end
 
   # Initializing the card byt running the query method.
   # We'll still keep the query block around for compatibility reasons.
   def init_card
-    if @card.respond_to? :query
-      @card.query
-    elsif @card.query_block.present?
-      @card.compute_result
+    if card.respond_to? :query
+      card.query
+    elsif card.query_block.present?
+      card.compute_result
     end
   end
 end

data/app/components/avo/fields/select_field/edit_component.html.erb

@@ -1,5 +1,5 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= @form.select @field.id, @field.options_for_select, {
+  <%= @form.select @field.id, options_for_select(@field.options_for_select, selected: @field.value), {
       include_blank: @field.include_blank
     },
     aria: {

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/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/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

@@ -9,6 +9,7 @@ module Avo
     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

@@ -59,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 = {}
@@ -224,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
 
@@ -306,8 +311,8 @@ module Avo
     def set_filters
       @filters = @resource
         .get_filters
-        .map do |filter_class|
-          filter_class.new
+        .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)
@@ -318,7 +323,7 @@ module Avo
       @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(parent_model: @parent_model, parent_resource: @parent_resource)
@@ -341,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
@@ -360,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
 
@@ -483,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_controller.rb

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

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/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

@@ -42,7 +42,6 @@ Gem::Specification.new do |spec|
   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/lib/avo/app.rb

@@ -22,7 +22,10 @@ module Avo
 
         return unless paths.present?
 
-        Rails.autoloaders.main.eager_load_dir(Rails.root.join(*paths).to_s)
+        pathname = Rails.root.join(*paths)
+        if pathname.directory?
+          Rails.autoloaders.main.eager_load_dir(pathname.to_s)
+        end
       end
 
       def boot

data/lib/avo/base_action.rb

@@ -19,6 +19,7 @@ module Avo
     attr_accessor :model
     attr_accessor :resource
     attr_accessor :user
+    attr_reader :arguments
 
     delegate :view, to: :class
     delegate :context, to: ::Avo::App
@@ -56,11 +57,12 @@ module Avo
       self.class.to_s.demodulize.underscore.humanize(keep_id_suffix: true)
     end
 
-    def initialize(model: nil, resource: nil, user: nil, view: nil)
+    def initialize(model: nil, resource: nil, user: nil, view: nil, arguments: {})
       self.class.model = model if model.present?
       self.class.resource = resource if resource.present?
       self.class.user = user if user.present?
       self.class.view = view if view.present?
+      @arguments = arguments
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
       self.class.confirm_button_label ||= I18n.t("avo.run")
@@ -132,6 +134,7 @@ module Avo
         parent_resource: parent_resource,
         resource: self.class.resource,
         view: self.class.view,
+        arguments: arguments
       ).handle
     end
 
@@ -146,6 +149,12 @@ module Avo
     end
 
     def fail(text)
+      Rails.logger.warn "DEPRECATION WARNING: Action fail method is deprecated in favor of error method and will be removed from Avo version 3.0.0"
+
+      error text
+    end
+
+    def error(text)
       add_message text, :error
 
       self
@@ -163,6 +172,12 @@ module Avo
       self
     end
 
+    def keep_modal_open
+      response[:keep_modal_open] = true
+
+      self
+    end
+
     # Add a placeholder silent message from when a user wants to do a redirect action or something similar
     def silent
       add_message nil, :silent

data/lib/avo/base_card.rb

@@ -15,6 +15,7 @@ module Avo
 
     attr_accessor :dashboard
     attr_accessor :options
+    attr_accessor :arguments
     attr_accessor :index
     attr_accessor :params
 
@@ -26,9 +27,10 @@ module Avo
       end
     end
 
-    def initialize(dashboard:, options: {}, index: 0, cols: nil, rows: nil, label: nil, description: nil, refresh_every: nil)
+    def initialize(dashboard:, options: {}, arguments: {}, index: 0, cols: nil, rows: nil, label: nil, description: nil, refresh_every: nil)
       @dashboard = dashboard
       @options = options
+      @arguments = arguments
       @index = index
       @cols = cols
       @rows = rows

data/lib/avo/base_resource.rb

@@ -62,16 +62,18 @@ module Avo
         self.grid_loader = grid_collector
       end
 
-      def action(action_class)
+      def action(action_class, arguments: {})
         self.actions_loader ||= Avo::Loaders::Loader.new
 
-        self.actions_loader.use action_class
+        action = { class: action_class, arguments: arguments }
+        self.actions_loader.use action
       end
 
-      def filter(filter_class)
+      def filter(filter_class, arguments: {})
         self.filters_loader ||= Avo::Loaders::Loader.new
 
-        self.filters_loader.use filter_class
+        filter = { class: filter_class , arguments: arguments }
+        self.filters_loader.use filter
       end
 
       # This is the search_query scope
@@ -170,12 +172,24 @@ module Avo
       self.class.filters_loader.bag
     end
 
+    def get_filter_arguments(filter_class)
+      filter = get_filters.find { |filter| filter[:class] == filter_class.constantize }
+
+      filter[:arguments]
+    end
+
     def get_actions
       return [] if self.class.actions_loader.blank?
 
       self.class.actions_loader.bag
     end
 
+    def get_action_arguments(action_class)
+      action = get_actions.find { |action| action[:class].to_s == action_class.to_s }
+
+      action[:arguments]
+    end
+
     def default_panel_name
       return @params[:related_name].capitalize if @params.present? && @params[:related_name].present?
 

data/lib/avo/concerns/breadcrumbs.rb

@@ -0,0 +1,96 @@
+module Avo
+  module Concerns
+    # This is a custom implementation of breadcrumbs largely based on breadcrumbs_on_rails gem
+    # created by Simone Carletti (@weppos) and released on MIT license.
+    #
+    # https://github.com/weppos/breadcrumbs_on_rails
+    #
+    # The reason to use custom implementation is to
+    #   * Avoid naming conflicts with other gems adding helpers like `breadcrumbs`
+    #   * Reduce number of dependencies
+    module Breadcrumbs
+      extend ActiveSupport::Concern
+
+      included do |base|
+        helper HelperMethods
+        extend ClassMethods
+        helper_method :add_breadcrumb, :avo_breadcrumbs
+      end
+
+      Crumb = Struct.new(:name, :path) unless defined?(Crumb)
+
+      class Builder
+        DEFAULT_SEPARATOR = " » ".freeze unless defined?(DEFAULT_SEPARATOR)
+
+        attr_reader :context, :options
+
+        def initialize(context, options)
+          @context = context
+          @options = options
+        end
+
+        def render
+          separator = options.fetch(:separator, DEFAULT_SEPARATOR)
+          breadcrumbs.map(&method(:render_element)).join(separator)
+        end
+
+        private
+
+        def breadcrumbs
+          context.avo_breadcrumbs
+        end
+
+        def render_element(element)
+          content = element.path.nil? ? compute_name(element) : context.link_to_unless_current(compute_name(element), compute_path(element))
+          options[:tag] ? context.content_tag(options[:tag], content) : ERB::Util.h(content)
+        end
+
+        def compute_name(element)
+          case name = element.name
+          when Symbol
+            context.send(name)
+          when Proc
+            name.call(context)
+          else
+            name.to_s
+          end
+        end
+
+        def compute_path(element)
+          case path = element.path
+          when Symbol
+            context.send(path)
+          when Proc
+            path.call(context)
+          else
+            context.url_for(path)
+          end
+        end
+      end
+
+      module ClassMethods
+        def add_breadcrumb(name, path = nil)
+          before_action(filter_options) do |controller|
+            controller.send(:add_breadcrumb, name, path)
+          end
+        end
+      end
+
+      def add_breadcrumb(name, path = nil)
+        avo_breadcrumbs << Crumb.new(name, path)
+      end
+
+      def avo_breadcrumbs
+        @avo_breadcrumbs ||= []
+      end
+
+      module HelperMethods
+        def render_avo_breadcrumbs(options = {}, &block)
+          builder = Builder.new(self, options)
+          content = builder.render.html_safe
+          block_given? ? capture(content, &block) : content
+        end
+      end
+    end
+  end
+end

data/lib/avo/concerns/has_html_attributes.rb

@@ -16,12 +16,14 @@ module Avo
           default_attribute_value name
         end
 
-        attributes = if html_builder.is_a? Hash
-          get_html_from_hash name, element: element, view: view
-        elsif html_builder.is_a? Avo::HTML::Builder
-          get_html_from_block name, element: element, view: view
-        elsif html_builder.nil?
-          # Handle empty html_builder by returning an empty state
+        parsed = parse_html
+
+        attributes = if parsed.is_a? Hash
+          get_html_from_hash name, element: element, hash: parsed, view: view
+        elsif parsed.is_a? Avo::HTML::Builder
+          get_html_from_block name, element: element, html_builder: parsed, view: view
+        elsif parsed.nil?
+          # Handle empty parsed by returning an empty state
           default_attribute_value name
         end
 
@@ -30,19 +32,15 @@ module Avo
 
       private
 
-      def html_builder
-        return @parsed_html if @parsed_html.present?
-
+      # Returns Hash, HTML::Builder, or nil.
+      def parse_html
         return if @html.nil?
 
-        # Memoize the value
-        @parsed_html = if @html.is_a? Hash
+        if @html.is_a? Hash
           @html
         elsif @html.respond_to? :call
           Avo::HTML::Builder.parse_block(record: model, resource: resource, &@html)
         end
-
-        @parsed_html
       end
 
       def default_attribute_value(name)
@@ -64,7 +62,7 @@ module Avo
         end
       end
 
-      def get_html_from_block(name = nil, element:, view:)
+      def get_html_from_block(name = nil, element:, html_builder:, view:)
         values = []
 
         # get view ancestor
@@ -83,9 +81,9 @@ module Avo
         merge_values_as(as: values_type, values: values)
       end
 
-      def get_html_from_hash(name = nil, element:, view:)
+      def get_html_from_hash(name = nil, element:, hash:, view:)
         # @todo: what if this is not a Hash but a string?
-        html_builder.dig(view, element, name) || {}
+        hash.dig(view, element, name) || {}
       end
 
       # Merge the values from all possible locations.

data/lib/avo/dashboards/base_dashboard.rb

@@ -12,7 +12,12 @@ module Avo
       class_attribute :index, default: 0
 
       class << self
-        def card(klass, label: nil, description: nil, cols: nil, rows: nil, refresh_every: nil, options: {})
+        def options_deprecation_message
+          Rails.logger.warn "DEPRECATION WARNING: Card options parameter is deprecated in favor of arguments parameter and will be removed from Avo version 3.0.0"
+        end
+
+        def card(klass, label: nil, description: nil, cols: nil, rows: nil, refresh_every: nil, options: {}, arguments: {})
+          options_deprecation_message if options.present?
           self.items_holder ||= []
 
           self.items_holder << klass.new(dashboard: self,
@@ -22,6 +27,7 @@ module Avo
             rows: rows,
             refresh_every: refresh_every,
             options: options,
+            arguments: arguments,
             index: index
           )
           self.index += 1

data/lib/avo/fields/select_field.rb

@@ -3,7 +3,7 @@ module Avo
     class SelectField < BaseField
       include Avo::Fields::FieldExtensions::HasIncludeBlank
 
-      attr_reader :options
+      attr_reader :options_from_args
       attr_reader :enum
       attr_reader :display_value
 
@@ -12,51 +12,56 @@ module Avo
 
         super(id, **args, &block)
 
-        @options = args[:options] || args[:enum]
-        @options = ActiveSupport::HashWithIndifferentAccess.new @options if @options.is_a? Hash
+        @options_from_args = if args[:options].is_a? Hash
+          ActiveSupport::HashWithIndifferentAccess.new args[:options]
+        else
+          args[:options]
+        end
         @enum = args[:enum].present? ? args[:enum] : nil
         @display_value = args[:display_value].present? ? args[:display_value] : false
       end
 
       def options_for_select
-        if options.respond_to? :call
-          computed_options = options.call model: model, resource: resource, view: view, field: self
-          if display_value
-            computed_options.map { |label, value| [value, value] }.to_h
-          else
-            computed_options
-          end
-        elsif enum.present?
-          if display_value
-            options.invert
-          else
-            # We need to use the label attribute as the option value because Rails casts it like that
-            options.map { |label, value| [label, label] }.to_h
-          end
-        elsif display_value
-          options.map { |label, value| [value, value] }.to_h
-        else
-          options
+        # If options are array don't need any pre-process
+        return options if options.is_a?(Array)
+
+        # If options are enum we invert the enum if display value, else (see next comment)
+        if enum.present?
+          return enum.invert if display_value
+
+          # We need to use the label attribute as the option value because Rails casts it like that
+          return enum.map { |label, value| [label, label] }.to_h
         end
+
+        # When code arrive here it means options are Hash
+        # If display_value is true we only need to return the values of the Hash
+        display_value ? options.values : options
       end
 
       def label
-        if options.respond_to? :call
-          computed_options = options.call model: model, resource: resource, view: view, field: self
+        # If options are array don't need any pre-process
+        return value if options.is_a?(Array)
+
+        # If options are enum and display_value is true we return the Value of that key-value pair, else return key of that key-value pair
+        # WARNING: value here is the DB stored value and not the value of a key-value pair.
+        if enum.present?
+          return enum[value] if display_value
+          return value
+        end
+
+        # When code arrive here it means options are Hash
+        # If display_value is true we only need to return the value stored in DB
+        display_value ? value : options.invert[value]
+      end
 
-          return value if display_value
+      private
 
-          computed_options.invert.stringify_keys[value]
-        elsif enum.present?
-          if display_value
-            options[value]
-          else
-            value
-          end
-        elsif display_value
-          value
+      # Cache options as options given on block or as options received from arguments
+      def options
+        @options ||= if options_from_args.respond_to? :call
+          options_from_args.call model: model, resource: resource, view: view, field: self
         else
-          options.invert.stringify_keys[value]
+          options_from_args
         end
       end
     end

data/lib/avo/filters/base_filter.rb

@@ -10,6 +10,8 @@ module Avo
       class_attribute :template, default: "avo/base/select_filter"
       class_attribute :visible
 
+      attr_reader :arguments
+
       delegate :params, to: Avo::App
 
       class << self
@@ -24,6 +26,10 @@ module Avo
         end
       end
 
+      def initialize(arguments: {})
+        @arguments = arguments
+      end
+
       def apply_query(request, query, value)
         value.stringify_keys! if value.is_a? Hash
 
@@ -63,7 +69,8 @@ module Avo
           params: params,
           parent_model: parent_model,
           parent_resource: parent_resource,
-          resource: resource
+          resource: resource,
+          arguments: arguments
         ).handle
 
       end

data/lib/avo/hosts/visibility_host.rb

@@ -4,6 +4,8 @@ module Avo
       option :parent_model
       option :parent_resource
       option :resource
+      option :arguments
+
       # View is optional because in filter context the view is always :index
       option :view, optional: true
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.19.0" unless const_defined?(:VERSION)
+  VERSION = "2.20.0" unless const_defined?(:VERSION)
 end

data/public/avo-assets/avo.base.css

@@ -6345,14 +6345,14 @@ trix-toolbar .trix-button-group:not(:first-child){
   z-index:20
 }
 
-.z-40{
-  z-index:40
-}
-
 .z-\[100\]{
   z-index:100
 }
 
+.z-40{
+  z-index:40
+}
+
 .z-\[60\]{
   z-index:60
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -151,20 +151,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: breadcrumbs_on_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -1648,6 +1634,7 @@ files:
 - app/javascript/js/controllers/toggle_panel_controller.js
 - app/javascript/js/helpers/cast_boolean.js
 - app/javascript/js/helpers/debounce_promise.js
+- app/views/avo/actions/keep_modal_open.turbo_stream.erb
 - app/views/avo/actions/show.html.erb
 - app/views/avo/associations/new.html.erb
 - app/views/avo/base/_boolean_filter.html.erb
@@ -1717,6 +1704,7 @@ files:
 - lib/avo/base_card.rb
 - lib/avo/base_resource.rb
 - lib/avo/base_resource_tool.rb
+- lib/avo/concerns/breadcrumbs.rb
 - lib/avo/concerns/can_replace_fields.rb
 - lib/avo/concerns/fetches_things.rb
 - lib/avo/concerns/filters_session_handler.rb