forest_admin_agent 1.0.0.pre.beta.75 → 1.0.0.pre.beta.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4512b50521a216034448e918f086c8f26c83927dc6f6e8fb1d66f851d3b70c5
-  data.tar.gz: 760dffe785894549b92e1104c00a567c5752336f6f88a47ed09690d87f8b0fb6
+  metadata.gz: acb44dc3e46d11e1cf6ff2cc910f8c337bf499df84a12e508f641af9b6a07188
+  data.tar.gz: 65f2a20cebb62e62b9ed67de3ef692b71765eaf61b46eb0ff603606577efde9f
 SHA512:
-  metadata.gz: aa879662b9a4b4c916458a27a9914439166c3b98314e2d9ba2327a83e876797ba4f1a89d06f22ae2c671924c3468a69f1ab50f76370ef1479a9a4d07c8df1365
-  data.tar.gz: 3c8911025c5f8b71f57053adafcfdcc8726800d624a2f9c40478aaf60596b03a146a46ae1f533523b6b79c09a0b6b2c7ebeea86f44756c8d0a346f0167911951
+  metadata.gz: 5086df998e3f22f9d04772f29375c33f13469aa98849045a6db9c96d1569286258f7c97fb75bb24a0d4a3dfbe61c7193d17932c625e66ee323541a37d9f676db
+  data.tar.gz: 957247e377111b6b48c5e69fdf375bbf7c3890043a254a16af7cfe2a5ce366d7011222dffd60438413cd3c59444399a5d8eec0371787112370773d4a0f5e94c9

data/lib/forest_admin_agent/http/router.rb

@@ -11,6 +11,7 @@ module ForestAdminAgent
           Security::Authentication.new.routes,
           Security::ScopeInvalidation.new.routes,
           Charts::Charts.new.routes,
+          Capabilities::Collections.new.routes,
           Resources::Count.new.routes,
           Resources::Delete.new.routes,
           Resources::Csv.new.routes,

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

@@ -0,0 +1,45 @@
+require 'json'
+module ForestAdminAgent
+  module Routes
+    module Capabilities
+      class Collections < AbstractAuthenticatedRoute
+        include ForestAdminDatasourceToolkit::Schema
+
+        def setup_routes
+          add_route('forest_capabilities_collections',
+                    'post',
+                    '/_internal/capabilities',
+                    ->(args) { handle_request(args) })
+
+          self
+        end
+
+        def handle_request(args = {})
+          @datasource = ForestAdminAgent::Facades::Container.datasource
+          collections = args[:params]['collectionNames'] || []
+
+          result = collections.map do |collection_name|
+            collection = @datasource.get_collection(collection_name)
+            {
+              name: collection.name,
+              fields: collection.schema[:fields].select { |_, field| field.is_a?(ColumnSchema) }.map do |name, field|
+                {
+                  name: name,
+                  type: field.column_type,
+                  operators: field.filter_operators.map { |operator| operator }
+                }
+              end
+            }
+          end
+
+          {
+            content: {
+              collections: result
+            },
+            status: 200
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,8 @@ module ForestAdminAgent
     module Resources
       class List < AbstractAuthenticatedRoute
         include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
+        include ForestAdminDatasourceToolkit::Validations
+
         def setup_routes
           add_route('forest_list', 'get', '/:collection_name', ->(args) { handle_request(args) })
 
@@ -14,6 +16,7 @@ module ForestAdminAgent
         def handle_request(args = {})
           build(args)
           @permissions.can?(:browse, @collection)
+
           filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
             condition_tree: ConditionTreeFactory.intersect([
                                                              @permissions.get_scope(@collection),
@@ -28,6 +31,8 @@ module ForestAdminAgent
             segment: ForestAdminAgent::Utils::QueryStringParser.parse_segment(@collection, args)
           )
 
+          ConditionTreeValidator.validate(filter.condition_tree, @collection) if filter.condition_tree
+
           projection = ForestAdminAgent::Utils::QueryStringParser.parse_projection_with_pks(@collection, args)
           records = @collection.list(@caller, filter, projection)
 

data/lib/forest_admin_agent/utils/context_variables.rb

@@ -29,9 +29,9 @@ module ForestAdminAgent
         end
 
         if context_variable_key.start_with?(USER_VALUE_TAG_PREFIX)
+          tag_key = context_variable_key[USER_VALUE_TAG_PREFIX.length..]
           user[:tags].each do |tag|
-            match_key = context_variable_key[USER_VALUE_TAG_PREFIX.length..]
-            return tag[match_key] if tag.key?(match_key)
+            return tag['value'] if tag['key'] == tag_key
           end
         end
 

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -8,6 +8,7 @@ module ForestAdminAgent
       include ForestAdminDatasourceToolkit::Exceptions
       include ForestAdminDatasourceToolkit::Components
       include ForestAdminDatasourceToolkit::Components::Query
+      include ForestAdminDatasourceToolkit::Validations
 
       DEFAULT_ITEMS_PER_PAGE = '15'.freeze
       DEFAULT_PAGE_TO_SKIP = '1'.freeze
@@ -23,8 +24,10 @@ module ForestAdminAgent
         return if filters.nil?
 
         filters = JSON.parse(filters, symbolize_names: true) if filters.is_a? String
+        condition_tree = ConditionTreeParser.from_plain_object(collection, filters)
+        ConditionTreeValidator.validate(condition_tree, collection)
 
-        ConditionTreeParser.from_plain_object(collection, filters)
+        condition_tree
       end
 
       def self.parse_caller(args)

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

@@ -1,71 +1,9 @@
-require 'digest/sha1'
-require 'json'
-
 module ForestAdminAgent
   module Utils
     module Schema
       class FrontendFilterable
-        include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
-
-        BASE_OPERATORS = [
-          Operators::EQUAL, Operators::NOT_EQUAL, Operators::PRESENT, Operators::BLANK
-        ].freeze
-
-        BASE_DATEONLY_OPERATORS = [
-          Operators::TODAY,
-          Operators::YESTERDAY,
-          Operators::PREVIOUS_X_DAYS,
-          Operators::PREVIOUS_WEEK,
-          Operators::PREVIOUS_MONTH,
-          Operators::PREVIOUS_QUARTER,
-          Operators::PREVIOUS_YEAR,
-          Operators::PREVIOUS_X_DAYS_TO_DATE,
-          Operators::PREVIOUS_WEEK_TO_DATE,
-          Operators::PREVIOUS_MONTH_TO_DATE,
-          Operators::PREVIOUS_QUARTER_TO_DATE,
-          Operators::PREVIOUS_YEAR_TO_DATE,
-          Operators::PAST,
-          Operators::FUTURE,
-          Operators::BEFORE_X_HOURS_AGO,
-          Operators::AFTER_X_HOURS_AGO,
-          Operators::BEFORE,
-          Operators::AFTER
-        ].freeze
-
-        DATE_OPERATORS = BASE_OPERATORS + BASE_DATEONLY_OPERATORS
-
-        OPERATOR_BY_TYPE = {
-          'Binary' => BASE_OPERATORS,
-          'Boolean' => BASE_OPERATORS,
-          'Date' => DATE_OPERATORS,
-          'Dateonly' => DATE_OPERATORS,
-          'Uuid' => BASE_OPERATORS,
-          'Enum' => BASE_OPERATORS + [Operators::IN],
-          'Number' => BASE_OPERATORS + [Operators::IN, Operators::GREATER_THAN, Operators::LESS_THAN],
-          'Timeonly' => BASE_OPERATORS + [Operators::GREATER_THAN, Operators::LESS_THAN],
-          'String' => BASE_OPERATORS +
-                      [
-                        Operators::IN,
-                        Operators::STARTS_WITH,
-                        Operators::ENDS_WITH,
-                        Operators::CONTAINS,
-                        Operators::NOT_CONTAINS
-                      ],
-          'Json' => []
-        }.freeze
-
-        def self.filterable?(type, supported_operators = [])
-          needed_operators = get_required_operators(type)
-
-          !needed_operators.empty? && needed_operators.all? { |operator| supported_operators.include?(operator) }
-        end
-
-        def self.get_required_operators(type)
-          return OPERATOR_BY_TYPE[type] if type.is_a?(String) && OPERATOR_BY_TYPE.key?(type)
-
-          return [Operators::INCLUDES_ALL] if type.is_a? Array
-
-          []
+        def self.filterable?(operator)
+          operator && !operator.empty?
         end
       end
     end

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

@@ -37,7 +37,7 @@ module ForestAdminAgent
               field: name,
               integration: nil,
               inverseOf: nil,
-              isFilterable: FrontendFilterable.filterable?(column.column_type, column.filter_operators),
+              isFilterable: FrontendFilterable.filterable?(column.filter_operators),
               isPrimaryKey: column.is_primary_key,
 
               # When a column is a foreign key, it is readonly.
@@ -70,7 +70,7 @@ module ForestAdminAgent
 
           def foreign_collection_filterable?(foreign_collection)
             foreign_collection.schema[:fields].values.any? do |field|
-              field.type == 'Column' && FrontendFilterable.filterable?(field.column_type, field.filter_operators)
+              field.type == 'Column' && FrontendFilterable.filterable?(field.filter_operators)
             end
           end
 

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

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
 
-        LIANA_VERSION = "1.0.0-beta.75"
+        LIANA_VERSION = "1.0.0-beta.77"
 
         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.75"
+  VERSION = "1.0.0-beta.77"
 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.75
+  version: 1.0.0.pre.beta.77
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -245,6 +245,7 @@ files:
 - lib/forest_admin_agent/routes/abstract_related_route.rb
 - lib/forest_admin_agent/routes/abstract_route.rb
 - lib/forest_admin_agent/routes/action/actions.rb
+- lib/forest_admin_agent/routes/capabilities/collections.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