forest_liana 9.5.4 → 9.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01219141321710917e3b67dcd37db280425c4cf1620c491172c4bc7ab5616047'
-  data.tar.gz: 12f0c3ae8d97f28a82e70f38c93545f0bed346607c7301a63436077a3e95e858
+  metadata.gz: 3d1c39075bf7b59d268ffd575ef52feb25eb8a67a370f08b4f94a1bca39288ac
+  data.tar.gz: 3c7e36125001dd9ed399239848260652ea6736b18cf9c93a3bf7a4eba7b2497c
 SHA512:
-  metadata.gz: 775dbe23c00ecd54bd64cde35a6efc3c40d72d1e873fa9e11d7077c830a1778001d6a90f4c4e9373dcd782e39d371b6673dab6b8f8e7a539a44b0bda49d14f78
-  data.tar.gz: 42441b9c0e1df5f8d760b0216982865ce1c6193452c9fd2677708b1c3171cd162dee9ae61365013a8bb4790998ff2f3cac2e3fe96dc80bd64ecfc6bd003b7ae5
+  metadata.gz: f30ea56ebf1e756c17df2398c6746b89165fadda18427b48b3685e5f78276c5994c586f33067c366ddb132245d4a0b0c40e3a562c39a01379319ef8cd7ce84ac
+  data.tar.gz: 57b9e0b67ca52e8f5703cd989a627f53e2eea910ba923a62f14b22482cee38ee9d0b22ac91aa38fe2f5b29a1a0244ac50cdad93f50cbfe113c73515c5c4d0cc8

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.4"
+  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

metadata

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