From 8864e9fa663e1cb593247a1571c965ba6bdc548a Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Tue, 7 Jun 2022 21:16:23 +0200
Subject: [PATCH] not working, lacks a clear view
---
.../communication/block/template/base.rb | 26 +++++++++++++++----
.../block/template/gallery/image.rb | 2 +-
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/app/models/communication/block/template/base.rb b/app/models/communication/block/template/base.rb
index 03ea74c82..1cdc350c8 100644
--- a/app/models/communication/block/template/base.rb
+++ b/app/models/communication/block/template/base.rb
@@ -55,11 +55,15 @@ class Communication::Block::Template::Base
CODE
end
- def initialize(block)
+ # It can be initialized with no data, for a full block
+ # or with data provided, for nested elements
+ def initialize(block, json = nil)
@block = block
@data_loaded = false
+ @data = json unless json.nil?
end
+ # Transforms raw json into ruby objects, based on componenets
def data=(value)
if value.is_a? String
json = JSON.parse(value)
@@ -72,6 +76,9 @@ class Communication::Block::Template::Base
next unless json.has_key? component.property
component.data = json[component.property]
end
+ json['elements'].each do |json|
+ default_element json
+ end if has_elements?
end
def data
@@ -79,6 +86,9 @@ class Communication::Block::Template::Base
components.each do |component|
hash[component.property] = component.data
end
+ elements.each do |element|
+ hash['elements'] << element.data
+ end if has_elements?
hash
end
@@ -95,13 +105,19 @@ class Communication::Block::Template::Base
[]
end
- def default_element
- return if self.class.element_class.nil?
- self.class.element_class.new block
+ def has_elements?
+ !self.class.element_class.nil?
+ end
+
+ def default_element(data = nil)
+ return unless has_elements?
+ self.class.element_class.new block, data
end
def elements
- data['elements']
+ block.attributes['data']['elements'].map do |json|
+ default_element json
+ end if has_elements?
end
def default_layout
diff --git a/app/models/communication/block/template/gallery/image.rb b/app/models/communication/block/template/gallery/image.rb
index 40f093130..d472c3d15 100644
--- a/app/models/communication/block/template/gallery/image.rb
+++ b/app/models/communication/block/template/gallery/image.rb
@@ -8,7 +8,7 @@ class Communication::Block::Template::Gallery::Image < Communication::Block::Tem
{
'alt' => '',
'credit' => '',
- 'file' => {}
+ 'image' => {}
}
end
end
--
GitLab