forest_admin_datasource_customizer 1.0.0.pre.beta.67 → 1.0.0.pre.beta.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7be9cd681f1268f79a3196e2df52f823bf27435addf2bafd6149d54c2cccae
-  data.tar.gz: 4ec5d39db429e15805cd46c0ae414a1486c24c42df2f2bd89c00b171e01bb7ab
+  metadata.gz: e1c8a06acb9a7a54a9b3307d8ced770afb79f524830002e3df64a0c4d2942663
+  data.tar.gz: 42839a7a96efa461771180ccfc4c7eeba8c111d35fef2c9677f09a9e264b2dad
 SHA512:
-  metadata.gz: d7f31dd4e49979ecd1b488b505eaf7c87ed8a41f2301578a2b4b26458075e64fd491c15b58638663d166da004d2c1f972412c5c4418809e77533b4bdc736de9c
-  data.tar.gz: 928ae535652f6eba9f2ccf93686d09e71b0a51d0d8a98e24fd70a702e37f8734f5f0358b2b2c30bfc30d5972135b31ff02b37fadda364d9116f12304986e98f9
+  metadata.gz: 4d0c9a2a6baa9054af52915b4987b570acc90376dc2f66ecaaae3749c1b59752968e6e4f85c8f91f2f7a1910312b9f9ebd51e1225a2c5dbfafd43bfc360a6a70
+  data.tar.gz: e184b1912374f9f8aca77f44a97b1d4b3d0e09d87eccaab1a9332d1e3039e040ff9a201cafefb3641f27e0fe90b11d4424aded5b503a43e42f67dd56162b052c

data/lib/forest_admin_datasource_customizer/decorators/action/action_collection_decorator.rb

@@ -48,7 +48,7 @@ module ForestAdminDatasourceCustomizer
           dynamic_fields = drop_defaults(context, dynamic_fields, form_values)
           dynamic_fields = drop_ifs(context, dynamic_fields) unless metas[:include_hidden_fields]
 
-          fields = drop_deferred(context, metas[:search_values], dynamic_fields)
+          fields = drop_deferred(context, metas[:search_values], dynamic_fields).compact
 
           fields.each do |field|
             next if field.type == 'Layout'

data/lib/forest_admin_datasource_customizer/decorators/action/base_action.rb

@@ -70,6 +70,10 @@ module ForestAdminDatasourceCustomizer
           case field[:component]
           when 'Separator'
             FormLayoutElement::SeparatorElement.new(**field)
+          when 'HtmlBlock'
+            FormLayoutElement::HtmlBlockElement.new(**field)
+          when 'Row'
+            FormLayoutElement::RowElement.new(**field)
           else
             raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
                   "Unknow component type: #{field[:component]}"
@@ -77,7 +81,7 @@ module ForestAdminDatasourceCustomizer
         end
 
         def static_form?
-          return form&.all?(&:static?) if form
+          return form&.all?(&:static?) && form&.none? { |field| field.type == 'Layout' } if form
 
           true
         end

data/lib/forest_admin_datasource_customizer/decorators/action/form_layout_element.rb

@@ -3,23 +3,65 @@ module ForestAdminDatasourceCustomizer
     module Action
       module FormLayoutElement
         include Types
+        include ForestAdminDatasourceToolkit::Exceptions
 
         class LayoutElement < BaseFormElement
           attr_accessor :if_condition, :component
 
           def initialize(component:, if_condition: nil, **kwargs)
             super(type: 'Layout', **kwargs)
-
             @component = component
             @if_condition = if_condition
           end
         end
 
         class SeparatorElement < LayoutElement
-          def initialize(options)
+          def initialize(**options)
             super(component: 'Separator', **options)
           end
         end
+
+        class HtmlBlockElement < LayoutElement
+          attr_accessor :content
+
+          def initialize(content:, **options)
+            super(component: 'HtmlBlock', **options)
+            @content = content
+          end
+        end
+
+        class RowElement < LayoutElement
+          include ForestAdminDatasourceToolkit::Exceptions
+          attr_accessor :fields
+
+          def initialize(options)
+            super(component: 'Row', **options)
+            validate_fields_presence!(options)
+            validate_no_layout_subfields!(options[:fields])
+            @fields = instantiate_subfields(options[:fields] || [])
+          end
+
+          private
+
+          def validate_fields_presence!(options)
+            raise ForestException, "Using 'fields' in a 'Row' configuration is mandatory" unless options.key?(:fields)
+          end
+
+          def validate_no_layout_subfields!(fields)
+            fields.each do |field|
+              if (field.is_a?(DynamicField) && field.type == 'Layout') ||
+                 (field.is_a?(Hash) && field[:type] == 'Layout')
+                raise ForestException, "A 'Row' form element doesn't allow layout elements as subfields"
+              end
+            end
+          end
+
+          def instantiate_subfields(fields)
+            fields.map do |field|
+              ForestAdminDatasourceToolkit::Components::Actions::ActionFieldFactory.build(field.to_h)
+            end
+          end
+        end
       end
     end
   end

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  VERSION = "1.0.0-beta.67"
+  VERSION = "1.0.0-beta.69"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_customizer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.67
+  version: 1.0.0.pre.beta.69
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport