forest_liana 8.0.0.beta.1 → 8.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e2794ab8f61539a32baf5a5522af5d632868658393a014836a7e154e148dc49
-  data.tar.gz: c3e7cf255d5719e1d5c2cee17ec583cab8cfb5d8855dd4408f10d5842e52fc7f
+  metadata.gz: 82036a005a4c2e31b6e1e48c7f9d5befacb5b72ba71046bd5bcfa83d43c19797
+  data.tar.gz: c825c64871dd4737961a589c3869c07126ddf8023265822cb73a2019aa82ed2e
 SHA512:
-  metadata.gz: 34eb116a51cf8ccad4c6ecc06df5216756d367f0d2f7fd1cfe9c2bc9a51c9a2fb380a920eacff26e9d8aa9875f6a6189fb286cc95a2a72caf26efb173dc907e7
-  data.tar.gz: ef1c16947a053299a251baa24492c53f7a4d24d96d885a69f2f98cc46f5428f8ac9d7fb41af1d772e6e095d497179c698f57b63a054186e7de3cfc2a5192735a
+  metadata.gz: c519f23a7c267b77cd83a42859e9aac9996955d2ec918c1d562c5d3ceda2c15638840fae765b2241b12a2f5dba38be8de898923879cd2b8c82902a77c583192c
+  data.tar.gz: f3e06eabdee80eab3b8991c355a1af15e1601d2e8ba35adb7160f9d367958f7473f236cbb011f0907be5073cc111efc17138b67c88c727827def72ab8261d0c1

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

@@ -37,6 +37,8 @@ module ForestLiana
           elsif @smart_action['approvalRequired'].include?(@user['roleId'])
             if @smart_action['approvalRequiredConditions'].empty? || match_conditions('approvalRequiredConditions')
               raise ForestLiana::Ability::Exceptions::RequireApproval.new(@smart_action['userApprovalEnabled'])
+            else
+              return true if @smart_action['triggerConditions'].empty? || match_conditions('triggerConditions')
             end
           end
 

data/lib/forest_liana/bootstrapper.rb

@@ -202,7 +202,7 @@ module ForestLiana
     def setup_forest_liana_meta
       ForestLiana.meta = {
         liana: 'forest-rails',
-        liana_version: ForestLiana::VERSION,
+        liana_version: ForestLiana::VERSION.sub!('.beta', '-beta'),
         stack: {
            database_type: database_type,
            orm_version: Gem.loaded_specs["activerecord"].version.version,

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "8.0.0.beta.1"
+  VERSION = "8.0.0.beta.3"
 end

data/spec/services/forest_liana/ability/permission/smart_action_checker_spec.rb

@@ -205,9 +205,67 @@ module ForestLiana
           expect{smart_action_checker.can_execute?}.to raise_error(ForestLiana::Ability::Exceptions::TriggerForbidden)
         end
 
-        it 'should raise error when triggerConditions not match' do
+        it 'should trigger action when approvalRequiredCondition not match but with triggerConditions matched' do
+          parameters = ActionController::Parameters.new(params).permit!
+          action['approvalRequired'] = [1]
+          action['triggerEnabled'] = [1]
+          action['triggerConditions'] = [
+            { 'filter' =>
+                { 'aggregator' => 'and',
+                  'conditions' =>
+                    [
+                      {
+                        'field' => 'name',
+                        'value' => 'foo',
+                        'source' => 'data',
+                        'operator' => 'equal'
+                      }
+                    ]
+                },
+              'roleId' => 1
+            }
+          ]
+          action['approvalRequiredConditions'] = [
+            { 'filter' =>
+                { 'aggregator' => 'and',
+                  'conditions' =>
+                    [
+                      {
+                        'field' => 'name',
+                        'value' => 'fake island',
+                        'source' => 'data',
+                        'operator' => 'equal'
+                      }
+                    ]
+                },
+              'roleId' => 1
+            }
+          ]
+          smart_action_checker = ForestLiana::Ability::Permission::SmartActionChecker.new(parameters, Island, action, user)
+
+          expect(smart_action_checker.can_execute?).to equal true
+        end
+
+        it 'should raise error when approvalRequiredConditions and triggerConditions not match' do
           parameters = ActionController::Parameters.new(params).permit!
           action['approvalRequired'] = [1]
+          action['triggerEnabled'] = [1]
+          action['triggerConditions'] = [
+            { 'filter' =>
+                { 'aggregator' => 'and',
+                  'conditions' =>
+                    [
+                      {
+                        'field' => 'name',
+                        'value' => 'fake island',
+                        'source' => 'data',
+                        'operator' => 'equal'
+                      }
+                    ]
+                },
+              'roleId' => 1
+            }
+          ]
           action['approvalRequiredConditions'] = [
             { 'filter' =>
                 { 'aggregator' => 'and',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 8.0.0.beta.1
+  version: 8.0.0.beta.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails