forest_admin_agent 1.0.0.pre.beta.23 → 1.0.0.pre.beta.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c342682e272a5886928f4c48de0e35dbd6bcf013c4f888aa56bac238cca695da
-  data.tar.gz: 300d73bdac310e91c2aa4a044d095b782bd362a0fb3c6309871fad0b1fff2930
+  metadata.gz: 99124b74e8108992635d7c4932b1e1a3e670cdef851df6af0174b1b13434845e
+  data.tar.gz: a4fb88fed216fd288ff7a2d89e13216ed21f576482f450b08300dc22ed805579
 SHA512:
-  metadata.gz: 50d05943fa75c8559e127bd181f91bb36dc64352237126381d4bd1fd769fa0e51389b74051e1f7cdc55f7c6747fbdb2c91259cf135c6e2e7e7665c5cef8cefcd
-  data.tar.gz: be53569ca0ad92511dc33b118693445e5a2a522faa98fd24e4d3662bf70eaa3ac7f9614cc1dccc6db444f8fe204d39db43eca1709f8efe4e528f7fef2b200ebf
+  metadata.gz: ef8333542d36d50484ede07d6bee4923e777eba881b6c49678e803387c271b8b4487ebf9b9f37697f8e23381c07e6a05af1a4eee07b8ead80277904fda28baf4
+  data.tar.gz: c32a53f151d3135e98349148e214f5ef90f9134a5cdf74fe3ac6bb072c241d7aef7a99a9cd3d8f8295d8acfa517bcae54567bf8b389ce533dfc1b3fe4c295f1f

data/lib/forest_admin_agent/builder/agent_factory.rb

@@ -14,26 +14,31 @@ module ForestAdminAgent
       def setup(options)
         @options = options
         @has_env_secret = options.to_h.key?(:env_secret)
-        @customizer = ForestAdminDatasourceToolkit::Datasource.new
+        @customizer = ForestAdminDatasourceCustomizer::DatasourceCustomizer.new
         build_container
         build_cache
         build_logger
       end
 
-      def add_datasource(datasource)
-        datasource.collections.each_value { |collection| @customizer.add_collection(collection) }
+      def add_datasource(datasource, options = {})
+        @customizer.add_datasource(datasource, options)
+
         self
       end
 
+      def customize_collection(name, handle)
+        @customizer.customize_collection(name, handle)
+      end
+
       def build
-        @container.register(:datasource, @customizer)
+        @container.register(:datasource, @customizer.datasource)
         send_schema
       end
 
       def send_schema(force: false)
         return unless @has_env_secret
 
-        schema = ForestAdminAgent::Utils::Schema::SchemaEmitter.get_serialized_schema(@customizer)
+        schema = ForestAdminAgent::Utils::Schema::SchemaEmitter.get_serialized_schema(@customizer.datasource)
         schema_is_know = @container.key?(:schema_file_hash) &&
                          @container.resolve(:schema_file_hash).get('value') == schema[:meta][:schemaFileHash]
 

data/lib/forest_admin_agent/routes/abstract_authenticated_route.rb

@@ -14,7 +14,7 @@ module ForestAdminAgent
         record = args[:params][:data][:attributes]
 
         args[:params][:data][:relationships]&.map do |field, value|
-          schema = @collection.fields[field]
+          schema = @collection.schema[:fields][field]
 
           record[schema.foreign_key] = value['data'][schema.foreign_key_target] if schema.type == 'ManyToOne'
         end

data/lib/forest_admin_agent/routes/abstract_related_route.rb

@@ -4,8 +4,8 @@ module ForestAdminAgent
       def build(args = {})
         super
 
-        relation = @collection.fields[args[:params]['relation_name']]
-        @child_collection = @datasource.collection(relation.foreign_collection)
+        relation = @collection.schema[:fields][args[:params]['relation_name']]
+        @child_collection = @datasource.get_collection(relation.foreign_collection)
       end
     end
   end

data/lib/forest_admin_agent/routes/abstract_route.rb

@@ -8,7 +8,7 @@ module ForestAdminAgent
 
       def build(args)
         @datasource = ForestAdminAgent::Facades::Container.datasource
-        @collection = @datasource.collection(args[:params]['collection_name'])
+        @collection = @datasource.get_collection(args[:params]['collection_name'])
       end
 
       def routes

data/lib/forest_admin_agent/routes/charts/charts.rb

@@ -141,7 +141,7 @@ module ForestAdminAgent
         end
 
         def make_leaderboard
-          field = @collection.fields[@args[:params][:relationshipFieldName]]
+          field = @collection.schema[:fields][@args[:params][:relationshipFieldName]]
 
           if field && field.type == 'OneToMany'
             inverse = ForestAdminDatasourceToolkit::Utils::Collection.get_inverse_relation(
@@ -180,7 +180,7 @@ module ForestAdminAgent
           end
 
           if collection && filter && aggregation
-            rows = @datasource.collection(collection).aggregate(
+            rows = @datasource.get_collection(collection).aggregate(
               @caller,
               filter,
               aggregation,

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

@@ -26,7 +26,7 @@ module ForestAdminAgent
             return {
               name: args[:params]['collection_name'],
               content: {
-                count: result[0][:value]
+                count: result.empty? ? 0 : result[0][:value]
               }
             }
           end

data/lib/forest_admin_agent/routes/resources/related/associate_related.rb

@@ -62,7 +62,7 @@ module ForestAdminAgent
             origin_value = Collection.get_value(@collection, @caller, parent_id, id)
             record = { relation.origin_key => origin_value, relation.foreign_key => foreign_value }
 
-            through_collection = @datasource.collection(relation.through_collection)
+            through_collection = @datasource.get_collection(relation.through_collection)
             through_collection.create(@caller, record)
           end
         end

data/lib/forest_admin_agent/routes/resources/related/dissociate_related.rb

@@ -52,7 +52,7 @@ module ForestAdminAgent
           end
 
           def dissociate_or_delete_many_to_many(relation, relation_name, parent_id, is_delete_mode, filter)
-            through_collection = @datasource.collection(relation.through_collection)
+            through_collection = @datasource.get_collection(relation.through_collection)
 
             if is_delete_mode
               # Generate filters _BEFORE_ deleting stuff, otherwise things break.

data/lib/forest_admin_agent/routes/resources/related/update_related.rb

@@ -23,7 +23,7 @@ module ForestAdminAgent
             build(args)
             @permissions.can?(:edit, @collection)
 
-            relation = @collection.fields[args[:params]['relation_name']]
+            relation = @collection.schema[:fields][args[:params]['relation_name']]
             parent_id = Utils::Id.unpack_id(@collection, args[:params]['id'])
 
             linked_id = if (id = args.dig(:params, :data, :id))

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

@@ -32,11 +32,11 @@ module ForestAdminAgent
 
         def link_one_to_one_relations(args, record)
           args[:params][:data][:relationships]&.map do |field, value|
-            schema = @collection.fields[field]
+            schema = @collection.schema[:fields][field]
             next unless schema.type == 'OneToOne'
 
             id = Utils::Id.unpack_id(@collection, value['data']['id'], with_key: true)
-            foreign_collection = @datasource.collection(schema.foreign_collection)
+            foreign_collection = @datasource.get_collection(schema.foreign_collection)
             # Load the value that will be used as origin_key
             origin_value = record[schema.origin_key_target]
 

data/lib/forest_admin_agent/serializer/forest_serializer.rb

@@ -41,8 +41,8 @@ module ForestAdminAgent
       end
 
       def attributes
-        forest_collection = ForestAdminAgent::Facades::Container.datasource.collection(object.class.name.demodulize.underscore)
-        fields = forest_collection.fields.select { |_field_name, field| field.type == 'Column' }
+        forest_collection = ForestAdminAgent::Facades::Container.datasource.get_collection(object.class.name.demodulize.underscore)
+        fields = forest_collection.schema[:fields].select { |_field_name, field| field.type == 'Column' }
         fields.each { |field_name, _field| add_attribute(field_name) }
         return {} if attributes_map.nil?
         attributes = {}
@@ -104,9 +104,9 @@ module ForestAdminAgent
       end
 
       def relationships
-        forest_collection = ForestAdminAgent::Facades::Container.datasource.collection(object.class.name.demodulize.underscore)
-        relations_to_many = forest_collection.fields.select { |_field_name, field| field.type == 'OneToMany' || field.type == 'ManyToMany' }
-        relations_to_one = forest_collection.fields.select { |_field_name, field| field.type == 'OneToOne' || field.type == 'ManyToOne' }
+        forest_collection = ForestAdminAgent::Facades::Container.datasource.get_collection(object.class.name.demodulize.underscore)
+        relations_to_many = forest_collection.schema[:fields].select { |_field_name, field| field.type == 'OneToMany' || field.type == 'ManyToMany' }
+        relations_to_one = forest_collection.schema[:fields].select { |_field_name, field| field.type == 'OneToOne' || field.type == 'ManyToOne' }
 
         relations_to_one.each { |field_name, _field| add_to_one_association(field_name) }
 

data/lib/forest_admin_agent/utils/id.rb

@@ -11,7 +11,7 @@ module ForestAdminAgent
         end
 
         result = primary_keys.map.with_index do |pk_name, index|
-          field = collection.fields[pk_name]
+          field = collection.schema[:fields][pk_name]
           value = primary_key_values[index]
           casted_value = field.column_type == 'Number' ? value.to_i : value
           # TODO: call FieldValidator::validateValue($value, $field, $castedValue);

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -57,7 +57,7 @@ module ForestAdminAgent
         return ProjectionFactory.all(collection) unless fields != '' && !fields.nil?
 
         fields = fields.split(',').map do |field_name|
-          column = collection.fields[field_name.strip]
+          column = collection.schema[:fields][field_name.strip]
           column.type == 'Column' ? field_name.strip : "#{field_name.strip}:#{args[:params][:fields][field_name.strip]}"
         end
 

data/lib/forest_admin_agent/utils/schema/generator_collection.rb

@@ -10,7 +10,7 @@ module ForestAdminAgent
             fields: build_fields(collection),
             icon: nil,
             integration: nil,
-            isReadOnly: collection.fields.all? { |_k, field| field.type != 'Column' || field.is_read_only },
+            isReadOnly: collection.schema[:fields].all? { |_k, field| field.type != 'Column' || field.is_read_only },
             isSearchable: true,
             isVirtual: false,
             name: collection.name,
@@ -21,7 +21,7 @@ module ForestAdminAgent
         end
 
         def self.build_fields(collection)
-          fields = collection.fields.select do |name, _field|
+          fields = collection.schema[:fields].select do |name, _field|
             !ForestAdminDatasourceToolkit::Utils::Schema.foreign_key?(collection, name) ||
               ForestAdminDatasourceToolkit::Utils::Schema.primary_key?(collection, name)
           end

data/lib/forest_admin_agent/utils/schema/generator_field.rb

@@ -10,7 +10,7 @@ module ForestAdminAgent
         }.freeze
 
         def self.build_schema(collection, name)
-          type = collection.fields[name].type
+          type = collection.schema[:fields][name].type
 
           case type
           when 'Column'
@@ -26,7 +26,7 @@ module ForestAdminAgent
           private
 
           def build_column_schema(collection, name)
-            column = collection.fields[name]
+            column = collection.schema[:fields][name]
             is_foreign_key = ForestAdminDatasourceToolkit::Utils::Schema.foreign_key?(collection, name)
 
             {
@@ -74,10 +74,10 @@ module ForestAdminAgent
 
           def build_many_to_many_schema(relation, collection, foreign_collection, base_schema)
             target_name = relation.foreign_key_target
-            target_field = foreign_collection.fields[target_name]
-            through_schema = collection.datasource.collection(relation.through_collection)
-            foreign_schema = through_schema.fields[relation.foreign_key]
-            origin_key = through_schema.fields[relation.origin_key]
+            target_field = foreign_collection.schema[:fields][target_name]
+            through_schema = collection.datasource.get_collection(relation.through_collection)
+            foreign_schema = through_schema.schema[:fields][relation.foreign_key]
+            origin_key = through_schema.schema[:fields][relation.origin_key]
 
             base_schema.merge(
               {
@@ -96,8 +96,8 @@ module ForestAdminAgent
 
           def build_one_to_many_schema(relation, collection, foreign_collection, base_schema)
             target_name = relation.origin_key_target
-            target_field = collection.fields[target_name]
-            origin_key = foreign_collection.fields[relation.origin_key]
+            target_field = collection.schema[:fields][target_name]
+            origin_key = foreign_collection.schema[:fields][relation.origin_key]
 
             base_schema.merge(
               {
@@ -115,8 +115,8 @@ module ForestAdminAgent
           end
 
           def build_one_to_one_schema(relation, collection, foreign_collection, base_schema)
-            target_field = collection.fields[relation.origin_key_target]
-            key_field = foreign_collection.fields[relation.origin_key]
+            target_field = collection.schema[:fields][relation.origin_key_target]
+            key_field = foreign_collection.schema[:fields][relation.origin_key]
 
             base_schema.merge(
               {
@@ -134,7 +134,7 @@ module ForestAdminAgent
           end
 
           def build_many_to_one_schema(relation, collection, foreign_collection, base_schema)
-            key_field = collection.fields[relation.foreign_key]
+            key_field = collection.schema[:fields][relation.foreign_key]
 
             base_schema.merge(
               {
@@ -152,8 +152,8 @@ module ForestAdminAgent
           end
 
           def build_relation_schema(collection, name)
-            relation = collection.fields[name]
-            foreign_collection = collection.datasource.collection(relation.foreign_collection)
+            relation = collection.schema[:fields][name]
+            foreign_collection = collection.datasource.get_collection(relation.foreign_collection)
 
             relation_schema = {
               field: name,

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "forest-rails"
 
-        LIANA_VERSION = "1.0.0-beta.23"
+        LIANA_VERSION = "1.0.0-beta.25"
 
         def self.get_serialized_schema(datasource)
           schema_path = Facades::Container.cache(:schema_path)

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.0.0-beta.23"
+  VERSION = "1.0.0-beta.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.23
+  version: 1.0.0.pre.beta.25
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2023-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -218,7 +218,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
-- CHANGELOG.md
 - README.md
 - Rakefile
 - forest_admin

data/CHANGELOG.md

@@ -1,5 +0,0 @@
-## [Unreleased]
-
-## [0.1.0] - 2023-08-28
-
-- Initial release