fix(rename decorator): properly map relation when renaming pk field

packages/forest_admin_datasource_customizer/lib/forest_admin_datasource_customizer/decorators/rename_field/rename_field_collection_decorator.rb

@@ -57,14 +57,24 @@ def refine_schema(sub_schema)
  sub_schema[:fields].each do |old_name, old_schema|
  case old_schema.type
  when 'ManyToOne'
+ relation = datasource.get_collection(old_schema.foreign_collection)
  old_schema.foreign_key = from_child_collection[old_schema.foreign_key] || old_schema.foreign_key
+ old_schema.foreign_key_target =
+ relation.from_child_collection[old_schema.foreign_key_target] || old_schema.foreign_key_target
  when 'OneToMany', 'OneToOne'
  relation = datasource.get_collection(old_schema.foreign_collection)
  old_schema.origin_key = relation.from_child_collection[old_schema.origin_key] || old_schema.origin_key
+ old_schema.origin_key_target =
+ from_child_collection[old_schema.origin_key_target] || old_schema.origin_key_target
  when 'ManyToMany'
  through = datasource.get_collection(old_schema.through_collection)
+ relation = datasource.get_collection(old_schema.foreign_collection)
  old_schema.foreign_key = through.from_child_collection[old_schema.foreign_key] || old_schema.foreign_key
  old_schema.origin_key = through.from_child_collection[old_schema.origin_key] || old_schema.origin_key
+ old_schema.origin_key_target =
+ from_child_collection[old_schema.origin_key_target] || old_schema.origin_key_target
+ old_schema.foreign_key_target =
+ relation.from_child_collection[old_schema.foreign_key_target] || old_schema.foreign_key_target
  end
 
  fields[from_child_collection[old_name] || old_name] = old_schema

packages/forest_admin_datasource_customizer/spec/lib/forest_admin_datasource_customizer/decorators/rename_field/rename_field_collection_decorator_spec.rb

@@ -318,6 +318,50 @@ module RenameField
  expect(rows).to eq([{ 'value' => 34, 'group' => { 'my_novel_author:created_at' => 'abc' } }])
  end
  end
+
+ describe 'when renaming foreign keys' do
+ before do
+ @new_book_person.rename_field('book_id', 'novel_id')
+ @new_book_person.rename_field('person_id', 'author_id')
+ end
+
+ it 'the columns should be renamed in the schema' do
+ fields = @new_book_person.schema[:fields]
+ expect(fields['author_id']).to be_a(ColumnSchema)
+ expect(fields['novel_id']).to be_a(ColumnSchema)
+ expect(fields['person_id']).to be_nil
+ expect(fields['book_id']).to be_nil
+ end
+
+ it 'the relations should be updated in all collections' do
+ book_fields = @new_book.schema[:fields]
+ book_person_fields = @new_book_person.schema[:fields]
+ person_fields = @new_person.schema[:fields]
+
+ expect(book_fields['my_persons'].foreign_key).to eq('author_id')
+ expect(book_fields['my_persons'].origin_key).to eq('novel_id')
+ expect(book_person_fields['my_book'].foreign_key).to eq('novel_id')
+ expect(book_person_fields['my_person'].foreign_key).to eq('author_id')
+ expect(person_fields['my_book_person'].origin_key).to eq('author_id')
+ end
+ end
+
+ describe 'when renaming primary keys' do
+ it 'the relations should be updated in all collections' do
+ @new_book.rename_field('id', 'new_book_id')
+ @new_person.rename_field('id', 'new_person_id')
+
+ book_fields = @new_book.schema[:fields]
+ book_person_fields = @new_book_person.schema[:fields]
+ person_fields = @new_person.schema[:fields]
+
+ expect(book_fields['my_persons'].origin_key_target).to eq('new_book_id')
+ expect(book_fields['my_persons'].foreign_key_target).to eq('new_person_id')
+ expect(book_person_fields['my_book'].foreign_key_target).to eq('new_book_id')
+ expect(book_person_fields['my_person'].foreign_key_target).to eq('new_person_id')
+ expect(person_fields['my_book_person'].origin_key_target).to eq('new_person_id')
+ end
+ end
  end
  end
  end

packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/schema/relations/many_to_many_schema.rb

@@ -2,8 +2,7 @@ module ForestAdminDatasourceToolkit
  module Schema
  module Relations
  class ManyToManySchema < RelationSchema
- attr_accessor :origin_key, :through_collection, :foreign_key
- attr_reader :origin_key_target, :foreign_key_target
+ attr_accessor :origin_key, :through_collection, :foreign_key, :origin_key_target, :foreign_key_target
 
  def initialize(
  origin_key:,

packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/schema/relations/many_to_one_schema.rb

@@ -2,8 +2,7 @@ module ForestAdminDatasourceToolkit
  module Schema
  module Relations
  class ManyToOneSchema < RelationSchema
- attr_accessor :foreign_key
- attr_reader :foreign_key_target
+ attr_accessor :foreign_key, :foreign_key_target
 
  def initialize(foreign_key:, foreign_key_target:, foreign_collection:)
  super(foreign_collection, 'ManyToOne')

packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/schema/relations/one_to_many_schema.rb

@@ -2,8 +2,7 @@ module ForestAdminDatasourceToolkit
  module Schema
  module Relations
  class OneToManySchema < RelationSchema
- attr_accessor :origin_key
- attr_reader :origin_key_target
+ attr_accessor :origin_key, :origin_key_target
 
  def initialize(origin_key:, origin_key_target:, foreign_collection:)
  super(foreign_collection, 'OneToMany')

packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/schema/relations/one_to_one_schema.rb

@@ -2,8 +2,7 @@ module ForestAdminDatasourceToolkit
  module Schema
  module Relations
  class OneToOneSchema < RelationSchema
- attr_accessor :origin_key
- attr_reader :origin_key_target
+ attr_accessor :origin_key, :origin_key_target
 
  def initialize(origin_key:, origin_key_target:, foreign_collection:)
  super(foreign_collection, 'OneToOne')

packages/forest_admin_datasource_toolkit/sig/forest_admin_datasource_toolkit/schema/relations/many_relation_schema.rbs

@@ -3,7 +3,7 @@ module ForestAdminDatasourceToolkit
  module Relations
  class ManyRelationSchema
  attr_accessor foreign_key: String
-attr_reader foreign_key_target: String
+attr_accessor foreign_key_target: String
  end
  end
  end

packages/forest_admin_datasource_toolkit/sig/forest_admin_datasource_toolkit/schema/relations/many_to_many_schema.rbs

@@ -3,7 +3,7 @@ module ForestAdminDatasourceToolkit
  module Relations
  class ManyToManySchema
  attr_accessor origin_key: String
-attr_reader origin_key_target: String
+attr_accessor origin_key_target: String
  attr_accessor through_collection: String
  end
  end

packages/forest_admin_datasource_toolkit/sig/forest_admin_datasource_toolkit/schema/relations/single_relation_schema.rbs

@@ -3,7 +3,7 @@ module ForestAdminDatasourceToolkit
  module Relations
  class SingleRelationSchema
  attr_accessor origin_key: String
-attr_reader origin_key_target: String
+attr_accessor origin_key_target: String
  end
  end
  end