forest_liana 9.15.7 → 9.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d693ce27b46138de7814e1d7486d4d67b8e094ea57ecdaec552ab557ca870438
-  data.tar.gz: d236006d4441662e39102eb6791e8713754097b0ec1620f799557a6513c79531
+  metadata.gz: 196dd946e590abc0f8d08471986655e8bd3244638cb278e91fd9e13ae446dcf4
+  data.tar.gz: 6fc5262c9b202656e03f6f490d0c25776cee50c5af1743705667f06aee69d205
 SHA512:
-  metadata.gz: 71f50a75e497a526837a9418f05ee8b8c361d1685875df78b29c88883d69da7766814f6e3f0b372a2edfdade2f2341c8115f8da2368dc968c9e3e00e3cd4bbdc
-  data.tar.gz: 301ebd315a041666583fcd2386c578850aaf627e8c4f6a9cfe1e5ca194abec82f9eb98777a08d1afc343e5fe54d30f68097c51c4fa88dadf4701c0618535b835
+  metadata.gz: 72a7ce8cca5d0e3d0e3829a5db69120d30c1c99e6ce09a766a00bb9816b52e071c4ed2c8a57879d0ce2e09213bc24b32ee782cd382ec4328af2131baa5b30167
+  data.tar.gz: d78f92c535f06d035ea1eb896621dfc8cb0c9f77001f252b84f594c8f5c58215b57a7bdb7cac5f339f7e7f7612baf506ef94e6a983bcec8f7cd849cedde6072b

data/app/controllers/forest_liana/application_controller.rb

@@ -188,7 +188,11 @@ module ForestLiana
           else
             smart_relations.each do |smart_relation|
               if smart_relation[:field].to_s == relation_name
-                fields[relation_name] = relation_fields
+                if smart_relation[:reference].split('.').first == params[:collection]
+                  fields[relation_name] = relation_fields
+                else
+                  fields[smart_relation[:reference].split('.').first] = relation_fields
+                end
               end
             end
           end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.15.7"
+  VERSION = "9.15.8"
 end

data/spec/requests/actions_controller_spec.rb

@@ -606,4 +606,93 @@ describe 'Requesting Actions routes', :type => :request  do
       controller.send(:serialize_models, records, options)
     end
   end
+
+  describe 'fields_per_model method' do
+    let(:model) { Island }
+    let(:collection_name) { 'Island' }
+
+    before do
+      forest_collection = double('forest_collection')
+      allow(ForestLiana).to receive(:apimap).and_return([forest_collection])
+      allow(forest_collection).to receive(:name).and_return(collection_name)
+    end
+
+    context 'with smart relations pointing to external models' do
+      it 'should use reference model name as key for external smart relations' do
+        smart_relations = [
+          {
+            field: :organization,
+            reference: 'Api__OrganizationsView.id',
+            is_virtual: true,
+            is_searchable: false,
+            type: 'String'
+          }
+        ]
+
+        forest_collection = double('forest_collection')
+        allow(forest_collection).to receive(:name).and_return(collection_name)
+        allow(forest_collection).to receive(:fields_smart_belongs_to).and_return(smart_relations)
+        allow(ForestLiana).to receive(:apimap).and_return([forest_collection])
+
+        params_fields = ActionController::Parameters.new({
+                                                           'organization' => 'name'
+                                                         })
+
+        mock_params = ActionController::Parameters.new({
+                                                         collection: 'Island',
+                                                         fields: { 'Island' => 'id,name', 'organization' => 'name'},
+                                                         page: { 'number' => '1', 'size' => '10' },
+                                                         searchExtended: '0',
+                                                         sort: '-id',
+                                                         timezone: 'Europe/Paris'
+                                                       })
+        allow(controller).to receive(:params).and_return(mock_params)
+
+        result = controller.send(:fields_per_model, params_fields, model)
+
+        expect(result).to have_key('Api__OrganizationsView')
+        expect(result['Api__OrganizationsView']).to eq('name')
+        expect(result).not_to have_key('organization')
+      end
+    end
+
+    context 'with smart relations pointing to same collection (self-reference)' do
+      it 'should use relation name as key for self-referencing smart relations' do
+        smart_relations = [
+          {
+            field: :parent_island,
+            reference: 'Island.id',
+            is_virtual: true,
+            is_searchable: false,
+            type: 'String'
+          }
+        ]
+
+        forest_collection = double('forest_collection')
+        allow(forest_collection).to receive(:name).and_return(collection_name)
+        allow(forest_collection).to receive(:fields_smart_belongs_to).and_return(smart_relations)
+        allow(ForestLiana).to receive(:apimap).and_return([forest_collection])
+
+        params_fields = ActionController::Parameters.new({
+                                                           'parent_island' => 'name'
+                                                         })
+
+        mock_params = ActionController::Parameters.new({
+                                                         collection: 'Island',
+                                                         fields: { 'Island' => 'id,name', 'parent_island' => 'name'},
+                                                         page: { 'number' => '1', 'size' => '10' },
+                                                         searchExtended: '0',
+                                                         sort: '-id',
+                                                         timezone: 'Europe/Paris'
+                                                       })
+        allow(controller).to receive(:params).and_return(mock_params)
+
+        result = controller.send(:fields_per_model, params_fields, model)
+
+        expect(result).to have_key('parent_island')
+        expect(result['parent_island']).to eq('name')
+        expect(result).not_to have_key('Island')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.15.7
+  version: 9.15.8
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-29 00:00:00.000000000 Z
+date: 2025-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails