Fix modal if signed form for template drafts

slovensko-digital · Dec 5, 2023 · e0e6b5e · e0e6b5e
1 parent aca573b
commit e0e6b5e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/app/components/message_draft_body_component.html.erb b/app/components/message_draft_body_component.html.erb
@@ -27,13 +27,7 @@
 
   <div class="flex flex-col justify-stretch items-start relative gap-4 p-6 border-t-0 border-r-0 border-b border-l-0 border-gray-200">
     <% if @message.custom_visualization? %>
-      <% if @message.editable? %>
-        <%= render MessageTemplateComponent.new(message: @message, is_last: @is_last) %>
-      <% else %>
-        <%= button_to confirm_unlock_message_draft_path(@message), method: 'post', class: "w-full", data: { turbo_frame: "modal" } do %>
-          <%= render MessageTemplateComponent.new(message: @message, is_last: @is_last) %>
-        <% end %>
-      <% end %>
+      <%= render MessageTemplateComponent.new(message: @message, is_last: @is_last) %>
     <% else %>
       <div class="w-full">
         <%= tag.iframe class: "relative border-none overflow-hidden h-full w-full", srcdoc: @message.html_visualization, onload: "(

diff --git a/app/components/message_template_component.html.erb b/app/components/message_template_component.html.erb
@@ -9,16 +9,33 @@
     "class": "mb-3 pt-0 w-full"
   }
 ) do %>
-  <%= form_for :message_draft, url: message_draft_path(@message), method: 'patch', id: message_draft_body_form_id, builder: MessageTemplateBuilder do |form| %>
-    <% MessageTemplateParser.parse_template_placeholders(@message.template).each do |placeholder| %>
-      <%= form.template_field(
-            placeholder,
-            data: @message.metadata.dig('data'),
-            errors: @message.template_validation_errors,
-            editable: @message.editable?,
-            is_last: @is_last
-          )
-      %>
+  <% if @message.editable? %>
+    <%= form_for :message_draft, url: message_draft_path(@message), method: 'patch', id: message_draft_body_form_id, builder: MessageTemplateBuilder do |form| %>
+      <% MessageTemplateParser.parse_template_placeholders(@message.template).each do |placeholder| %>
+        <%= form.template_field(
+              placeholder,
+              data: @message.metadata.dig('data'),
+              errors: @message.template_validation_errors,
+              editable: @message.editable?,
+              is_last: @is_last
+            )
+        %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <%= button_to confirm_unlock_message_draft_path(@message), class: "w-full", data: { turbo_frame: "modal" } do %>
+      <%= form_for :message_draft, url: confirm_unlock_message_draft_path(@message), method: 'post', id: message_draft_body_form_id, builder: MessageTemplateBuilder, class: "w-full", data: { turbo_frame: "modal" } do |form| %>
+        <% MessageTemplateParser.parse_template_placeholders(@message.template).each do |placeholder| %>
+          <%= form.template_field(
+                placeholder,
+                data: @message.metadata.dig('data'),
+                errors: @message.template_validation_errors,
+                editable: @message.editable?,
+                is_last: @is_last
+              )
+          %>
+        <% end %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>