forest_admin_agent 1.0.0.pre.beta.71 → 1.0.0.pre.beta.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea6f67ffc5dc116dac48722300bd5fa6a0c40ca82b5f8af91d6efa657bb803a
-  data.tar.gz: 6985f9c28c16899cb14da10ce069e757eb62020d0eba7a657c27594e96eb01e2
+  metadata.gz: c94f2a856dbe3fb0b7ab5968ccb91d1f1ea0894d84b60a9076a5a8fd98b5663a
+  data.tar.gz: 63706206c126f7fb68807e94ccf6b971b40a47f52eb37094c190d5694b874dd8
 SHA512:
-  metadata.gz: 9f2a571ab36bb1d331b8f2f783086e2089b2bdc2bd009208ad06aec5e520e6ad8227074c5eb4a2026148fa9f5687c8e9d20767ddb7782ce2d2c6bb98b0a5102a
-  data.tar.gz: 7aa16376f63c8ce874b8426cd2842a02300f71a75545db9b26e034d5acb93ed26b44a8485da976df4ea461d369e0b0f05d2a80f3618eadc4da1dbc26943ccfdd
+  metadata.gz: f77e8e90b43a20e9a3b8ca08b98670d4a2f7ee4489cbfb26da5f1be11255d7048882a0a9aede0dc1ae9589d693adc4b0f89add527fc42e5884407fe7a16ab761
+  data.tar.gz: 51a25721acb463d04e93d31f86d4c595b91c887540c0c8bb272a9440fecfa410760578962dd2bf561f1d6bb6add323302d5779b5a9b25059ee04bd8b12434f27

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

@@ -29,7 +29,6 @@ module ForestAdminAgent
           action = collection.schema[:actions][name]
           action_index = collection.schema[:actions].keys.index(name)
           slug = get_action_slug(name)
-
           form_elements = extract_fields_and_layout(collection.get_form(nil, name))
           if action.static_form?
             fields = build_fields(collection, form_elements[:fields])
@@ -72,6 +71,14 @@ module ForestAdminAgent
               component: field.component.camelize(:lower),
               fields: field.fields.map { |f| build_layout_schema(f) }
             }
+          elsif field.component == 'Page'
+            return {
+              **field.to_h,
+              component: field.component.camelize(:lower),
+              elements: field.elements.map do |f|
+                build_layout_schema(f)
+              end
+            }
           end
 
           { **field.to_h, component: field.component.camelize(:lower) }
@@ -135,18 +142,15 @@ module ForestAdminAgent
         def self.extract_fields_and_layout(form)
           fields = []
           layout = []
-
           form&.each do |element|
             if element.type == Actions::FieldType::LAYOUT
-              if element.component == 'Row'
-                extract = extract_fields_and_layout(element.fields)
-                element.fields = extract[:layout]
+              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
@@ -156,6 +160,13 @@ module ForestAdminAgent
 
           { fields: fields, layout: layout }
         end
+
+        def self.extract_fields_and_layout_for_component(element)
+          key = element.component == 'Page' ? :elements : :fields
+          extract = extract_fields_and_layout(element.public_send(key))
+          element.public_send(:"#{key}=", extract[:layout])
+          extract
+        end
       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.71"
+        LIANA_VERSION = "1.0.0-beta.72"
 
         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.71"
+  VERSION = "1.0.0-beta.72"
 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.71
+  version: 1.0.0.pre.beta.72
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport