forest_admin_agent 1.46.1 → 1.46.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be21283660e21385c61e7a2b4312996bd27c516d5835483a9548967eda3c10a3
-  data.tar.gz: 8db034fa9e1562fd7552d2f8b4fae5ddc29944b71d1902a715d05d4531c15b47
+  metadata.gz: 66c2c677df8cd9ee2cdb91925ea87a84e7d7b949d5ebf2f57104de3591e1df24
+  data.tar.gz: 8a844fc3354a9e522f04038e6f966252370650980035e1ad59763a0a91d74331
 SHA512:
-  metadata.gz: 691a6dc3a633103b92e6cea06db4c7adf5fb1bcf2d294bbcdac8afd1c4d27af6794f325ad8b4c286c5c06e9469df8428f1a0c6fce81f8ca8318f072367435add
-  data.tar.gz: 67b147dbe477ca883faa985b2802187e3e0c6971896e129c288a15c85a9dc7118fe811f7d497bee9ef534c233bf15b0e0e008bb5ac121cae118605a3ee17b32c
+  metadata.gz: f1c7ffe69debc653eeec2013f3038e61a16119c78d18930851e8a2d45b09c32ebb4378843295c38fb05d2b3d6d779e1a9ab65f76decd08a587c41ee91ef1a46e
+  data.tar.gz: 42b9d25705b3695cdeb9858026362f5732df3f54433afec6e17fd351615411cd8fa98bec3129e101ab1df5595e3c87f6d5c78297a3130387f35b7deab356033d

data/lib/forest_admin_agent/routes/action/actions.rb

@@ -11,6 +11,7 @@ module ForestAdminAgent
         include ForestAdminDatasourceToolkit::Components::Query
         include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
         include ForestAdminDatasourceCustomizer::Decorators::Action
+        include ForestAdminAgent::Routes::QueryHandler
 
         def initialize(collection, action)
           @action_name = action
@@ -223,18 +224,7 @@ module ForestAdminAgent
         def get_record_selection(args, context)
           attributes = args.dig(:params, :data, :attributes)
 
-          # Match user filter + search + scope? + segment
-          scope = context.permissions.get_scope(context.collection)
-          filter = Filter.new(
-            condition_tree: ConditionTreeFactory.intersect(
-              [
-                scope,
-                ForestAdminAgent::Utils::QueryStringParser.parse_condition_tree(
-                  context.collection, args
-                )
-              ]
-            )
-          )
+          filter = build_context_filter(context.collection, args, context.permissions, context.caller)
 
           # Restrict the filter to the selected records for single or bulk actions
           if context.collection.schema[:actions][@action_name].scope != Types::ActionScope::GLOBAL

data/lib/forest_admin_agent/routes/query_handler.rb

@@ -23,23 +23,25 @@ module ForestAdminAgent
       end
 
       def parse_query_segment(collection, args, permissions, caller)
-        return unless args[:params][:segmentQuery]
+        segment_query = QueryStringParser.subset_or_query(args, :segmentQuery)
+        return unless segment_query
 
-        unless args[:params][:connectionName]
+        connection_name = QueryStringParser.subset_or_query(args, :connectionName)
+        unless connection_name
           raise ForestAdminAgent::Http::Exceptions::UnprocessableError, 'Missing native query connection attribute'
         end
 
-        QueryValidator.valid?(args[:params][:segmentQuery])
+        QueryValidator.valid?(segment_query)
 
-        permissions.can_execute_query_segment?(collection, args[:params][:segmentQuery], args[:params][:connectionName])
+        permissions.can_execute_query_segment?(collection, segment_query, connection_name)
 
         ids = execute_query(
           collection.datasource,
-          args[:params][:segmentQuery],
-          args[:params][:connectionName],
+          segment_query,
+          connection_name,
           permissions,
           caller,
-          args[:params][:contextVariables]
+          QueryStringParser.subset_or_query(args, :contextVariables)
         ).map(&:values)
 
         condition_tree_segment = ConditionTree::ConditionTreeFactory.match_ids(collection, ids)
@@ -47,6 +49,29 @@ module ForestAdminAgent
 
         condition_tree_segment
       end
+
+      def build_context_filter(collection, args, permissions, caller, sort: nil)
+        condition_tree = QueryStringParser.parse_condition_tree(collection, args)
+        search = QueryStringParser.parse_search(collection, args)
+        search_extended = QueryStringParser.parse_search_extended(args)
+        applied = { condition_tree: condition_tree, search: search, search_extended: search_extended }
+        applied[:sort] = sort if sort
+        permissions.assert_can_read_query_fields(collection, **applied)
+
+        Filter.new(
+          condition_tree: ConditionTree::ConditionTreeFactory.intersect(
+            [
+              permissions.get_scope(collection),
+              condition_tree,
+              parse_query_segment(collection, args, permissions, caller)
+            ]
+          ),
+          search: search,
+          search_extended: search_extended,
+          sort: sort,
+          segment: QueryStringParser.parse_segment(collection, args)
+        )
+      end
     end
   end
 end

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

@@ -19,28 +19,7 @@ module ForestAdminAgent
           context.permissions.can?(:browse, context.collection)
 
           if context.collection.is_countable?
-            condition_tree = ForestAdminAgent::Utils::QueryStringParser.parse_condition_tree(
-              context.collection, args
-            )
-            search = QueryStringParser.parse_search(context.collection, args)
-            search_extended = QueryStringParser.parse_search_extended(args)
-            context.permissions.assert_can_read_query_fields(
-              context.collection,
-              condition_tree: condition_tree, search: search, search_extended: search_extended
-            )
-
-            filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
-              condition_tree: ConditionTreeFactory.intersect(
-                [
-                  context.permissions.get_scope(context.collection),
-                  parse_query_segment(context.collection, args, context.permissions, context.caller),
-                  condition_tree
-                ]
-              ),
-              search: search,
-              search_extended: search_extended,
-              segment: QueryStringParser.parse_segment(context.collection, args)
-            )
+            filter = build_context_filter(context.collection, args, context.permissions, context.caller)
             aggregation = ForestAdminDatasourceToolkit::Components::Query::Aggregation.new(operation: 'Count')
             result = context.collection.aggregate(context.caller, filter, aggregation)
 

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

@@ -23,28 +23,8 @@ module ForestAdminAgent
           context.permissions.can?(:browse, context.collection)
           context.permissions.can?(:export, context.collection)
 
-          condition_tree = QueryStringParser.parse_condition_tree(context.collection, args)
-          search = QueryStringParser.parse_search(context.collection, args)
-          search_extended = QueryStringParser.parse_search_extended(args)
           sort = QueryStringParser.parse_sort(context.collection, args)
-          context.permissions.assert_can_read_query_fields(
-            context.collection,
-            condition_tree: condition_tree, sort: sort, search: search, search_extended: search_extended
-          )
-
-          filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
-            condition_tree: ConditionTreeFactory.intersect(
-              [
-                context.permissions.get_scope(context.collection),
-                parse_query_segment(context.collection, args, context.permissions, context.caller),
-                condition_tree
-              ]
-            ),
-            search: search,
-            search_extended: search_extended,
-            sort: sort,
-            segment: QueryStringParser.parse_segment(context.collection, args)
-          )
+          filter = build_context_filter(context.collection, args, context.permissions, context.caller, sort: sort)
           requested = QueryStringParser.parse_requested_projection(context.collection, args)
           projection = context.permissions.redact_projection(
             context.collection,

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

@@ -8,6 +8,9 @@ module ForestAdminAgent
         include ForestAdminAgent::Builder
         include ForestAdminDatasourceToolkit::Components::Query
         include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
+        include ForestAdminAgent::Routes::QueryHandler
+
+        NULLIFIED_POLYMORPHIC_TYPES = %w[PolymorphicOneToOne PolymorphicOneToMany].freeze
 
         def setup_routes
           add_route('forest_delete_bulk', 'delete', '/:collection_name', ->(args) { handle_request_bulk(args) })
@@ -39,45 +42,44 @@ module ForestAdminAgent
                                                                                  selection_ids[:ids])
           condition_tree_ids = condition_tree_ids.inverse if selection_ids[:are_excluded]
 
-          context.collection.schema[:fields].each_value do |field_schema|
-            next unless ['PolymorphicOneToOne', 'PolymorphicOneToMany'].include?(field_schema.type)
-            next if field_schema.respond_to?(:cascade_on_delete) && field_schema.cascade_on_delete
+          filter = build_context_filter(context.collection, args, context.permissions, context.caller)
+          filter = filter.override(
+            condition_tree: ConditionTree::ConditionTreeFactory.intersect([filter.condition_tree, condition_tree_ids])
+          )
+
+          relations = nullified_polymorphic_relations(context.collection)
+          # ponytail: loads every deleted record's keys at once, page it if select-all deletes outgrow memory
+          records = if relations.any?
+                      context.collection.list(context.caller, filter,
+                                              Projection.new(relations.map(&:origin_key_target).uniq))
+                    end
 
-            origin_values = selection_ids[:ids].map do |pk_hash|
-              if pk_hash.is_a?(Hash)
-                pk_hash[field_schema.origin_key_target]
-              else
-                pk_names = ForestAdminDatasourceToolkit::Utils::Schema.primary_keys(context.collection)
-                index = pk_names.index(field_schema.origin_key_target)
-                pk_hash[index] if index
-              end
-            end
+          context.collection.delete(context.caller, filter)
+          relations.each { |relation| nullify_polymorphic_references(context, relation, records) }
+        end
 
-            condition_tree = Nodes::ConditionTreeBranch.new(
-              'And',
-              [
-                Nodes::ConditionTreeLeaf.new(field_schema.origin_key, Operators::IN, origin_values),
-                Nodes::ConditionTreeLeaf.new(field_schema.origin_type_field, Operators::EQUAL,
-                                             context.collection.name.gsub('__', '::'))
-              ]
-            )
-            filter = Filter.new(condition_tree: condition_tree)
-            context.datasource.get_collection(field_schema.foreign_collection)
-                   .update(context.caller, filter, { field_schema.origin_key => nil,
-                                                     field_schema.origin_type_field => nil })
+        def nullified_polymorphic_relations(collection)
+          collection.schema[:fields].values.select do |field_schema|
+            NULLIFIED_POLYMORPHIC_TYPES.include?(field_schema.type) &&
+              !(field_schema.respond_to?(:cascade_on_delete) && field_schema.cascade_on_delete)
           end
+        end
 
-          filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
-            condition_tree: ConditionTree::ConditionTreeFactory.intersect(
-              [
-                Utils::QueryStringParser.parse_condition_tree(context.collection, args),
-                condition_tree_ids,
-                context.permissions.get_scope(context.collection)
-              ]
-            )
-          )
+        def nullify_polymorphic_references(context, relation, records)
+          origin_values = records.map { |record| record[relation.origin_key_target] }
+          return if origin_values.empty?
 
-          context.collection.delete(context.caller, filter)
+          condition_tree = Nodes::ConditionTreeBranch.new(
+            'And',
+            [
+              Nodes::ConditionTreeLeaf.new(relation.origin_key, Operators::IN, origin_values),
+              Nodes::ConditionTreeLeaf.new(relation.origin_type_field, Operators::EQUAL,
+                                           context.collection.name.gsub('__', '::'))
+            ]
+          )
+          context.datasource.get_collection(relation.foreign_collection)
+                 .update(context.caller, Filter.new(condition_tree: condition_tree),
+                         { relation.origin_key => nil, relation.origin_type_field => nil })
         end
       end
     end

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

@@ -18,29 +18,9 @@ module ForestAdminAgent
           context = build(args)
           context.permissions.can?(:browse, context.collection)
 
-          condition_tree = QueryStringParser.parse_condition_tree(context.collection, args)
-          search = QueryStringParser.parse_search(context.collection, args)
-          search_extended = QueryStringParser.parse_search_extended(args)
           sort = QueryStringParser.parse_sort(context.collection, args)
-          context.permissions.assert_can_read_query_fields(
-            context.collection,
-            condition_tree: condition_tree, sort: sort, search: search, search_extended: search_extended
-          )
-
-          filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
-            condition_tree: ConditionTreeFactory.intersect(
-              [
-                context.permissions.get_scope(context.collection),
-                condition_tree,
-                parse_query_segment(context.collection, args, context.permissions, context.caller)
-              ]
-            ),
-            page: QueryStringParser.parse_pagination(args),
-            search: search,
-            search_extended: search_extended,
-            sort: sort,
-            segment: QueryStringParser.parse_segment(context.collection, args)
-          )
+          filter = build_context_filter(context.collection, args, context.permissions, context.caller, sort: sort)
+                   .override(page: QueryStringParser.parse_pagination(args))
 
           projection = redacted_projection_with_pks(context, context.collection, args)
           records = context.collection.list(context.caller, filter, projection)

data/lib/forest_admin_agent/routes/resources/related/count_related.rb

@@ -8,6 +8,7 @@ module ForestAdminAgent
           include ForestAdminAgent::Builder
           include ForestAdminDatasourceToolkit::Utils
           include ForestAdminDatasourceToolkit::Components::Query
+          include ForestAdminAgent::Routes::QueryHandler
 
           def setup_routes
             add_route(
@@ -25,7 +26,7 @@ module ForestAdminAgent
             context.permissions.can?(:browse, context.child_collection)
 
             if context.child_collection.is_countable?
-              filter = Filter.new(condition_tree: context.permissions.get_scope(context.child_collection))
+              filter = build_context_filter(context.child_collection, args, context.permissions, context.caller)
               primary_key_values = Utils::Id.unpack_id(context.collection, args[:params]['id'], with_key: true)
               result = Collection.aggregate_relation(
                 context.collection,

data/lib/forest_admin_agent/routes/resources/related/csv_related.rb

@@ -6,6 +6,7 @@ module ForestAdminAgent
           include ForestAdminAgent::Utils
           include ForestAdminDatasourceToolkit::Utils
           include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
+          include ForestAdminAgent::Routes::QueryHandler
 
           def setup_routes
             add_route(
@@ -23,18 +24,7 @@ module ForestAdminAgent
             context = build(args)
             context.permissions.can?(:browse, context.child_collection)
             context.permissions.can?(:export, context.child_collection)
-            condition_tree = ForestAdminAgent::Utils::QueryStringParser.parse_condition_tree(
-              context.child_collection, args
-            )
-            context.permissions.assert_can_read_query_fields(
-              context.child_collection, condition_tree: condition_tree
-            )
-
-            filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
-              condition_tree: ConditionTreeFactory.intersect(
-                [context.permissions.get_scope(context.child_collection), condition_tree]
-              )
-            )
+            filter = build_context_filter(context.child_collection, args, context.permissions, context.caller)
             requested = ForestAdminAgent::Utils::QueryStringParser.parse_requested_projection(
               context.child_collection, args
             )

data/lib/forest_admin_agent/routes/resources/related/dissociate_related.rb

@@ -8,6 +8,7 @@ module ForestAdminAgent
           include ForestAdminAgent::Builder
           include ForestAdminDatasourceToolkit::Utils
           include ForestAdminDatasourceToolkit::Components::Query
+          include ForestAdminAgent::Routes::QueryHandler
 
           def setup_routes
             add_route(
@@ -126,14 +127,9 @@ module ForestAdminAgent
               raise ForestAdminDatasourceToolkit::Exceptions::ForestException, 'Expected no empty id list'
             end
 
-            Filter.new(
-              condition_tree: ConditionTree::ConditionTreeFactory.intersect(
-                [
-                  context.permissions.get_scope(context.child_collection),
-                  Utils::QueryStringParser.parse_condition_tree(context.child_collection, args),
-                  selected_ids
-                ]
-              )
+            filter = build_context_filter(context.child_collection, args, context.permissions, context.caller)
+            filter.override(
+              condition_tree: ConditionTree::ConditionTreeFactory.intersect([filter.condition_tree, selected_ids])
             )
           end
         end

data/lib/forest_admin_agent/routes/resources/related/list_related.rb

@@ -8,6 +8,7 @@ module ForestAdminAgent
           include ForestAdminAgent::Builder
           include ForestAdminDatasourceToolkit::Utils
           include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
+          include ForestAdminAgent::Routes::QueryHandler
 
           def setup_routes
             add_route(
@@ -23,21 +24,10 @@ module ForestAdminAgent
           def handle_request(args = {})
             context = build(args)
             context.permissions.can?(:browse, context.child_collection)
-            condition_tree = ForestAdminAgent::Utils::QueryStringParser.parse_condition_tree(
-              context.child_collection, args
-            )
             sort = ForestAdminAgent::Utils::QueryStringParser.parse_sort(context.child_collection, args)
-            context.permissions.assert_can_read_query_fields(
-              context.child_collection, condition_tree: condition_tree, sort: sort
-            )
-
-            filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
-              condition_tree: ConditionTreeFactory.intersect(
-                [context.permissions.get_scope(context.child_collection), condition_tree]
-              ),
-              page: ForestAdminAgent::Utils::QueryStringParser.parse_pagination(args),
-              sort: sort
-            )
+            filter = build_context_filter(context.child_collection, args, context.permissions, context.caller,
+                                          sort: sort)
+                     .override(page: ForestAdminAgent::Utils::QueryStringParser.parse_pagination(args))
             projection = redacted_projection_with_pks(context, context.child_collection, args)
             primary_key_values = Utils::Id.unpack_id(context.collection, args[:params]['id'], with_key: true)
             records = Collection.list_relation(

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -318,8 +318,7 @@ module ForestAdminAgent
       end
 
       def self.parse_segment(collection, args)
-        segment = args.dig(:params, :data, :attributes, :all_records_subset_query,
-                           :segment) || args.dig(:params, :segment)
+        segment = subset_or_query(args, :segment) || args.dig(:params, :segment)
 
         return unless segment
 

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

@@ -6,7 +6,7 @@ module ForestAdminAgent
     module Schema
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
-        LIANA_VERSION = "1.46.1"
+        LIANA_VERSION = "1.46.2"
 
         def self.generate(datasource)
           datasource.collections

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.46.1"
+  VERSION = "1.46.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.46.1
+  version: 1.46.2
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-16 00:00:00.000000000 Z
+date: 2026-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord