[*] Search - Fix the broken search if the collection contains Array fields

Author: arnaudbesnier

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 
 ## [Unreleased]
+### Fixed
+- Search - Fix the broken search if the collection contains Array fields. [Regression introduced in 2.9.0]
+- Search - Highlight the records id if it matches with the search value.
 
 ## RELEASE 2.11.4 - 2018-07-31
 ### Fixed

app/helpers/forest_liana/decoration_helper.rb

@@ -1,18 +1,27 @@
 module ForestLiana
   module DecorationHelper
+    def self.detect_match_and_decorate record, index, field_name, value, search_value, match_fields
+      begin
+        match = value.match(/#{search_value}/i)
+        if match
+          match_fields[index] = { id: record['id'], search: [] } if match_fields[index].nil?
+          match_fields[index][:search] << field_name
+        end
+      rescue
+      end
+    end
+
     def self.decorate_for_search(records_serialized, field_names, search_value)
       match_fields = {}
       records_serialized['data'].each_with_index do |record, index|
         field_names.each do |field_name|
           value = record['attributes'][field_name]
           if value
-            match = value.match(/#{search_value}/i)
-            if match
-              match_fields[index] = { id: record['id'], search: [] } if match_fields[index].nil?
-              match_fields[index][:search] << field_name
-            end
+            detect_match_and_decorate(record, index, field_name, value, search_value, match_fields)
           end
         end
+
+        detect_match_and_decorate(record, index, 'id', record['id'], search_value, match_fields)
       end
       match_fields.empty? ? nil : match_fields
     end