forest_admin_datasource_active_record 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c597f5097cc2fca7a364b0ac6b9480e1d8dca6ec481bb321a2507379b21d89d
-  data.tar.gz: a8bf8f41c39093fe4d13197e32fb03c8ac45aa2ca0c70bb4e7ce28e702fa7d8a
+  metadata.gz: fae5816b36cb706d530aedc0e3828e030f09f9f67de2e653b3aeba5b56c56afe
+  data.tar.gz: b95fa478d9af1ba920e91b94458b4be1700f24cfea1f0ab480e66ba478e7be97
 SHA512:
-  metadata.gz: '0595ed02849bb6f65b4913c7893147f36fba65f337a3ec5dc336998e827566cf374e8a6084ae9f4bdea208ef44a639ee7dc737e17e559765a193388e38455fee'
-  data.tar.gz: a847aad91d684e88f4e25c10984b8f5b62c7e6b537066e9d4cae54bd2f74c42ebaa7520e3467c5ee14568684a32453f0059dab0a199475acd5880dff851e0c1b
+  metadata.gz: 9bfdda35755f2071b0a3e3fbf8e93be8c8cb22681205f04adb918a2d7ff6c2ca7bd0183fc68e21bbfe3916cb2c3049ea056737dd389d5404cb936e55d499049c
+  data.tar.gz: 77e3b2af2d4a736c63c7edaa1f412e17d5c0dbb3b89ca9b138033a57ccdf2eef64c4ca7f5f8fd4b9bb548210be1342579b8f19bd2bdaa17e1dfe794faab886e0

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -196,6 +196,7 @@ module ForestAdminDatasourceActiveRecord
             end
           end
         when :has_and_belongs_to_many
+          through_collection_name = resolve_habtm_through_collection(association)
           add_field(
             association.name.to_s,
             ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
@@ -204,7 +205,7 @@ module ForestAdminDatasourceActiveRecord
               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
+              through_collection: through_collection_name
             )
           )
         end
@@ -218,6 +219,62 @@ module ForestAdminDatasourceActiveRecord
     end
     # rubocop:enable Metrics/BlockNesting
 
+    def resolve_habtm_through_collection(association)
+      join_table = association.join_table.to_s
+      through_model_name = association.join_table.classify
+
+      # Check if the join table exists and has an 'id' column
+      if ActiveRecord::Base.connection.table_exists?(join_table)
+        columns = ActiveRecord::Base.connection.columns(join_table)
+        has_id_column = columns.any? { |col| col.name == 'id' }
+
+        if has_id_column
+          begin
+            through_model_name.constantize
+          rescue NameError
+            create_virtual_habtm_model(association, through_model_name)
+          end
+        end
+      end
+
+      format_model_name(through_model_name)
+    end
+
+    def create_virtual_habtm_model(association, model_name)
+      parent_module = @model.name.deconstantize
+
+      # Create the model class dynamically and assign to constant
+      klass = if parent_module.empty?
+                # Create in global namespace
+                Object.const_set(model_name, Class.new(ActiveRecord::Base))
+              else
+                # Create in parent module namespace
+                parent_module_obj = parent_module.constantize
+                parent_module_obj.const_set(model_name.demodulize, Class.new(ActiveRecord::Base))
+              end
+
+      klass.table_name = association.join_table
+
+      # Mark this as a virtual through collection so datasource doesn't try to add it again
+      klass.const_set(:VIRTUAL_THROUGH_COLLECTION, true)
+
+      # add associations
+      klass.belongs_to association.active_record.name.demodulize.underscore.to_sym,
+                       class_name: association.active_record.name,
+                       foreign_key: association.join_foreign_key
+      klass.belongs_to association.name.to_s.singularize.to_sym,
+                       class_name: association.klass.name,
+                       foreign_key: association.association_foreign_key
+
+      logger = ActiveSupport::Logger.new($stdout)
+      logger.info(
+        "[ForestAdmin] Created virtual model '#{model_name}' for HABTM join table '#{association.join_table}' " \
+        'with id column. This allows proper handling of the many-to-many relationship.'
+      )
+
+      klass
+    end
+
     def warn_missing_polymorphic_columns(association)
       missing_columns = []
       missing_columns << association.foreign_key unless schema[:fields][association.foreign_key]

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.15.0"
+  VERSION = "1.15.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Matthieu