forest_admin_datasource_active_record 1.0.0.pre.beta.95 → 1.0.0.pre.beta.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d95bf6e2df9031522b5dabe4e7439431172f1917f006c4907ffe6574bc6d3b56
-  data.tar.gz: f8a991a4a57fc2e6fe505c109e337050cf8a72782ec69a3629a07e66e95c770e
+  metadata.gz: 14b38a52aa95adb40477a63cc126e1c0ca9b64deac752faab651dc41b48e7589
+  data.tar.gz: 99517b7674002b976f641b980c8f132a0f11dd98f5cb05ce4e350ba409201c25
 SHA512:
-  metadata.gz: d5a33975630e02d523d7ed99a99e87c6b44745a8fb962437b592e248a3ccdc55d1bb2430e921525fbc101bee1b37ae88ebfb24045dd1551952d6ea33840bd0ec
-  data.tar.gz: 703c0f044e150d86664bfd82262fc630a6e548cc8b11985c01a879d82325b2ee279309fb4f7c1ba49b5ccb6411ae54503e0b411bb54312b21eccb32f863be9b5
+  metadata.gz: bba918fc280643db5e5ae2f85ba4c07524e14aeac607fe3af60509ef01637190859f63c7a7edb2cfbafe124d859a937c08a8c0b1bac64397be11179967b54a4d
+  data.tar.gz: be1c7702d6830c94e7370e437270b495130989a147fb874a95562f598a309adcb609e3f687bfc29ffc07f4fc15f1cb48b458c471442b8089989a99a54b4f3d41

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.95"
+  VERSION = "1.0.0-beta.97"
 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.95
+  version: 1.0.0.pre.beta.97
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord