forest_liana 7.0.0.beta.3 → 7.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3115af32c59b5bf0e32218f3d40cb661809d58316714654520bde1bfee235098
-  data.tar.gz: 850a6dbc96d8ff1e74ffe7970dc98ff2bd721d6b834087353052208722b55810
+  metadata.gz: 0bf8bedca443e88f415a14995d430f5ba021cfe846d8471588680c5f35e619eb
+  data.tar.gz: f68ffb4494911b3b674965b3370988c4505be91673f7d67e194482b0975226e2
 SHA512:
-  metadata.gz: ea018906c77a41db7a7dc1022cd6485e5f9a293763c1822a64706092f8be74d1046230198af6d0041277cb8f2b852115633b96f622f69a192dc99f911cd31178
-  data.tar.gz: cf12c7f0821b3e9232fe884e3d5c04470f6467d4a571ffc88ce2f6e36c9edac6704dcdd9a0c431dd222435bac1c31b512a5585bc9fb99f141e309e41f9ff8696
+  metadata.gz: 97aeec5fc463e97cc3b8475c0f09228ea131a322d458104f2cf28306d390b904fd433a78e2a53b7baf34aaf05c6f66d7783e15a36b1f464790ab78bc5bd60ea6
+  data.tar.gz: 9339a84947baea79f91ebb48716760eee7f8e2acee6fc473b881904001c7f3f6bd6f1a1de6603df63eeba15967fcf6d982a60a7f42c049f007b958d60ff9732e

data/app/controllers/forest_liana/actions_controller.rb

@@ -1,8 +1,13 @@
 module ForestLiana
   class ActionsController < ForestLiana::BaseController
 
-    def values
-      render serializer: nil, json: {}, status: :ok
+    def get_smart_action_hook_request
+      begin
+        params[:data][:attributes]
+      rescue => error
+        FOREST_LOGGER.error "Smart Action hook request error: #{error}"
+        {}
+      end
     end
 
     def get_collection(collection_name)
@@ -18,13 +23,6 @@ module ForestLiana
         nil
       end
     end
-    
-    def get_record
-      model = ForestLiana::SchemaUtils.find_model_from_collection_name(params[:collectionName])
-      redord_getter = ForestLiana::ResourceGetter.new(model, {:id => params[:recordIds][0]})
-      redord_getter.perform
-      redord_getter.record
-    end
 
     def get_smart_action_load_ctx(fields)
       fields = fields.map do |field|
@@ -32,7 +30,7 @@ module ForestLiana
         field[:value] = nil unless field[:value]
         field
       end
-      {:record => get_record, :fields => fields}
+      {:fields => fields, :params => params}
     end
 
     def get_smart_action_change_ctx(fields, field_changed)
@@ -42,7 +40,7 @@ module ForestLiana
         ForestLiana::WidgetsHelper.set_field_widget(field)
         field
       end
-      {:record => get_record,  :field_changed => found_field_changed, :fields => fields}
+      {:field_changed => found_field_changed, :fields => fields, :params => params}
     end
 
     def handle_result(result, action)
@@ -87,7 +85,9 @@ module ForestLiana
     end
 
     def load
-      action = get_action(params[:collectionName])
+      load_request = get_smart_action_hook_request
+
+      action = get_action(load_request[:collection_name])
 
       if !action
         render status: 500, json: {error: 'Error in smart action load hook: cannot retrieve action from collection'}
@@ -103,18 +103,20 @@ module ForestLiana
     end
 
     def change
-      action = get_action(params[:collectionName])
+      change_request = get_smart_action_hook_request
+
+      action = get_action(change_request[:collection_name])
 
       if !action
         return render status: 500, json: {error: 'Error in smart action change hook: cannot retrieve action from collection'}
-      elsif params[:fields].nil?
+      elsif change_request[:fields].nil?
         return render status: 500, json: {error: 'Error in smart action change hook: fields params is mandatory'}
-      elsif !params[:fields].is_a?(Array)
+      elsif !change_request[:fields].is_a?(Array)
         return render status: 500, json: {error: 'Error in smart action change hook: fields params must be an array'}
       end
 
       # Get the smart action hook change context
-      context = get_smart_action_change_ctx(params[:fields], params[:changedField])
+      context = get_smart_action_change_ctx(change_request[:fields], change_request[:changed_field])
 
       field_changed_hook = context[:field_changed][:hook]
 

data/app/controllers/forest_liana/application_controller.rb

@@ -86,15 +86,6 @@ module ForestLiana
       end
     end
 
-    def get_smart_action_context
-      begin
-        params[:data][:attributes].values[0].to_hash.symbolize_keys
-      rescue => error
-        FOREST_LOGGER.error "Smart Action context retrieval error: #{error}"
-        {}
-      end
-    end
-
     def internal_server_error
       head :internal_server_error
     end

data/config/routes.rb

@@ -57,7 +57,6 @@ ForestLiana::Engine.routes.draw do
   delete ':collection', to: router
 
   # Smart Actions forms value
-  post 'actions/:action_name/values' => 'actions#values'
   post 'actions/:action_name/hooks/load' => 'actions#load'
   post 'actions/:action_name/hooks/change' => 'actions#change'
 end

data/lib/forest_liana/version.rb

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

data/spec/requests/actions_controller_spec.rb

@@ -10,15 +10,7 @@ describe 'Requesting Actions routes', :type => :request  do
   after(:each) do
     Island.destroy_all
   end
-
-  describe 'call /values' do
-    it 'should respond 200' do
-      post '/forest/actions/foo/values', {}
-      expect(response.status).to eq(200)
-      expect(response.body).to be {}
-    end
-  end
-
+  
   describe 'hooks' do
     foo = {
         field: 'foo',
@@ -127,7 +119,11 @@ describe 'Requesting Actions routes', :type => :request  do
     island.actions = [action, fail_action, cheat_action, enums_action, multiple_enums_action]
 
     describe 'call /load' do
-      params = {recordIds: [1], collectionName: 'Island'}
+      params = {
+        data: {
+          attributes: { ids: [1], collection_name: 'Island' }
+        }
+      }
 
       it 'should respond 200' do
         post '/forest/actions/my_action/hooks/load', params: JSON.dump(params), headers: { 'CONTENT_TYPE' => 'application/json' }
@@ -156,7 +152,16 @@ describe 'Requesting Actions routes', :type => :request  do
 
     describe 'call /change' do
       updated_foo = foo.clone.merge({:previousValue => nil, :value => 'bar'})
-      params = {recordIds: [1], fields: [updated_foo], collectionName: 'Island', changedField: 'foo'}
+      params = {
+        data: {
+          attributes: {
+            ids: [1],
+            fields: [updated_foo],
+            collection_name: 'Island',
+            changed_field: 'foo'
+          }
+        }
+      }
 
       it 'should respond 200' do
         post '/forest/actions/my_action/hooks/change', params: JSON.dump(params), headers: { 'CONTENT_TYPE' => 'application/json' }
@@ -168,7 +173,7 @@ describe 'Requesting Actions routes', :type => :request  do
       end
 
       it 'should respond 500 with bad params' do
-        post '/forest/actions/my_action/hooks/change', params: JSON.dump({collectionName: 'Island'}), headers: { 'CONTENT_TYPE' => 'application/json' }
+        post '/forest/actions/my_action/hooks/change', params: JSON.dump({ data: { attributes: { collection_name: 'Island' }}}), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(500)
         expect(JSON.parse(response.body)).to eq({'error' => 'Error in smart action change hook: fields params is mandatory'})
       end
@@ -181,7 +186,16 @@ describe 'Requesting Actions routes', :type => :request  do
 
       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'}
+        p = {
+          data: {
+            attributes: {
+              ids: [1],
+              fields: [updated_foo, updated_enum],
+              collection_name: 'Island',
+              changed_field: 'foo'
+            }
+          }
+        }
         post '/forest/actions/enums_action/hooks/change', params: JSON.dump(p), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(200)
 
@@ -195,7 +209,16 @@ describe 'Requesting Actions routes', :type => :request  do
 
       it 'should not reset value when every enum values are in the enums definition' do
         updated_multiple_enum = multiple_enum.clone.merge({:previousValue => nil, :value => %w[c]})
-        p = {recordIds: [1], fields: [foo, updated_multiple_enum], collectionName: 'Island', changedField: 'foo'}
+        p = {
+          data: {
+            attributes: {
+              ids: [1],
+              fields: [foo, updated_multiple_enum],
+              collection_name: 'Island',
+              changed_field: 'foo'
+            }
+          }
+        }
         post '/forest/actions/multiple_enums_action/hooks/change', params: JSON.dump(p), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(200)
 
@@ -209,7 +232,17 @@ describe 'Requesting Actions routes', :type => :request  do
 
       it 'should reset value when one of the enum values is not in the enums definition' do
         wrongly_updated_multiple_enum = multiple_enum.clone.merge({:previousValue => nil, :value => %w[a b]})
-        p = {recordIds: [1], fields: [foo, wrongly_updated_multiple_enum], collectionName: 'Island', changedField: 'foo'}
+        p = {
+          data: {
+            attributes: {
+              ids: [1],
+              fields: [foo, wrongly_updated_multiple_enum],
+              collection_name: 'Island',
+              changed_field: 'foo'
+            }
+          }
+        }
+
         post '/forest/actions/multiple_enums_action/hooks/change', params: JSON.dump(p), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(200)
 

metadata

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