forest_admin_datasource_active_record 1.0.0.pre.beta.94 → 1.0.0.pre.beta.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d7ce59f57ef174a6f1d924bd0a1d86308063f4b1a7105bb627641e5ce255ce2
-  data.tar.gz: dda43503a324dd5f613c0ae9ba91aa3740fb7520ac9b677377411080405cbca2
+  metadata.gz: 32aea28cf7659b7e3903b3ab71404a0a1c6b432a057fc04634378a0e259be677
+  data.tar.gz: 8acfd38b27078bb95ae8b845ec2e669fe6e15e4edb3a585b464004c54ffef325
 SHA512:
-  metadata.gz: 85e007a8d73a3819a4412f35bbe54fcd110128cccce6e61cdec81c6ceeeda1319025aea62509c5b18bcf842213bc32d5d2c851d9d9b77f11df9483f7a85a032e
-  data.tar.gz: c9ab8608f0e871ccdff31dd2bbc1d9b048bbbc8fe6df4cfda4611759a6dd943b8116e0b2b4cce0273da707d59ebc0553ac4f584593917ccf8a5d6e92e5f47e1e
+  metadata.gz: 0b2ed1c0961e9630b977c8007cbcfdb7a608d86ef46bb33c700318649efa5db20f03fe819509b6075c76bbfeaa627c25933cd91c112f545e4f33cab5e20d9eaf
+  data.tar.gz: 17b65e9c435ddc9b1dc329f51efeb81aa1e4af14ad1b57c4196cda670dee9c16b5bf98a9b352e73561f82a5d22997aeb2e589eafe529afc06e727b0b1dc2a10f

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -175,6 +175,18 @@ module ForestAdminDatasourceActiveRecord
               )
             end
           end
+        when :has_and_belongs_to_many
+          add_field(
+            association.name.to_s,
+            ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
+              foreign_collection: format_model_name(association.klass.name),
+              origin_key: association.join_primary_key,
+              origin_key_target: association.join_foreign_key,
+              foreign_key: association.association_foreign_key,
+              foreign_key_target: association.association_primary_key,
+              through_collection: association.join_table.classify
+            )
+          )
         end
       end
     end

data/lib/forest_admin_datasource_active_record/datasource.rb

@@ -78,7 +78,8 @@ module ForestAdminDatasourceActiveRecord
         @models << model unless model.abstract_class? ||
                                 @models.include?(model) ||
                                 !model.table_exists? ||
-                                !primary_key?(model)
+                                !primary_key?(model) ||
+                                model.const_defined?(:VIRTUAL_THROUGH_COLLECTION)
       end
     end
 
@@ -101,19 +102,24 @@ module ForestAdminDatasourceActiveRecord
       if @habtm_models.key?(model.table_name)
         @habtm_models[model.table_name].left_reflection = model.right_reflection
         # when the second model is added, we can push the HABTM model to the models list
-        @models << make_through_model(
+        through_model = make_through_model(
           model.table_name,
           [
             @habtm_models[model.table_name].left_reflection,
             @habtm_models[model.table_name].right_reflection
           ]
         )
+
+        add_collection(
+          Collection.new(self, through_model, support_polymorphic_relations: @support_polymorphic_relations)
+        )
       else
         @habtm_models[model.table_name] = model
       end
     end
 
     def make_through_model(table_name, associations)
+      through_model_name = table_name.classify
       through_model = Class.new(ActiveRecord::Base) do
         class << self
           attr_accessor :name, :table_name
@@ -124,13 +130,15 @@ module ForestAdminDatasourceActiveRecord
         end
       end
 
-      through_model.name = table_name.singularize
+      through_model.name = through_model_name
       through_model.table_name = table_name
       through_model.primary_key = [associations[0].foreign_key, associations[1].foreign_key]
       associations.each do |association|
         through_model.add_association(association.name, association.options)
       end
 
+      through_model.const_set(:VIRTUAL_THROUGH_COLLECTION, true)
+
       through_model
     end
   end

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.94"
+  VERSION = "1.0.0-beta.96"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.94
+  version: 1.0.0.pre.beta.96
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-28 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord