forest_liana 9.5.1 → 9.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0176683d5de6bb4bf2983218178607f846b76fc4974cbeb3c505b53cc74384
-  data.tar.gz: 4f949dee10c6ffb77a394e0f4a5e82d9a0702d3ac388cf972b13746a062186c9
+  metadata.gz: 93e5e9bbc17d64a32b2d38ce4effa876d682c356dbf1d180eb5e0117db644604
+  data.tar.gz: 52b8528c2d513cd0b906d8d69f7a163053976cdfc09fdb8484f83702354c2b23
 SHA512:
-  metadata.gz: 6a7e3a0a475c400559c0acfb14c2f0b2d08ebc84b38356486ccc2d851a822b1f4e3c9864ef31d1c0d6a870ba9774b3e9c990610f19e081a474231749a68000e1
-  data.tar.gz: baf28439443b7de0509b45b6d8e8c57323cd4dce5b6b38ea6c1666329505423c9222dc2bd2ccc7e7505701663e51d983d7aa7c711169564093aa6181952a7898
+  metadata.gz: 40fd658783f4362c1ec6fd94224a160d31ee29277f87eee3bfc53223d91f4e7854be9ba6c0eecd645c39723c5e4338962fc70b785c53e0e527a9e687b8fc3660
+  data.tar.gz: 2620e9af72ecf6c7cd596ac4d596c36b10477b3ee0091cacb1758c233e890b85719c5acdfe678fffdc2e41e6c07c501585ddb6f81cd65b597a8864cd58187d06

data/app/services/forest_liana/ability/permission/smart_action_checker.rb

@@ -22,7 +22,7 @@ module ForestLiana
 
         def can_approve?
           @parameters = RequestPermission.decodeSignedApprovalRequest(@parameters)
-          if ((@smart_action['userApprovalConditions'].empty? || match_conditions('userApprovalConditions')) &&
+          if ((condition_by_role_id(@smart_action['userApprovalConditions']).blank? || match_conditions('userApprovalConditions')) &&
             (@parameters[:data][:attributes][:requester_id] != @user['id'] || @smart_action['selfApprovalEnabled'].include?(@user['roleId']))
           )
             return true
@@ -33,12 +33,12 @@ module ForestLiana
 
         def can_trigger?
           if @smart_action['triggerEnabled'].include?(@user['roleId']) && @smart_action['approvalRequired'].exclude?(@user['roleId'])
-            return true if @smart_action['triggerConditions'].empty? || match_conditions('triggerConditions')
+            return true if condition_by_role_id(@smart_action['triggerConditions']).blank? || match_conditions('triggerConditions')
           elsif @smart_action['approvalRequired'].include?(@user['roleId'])
-            if @smart_action['approvalRequiredConditions'].empty? || match_conditions('approvalRequiredConditions')
+            if condition_by_role_id(@smart_action['approvalRequiredConditions']).blank? || match_conditions('approvalRequiredConditions')
               raise ForestLiana::Ability::Exceptions::RequireApproval.new(@smart_action['userApprovalEnabled'])
             else
-              return true if @smart_action['triggerConditions'].empty? || match_conditions('triggerConditions')
+              return true if condition_by_role_id(@smart_action['triggerConditions']).blank? || match_conditions('triggerConditions')
             end
           end
 
@@ -48,8 +48,10 @@ module ForestLiana
         def match_conditions(condition_name)
           begin
             attributes = @parameters[:data][:attributes]
+            condition = condition_by_role_id(@smart_action[condition_name])
+
             records = FiltersParser.new(
-              @smart_action[condition_name][0]['filter'],
+              condition['filter'],
               @collection,
               @parameters[:timezone],
               @parameters
@@ -67,6 +69,10 @@ module ForestLiana
             raise ForestLiana::Ability::Exceptions::ActionConditionError.new
           end
         end
+
+        def condition_by_role_id(condition)
+          condition.find { |c| c['roleId'] == @user['roleId'] }
+        end
       end
     end
   end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.5.1"
+  VERSION = "9.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.5.1
+  version: 9.5.2
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails