From 0cc53066ebdff651eac93cb01a3dac8f1528d2d2 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <lexfox777@gmail.com>
Date: Sun, 3 Sep 2023 20:44:54 +0300
Subject: [PATCH] refactor

---
 app/javascript/form.js                          |  1 +
 app/javascript/submission_form/completed.vue    | 10 +++++++++-
 app/javascript/submission_form/form.vue         |  6 ++++++
 app/views/shared/_attribution.html.erb          |  5 +----
 app/views/shared/_powered_by.html.erb           |  4 ++++
 app/views/submit_form/_submission_form.html.erb |  3 +++
 app/views/submit_form/show.html.erb             |  2 +-
 7 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 app/views/shared/_powered_by.html.erb
 create mode 100644 app/views/submit_form/_submission_form.html.erb

diff --git a/app/javascript/form.js b/app/javascript/form.js
index da33cdbe..df1eff3d 100644
--- a/app/javascript/form.js
+++ b/app/javascript/form.js
@@ -14,6 +14,7 @@ window.customElements.define('submission-form', class extends HTMLElement {
       canSendEmail: this.dataset.canSendEmail === 'true',
       isDirectUpload: this.dataset.isDirectUpload === 'true',
       isDemo: this.dataset.isDemo === 'true',
+      attribution: this.dataset.attribution !== 'false',
       withConfetti: true,
       values: reactive(JSON.parse(this.dataset.values)),
       attachments: reactive(JSON.parse(this.dataset.attachments)),
diff --git a/app/javascript/submission_form/completed.vue b/app/javascript/submission_form/completed.vue
index 2abae5ad..9108c945 100644
--- a/app/javascript/submission_form/completed.vue
+++ b/app/javascript/submission_form/completed.vue
@@ -62,7 +62,10 @@
         </span>
       </a>
     </div>
-    <div class="text-center mt-4">
+    <div
+      v-if="attribution"
+      class="text-center mt-4"
+    >
       {{ t('signed_with') }}
       <a
         href="https://www.docuseal.co"
@@ -97,6 +100,11 @@ export default {
       required: false,
       default: false
     },
+    attribution: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     withConfetti: {
       type: Boolean,
       required: false,
diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue
index 91d63d6f..53372e65 100644
--- a/app/javascript/submission_form/form.vue
+++ b/app/javascript/submission_form/form.vue
@@ -293,6 +293,7 @@
       <FormCompleted
         v-else
         :is-demo="isDemo"
+        :attribution="attribution"
         :with-confetti="withConfetti"
         :can-send-email="canSendEmail && submitter.email"
         :submitter-slug="submitterSlug"
@@ -392,6 +393,11 @@ export default {
       required: false,
       default: false
     },
+    attribution: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     values: {
       type: Object,
       required: false,
diff --git a/app/views/shared/_attribution.html.erb b/app/views/shared/_attribution.html.erb
index 58fbee58..275eb686 100644
--- a/app/views/shared/_attribution.html.erb
+++ b/app/views/shared/_attribution.html.erb
@@ -1,4 +1 @@
-<div class="text-center px-2">
-  Powered by
-  <a href="<%= Docuseal::PRODUCT_URL %>" class="underline"><%= Docuseal::PRODUCT_NAME %></a> - open source documents software
-</div>
+<%= render 'shared/powered_by' %>
diff --git a/app/views/shared/_powered_by.html.erb b/app/views/shared/_powered_by.html.erb
new file mode 100644
index 00000000..58fbee58
--- /dev/null
+++ b/app/views/shared/_powered_by.html.erb
@@ -0,0 +1,4 @@
+<div class="text-center px-2">
+  Powered by
+  <a href="<%= Docuseal::PRODUCT_URL %>" class="underline"><%= Docuseal::PRODUCT_NAME %></a> - open source documents software
+</div>
diff --git a/app/views/submit_form/_submission_form.html.erb b/app/views/submit_form/_submission_form.html.erb
new file mode 100644
index 00000000..5bb1b814
--- /dev/null
+++ b/app/views/submit_form/_submission_form.html.erb
@@ -0,0 +1,3 @@
+<% data_attachments = attachments_index.values.select { |e| e.record_id == submitter.id }.to_json(only: %i[uuid], methods: %i[url filename content_type]) %>
+<% data_fields = (submitter.submission.template_fields || submitter.submission.template.fields).select { |f| f['submitter_uuid'] == submitter.uuid }.to_json %>
+<submission-form data-is-demo="<%= Docuseal.demo? %>" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.template.account_id)) %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-authenticity-token="<%= form_authenticity_token %>" data-values="<%= submitter.values.to_json %>"></submission-form>
diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb
index 8567844f..7813e0c4 100644
--- a/app/views/submit_form/show.html.erb
+++ b/app/views/submit_form/show.html.erb
@@ -33,7 +33,7 @@
 <div class="fixed bottom-0 w-full h-0 z-20">
   <div class="mx-auto" style="max-width: 1000px">
     <div class="relative md:mx-32">
-      <submission-form data-is-demo="<%= Docuseal.demo? %>" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-submitter="<%= @submitter.to_json(only: %i[uuid slug email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.template.account_id)) %>" data-attachments="<%= attachments_index.values.select { |e| e.record_id == @submitter.id }.to_json(only: %i[uuid], methods: %i[url filename content_type]) %>" data-fields="<%= (@submitter.submission.template_fields || @submitter.submission.template.fields).select { |f| f['submitter_uuid'] == @submitter.uuid }.to_json %>" data-values="<%= @submitter.values.to_json %>" data-authenticity-token="<%= form_authenticity_token %>"></submission-form>
+      <%= render 'submission_form', attachments_index:, submitter: @submitter %>
     </div>
   </div>
 </div>