forest_admin_agent 1.0.0.pre.beta.78 → 1.0.0.pre.beta.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27acf5eecdcc0214bb2f2c88c761a165e4c769e8790d10be2ed999e4e2b99c6f
-  data.tar.gz: 6fc3368da9efe7a50120dfcf27fb731100be817075343f4d489efdbd6a225a26
+  metadata.gz: a01610bd932ab1fbf77523d7643b5d88e2cb6570bbe35ed0cef4a64d15be43a3
+  data.tar.gz: 29ecd9585091340a2f3c34347afcaf31c3b973baf765ac82451e356eede1bbb9
 SHA512:
-  metadata.gz: f6325a6a4130edf6c3589bcdcf1c0247693fa17a95dd6dea045058b48e4289e85b13d0a4c9f9d67414aa1d91c6b795e254b20f966611ceff8448c27ea24f85a6
-  data.tar.gz: c68b8311af7cd615eaa1ef6b84dc9126098988d725885e6499acd9acb743d4023474fda0ec10176c7d3a6eb2b7ab405936db8335a11290b60290b6ca80fa76ef
+  metadata.gz: 766c95a6b69884075911e6aa7da8cf0b247007a0c4eb0fe26c4f6ca71d33de23cdc7008e1702ca88c2ae815521b11f7845363dfce7a95d8fbdf3f4c4f3ff842a
+  data.tar.gz: 18ef288c93d62c83f0900e9df9715ee6d14e6d52340e47e1283139e79fc07e440f19b84bdf0f5861b9ddb80d8421cf1e139039bed303f6220b853e04c2bc6ccb

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/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/schema/schema_emitter.rb

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
 
-        LIANA_VERSION = "1.0.0-beta.78"
+        LIANA_VERSION = "1.0.0-beta.80"
 
         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.78"
+  VERSION = "1.0.0-beta.80"
 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.78
+  version: 1.0.0.pre.beta.80
 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-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport