forest_liana 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec0228713b3a5f0f943dcd9901d9d866ce2d5df36b452faaa8f163aed2b17aa
-  data.tar.gz: 152af3bfde151e934042b8629c28c77a1fe1ea0a648fd41857fec5cbe9179e03
+  metadata.gz: 52b354dcc7c4a05c8303bffa7c1deca674900d7b693f37e816d2bafe665c4b12
+  data.tar.gz: 358a702306af12e805a6fe954c2e0fbb1d1ccc3ebe8fe8d8b73d6ebd8f101bb5
 SHA512:
-  metadata.gz: 7062153dfd912d67d91893d27d89d48f7aeba6a1de21ab442a91e1dc51d0f30369c406b700ed7b9f25fd4d69039172a118894af96f29be713e90543eadb66a18
-  data.tar.gz: 40ed811e8dda8166ee0573377f195ba4e8ee70c2446ffcaad8c4901bf372e0442ae419252fb30e4242f65231433b3e9b7afbedb587c297dfe445c72bfdf237b3
+  metadata.gz: 68dac9b8f4e7f427d1c9f4bf885d2412cf740b8e6038a6e83e919c967e9fbe9369fddc753992b7d80a191a04688366c06cc028a2afe309a476686e993603e8a6
+  data.tar.gz: fcdb37f174ec29d416bfe1ce668608baa9e1924ec6ea2b51e61dcc74f1976e11fdf6eb41eb5503a22ed352d4e0ad772bc1498f2f31f958a467ac54dcf6e56a75

data/app/controllers/forest_liana/actions_controller.rb

@@ -53,7 +53,14 @@ module ForestLiana
       end
 
       # Apply result on fields (transform the object back to an array), preserve order.
-      fields = action.fields.map { |field| result[field[:field]] }
+      fields = action.fields.map do |field|
+        updated_field = result[field[:field]]
+        # Reset `value` when not present in `enums` (which means `enums` has changed).
+        if updated_field[:enums].is_a?(Array) && !updated_field[:enums].include?(updated_field[:value])
+          updated_field[:value] = nil
+        end
+        updated_field
+      end
 
       render serializer: nil, json: { fields: fields}, status: :ok
     end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "5.3.2"
+  VERSION = "5.3.3"
 end

data/spec/requests/actions_controller_spec.rb

@@ -30,6 +30,12 @@ describe 'Requesting Actions routes', :type => :request  do
         description: nil,
         widget: nil,
     }
+    enum = {
+        field: 'enum',
+        type: 'Enum',
+        enums: %w[a b c],
+    }
+
     action_definition = {
         name: 'my_action',
         fields: [foo],
@@ -76,11 +82,25 @@ describe 'Requesting Actions routes', :type => :request  do
             }
         }
     }
+    enums_action_definition = {
+      name: 'enums_action',
+      fields: [foo, enum],
+      hooks: {
+        :change => {
+          'foo' => -> (context) {
+            fields = context[:fields]
+            fields['enum'][:enums] = %w[c d e]
+            return fields
+          }
+        }
+      }
+    }
     action = ForestLiana::Model::Action.new(action_definition)
     fail_action = ForestLiana::Model::Action.new(fail_action_definition)
     cheat_action = ForestLiana::Model::Action.new(cheat_action_definition)
+    enums_action = ForestLiana::Model::Action.new(enums_action_definition)
     island = ForestLiana.apimap.find {|collection| collection.name.to_s == ForestLiana.name_for(Island)}
-    island.actions = [action, fail_action, cheat_action]
+    island.actions = [action, fail_action, cheat_action, enums_action]
 
     describe 'call /load' do
       params = {recordIds: [1], collectionName: 'Island'}
@@ -114,7 +134,7 @@ describe 'Requesting Actions routes', :type => :request  do
       it 'should respond 200' do
         post '/forest/actions/my_action/hooks/change', JSON.dump(params), 'CONTENT_TYPE' => 'application/json'
         expect(response.status).to eq(200)
-        expected = updated_foo.merge({:value => 'baz'})
+        expected = updated_foo.clone.merge({:value => 'baz'})
         expected[:widgetEdit] = nil
         expected.delete(:widget)
         expect(JSON.parse(response.body)).to eq({'fields' => [expected.stringify_keys]})
@@ -134,6 +154,21 @@ describe 'Requesting Actions routes', :type => :request  do
         post '/forest/actions/cheat_action/hooks/change', JSON.dump(params), 'CONTENT_TYPE' => 'application/json'
         expect(response.status).to eq(500)
       end
+
+      it 'should reset value when enums has changed' do
+        updated_enum = enum.clone.merge({:previousValue => nil, :value => 'a'}) # set value to a
+        p = {recordIds: [1], fields: [updated_foo, updated_enum], collectionName: 'Island', changedField: 'foo'}
+        post '/forest/actions/enums_action/hooks/change', JSON.dump(p), 'CONTENT_TYPE' => 'application/json'
+        expect(response.status).to eq(200)
+
+        expected_enum = updated_enum.clone.merge({ :enums => %w[c d e], :value => nil, :widgetEdit => nil})
+        expected_enum.delete(:widget)
+        expected_foo = updated_foo.clone.merge({ :widgetEdit => nil})
+        expected_foo.delete(:widget)
+
+        expect(JSON.parse(response.body)).to eq({'fields' => [expected_foo.stringify_keys, expected_enum.stringify_keys]})
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.3
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails