Fix #as_query to provide format ready to convert to URL params

- Enhanced `as_query` method to handle dynamic filters correctly, ensuring proper serialization of query arguments.
- Added `as_json` method to provide JSON representation of datagrid attributes.
- Updated `query_params` to use string keys for consistency.
- Extended `TRUTH` array in `Utils` to include "y" for boolean conversion.
- Adjusted tests to reflect changes in serialization and parameter handling.

Author: bogdan

CHANGELOG.md

@@ -1,7 +1,29 @@
 # Changelog
 
+## [2.0.7]
+
 * Raise `Datagrid::ConfigurationError` when column or filter name 
   specified in `before` or `after` option not found.
+* Fixed `as_query` method when dynamic filter is used. Fixes [#344](https://github.com/bogdan/datagrid/issues/344)
+
+``` ruby
+grid = ProductsGrid.new(category: 'dresses', available: true, condition: ["price", ">=", 25])
+# Before
+grid.as_query 
+  # => {
+  #      category: 'dresses', 
+  #      available: true, 
+  #      condition: #<Object>
+  #    }
+# After
+grid.as_query 
+  # => {
+  #      "category" => 'dresses', 
+  #      "available" => true, 
+  #      "condition" => { "field" => "price", "operation" => ">=", "value" => "25" }
+  #    }
+```
+
 
 ## [2.0.6]
 

lib/datagrid/core.rb

@@ -2,6 +2,7 @@
 
 require "datagrid/drivers"
 require "active_support/core_ext/class/attribute"
+require "active_support/core_ext/object/json"
 require "active_model/attribute_assignment"
 
 module Datagrid
@@ -210,16 +211,15 @@ def assets
       scope
     end
 
-    # @return [Hash{Symbol => Object}] serializable query arguments skipping all nil values
+    # @return [Hash{String => Object}] serializable query arguments skipping all nil values
     # @example
     #   grid = ProductsGrid.new(category: 'dresses', available: true)
     #   grid.as_query # => {category: 'dresses', available: true}
     def as_query
-      attributes = self.attributes.clone
-      attributes.each do |key, value|
-        attributes.delete(key) if value.nil?
+      self.attributes.reduce({}) do |result, (k,v)|
+        result[k.to_s] = v.as_json unless v.nil?
+        result
       end
-      attributes
     end
 
     # @return [Hash{Symbol => Hash{Symbol => Object}}] query parameters to link this grid from a page
@@ -228,7 +228,18 @@ def as_query
     #   Rails.application.routes.url_helpers.products_path(grid.query_params)
     #     # => "/products?products_grid[category]=dresses&products_grid[available]=true"
     def query_params(attributes = {})
-      { param_name.to_sym => as_query.merge(attributes) }
+      { param_name.to_s => as_query.merge(attributes.stringify_keys) }
+    end
+
+    # @return [Hash{String => Object}] JSON representation of datagrid attributes
+    # @example
+    #   grid = ProductsGrid.new(category: 'dresses', available: true)
+    #   grid.as_json # => {"category" => 'dresses', "available" => true}
+    def as_json(options = nil)
+      attributes.reduce({}) do |result, (k,v)|
+        result[k.to_s] = v.as_json(options)
+        result
+      end
     end
 
     # @return [void] redefines scope at instance level

lib/datagrid/filters/dynamic_filter.rb

@@ -143,8 +143,8 @@ def to_h
           { field: field, operation: operation, value: value }
         end
 
-        def as_query
-          to_h
+        def as_json
+          { "field" => field, "operation" => operation, "value" => value }
         end
 
         protected

lib/datagrid/helper.rb

@@ -436,7 +436,7 @@ def datagrid_order_path(grid, column, descending)
       query = request&.query_parameters || {}
       ActionDispatch::Http::URL.path_for(
         path: request&.path || "/",
-        params: query.merge(grid.query_params(order: column.name, descending: descending)),
+        params: query.merge(grid.query_params("order" => column.name, "descending" => descending)),
       )
     end
 

lib/datagrid/utils.rb

@@ -4,7 +4,7 @@ module Datagrid
   # @!visibility private
   module Utils
     class << self
-      TRUTH = [true, 1, "1", "true", "yes", "on"].freeze
+      TRUTH = [true, 1, "1", "true", "yes", "on", "y"].freeze
 
       def booleanize(value)
         value = value.downcase if value.respond_to?(:downcase)

spec/datagrid/core_spec.rb

@@ -244,7 +244,7 @@ class EqualTest < Datagrid::Base
     end
   end
 
-  describe ".query_param" do
+  describe "#query_param" do
     it "works" do
       grid = test_grid(name: "value") do
         scope { Entry }
@@ -253,7 +253,22 @@ def param_name
           "grid"
         end
       end
-      expect(grid.query_params).to eq({ grid: { name: "value" } })
+      expect(grid.query_params).to eq({ "grid" => { "name" => "value" } })
+    end
+  end
+
+  describe "#as_json" do
+    it "works" do
+      grid = SimpleReport.new(category: "One", confirmed: true, disabled: true, group_id: 1, name: "hello", order: :category)
+      expect(grid.as_json).to eq(
+        "category" => "One",
+        "confirmed" => true,
+        "descending" => nil,
+        "disabled" => "YES",
+        "group_id" => [1],
+        "name" => "hello",
+        "order" => "category",
+      )
     end
   end
 end

spec/datagrid/filters/dynamic_filter_spec.rb

@@ -218,4 +218,15 @@
     grid.condition = ["groups.name", "=~", "Hello"]
     expect(grid.assets).to_not include(entry)
   end
+
+  it "serializes value to array when calling as_query" do
+    grid = test_grid(condition: ["id", "=", 1]) do
+      scope { Entry }
+      filter(:condition, :dynamic)
+    end
+
+    expect(grid.as_query).to eq({
+      "condition" => {"field" => "id", "operation" => "=", "value" => 1}
+    })
+  end
 end