forest_admin_agent 1.0.0.pre.beta.25 → 1.0.0.pre.beta.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99124b74e8108992635d7c4932b1e1a3e670cdef851df6af0174b1b13434845e
-  data.tar.gz: a4fb88fed216fd288ff7a2d89e13216ed21f576482f450b08300dc22ed805579
+  metadata.gz: d5a1222f5af1bf778087d4b388f224d8802cb52f4aa59a203d608145f11a0920
+  data.tar.gz: a63be1a15f8778eb1a7766ebcc099ef66a39f8804059bb6b1fe9783c45cec718
 SHA512:
-  metadata.gz: ef8333542d36d50484ede07d6bee4923e777eba881b6c49678e803387c271b8b4487ebf9b9f37697f8e23381c07e6a05af1a4eee07b8ead80277904fda28baf4
-  data.tar.gz: c32a53f151d3135e98349148e214f5ef90f9134a5cdf74fe3ac6bb072c241d7aef7a99a9cd3d8f8295d8acfa517bcae54567bf8b389ce533dfc1b3fe4c295f1f
+  metadata.gz: b395ae4c2e8a0d5c1a5f974170dc863af79f969d0118b703b97dde95e92b119f007bdc5373bac86fd271029f69493baca613f0608e031cfb7b1cf0284514bfc0
+  data.tar.gz: 90a0a84788e6e13aa7a324463aee664c44f28952e22625335bbf95f7534ccccced3f8e397834658e1bb1154e6aa8756e39408fa3f5ad4c4e84885d5f360a6513

data/lib/forest_admin_agent/routes/resources/list.rb

@@ -15,7 +15,6 @@ module ForestAdminAgent
         def handle_request(args = {})
           build(args)
           @permissions.can?(:browse, @collection)
-
           filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
             condition_tree: ConditionTreeFactory.intersect([
                                                              @permissions.get_scope(@collection),
@@ -23,8 +22,11 @@ module ForestAdminAgent
                                                                @collection, args
                                                              )
                                                            ]),
-            page: ForestAdminAgent::Utils::QueryStringParser.parse_pagination(args)
+            page: ForestAdminAgent::Utils::QueryStringParser.parse_pagination(args),
+            search: ForestAdminAgent::Utils::QueryStringParser.parse_search(@collection, args),
+            search_extended: ForestAdminAgent::Utils::QueryStringParser.parse_search_extended(args)
           )
+
           projection = ForestAdminAgent::Utils::QueryStringParser.parse_projection_with_pks(@collection, args)
           records = @collection.list(@caller, filter, projection)
 
@@ -34,10 +36,30 @@ module ForestAdminAgent
               records,
               is_collection: true,
               serializer: Serializer::ForestSerializer,
-              include: projection.relations.keys
+              include: projection.relations.keys,
+              meta: handle_search_decorator(args[:params]['search'], records)
             )
           }
         end
+
+        def handle_search_decorator(search_value, records)
+          decorator = { decorators: [] }
+          unless search_value.nil?
+            records.each_with_index do |entry, index|
+              decorator[:decorators][index] = { id: Utils::Id.pack_id(@collection, entry), search: [] }
+              # attributes method is defined on ActiveRecord::Base model
+              attributes = entry.respond_to?(:attributes) ? entry.attributes : entry
+
+              attributes.each do |field_key, field_value|
+                if !field_value.is_a?(Array) && field_value.to_s.downcase.include?(search_value.downcase)
+                  decorator[:decorators][index][:search] << field_key
+                end
+              end
+            end
+          end
+
+          decorator
+        end
       end
     end
   end

data/lib/forest_admin_agent/utils/condition_tree_parser.rb

@@ -40,6 +40,8 @@ module ForestAdminAgent
           return values.map { |item| !%w[false 0 no].include?(item) } if schema.column_type == 'Boolean'
 
           return values.map(&:to_f).select { |item| item.is_a? Numeric } if schema.column_type == 'Number'
+
+          return values
         end
 
         leaf['value']

data/lib/forest_admin_agent/utils/id.rb

@@ -3,6 +3,19 @@ module ForestAdminAgent
     class Id
       include ForestAdminDatasourceToolkit::Utils
       include ForestAdminDatasourceToolkit
+
+      def self.pack_ids(schema, records)
+        records.map { |packed_id| pack_id(schema, packed_id) }
+      end
+
+      def self.pack_id(schema, record)
+        pk_names = ForestAdminDatasourceToolkit::Utils::Schema.primary_keys(schema)
+
+        raise Exceptions::ForestException, 'This collection has no primary key' if pk_names.empty?
+
+        pk_names.map { |pk| record[pk].to_s }.join('|')
+      end
+
       def self.unpack_id(collection, packed_id, with_key: false)
         primary_keys = ForestAdminDatasourceToolkit::Utils::Schema.primary_keys(collection)
         primary_key_values = packed_id.to_s.split('|')

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -85,6 +85,23 @@ module ForestAdminAgent
 
         Page.new(offset: offset, limit: items_per_pages.to_i)
       end
+
+      def self.parse_search(collection, args)
+        search = args.dig(:params, :data, :attributes, :all_records_subset_query, :search) || args.dig(:params, :search)
+
+        raise ForestException, 'Collection is not searchable' if search && !collection.is_searchable?
+
+        search
+      end
+
+      def self.parse_search_extended(args)
+        extended = args.dig(:params, :data, :attributes, :all_records_subset_query,
+                            :searchExtended) || args.dig(:params, :searchExtended)
+
+        return false if extended.nil?
+
+        extended != '0'
+      end
     end
   end
 end

data/lib/forest_admin_agent/utils/schema/frontend_filterable.rb

@@ -63,7 +63,7 @@ module ForestAdminAgent
         def self.get_required_operators(type)
           return OPERATOR_BY_TYPE[type] if type.is_a?(String) && OPERATOR_BY_TYPE.key?(type)
 
-          return ['Includes_All'] if type.is_a? Array
+          return [Operators::INCLUDES_ALL] if type.is_a? Array
 
           []
         end

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "forest-rails"
 
-        LIANA_VERSION = "1.0.0-beta.25"
+        LIANA_VERSION = "1.0.0-beta.27"
 
         def self.get_serialized_schema(datasource)
           schema_path = Facades::Container.cache(:schema_path)

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.0.0-beta.25"
+  VERSION = "1.0.0-beta.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.25
+  version: 1.0.0.pre.beta.27
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport