forest_admin_datasource_toolkit 1.0.0.pre.beta.101 → 1.0.0.pre.beta.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51e0c67456dd07967f7cfdb36b6954b2b7d62c31930cd73498e6e704628185ef
-  data.tar.gz: f26592628ef5d09bb6bb2f3216c5f19a7f2bcfd74cfe4c66cb2d93786c2f34e4
+  metadata.gz: 495f875b6cecfc26c1355cc38e11043a3510e50d1ad8515191dad964f8d9bd74
+  data.tar.gz: acafa1e27c47f638d275a7d50caee2dc1574a6dd223b300689b2f81718308bf2
 SHA512:
-  metadata.gz: b16e2373a7a631bdf2a3a7e23b5b3eb77430b4e2d3e02ed533108135132320f264e4a89a2cb910512b3487533f8357b07d37e6b82ceada4cf6c6c963f832dbd0
-  data.tar.gz: 1583ac50fdb7ddd453f49b481a80dfbdfb94bb733d30c6e6665560e3d721d0d131a9a48b02717410545390f4c16911e90b511bb14c3928dd23280851a9b73d67
+  metadata.gz: a3f43f1c7d7398f4f80fd493907b7831072f6f70e28fe74e55a2442cb80b9d2f7e4774119d26d0df9a657b4273d65059c9a098b0fbfee41335ddafb95b30645d
+  data.tar.gz: 0040f777cb0c5c812659c27c3bc8d6c5e2cd633c2315fe722fa87b434131608b39b03e7ce9f6ac9b90649241cdf039765cbc4678b870972a6cd2594f85c47387

data/lib/forest_admin_datasource_toolkit/collection.rb

@@ -63,6 +63,15 @@ module ForestAdminDatasourceToolkit
       schema[:actions][name] = action
     end
 
+    def add_chart(name)
+      if @schema[:charts].include?(name)
+        raise Exceptions::ForestException,
+              "Chart #{name} already defined in collection"
+      end
+
+      schema[:charts] << name
+    end
+
     def render_chart(_caller, name, _record_id)
       raise Exceptions::ForestException, "Chart #{name} is not implemented."
     end

data/lib/forest_admin_datasource_toolkit/components/caller.rb

@@ -32,6 +32,15 @@ module ForestAdminDatasourceToolkit
         @project = project
         @environment = environment
       end
+
+      def to_h
+        result = {}
+        instance_variables.each do |attribute|
+          result[attribute.to_s.delete('@').to_sym] = instance_variable_get(attribute)
+        end
+
+        result
+      end
     end
   end
 end

data/lib/forest_admin_datasource_toolkit/components/query/filter.rb

@@ -20,14 +20,14 @@ module ForestAdminDatasourceToolkit
           @page = page
         end
 
-        def to_h
+        def to_h(deeply: true)
           {
-            condition_tree: @condition_tree,
+            condition_tree: deeply && !@condition_tree.nil? ? @condition_tree.to_h : @condition_tree,
             search: @search,
             search_extended: @search_extended,
             segment: @segment,
             sort: @sort,
-            page: @page
+            page: deeply && !page.nil? ? @page.to_h : @page
           }
         end
 
@@ -36,7 +36,7 @@ module ForestAdminDatasourceToolkit
         end
 
         def override(args)
-          args = to_h.merge(args)
+          args = to_h(deeply: false).merge(args)
 
           Filter.new(**args)
         end

data/lib/forest_admin_datasource_toolkit/components/query/filter_factory.rb

@@ -9,6 +9,25 @@ module ForestAdminDatasourceToolkit
         include ForestAdminDatasourceToolkit::Schema::Relations
         include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
 
+        def self.from_plain_object(json)
+          return Filter.new if json.nil? || json.empty?
+
+          Filter.new(
+            condition_tree: ConditionTree::ConditionTreeFactory.from_plain_object(
+              json['condition_tree'] || nil
+            ),
+            page: if json['page'].nil?
+                    nil
+                  else
+                    Page.new(offset: json['page']['offset'], limit: json['page']['limit'])
+                  end,
+            search: json['search'],
+            search_extended: json['search_extended'],
+            sort: json['sort'].nil? ? nil : Sort.new(json['sort']),
+            segment: json['segment']
+          )
+        end
+
         def self.get_previous_period_filter(filter, timezone)
           filter.override(condition_tree: filter.condition_tree.replace_leafs do |leaf|
                                             case leaf.operator

data/lib/forest_admin_datasource_toolkit/components/query/page.rb

@@ -13,6 +13,10 @@ module ForestAdminDatasourceToolkit
           end_index = @limit ? @offset + @limit : nil
           records[@offset...end_index]
         end
+
+        def to_h
+          { offset: @offset, limit: @limit }
+        end
       end
     end
   end

data/lib/forest_admin_datasource_toolkit/datasource.rb

@@ -34,5 +34,16 @@ module ForestAdminDatasourceToolkit
     def build_binding_symbol(_connection_name, _binds)
       raise Exceptions::ForestException, 'this datasource do not support native query.'
     end
+
+    def add_chart(chart)
+      if @schema[:charts].any? do |c|
+        c[:name] == chart[:name]
+      end
+        raise Exceptions::ForestException,
+              "Chart #{chart[:name]} already defined in datasource"
+      end
+
+      @schema[:charts] << chart
+    end
   end
 end

data/lib/forest_admin_datasource_toolkit/decorators/collection_decorator.rb

@@ -1,6 +1,8 @@
 module ForestAdminDatasourceToolkit
   module Decorators
     class CollectionDecorator < Collection
+      include ForestAdminDatasourceToolkit::Components::Query
+
       attr_reader :datasource, :child_collection, :last_schema
       attr_writer :parent
 
@@ -36,7 +38,7 @@ module ForestAdminDatasourceToolkit
       end
 
       def get_form(caller, name, data = nil, filter = nil, metas = {})
-        refined_filter = refine_filter(caller, filter)
+        refined_filter = refine_filter(caller, filter || Filter.new)
 
         @child_collection.get_form(caller, name, data, refined_filter, metas)
       end

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.0.0-beta.101"
+  VERSION = "1.0.0-beta.102"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.101
+  version: 1.0.0.pre.beta.102
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-21 00:00:00.000000000 Z
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport