forest_admin_agent 1.12.8 → 1.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01f7a58ed14f73ef6090b03b00158a166e57ae8aaffb61049a58dde26c5e52e6
-  data.tar.gz: 2508a64a6b3842f83aae7a529c1915a19d75f9487e4553b19991a91834f90479
+  metadata.gz: 98c689bf74a3f3bf3dd9cab8747d0e0a526b8b7a1e7de3d43133312cf269b755
+  data.tar.gz: 6ef3e6ed4018298169d19d9eac6d6e4767695ebe372839319753d967e8c48471
 SHA512:
-  metadata.gz: 928a5f2524d32f014f226f402789cf2d81758685b71f9eabcf9008d494af5d0cbdeb066b953da697fb61df0572a800cf5e05ac658b92c31f7ab79895b40a30a9
-  data.tar.gz: 6fdf6f47c29362972f113047f2786b81ef0cca82a4a8dd7372d8e8f327811ca4a45f1005b79011b2e0a72c98c2b8b4093ec432be5aa3c79eb033f86f0627b891
+  metadata.gz: 5eb4c1f3f0cc477a2debc4191d18f191454afb628b15130b9365d1aaef78f88d5a1721ffc3fb17e3b3980a2e7c9f8b8dc3f54626f9130092ae09c142379d3aa6
+  data.tar.gz: 8c9cf757c454036b80b70ef7e1e7aa2646e2c6abd172f09a1a569ea81cff3200e7010f200afb55d600a75a8e1be9a828fc27baff52e4d77af6e1fa58a348dddb

data/lib/forest_admin_agent/routes/capabilities/collections.rb

@@ -18,12 +18,7 @@ module ForestAdminAgent
           @datasource = ForestAdminAgent::Facades::Container.datasource
           collections = args[:params]['collectionNames'] || []
 
-          connections = []
-          ForestAdminAgent::Builder::AgentFactory.instance.customizer.datasources.map do |root_datasource|
-            connections = connections.union(
-              root_datasource.live_query_connections.keys.map { |connection_name| { name: connection_name } }
-            )
-          end
+          connections = @datasource.live_query_connections.keys.map { |connection_name| { name: connection_name } }
 
           result = collections.map do |collection_name|
             collection = @datasource.get_collection(collection_name)

data/lib/forest_admin_agent/routes/query_handler.rb

@@ -6,21 +6,20 @@ module ForestAdminAgent
       include ForestAdminDatasourceToolkit::Components::Query
       include ForestAdminDatasourceToolkit::Validations
 
-      def inject_context_variables(connection_name, query, permissions, caller, context_variables)
+      def inject_context_variables(datasource, connection_name, query, permissions, caller, context_variables)
         user = permissions.get_user_data(caller.id)
         team = permissions.get_team(caller.rendering_id)
         context_variables = ContextVariables.new(team, user, context_variables)
 
-        ContextVariablesInjector.inject_context_in_native_query(connection_name, query, context_variables)
+        ContextVariablesInjector.inject_context_in_native_query(datasource, connection_name, query, context_variables)
       end
 
-      def execute_query(query, connection_name, permissions, caller, context_variables)
-        root_datasource = AgentFactory.instance.customizer.get_root_datasource_by_connection(connection_name)
+      def execute_query(datasource, query, connection_name, permissions, caller, context_variables)
         query = query.strip
-        query, context_variables = inject_context_variables(connection_name, query, permissions, caller,
+        query, context_variables = inject_context_variables(datasource, connection_name, query, permissions, caller,
                                                             context_variables)
 
-        root_datasource.execute_native_query(
+        datasource.execute_native_query(
           connection_name,
           query,
           context_variables.values
@@ -39,6 +38,7 @@ module ForestAdminAgent
         permissions.can_execute_query_segment?(collection, args[:params][:segmentQuery], args[:params][:connectionName])
 
         ids = execute_query(
+          collection.datasource,
           args[:params][:segmentQuery],
           args[:params][:connectionName],
           permissions,

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

@@ -38,6 +38,7 @@ module ForestAdminAgent
           query.gsub!('?', args[:params][:record_id].to_s) if args[:params][:record_id]
           self.type = args[:params][:type]
           result = execute_query(
+            @datasource,
             query,
             args[:params][:connectionName],
             @permissions,

data/lib/forest_admin_agent/utils/context_variables_injector.rb

@@ -12,12 +12,11 @@ module ForestAdminAgent
         end
       end
 
-      def self.inject_context_in_native_query(connection_name, query, context_variables)
+      def self.inject_context_in_native_query(datasource, connection_name, query, context_variables)
         return query unless query.is_a?(String)
 
         query_with_context_variables_injected = query
         encountered_variables = {}
-        datasource = AgentFactory.instance.customizer.get_root_datasource_by_connection(connection_name)
 
         while (match = REGEX.match(query_with_context_variables_injected))
           context_variable_key = match[1]

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.12.8"
+        LIANA_VERSION = "1.12.9"
 
         def self.generate(datasource)
           datasource.collections

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.12.8"
+  VERSION = "1.12.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.12.8
+  version: 1.12.9
 platform: ruby
 authors:
 - Matthieu