From 2facdf7ef0f5c85c33e17d11c994c37d52e9e4e9 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Sat, 4 Jun 2022 08:54:35 +0200
Subject: [PATCH] has_layouts
---
app/models/communication/block/template/base.rb | 6 +++++-
app/models/communication/block/template/gallery.rb | 4 +---
app/models/communication/block/template/page.rb | 4 ++--
.../blocks/components/{layout => layouts}/_edit.html.erb | 2 +-
.../communication/blocks/templates/gallery/_edit.html.erb | 3 +--
.../communication/blocks/templates/pages/_edit.html.erb | 4 +---
6 files changed, 11 insertions(+), 12 deletions(-)
rename app/views/admin/communication/blocks/components/{layout => layouts}/_edit.html.erb (97%)
diff --git a/app/models/communication/block/template/base.rb b/app/models/communication/block/template/base.rb
index b7d8384fc..6624b56e0 100644
--- a/app/models/communication/block/template/base.rb
+++ b/app/models/communication/block/template/base.rb
@@ -1,5 +1,5 @@
class Communication::Block::Template::Base
- class_attribute :components_descriptions
+ class_attribute :components_descriptions, :layouts
attr_reader :block
@@ -25,6 +25,10 @@ class Communication::Block::Template::Base
has_component "#{property}_credit".to_sym, :string
end
+ def self.has_layouts(list)
+ self.layouts = list
+ end
+
def self.has_component(property, kind)
self.components_descriptions ||= []
self.components_descriptions << { name: property, type: kind }
diff --git a/app/models/communication/block/template/gallery.rb b/app/models/communication/block/template/gallery.rb
index 833ef1c6b..9b0e2d27d 100644
--- a/app/models/communication/block/template/gallery.rb
+++ b/app/models/communication/block/template/gallery.rb
@@ -1,8 +1,6 @@
class Communication::Block::Template::Gallery < Communication::Block::Template::Base
- LAYOUTS = [:grid, :carousel].freeze
-
- # has_select :layout, options: LAYOUTS, default: LAYOUTS.first
+ has_layouts [:grid, :carousel]
def default_element
Communication::Block::Template::Gallery::Image.new block
diff --git a/app/models/communication/block/template/page.rb b/app/models/communication/block/template/page.rb
index ef482aa88..023ccda46 100644
--- a/app/models/communication/block/template/page.rb
+++ b/app/models/communication/block/template/page.rb
@@ -1,7 +1,7 @@
class Communication::Block::Template::Page < Communication::Block::Template::Base
- has_rich_text :text
- LAYOUTS = [:grid, :list, :cards].freeze
+ has_layouts [:grid, :list, :cards]
+ has_rich_text :text
def build_git_dependencies
add_dependency main_page
diff --git a/app/views/admin/communication/blocks/components/layout/_edit.html.erb b/app/views/admin/communication/blocks/components/layouts/_edit.html.erb
similarity index 97%
rename from app/views/admin/communication/blocks/components/layout/_edit.html.erb
rename to app/views/admin/communication/blocks/components/layouts/_edit.html.erb
index aa0ce6a4a..1544fa810 100644
--- a/app/views/admin/communication/blocks/components/layout/_edit.html.erb
+++ b/app/views/admin/communication/blocks/components/layouts/_edit.html.erb
@@ -2,7 +2,7 @@
horizontal ||= false
template = @block.template
template_kind = @block.template_kind
-layouts = template.class::LAYOUTS
+layouts = template.class.layouts
%>
<% if horizontal %><div class="row"><% end %>
<% layouts.each do |layout| %>
diff --git a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
index 49e7b69f6..a8c9c1003 100644
--- a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb
@@ -1,5 +1,4 @@
-<%= render 'admin/communication/blocks/components/layout/edit',
- layouts: Communication::Block::Template::Gallery::LAYOUTS,
+<%= render 'admin/communication/blocks/components/layouts/edit',
horizontal: true %>
<%= render 'admin/communication/blocks/components/add_element/edit',
diff --git a/app/views/admin/communication/blocks/templates/pages/_edit.html.erb b/app/views/admin/communication/blocks/templates/pages/_edit.html.erb
index d9a1da646..efde9f508 100644
--- a/app/views/admin/communication/blocks/templates/pages/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/pages/_edit.html.erb
@@ -116,8 +116,6 @@
</div>
</div>
- <%= render 'admin/communication/blocks/components/layout/edit',
- layouts: Communication::Block::Template::Page::LAYOUTS,
- template: 'pages' %>
+ <%= render 'admin/communication/blocks/components/layouts/edit' %>
</div>
</div>
--
GitLab