avo 2.25.1.pre.1.pr1579 → 2.26.1.pr1584.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae32fd05a8d35cbd8d5253344b8ebd26a96d98414430020ffa0e1ea80eb4b761
-  data.tar.gz: b5a36ad70462507937a96bf563842b986f086c72fcd8b489fbeafb5779228ed9
+  metadata.gz: 7a5ed608bd7bb2383b9d541e6628cd09ae0f59c074fc01a809c48ad9c8286fb5
+  data.tar.gz: 2bea6d2082fb7d5c991ea7a948c3530566752d9d386987b15da6c718339b0ed8
 SHA512:
-  metadata.gz: a3e978151ea7f78ce700368e91bfc5bb0a181c12532a693b998a61c0fc93416fb679c59c2bec892caf5b2f356fa7d431c2c6ff1f540435438a5576b04dd4958b
-  data.tar.gz: 801644a98e243eea9ae43728cf4e321baddc19f2703700ed83b6f701be1e2a89bcd086c1b02381dca52fc161650e70c61770c80dd0a3575f93170ace07b8c9e6
+  metadata.gz: 7216406691593c3219f9a8977ff4c9fdc4520afac0280dd006e28e1b7ad7bf018813434cff06f91f1eaccb96f54e98a29f2932e7e6f892e8e2400d19cfce152e
+  data.tar.gz: ff1c08ce8d21d27ad23421298f03fc35cb16f3cfefb21c04fc82a6842c2f2b90083cfb185ae5b40b918c415201bf58dc59f0c5d28af5f61c9f49be54544b5162

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.25.1.pre.1.pr1579)
+    avo (2.26.1.pr1584.pre.1)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/components/avo/base_component.rb

@@ -23,9 +23,9 @@ class Avo::BaseComponent < ViewComponent::Base
 
     model_klass = ::Avo::BaseResource.valid_model_class model_class_name
 
-    resource = ::Avo::App.get_resource_by_model_name model_klass if resource.blank?
+    model = model_klass.find params[:via_resource_id]
 
-    model = resource.find_record params[:via_resource_id], query: model_klass
+    resource = ::Avo::App.get_resource_by_model_name model_klass if resource.blank?
 
     resource.dup.hydrate model: model
   end

data/app/components/avo/fields/belongs_to_field/edit_component.rb

@@ -44,7 +44,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
     return @polymorphic_record if @polymorphic_record.present?
 
-    @polymorphic_record = @resource.find_record polymorphic_id, query: polymorphic_class.safe_constantize
+    @polymorphic_record = polymorphic_class.safe_constantize.find polymorphic_id
 
     @polymorphic_record
   end

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

@@ -6,7 +6,7 @@ class Avo::Fields::BelongsToField::ShowComponent < Avo::Fields::ShowComponent
       model: @field.value,
       resource: @field.target_resource,
       via_resource_class: @resource.class.to_s,
-      via_resource_id: @resource.model.to_param
+      via_resource_id: @resource.model.id
     )
   end
 end

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

@@ -21,11 +21,11 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   end
 
   def attach_path
-    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.to_param, @field.id)
+    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.id, @field.id)
   end
 
   def can_see_the_create_button?
-    create = "create_#{@field.id}?"
+    create = "create_#{@field.id.to_s}?"
 
     authorization_service = @resource.authorization
 
@@ -39,7 +39,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
     args = {
       via_relation: @resource.singular_model_key,
       via_relation_class: @resource.model_class.to_s,
-      via_resource_id: @resource.model.to_param
+      via_resource_id: @resource.model.id
     }
     helpers.new_resource_path(resource: @field.target_resource, **args)
   end

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

@@ -22,7 +22,7 @@ class Avo::Fields::IndexComponent < Avo::BaseComponent
     if @parent_model.present?
       args = {
         via_resource_class: @parent_resource.class,
-        via_resource_id: @parent_model.to_param
+        via_resource_id: @parent_model.id
       }
     end
 

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

@@ -33,7 +33,7 @@ class Avo::Index::GridItemComponent < Avo::BaseComponent
     if @parent_model.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.to_param
+        via_resource_id: @parent_model.id
       }
     end
 

data/app/components/avo/index/ordering/button_component.rb

@@ -18,6 +18,6 @@ class Avo::Index::Ordering::ButtonComponent < Avo::Index::Ordering::BaseComponen
   end
 
   def order_path(args)
-    Avo::App.view_context.avo.reorder_order_path(resource.route_key, resource.model.to_param, **args)
+    Avo::App.view_context.avo.reorder_order_path(resource.route_key, resource.model.id, **args)
   end
 end

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

@@ -37,7 +37,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     if @parent_model.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.to_param
+        via_resource_id: @parent_model.id
       }
     end
 
@@ -51,7 +51,7 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
     if @parent_model.present?
       args = {
         via_resource_class: parent_resource.class.to_s,
-        via_resource_id: @parent_model.to_param
+        via_resource_id: @parent_model.id
       }
     end
 

data/app/components/avo/resource_component.rb

@@ -26,7 +26,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
   def detach_path
     return "/" if @reflection.blank?
 
-    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.to_param)
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
   end
 
   def can_see_the_edit_button?

data/app/components/avo/views/resource_index_component.rb

@@ -74,7 +74,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     if @reflection.present?
       args = {
         via_relation_class: reflection_model_class,
-        via_resource_id: @parent_model.to_param
+        via_resource_id: @parent_model.id
       }
 
       if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
@@ -98,9 +98,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def attach_path
-    current_path = CGI.unescape(request.env["PATH_INFO"]).split("/").select(&:present?)
-
-    Avo::App.root_path(paths: [*current_path, "new"])
+    Avo::App.root_path(paths: [request.env["PATH_INFO"], "new"])
   end
 
   def singular_resource_name
@@ -144,10 +142,10 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     return unless @reflection.present?
 
     {
-      association: "has_many",
+      association: 'has_many',
       association_id: @reflection.name,
       class: reflection_model_class,
-      id: @parent_model.to_param
+      id: @parent_model.id
     }
   end
 end

data/app/controllers/avo/actions_controller.rb

@@ -35,7 +35,7 @@ module Avo
         args[:models] = if @selected_query.present?
           @resource.model_class.find_by_sql decrypted_query
         else
-          @resource.find_record resource_ids
+          @resource.class.find_scope.find resource_ids
         end
       end
 

data/app/controllers/avo/application_controller.rb

@@ -128,7 +128,7 @@ module Avo
     end
 
     def set_model
-      @model = @resource.find_record(params[:id], query: model_find_scope)
+      @model = model_find_scope.find params[:id]
     end
 
     def model_find_scope
@@ -141,10 +141,11 @@ module Avo
 
     def set_related_model
       association_name = BaseResource.valid_association_name(@model, params[:related_name])
+
       @related_model = if @field.is_a? Avo::Fields::HasOneField
         @model.send association_name
       else
-        @related_resource.find_record params[:related_id], query: eager_load_files(@related_resource, @model.send(association_name))
+        eager_load_files(@related_resource, @model.send(association_name)).find params[:related_id]
       end
     end
 

data/app/controllers/avo/associations_controller.rb

@@ -21,7 +21,7 @@ module Avo
     def index
       @parent_resource = @resource.dup
       @resource = @related_resource
-      @parent_model = @parent_resource.find_record(params[:id])
+      @parent_model = @parent_resource.class.find_scope.find(params[:id])
       @parent_resource.hydrate(model: @parent_model)
       association_name = BaseResource.valid_association_name(@parent_model, params[:related_name])
       @query = @related_authorization.apply_policy @parent_model.send(association_name)
@@ -113,7 +113,7 @@ module Avo
     end
 
     def set_attachment_model
-      @attachment_model = @related_resource.find_record attachment_id
+      @attachment_model = @attachment_class.find attachment_id
     end
 
     def set_reflection_field

data/app/controllers/avo/base_controller.rb

@@ -90,7 +90,7 @@ module Avo
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
         via_resource = Avo::App.get_resource(params[:via_resource_class]).dup
-        via_model = via_resource.find_record params[:via_resource_id]
+        via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
@@ -113,7 +113,7 @@ module Avo
 
       if is_associated_record?
         via_resource = Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
-        via_model = via_resource.find_record params[:via_resource_id]
+        via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
@@ -137,10 +137,7 @@ module Avo
         # Fills in the required infor for belongs_to and has_many
         # Get the foreign key and set it to the id we received in the params
         if @reflection.is_a?(ActiveRecord::Reflection::BelongsToReflection) || @reflection.is_a?(ActiveRecord::Reflection::HasManyReflection)
