From f1bfef0269803e70bf0855621d384c22c60ff597 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Wed, 8 Jun 2022 08:26:59 +0200
Subject: [PATCH] refactored statics
---
app/helpers/admin/blocks_helper.rb | 4 +++-
.../communication/blocks/components/_edit.html.erb | 0
.../blocks/components/_preview.html.erb | 0
.../blocks/components/_static.html.erb | 14 ++++++++++++++
.../blocks/components/image/_static.html.erb | 3 ---
.../blocks/components/rich_text/_static.html.erb | 5 -----
.../blocks/components/string/_static.html.erb | 5 -----
.../blocks/components/text/_static.html.erb | 5 -----
8 files changed, 17 insertions(+), 19 deletions(-)
create mode 100644 app/views/admin/communication/blocks/components/_edit.html.erb
create mode 100644 app/views/admin/communication/blocks/components/_preview.html.erb
create mode 100644 app/views/admin/communication/blocks/components/_static.html.erb
diff --git a/app/helpers/admin/blocks_helper.rb b/app/helpers/admin/blocks_helper.rb
index 3c99f60dd..354b7d742 100644
--- a/app/helpers/admin/blocks_helper.rb
+++ b/app/helpers/admin/blocks_helper.rb
@@ -9,7 +9,9 @@ module Admin::BlocksHelper
end
def block_component_static(property, **options)
- block_component_render :static, property, **options
+ render "admin/communication/blocks/components/static",
+ property: property,
+ **options
end
protected
diff --git a/app/views/admin/communication/blocks/components/_edit.html.erb b/app/views/admin/communication/blocks/components/_edit.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/admin/communication/blocks/components/_preview.html.erb b/app/views/admin/communication/blocks/components/_preview.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/admin/communication/blocks/components/_static.html.erb b/app/views/admin/communication/blocks/components/_static.html.erb
new file mode 100644
index 000000000..300d937bb
--- /dev/null
+++ b/app/views/admin/communication/blocks/components/_static.html.erb
@@ -0,0 +1,14 @@
+<%
+template ||= @block.template
+component = template.public_send "#{property}_component"
+value = template.public_send property
+depth ||= 3
+indentation = ' ' * depth
+local_assigns[:template] = template
+local_assigns[:component] = component
+local_assigns[:value] = value
+local_assigns[:depth] = depth
+local_assigns[:indentation] = indentation
+partial = "admin/communication/blocks/components/#{component.kind}/static"
+%>
+<%= render partial, **local_assigns %>
diff --git a/app/views/admin/communication/blocks/components/image/_static.html.erb b/app/views/admin/communication/blocks/components/image/_static.html.erb
index a0a65ccdf..83fe9086e 100644
--- a/app/views/admin/communication/blocks/components/image/_static.html.erb
+++ b/app/views/admin/communication/blocks/components/image/_static.html.erb
@@ -1,9 +1,6 @@
<%
-component = template.public_send "#{property}_component"
blob = component.blob
-depth ||= 3
list ||= false
-indentation = ' ' * depth
return unless blob
%>
<% if list %>
diff --git a/app/views/admin/communication/blocks/components/rich_text/_static.html.erb b/app/views/admin/communication/blocks/components/rich_text/_static.html.erb
index 7c487d790..c3125cb3d 100644
--- a/app/views/admin/communication/blocks/components/rich_text/_static.html.erb
+++ b/app/views/admin/communication/blocks/components/rich_text/_static.html.erb
@@ -1,7 +1,2 @@
-<%
-value = template.public_send property
-depth ||= 3
-indentation = ' ' * depth
-%>
<%= indentation %><%= property %>: >-
<%= indentation %> <%= prepare_html_for_static value, @university %>
diff --git a/app/views/admin/communication/blocks/components/string/_static.html.erb b/app/views/admin/communication/blocks/components/string/_static.html.erb
index 72a8e7fc8..49f919241 100644
--- a/app/views/admin/communication/blocks/components/string/_static.html.erb
+++ b/app/views/admin/communication/blocks/components/string/_static.html.erb
@@ -1,7 +1,2 @@
-<%
-value = template.public_send property
-depth ||= 3
-indentation = ' ' * depth
-%>
<%= indentation %><%= property %>: >-
<%= indentation %> <%= prepare_text_for_static value, depth + 1 %>
diff --git a/app/views/admin/communication/blocks/components/text/_static.html.erb b/app/views/admin/communication/blocks/components/text/_static.html.erb
index 72a8e7fc8..49f919241 100644
--- a/app/views/admin/communication/blocks/components/text/_static.html.erb
+++ b/app/views/admin/communication/blocks/components/text/_static.html.erb
@@ -1,7 +1,2 @@
-<%
-value = template.public_send property
-depth ||= 3
-indentation = ' ' * depth
-%>
<%= indentation %><%= property %>: >-
<%= indentation %> <%= prepare_text_for_static value, depth + 1 %>
--
GitLab