avo 2.18.0 → 2.18.1.pre.1.eagerloaddirs

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3aeba1710c17c48914eb88a8d2c6d995903b292ad1d41ba68ebf6ca60ffb23d
-  data.tar.gz: 3f2b5b18f03ca4bec42fc0101c397a8150de001c98d3510f5b3d49a9a97ac54d
+  metadata.gz: dedb3bcead6abca3b563cf3c407486f240cd1f93af38c3d3c6edec9605266119
+  data.tar.gz: '09dcd70c7db58cdd1c13a5ced9a3b75bc5b7ed5afc8ecf4c24237ade4f67f417'
 SHA512:
-  metadata.gz: c2e2850291a795e8ba15793ab8a7b4132322ae567d975fb0c70c73a4a807788bf67ca32cb84320a02d62096fe06ae745388ecab89f01b2f5d396e58b1f8d71ce
-  data.tar.gz: 3f66906bce086a54f94ac1c39cbbeb8b5100fe7a61752d3eb0f3d242a1eabdd2e3ad004aafbcac9f35613e1a64a509d11b8c5a267accf9b058502102d5f4b7f1
+  metadata.gz: e918b0789be4e669df92c80870d16a94c2ae9a33dd8db7ef9498a1cf1d50a06d4d7074d7eb79a1da321bf0f8e7398e3061cb3f92d2fe62a1c2902b7aa79b2a3f
+  data.tar.gz: b6cc344b4ecc7b590219eed82708bf81ea21f006ce6a070c07e79aff53835af3ee2a12262a48f4261d223f2f96a85cd73c0eac21c2e8651a6cd002d5270b09e3

data/Gemfile

@@ -102,14 +102,12 @@ group :test do
   gem "launchy", require: false
 
   gem "test-prof"
-
-  gem "sprockets-rails"
 end
 
 gem "rubocop"
 gem "rubocop-shopify", require: false
 
-gem "zeitwerk", "~> 2.3"
+gem "zeitwerk"
 
 gem "httparty"
 
@@ -160,6 +158,8 @@ gem "chartkick"
 
 # Avo file filed requires this gem
 gem "activestorage"
+# Required by Avo
+gem "sprockets-rails"
 
 # Avo file filed requires this gem
 # Use Active Storage variant

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.18.0)
+    avo (2.18.1.pre.1.eagerloaddirs)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -15,7 +15,7 @@ PATH
       pagy
       turbo-rails
       view_component
-      zeitwerk
+      zeitwerk (>= 2.6.2)
 
 GEM
   remote: https://rubygems.org/
@@ -88,8 +88,8 @@ GEM
       activerecord (>= 6.0, < 7.1)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -100,22 +100,22 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.551.0)
-    aws-sdk-core (3.125.5)
+    aws-partitions (1.621.0)
+    aws-sdk-core (3.134.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.58.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.3)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     better_html (2.0.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -131,7 +131,7 @@ GEM
       railties (>= 5.0)
     builder (3.2.4)
     bump (0.10.0)
-    bundler-integrity (1.0.7)
+    bundler-integrity (1.0.9)
     byebug (11.1.3)
     capybara (3.36.0)
       addressable
@@ -150,7 +150,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    cssbundling-rails (1.0.0)
+    cssbundling-rails (1.1.1)
       railties (>= 6.0.0)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
@@ -167,20 +167,20 @@ GEM
     diff-lcs (1.5.0)
     digest (3.1.0)
     docile (1.4.0)
-    dotenv (2.7.6)
-    dotenv-rails (2.7.6)
-      dotenv (= 2.7.6)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
       railties (>= 3.2)
     dry-initializer (3.1.1)
     erb-formatter (0.3.0)
     erubi (1.11.0)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faker (2.19.0)
-      i18n (>= 1.6, < 2)
+    faker (2.22.0)
+      i18n (>= 1.8.11, < 2)
     ffi (1.15.5)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
@@ -190,16 +190,16 @@ GEM
     gem-release (2.2.2)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    groupdate (5.2.4)
-      activesupport (>= 5)
+    groupdate (6.1.0)
+      activesupport (>= 5.2)
     hashdiff (1.0.1)
     highline (2.0.3)
     hightop (0.3.0)
       activesupport (>= 5.2)
-    hotwire-livereload (1.1.0)
+    hotwire-livereload (1.2.2)
       listen (>= 3.0.0)
       rails (>= 6.0.0)
-    htmlbeautifier (1.4.1)
+    htmlbeautifier (1.4.2)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -222,12 +222,12 @@ GEM
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-wait (0.2.1)
     iso (0.4.0)
       i18n
     jmespath (1.6.1)
-    jsbundling-rails (1.0.0)
+    jsbundling-rails (1.0.3)
       railties (>= 6.0.0)
+    json (2.6.2)
     launchy (2.5.0)
       addressable (~> 2.7)
     listen (3.7.1)
@@ -243,7 +243,7 @@ GEM
       zeitwerk
     marcel (1.0.2)
     matrix (0.4.2)
-    meta-tags (2.16.0)
+    meta-tags (2.17.0)
       actionpack (>= 3.2.0, < 7.1)
     method_source (1.0.0)
     mime-types (3.4.1)
@@ -253,10 +253,9 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
     minitest (5.16.3)
-    msgpack (1.6.0)
+    msgpack (1.5.6)
     multi_xml (0.6.0)
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
@@ -271,12 +270,12 @@ GEM
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.3.1)
-    public_suffix (4.0.6)
-    puma (5.6.4)
+    pg (1.4.3)
+    public_suffix (5.0.0)
+    puma (5.6.5)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
@@ -319,27 +318,27 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    ransack (2.5.0)
-      activerecord (>= 5.2.4)
-      activesupport (>= 5.2.4)
+    ransack (3.2.1)
+      activerecord (>= 6.1.5)
+      activesupport (>= 6.1.5)
       i18n
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.6.0)
-    regexp_parser (2.2.0)
+    redis (4.8.0)
+    regexp_parser (2.5.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-rails (4.0.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
@@ -348,33 +347,35 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.3)
-    rubocop (1.25.0)
+    rspec-support (3.11.0)
+    rubocop (1.35.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.2)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-shopify (2.5.0)
-      rubocop (~> 1.25)
+    rubocop-shopify (2.9.0)
+      rubocop (~> 1.33)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    selenium-webdriver (4.1.0)
+    selenium-webdriver (4.5.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -383,7 +384,7 @@ GEM
       rexml
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     sixarm_ruby_unaccent (1.2.0)
     smart_properties (1.17.0)
     spring (4.0.0)
@@ -396,21 +397,21 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    standard (1.7.0)
-      rubocop (= 1.25.0)
-      rubocop-performance (= 1.13.2)
+    standard (1.16.0)
+      rubocop (= 1.35.0)
+      rubocop-performance (= 1.14.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    test-prof (1.0.7)
+    test-prof (1.0.10)
     thor (1.2.1)
-    timeout (0.2.0)
+    timeout (0.3.0)
     turbo-rails (1.3.2)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     view_component (2.74.1)
       activesupport (>= 5.0.0, < 8.0)
       concurrent-ruby (~> 1.0)
@@ -422,20 +423,21 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.0.0)
+    webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0)
-    webmock (3.14.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.2)
 
 PLATFORMS
   ruby
@@ -508,7 +510,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   webdrivers
   webmock
-  zeitwerk (~> 2.3)
+  zeitwerk
 
 BUNDLED WITH
-   2.3.23
+   2.3.24

data/app/components/avo/base_component.rb

@@ -43,4 +43,20 @@ class Avo::BaseComponent < ViewComponent::Base
   rescue
     nil
   end
+
+  def parent_or_child_resource
+    return @resource unless link_to_child_resource_is_enabled?
+
+    ::Avo::App.get_resource_by_model_name(@resource.model.class).dup
+  end
+
+  def link_to_child_resource_is_enabled?
+    return field_linked_to_child_resource? if @parent_resource
+
+    @resource.link_to_child_resource
+  end
+
+  def field_linked_to_child_resource?
+    field.present? && field.respond_to?(:link_to_child_resource) && field.link_to_child_resource
+  end
 end

data/app/components/avo/fields/index_component.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-class Avo::Fields::IndexComponent < ViewComponent::Base
+class Avo::Fields::IndexComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
   attr_reader :parent_resource
   attr_reader :view
 
-  def initialize(field: nil, resource: nil, index: 0, parent_model: nil, parent_resource: nil)
+  def initialize(field: nil, resource: nil, reflection: nil, index: 0, parent_model: nil, parent_resource: nil)
     @field = field
     @resource = resource
     @index = index
     @parent_model = parent_model
     @parent_resource = parent_resource
     @view = :index
+    @reflection = reflection
   end
 
   def resource_view_path
@@ -25,7 +26,7 @@ class Avo::Fields::IndexComponent < ViewComponent::Base
       }
     end
 
-    helpers.resource_view_path(model: @resource.model, resource: @resource, **args)
+    helpers.resource_view_path(model: @resource.model, resource: parent_or_child_resource, **args)
   end
 
   def field_wrapper_args

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Avo::Index::GridItemComponent < ViewComponent::Base
+class Avo::Index::GridItemComponent < Avo::BaseComponent
   include Avo::ResourcesHelper
 
   attr_reader :parent_resource
@@ -37,6 +37,6 @@ class Avo::Index::GridItemComponent < ViewComponent::Base
       }
     end
 
-    helpers.resource_view_path(model: @resource.model, resource: @resource, **args)
+    helpers.resource_view_path(model: @resource.model, resource: parent_or_child_resource, **args)
   end
 end

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/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/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/controllers/avo/application_controller.rb

@@ -1,5 +1,11 @@
 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

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/avo.gemspec

@@ -35,7 +35,7 @@ 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"

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

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,11 @@ FactoryBot.define do
     type { "Spouse" }
   end
 
+  factory :sibling do
+    name { "#{Faker::Name.first_name} #{Faker::Name.last_name}" }
+    type { "Sibling" }
+  end
+
   factory :fish do
     name { %w[Tilapia Salmon Trout Catfish Pangasius Carp].sample }
   end

data/lib/avo/app.rb

@@ -17,6 +17,14 @@ module Avo
     class_attribute :error_messages
 
     class << self
+      def eager_load(entity)
+        paths = Avo::ENTITIES.fetch entity
+
+        return unless paths.present?
+
+        Rails.autoloaders.main.eager_load_dir(Rails.root.join(*paths).to_s)
+      end
+
       def boot
         init_fields
 
@@ -91,7 +99,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 +127,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

data/lib/avo/base_action.rb

@@ -34,9 +34,9 @@ module Avo
       def form_data_attributes
         # We can't respond with a file download from Turbo se we disable it on the form
         if may_download_file
-          {turbo: false, remote: false}
+          {turbo: false, remote: false, action_target: :form}
         else
-          {"turbo-frame": "_top", "action-target": "form"}
+          {turbo_frame: :_top, action_target: :form}
         end
       end
 

data/lib/avo/base_resource.rb

@@ -49,6 +49,7 @@ module Avo
     class_attribute :record_selector, default: true
     class_attribute :keep_filters_panel_open, default: false
     class_attribute :extra_params
+    class_attribute :link_to_child_resource, default: false
 
     class << self
       delegate :t, to: ::I18n
@@ -422,9 +423,7 @@ module Avo
     end
 
     def label
-      label_field.value || model_title
-    rescue
-      model_title
+      label_field&.value || model_title
     end
 
     def avatar_field
@@ -460,9 +459,7 @@ module Avo
     end
 
     def description
-      description_field.value
-    rescue
-      nil
+      description_field&.value
     end
 
     def form_scope

data/lib/avo/concerns/has_fields.rb

@@ -270,6 +270,8 @@ module Avo
           end
           # each field has it's own visibility checker
           if item.respond_to? :visible?
+            item.hydrate(view: view) if item.view.nil?
+
             next unless item.visible?
           end
           # check if the user is authorized to view it

data/lib/avo/concerns/visible_items.rb

@@ -0,0 +1,44 @@
+# This concern helps us figure out what items are visible for each tab, panel or sidebar
+module Avo
+  module Concerns
+    module VisibleItems
+      extend ActiveSupport::Concern
+      def items
+        if items_holder.present?
+          items_holder.items
+        else
+          []
+        end
+      end
+
+      def visible_items
+        items
+          .map do |item|
+            visible(item) ? item : nil
+          end
+          .compact
+      end
+
+      def visible(item)
+        if item.is_field?
+          item.visible? && item.visible_on?(view)
+        else
+          item.visible?
+        end
+      end
+
+      def visible?
+        any_item_visible = visible_items.any?
+        return any_item_visible unless respond_to?(:visible_on?)
+
+        visible_on?(view) && any_item_visible
+      end
+
+      def hydrate(view: nil)
+        @view = view
+
+        self
+      end
+    end
+  end
+end

data/lib/avo/configuration/branding.rb

@@ -16,7 +16,7 @@ class Avo::Configuration::Branding
     @default_chart_colors = ["#0B8AE2", "#34C683", "#2AB1EE", "#34C6A8"]
     @default_logo = "/avo-assets/logo.png"
     @default_logomark = "/avo-assets/logomark.png"
-    @default_placeholder = "placeholder.svg"
+    @default_placeholder = "/avo-assets/placeholder.svg"
   end
 
   def css_colors

data/lib/avo/dynamic_router.rb

@@ -1,21 +1,22 @@
 module Avo
-  module DynamicRouter
-    def self.routes(router)
-      Rails.application.eager_load! unless Rails.env.production?
+  class DynamicRouter
+    def self.routes
+      Avo::Engine.routes.draw do
+        scope "resources", as: "resources" do
+          Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
 
-      BaseResource.descendants
-        .select do |resource|
-          resource != :BaseResource
-        end
-        .select do |resource|
-          resource.is_a? Class
-        end
-        # .select do |resource|
-        #   resource.model_class.present?
-        # end
-        .map do |resource|
-          router.resources resource.new.route_key
+          BaseResource.descendants
+            .select do |resource|
+              resource != :BaseResource
+            end
+            .select do |resource|
+              resource.is_a? Class
+            end
+            .map do |resource|
+              resources resource.new.route_key
+            end
         end
+      end
     end
   end
 end

data/lib/avo/engine.rb

@@ -27,15 +27,7 @@ module Avo
     end
 
     initializer "avo.autoload" do |app|
-      [
-        ["app", "avo", "fields"],
-        ["app", "avo", "filters"],
-        ["app", "avo", "actions"],
-        ["app", "avo", "resources"],
-        ["app", "avo", "dashboards"],
-        ["app", "avo", "cards"],
-        ["app", "avo", "resource_tools"]
-      ].each do |path_params|
+      Avo::ENTITIES.values.each do |path_params|
         path = Rails.root.join(*path_params)
 
         if File.directory? path.to_s

data/lib/avo/fields/base_field.rb

@@ -83,7 +83,7 @@ module Avo
 
         @args = args
 
-        @updatable = true
+        @updatable = !readonly
         @computable = true
         @computed = block.present?
         @computed_value = nil

data/lib/avo/fields/has_base_field.rb

@@ -7,6 +7,7 @@ module Avo
       attr_accessor :description
       attr_accessor :discreet_pagination
       attr_accessor :hide_search_input
+      attr_reader :link_to_child_resource
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -19,6 +20,7 @@ module Avo
         @description = args[:description]
         @use_resource = args[:use_resource] || nil
         @discreet_pagination = args[:discreet_pagination] || false
+        @link_to_child_resource = args[:link_to_child_resource] || false
       end
 
       def searchable

data/lib/avo/panel.rb

@@ -1,16 +1,19 @@
 class Avo::Panel
   include Avo::Concerns::IsResourceItem
+  include Avo::Concerns::VisibleItems
 
   class_attribute :item_type, default: :panel
 
   attr_reader :name
+  attr_reader :view
   attr_reader :description
   attr_accessor :items_holder
 
   delegate :items, :add_item, to: :items_holder
 
-  def initialize(name: nil, description: nil)
+  def initialize(name: nil, description: nil, view: nil)
     @name = name
+    @view = view
     @description = description
     @items_holder = Avo::ItemsHolder.new
   end

data/lib/avo/sidebar.rb

@@ -1,5 +1,6 @@
 class Avo::Sidebar
   include Avo::Concerns::IsResourceItem
+  include Avo::Concerns::VisibleItems
   include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
   class_attribute :item_type, default: :sidebar
@@ -23,38 +24,7 @@ class Avo::Sidebar
     except_on args[:except_on] if args[:except_on].present?
   end
 
-  def hydrate(view: nil)
-    @view = view
-
-    self
-  end
-
   def empty?
     visible_items.blank?
   end
-
-  def items
-    if self.items_holder.present?
-      self.items_holder.items
-    else
-      []
-    end
-  end
-
-  def visible_items
-    items.map do |item|
-      # Remove the fields that shouldn't be visible in this view
-      # eg: has_many fields on edit
-      if not_visible_field(item)
-        nil
-      else
-        item
-      end
-    end
-    .compact
-  end
-
-  def not_visible_field(item)
-    item.is_field? && !item.visible_on?(view)
-  end
 end

data/lib/avo/tab.rb

@@ -1,5 +1,6 @@
 class Avo::Tab
   include Avo::Concerns::IsResourceItem
+  include Avo::Concerns::VisibleItems
   include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
   class_attribute :item_type, default: :tab
@@ -30,6 +31,10 @@ class Avo::Tab
   def hydrate(view: nil)
     @view = view
 
+    items_holder.items.grep(Avo::Panel).each do |panel|
+      panel.hydrate(view: view)
+    end
+
     self
   end
 
@@ -53,26 +58,4 @@ class Avo::Tab
       super(view)
     end
   end
-
-  def items
-    if self.items_holder.present?
-      self.items_holder.items
-    else
-      []
-    end
-  end
-
-  def visible_items
-    items.map do |item|
-      if item.is_field?
-        visible = item.visible_on?(view)
-        # Remove the fields that shouldn't be visible in this view
-        # eg: has_many fields on edit
-        item = nil unless visible
-      end
-
-      item
-    end
-    .compact
-  end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.18.0" unless const_defined?(:VERSION)
+  VERSION = "2.18.1.pre.1.eagerloaddirs" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -40,6 +40,15 @@ module Avo
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
   COOKIES_KEY = "avo"
+  ENTITIES = {
+    cards: ["app", "avo", "cards"],
+    fields: ["app", "avo", "fields"],
+    filters: ["app", "avo", "filters"],
+    actions: ["app", "avo", "actions"],
+    resources: ["app", "avo", "resources"],
+    dashboards: ["app", "avo", "dashboards"],
+    resource_tools: ["app", "avo", "resource_tools"]
+  }
 
   class LicenseVerificationTemperedError < StandardError; end
 

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

@@ -7783,16 +7783,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   line-height:1.5rem
 }
 
-.text-3xl{
-  font-size:1.875rem;
-  line-height:2.25rem
-}
-
-.text-5xl{
-  font-size:3rem;
-  line-height:1
-}
-
 .text-xl{
   font-size:1.25rem;
   line-height:1.75rem
@@ -7803,6 +7793,16 @@ trix-toolbar .trix-button-group:not(:first-child){
   line-height:1rem
 }
 
+.text-3xl{
+  font-size:1.875rem;
+  line-height:2.25rem
+}
+
+.text-5xl{
+  font-size:3rem;
+  line-height:1
+}
+
 .text-2xl{
   font-size:1.5rem;
   line-height:2rem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.18.1.pre.1.eagerloaddirs
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -1309,7 +1309,6 @@ files:
 - app/assets/svgs/menu-back.svg
 - app/assets/svgs/menu.svg
 - app/assets/svgs/photograph.svg
-- app/assets/svgs/placeholder.svg
 - app/assets/svgs/play.svg
 - app/assets/svgs/plus-circle.svg
 - app/assets/svgs/plus.svg
@@ -1596,7 +1595,7 @@ files:
 - app/controllers/avo/associations_controller.rb
 - app/controllers/avo/attachments_controller.rb
 - app/controllers/avo/base_controller.rb
-- app/controllers/avo/cards_controller.rb
+- app/controllers/avo/dashboards/cards_controller.rb
 - app/controllers/avo/dashboards_controller.rb
 - app/controllers/avo/debug_controller.rb
 - app/controllers/avo/home_controller.rb
@@ -1659,10 +1658,10 @@ files:
 - app/views/avo/base/index.html.erb
 - app/views/avo/base/new.html.erb
 - app/views/avo/base/show.html.erb
-- app/views/avo/cards/_chartkick_card.html.erb
-- app/views/avo/cards/_metric_card.html.erb
-- app/views/avo/cards/chartkick_missing.html.erb
-- app/views/avo/cards/show.html.erb
+- app/views/avo/dashboards/cards/_chartkick_card.html.erb
+- app/views/avo/dashboards/cards/_metric_card.html.erb
+- app/views/avo/dashboards/cards/chartkick_missing.html.erb
+- app/views/avo/dashboards/cards/show.html.erb
 - app/views/avo/dashboards/show.html.erb
 - app/views/avo/debug/index.html.erb
 - app/views/avo/debug/report.html.erb
@@ -1708,6 +1707,7 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
+- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1727,6 +1727,7 @@ files:
 - lib/avo/concerns/has_stimulus_controllers.rb
 - lib/avo/concerns/is_resource_item.rb
 - lib/avo/concerns/model_class_constantized.rb
+- lib/avo/concerns/visible_items.rb
 - lib/avo/configuration.rb
 - lib/avo/configuration/branding.rb
 - lib/avo/configuration/resource_configuration.rb
@@ -1927,6 +1928,7 @@ files:
 - public/avo-assets/logo-on-white.png
 - public/avo-assets/logo.png
 - public/avo-assets/logomark.png
+- public/avo-assets/placeholder.svg
 homepage: https://avohq.io
 licenses:
 - Commercial
@@ -1947,9 +1949,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: 

data/app/controllers/avo/cards_controller.rb

@@ -1,35 +0,0 @@
-require_dependency "avo/application_controller"
-
-module Avo
-  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