diff --git a/app/models/communication/block/template/call_to_action.rb b/app/models/communication/block/template/call_to_action.rb
index a16e87e65784202cc523978013d75bfbea423c8e..b29315d667dbd9d3b8c474e906cbd644b64dae62 100644
--- a/app/models/communication/block/template/call_to_action.rb
+++ b/app/models/communication/block/template/call_to_action.rb
@@ -1,11 +1,12 @@
class Communication::Block::Template::CallToAction < Communication::Block::Template::Base
+ has_elements
has_component :text, :rich_text
has_component :image, :image
has_component :alt, :string
has_component :credit, :rich_text
- has_elements Communication::Block::Template::CallToAction::Button
+ protected
def check_accessibility
super
diff --git a/app/models/communication/block/template/call_to_action/button.rb b/app/models/communication/block/template/call_to_action/element.rb
similarity index 52%
rename from app/models/communication/block/template/call_to_action/button.rb
rename to app/models/communication/block/template/call_to_action/element.rb
index bfb78c82e90d40c516fdb00c0808332dc0fa11fc..91db731343a0e2f3e94fd62069b34f6b880843ff 100644
--- a/app/models/communication/block/template/call_to_action/button.rb
+++ b/app/models/communication/block/template/call_to_action/element.rb
@@ -1,4 +1,4 @@
-class Communication::Block::Template::CallToAction::Button < Communication::Block::Template::Base
+class Communication::Block::Template::CallToAction::Element < Communication::Block::Template::Base
has_component :title, :string
has_component :url, :string
diff --git a/app/models/communication/block/template/datatable.rb b/app/models/communication/block/template/datatable.rb
index f40d97f26611183cd65ff3c16e5982575e200885..a6f3d5ec3e108b2d46941ca2597882e6ddbbd153 100644
--- a/app/models/communication/block/template/datatable.rb
+++ b/app/models/communication/block/template/datatable.rb
@@ -1,6 +1,6 @@
class Communication::Block::Template::Datatable < Communication::Block::Template::Base
- has_elements Communication::Block::Template::Datatable::Row
+ has_elements
has_component :columns, :array
has_component :caption, :text
diff --git a/app/models/communication/block/template/datatable/element.rb b/app/models/communication/block/template/datatable/element.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d6d786a73533c3d363ade6deaca35d700a1d3192
--- /dev/null
+++ b/app/models/communication/block/template/datatable/element.rb
@@ -0,0 +1,5 @@
+class Communication::Block::Template::Datatable::Element < Communication::Block::Template::Base
+
+ has_component :cells, :array
+
+end
diff --git a/app/models/communication/block/template/datatable/row.rb b/app/models/communication/block/template/datatable/row.rb
deleted file mode 100644
index 6563744ec2f8036f8bf37f9f1022e26cf761241e..0000000000000000000000000000000000000000
--- a/app/models/communication/block/template/datatable/row.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Communication::Block::Template::Datatable::Row < Communication::Block::Template::Base
-
- has_component :cells, :array
-
-end
diff --git a/app/models/communication/block/template/definition.rb b/app/models/communication/block/template/definition.rb
index 24239084f87559c737261117e70d3b3955c7772f..5b444b4049d5d4006a5d99bb7fd7abb3007a8104 100644
--- a/app/models/communication/block/template/definition.rb
+++ b/app/models/communication/block/template/definition.rb
@@ -1,5 +1,5 @@
class Communication::Block::Template::Definition < Communication::Block::Template::Base
- has_elements Communication::Block::Template::Definition::Definition
+ has_elements
end
diff --git a/app/models/communication/block/template/definition/definition.rb b/app/models/communication/block/template/definition/definition.rb
deleted file mode 100644
index 350a8b3e4f5fbd41d49e33eaa4c065c00740378d..0000000000000000000000000000000000000000
--- a/app/models/communication/block/template/definition/definition.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class Communication::Block::Template::Definition::Definition < Communication::Block::Template::Base
- has_component :title, :string
- has_component :description, :text
-end
diff --git a/app/models/communication/block/template/definition/element.rb b/app/models/communication/block/template/definition/element.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4372d6b952491f0804bc1ea54c67a3902d7f2b18
--- /dev/null
+++ b/app/models/communication/block/template/definition/element.rb
@@ -0,0 +1,4 @@
+class Communication::Block::Template::Definition::Element < Communication::Block::Template::Base
+ has_component :title, :string
+ has_component :description, :text
+end
diff --git a/app/models/communication/block/template/embed.rb b/app/models/communication/block/template/embed.rb
index 8f48cc8f3f68c994eba27f652140f117a9f84cba..e71ed4a89ac48153601165d6dcb05a3dfa7edbf8 100644
--- a/app/models/communication/block/template/embed.rb
+++ b/app/models/communication/block/template/embed.rb
@@ -4,6 +4,8 @@ class Communication::Block::Template::Embed < Communication::Block::Template::Ba
has_component :iframe_title, :string
has_component :transcription, :text
+ protected
+
def check_accessibility
super
accessibility_error 'accessibility.blocks.templates.embed.title_missing' if iframe_title.blank?
diff --git a/app/models/communication/block/template/file.rb b/app/models/communication/block/template/file.rb
index f998126bc6664f2d7a79af443486d5ed627188db..44322dc71270c5d9a15f1707280afe93fe048982 100644
--- a/app/models/communication/block/template/file.rb
+++ b/app/models/communication/block/template/file.rb
@@ -1,24 +1,5 @@
class Communication::Block::Template::File < Communication::Block::Template::Base
- def build_git_dependencies
- files.each do |file|
- add_dependency file.blob
- end
- end
-
- def files
- @files ||= elements.map { |element|
- file(element)
- }.compact
- end
-
- protected
-
- def file(element)
- {
- title: element['title'],
- blob: find_blob(element, 'file')
- }.to_dot
- end
+ has_elements
end
diff --git a/app/models/communication/block/template/file/file.rb b/app/models/communication/block/template/file/element.rb
similarity index 60%
rename from app/models/communication/block/template/file/file.rb
rename to app/models/communication/block/template/file/element.rb
index 107bbc40355d9cc016a37c1f247850078ff53909..7c14df5ac75be1ef609f1d3f4d3382de414bc8ae 100644
--- a/app/models/communication/block/template/file/file.rb
+++ b/app/models/communication/block/template/file/element.rb
@@ -1,5 +1,6 @@
class Communication::Block::Template::File::File < Communication::Block::Template::Base
- has_string :title
+ has_component :title, :string
+ has_component :file, :file
end
diff --git a/app/models/communication/block/template/gallery.rb b/app/models/communication/block/template/gallery.rb
index 0fef23ebf55f5ca7d6361017177437dceda53471..572169bcc60eae93b6f91c95ac7beeb463bdadac 100644
--- a/app/models/communication/block/template/gallery.rb
+++ b/app/models/communication/block/template/gallery.rb
@@ -1,6 +1,6 @@
class Communication::Block::Template::Gallery < Communication::Block::Template::Base
+ has_elements
has_layouts [:grid, :carousel]
- has_elements Communication::Block::Template::Gallery::Image
end
diff --git a/app/models/communication/block/template/gallery/image.rb b/app/models/communication/block/template/gallery/element.rb
similarity index 77%
rename from app/models/communication/block/template/gallery/image.rb
rename to app/models/communication/block/template/gallery/element.rb
index 2761a441bfe06f7eb1c8e11fed1dc9e2144fa442..ada521ad438d716cc112e8df22e07769f0bb81c0 100644
--- a/app/models/communication/block/template/gallery/image.rb
+++ b/app/models/communication/block/template/gallery/element.rb
@@ -1,4 +1,4 @@
-class Communication::Block::Template::Gallery::Image < Communication::Block::Template::Base
+class Communication::Block::Template::Gallery::Element < Communication::Block::Template::Base
has_component :image, :image
has_component :alt, :string
has_component :credit, :rich_text
diff --git a/app/models/communication/block/template/image.rb b/app/models/communication/block/template/image.rb
index ea534a8901d8ec12c4f589a5fb16d772caddbd90..fa80f4866c72cbc8da9008ddf7f71e3163e5d07b 100644
--- a/app/models/communication/block/template/image.rb
+++ b/app/models/communication/block/template/image.rb
@@ -5,6 +5,8 @@ class Communication::Block::Template::Image < Communication::Block::Template::Ba
has_component :credit, :rich_text
has_component :text, :text
+ protected
+
def check_accessibility
super
accessibility_warning 'accessibility.commons.alt.empty' if image_component.blob && alt.blank?
diff --git a/app/models/communication/block/template/key_figure.rb b/app/models/communication/block/template/key_figure.rb
index 14b92d39d62c9c8de0ecf8f76e31063dc56b6c8e..a7baeb675cc09e7a48f0ff96eb567f2403c7280d 100644
--- a/app/models/communication/block/template/key_figure.rb
+++ b/app/models/communication/block/template/key_figure.rb
@@ -1,5 +1,5 @@
class Communication::Block::Template::KeyFigure < Communication::Block::Template::Base
- has_elements Communication::Block::Template::KeyFigure::Figure
+ has_elements
end
diff --git a/app/models/communication/block/template/key_figure/figure.rb b/app/models/communication/block/template/key_figure/element.rb
similarity index 52%
rename from app/models/communication/block/template/key_figure/figure.rb
rename to app/models/communication/block/template/key_figure/element.rb
index 24c22f2ba9d661e8fd41dbae7bb7ff0e5f171310..d7409a8745ce96d9f93c7af3fac9134027e96822 100644
--- a/app/models/communication/block/template/key_figure/figure.rb
+++ b/app/models/communication/block/template/key_figure/element.rb
@@ -1,4 +1,4 @@
-class Communication::Block::Template::KeyFigure::Figure < Communication::Block::Template::Base
+class Communication::Block::Template::KeyFigure::Element < Communication::Block::Template::Base
has_component :number, :number
has_component :unit, :string
diff --git a/app/models/communication/block/template/organization_chart.rb b/app/models/communication/block/template/organization_chart.rb
index 2788206cdc24127689f90796eedde358d51a5b4f..42901e89c5cfccd6cab37dae0bcbf0df7fb3d158 100644
--- a/app/models/communication/block/template/organization_chart.rb
+++ b/app/models/communication/block/template/organization_chart.rb
@@ -1,5 +1,5 @@
class Communication::Block::Template::OrganizationChart < Communication::Block::Template::Base
- has_elements Communication::Block::Template::OrganizationChart::Person
+ has_elements
end
diff --git a/app/models/communication/block/template/organization_chart/person.rb b/app/models/communication/block/template/organization_chart/element.rb
similarity index 51%
rename from app/models/communication/block/template/organization_chart/person.rb
rename to app/models/communication/block/template/organization_chart/element.rb
index 265a20f8034690d06bb922cd1a6436dc1700f42f..962ce80e4c89783e559494d23bcc0d61e0557cd5 100644
--- a/app/models/communication/block/template/organization_chart/person.rb
+++ b/app/models/communication/block/template/organization_chart/element.rb
@@ -1,4 +1,4 @@
-class Communication::Block::Template::OrganizationChart::Person < Communication::Block::Template::Base
+class Communication::Block::Template::OrganizationChart::Element < Communication::Block::Template::Base
has_component :id, :person
has_component :role, :string
diff --git a/app/models/communication/block/template/partner.rb b/app/models/communication/block/template/partner.rb
index 6d3b2d286d3506503a6e48ed1ecb356297149e7b..1644b17aef327481772ba6d1b31c509ce68594b0 100644
--- a/app/models/communication/block/template/partner.rb
+++ b/app/models/communication/block/template/partner.rb
@@ -1,51 +1,5 @@
class Communication::Block::Template::Partner < Communication::Block::Template::Base
- has_elements Communication::Block::Template::Partner::Element
+ has_elements
-
- # def build_git_dependencies
- # add_dependency active_storage_blobs
- # add_dependency organizations
- # organizations.each do |organization|
- # add_dependency organization.active_storage_blobs
- # end
- # end
- #
- # def partners
- # @partners ||= elements.map { |element|
- # partner(element)
- # }.compact
- # end
-
- # def active_storage_blobs
- # @active_storage_blobs ||= partners.map { |partner|
- # partner.blob
- # }.compact
- # end
-
- # protected
-
- # def organizations
- # @organizations ||= partners.map { |partner|
- # partner.organization
- # }.compact
- # end
- #
- # def partner(element)
- # # Init to have easy tests in the views and dependencies
- # element['organization'] = nil
- # element['blob'] = nil
- # if element['id']
- # organization = university.organizations.find_by id: element['id']
- # if organization
- # element['organization'] = organization
- # element['name'] = organization.to_s
- # element['url'] = organization.url
- # element['blob'] = organization.logo&.blob
- # end
- # else
- # element['blob'] = find_blob element, 'logo'
- # end
- # element.to_dot
- # end
end
diff --git a/app/models/communication/block/template/post.rb b/app/models/communication/block/template/post.rb
index 4b916b574bc5ef600d29093cdd909e65af61fcfa..92b771aec8ade5b08468bb602003fe06dd4a8b93 100644
--- a/app/models/communication/block/template/post.rb
+++ b/app/models/communication/block/template/post.rb
@@ -1,6 +1,6 @@
class Communication::Block::Template::Post < Communication::Block::Template::Base
- has_elements Communication::Block::Template::Post::Item
+ has_elements
has_component :mode, :option, options: [:all, :category, :selection]
has_component :posts_quantity, :number, options: 3
has_component :category_id, :category
diff --git a/app/models/communication/block/template/post/element.rb b/app/models/communication/block/template/post/element.rb
new file mode 100644
index 0000000000000000000000000000000000000000..acc20d9ddf6c7d455d9f9772652d7ae67ce3dc60
--- /dev/null
+++ b/app/models/communication/block/template/post/element.rb
@@ -0,0 +1,5 @@
+class Communication::Block::Template::Post::Element < Communication::Block::Template::Base
+
+ has_component :id, :post
+
+end
diff --git a/app/models/communication/block/template/post/item.rb b/app/models/communication/block/template/post/item.rb
deleted file mode 100644
index be25c4cfbc11983d644909a507d81039fc89024c..0000000000000000000000000000000000000000
--- a/app/models/communication/block/template/post/item.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Communication::Block::Template::Post::Item < Communication::Block::Template::Base
-
- has_component :id, :post
-
-end
diff --git a/app/models/communication/block/template/testimonial.rb b/app/models/communication/block/template/testimonial.rb
index 70e9d702694e8fc6a90cfaded437959b3656314d..89a595b7a2cab8133c0187dac5e9f00daa0058d1 100644
--- a/app/models/communication/block/template/testimonial.rb
+++ b/app/models/communication/block/template/testimonial.rb
@@ -1,5 +1,5 @@
class Communication::Block::Template::Testimonial < Communication::Block::Template::Base
- has_elements Communication::Block::Template::Testimonial::Testimonial
+ has_elements
end
diff --git a/app/models/communication/block/template/testimonial/testimonial.rb b/app/models/communication/block/template/testimonial/element.rb
similarity index 55%
rename from app/models/communication/block/template/testimonial/testimonial.rb
rename to app/models/communication/block/template/testimonial/element.rb
index 6750491edcd0e1828923763cc4678fa534f2e5fe..2a6d886537cd7bab52985a3802a5f7ff1868beab 100644
--- a/app/models/communication/block/template/testimonial/testimonial.rb
+++ b/app/models/communication/block/template/testimonial/element.rb
@@ -1,4 +1,4 @@
-class Communication::Block::Template::Testimonial::Testimonial < Communication::Block::Template::Base
+class Communication::Block::Template::Testimonial::Element < Communication::Block::Template::Base
has_component :text, :text
has_component :author, :string
diff --git a/app/models/communication/block/template/timeline.rb b/app/models/communication/block/template/timeline.rb
index 03c0f668ca87bb4ec56b0eef038bc6c6a9c89ccf..aa575959411af9b6491aa33d90e81b0f005c1a00 100644
--- a/app/models/communication/block/template/timeline.rb
+++ b/app/models/communication/block/template/timeline.rb
@@ -1,5 +1,5 @@
class Communication::Block::Template::Timeline < Communication::Block::Template::Base
- has_elements Communication::Block::Template::Timeline::Timeline
+ has_elements
end
diff --git a/app/models/communication/block/template/timeline/element.rb b/app/models/communication/block/template/timeline/element.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a928b630ffb37ff0cefcded8a42b7912a05061db
--- /dev/null
+++ b/app/models/communication/block/template/timeline/element.rb
@@ -0,0 +1,6 @@
+class Communication::Block::Template::Timeline::Element < Communication::Block::Template::Base
+
+ has_component :title, :string
+ has_component :text, :text
+
+end
diff --git a/app/models/communication/block/template/timeline/timeline.rb b/app/models/communication/block/template/timeline/timeline.rb
deleted file mode 100644
index f1d0faae898cb6e7bc1ba282d9638e36e9994ebd..0000000000000000000000000000000000000000
--- a/app/models/communication/block/template/timeline/timeline.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Communication::Block::Template::Timeline::Timeline < Communication::Block::Template::Base
-
- has_component :title, :string
- has_component :text, :text
-
-end