From 8181a564c7ec8fcfee7498db7b54b5cf956a5fb1 Mon Sep 17 00:00:00 2001
From: Alexandr Zhulev <alexandrzhulev@gmail.com>
Date: Fri, 4 Feb 2022 13:59:43 +0200
Subject: [PATCH 1/3] Allow raw label - preview section - frontend render

---
 .../Resources/views/AjaxForm/fieldPreview.html.twig         | 3 ++-
 .../CmsFormBundle/Resources/views/AjaxForm/fields.html.twig | 6 ++++++
 .../Resources/views/layouts/blank/cms_form.html.twig        | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 src/B2bCode/Bundle/CmsFormBundle/Resources/views/AjaxForm/fields.html.twig

diff --git a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/AjaxForm/fieldPreview.html.twig b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/AjaxForm/fieldPreview.html.twig
index 47e18cc..a7eece9 100644
--- a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/AjaxForm/fieldPreview.html.twig
+++ b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/AjaxForm/fieldPreview.html.twig
@@ -1,10 +1,11 @@
 {% set entityAttr = entity.option('attr') %}
 {% set size = entityAttr["data-size"] is defined ? entityAttr["data-size"] : 'large' %}
+{% form_theme form with ['B2bCodeCmsFormBundle:AjaxForm:fields.html.twig'] %}
 
 {% if form.children|length %}
     {% for child in form %}
         <div class="cms-field cms-field__{{ size }}">
-        {{ form_row(child) }}
+            {{ form_row(child) }}
         </div>
     {% endfor %}
 {% endif %}
diff --git a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/AjaxForm/fields.html.twig b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/AjaxForm/fields.html.twig
new file mode 100644
index 0000000..98913bd
--- /dev/null
+++ b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/AjaxForm/fields.html.twig
@@ -0,0 +1,6 @@
+{% extends 'OroFormBundle:Form:fields.html.twig' %}
+
+{%- block form_label -%}
+    {% set raw_label = 1 %}
+    {{ parent() }}
+{%- endblock form_label -%}
diff --git a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
index c82ef5d..0b27711 100644
--- a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
+++ b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
@@ -56,3 +56,9 @@
         {{ oro_form_js_validation(form, js_validation_options|default({})) }}
     </div>
 {% endblock %}
+
+{% extends 'OroFormBundle:layouts/blank:form_theme.html.twig' %}
+{%- block form_label -%}
+    {% set raw_label = 1 %}
+    {{ parent() }}
+{%- endblock form_label -%}

From e0fede8bad100caec2db9705f0b2eb9e07354cf0 Mon Sep 17 00:00:00 2001
From: Alexandr Zhulev <alexandrzhulev@gmail.com>
Date: Fri, 4 Feb 2022 15:55:10 +0200
Subject: [PATCH 2/3] Allow raw label - introduce _form_row_with_raw_label
 intead of inherit from parent

---
 .../views/layouts/blank/cms_form.html.twig    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
index 0b27711..3152953 100644
--- a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
+++ b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
@@ -34,14 +34,14 @@
 
                     {% if willFit %}
                         <div class="grid__column grid__column--{{ gridColumnSize }}">
-                            {{ form_row(child) }}
+                            {{ block('_form_row_with_raw_label') }}
                         </div>
                         {% set rowSize = rowSize + gridColumnSize %}
                     {% else %}
                         </div>
                         <div class="grid__row grid__row--offset-none">
                             <div class="grid__column grid__column--{{ gridColumnSize }}">
-                                {{ form_row(child) }}
+                                {{ block('_form_row_with_raw_label') }}
                             </div>
                         {% set rowSize = gridColumnSize %}
                     {% endif %}
@@ -57,8 +57,18 @@
     </div>
 {% endblock %}
 
-{% extends 'OroFormBundle:layouts/blank:form_theme.html.twig' %}
-{%- block form_label -%}
-    {% set raw_label = 1 %}
-    {{ parent() }}
-{%- endblock form_label -%}
+{%- block _form_row_with_raw_label -%}
+    <div class="form-row">
+        <div class="form-row__label">
+            {{- form_label(child, null, { 'raw_label': 1, 'label_attr': {'class': 'label'}}) -}}
+        </div>
+        <div class="form-row__content">
+            {{- form_widget(child, {
+                attr: {
+                    'class': 'input input--full'
+                }
+            }) -}}
+        </div>
+        {{- form_errors(child) -}}
+    </div>
+{%- endblock -%}

From ef8ad8c9e691a7e85005e582db4a7ea0ef2d5ae5 Mon Sep 17 00:00:00 2001
From: Alexandr Zhulev <alexandrzhulev@gmail.com>
Date: Wed, 9 Feb 2022 13:21:22 +0200
Subject: [PATCH 3/3] Allow raw label - simplified

---
 .../views/layouts/blank/cms_form.html.twig    | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
index 3152953..9d36afd 100644
--- a/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
+++ b/src/B2bCode/Bundle/CmsFormBundle/Resources/views/layouts/blank/cms_form.html.twig
@@ -34,14 +34,14 @@
 
                     {% if willFit %}
                         <div class="grid__column grid__column--{{ gridColumnSize }}">
-                            {{ block('_form_row_with_raw_label') }}
+                            {{ form_row(child, {raw_label: 1}) }}
                         </div>
                         {% set rowSize = rowSize + gridColumnSize %}
                     {% else %}
                         </div>
                         <div class="grid__row grid__row--offset-none">
                             <div class="grid__column grid__column--{{ gridColumnSize }}">
-                                {{ block('_form_row_with_raw_label') }}
+                                {{ form_row(child, {raw_label: 1}) }}
                             </div>
                         {% set rowSize = gridColumnSize %}
                     {% endif %}
@@ -56,19 +56,3 @@
         {{ oro_form_js_validation(form, js_validation_options|default({})) }}
     </div>
 {% endblock %}
-
-{%- block _form_row_with_raw_label -%}
-    <div class="form-row">
-        <div class="form-row__label">
-            {{- form_label(child, null, { 'raw_label': 1, 'label_attr': {'class': 'label'}}) -}}
-        </div>
-        <div class="form-row__content">
-            {{- form_widget(child, {
-                attr: {
-                    'class': 'input input--full'
-                }
-            }) -}}
-        </div>
-        {{- form_errors(child) -}}
-    </div>
-{%- endblock -%}