avo 2.18.1.pre.1.eagerloaddirs → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dedb3bcead6abca3b563cf3c407486f240cd1f93af38c3d3c6edec9605266119
-  data.tar.gz: '09dcd70c7db58cdd1c13a5ced9a3b75bc5b7ed5afc8ecf4c24237ade4f67f417'
+  metadata.gz: b2b092c8d9df1951b5ccd6a07b31c8c96a6cb68846ab2b2342f43082449a5ced
+  data.tar.gz: 5bb4985123f45ad9aeca49892559d43a80130a29ff823fc6c7f35127e5de3e5c
 SHA512:
-  metadata.gz: e918b0789be4e669df92c80870d16a94c2ae9a33dd8db7ef9498a1cf1d50a06d4d7074d7eb79a1da321bf0f8e7398e3061cb3f92d2fe62a1c2902b7aa79b2a3f
-  data.tar.gz: b6cc344b4ecc7b590219eed82708bf81ea21f006ce6a070c07e79aff53835af3ee2a12262a48f4261d223f2f96a85cd73c0eac21c2e8651a6cd002d5270b09e3
+  metadata.gz: e28f40d6e4559541cd2e08a76753ef87bcbfe54a48bd3ba2c7ea368436762bb287ddbac6641df9b18f6196071dd6bd7bb3f5e2f6e0bb95e2b7b10a5ab0cc6a2b
+  data.tar.gz: c6a64520f187b1e725b167bc396e23d6177c9c83e8f5ff2864a56cd12aed87ec757bfd34ee76955e93718268e888c9693dfa6899d6633e37f93874d2d86cbd73

data/Gemfile

@@ -21,7 +21,7 @@ gem 'cssbundling-rails'
 # Dependencies for dummy_app
 #
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-# gem "rails", "~> 6.1.0"
+gem "rails", "~> 6.1.0"
 
 # Use postgresql as the database for Active Record
 gem "pg", ">= 0.18", "< 2.0"
@@ -123,7 +123,6 @@ gem 'meta-tags'
 
 gem 'breadcrumbs_on_rails'
 
-gem 'manifester'
 
 # Search
 gem 'ransack'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.18.1.pre.1.eagerloaddirs)
+    avo (2.19.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -238,9 +238,6 @@ 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)
@@ -485,12 +482,12 @@ DEPENDENCIES
   jsbundling-rails
   launchy
   listen (>= 3.5.1)
-  manifester
   meta-tags
   net-smtp
   pg (>= 0.18, < 2.0)
   puma (~> 5.6.4)
   pundit
+  rails (~> 6.1.0)
   rails-controller-testing
   ransack
   redis (~> 4.0)

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

@@ -11,7 +11,7 @@
     icon_class: 'transform rotate-90',
     'data-action': "click->toggle-panel#togglePanel",
     'data-actions-dropdown-button': @resource.model_key do %>
-    <%= t 'avo.actions' %>
+    <%= label %>
   <% end %>
   <div
     class="absolute flex inset-auto xl:right-0 top-full bg-white w-full sm:w-auto sm:min-w-[300px] mt-2 z-40 shadow-modal rounded overflow-hidden hidden"

data/app/components/avo/actions_component.rb

@@ -2,14 +2,16 @@
 
 class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
+  attr_reader :label
 
-  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :primary)
+  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :primary, label: nil)
     @actions = actions || []
     @resource = resource
     @view = view
     @exclude = exclude
     @color = color
     @style = style
+    @label = label || t("avo.actions")
   end
 
   def render?
@@ -17,9 +19,7 @@ class Avo::ActionsComponent < ViewComponent::Base
   end
 
   def actions
-    @actions.select do |action|
-      !action.class.in?(@exclude)
-    end
+    @actions.reject { |action| action.class.in?(@exclude) }
   end
 
   # When running an action for one record we should do it on a special path.

data/app/components/avo/base_component.rb

@@ -46,8 +46,9 @@ class Avo::BaseComponent < ViewComponent::Base
 
   def parent_or_child_resource
     return @resource unless link_to_child_resource_is_enabled?
+    return @resource if @resource.model.class.base_class == @resource.model.class
 
-    ::Avo::App.get_resource_by_model_name(@resource.model.class).dup
+    ::Avo::App.get_resource_by_model_name(@resource.model.class).dup || @resource
   end
 
   def link_to_child_resource_is_enabled?

data/app/components/avo/field_wrapper_component.rb

@@ -61,7 +61,13 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   end
 
   def help
-    @help || @field.help
+    help_value = @help || @field.help
+
+    if help_value.respond_to?(:call)
+      return Avo::Hosts::ResourceViewRecordHost.new(block: help_value, record: record, resource: resource, view: view).handle
+    end
+
+    help_value
   end
 
   def record

data/app/components/avo/fields/has_one_field/show_component.rb

@@ -38,10 +38,9 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   def create_path
     args = {
       via_relation: @resource.singular_model_key,
-      via_relation_class: @resource.name,
+      via_relation_class: @resource.model_class.to_s,
       via_resource_id: @resource.model.id
     }
-
     helpers.new_resource_path(resource: @field.target_resource, **args)
   end
 end

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

@@ -21,7 +21,7 @@
         <%= render partial: filter.class.template, locals: {filter: filter} %>
       <% end %>
       <div class="p-4 border-gray-300 border-t">
-        <% if params[:filters].present? %>
+        <% if @applied_filters.present? %>
           <%= a_link reset_path, data: {turbo_frame: params[:turbo_frame]}, color: :gray, size: :sm, class: 'w-full justify-center' do %>
             <%= t('avo.reset_filters') %>
           <% end %>

data/app/components/avo/filters_component.rb

@@ -17,9 +17,9 @@ class Avo::FiltersComponent < ViewComponent::Base
   def reset_path
     # If come from a association page
     if @parent_model.present?
-      helpers.related_resources_path(@parent_model, @parent_model, filters: nil, keep_query_params: true)
+      helpers.related_resources_path(@parent_model, @parent_model, filters: nil, reset_filter: true, keep_query_params: true)
     else
-      helpers.resources_path(resource: @resource, filters: nil, keep_query_params: true)
+      helpers.resources_path(resource: @resource, filters: nil, reset_filter: true, keep_query_params: true)
     end
   end
 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/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/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
@@ -302,11 +304,14 @@ 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_class|
+          filter_class.new
+        end
+        .select do |filter|
+          filter.visible_in_view(resource: @resource, parent_model: @parent_model, parent_resource: @parent_resource)
+        end
     end
 
     def set_actions
@@ -316,12 +321,14 @@ module Avo
           action.new(model: @model, resource: @resource, view: @view)
         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

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/partials/_branding.html.erb

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

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/db/factories.rb

@@ -65,6 +65,11 @@ FactoryBot.define do
     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/base_action.rb

@@ -114,15 +114,25 @@ module Avo
       self
     end
 
-    def visible_in_view
-      # Run the visible block if available
-      return instance_exec(resource: self.class.resource, view: view, &visible) if visible.present?
+    def visible_in_view(parent_model: nil, parent_resource: nil)
+      if visible.blank?
+        # Hide on the :new view by default
+        return false if view == :new
 
-      # Hide on the :new view by default
-      return false if view == :new
+        # Show on all other views
+        return true
+      end
 
-      # Show on all other views
-      true
+      # Run the visible block if available
+      Avo::Hosts::VisibilityHost.new(
+        block: visible,
+        model: self.class.model,
+        params: params,
+        parent_model: parent_model,
+        parent_resource: parent_resource,
+        resource: self.class.resource,
+        view: self.class.view,
+      ).handle
     end
 
     def param_id

data/lib/avo/concerns/filters_session_handler.rb

@@ -0,0 +1,43 @@
+
+module Avo
+  module Concerns
+    module FiltersSessionHandler
+      def reset_filters
+        return unless cache_resource_filters?
+
+        session.delete(filters_session_key)
+      end
+
+      def fetch_filters
+        return filters_from_params unless cache_resource_filters?
+
+        (filters_from_params && save_filters_to_session) || filters_from_session
+      end
+
+      def filters_from_params
+        params[Avo::Filters::BaseFilter::PARAM_KEY].presence
+      end
+
+      def save_filters_to_session
+        session[filters_session_key] = params[Avo::Filters::BaseFilter::PARAM_KEY]
+      end
+
+      def filters_from_session
+        session[filters_session_key]
+      end
+
+      def filters_session_key
+        @filters_session_key ||= '/filters/' << %w[
+          turbo_frame controller resource_name related_name
+          action id
+        ].map { |key| params[key] }.compact.join('/')
+      end
+
+      def cache_resource_filters?
+        return Avo.configuration.cache_resource_filters unless Avo.configuration.cache_resource_filters.is_a?(Proc)
+
+        Avo.configuration.cache_resource_filters.call(current_user: current_user, resource: @resource)
+      end
+    end
+  end
+end

data/lib/avo/configuration/branding.rb

@@ -1,10 +1,11 @@
 class Avo::Configuration::Branding
-  def initialize(colors: nil, chart_colors: nil, logo: nil, logomark: nil, placeholder: nil)
+  def initialize(colors: nil, chart_colors: nil, logo: nil, logomark: nil, placeholder: nil, favicon: nil)
     @colors = colors || {}
     @chart_colors = chart_colors
     @logo = logo
     @logomark = logomark
     @placeholder = placeholder
+    @favicon = favicon
 
     @default_colors = {
       background: "#F6F6F7",
@@ -17,6 +18,7 @@ class Avo::Configuration::Branding
     @default_logo = "/avo-assets/logo.png"
     @default_logomark = "/avo-assets/logomark.png"
     @default_placeholder = "/avo-assets/placeholder.svg"
+    @default_favicon = "/avo-assets/favicon.ico"
   end
 
   def css_colors
@@ -53,6 +55,12 @@ class Avo::Configuration::Branding
     @chart_colors || @default_chart_colors
   end
 
+  def favicon
+    return @default_favicon if Avo::App.license.lacks_with_trial(:branding)
+
+    @favicon || @default_favicon
+  end
+
   private
 
   def colors

data/lib/avo/configuration.rb

@@ -20,6 +20,7 @@ module Avo
     attr_accessor :full_width_container
     attr_accessor :full_width_index_view
     attr_accessor :cache_resources_on_index_view
+    attr_accessor :cache_resource_filters
     attr_accessor :context
     attr_accessor :display_breadcrumbs
     attr_accessor :hide_layout_when_printing
@@ -39,6 +40,7 @@ module Avo
     attr_accessor :resource_default_view
     attr_accessor :authorization_client
     attr_accessor :field_wrapper_layout
+    attr_accessor :sign_out_path_name
     attr_writer :branding
 
     def initialize
@@ -68,6 +70,7 @@ module Avo
       @full_width_container = false
       @full_width_index_view = false
       @cache_resources_on_index_view = Avo::PACKED
+      @cache_resource_filters = false
       @context = proc {}
       @initial_breadcrumbs = proc {
         add_breadcrumb I18n.t("avo.home").humanize, avo.root_path

data/lib/avo/engine.rb

@@ -64,6 +64,11 @@ module Avo
       g.test_framework :rspec, view_specs: false
     end
 
+    generators do |app|
+      Rails::Generators.configure! app.config.generators
+      require_relative "../generators/model_generator"
+    end
+
     # After deploy we want to make sure the license response is being cleared.
     # We need a fresh license response.
     # This is disabled in development because the initialization process might be triggered more than once.

data/lib/avo/fields/base_field.rb

@@ -14,6 +14,7 @@ module Avo
       include Avo::Concerns::HasHTMLAttributes
       include Avo::Fields::Concerns::IsRequired
       include Avo::Fields::Concerns::IsReadonly
+      include Avo::Fields::Concerns::HasDefault
 
       delegate :view_context, to: ::Avo::App
       delegate :simple_format, :content_tag, to: :view_context
@@ -145,9 +146,11 @@ module Avo
       end
 
       def placeholder
-        return @placeholder if @placeholder.present?
+        if @placeholder.respond_to?(:call)
+          return Avo::Hosts::ResourceViewRecordHost.new(block: @placeholder, record: @model, resource: @resource, view: @view).handle
+        end
 
-        name
+        @placeholder || name
       end
 
       def visible?
@@ -166,15 +169,9 @@ module Avo
         # Get model value
         final_value = @model.send(property) if is_model?(@model) && @model.respond_to?(property)
 
-        # On new views and actions modals we need to prefill the fields
-        if @view.in?([:new, :create]) || @action.present?
-          if default.present?
-            final_value = if default.respond_to?(:call)
-              default.call
-            else
-              default
-            end
-          end
+        # On new views and actions modals we need to prefill the fields with the default value
+        if should_fill_with_default_value? && default.present?
+          final_value = computed_default_value
         end
 
         # Run computable callback block if present
@@ -269,6 +266,18 @@ module Avo
       def is_model?(model)
         model_or_class(model) == "model"
       end
+
+      def should_fill_with_default_value?
+        on_create? || in_action?
+      end
+
+      def on_create?
+        @view.in?([:new, :create])
+      end
+
+      def in_action?
+        @action.present?
+      end
     end
   end
 end

data/lib/avo/fields/concerns/has_default.rb

@@ -0,0 +1,17 @@
+module Avo
+  module Fields
+    module Concerns
+      module HasDefault
+        extend ActiveSupport::Concern
+
+        def computed_default_value
+          if default.respond_to? :call
+            Avo::Hosts::ResourceViewRecordHost.new(block: default, record: model, view: view, resource: resource).handle
+          else
+            default
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/fields/concerns/is_readonly.rb

@@ -6,7 +6,7 @@ module Avo
 
         def is_readonly?
           if readonly.respond_to? :call
-            Avo::Hosts::ViewRecordHost.new(block: readonly, record: model, view: view).handle
+            Avo::Hosts::ResourceViewRecordHost.new(block: readonly, record: model, view: view, resource: resource).handle
           else
             readonly
           end

data/lib/avo/fields/concerns/is_required.rb

@@ -6,7 +6,7 @@ module Avo
 
         def is_required?
           if required.respond_to? :call
-            Avo::Hosts::ViewRecordHost.new(block: required, record: model, view: view).handle
+            Avo::Hosts::ResourceViewRecordHost.new(block: required, record: model, view: view, resource: resource).handle
           else
             required.nil? ? required_from_validators : required
           end
@@ -18,7 +18,7 @@ module Avo
           return false if model.nil?
 
           validators.any? do |validator|
-            validator.kind_of? ActiveModel::Validations::PresenceValidator
+            validator.is_a? ActiveModel::Validations::PresenceValidator
           end
         end
 

data/lib/avo/fields/key_value_field.rb

@@ -81,7 +81,7 @@ module Avo
           new_value = {}
         end
 
-        model[key] = new_value
+        model.send("#{key}=", new_value)
 
         model
       end

data/lib/avo/filters/base_filter.rb

@@ -3,11 +3,12 @@ module Avo
     class BaseFilter
       PARAM_KEY = :filters unless const_defined?(:PARAM_KEY)
 
-      class_attribute :name, default: "Filter"
       class_attribute :component, default: "boolean-filter"
       class_attribute :default, default: nil
-      class_attribute :template, default: "avo/base/select_filter"
       class_attribute :empty_message
+      class_attribute :name, default: "Filter"
+      class_attribute :template, default: "avo/base/select_filter"
+      class_attribute :visible
 
       delegate :params, to: Avo::App
 
@@ -52,6 +53,20 @@ module Avo
       def applied_filters
         self.class.decode_filters params[PARAM_KEY]
       end
+
+      def visible_in_view(resource: nil, parent_model: nil, parent_resource: nil)
+        return true if visible.blank?
+
+        # Run the visible block if available
+        Avo::Hosts::VisibilityHost.new(
+          block: visible,
+          params: params,
+          parent_model: parent_model,
+          parent_resource: parent_resource,
+          resource: resource
+        ).handle
+
+      end
     end
   end
 end

data/lib/avo/hosts/resource_view_record_host.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Hosts
+    class ResourceViewRecordHost < ViewRecordHost
+      option :resource
+    end
+  end
+end

data/lib/avo/hosts/visibility_host.rb

@@ -0,0 +1,11 @@
+module Avo
+  module Hosts
+    class VisibilityHost < BaseHost
+      option :parent_model
+      option :parent_resource
+      option :resource
+      # View is optional because in filter context the view is always :index
+      option :view, optional: true
+    end
+  end
+end