forest_liana 9.3.16 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d542e8e2e471ab7b14b4b47d71692e98a4889c09a95e72c61775cb1744c93d9
-  data.tar.gz: c3528129a4b519ef9d11f1c381476c1d300ffbe7ecd6845d754185bdb230f7bc
+  metadata.gz: 855ec9302b2f8b3c54c16efb2919b9324c22feecaa132a02075914478ae3b040
+  data.tar.gz: eb8275f28303c3b76a95460854037be8f619a8fa74541a91dd80128fb3e49457
 SHA512:
-  metadata.gz: b7ff03164f24e175ef86a4076ae2b5987df415734351f17850db84e075ed152203530030786e8de98959f646611429f95bb83afe7ec651659604737bdd5aaf53
-  data.tar.gz: 1e17aa30b9fa4cfd2914e14f198fe8a0ba999b29c60e1074629ab61b9dcff00417e34d5613552fe40a6c3164da28c0f31de25db41ca69317bda9357212a0aada
+  metadata.gz: 7e140338ed979e85df67414887d3fc986b0eb58abe88649dcdc140b565f43b5e72f788d3952213e3c82ff5057b23b5c63bd3543be7279f534f77893efc3b1179
+  data.tar.gz: ec56a023d16948a3a21736b43ae89f3ab0cf5a9bec456b2a34d90299ceefdf9b0e0d9809d938e40f88e8bae30d7ce96cc63f8334ab0124bd95943d730e3aa999

data/app/controllers/forest_liana/actions_controller.rb

@@ -52,12 +52,14 @@ module ForestLiana
         return render status: 500, json: { error: 'Error in smart action load hook: hook must return an array of fields' }
       end
 
+      result = SmartActionFormParser.extract_fields_and_layout(result)
+
       # Validate that the fields are well formed.
       begin
         # action.hooks[:change] is a hashmap here
         # to do the validation, only the hook names are require
         change_hooks_name = action.hooks[:change].nil? ? nil : action.hooks[:change].keys
-        ForestLiana::SmartActionFieldValidator.validate_smart_action_fields(result, action.name, change_hooks_name)
+        ForestLiana::SmartActionFieldValidator.validate_smart_action_fields(result[:fields], action.name, change_hooks_name)
       rescue ForestLiana::Errors::SmartActionInvalidFieldError => invalid_field_error
         FOREST_LOGGER.warn invalid_field_error.message
       rescue ForestLiana::Errors::SmartActionInvalidFieldHookError => invalid_hook_error
@@ -67,8 +69,8 @@ module ForestLiana
       end
 
       # Apply result on fields (transform the object back to an array), preserve order.
-      fields = result.map do |field|
-        updated_field = result.find{|f| f[:field] == field[:field]}
+      fields = result[:fields].map do |field|
+        updated_field = result[:fields].find{|f| f[:field] == field[:field]}
 
         # Reset `value` when not present in `enums` (which means `enums` has changed).
         if updated_field[:enums].is_a?(Array)
@@ -88,7 +90,10 @@ module ForestLiana
         updated_field.transform_keys { |key| key.to_s.camelize(:lower) }
       end
 
-      render serializer: nil, json: { fields: fields }, status: :ok
+      response = { fields: fields }
+      response[:layout] = result[:layout] unless result[:layout].all? { |element| element[:component] == 'input' }
+
+      render serializer: nil, json: response, status: :ok
     end
 
     def load

data/app/models/forest_liana/model/action.rb

@@ -5,7 +5,7 @@ class ForestLiana::Model::Action
   extend ActiveModel::Naming
 
   attr_accessor :id, :name, :base_url, :endpoint, :http_method, :fields, :redirect,
-    :type, :download, :hooks
+    :type, :download, :hooks, :description, :submit_button_label
 
   def initialize(attributes = {})
     if attributes.key?(:global)
@@ -74,6 +74,8 @@ class ForestLiana::Model::Action
     @type ||= "bulk"
     @download ||= false
     @hooks = !@hooks.nil? ? @hooks.symbolize_keys : nil
+    @description ||= nil
+    @submit_button_label ||= nil
   end
 
   def persisted?

data/app/services/forest_liana/apimap_sorter.rb

@@ -41,6 +41,8 @@ module ForestLiana
       'download',
       'fields',
       'hooks',
+      'description',
+      'submit_button_label',
     ]
     KEYS_ACTION_FIELD = [
       'field',

data/app/services/forest_liana/smart_action_form_parser.rb

@@ -0,0 +1,69 @@
+module ForestLiana
+  class SmartActionFormParser
+    def self.extract_fields_and_layout(form)
+      fields = []
+      layout = []
+      form&.each do |element|
+        if element[:type] == 'Layout'
+          validate_layout_element(element)
+          element[:component] = element[:component].camelize(:lower)
+          if %w[page row].include?(element[:component])
+            extract = extract_fields_and_layout_for_component(element)
+            layout << element
+            fields.concat(extract[:fields])
+          else
+            layout << element
+          end
+        else
+          fields << element
+          # frontend rule
+          layout << { component: 'input', fieldId: element[:field] }
+        end
+      end
+
+      { fields: fields, layout: layout }
+    end
+
+    def self.extract_fields_and_layout_for_component(element)
+      # 'page' is in camel case because at this step the 'component' attribute is already convert for the response
+      key = element[:component] == 'page' ? :elements : :fields
+      extract = extract_fields_and_layout(element[key])
+      element[key] = extract[:layout]
+
+      extract
+    end
+
+    def self.validate_layout_element(element)
+      valid_components = %w[Page Row Separator HtmlBlock]
+      unless valid_components.include?(element[:component])
+        raise ForestLiana::Errors::HTTP422Error.new(
+          "#{element[:component]} is not a valid component. Valid components are #{valid_components.join(' or ')}"
+        )
+      end
+
+      if element[:component] == 'Page'
+        unless element[:elements].is_a? Array
+          raise ForestLiana::Errors::HTTP422Error.new(
+            "Page components must contain an array of fields or layout elements in property 'elements'"
+          )
+        end
+
+        if element[:elements].any? { |element| element[:component] === 'Page' }
+          raise ForestLiana::Errors::HTTP422Error.new('Pages cannot contain other pages')
+        end
+      end
+
+      if element[:component] == 'Row'
+        unless element[:fields].is_a? Array
+          raise ForestLiana::Errors::HTTP422Error.new(
+            "Row components must contain an array of fields in property 'fields'"
+          )
+        end
+
+        if element[:fields].any? { |element| element[:type] === 'Layout' }
+          raise ForestLiana::Errors::HTTP422Error.new('Row components can only contain fields')
+        end
+      end
+    end
+  end
+end

data/lib/forest_liana/schema_file_updater.rb

@@ -52,6 +52,8 @@ module ForestLiana
       'download',
       'fields',
       'hooks',
+      'description',
+      'submit_button_label',
     ]
     KEYS_ACTION_FIELD = [
       'field',

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.3.16"
+  VERSION = "9.4.0"
 end

data/spec/dummy/lib/forest_liana/collections/island.rb

@@ -43,6 +43,89 @@ class Forest::Island
       }
     }
 
+  action 'my_action_with_layout',
+    fields: [foo],
+    hooks: {
+      :load => -> (context) {
+        [
+          {
+            type: 'Layout',
+            component: 'Page',
+            elements: [
+              {
+                type: 'Layout',
+                component: 'HtmlBlock',
+                content: '<p>test</p>',
+              },
+              {
+                type: 'Layout',
+                component: 'Separator',
+              },
+              foo,
+              {
+                field: 'field 1',
+                type: 'String',
+              },
+              {
+                type: 'Layout',
+                component: 'Separator',
+              },
+              {
+                field: 'field 2',
+                type: 'String',
+              }
+            ]
+          },
+        ]
+      },
+      :change => {
+        'on_foo_changed' => -> (context) {
+          [
+            {
+              type: 'Layout',
+              component: 'Page',
+              elements: [
+                {
+                  type: 'Layout',
+                  component: 'HtmlBlock',
+                  content: '<div style="text-align:center;">
+                            <p>
+                                <strong>Hi #{ctx.form_values["firstName"]} #{ctx.form_values["lastName"]}</strong>,
+                                <br/>here you can put
+                                <strong style="color: red;">all the html</strong> you want.
+                            </p>
+                        </div>
+                        <div style="display: flex; flex-flow: row wrap; justify-content: space-around;">
+                            <a href="https://www.w3schools.com" target="_blank">
+                                <img src="https://www.w3schools.com/html/w3schools.jpg">
+                            </a>
+                            <iframe src="https://www.youtube.com/embed/xHPKuu9-yyw?autoplay=1&mute=1"></iframe>
+                        </div>',
+                },
+                {
+                  type: 'Layout',
+                  component: 'Separator',
+                },
+                foo,
+                {
+                  field: 'field 1',
+                  type: 'String',
+                },
+                {
+                  type: 'Layout',
+                  component: 'Separator',
+                },
+                {
+                  field: 'field 2',
+                  type: 'String',
+                }
+              ]
+            },
+          ]
+        }
+      }
+    }
+
   action 'fail_action',
     fields: [foo],
     hooks: {

data/spec/requests/actions_controller_spec.rb

@@ -41,6 +41,57 @@ describe 'Requesting Actions routes', :type => :request  do
   describe 'hooks' do
     island = ForestLiana.apimap.find {|collection| collection.name.to_s == ForestLiana.name_for(Island)}
 
+    describe 'call /load on layout form' do
+      params = {
+        data: {
+          attributes: { ids: [1], collection_name: 'Island' }
+        }
+      }
+
+      it 'should respond 200 with expected response on load' do
+        post '/forest/actions/my_action_with_layout/hooks/load', params: JSON.dump(params), headers: headers
+        result = JSON.parse(response.body)
+
+        expect(response.status).to eq(200)
+        expect(result).to eq(
+          {
+            "fields" => [
+              {
+                "field"=>"foo",
+                "type"=>"String",
+                "defaultValue"=>nil,
+                "enums"=>nil,
+                "isRequired"=>false,
+                "isReadOnly"=>false,
+                "reference"=>nil,
+                "description"=>nil,
+                "hook"=>"on_foo_changed",
+                "position"=>0,
+                "widgetEdit"=>nil,
+                "value"=>nil
+              },
+              { "field"=>"field 1", "type"=>"String"},
+              {"field"=>"field 2", "type"=>"String" }
+            ],
+            "layout"=>[
+              {
+                "type"=>"Layout",
+                "component"=>"page",
+                "elements"=>[
+                  {"type"=>"Layout", "component"=>"htmlBlock", "content"=>"<p>test</p>"},
+                  {"type"=>"Layout", "component"=>"separator"},
+                  {"component"=>"input", "fieldId"=>"foo"},
+                  {"component"=>"input", "fieldId"=>"field 1"},
+                  {"type"=>"Layout", "component"=>"separator"},
+                  {"component"=>"input", "fieldId"=>"field 2"}
+                ]
+              }
+            ]
+          }
+        )
+      end
+    end
+
     describe 'call /load' do
       params = {
         data: {
@@ -54,6 +105,8 @@ describe 'Requesting Actions routes', :type => :request  do
         foo = action.fields.select { |field| field[:field] == 'foo' }.first
         expect(response.status).to eq(200)
         expect(JSON.parse(response.body)).to eq({'fields' => [foo.merge({:value => nil}).transform_keys { |key| key.to_s.camelize(:lower) }.stringify_keys]})
+        # action form without layout elements should not have the key layout
+        expect(JSON.parse(response.body)).not_to have_key('layout')
       end
 
       it 'should respond 422 with bad params' do

data/spec/services/forest_liana/smart_action_form_parser_spec.rb

@@ -0,0 +1,55 @@
+module ForestLiana
+  describe SmartActionFormParser do
+    describe "self.validate_layout_element" do
+      it "raise an error with an invalid component" do
+        expect { SmartActionFormParser.validate_layout_element({ type: 'Layout', component: 'foo' }) }
+          .to raise_error(
+            ForestLiana::Errors::HTTP422Error,
+            'foo is not a valid component. Valid components are Page or Row or Separator or HtmlBlock'
+          )
+      end
+
+      it "raise an error with an invalid Page" do
+        expect do
+          SmartActionFormParser.validate_layout_element(
+            { type: 'Layout', component: 'Page', elements: 'foo' }
+          )
+        end.to raise_error(
+            ForestLiana::Errors::HTTP422Error,
+            "Page components must contain an array of fields or layout elements in property 'elements'"
+          )
+      end
+
+      it "raise an error with a Page that contains page" do
+        expect do
+          SmartActionFormParser.validate_layout_element(
+            { type: 'Layout', component: 'Page', elements: [{ type: 'Layout', component: 'Page', elements: [] }] }
+          )
+        end.to raise_error(ForestLiana::Errors::HTTP422Error, 'Pages cannot contain other pages')
+      end
+
+      it "should raise an error with an invalid Row" do
+        expect do
+          SmartActionFormParser.validate_layout_element(
+            { type: 'Layout', component: 'Row', fields: 'foo' }
+          )
+        end.to raise_error(
+          ForestLiana::Errors::HTTP422Error,
+          "Row components must contain an array of fields in property 'fields'"
+        )
+      end
+
+      it "raise an error with a row that contains layout element" do
+        expect do
+          SmartActionFormParser.validate_layout_element(
+            {
+              type: 'Layout',
+              component: 'Row',
+              fields: [ { type: 'Layout', component: 'HtmlBlock', fields: 'Row components can only contain fields' }]
+            }
+          )
+        end.to raise_error(ForestLiana::Errors::HTTP422Error, 'Row components can only contain fields')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.3.16
+  version: 9.4.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -305,6 +305,7 @@ files:
 - app/services/forest_liana/scope_manager.rb
 - app/services/forest_liana/search_query_builder.rb
 - app/services/forest_liana/smart_action_field_validator.rb
+- app/services/forest_liana/smart_action_form_parser.rb
 - app/services/forest_liana/stat_getter.rb
 - app/services/forest_liana/stripe_base_getter.rb
 - app/services/forest_liana/stripe_invoice_getter.rb
@@ -441,6 +442,7 @@ files:
 - spec/services/forest_liana/schema_adapter_spec.rb
 - spec/services/forest_liana/scope_manager_spec.rb
 - spec/services/forest_liana/smart_action_field_validator_spec.rb
+- spec/services/forest_liana/smart_action_form_parser_spec.rb
 - spec/services/forest_liana/utils/context_variables_injector_spec.rb
 - spec/services/forest_liana/utils/context_variables_spec.rb
 - spec/services/forest_liana/value_stat_getter_spec.rb
@@ -741,6 +743,7 @@ test_files:
 - spec/services/forest_liana/schema_adapter_spec.rb
 - spec/services/forest_liana/scope_manager_spec.rb
 - spec/services/forest_liana/smart_action_field_validator_spec.rb
+- spec/services/forest_liana/smart_action_form_parser_spec.rb
 - spec/services/forest_liana/utils/context_variables_injector_spec.rb
 - spec/services/forest_liana/utils/context_variables_spec.rb
 - spec/services/forest_liana/value_stat_getter_spec.rb