forest_admin_agent 1.0.0.pre.beta.77 → 1.0.0.pre.beta.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acb44dc3e46d11e1cf6ff2cc910f8c337bf499df84a12e508f641af9b6a07188
-  data.tar.gz: 65f2a20cebb62e62b9ed67de3ef692b71765eaf61b46eb0ff603606577efde9f
+  metadata.gz: 0c6837279d632500c6245b172c625bae5ae5e4e459a396e90ed10cd7ac1f5591
+  data.tar.gz: 61dedb7cf077dd3ed87b178d59d78b557538fb83032cd3530cd791ff3442030f
 SHA512:
-  metadata.gz: 5086df998e3f22f9d04772f29375c33f13469aa98849045a6db9c96d1569286258f7c97fb75bb24a0d4a3dfbe61c7193d17932c625e66ee323541a37d9f676db
-  data.tar.gz: 957247e377111b6b48c5e69fdf375bbf7c3890043a254a16af7cfe2a5ce366d7011222dffd60438413cd3c59444399a5d8eec0371787112370773d4a0f5e94c9
+  metadata.gz: 5dada3205734f2ba783a141428937b26d176ccfbf82e012b59742417e61c10497f3d6aa25a1399b4f604fe765d21e66f1d07fc1dfd02340a36777b9b79746f9a
+  data.tar.gz: 38d2f8294e77b004df22d448f185a6153b85c08d1c0591a388bffa7252e794d72e8ceecf8d19d4ec75322db8fb506a2de0fa80704026e759557a59b555dc5792

data/lib/forest_admin_agent/builder/agent_factory.rb

@@ -80,13 +80,10 @@ module ForestAdminAgent
         return unless @has_env_secret
 
         cache = @container.resolve(:cache)
-        @options[:customize_error_message] = @options[:customize_error_message]
-                                             &.source
-                                             &.strip
-                                             &.delete_prefix('config.customize_error_message =')
-                                             &.strip
 
-        @options[:logger] = @options[:logger]&.source&.strip&.delete_prefix('config.logger =')&.strip
+        @options[:customize_error_message] =
+          clean_option_value(@options[:customize_error_message], 'config.customize_error_message =')
+        @options[:logger] = clean_option_value(@options[:logger], 'config.logger =')
 
         cache.set('config', @options.to_h)
       end
@@ -95,6 +92,14 @@ module ForestAdminAgent
         @logger = Services::LoggerService.new(@options[:loggerLevel], @options[:logger])
         @container.register(:logger, @logger)
       end
+
+      def clean_option_value(option, prefix)
+        return unless option
+
+        source = option.source
+        cleaned_option = source&.strip if source
+        cleaned_option&.delete_prefix(prefix)&.strip
+      end
     end
   end
 end

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

@@ -5,7 +5,6 @@ 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) })
@@ -31,8 +30,6 @@ 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/services/smart_action_checker.rb

@@ -37,7 +37,7 @@ module ForestAdminAgent
 
       def can_approve?
         if smart_action[:userApprovalEnabled].include?(role_id) &&
-           (smart_action[:userApprovalConditions].empty? || match_conditions(:userApprovalConditions)) &&
+           (condition_by_role_id(smart_action[:userApprovalConditions]).blank? || match_conditions(:userApprovalConditions)) &&
            (attributes[:signed_approval_request][:data][:attributes][:requester_id] != caller.id ||
              smart_action[:selfApprovalEnabled].include?(role_id))
           return true
@@ -48,15 +48,17 @@ module ForestAdminAgent
 
       def can_trigger?
         if smart_action[:triggerEnabled].include?(role_id) && !smart_action[:approvalRequired].include?(role_id)
-          return true if smart_action[:triggerConditions].empty? || match_conditions(:triggerConditions)
+          if condition_by_role_id(smart_action[:triggerConditions]).blank? || match_conditions(:triggerConditions)
+            return true
+          end
         elsif smart_action[:approvalRequired].include?(role_id) && smart_action[:triggerEnabled].include?(role_id)
-          if smart_action[:approvalRequiredConditions].empty? || match_conditions(:approvalRequiredConditions)
+          if condition_by_role_id(smart_action[:approvalRequiredConditions]).blank? || match_conditions(:approvalRequiredConditions)
             raise RequireApproval.new(
               'This action requires to be approved.',
               REQUIRE_APPROVAL_ERROR,
               smart_action[:userApprovalEnabled]
             )
-          elsif smart_action[:triggerConditions].empty? || match_conditions(:triggerConditions)
+          elsif condition_by_role_id(smart_action[:triggerConditions]).blank? || match_conditions(:triggerConditions)
             return true
           end
         end
@@ -71,11 +73,11 @@ module ForestAdminAgent
                            else
                              Nodes::ConditionTreeLeaf.new(pk, 'IN', attributes[:ids])
                            end
-        condition = smart_action[condition_name][0][:filter]
+        condition = condition_by_role_id(smart_action[condition_name])
         conditional_filter = filter.override(
           condition_tree: ConditionTreeFactory.intersect(
             [
-              ConditionTreeParser.from_plain_object(collection, condition),
+              ConditionTreeParser.from_plain_object(collection, condition[:filter]),
               filter.condition_tree,
               condition_filter
             ]
@@ -90,6 +92,10 @@ module ForestAdminAgent
           INVALID_ACTION_CONDITION_ERROR
         )
       end
+
+      def condition_by_role_id(condition)
+        condition.find { |c| c['roleId'] == role_id }
+      end
     end
   end
 end

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -52,6 +52,7 @@ module ForestAdminAgent
         )[0]
         token_data.delete('exp')
         token_data[:timezone] = timezone
+        token_data[:request] = { ip: args[:headers]['action_dispatch.remote_ip'].to_s }
 
         Caller.new(**token_data.transform_keys(&:to_sym))
       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.77"
+        LIANA_VERSION = "1.0.0-beta.79"
 
         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.77"
+  VERSION = "1.0.0-beta.79"
 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.77
+  version: 1.0.0.pre.beta.79
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport