forest_admin_agent 1.0.0.pre.beta.40 → 1.0.0.pre.beta.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b8857f137e139961cff4046676b1aae0e23361da856fcbec2893ec4015062d
-  data.tar.gz: 390f9b579d38542751372cbd0044c72b6aac9c1878267b1c0adfc4263ebd00e4
+  metadata.gz: 4cf2cf28452f96556dff2a234ba9583c9ee7dfd737e7a5b9950dc173e8806c40
+  data.tar.gz: 99e9e3c1c7f3a490a6c92048951d698a6bf39401728db22caf4aec7a6020438c
 SHA512:
-  metadata.gz: a31465607de88738292b710c8c13fc4188c63f7533f4c80149cd140caaaf7e6d33d7f5f1b66379342cd72c8d5303908c0d6b184656613b0d0bda3aebe1caedf6
-  data.tar.gz: db279dd8cca208a0de6af1469f03a1cf634a3c4c3978d33fc40b1795e4a206d693b653a136bda0001062b0ea14fdf7a89197a4ba8b90faa32e80d37a7914844b
+  metadata.gz: fb7093defaccc0c4e7cf6424a5605687501e763fd6b0fa74cfa931685084f344522c16d04797b0c59c448bf1bdbb5d8b80ba6215d52f585216f007c235f6e5ec
+  data.tar.gz: dfeb108f3cf907718032c1817011805366ddc406f95f8b36485eb4871edc68549ab2e05100de4f27dc3a7caa418ed418236ec98fedfe531fc304fe19e697fde8

data/lib/forest_admin_agent/builder/agent_factory.rb

@@ -26,6 +26,12 @@ module ForestAdminAgent
         self
       end
 
+      def add_chart(name, &definition)
+        @customizer.add_chart(name, &definition)
+
+        self
+      end
+
       def customize_collection(name, &handle)
         @customizer.customize_collection(name, handle)
       end

data/lib/forest_admin_agent/facades/container.rb

@@ -9,6 +9,10 @@ module ForestAdminAgent
         instance.resolve(:datasource)
       end
 
+      def self.logger
+        instance.resolve(:logger)
+      end
+
       def self.config_from_cache
         instance.resolve(:cache).get('config')
       end

data/lib/forest_admin_agent/http/router.rb

@@ -6,7 +6,7 @@ module ForestAdminAgent
       def self.routes
         [
           actions_routes,
-          # api_charts_routes,
+          api_charts_routes,
           System::HealthCheck.new.routes,
           Security::Authentication.new.routes,
           Charts::Charts.new.routes,
@@ -36,17 +36,18 @@ module ForestAdminAgent
       end
 
       def self.api_charts_routes
-        routes = []
-        # TODO
-        # AgentFactory.get('datasource').charts.each do |chart|
-        #   routes << ApiChartDatasource.new(chart).routes
-        # end
-        # AgentFactory.get('datasource').collections.each do |collection|
-        #   collection.charts.each do |chart|
-        #     routes << ApiChartCollection.new(collection, chart).routes
-        #   end
-        # end
-        routes.flatten
+        routes = {}
+        Facades::Container.datasource.collections.each_value do |collection|
+          collection.schema[:charts].each do |chart_name|
+            routes.merge!(Charts::ApiChartCollection.new(collection, chart_name).routes)
+          end
+        end
+
+        Facades::Container.datasource.schema[:charts].each do |chart_name|
+          routes.merge!(Charts::ApiChartDatasource.new(chart_name).routes)
+        end
+
+        routes
       end
     end
   end

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

@@ -0,0 +1,70 @@
+require 'jsonapi-serializers'
+require 'active_support/inflector'
+
+module ForestAdminAgent
+  module Routes
+    module Charts
+      class ApiChartCollection < AbstractAuthenticatedRoute
+        include ForestAdminAgent::Utils
+
+        def initialize(collection, chart_name)
+          @chart_name = chart_name
+          @collection = collection
+
+          super()
+        end
+
+        def setup_routes
+          # Mount both GET and POST, respectively for smart and api charts.
+          collection_name = @collection.name
+          slug = @chart_name.parameterize
+
+          add_route(
+            "forest_chart_#{collection_name}_get_#{slug}",
+            'get',
+            "/_charts/:collection_name/#{slug}",
+            proc { |args| handle_smart_chart(args) }
+          )
+
+          add_route(
+            "forest_chart_#{collection_name}_post_#{slug}",
+            'post',
+            "/_charts/:collection_name/#{slug}",
+            proc { |args| handle_api_chart(args) }
+          )
+
+          unless Facades::Container.cache(:is_production)
+            Facades::Container.logger.log(
+              'Info',
+              "Chart #{@chart_name} was mounted at /forest/_charts/#{collection_name}/#{slug}"
+            )
+          end
+
+          self
+        end
+
+        def handle_api_chart(args)
+          {
+            content: Serializer::ForestChartSerializer.serialize(
+              @collection.render_chart(
+                @caller,
+                @chart_name,
+                Id.unpack_id(@collection, args[:params]['record_id'])
+              )
+            )
+          }
+        end
+
+        def handle_smart_chart(args)
+          {
+            content: @collection.render_chart(
+              @caller,
+              @chart_name,
+              Id.unpack_id(@collection, args[:params]['record_id'])
+            )
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+require 'jsonapi-serializers'
+require 'active_support/inflector'
+
+module ForestAdminAgent
+  module Routes
+    module Charts
+      class ApiChartDatasource < AbstractAuthenticatedRoute
+        def initialize(chart_name)
+          @chart_name = chart_name
+          @datasource = ForestAdminAgent::Facades::Container.datasource
+
+          super()
+        end
+
+        def setup_routes
+          # Mount both GET and POST, respectively for smart and api charts.
+          slug = @chart_name.parameterize
+
+          add_route(
+            "forest_chart_get_#{slug}",
+            'get',
+            "/_charts/#{slug}",
+            proc { handle_smart_chart }
+          )
+
+          add_route(
+            "forest_chart_post_#{slug}",
+            'post',
+            "/_charts/#{slug}",
+            proc { handle_api_chart }
+          )
+
+          unless Facades::Container.cache(:is_production)
+            Facades::Container.logger.log('Info', "/forest/_charts/#{slug}")
+          end
+
+          self
+        end
+
+        def handle_api_chart
+          {
+            content: Serializer::ForestChartSerializer.serialize(
+              @datasource.render_chart(
+                @caller,
+                @chart_name
+              )
+            )
+          }
+        end
+
+        def handle_smart_chart
+          {
+            content: @datasource.render_chart(
+              @caller,
+              @chart_name
+            )
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -82,11 +82,11 @@ module ForestAdminAgent
             previous_value = compute_value(FilterFactory.get_previous_period_filter(@filter, @caller.timezone))
           end
 
-          ValueChart.new(value, previous_value)
+          ValueChart.new(value, previous_value).serialize
         end
 
         def make_objective
-          ObjectiveChart.new(compute_value(@filter))
+          ObjectiveChart.new(compute_value(@filter)).serialize
         end
 
         def make_pie
@@ -99,7 +99,7 @@ module ForestAdminAgent
 
           result = @collection.aggregate(@caller, @filter, aggregation)
 
-          PieChart.new(result.map { |row| { key: row[:group][group_field], value: row[:value] } })
+          PieChart.new(result.map { |row| { key: row[:group][group_field], value: row[:value] } }).serialize
         end
 
         def make_line
@@ -137,7 +137,7 @@ module ForestAdminAgent
             current += 1.send(time_range.downcase.pluralize.to_sym)
           end
 
-          LineChart.new(result)
+          LineChart.new(result).serialize
         end
 
         def make_leaderboard
@@ -194,7 +194,7 @@ module ForestAdminAgent
               }
             end
 
-            return LeaderboardChart.new(result)
+            return LeaderboardChart.new(result).serialize
           end
 
           raise ForestAdminDatasourceToolkit::Exceptions::ForestException,

data/lib/forest_admin_agent/serializer/forest_chart_serializer.rb

@@ -9,7 +9,7 @@ module ForestAdminAgent
             id: SecureRandom.uuid,
             type: 'stats',
             attributes: {
-              value: chart.serialize
+              value: chart
             }
           }
         }

data/lib/forest_admin_agent/services/logger_service.rb

@@ -5,15 +5,31 @@ module ForestAdminAgent
     class LoggerService
       attr_reader :default_logger
 
+      LEVELS = {
+        'Info' => Logger::INFO,
+        'Debug' => Logger::DEBUG,
+        'Warn' => Logger::WARN,
+        'Error' => Logger::ERROR
+      }.freeze
+
       def initialize(logger_level = 'Info', logger = nil)
         @logger_level = logger_level
         @logger = logger
-        @default_logger = MonoLogger.new('forest_admin')
+        @default_logger = MonoLogger.new($stdout)
         # TODO: HANDLE FORMATTER
       end
 
-      def levels
-        %w[Debug Info Warn Error]
+      def log(level, message)
+        if @logger
+          @logger.call(get_level(level), message)
+        else
+          @default_logger.add(get_level(level), message)
+        end
+        @logger || @default_logger
+      end
+
+      def get_level(level)
+        LEVELS[level]
       end
     end
   end

data/lib/forest_admin_agent/utils/condition_tree_parser.rb

@@ -19,9 +19,8 @@ module ForestAdminAgent
 
         if branch?(filters)
           aggregator = filters[:aggregator].capitalize
-          conditions = []
-          filters[:conditions].each do |sub_tree|
-            conditions << from_plain_object(collection, sub_tree)
+          conditions = filters[:conditions].map do |sub_tree|
+            from_plain_object(collection, sub_tree)
           end
 
           return conditions.size == 1 ? conditions[0] : ConditionTreeBranch.new(aggregator, conditions)

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.40"
+        LIANA_VERSION = "1.0.0-beta.41"
 
         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.40"
+  VERSION = "1.0.0-beta.41"
 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.40
+  version: 1.0.0.pre.beta.41
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -244,6 +244,8 @@ files:
 - lib/forest_admin_agent/routes/abstract_related_route.rb
 - lib/forest_admin_agent/routes/abstract_route.rb
 - lib/forest_admin_agent/routes/action/action.rb
+- lib/forest_admin_agent/routes/charts/api_chart_collection.rb
+- lib/forest_admin_agent/routes/charts/api_chart_datasource.rb
 - lib/forest_admin_agent/routes/charts/charts.rb
 - lib/forest_admin_agent/routes/resources/count.rb
 - lib/forest_admin_agent/routes/resources/delete.rb