forest_admin_agent 1.0.0.pre.beta.68 → 1.0.0.pre.beta.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec7cdc76e8ce7354d2680798ed7639e63494054a7c61edb7d68c64531065d9f
-  data.tar.gz: 46b7e3cf3f0c39750042cfb5c14abacf9f1a773cc7be045233941fc3a82530db
+  metadata.gz: 250a2c4a19974f9d4658a54b9bed10460bb810d3ee48fd7d54635eb084ae93b5
+  data.tar.gz: 9a523b41aaffe9a6b17a50e4237458ebd1bb5a5a0d21db64afe8ffac3ec955a0
 SHA512:
-  metadata.gz: 9b8a421a9a493b1817fd7a9f6cfdfa870279963fa55d27c1f8aec7e6db901b387f729e6c52dacf5ee6e65574221992b23a326c5f45db91804f3c519bd2ec3ab0
-  data.tar.gz: cc960dcc8d061dd901550cf760a19159a32548efa2681ddcdb580749aa6ef65cdb5229b11754e54ec6994a763b3282e4de3e27c889af2a40c11097eb66bab715
+  metadata.gz: e1ff743334eb20133c69b24d48258a0308ac1e6a8820b8dfccf92ffe53bfedae8d4fb3cea940e3664885c59b4eda3100250533138646645cfe3a86bbf7533978
+  data.tar.gz: 63fea12ae51f061c8724fdcd1d4a79b022e49960ee0637207d0c61659a8ae1b90a9459772fada1e3c7b5e43f3b04ad598d437890a259effd4364abdd63fb05e0

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

@@ -58,7 +58,7 @@ module ForestAdminAgent
         def self.make_form_data(datasource, raw_data, fields)
           data = {}
           raw_data.each do |key, value|
-            field = fields.find { |f| f.label == key }
+            field = fields.find { |f| f.id == key }
             # Skip fields from the default form
             next if Schema::GeneratorAction::DEFAULT_FIELDS.map { |f| f[:field] }.include?(key)
 

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

@@ -7,6 +7,7 @@ module ForestAdminAgent
         DEFAULT_FIELDS = [
           {
             field: 'Loading...',
+            label: 'Loading...',
             type: 'String',
             isReadOnly: true,
             defaultValue: 'Form is loading',
@@ -30,8 +31,7 @@ module ForestAdminAgent
           slug = get_action_slug(name)
 
           form_elements = extract_fields_and_layout(collection.get_form(nil, name))
-          if action.static_form? && form_elements[:layout].empty?
-            # if action.static_form?
+          if action.static_form?
             fields = build_fields(collection, form_elements[:fields])
             layout = form_elements[:layout]
           else
@@ -58,12 +58,20 @@ module ForestAdminAgent
 
           return schema unless layout && !layout.empty?
 
-          schema[:layout] = build_layout(layout)
+          # schema[:layout] = build_layout(layout)
 
           schema
         end
 
         def self.build_layout_schema(field)
+          if field.component == 'Row'
+            return {
+              **field.to_h,
+              component: field.component.camelize(:lower),
+              fields: field.fields.map { |f| build_layout_schema(f) }
+            }
+          end
+
           { **field.to_h, component: field.component.camelize(:lower) }
         end
 
@@ -72,7 +80,8 @@ module ForestAdminAgent
             description: field.description,
             isRequired: field.is_required,
             isReadOnly: field.is_read_only,
-            field: field.label,
+            field: field.id,
+            label: field.label,
             value: ForestValueConverter.value_to_forest(field),
             widgetEdit: GeneratorActionFieldWidget.build_widget_options(field)
           }
@@ -101,7 +110,7 @@ module ForestAdminAgent
           if fields
             return fields.map do |field|
               new_field = build_field_schema(collection.datasource, field)
-              new_field[:default_value] = new_field[:value]
+              new_field[:defaultValue] = new_field[:value]
               new_field.delete(:value)
 
               new_field
@@ -112,7 +121,7 @@ module ForestAdminAgent
         end
 
         def self.build_layout(elements)
-          if elements
+          if elements.any? { |element| element.component != 'Input' }
             return elements.map do |element|
               build_layout_schema(element)
             end
@@ -124,21 +133,25 @@ module ForestAdminAgent
         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
+              if element.component == 'Row'
+                extract = extract_fields_and_layout(element.fields)
+                element.fields = extract[:layout]
+                layout << element
+                fields.concat(extract[:fields])
+              else
+                layout << element
+              end
+
             else
               fields << element
               # frontend rule
-              layout << Actions::ActionLayoutElement::InputElement.new(component: 'Input', field_id: element.label)
+              layout << Actions::ActionLayoutElement::InputElement.new(component: 'Input', field_id: element.id)
             end
           end
 
-          layout = [] unless has_real_layout
-
           { fields: fields, layout: layout }
         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.68"
+        LIANA_VERSION = "1.0.0-beta.70"
 
         def self.get_serialized_schema(datasource)
           schema_path = Facades::Container.cache(:schema_path)

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.0.0-beta.68"
+  VERSION = "1.0.0-beta.70"
 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.68
+  version: 1.0.0.pre.beta.70
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-23 00:00:00.000000000 Z
+date: 2024-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport