forest_admin_datasource_customizer 1.12.8 → 1.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4110d73191eea803ade34c877ec1b0645ef434b773d49fcab046e5b79bd19a2
-  data.tar.gz: 897b430464487f94dd687ab00752b440c1bcf4fa5c1576e7ad980f4483200a6e
+  metadata.gz: 0b602ad730759006a6897f4bffe4387c700dfb9e63da39f222e4ed5f14315456
+  data.tar.gz: 05501e5c27f83663f192c190d1e540584125e3a22a0aa97dd2125c185e3f7263
 SHA512:
-  metadata.gz: 29dfc4f73ae246ae85de933827b27bb8d6e6251e4f57e515717180ed41b6f4e45d3257d8dd3e0dfd1329a55a358613440369e96b44251f4de56b378e0c8fcdfc
-  data.tar.gz: b82111cf0673354355f58d18b0d6fec4c0e2bd091cee36252d606cefb740cc8ea3ee6fe04fae7f2f1db37c4f5ab6467a2019a3e925cca2a1aa4e14faaa37a43f
+  metadata.gz: 6b4d0efa7d03ee6a5362f50bcbb38990dca98835a31d1c05514be262c6f02b29a63dd7c3fe146a1cfc31dac13b1b1de5b32bb4a9c07fb2de1d0abc9d4271440d
+  data.tar.gz: d32642ef7762138472deddf1d6011f27470b76b4c53891a7670c19b20eb2e7e920bedcf087c002f47c059ed4e801e09a2f778a76f45f2f574d7faf371a222a75

data/lib/forest_admin_datasource_customizer/composite_datasource.rb

@@ -0,0 +1,77 @@
+module ForestAdminDatasourceCustomizer
+  class CompositeDatasource
+    def initialize
+      @datasources = []
+    end
+
+    def live_query_connections
+      @datasources.each_with_object({}) do |ds, acc|
+        acc.merge!(ds.live_query_connections || {})
+      end
+    end
+
+    def schema
+      { charts: @datasources.flat_map { |ds| ds.schema[:charts] } }
+    end
+
+    def collections
+      @datasources.reduce({}) { |acc, ds| acc.merge(ds.collections) }
+    end
+
+    def get_collection(name)
+      @datasources.each do |ds|
+        return ds.get_collection(name)
+      rescue StandardError
+        # ignore and continue
+      end
+
+      raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
+            "Collection '#{name}' not found. List of available collections: #{collections.keys.sort.join(", ")}"
+    end
+
+    def render_chart(caller_obj, name)
+      @datasources.each do |ds|
+        return ds.render_chart(caller_obj, name) if ds.schema[:charts].include?(name)
+      end
+
+      raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
+            "Chart '#{name}' is not defined in the dataSource."
+    end
+
+    def execute_native_query(connection_name, query, context_variables = {})
+      unless live_query_connections.key?(connection_name)
+        raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
+              "Native query connection '#{name}' is unknown."
+      end
+
+      ds = @datasources.find do |d|
+        (d.live_query_connections || {}).key?(connection_name)
+      end
+
+      ds.execute_native_query(connection_name, query, context_variables)
+    end
+
+    def add_data_source(datasource)
+      existing_names = collections.map { |c| c.respond_to?(:name) ? c.name : c.to_s }
+      datasource.collections.each do |c|
+        new_name = c.respond_to?(:name) ? c.name : c.to_s
+        raise ArgumentError, "Collection '#{new_name}' already exists" if existing_names.include?(new_name)
+      end
+
+      existing_charts = schema[:charts]
+      (datasource.schema[:charts] || []).each do |chart|
+        raise ArgumentError, "Chart '#{chart}' is already defined in datasource." if existing_charts.include?(chart)
+      end
+
+      existing_conns = live_query_connections
+      (datasource.live_query_connections || {}).each_key do |conn_name|
+        if existing_conns.key?(conn_name)
+          raise ArgumentError, "Native Query connection '#{conn_name}' is already defined"
+        end
+      end
+
+      @datasources << datasource
+      nil
+    end
+  end
+end

data/lib/forest_admin_datasource_customizer/datasource_customizer.rb

@@ -3,9 +3,8 @@ module ForestAdminDatasourceCustomizer
     attr_reader :stack, :datasources
 
     def initialize(_db_config = {})
-      @composite_datasource = ForestAdminDatasourceToolkit::Datasource.new
+      @composite_datasource = ForestAdminDatasourceCustomizer::CompositeDatasource.new
       @stack = Decorators::DecoratorsStack.new(@composite_datasource)
-      @datasources = []
     end
 
     def schema
@@ -42,17 +41,9 @@ module ForestAdminDatasourceCustomizer
           datasource = rename_collection_decorator
         end
 
-        datasource.collections.each_value do |collection|
-          @composite_datasource.add_collection(collection)
-        end
-
-        datasource.schema[:charts].each do |chart|
-          @composite_datasource.add_chart(chart)
-        end
+        @composite_datasource.add_data_source(datasource)
       })
 
-      @datasources << datasource
-
       self
     end
 
@@ -79,30 +70,11 @@ module ForestAdminDatasourceCustomizer
       self
     end
 
-    def get_root_datasource_by_connection(name)
-      root_datasource = @datasources.find do |datasource|
-        datasource.live_query_connections.any? { |connection_name, _connection| connection_name == name }
-      end
-
-      unless root_datasource
-        raise ForestAdminAgent::Http::Exceptions::NotFoundError,
-              "Native query connection '#{name}' is unknown."
-      end
-
-      root_datasource
-    end
-
-    def render_chart(caller, name)
-      return @composite_datasource.render_chart(caller, name) if @composite_datasource.schema[:charts].any?(name)
-
-      raise ForestAdminAgent::Http::Exceptions::NotFoundError, "Chart '#{name}' is not defined in the dataSource."
-    end
-
     def reload!(logger: nil)
       old_composite = @composite_datasource
 
       begin
-        new_composite = ForestAdminDatasourceToolkit::Datasource.new
+        new_composite = ForestAdminDatasourceCustomizer::CompositeDatasource.new
         @stack.reload!(new_composite, logger)
         @composite_datasource = new_composite
       rescue StandardError => e

data/lib/forest_admin_datasource_customizer/decorators/rename_collection/rename_collection_datasource_decorator.rb

@@ -14,7 +14,7 @@ module ForestAdminDatasourceCustomizer
 
         def collections
           @child_datasource.collections.to_h do |name, _collection|
-            [name, method(:get_collection).super_method.call(name)]
+            [get_collection_name(name), method(:get_collection).super_method.call(name)]
           end
         end
 
@@ -48,7 +48,7 @@ module ForestAdminDatasourceCustomizer
 
         def rename_collection(current_name, new_name)
           # Check collection exists
-          get_collection(current_name)
+          collection = get_collection(current_name)
 
           return unless current_name != new_name
 
@@ -65,7 +65,7 @@ module ForestAdminDatasourceCustomizer
           end
 
           polymorphic_relations = %w[PolymorphicOneToOne PolymorphicOneToMany]
-          get_collection(current_name).schema[:fields].each do |field_name, field_schema|
+          collection.schema[:fields].each do |field_name, field_schema|
             next unless polymorphic_relations.include?(field_schema.type)
 
             reverse_relation_name = Utils::Collection.get_inverse_relation(get_collection(current_name), field_name)

data/lib/forest_admin_datasource_customizer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_customizer
 version: !ruby/object:Gem::Version
-  version: 1.12.8
+  version: 1.12.9
 platform: ruby
 authors:
 - Matthieu
@@ -144,6 +144,7 @@ files:
 - forest_admin_datasource_customizer.gemspec
 - lib/forest_admin_datasource_customizer.rb
 - lib/forest_admin_datasource_customizer/collection_customizer.rb
+- lib/forest_admin_datasource_customizer/composite_datasource.rb
 - lib/forest_admin_datasource_customizer/context/agent_customization_context.rb
 - lib/forest_admin_datasource_customizer/context/collection_customization_context.rb
 - lib/forest_admin_datasource_customizer/context/relaxed_wrappers/relaxed_collection.rb