avo 2.24.1 → 2.25.1.pre.1.pr1579

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd9af86b6e3a217455a722a02f0e63ac1730f3d38bc8cf437c2e7acf51e42393
-  data.tar.gz: 3ec156f8d9aa616fe254d91f676d365ce949407c7496b9deac4147213ac25868
+  metadata.gz: ae32fd05a8d35cbd8d5253344b8ebd26a96d98414430020ffa0e1ea80eb4b761
+  data.tar.gz: b5a36ad70462507937a96bf563842b986f086c72fcd8b489fbeafb5779228ed9
 SHA512:
-  metadata.gz: 6b36e26266d5f1db62580fcc1504e413bb037d5da0a6381bb7cb4785d9db64486f2c2d57d75ebb17ed1b8f21252bbda1c4ef2140ed659bfe62c2117a5c331955
-  data.tar.gz: 365bb62634783fb83f3a0a3e88fa48f0f35ab64eae9ddeca321ed91f8c1fdaf5468f99e851beb602c2688b2a20db0b956143850e3e09006c07807f6384178837
+  metadata.gz: a3e978151ea7f78ce700368e91bfc5bb0a181c12532a693b998a61c0fc93416fb679c59c2bec892caf5b2f356fa7d431c2c6ff1f540435438a5576b04dd4958b
+  data.tar.gz: 801644a98e243eea9ae43728cf4e321baddc19f2703700ed83b6f701be1e2a89bcd086c1b02381dca52fc161650e70c61770c80dd0a3575f93170ace07b8c9e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.24.1)
+    avo (2.25.1.pre.1.pr1579)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -19,40 +19,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actioncable (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionmailbox (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       mail (>= 2.7.1)
-    actionmailer (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      actionview (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionmailer (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      actionview (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.6.1)
-      actionview (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionpack (6.1.7.2)
+      actionview (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actiontext (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       nokogiri (>= 1.8.5)
-    actionview (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    actionview (6.1.7.2)
+      activesupport (= 6.1.7.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -62,22 +62,22 @@ GEM
       addressable
     active_median (0.3.3)
       activesupport (>= 5.2)
-    activejob (6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activejob (6.1.7.2)
+      activesupport (= 6.1.7.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.6.1)
-      activesupport (= 6.1.6.1)
-    activerecord (6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
-    activestorage (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    activemodel (6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activerecord (6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activestorage (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.6.1)
+    activesupport (6.1.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -142,7 +142,7 @@ GEM
       xpath (~> 3.2)
     chartkick (4.2.1)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     countries (4.2.3)
       i18n_data (~> 0.16.0)
       sixarm_ruby_unaccent (~> 1.1)
@@ -157,6 +157,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    date (3.3.3)
     devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -171,7 +172,7 @@ GEM
       railties (>= 3.2)
     dry-initializer (3.1.1)
     erb-formatter (0.3.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
@@ -186,7 +187,7 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     gem-release (2.2.2)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     groupdate (6.1.0)
       activesupport (>= 5.2)
@@ -237,8 +238,11 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     manifester (0.1.8)
       rails (>= 6.0)
       zeitwerk
@@ -249,19 +253,24 @@ GEM
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     minitest (5.17.0)
     msgpack (1.5.6)
     multi_xml (0.6.0)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
     net-protocol (0.1.3)
       timeout
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.14.1)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (6.0.1)
@@ -274,24 +283,24 @@ GEM
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.1)
-    rack (2.2.5)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (6.1.6.1)
-      actioncable (= 6.1.6.1)
-      actionmailbox (= 6.1.6.1)
-      actionmailer (= 6.1.6.1)
-      actionpack (= 6.1.6.1)
-      actiontext (= 6.1.6.1)
-      actionview (= 6.1.6.1)
-      activejob (= 6.1.6.1)
-      activemodel (= 6.1.6.1)
-      activerecord (= 6.1.6.1)
-      activestorage (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    rails (6.1.7.2)
+      actioncable (= 6.1.7.2)
+      actionmailbox (= 6.1.7.2)
+      actionmailer (= 6.1.7.2)
+      actionpack (= 6.1.7.2)
+      actiontext (= 6.1.7.2)
+      actionview (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       bundler (>= 1.15.0)
-      railties (= 6.1.6.1)
+      railties (= 6.1.7.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -300,14 +309,14 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     rails-i18n (7.0.5)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (6.1.6.1)
-      actionpack (= 6.1.6.1)
-      activesupport (= 6.1.6.1)
+    railties (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -404,7 +413,7 @@ GEM
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
     view_component (2.82.0)
@@ -431,7 +440,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

data/app/components/avo/base_component.rb

@@ -23,10 +23,10 @@ class Avo::BaseComponent < ViewComponent::Base
 
     model_klass = ::Avo::BaseResource.valid_model_class model_class_name
 
-    model = model_klass.find params[:via_resource_id]
-
     resource = ::Avo::App.get_resource_by_model_name model_klass if resource.blank?
 
+    model = resource.find_record params[:via_resource_id], query: model_klass
+
     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 = polymorphic_class.safe_constantize.find polymorphic_id
+    @polymorphic_record = @resource.find_record polymorphic_id, query: polymorphic_class.safe_constantize
 
     @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.id
+      via_resource_id: @resource.model.to_param
     )
   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.id, @field.id)
+    helpers.avo.resources_associations_new_path(@resource.singular_model_key, @resource.model.to_param, @field.id)
   end
 
   def can_see_the_create_button?
-    create = "create_#{@field.id.to_s}?"
+    create = "create_#{@field.id}?"
 
     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.id
+      via_resource_id: @resource.model.to_param
     }
     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.id
+        via_resource_id: @parent_model.to_param
       }
     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.id
+        via_resource_id: @parent_model.to_param
       }
     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.id, **args)
+    Avo::App.view_context.avo.reorder_order_path(resource.route_key, resource.model.to_param, **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.id
+        via_resource_id: @parent_model.to_param
       }
     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.id
+        via_resource_id: @parent_model.to_param
       }
     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.id)
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.to_param)
   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.id
+        via_resource_id: @parent_model.to_param
       }
 
       if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
@@ -98,7 +98,9 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def attach_path
-    Avo::App.root_path(paths: [request.env["PATH_INFO"], "new"])
+    current_path = CGI.unescape(request.env["PATH_INFO"]).split("/").select(&:present?)
+
+    Avo::App.root_path(paths: [*current_path, "new"])
   end
 
   def singular_resource_name
@@ -142,10 +144,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.id
+      id: @parent_model.to_param
     }
   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.class.find_scope.find resource_ids
+          @resource.find_record resource_ids
         end
       end
 

data/app/controllers/avo/application_controller.rb

@@ -128,11 +128,7 @@ module Avo
     end
 
     def set_model
-      @model = model_find_scope.find record_id
-    end
-
-    def record_id
-      params.permit(:id).dig(:id)
+      @model = @resource.find_record(params[:id], query: model_find_scope)
     end
 
     def model_find_scope
@@ -145,11 +141,10 @@ 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
-        eager_load_files(@related_resource, @model.send(association_name)).find params[:related_id]
+        @related_resource.find_record params[:related_id], query: eager_load_files(@related_resource, @model.send(association_name))
       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.class.find_scope.find(params[:id])
+      @parent_model = @parent_resource.find_record(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 = @attachment_class.find attachment_id
+      @attachment_model = @related_resource.find_record 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.class.find_scope.find params[:via_resource_id]
+        via_model = via_resource.find_record 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.class.find_scope.find params[:via_resource_id]
+        via_model = via_resource.find_record params[:via_resource_id]
         via_resource.hydrate model: via_model
 
         add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
@@ -137,7 +137,10 @@ 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)
-          @model.send("#{@reflection.foreign_key}=", params[:via_resource_id])
+          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.save
         end
 
@@ -145,7 +148,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.model_class.find params[:via_resource_id]
+          @related_record = via_resource.find_record params[:via_resource_id]
           association_name = BaseResource.valid_association_name(@model, params[:via_relation])
 
           @model.send(association_name) << @related_record
@@ -385,7 +388,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.class.find_scope.find params[:via_resource_id]
+        via_model = via_resource.find_record 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,6 +1,11 @@
 <%= 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: "#{avo.root_path}resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
+    url: url,
     local: true,
     data: {
       'turbo-frame': '_top'

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

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

data/config/master.key

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

data/db/factories.rb

@@ -31,7 +31,7 @@ FactoryBot.define do
 
   factory :project do
     name { Faker::App.name }
-    status { [:closed, :rejected, :failed, :loading, :running, :waiting].sample }
+    status { ['closed', :rejected, :failed, 'loading', :running, :waiting].sample }
     stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled"].sample }
     budget { Faker::Number.decimal(l_digits: 4) }
     country { Faker::Address.country_code }

data/lib/avo/base_resource.rb

@@ -42,6 +42,9 @@ 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
@@ -379,7 +382,11 @@ 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
-              value = @params[:via_resource_id]
+              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)
             end
           end
 
@@ -488,5 +495,11 @@ 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/fields/has_one_field.rb

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

data/lib/avo/fields/status_field.rb

@@ -4,8 +4,8 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten : [:waiting, :running]
-        @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten : [:failed]
+        @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten.map(&:to_sym) : [:waiting, :running]
+        @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten.map(&:to_sym) : [:failed]
       end
 
       def status

data/lib/avo/services/uri_service.rb

@@ -3,13 +3,13 @@ module Avo
     class URIService
       class << self
         def parse(path)
-          self.new path
+          new path
         end
       end
 
       attr_reader :uri
 
-      def initialize(path = '')
+      def initialize(path = "")
         @uri = Addressable::URI.parse(path)
       end
 
@@ -56,19 +56,20 @@ 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..-1]
+        if path.to_s.starts_with? "/"
+          path = path[1..]
         end
 
-        path
+        ERB::Util.url_encode path
       end
     end
   end

data/lib/avo/version.rb

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

data/lib/generators/avo/resource_generator.rb

@@ -18,19 +18,19 @@ module Generators
       end
 
       def resource_class
-        "#{class_name}Resource"
+        "#{class_name.remove(":")}Resource"
       end
 
       def controller_class
-        "Avo::#{class_name.camelize.pluralize}Controller"
+        "Avo::#{class_name.remove(":").pluralize}Controller"
       end
 
       def resource_name
-        "#{singular_name}_resource"
+        "#{model_resource_name}_resource"
       end
 
       def controller_name
-        "#{plural_name}_controller"
+        "#{model_resource_name.pluralize}_controller"
       end
 
       def current_models
@@ -40,11 +40,13 @@ module Generators
       end
 
       def class_from_args
-        @class_from_args ||= options["model-class"]&.capitalize
+        @class_from_args ||= options["model-class"]&.camelize || (class_name if class_name.include?("::"))
       end
 
       def model_class_from_args
-        "\n  self.model_class = ::#{class_from_args}" if class_from_args.present?
+        if class_from_args.present? || class_name.include?("::")
+          "\n  self.model_class = ::#{class_from_args || class_name}"
+        end
       end
 
       private
@@ -58,7 +60,7 @@ module Generators
       end
 
       def model_db_columns
-        @model_db_columns ||= model.columns_hash.reject { |name, _| db_columns_to_ignore.include? name }
+        @model_db_columns ||= model.columns_hash.except(*db_columns_to_ignore)
       end
 
       def db_columns_to_ignore
@@ -155,14 +157,30 @@ module Generators
 
       def fields_from_model_associations
         associations.each do |name, association|
-          fields[name] = associations_mapping[association.class]
-
-          if association.is_a? ActiveRecord::Reflection::ThroughReflection
-            fields[name][:options][:through] = ":#{association.options[:through]}"
+          fields[name] = if association.is_a? ActiveRecord::Reflection::ThroughReflection
+            field_from_through_association(association)
+          else
+            associations_mapping[association.class]
           end
         end
       end
 
+      def field_from_through_association(association)
+        if association.through_reflection.is_a? ActiveRecord::Reflection::HasManyReflection
+          {
+            field: "has_many",
+            options: {
+              through: ":#{association.options[:through]}"
+            }
+          }
+        else
+          # If the through_reflection is not a HasManyReflection, add it to the fields hash using the class of the through_reflection
+          # ex (team.rb): has_one :admin, through: :admin_membership, source: :user
+          # we use the class of the through_reflection (HasOneReflection -> has_one :admin) to generate the field
+          associations_mapping[association.through_reflection.class]
+        end
+      end
+
       def fields_from_model_attachements
         attachments.each do |name, attachment|
           fields[remove_last_word_from name] = attachments_mapping[attachment.class]
@@ -210,12 +228,6 @@ module Generators
           ActiveRecord::Reflection::HasManyReflection => {
             field: "has_many"
           },
-          ActiveRecord::Reflection::ThroughReflection => {
-            field: "has_many",
-            options: {
-              through: ":..."
-            }
-          },
           ActiveRecord::Reflection::HasAndBelongsToManyReflection => {
             field: "has_and_belongs_to_many"
           }

data/lib/generators/avo/templates/initializer/avo.tt

@@ -17,7 +17,8 @@ Avo.configure do |config|
 
   ## == Authentication ==
   # config.current_user_method = {}
-  # config.authenticate_with = {}
+  # config.authenticate_with do
+  # end
 
   ## == Authorization ==
   # config.authorization_methods = {
@@ -76,8 +77,9 @@ Avo.configure do |config|
   #   },
   #   chart_colors: ["#0B8AE2", "#34C683", "#2AB1EE", "#34C6A8"],
   #   logo: "/avo-assets/logo.png",
-  #   logomark: "/avo-assets/logomark.png"
-  #   placeholder: "/avo-assets/placeholder.svg"
+  #   logomark: "/avo-assets/logomark.png",
+  #   placeholder: "/avo-assets/placeholder.svg",
+  #   favicon: "/avo-assets/favicon.ico"
   # }
 
   ## == Breadcrumbs ==

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.24.1
+  version: 2.25.1.pre.1.pr1579
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1695,6 +1695,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
@@ -1950,9 +1951,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.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: