forest_admin_agent 1.0.0.pre.beta.66 → 1.0.0.pre.beta.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fc85827537907fb926fbcda872d569326d43924765e01226c7dd7fd039e5295
-  data.tar.gz: c8d8a5ac377333ae6ae550938c5c59b47c1a03a5d61e2e6ae95ff638f9920560
+  metadata.gz: 102bc16ac3f1558f735da11578c64f728e46a8d4fce2e5226e39446cbd3b83fd
+  data.tar.gz: 9e6cf5a41c4cfdd84733bb2bba8ed63e2b176375e32be57f5c1372fdb1e703e2
 SHA512:
-  metadata.gz: 764cc18307625f10dc4278c76ee89c7ad786c0b5136a4942781a1a57e0976d4e8f26e953a7c0d18cc60c10503721328b779971707f5a14bb6f3fd1f0206c10f8
-  data.tar.gz: 2886be1ee6068aba91aeb447a5fc5d55e9edcf51ac84998ce8c8b50e5418ff8a8d3c4edbc21e10fe6422d7625fd3e0eaa9fe933a5885375e6e7d824a7bb9342a
+  metadata.gz: 8be3201acf63fbc863320e1f663f15b18b556e0be542484081f4b0494abfa8f8d62180d6f481efb9db03ee3299da4e00d20b2d17e82b3b12da416b255e8f5996
+  data.tar.gz: f0ff4f00e19244e8440791d9bae621b2616e33003a3467107c1a81bdd5a62900c9dd12c5f53eaacbe46394f17202c110c3dfdec625a4307c74fa04fba79760d6

data/lib/forest_admin_agent/routes/action/actions.rb

@@ -69,7 +69,11 @@ module ForestAdminAgent
           )
 
           # Now that we have the field list, we can parse the data again.
-          data = Schema::ForestValueConverter.make_form_data(@datasource, raw_data, fields)
+          data = Schema::ForestValueConverter.make_form_data(
+            @datasource,
+            raw_data,
+            fields.reject { |field| field.type == 'Layout' }
+          )
 
           { content: @collection.execute(@caller, @action_name, data, filter_for_caller) }
         end
@@ -82,7 +86,7 @@ module ForestAdminAgent
           search_values = {}
           forest_fields&.each { |field| search_values[field['field']] = field['searchValue'] }
 
-          fields = @collection.get_form(
+          form = @collection.get_form(
             @caller,
             @action_name,
             data,
@@ -94,10 +98,12 @@ module ForestAdminAgent
               includeHiddenFields: false
             }
           )
+          form_elements = Schema::GeneratorAction.extract_fields_and_layout(form)
 
           {
             content: {
-              fields: fields&.map { |field| Schema::GeneratorAction.build_field_schema(@datasource, field) } || {}
+              fields: Schema::GeneratorAction.build_fields(@collection, form_elements[:fields]),
+              layout: Schema::GeneratorAction.build_layout(form_elements[:layout])
             }
           }
         end

data/lib/forest_admin_agent/utils/schema/generator_action.rb

@@ -2,6 +2,8 @@ module ForestAdminAgent
   module Utils
     module Schema
       class GeneratorAction
+        include ForestAdminDatasourceToolkit::Components
+
         DEFAULT_FIELDS = [
           {
             field: 'Loading...',
@@ -23,27 +25,46 @@ module ForestAdminAgent
         end
 
         def self.build_schema(collection, name)
-          schema = collection.schema[:actions][name]
+          action = collection.schema[:actions][name]
           action_index = collection.schema[:actions].keys.index(name)
           slug = get_action_slug(name)
-          fields = build_fields(collection, name, schema)
 
-          {
+          form_elements = extract_fields_and_layout(collection.get_form(nil, name))
+          if action.static_form? && form_elements[:layout].empty?
+            # if action.static_form?
+            fields = build_fields(collection, form_elements[:fields])
+            layout = form_elements[:layout]
+          else
+            fields = DEFAULT_FIELDS
+            layout = nil
+          end
+
+          schema = {
             id: "#{collection.name}-#{action_index}-#{slug}",
             name: name,
-            type: schema.scope.downcase,
+            type: action.scope.downcase,
             baseUrl: nil,
             endpoint: "/forest/_actions/#{collection.name}/#{action_index}/#{slug}",
             httpMethod: 'POST',
             redirect: nil, # frontend ignores this attribute
-            download: schema.is_generate_file,
+            download: action.is_generate_file,
             fields: fields,
             hooks: {
-              load: !schema.static_form?,
+              load: !action.static_form?,
               # Always registering the change hook has no consequences, even if we don't use it.
               change: ['changeHook']
             }
           }
+
+          return schema unless layout && !layout.empty?
+
+          schema[:layout] = build_layout(layout)
+
+          schema
+        end
+
+        def self.build_layout_schema(field)
+          { **field.to_h, component: field.component.downcase }
         end
 
         def self.build_field_schema(datasource, field)
@@ -76,26 +97,49 @@ module ForestAdminAgent
           output
         end
 
-        class << self
-          private
-
-          def build_fields(collection, name, action)
-            return DEFAULT_FIELDS unless action.static_form?
+        def self.build_fields(collection, fields)
+          if fields
+            return fields.map do |field|
+              new_field = build_field_schema(collection.datasource, field)
+              new_field[:default_value] = new_field[:value]
+              new_field.delete(:value)
 
-            fields = collection.get_form(nil, name)
+              new_field
+            end
+          end
 
-            if fields
-              return fields.map do |field|
-                new_field = build_field_schema(collection.datasource, field)
-                new_field[:default_value] = new_field[:value]
-                new_field.delete(:value)
+          []
+        end
 
-                new_field
-              end
+        def self.build_layout(elements)
+          if elements
+            return elements.map do |element|
+              build_layout_schema(element)
             end
+          end
+
+          []
+        end
+
+        def self.extract_fields_and_layout(form)
+          fields = []
+          layout = []
+          has_real_layout = false
 
-            []
+          form&.each do |element|
+            if element.type == Actions::FieldType::LAYOUT
+              layout << element
+              has_real_layout = true
+            else
+              fields << element
+              # frontend rule
+              layout << Actions::ActionLayoutElement::InputElement.new(component: 'Input', field_id: element.label)
+            end
           end
+
+          layout = [] unless has_real_layout
+
+          { fields: fields, layout: layout }
         end
       end
     end

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
 
-        LIANA_VERSION = "1.0.0-beta.66"
+        LIANA_VERSION = "1.0.0-beta.67"
 
         def self.get_serialized_schema(datasource)
           schema_path = Facades::Container.cache(:schema_path)
@@ -66,6 +66,7 @@ module ForestAdminAgent
             schema[:collections].each do |collection|
               collection_actions = collection[:actions]
               collection_segments = collection[:segments]
+
               collection.delete(:actions)
               collection.delete(:segments)
 
@@ -94,6 +95,7 @@ module ForestAdminAgent
 
           def get_smart_features_by_collection(type, data, with_attributes: false)
             smart_features = []
+
             data.each do |value|
               smart_feature = { id: value[:id], type: type }
               smart_feature[:attributes] = value if with_attributes

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.0.0-beta.66"
+  VERSION = "1.0.0-beta.67"
 end

metadata

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