forest_admin_datasource_active_record 1.14.0 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aca63f1bf2a3ad065e61000b5bba057154c5a7879104a5a5e6e18584bea58e1
-  data.tar.gz: a46e81981549b569d72c238bc78062d16fc06428c6c8b86198269451e5c2d5c0
+  metadata.gz: 4f9af86ad7f57b450c0e780e0df0ff4c6b3d8a76e6974f3e2f05356a8662f9bd
+  data.tar.gz: 43e986234e5b73a2feeda31b1d7d5baf38ef868ba1ae0549b4e37f45a2db7d90
 SHA512:
-  metadata.gz: 77956a7dad5c4f9825565de6d41c7b624eac2bf8e1c5e6be1d45f3bd646374439cf1ab5ef618985aeba309be27cb5a23139817c4255805b9f1ba29886c10c38f
-  data.tar.gz: 656be438cd64847bd2c782df16c0eb933dd1ab09eb0281e8e7ccf5b102d0ac8a0e0d9a6f70b7910180057759ef9922a1f97fb0cc45309ecb6bd40a5fe8bc9ade
+  metadata.gz: 9fec9e98866cbe2b4e99d87fb39a779f137bce25b4ca63dd9065bf89014172d6f690da77d59890408f9b26f9ba0fc422c725b3daff16857deabced91fec46a5d
+  data.tar.gz: c695dba049358d02ca30eae1924841958dc67097370447e2579e7e895e45b592c2629c5657ea70e7f9f11d4f79eb79f07249bcb132623beb4fcfd36528650d22

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -80,21 +80,27 @@ module ForestAdminDatasourceActiveRecord
       association.polymorphic?
     end
 
+    # rubocop:disable Metrics/BlockNesting
     def fetch_associations
       associations(@model, support_polymorphic_relations: @support_polymorphic_relations).each do |association|
         case association.macro
         when :has_one
           if association_primary_key?(association)
             if association.through_reflection?
+              through_reflection = association.through_reflection
+              is_polymorphic = through_reflection.options[:as].present?
+
               add_field(
                 association.name.to_s,
                 ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
                   foreign_collection: format_model_name(association.klass.name),
-                  origin_key: association.through_reflection.foreign_key,
-                  origin_key_target: association.through_reflection.join_foreign_key,
+                  origin_key: through_reflection.foreign_key,
+                  origin_key_target: through_reflection.join_foreign_key,
                   foreign_key: association.join_foreign_key,
                   foreign_key_target: association.association_primary_key,
-                  through_collection: format_model_name(association.through_reflection.klass.name)
+                  through_collection: format_model_name(through_reflection.klass.name),
+                  origin_type_field: is_polymorphic ? through_reflection.type : nil,
+                  origin_type_value: is_polymorphic ? @model.name : nil
                 )
               )
             elsif association.inverse_of&.polymorphic?
@@ -151,15 +157,20 @@ module ForestAdminDatasourceActiveRecord
         when :has_many
           if association_primary_key?(association)
             if association.through_reflection?
+              through_reflection = association.through_reflection
+              is_polymorphic = through_reflection.options[:as].present?
+
               add_field(
                 association.name.to_s,
                 ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
                   foreign_collection: format_model_name(association.klass.name),
-                  origin_key: association.through_reflection.foreign_key,
-                  origin_key_target: association.through_reflection.join_foreign_key,
+                  origin_key: through_reflection.foreign_key,
+                  origin_key_target: through_reflection.join_foreign_key,
                   foreign_key: association.join_foreign_key,
                   foreign_key_target: association.association_primary_key,
-                  through_collection: format_model_name(association.through_reflection.klass.name)
+                  through_collection: format_model_name(through_reflection.klass.name),
+                  origin_type_field: is_polymorphic ? through_reflection.type : nil,
+                  origin_type_value: is_polymorphic ? @model.name : nil
                 )
               )
             elsif association.inverse_of&.polymorphic?
@@ -197,8 +208,15 @@ module ForestAdminDatasourceActiveRecord
             )
           )
         end
+      rescue StandardError => e
+        logger = ActiveSupport::Logger.new($stdout)
+        logger.warn(
+          "[ForestAdmin] Unable to process association '#{association.name}' " \
+          "in model '#{@model.name}': #{e.message}. Skipping this association."
+        )
       end
     end
+    # rubocop:enable Metrics/BlockNesting
 
     def warn_missing_polymorphic_columns(association)
       missing_columns = []

data/lib/forest_admin_datasource_active_record/parser/relation.rb

@@ -15,6 +15,8 @@ module ForestAdminDatasourceActiveRecord
       def polymorphic?(association)
         (association.options.key?(:polymorphic) && association.options[:polymorphic]) ||
           association.inverse_of&.polymorphic?
+      rescue StandardError
+        false
       end
 
       def get_class(association)

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.14.0"
+  VERSION = "1.14.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.2
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-07 00:00:00.000000000 Z
+date: 2025-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord