forest_admin_datasource_toolkit 1.0.0.pre.beta.83 → 1.0.0.pre.beta.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e6da6151544ce719d17e6a14b349c2fe48d623d4f6d8a301a82159e93132a1
-  data.tar.gz: 6684f1ba755d15a7ac8dc5a9d46a1fb3a0c46ac77b61dea70d795dd16831dc52
+  metadata.gz: 3550cad39d6cdb44ffa071b6f872831a7f84ccdfc98303385c4d0f5c6071f865
+  data.tar.gz: b3cce92750ed549ad2ea34e08cf7ae77ba62518b6b867b492c0fe78233769b27
 SHA512:
-  metadata.gz: 9ed9f1764a246355eec14f0ca39bfb37b068b8d24734b98c932cd529ee819e5e858773a347a1a93837f738b225c0a0d8fd8b7ef86742ccc7ffd678770d5385af
-  data.tar.gz: 0caca749790952066e5e518660065600b4e143823b235a9ceb8699e30b9345dca1f1183ff07deedf9c0364736a39f3c8242e7a44b273161b3e2a3913ddaf87bd
+  metadata.gz: 130de0d0e11b0711fe4baaf61d33da6ed9f2411c64c10dad468d66635e02b65d8f7edc56fa1e9b4d8b3dd6117b570c13af42d5356fa15a5c16e286b7238e8d25
+  data.tar.gz: c2e8760294b55455e567c3bbd85b7350825034ec671f3ff200428042a56219f12273de101cd0c2b46514c45eb30352fa29249c7000673a2706148d5ab77af7eb

data/lib/forest_admin_datasource_toolkit/components/query/condition_tree/nodes/condition_tree_branch.rb

@@ -43,7 +43,7 @@ module ForestAdminDatasourceToolkit
             end
 
             def for_each_leaf(&handler)
-              @conditions.each { |condition| condition.for_each_leaf(&handler) }
+              @conditions.map! { |condition| condition.for_each_leaf(&handler) }
               self
             end
 

data/lib/forest_admin_datasource_toolkit/components/query/condition_tree/nodes/condition_tree_leaf.rb

@@ -40,9 +40,9 @@ module ForestAdminDatasourceToolkit
 
               case @operator
               when Operators::BLANK
-                override(operator: Operators::BLANK)
-              when Operators::PRESENT
                 override(operator: Operators::PRESENT)
+              when Operators::PRESENT
+                override(operator: Operators::BLANK)
               else
                 raise ForestException, "Operator: #{@operator} cannot be inverted."
               end
@@ -133,7 +133,7 @@ module ForestAdminDatasourceToolkit
               ConditionTreeLeaf.new(
                 args[:field] || @field,
                 args[:operator] || @operator,
-                args[:value] || @value
+                args[:value].nil? ? @value : args[:value]
               )
             end
 

data/lib/forest_admin_datasource_toolkit/components/query/condition_tree/transforms/times.rb

@@ -14,7 +14,7 @@ module ForestAdminDatasourceToolkit
             def self.compare(operator)
               {
                 depends_on: [operator],
-                for_types: ['Date', 'Dateonly'],
+                for_types: %w[Date Dateonly],
                 replacer: proc { |leaf, tz|
                   leaf.override(operator: operator, value: format(yield(Time.now.in_time_zone(tz), leaf.value)))
                 }
@@ -24,7 +24,7 @@ module ForestAdminDatasourceToolkit
             def self.interval(start_fn, end_fn)
               {
                 depends_on: [Operators::LESS_THAN, Operators::GREATER_THAN],
-                for_types: ['Date', 'Dateonly'],
+                for_types: %w[Date Dateonly],
                 replacer: proc do |leaf, tz|
                   value_greater_than = if leaf.value.nil?
                                          format(start_fn.call(Time.now.in_time_zone(tz)))

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

@@ -4,7 +4,14 @@ module ForestAdminDatasourceToolkit
       class Filter
         attr_reader :condition_tree, :segment, :sort, :search, :search_extended, :page
 
-        def initialize(condition_tree: nil, search: nil, search_extended: nil, segment: nil, sort: nil, page: nil)
+        def initialize(
+          condition_tree: nil,
+          search: nil,
+          search_extended: nil,
+          segment: nil,
+          sort: nil,
+          page: nil
+        )
           @condition_tree = condition_tree
           @search = search
           @search_extended = search_extended

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

@@ -33,9 +33,9 @@ module ForestAdminDatasourceToolkit
                                             when Operators::TODAY
                                               leaf.override(operator: Operators::YESTERDAY)
                                             when Operators::PREVIOUS_X_DAYS
-                                              get_previous_x_days_period(leaf, timezone, 'Previous_X_Days')
+                                              get_previous_x_days_period(leaf, timezone, Operators::PREVIOUS_X_DAYS)
                                             when Operators::PREVIOUS_X_DAYS_TO_DATE
-                                              get_previous_x_days_period(leaf, timezone, 'Previous_X_Days_To_Date')
+                                              get_previous_x_days_period(leaf, timezone, Operators::PREVIOUS_X_DAYS_TO_DATE)
                                             else
                                               leaf
                                             end

data/lib/forest_admin_datasource_toolkit/datasource.rb

@@ -1,11 +1,12 @@
 module ForestAdminDatasourceToolkit
   class Datasource < Components::Contracts::DatasourceContract
-    attr_reader :collections, :schema
+    attr_reader :collections, :schema, :live_query_connections
 
     def initialize
       super
       @schema = { charts: [] }
       @collections = {}
+      @live_query_connections = {}
     end
 
     def get_collection(name)
@@ -25,5 +26,13 @@ module ForestAdminDatasourceToolkit
     def render_chart(_caller, name)
       raise Exceptions::ForestException, "No chart named #{name} exists on this datasource."
     end
+
+    def execute_native_query(_connection_name, _query, _binds)
+      raise Exceptions::ForestException, 'this datasource do not support native query.'
+    end
+
+    def build_binding_symbol(_connection_name, _binds)
+      raise Exceptions::ForestException, 'this datasource do not support native query.'
+    end
   end
 end

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.0.0-beta.83"
+  VERSION = "1.0.0-beta.85"
 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.83
+  version: 1.0.0.pre.beta.85
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport