avo 3.17.7 → 3.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d37cac842e01c924da20b541aae0072dac630d725d61faa4760d3b90d077ae5
-  data.tar.gz: 1838971f0c60d36aa7d47457f4e394c9106afdd5442a930c14a39e3425d908f1
+  metadata.gz: 9e776b4d3c05d50eb82a2f18d433fba1f0eb772708aa1454f5261acf02c40e90
+  data.tar.gz: 286dc3f948587185ea5120d4644d050142c7a3623e907329b8d7e1cec5df72dd
 SHA512:
-  metadata.gz: d1a371f602937cb5b3146d13e12dcef3a3a0d4f84db2f5e7691c28c1b5f5c83573c385e1d2ce27e359c388dbaef077c0702cd96c6674752ff069b09e071c6f69
-  data.tar.gz: 3cb0dc6ff3b544fa46a67cce144beadb2451b91acc9dfb936257b464b6bcf81dc2dabea079d4359c8db84725a8da18823957b2f32e5b179ffbfcca035fad5254
+  metadata.gz: 67ee9428d2759f669805fc3b3f4a5f5472f6f8ddbbc8a9e22982854f41dd78d4a5a5528d3f385fd9b1a23195fae936bd96af883b12039cff68e6ab309ef6760d
+  data.tar.gz: 96cb89c794b12fd7a327f79ffd13a7ab7bab2a92d75d934324a4022fb772d160049ccaa9ed56ddcf6b29f69a43a85c401e8682d255cc0a73418be9361e09766e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.17.7)
+    avo (3.17.8)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)
@@ -129,18 +129,18 @@ GEM
     avo-money_field (0.0.5)
       money-rails (~> 1.12)
     avo-record_link_field (0.0.2)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.1050.0)
-    aws-sdk-core (3.218.1)
+    aws-eventstream (1.3.1)
+    aws-partitions (1.1052.0)
+    aws-sdk-core (3.219.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.98.0)
+    aws-sdk-kms (1.99.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.180.0)
+    aws-sdk-s3 (1.182.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -178,7 +178,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (5.1.3)
+    chartkick (5.1.4)
     childprocess (5.1.0)
       logger (~> 1.5)
     coercible (1.0.0)
@@ -376,7 +376,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.5)
+    logger (1.6.6)
     loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -422,9 +422,9 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.2-arm64-darwin)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-linux-gnu)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     orm_adapter (0.5.0)
@@ -527,7 +527,7 @@ GEM
       railties (>= 5.2)
     reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.4.0)
+    rexml (3.4.1)
     ripper-tags (1.0.2)
     rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
@@ -645,7 +645,7 @@ GEM
     standard-performance (1.6.0)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.23.0)
-    stringio (3.1.2)
+    stringio (3.1.3)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
     terminal-table (4.0.0)
@@ -696,7 +696,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.37)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   arm64-darwin-23

data/app/components/avo/paginator_component.rb

@@ -3,6 +3,7 @@
 class Avo::PaginatorComponent < Avo::BaseComponent
   prop :resource
   prop :parent_record
+  prop :parent_resource
   prop :pagy
   prop :turbo_frame do |frame|
     frame.present? ? CGI.escapeHTML(frame) : :_top
@@ -12,7 +13,14 @@ class Avo::PaginatorComponent < Avo::BaseComponent
 
   def change_items_per_page_url(option)
     if @parent_record.present?
-      helpers.related_resources_path(@parent_record, @parent_record, per_page: option, keep_query_params: true, page: 1)
+      helpers.related_resources_path(
+        @parent_record,
+        @parent_record,
+        parent_resource: @parent_resource,
+        per_page: option,
+        keep_query_params: true,
+        page: 1
+      )
     else
       helpers.resources_path(resource: @resource, per_page: option, keep_query_params: true, page: 1)
     end

data/app/components/avo/views/resource_index_component.html.erb

@@ -79,7 +79,7 @@
       <% if view_type.to_sym == :table || view_type.to_sym == :map %>
         <% if @records.present? %>
           <div class="mt-4 w-full">
-            <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame, index_params: @index_params, resource: @resource, parent_record: @parent_record, discreet_pagination: field&.discreet_pagination %>
+            <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame, index_params: @index_params, resource: @resource, parent_record: @parent_record, parent_resource: @parent_resource, discreet_pagination: field&.discreet_pagination %>
           </div>
         <% end %>
       <% end %>
@@ -88,7 +88,7 @@
           <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, actions: @actions) %>
         </div>
         <div class="mt-6">
-          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame, index_params: @index_params, resource: @resource, parent_record: @parent_record, discreet_pagination: field&.discreet_pagination %>
+          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame, index_params: @index_params, resource: @resource, parent_record: @parent_record, parent_resource: @parent_resource, discreet_pagination: field&.discreet_pagination %>
         </div>
       <% end %>
     <% end %>

data/app/helpers/avo/url_helpers.rb

@@ -61,6 +61,7 @@ module Avo
       parent_record,
       record,
       keep_query_params: false,
+      parent_resource: nil,
       **args
     )
       return if record.nil?
@@ -75,7 +76,9 @@ module Avo
       rescue
       end
 
-      avo.resources_associations_index_path(parent_record.model_name.route_key, record.to_param, **existing_params, **args)
+      route_key = parent_resource&.route_key || parent_record.model_name.route_key
+
+      avo.resources_associations_index_path(route_key, record.to_param, **existing_params, **args)
     end
 
     def resource_view_path(**args)

data/lib/avo/version.rb

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

data/lib/generators/avo/resource_generator.rb

@@ -185,11 +185,34 @@ module Generators
 
         def fields_from_model_associations
           associations.each do |name, association|
-            fields[name] = if association.is_a? ActiveRecord::Reflection::ThroughReflection
-              field_from_through_association(association)
-            else
-              ::Avo::Mappings::ASSOCIATIONS_MAPPING[association.class]
-            end
+            fields[name] =
+              if association.polymorphic?
+                field_with_polymorphic_association(association)
+              elsif association.is_a?(ActiveRecord::Reflection::ThroughReflection)
+                field_from_through_association(association)
+              else
+                ::Avo::Mappings::ASSOCIATIONS_MAPPING[association.class]
+              end
+          end
+        end
+
+        def field_with_polymorphic_association(association)
+          Rails.application.eager_load! unless Rails.application.config.eager_load
+
+          types = polymorphic_association_types(association)
+
+          {
+            field: "belongs_to",
+            options: {
+              polymorphic_as: ":#{association.name}",
+              types: types.presence || "[] # Types weren't computed correctly. Please configure them."
+            }
+          }
+        end
+
+        def polymorphic_association_types(association)
+          ActiveRecord::Base.descendants.filter_map do |model|
+            Inspector.new(model.name) if model.reflect_on_all_associations(:has_many).any? { |assoc| assoc.options[:as] == association.name }
           end
         end
 
@@ -293,5 +316,20 @@ module Generators
         end
       end
     end
+
+    # This class modifies the inspect function to correctly handle polymorphic associations.
+    # It is used in the polymorphic_association_types function.
+    # Without modification: Model(id: integer, name: string)
+    # After modification: Model
+    class Inspector
+      attr_accessor :name
+      def initialize(name)
+        @name = name
+      end
+
+      def inspect
+        name
+      end
+    end
   end
 end

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

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 /**
- * easymde v2.18.0
+ * easymde v2.19.0
  * Copyright Jeroen Akkerman
  * @link https://github.com/ionaru/easy-markdown-editor
  * @license MIT
@@ -7726,6 +7726,18 @@ tag.tagify__tag{
   margin-bottom:2rem
 }
 
+.me-1{
+  margin-inline-end:0.25rem
+}
+
+.me-2{
+  margin-inline-end:0.5rem
+}
+
+.me-3{
+  margin-inline-end:0.75rem
+}
+
 .ml-0{
   margin-left:0px
 }