-          related_resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
-          related_record = related_resource.find_record params[:via_resource_id]
-
-          @model.send("#{@reflection.foreign_key}=", related_record.id)
+          @model.send("#{@reflection.foreign_key}=", params[:via_resource_id])
           @model.save
         end
 
@@ -148,7 +145,7 @@ module Avo
         if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
           # find the record
           via_resource = ::Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
-          @related_record = via_resource.find_record params[:via_resource_id]
+          @related_record = via_resource.model_class.find params[:via_resource_id]
           association_name = BaseResource.valid_association_name(@model, params[:via_relation])
 
           @model.send(association_name) << @related_record
@@ -388,7 +385,7 @@ module Avo
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
         via_resource = Avo::App.get_resource(params[:via_resource_class]).dup
-        via_model = via_resource.find_record params[:via_resource_id]
+        via_model = via_resource.class.find_scope.find params[:via_resource_id]
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)

data/app/views/avo/associations/new.html.erb

@@ -1,11 +1,6 @@
 <%= turbo_frame_tag 'attach_modal' do %>
-  <%
-    url = Avo::Services::URIService.parse(avo.root_url.to_s)
-      .append_paths('resources', params[:resource_name], params[:id], params[:related_name])
-      .to_s
-  %>
   <%= form_with scope: 'fields',
-    url: url,
+    url: "#{avo.root_path}resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
     local: true,
     data: {
       'turbo-frame': '_top'

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

@@ -1,6 +1,6 @@
-<style>
+<%= content_tag(:style, nonce: content_security_policy_nonce) do %>
   :root {
     <%= Avo.configuration.branding.css_colors %>
   }
-</style>
+<% end %>
 <%= favicon_link_tag Avo.configuration.branding.favicon %>

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

@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<!-- ✨ Built with Avo • https://www.avohq.io/ -->
 <html>
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -63,4 +62,3 @@
     <!-- License valid?: <%= Avo::App.license.valid ? "valid" : "invalid" %>  -->
   </body>
 </html>
-<!-- ✨ Built with Avo • https://www.avohq.io/ -->

data/lib/avo/app.rb

@@ -115,8 +115,45 @@ module Avo
         end
       end
 
+      # Fetches the resources available to the application.
+      # We have two ways of doing that.
+      #
+      # 1. Through eager loading.
+      # We automatically eager load the resources directory and fetch the descendants from the scanned files.
+      # This is the simple way to get started.
+      #
+      # 2. Manually, declared by the user.
+      # We have this option to load the resources because when they are loaded automatically through eager loading,
+      # those Resource classes and their methods may trigger loading other classes. And that may disrupt Rails booting process.
+      # Ex: AdminResource may use self.model_class = User. That will trigger Ruby to load the User class and itself load
+      # other classes in a chain reaction.
+      # The scenario that comes up most often is when Rails boots, the routes are being computed which eager loads the resource files.
+      # At that boot time some migration might have not been run yet, but Rails tries to access them through model associations,
+      # and they are not available.
+      #
+      # To enable this feature add a `resources` array config in your Avo initializer.
+      # config.resources = [
+      #   "UserResource",
+      #   "FishResource",
+      # ]
+      def fetch_resources
+        resources = if Avo.configuration.resources.nil?
+          BaseResource.descendants
+        else
+          Avo.configuration.resources
+        end
+
+        resources.map do |resource|
+          if resource.is_a?(Class)
+            resource
+          else
+            resource.to_s.safe_constantize
+          end
+        end
+      end
+
       def init_resources
-        self.resources = BaseResource.descendants
+        self.resources = fetch_resources
           .select do |resource|
             # Remove the BaseResource. We only need the descendants
             resource != BaseResource

data/lib/avo/base_card.rb

@@ -89,7 +89,6 @@ module Avo
         5 => " h-[45rem]",
         6 => " h-[54rem]"
       }
-      # puts ["cols->", cols, classes_for_cols, classes_for_rows, classes_for_cols[cols.to_i]].inspect
 
       result += classes_for_cols[cols.to_i] if classes_for_cols[cols.to_i].present?
       result += classes_for_rows[rows.to_i] if classes_for_rows[rows.to_i].present?
@@ -98,9 +97,9 @@ module Avo
     end
 
     def type
-      return :metric if self.class.superclass == ::Avo::Dashboards::MetricCard
-      return :chartkick if self.class.superclass == ::Avo::Dashboards::ChartkickCard
-      return :partial if self.class.superclass == ::Avo::Dashboards::PartialCard
+      return :metric if is_a?(::Avo::Dashboards::MetricCard)
+      return :chartkick if is_a?(::Avo::Dashboards::ChartkickCard)
+      return :partial if is_a?(::Avo::Dashboards::PartialCard)
     end
 
     def compute_result

data/lib/avo/base_resource.rb

@@ -42,9 +42,6 @@ module Avo
     class_attribute :unscoped_queries_on_index, default: false
     class_attribute :resolve_query_scope
     class_attribute :resolve_find_scope
-    class_attribute :find_record_method, default: ->(model_class:, id:) {
-      model_class.find id
-    }
     class_attribute :ordering
     class_attribute :hide_from_global_search, default: false
     class_attribute :after_create_path, default: :show
@@ -382,11 +379,7 @@ module Avo
               # set the value to the actual record
               value = @params[:via_relation_class].safe_constantize.find(@params[:via_resource_id])
             elsif reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
-              resource = Avo::App.get_resource_by_model_name params[:via_relation_class]
-              model = resource.find_record @params[:via_resource_id]
-              id_param = reflection.options[:primary_key] || :id
-
-              value = model.send(id_param)
+              value = @params[:via_resource_id]
             end
           end
 
@@ -495,11 +488,5 @@ module Avo
     def has_model_id?
       model.present? && model.id.present?
     end
-
-    def find_record(id, query: nil)
-      query ||= self.class.find_scope
-
-      self.class.find_record_method.call(model_class: query, id: id)
-    end
   end
 end

data/lib/avo/configuration.rb

@@ -41,6 +41,7 @@ module Avo
     attr_accessor :authorization_client
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
+    attr_accessor :resources
     attr_writer :branding
 
     def initialize
@@ -92,6 +93,7 @@ module Avo
       @resource_default_view = :show
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
+      @resources = nil
     end
 
     def current_user_method(&block)

data/lib/avo/dynamic_router.rb

@@ -3,9 +3,13 @@ module Avo
     def self.routes
       Avo::Engine.routes.draw do
         scope "resources", as: "resources" do
-          Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
+          # Check if the user chose to manually register the resource files.
+          # If so, eager_load the resources dir.
+          if Avo.configuration.resources.nil?
+            Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
+          end
 
-          BaseResource.descendants
+          Avo::App.fetch_resources
             .select do |resource|
               resource != :BaseResource
             end

data/lib/avo/fields/has_one_field.rb

@@ -29,7 +29,6 @@ module Avo
       end
 
       def fill_field(model, key, value, params)
-        puts ["!!!!!!!!->"].inspect
         if value.blank?
           related_model = nil
         else

data/lib/avo/services/uri_service.rb

@@ -3,13 +3,13 @@ module Avo
     class URIService
       class << self
         def parse(path)
-          new path
+          self.new path
         end
       end
 
       attr_reader :uri
 
-      def initialize(path = "")
+      def initialize(path = '')
         @uri = Addressable::URI.parse(path)
       end
 
@@ -56,20 +56,19 @@ module Avo
       private
 
       def join_paths(paths)
-        paths
-          .map do |path|
-            sanitize_path path
-          end
-          .join("/")
+        paths.map do |path|
+          sanitize_path path
+        end
+        .join("/")
       end
 
       # Removes the forward slash if it's present at the start of the path
       def sanitize_path(path)
-        if path.to_s.starts_with? "/"
-          path = path[1..]
+        if path.to_s.starts_with? '/'
+          path = path[1..-1]
         end
 
-        ERB::Util.url_encode path
+        path
       end
     end
   end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.25.1.pre.1.pr1579" unless const_defined?(:VERSION)
+  VERSION = "2.26.1.pr1584.pre.1" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.25.1.pre.1.pr1579
+  version: 2.26.1.pr1584.pre.1
 platform: ruby
 authors:
 - Adrian Marin