forest_admin_datasource_rpc 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ecfc7fcccaab5082c79cd0e3540a5e49b19f31a595ff791909513dec93fef6
-  data.tar.gz: e8b60bff791c949616ef6837590b4912a4fb77c02fda387072d5b21457bf4c36
+  metadata.gz: a5c715351293fd36cb411085ff8efb48b21746d8324f20abe23cb8b4921cd038
+  data.tar.gz: f8edd7ff3f772a3c2dcfeabadfe1d20a4c06989bc6ecb96a5c4273f7396c91d2
 SHA512:
-  metadata.gz: 8c5792e93f40aad051e513b5662ba4d303d8ae3c8b6b7b50a1ef15dd8931e4eb3c9930995e268b427bd8d6b1dbea842cc4654b7c72a387e11c89b07b7380d67f
-  data.tar.gz: 0625f95718e559c308881b6090345f11637b682ec0423bf097078afbf1f056cca393bc164b2fa628b39e407b98d9625100521210e23bad41910e2215cfb83db8
+  metadata.gz: 1d54622d8ab197d024e4f6a91e9ba300bcaec6553cd139bc03755cfe51f81da550a3d3998a13b0a855275fa8a1e8303b872dd30f6f8342540edc647d4b6fafdc
+  data.tar.gz: fb9429ec75ca3c1ceec014a3756e4424f546b741d3ca8b7c295d574bed7af08b91ea7b1e20e193aee565cd32ae46a308213e7a49190757221d9a75d238fa25b4

data/lib/forest_admin_datasource_rpc/Utils/rpc_client.rb

@@ -33,7 +33,7 @@ module ForestAdminDatasourceRpc
         @auth_secret = auth_secret
       end
 
-      def call_rpc(endpoint, method: :get, payload: nil, symbolize_keys: false)
+      def call_rpc(endpoint, caller: nil, method: :get, payload: nil, symbolize_keys: false)
         client = Faraday.new(url: @api_url) do |faraday|
           faraday.request :json
           faraday.response :json, parser_options: { symbolize_names: symbolize_keys }
@@ -50,6 +50,8 @@ module ForestAdminDatasourceRpc
           'X_SIGNATURE' => signature
         }
 
+        headers['forest_caller'] = caller.to_json if caller
+
         response = client.send(method, endpoint, payload, headers)
 
         handle_response(response)

data/lib/forest_admin_datasource_rpc/collection.rb

@@ -9,7 +9,7 @@ module ForestAdminDatasourceRpc
     def initialize(datasource, name, options, schema)
       super(datasource, name)
       @options = options
-      @client = RpcClient.new(@options[:uri], ForestAdminRpcAgent::Facades::Container.cache(:auth_secret))
+      @client = RpcClient.new(@options[:uri], @options[:auth_secret] || ForestAdminRpcAgent::Facades::Container.cache(:auth_secret))
       @rpc_collection_uri = "/forest/rpc/#{name}"
       @base_params = { collection_name: name }
 
@@ -30,6 +30,8 @@ module ForestAdminDatasourceRpc
         field_name = field_name.to_s
         type = schema[:type]
         schema.delete(:type)
+        # remove these
+        schema.delete(:allow_null)
         case type
         when 'Column'
           add_field(field_name, ForestAdminDatasourceToolkit::Schema::ColumnSchema.new(**schema))
@@ -55,8 +57,7 @@ module ForestAdminDatasourceRpc
     end
 
     def list(caller, filter, projection)
-      params = build_params(caller: caller.to_h, filter: filter.to_h, projection: projection,
-                            timezone: caller.timezone)
+      params = build_params(filter: filter.to_h, projection: projection)
       url = "#{@rpc_collection_uri}/list"
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
@@ -64,11 +65,11 @@ module ForestAdminDatasourceRpc
         "Forwarding '#{@name}' list call to the Rpc agent on #{url}."
       )
 
-      @client.call_rpc(url, method: :post, payload: params)
+      @client.call_rpc(url, caller: caller, method: :post, payload: params)
     end
 
     def create(caller, data)
-      params = build_params(caller: caller.to_h, timezone: caller.timezone, data: data)
+      params = build_params(data: [data])
       url = "#{@rpc_collection_uri}/create"
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
@@ -76,11 +77,12 @@ module ForestAdminDatasourceRpc
         "Forwarding '#{@name}' creation call to the Rpc agent on #{url}."
       )
 
-      @client.call_rpc(url, method: :post, payload: params)
+      res = @client.call_rpc(url, caller: caller, method: :post, payload: params)
+      res.first
     end
 
     def update(caller, filter, data)
-      params = build_params(caller: caller.to_h, filter: filter.to_h, data: data, timezone: caller.timezone)
+      params = build_params(filter: filter.to_h, patch: data)
       url = "#{@rpc_collection_uri}/update"
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
@@ -88,11 +90,11 @@ module ForestAdminDatasourceRpc
         "Forwarding '#{@name}' update call to the Rpc agent on #{url}."
       )
 
-      @client.call_rpc(url, method: :post, payload: params)
+      @client.call_rpc(url, caller: caller, method: :post, payload: params)
     end
 
     def delete(caller, filter)
-      params = build_params(caller: caller.to_h, filter: filter.to_h, timezone: caller.timezone)
+      params = build_params(filter: filter.to_h)
       url = "#{@rpc_collection_uri}/delete"
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
@@ -100,12 +102,11 @@ module ForestAdminDatasourceRpc
         "Forwarding '#{@name}' deletion call to the Rpc agent on #{url}."
       )
 
-      @client.call_rpc(url, method: :post, payload: params)
+      @client.call_rpc(url, caller: caller, method: :post, payload: params)
     end
 
     def aggregate(caller, filter, aggregation, limit = nil)
-      params = build_params(caller: caller.to_h, filter: filter.to_h, aggregation: aggregation.to_h, limit: limit,
-                            timezone: caller.timezone)
+      params = build_params(filter: filter.to_h, aggregation: aggregation.to_h, limit: limit)
       url = "#{@rpc_collection_uri}/aggregate"
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
@@ -113,18 +114,12 @@ module ForestAdminDatasourceRpc
         "Forwarding '#{@name}' aggregate call to the Rpc agent on #{url}."
       )
 
-      @client.call_rpc(url, method: :post, payload: params)
+      @client.call_rpc(url, caller: caller, method: :post, payload: params)
     end
 
     def execute(caller, name, data, filter = nil)
       data = encode_form_data(data)
-      params = build_params(
-        caller: caller.to_h,
-        timezone: caller.timezone,
-        action: name,
-        filter: filter&.to_h,
-        data: data
-      )
+      params = build_params(action: name, filter: filter&.to_h, data: data)
       url = "#{@rpc_collection_uri}/action-execute"
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
@@ -132,15 +127,14 @@ module ForestAdminDatasourceRpc
         "Forwarding '#{@name}' action #{name} call to the Rpc agent on #{url}."
       )
 
-      @client.call_rpc(url, method: :post, payload: params)
+      @client.call_rpc(url, caller: caller, method: :post, payload: params)
     end
 
     def get_form(caller, name, data = nil, filter = nil, metas = nil)
       params = build_params(action: name)
       if caller
         data = encode_form_data(data)
-        params = params.merge({ caller: caller.to_h, timezone: caller.timezone, filter: filter&.to_h, metas: metas,
-                                data: data })
+        params = params.merge({ filter: filter&.to_h, metas: metas, data: data })
       end
       url = "#{@rpc_collection_uri}/action-form"
 
@@ -149,14 +143,14 @@ module ForestAdminDatasourceRpc
         "Forwarding '#{@name}' action form #{name} call to the Rpc agent on #{url}."
       )
 
-      result = @client.call_rpc(url, method: :post, payload: params, symbolize_keys: true)
-      FormFactory.build_elements(result).map do |field|
+      result = @client.call_rpc(url, caller: caller, method: :post, payload: params, symbolize_keys: true)
+      result.map do |field|
         Actions::ActionFieldFactory.build(field.to_h)
       end
     end
 
     def render_chart(caller, name, record_id)
-      params = build_params(caller: caller.to_h, name: name, record_id: record_id)
+      params = build_params(chart: name, record_id: record_id)
       url = "#{@rpc_collection_uri}/chart"
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
@@ -164,7 +158,7 @@ module ForestAdminDatasourceRpc
         "Forwarding '#{@name}' chart #{name} call to the Rpc agent on #{url}."
       )
 
-      @client.call_rpc(url, method: :post, payload: params)
+      @client.call_rpc(url, caller: caller, method: :post, payload: params)
     end
 
     private

data/lib/forest_admin_datasource_rpc/datasource.rb

@@ -19,34 +19,36 @@ module ForestAdminDatasourceRpc
       @charts = introspection[:charts]
       @rpc_relations = introspection[:rpc_relations]
 
-      native_query_connections = introspection[:nativeQueryConnections] || []
+      native_query_connections = introspection[:native_query_connections] || []
       @live_query_connections = native_query_connections.to_h { |conn| [conn[:name], conn[:name]] }
 
       @schema = { charts: @charts }
     end
 
     def render_chart(caller, name)
-      client = RpcClient.new(@options[:uri], ForestAdminRpcAgent::Facades::Container.cache(:auth_secret))
-      url = 'forest/rpc/datasource-chart'
+      client = RpcClient.new(@options[:uri], @options[:auth_secret] || ForestAdminRpcAgent::Facades::Container.cache(:auth_secret))
+      url = 'forest/rpc-datasource-chart'
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
         'Debug',
         "Forwarding datasource chart '#{name}' call to the Rpc agent on #{url}."
       )
 
-      client.call_rpc(url, method: :post, payload: { chart: name, caller: caller.to_h })
+      client.call_rpc(url, caller: caller, method: :post, payload: { chart: name })
     end
 
     def execute_native_query(connection_name, query, binds)
-      client = RpcClient.new(@options[:uri], ForestAdminRpcAgent::Facades::Container.cache(:auth_secret))
-      url = 'forest/rpc/native-query'
+      client = RpcClient.new(@options[:uri], @options[:auth_secret] || ForestAdminRpcAgent::Facades::Container.cache(:auth_secret))
+      url = 'forest/rpc-native-query'
 
       ForestAdminRpcAgent::Facades::Container.logger.log(
         'Debug',
         "Forwarding native query for connection '#{connection_name}' to the Rpc agent on #{url}."
       )
 
-      client.call_rpc(url, method: :post, payload: { connection_name: connection_name, query: query, binds: binds })
+      result = client.call_rpc(url, method: :post,
+                                    payload: { connection_name: connection_name, query: query, binds: binds })
+      ForestAdminDatasourceToolkit::Utils::HashHelper.convert_keys(result.to_a)
     end
   end
 end

data/lib/forest_admin_datasource_rpc/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceRpc
-  VERSION = "1.13.1"
+  VERSION = "1.13.2"
 end

data/lib/forest_admin_datasource_rpc.rb

@@ -10,7 +10,7 @@ module ForestAdminDatasourceRpc
 
   def self.build(options)
     uri = options[:uri]
-    auth_secret = ForestAdminRpcAgent::Facades::Container.cache(:auth_secret)
+    auth_secret = options[:auth_secret] || ForestAdminRpcAgent::Facades::Container.cache(:auth_secret)
     ForestAdminRpcAgent::Facades::Container.logger.log('Info', "Getting schema from RPC agent on #{uri}.")
 
     begin
@@ -28,7 +28,7 @@ module ForestAdminDatasourceRpc
       # return empty datasource for not breaking stack
       ForestAdminDatasourceToolkit::Datasource.new
     else
-      sse = Utils::SseClient.new("#{uri}/forest/rpc/sse", auth_secret) do
+      sse = Utils::SseClient.new("#{uri}/forest/sse", auth_secret) do
         ForestAdminRpcAgent::Facades::Container.logger.log('Info', 'RPC server stopped, checking schema...')
         new_schema = rpc_client.call_rpc('/forest/rpc-schema', method: :get, symbolize_keys: true)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_rpc
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64