forest_liana 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e035848d2e7346973187338d78579301dcf062b2b6192ba383cd1f50dcccf584
-  data.tar.gz: 5f8a3ecdea7a8f4643922c27626397bfa3d497c14302f77f377153a22f064b0f
+  metadata.gz: 4ce31e8e9d92594427c53bfd5b2b6827218a225921fbeec7a371404fcbbf67bc
+  data.tar.gz: 4baa01b9c4583493f697123ec8517ad191ceeec5ee7923058f70fd33255a2026
 SHA512:
-  metadata.gz: a30b760625155ae65acf9c8d6941e1e8ddd408b98cd377fdd6f6385c943ceef74e72cf3318d1373f966f8eda48dd9c35c4198bdaeecba2c9c6ffd52f2285e465
-  data.tar.gz: 52b468bfea30b0c115c318ab60eefd2caf382c94df171ea53ec0e203d6869d823f0deb23b20f66939f2560a8611d55b2c6b64f1dcb0b5ffb3d461de3471db8a5
+  metadata.gz: 423933e1177d38264ea7b351a66a86c8dd7d4d435c15fdd23f4399ae9cde8bf9604405dea94051038467b8853fa70e24e7d8e73cfb79ad124056c196f8b12ad0
+  data.tar.gz: f9b955b3a70e2a1a576d5be1635a9257b72c2938929dd6b21d009a9de8f705a24a0f194f19f829703d73d1d9e0d47117fd9d71da8e55c997613834521a136313

data/app/controllers/forest_liana/actions_controller.rb

@@ -27,12 +27,19 @@ module ForestLiana
     end
 
     def get_smart_action_load_ctx(fields)
-      fields = fields.reduce({}) {|p, c| p.update(c[:field] => c.merge!(value: nil))}
+      fields = fields.reduce({}) do |p, c|
+        ForestLiana::WidgetsHelper.set_field_widget(c)
+        p.update(c[:field] => c.merge!(value: nil))
+      end
       {:record => get_record, :fields => fields}
     end
 
     def get_smart_action_change_ctx(fields)
-      fields = fields.reduce({}) {|p, c| p.update(c[:field] => c.permit!.to_h)}
+      fields = fields.reduce({}) do |p, c|
+        field = c.permit!.to_h.symbolize_keys
+        ForestLiana::WidgetsHelper.set_field_widget(field)
+        p.update(c[:field] => field)
+      end
       {:record => get_record, :fields => fields}
     end
 

data/app/helpers/forest_liana/widgets_helper.rb

@@ -0,0 +1,59 @@
+require 'set'
+
+module ForestLiana
+  module WidgetsHelper
+
+    @widget_edit_list = [
+      'address editor',
+      'belongsto typeahead',
+      'belongsto dropdown',
+      'boolean editor',
+      'checkboxes',
+      'color editor',
+      'date editor',
+      'dropdown',
+      'embedded document editor',
+      'file picker',
+      'json code editor',
+      'input array',
+      'multiple select',
+      'number input',
+      'point editor',
+      'price editor',
+      'radio button',
+      'rich text',
+      'text area editor',
+      'text editor',
+      'time input',
+    ]
+
+    @v1_to_v2_edit_widgets_mapping = {
+      address: 'address editor',
+      'belongsto select': 'belongsto dropdown',
+      'color picker': 'color editor',
+      'date picker': 'date editor',
+      price: 'price editor',
+      'JSON editor': 'json code editor',
+      'rich text editor': 'rich text',
+      'text area': 'text area editor',
+      'text input': 'text editor',
+    }
+
+    def self.set_field_widget(field)
+
+      if field[:widget]
+        if @v1_to_v2_edit_widgets_mapping[field[:widget].to_sym]
+          field[:widgetEdit] = {name: @v1_to_v2_edit_widgets_mapping[field[:widget].to_sym], parameters: {}}
+        elsif @widget_edit_list.include?(field[:widget])
+          field[:widgetEdit] = {name: field[:widget], parameters: {}}
+        end
+      end
+
+      if !field.key?(:widgetEdit)
+        field[:widgetEdit] = nil
+      end
+
+      field.delete(:widget)
+    end
+  end
+end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "5.3.0"
+  VERSION = "5.3.1"
 end

data/spec/requests/actions_controller_spec.rb

@@ -114,7 +114,10 @@ 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)
-        expect(JSON.parse(response.body)).to eq({'fields' => [updated_foo.merge({:value => 'baz'}).stringify_keys]})
+        expected = updated_foo.merge({:value => 'baz'})
+        expected[:widgetEdit] = nil
+        expected.delete(:widget)
+        expect(JSON.parse(response.body)).to eq({'fields' => [expected.stringify_keys]})
       end
 
       it 'should respond 500 with bad params' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Sandro Munda
@@ -214,6 +214,7 @@ files:
 - app/helpers/forest_liana/is_same_data_structure_helper.rb
 - app/helpers/forest_liana/query_helper.rb
 - app/helpers/forest_liana/schema_helper.rb
+- app/helpers/forest_liana/widgets_helper.rb
 - app/models/forest_liana/model/action.rb
 - app/models/forest_liana/model/collection.rb
 - app/models/forest_liana/model/segment.rb