forest_liana 9.5.3 → 9.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 331a5a4b04f74fad06fa9b8f9443e2a91c27685483fb1bba39bedb1b409c498c
-  data.tar.gz: 055da277ebd38b2617dbc5b61a24dfb0b0bf474bb65fb8763d50ed694926122a
+  metadata.gz: 3d1c39075bf7b59d268ffd575ef52feb25eb8a67a370f08b4f94a1bca39288ac
+  data.tar.gz: 3c7e36125001dd9ed399239848260652ea6736b18cf9c93a3bf7a4eba7b2497c
 SHA512:
-  metadata.gz: 50c346b60aea696ed3295aa82c51cb92167e94c0a24168f039f1d673f2c9e48bed79b6699004d00b55e35bfb3b1ed55a0465c8f8b824256e645da831ca6b89cd
-  data.tar.gz: aa3fd7c4133120ff50c0c88a4ab0b5873a6f5a28d1acd83b11a409a3557e15c0f8dbad572a43f44f39e1ba0d142f282a4a9a9ebf68e8496d7cd1425eedd0b5ed
+  metadata.gz: f30ea56ebf1e756c17df2398c6746b89165fadda18427b48b3685e5f78276c5994c586f33067c366ddb132245d4a0b0c40e3a562c39a01379319ef8cd7ce84ac
+  data.tar.gz: 57b9e0b67ca52e8f5703cd989a627f53e2eea910ba923a62f14b22482cee38ee9d0b22ac91aa38fe2f5b29a1a0244ac50cdad93f50cbfe113c73515c5c4d0cc8

data/app/services/forest_liana/scope_manager.rb

@@ -49,20 +49,15 @@ module ForestLiana
     end
 
     def self.fetch_scopes(rendering_id)
-      response = ForestLiana::ForestApiRequester.get("/liana/v4/permissions/renderings/#{rendering_id}")
-
-      if response.is_a?(Net::HTTPOK)
-        Rails.cache.fetch('forest.scopes.' + rendering_id.to_s, expires_in: @@scope_cache_expiration_delta) do
-          data = {}
-          parse_response = JSON.parse(response.body)
-
-          data['scopes'] = decode_scope(parse_response['collections'])
-          data['team'] = parse_response['team']
-
-          data
-        end
-      else
-        raise 'Unable to fetch scopes'
+      Rails.cache.fetch("forest.scopes.#{rendering_id}", expires_in: @@scope_cache_expiration_delta) do
+        response = ForestLiana::ForestApiRequester.get("/liana/v4/permissions/renderings/#{rendering_id}")
+        raise 'Unable to fetch scopes' unless response.is_a?(Net::HTTPOK)
+        parsed_response = JSON.parse(response.body)
+
+        {
+          'scopes' => decode_scope(parsed_response['collections']),
+          'team' => parsed_response['team']
+        }
       end
     end
 

data/app/services/forest_liana/search_query_builder.rb

@@ -30,6 +30,7 @@ module ForestLiana
           if field.try(:[], :search)
             begin
               @records = field[:search].call(@records, @search)
+              (@fields_searched << field[:field].to_s) if field[:type] == 'String'
             rescue => exception
               FOREST_REPORTER.report exception
               FOREST_LOGGER.error "Cannot search properly on Smart Field:\n" \

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.5.3"
+  VERSION = "9.5.5"
 end

data/spec/dummy/lib/forest_liana/collections/user.rb

@@ -8,7 +8,12 @@ class Forest::User
     "name IS '#{capitalize_name}'"
   end
 
-  field :cap_name, type: 'String', filter: filter_cap_name do
+  search_cap_name = lambda do |query, search|
+    # Injects your new filter into the query.
+    query.or(User.where("name = '#{search}'"))
+  end
+
+  field :cap_name, type: 'String', filter: filter_cap_name, search: search_cap_name do
     object.name.upcase
   end
 

data/spec/requests/resources_spec.rb

@@ -154,6 +154,100 @@ describe 'Requesting Tree resources', :type => :request  do
   end
 end
 
+describe 'Requesting User resources', :type => :request  do
+  describe 'index' do
+    before do
+      User.create(name: 'John')
+
+      Rails.cache.write('forest.users', {'1' => { 'id' => 1, 'roleId' => 1, 'rendering_id' => '1' }})
+      Rails.cache.write('forest.has_permission', true)
+      Rails.cache.write(
+        'forest.collections',
+        {
+          'User' => {
+            'browse'  => [1],
+            'read'    => [1],
+            'edit'    => [1],
+            'add'     => [1],
+            'delete'  => [1],
+            'export'  => [1],
+            'actions' => {}
+          }
+        }
+      )
+
+      allow(ForestLiana::IpWhitelist).to receive(:retrieve) { true }
+      allow(ForestLiana::IpWhitelist).to receive(:is_ip_whitelist_retrieved) { true }
+      allow(ForestLiana::IpWhitelist).to receive(:is_ip_valid) { true }
+      allow(ForestLiana::ScopeManager).to receive(:fetch_scopes).and_return(
+        {'scopes' => {}, 'team' => {'id' => '1', 'name' => 'Operations'}}
+      )
+    end
+
+    after do
+      User.destroy_all
+    end
+
+    it 'should respond the user data with meta when search apply on simple column and smart field' do
+      token = JWT.encode({
+        id: 1,
+        email: 'michael.kelso@that70.show',
+        first_name: 'Michael',
+        last_name: 'Kelso',
+        team: 'Operations',
+        rendering_id: 16,
+        exp: Time.now.to_i + 2.weeks.to_i,
+        permission_level: 'admin'
+      }, ForestLiana.auth_secret, 'HS256')
+
+      headers = {
+        'Accept' => 'application/json',
+        'Content-Type' => 'application/json',
+        'Authorization' => "Bearer #{token}"
+      }
+      
+      params = {
+        fields: { 'User' => 'id,name,cap_name' },
+        page: { 'number' => '1', 'size' => '10' },
+        searchExtended: '0',
+        search: 'JOHN',
+        sort: '-id',
+        timezone: 'Europe/Paris'
+      }
+
+      allow(ForestAdmin::JSONAPI::Serializer).to receive(:serialize).and_return(
+        { "data" => [
+          {
+            "type" => "User",
+            "id" => "1",
+            "attributes" => { "id" => 1, "name" => "John", "cap_name" => "JOHN" },
+            "links" => { "self" => "/forest/user/1" }
+          }
+        ], "included" => [] }
+      )
+
+      get '/forest/User', params: params, headers: headers
+
+      expect(JSON.parse(response.body)).to include(
+        "data" => [
+          {
+            "type" => "User",
+            "id" => "1",
+            "attributes" => {
+              "id" => 1,
+              "name" => "John",
+              "cap_name" => "JOHN"
+            },
+            "links" => { "self" => "/forest/user/1" },
+          }
+        ],
+        "included" => [],
+        "meta" => { 'decorators' => { '0' => { 'id' => "1", 'search' => %w[name cap_name] } } }
+      )
+    end
+  end
+end
+
 describe 'Requesting Address resources', :type => :request  do
   let(:scope_filters) { {'scopes' => {}, 'team' => {'id' => '1', 'name' => 'Operations'}} }
   before do

data/spec/services/forest_liana/scope_manager_spec.rb

@@ -73,6 +73,14 @@ module ForestLiana
               'team' => {'id' => '1', 'name' => 'Operations'},
             })
         end
+
+        it 'calls the API only once, even with multiple fetch_scopes calls' do
+          described_class.fetch_scopes(rendering_id)
+          described_class.fetch_scopes(rendering_id)
+
+          expect(ForestLiana::ForestApiRequester).to have_received(:get).once
+        end
+
       end
 
       describe 'when scope contains dynamic values' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.5.3
+  version: 9.5.5
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails