From ac1f90e711e5a20d4b20ac6ff6ed76cdbf6a759d Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Mon, 26 May 2025 14:46:33 +0300
Subject: [PATCH 01/26] do not email smtp settings

---
 app/controllers/email_smtp_settings_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/email_smtp_settings_controller.rb b/app/controllers/email_smtp_settings_controller.rb
index d41ca570..766a9545 100644
--- a/app/controllers/email_smtp_settings_controller.rb
+++ b/app/controllers/email_smtp_settings_controller.rb
@@ -9,7 +9,9 @@ class EmailSmtpSettingsController < ApplicationController
 
   def create
     if @encrypted_config.update(email_configs)
-      SettingsMailer.smtp_successful_setup(@encrypted_config.value['from_email'] || current_user.email).deliver_now!
+      unless Docuseal.multitenant?
+        SettingsMailer.smtp_successful_setup(@encrypted_config.value['from_email'] || current_user.email).deliver_now!
+      end
 
       redirect_to settings_email_index_path, notice: I18n.t('changes_have_been_saved')
     else

From 5e44ba49b8eb019b37962c1b7f6e8c94082db75e Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Mon, 26 May 2025 22:26:14 +0300
Subject: [PATCH 02/26] refactor

---
 lib/templates/process_document.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/templates/process_document.rb b/lib/templates/process_document.rb
index 8ee1dff5..bba7e1e4 100644
--- a/lib/templates/process_document.rb
+++ b/lib/templates/process_document.rb
@@ -118,10 +118,10 @@ module Templates
 
       page = page.copy(interpretation: :srgb)
 
-      bitdepth = 2**page.stats.to_a[1..3].pluck(2).uniq.size
-
       data =
         if format == FORMAT
+          bitdepth = 2**page.stats.to_a[1..3].pluck(2).uniq.size
+
           page.write_to_buffer(format, compression: 7, filter: 0, bitdepth:,
                                        palette: true, Q: bitdepth == 8 ? Q : 5, dither: 0)
         else

From 9fcd8955d3c8312c871da674b5eb3932dc24e81e Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Tue, 27 May 2025 21:10:58 +0300
Subject: [PATCH 03/26] add 'field-area-active-label' theme class

---
 app/javascript/submission_form/area.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/submission_form/area.vue b/app/javascript/submission_form/area.vue
index 01819533..f7c0cc08 100644
--- a/app/javascript/submission_form/area.vue
+++ b/app/javascript/submission_form/area.vue
@@ -23,7 +23,7 @@
     </div>
     <div
       v-if="isActive && withLabel && (!area.option_uuid || !option.value)"
-      class="absolute -top-7 rounded bg-base-content text-base-100 px-2 text-sm whitespace-nowrap pointer-events-none"
+      class="absolute -top-7 rounded bg-base-content text-base-100 px-2 text-sm whitespace-nowrap pointer-events-none field-area-active-label"
     >
       <template v-if="area.option_uuid && !option.value">
         {{ optionValue(option) }}

From 1c9d15aa7e35e18a430054217b775ab26b8eb35c Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 28 May 2025 10:06:06 +0300
Subject: [PATCH 04/26] add translations for pagination

---
 app/views/shared/_pagination.html.erb |  6 +-
 config/locales/i18n.yml               | 82 ++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index 8eecc313..7676eb5f 100644
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -2,7 +2,11 @@
 <% if @pagy.pages > 1 %>
   <div class="flex my-6 justify-center md:justify-between">
     <div class="hidden md:block text-sm">
-      <%= @pagy.from %>-<%= local_assigns.fetch(:to, @pagy.to) %> of <%= local_assigns.fetch(:count, @pagy.count) %> <%= local_assigns[:items_name] || 'items' %>
+      <% if @pagy.count.nil? %>
+        <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_without_total", from: local_assigns.fetch(:from, @pagy.from), to: local_assigns.fetch(:to, @pagy.to)) %>
+      <% else %>
+        <%= t("pagination.#{local_assigns.fetch(:items_name, 'items')}.range_with_total", from: local_assigns.fetch(:from, @pagy.from), to: local_assigns.fetch(:to, @pagy.to), count: local_assigns.fetch(:count, @pagy.count)) %>
+      <% end %>
       <%= local_assigns[:left_additional_html] %>
     </div>
     <div class="flex items-center space-x-1.5">
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index d807d374..bd5ef1be 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -829,6 +829,19 @@ en: &en
     scopes:
       write: Update your data
       read: Read your data
+  pagination:
+    submissions:
+      range_with_total: "%{from}-%{to} of %{count} submissions"
+      range_without_total: "%{from}-%{to} submissions"
+    templates:
+      range_with_total: "%{from}-%{to} of %{count} templates"
+      range_without_total: "%{from}-%{to} templates"
+    users:
+      range_with_total: "%{from}-%{to} of %{count} users"
+      range_without_total: "%{from}-%{to} users"
+    items:
+      range_with_total: "%{from}-%{to} of %{count} items"
+      range_without_total: "%{from}-%{to} items"
 
 es: &es
   stripe_integration: Integración con Stripe
@@ -1641,6 +1654,19 @@ es: &es
     scopes:
       write: Actualizar tus datos
       read: Leer tus datos
+  pagination:
+    submissions:
+      range_with_total: "%{from}-%{to} de %{count} envíos"
+      range_without_total: "%{from}-%{to} envíos"
+    templates:
+      range_with_total: "%{from}-%{to} de %{count} plantillas"
+      range_without_total: "%{from}-%{to} plantillas"
+    users:
+      range_with_total: "%{from}-%{to} de %{count} usuarios"
+      range_without_total: "%{from}-%{to} usuarios"
+    items:
+      range_with_total: "%{from}-%{to} de %{count} elementos"
+      range_without_total: "%{from}-%{to} elementos"
 
 it: &it
   stripe_integration: Integrazione Stripe
@@ -2451,6 +2477,19 @@ it: &it
     scopes:
       write: Aggiorna i tuoi dati
       read: Leggi i tuoi dati
+  pagination:
+    submissions:
+      range_with_total: "%{from}-%{to} di %{count} invii"
+      range_without_total: "%{from}-%{to} invii"
+    templates:
+      range_with_total: "%{from}-%{to} di %{count} modelli"
+      range_without_total: "%{from}-%{to} modelli"
+    users:
+      range_with_total: "%{from}-%{to} di %{count} utenti"
+      range_without_total: "%{from}-%{to} utenti"
+    items:
+      range_with_total: "%{from}-%{to} di %{count} elementi"
+      range_without_total: "%{from}-%{to} elementi"
 
 fr: &fr
   stripe_integration: Intégration Stripe
@@ -3264,6 +3303,19 @@ fr: &fr
     scopes:
       write: Mettre à jour vos données
       read: Lire vos données
+  pagination:
+    submissions:
+      range_with_total: "%{from} à %{to} sur %{count} soumissions"
+      range_without_total: "%{from} à %{to} soumissions"
+    templates:
+      range_with_total: "%{from} à %{to} sur %{count} modèles"
+      range_without_total: "%{from} à %{to} modèles"
+    users:
+      range_with_total: "%{from} à %{to} sur %{count} utilisateurs"
+      range_without_total: "%{from} à %{to} utilisateurs"
+    items:
+      range_with_total: "%{from} à %{to} sur %{count} éléments"
+      range_without_total: "%{from} à %{to} éléments"
 
 pt: &pt
   stripe_integration: Integração com Stripe
@@ -4036,8 +4088,8 @@ pt: &pt
     start: Iniciar
     previous: Anterior
     next: Próximo
-    template_and_submissions: 'Modelos e Envios'
-    template_and_submissions_description: "Você pode selecionar a visualização que melhor se adapta ao seu fluxo de trabalho. Escolha a visualização 'Modelos' para criar modelos reutilizáveis de documentos ou 'Envios' para assinar documentos individuais ou verificar o status de cada solicitação de assinatura."
+    template_and_submissions: 'Modelos e Submissões'
+    template_and_submissions_description: "Você pode selecionar a visualização que melhor se adapta ao seu fluxo de trabalho. Escolha a visualização 'Modelos' para criar modelos reutilizáveis de documentos ou 'Submissões' para assinar documentos individuais ou verificar o status de cada solicitação de assinatura."
     upload_a_pdf_file: 'Enviar um arquivo PDF'
     upload_a_pdf_file_description: 'Envie um documento PDF para criar um modelo de formulário de assinatura.'
     select_a_signer_party: 'Selecionar parte assinante'
@@ -4077,6 +4129,19 @@ pt: &pt
     scopes:
       write: Atualizar seus dados
       read: Ler seus dados
+  pagination:
+    submissions:
+      range_with_total: "%{from}-%{to} de %{count} submissões"
+      range_without_total: "%{from}-%{to} submissões"
+    templates:
+      range_with_total: "%{from}-%{to} de %{count} modelos"
+      range_without_total: "%{from}-%{to} modelos"
+    users:
+      range_with_total: "%{from}-%{to} de %{count} usuários"
+      range_without_total: "%{from}-%{to} usuários"
+    items:
+      range_with_total: "%{from}-%{to} de %{count} itens"
+      range_without_total: "%{from}-%{to} itens"
 
 de: &de
   stripe_integration: Stripe-Integration
@@ -4889,6 +4954,19 @@ de: &de
     scopes:
       write: Aktualisiere deine Daten
       read: Lese deine Daten
+  pagination:
+    submissions:
+      range_with_total: "%{from}-%{to} von %{count} Einreichungen"
+      range_without_total: "%{from}-%{to} Einreichungen"
+    templates:
+      range_with_total: "%{from}-%{to} von %{count} Vorlagen"
+      range_without_total: "%{from}-%{to} Vorlagen"
+    users:
+      range_with_total: "%{from}-%{to} von %{count} Benutzern"
+      range_without_total: "%{from}-%{to} Benutzer"
+    items:
+      range_with_total: "%{from}-%{to} von %{count} Elementen"
+      range_without_total: "%{from}-%{to} Elemente"
 
 pl:
   require_phone_2fa_to_open: Wymagaj uwierzytelniania telefonicznego 2FA do otwarcia

From 2ef8df3f0c1adc475ee95422e330a4ad1f48be89 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Wed, 28 May 2025 10:23:36 +0300
Subject: [PATCH 05/26] optimize query

---
 app/models/submission.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/submission.rb b/app/models/submission.rb
index f448adcd..d5f17a2f 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -65,12 +65,18 @@ class Submission < ApplicationRecord
 
   scope :active, -> { where(archived_at: nil) }
   scope :archived, -> { where.not(archived_at: nil) }
-  scope :pending, -> { joins(:submitters).where(submitters: { completed_at: nil }).group(:id) }
+  scope :pending, lambda {
+    where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id])
+     .and(Submitter.arel_table[:completed_at].eq(nil))).select(1).arel.exists)
+  }
   scope :completed, lambda {
     where.not(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id])
      .and(Submitter.arel_table[:completed_at].eq(nil))).select(1).arel.exists)
   }
-  scope :declined, -> { joins(:submitters).where.not(submitters: { declined_at: nil }).group(:id) }
+  scope :declined, lambda {
+    where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id])
+     .and(Submitter.arel_table[:declined_at].not_eq(nil))).select(1).arel.exists)
+  }
   scope :expired, -> { pending.where(expire_at: ..Time.current) }
 
   enum :source, {

From 43669bf0956ca1822c15db90d1c2548356baf1fe Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Wed, 28 May 2025 21:41:32 +0300
Subject: [PATCH 06/26] do not prefill optional signature

---
 app/javascript/submission_form/initials_step.vue  | 2 +-
 app/javascript/submission_form/signature_step.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/submission_form/initials_step.vue b/app/javascript/submission_form/initials_step.vue
index 07ac951c..531b9784 100644
--- a/app/javascript/submission_form/initials_step.vue
+++ b/app/javascript/submission_form/initials_step.vue
@@ -211,7 +211,7 @@ export default {
   },
   computed: {
     computedPreviousValue () {
-      if (this.isUsePreviousValue) {
+      if (this.isUsePreviousValue && this.field.required === true) {
         return this.previousValue
       } else {
         return null
diff --git a/app/javascript/submission_form/signature_step.vue b/app/javascript/submission_form/signature_step.vue
index e12784fa..146cf791 100644
--- a/app/javascript/submission_form/signature_step.vue
+++ b/app/javascript/submission_form/signature_step.vue
@@ -414,7 +414,7 @@ export default {
       }
     },
     computedPreviousValue () {
-      if (this.isUsePreviousValue) {
+      if (this.isUsePreviousValue && this.field.required === true) {
         return this.previousValue
       } else {
         return null

From 8b9678a4347520c5b7f9bd1c8727980f3d2e092a Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Wed, 28 May 2025 23:01:34 +0300
Subject: [PATCH 07/26] fix heif

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 932d8b13..a5a8f855 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,7 @@ ENV OPENSSL_CONF=/app/openssl_legacy.cnf
 
 WORKDIR /app
 
-RUN echo '@edge https://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev@edge redis libheif@edge vips-heif gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
+RUN echo '@edge https://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev@edge redis libheif@edge vips-heif@edge gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
 
 RUN echo $'.include = /etc/ssl/openssl.cnf\n\
 \n\

From fa0733f480b658f163acde1512c34fdb3f557e5e Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 28 May 2025 19:11:39 +0300
Subject: [PATCH 08/26] improve user email validation

---
 app/models/user.rb                   |  2 ++
 spec/system/profile_settings_spec.rb |  8 ++++++++
 spec/system/setup_spec.rb            | 10 ++++++++++
 spec/system/team_settings_spec.rb    | 17 +++++++++++++++++
 4 files changed, 37 insertions(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index e8e5f879..f840ca7d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -73,6 +73,8 @@ class User < ApplicationRecord
   scope :archived, -> { where.not(archived_at: nil) }
   scope :admins, -> { where(role: ADMIN_ROLE) }
 
+  validates :email, format: { with: /\A[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\z/ }
+
   def access_token
     super || build_access_token.tap(&:save!)
   end
diff --git a/spec/system/profile_settings_spec.rb b/spec/system/profile_settings_spec.rb
index 7b977d2d..3c05a664 100644
--- a/spec/system/profile_settings_spec.rb
+++ b/spec/system/profile_settings_spec.rb
@@ -33,6 +33,14 @@ RSpec.describe 'Profile Settings' do
       expect(user.last_name).to eq('Beckham')
       expect(user.email).to eq('david.beckham@example.com')
     end
+
+    it 'does not update if email is invalid' do
+      fill_in 'Email', with: 'devid+test@example'
+
+      all(:button, 'Update')[0].click
+
+      expect(page).to have_content('Email is invalid')
+    end
   end
 
   context 'when changes password' do
diff --git a/spec/system/setup_spec.rb b/spec/system/setup_spec.rb
index 5235c9b5..da4a37da 100644
--- a/spec/system/setup_spec.rb
+++ b/spec/system/setup_spec.rb
@@ -51,6 +51,16 @@ RSpec.describe 'App Setup' do
   end
 
   context 'when invalid information' do
+    it 'does not setup the app if the email is invalid' do
+      fill_setup_form(form_data.merge(email: 'bob@example-com'))
+
+      expect do
+        click_button 'Submit'
+      end.not_to(change(User, :count))
+
+      expect(page).to have_content('Email is invalid')
+    end
+
     it 'does not setup the app if the password is too short' do
       fill_setup_form(form_data.merge(password: 'pass'))
 
diff --git a/spec/system/team_settings_spec.rb b/spec/system/team_settings_spec.rb
index 0286267f..01ce568f 100644
--- a/spec/system/team_settings_spec.rb
+++ b/spec/system/team_settings_spec.rb
@@ -92,6 +92,23 @@ RSpec.describe 'Team Settings' do
       end
     end
 
+    it 'does not allow to create a new user with an invalid email' do
+      click_link 'New User'
+
+      within '#modal' do
+        fill_in 'First name', with: 'Joseph'
+        fill_in 'Last name', with: 'Smith'
+        fill_in 'Email', with: 'joseph.smith@gmail'
+        fill_in 'Password', with: 'password'
+
+        expect do
+          click_button 'Submit'
+        end.not_to change(User, :count)
+
+        expect(page).to have_content('Email is invalid')
+      end
+    end
+
     it 'updates a user' do
       first(:link, 'Edit').click
 

From 260bd6d5d5d3bb8b2ecfbd673880d8531b940976 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 29 May 2025 17:11:49 +0300
Subject: [PATCH 09/26] fix signature field size

---
 app/javascript/submission_form/area.vue | 6 +++---
 app/views/submissions/_value.html.erb   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/submission_form/area.vue b/app/javascript/submission_form/area.vue
index f7c0cc08..caaa2f5c 100644
--- a/app/javascript/submission_form/area.vue
+++ b/app/javascript/submission_form/area.vue
@@ -55,12 +55,12 @@
     >
     <div
       v-else-if="field.type === 'signature' && signature"
-      class="flex justify-between h-full gap-1 overflow-hidden"
-      :class="isNarrow ? 'flex-row' : 'flex-col'"
+      class="flex justify-between h-full gap-1 overflow-hidden w-full"
+      :class="isNarrow && withSignatureId ? 'flex-row' : 'flex-col'"
     >
       <div
         class="flex overflow-hidden"
-        :class="isNarrow ? 'w-1/2' : 'flex-grow'"
+        :class="isNarrow && withSignatureId ? 'w-1/2' : 'flex-grow'"
         style="min-height: 50%"
       >
         <img
diff --git a/app/views/submissions/_value.html.erb b/app/views/submissions/_value.html.erb
index 852711fa..c1a727b7 100644
--- a/app/views/submissions/_value.html.erb
+++ b/app/views/submissions/_value.html.erb
@@ -6,8 +6,8 @@
 <field-value dir="auto" class="flex absolute text-[1.6vw] lg:text-base <%= 'font-mono' if font == 'Courier' %> <%= 'font-serif' if font == 'Times' %> <%= 'font-bold' if font_type == 'bold' || font_type == 'bold_italic' %> <%= 'italic' if font_type == 'italic' || font_type == 'bold_italic' %> <%= align == 'right' ? 'text-right' : (align == 'center' ? 'text-center' : '') %>" style="<%= "color: #{color}; " if color.present? %>width: <%= area['w'] * 100 %>%; height: <%= area['h'] * 100 %>%; left: <%= area['x'] * 100 %>%; top: <%= area['y'] * 100 %>%; <%= "font-size: clamp(4pt, 1.6vw, #{field['preferences']['font_size'].to_i * 1.23}pt); line-height: `clamp(6pt, 2.0vw, #{(field['preferences']['font_size'].to_i * 1.23) + 3}pt)`" if field.dig('preferences', 'font_size') %>">
   <% if field['type'] == 'signature' %>
     <% is_narrow = area['h']&.positive? && (area['w'].to_f / area['h']) > 6 %>
-    <div class="flex justify-between w-full h-full gap-1 <%= is_narrow ? 'flex-row' : 'flex-col' %>">
-      <div class="flex overflow-hidden <%= is_narrow ? 'w-1/2' : 'flex-grow' %>" style="min-height: 50%">
+    <div class="flex justify-between w-full h-full gap-1 <%= is_narrow && local_assigns[:with_signature_id] ? 'flex-row' : 'flex-col' %>">
+      <div class="flex overflow-hidden <%= is_narrow && local_assigns[:with_signature_id] ? 'w-1/2' : 'flex-grow' %>" style="min-height: 50%">
         <img class="object-contain mx-auto" src="<%= attachments_index[value].url %>">
       </div>
       <% if local_assigns[:with_signature_id] && attachment = attachments_index[value] %>

From 5670390b3708efc29b11a1948d91de9545010878 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 29 May 2025 17:31:09 +0300
Subject: [PATCH 10/26] fix signature reason

---
 app/javascript/submission_form/area.vue | 6 +++---
 app/views/submissions/_value.html.erb   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/javascript/submission_form/area.vue b/app/javascript/submission_form/area.vue
index caaa2f5c..5aed2a7a 100644
--- a/app/javascript/submission_form/area.vue
+++ b/app/javascript/submission_form/area.vue
@@ -56,11 +56,11 @@
     <div
       v-else-if="field.type === 'signature' && signature"
       class="flex justify-between h-full gap-1 overflow-hidden w-full"
-      :class="isNarrow && withSignatureId ? 'flex-row' : 'flex-col'"
+      :class="isNarrow && (withSignatureId || field.preferences?.reason_field_uuid) ? 'flex-row' : 'flex-col'"
     >
       <div
         class="flex overflow-hidden"
-        :class="isNarrow && withSignatureId ? 'w-1/2' : 'flex-grow'"
+        :class="isNarrow && (withSignatureId || field.preferences?.reason_field_uuid) ? 'w-1/2' : 'flex-grow'"
         style="min-height: 50%"
       >
         <img
@@ -69,7 +69,7 @@
         >
       </div>
       <div
-        v-if="withSignatureId"
+        v-if="withSignatureId || field.preferences?.reason_field_uuid"
         class="text-[1vw] lg:text-[0.55rem] lg:leading-[0.65rem]"
         :class="isNarrow ? 'w-1/2' : 'w-full'"
       >
diff --git a/app/views/submissions/_value.html.erb b/app/views/submissions/_value.html.erb
index c1a727b7..546ce26f 100644
--- a/app/views/submissions/_value.html.erb
+++ b/app/views/submissions/_value.html.erb
@@ -6,11 +6,11 @@
 <field-value dir="auto" class="flex absolute text-[1.6vw] lg:text-base <%= 'font-mono' if font == 'Courier' %> <%= 'font-serif' if font == 'Times' %> <%= 'font-bold' if font_type == 'bold' || font_type == 'bold_italic' %> <%= 'italic' if font_type == 'italic' || font_type == 'bold_italic' %> <%= align == 'right' ? 'text-right' : (align == 'center' ? 'text-center' : '') %>" style="<%= "color: #{color}; " if color.present? %>width: <%= area['w'] * 100 %>%; height: <%= area['h'] * 100 %>%; left: <%= area['x'] * 100 %>%; top: <%= area['y'] * 100 %>%; <%= "font-size: clamp(4pt, 1.6vw, #{field['preferences']['font_size'].to_i * 1.23}pt); line-height: `clamp(6pt, 2.0vw, #{(field['preferences']['font_size'].to_i * 1.23) + 3}pt)`" if field.dig('preferences', 'font_size') %>">
   <% if field['type'] == 'signature' %>
     <% is_narrow = area['h']&.positive? && (area['w'].to_f / area['h']) > 6 %>
-    <div class="flex justify-between w-full h-full gap-1 <%= is_narrow && local_assigns[:with_signature_id] ? 'flex-row' : 'flex-col' %>">
-      <div class="flex overflow-hidden <%= is_narrow && local_assigns[:with_signature_id] ? 'w-1/2' : 'flex-grow' %>" style="min-height: 50%">
+    <div class="flex justify-between w-full h-full gap-1 <%= is_narrow && (local_assigns[:with_signature_id] || field.dig('preferences', 'reason_field_uuid').present?) ? 'flex-row' : 'flex-col' %>">
+      <div class="flex overflow-hidden <%= is_narrow && (local_assigns[:with_signature_id] || field.dig('preferences', 'reason_field_uuid').present?) ? 'w-1/2' : 'flex-grow' %>" style="min-height: 50%">
         <img class="object-contain mx-auto" src="<%= attachments_index[value].url %>">
       </div>
-      <% if local_assigns[:with_signature_id] && attachment = attachments_index[value] %>
+      <% if (local_assigns[:with_signature_id] || field.dig('preferences', 'reason_field_uuid').present?) && attachment = attachments_index[value] %>
         <div class="text-[1vw] lg:text-[0.55rem] lg:leading-[0.65rem] <%= is_narrow ? 'w-1/2' : 'w-full' %>">
           <div class="truncate uppercase">
             ID: <%= attachment.uuid %>

From 9645332e48ce3ea2569d4f0ba5c4d2bf89927518 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Wed, 28 May 2025 22:48:15 +0300
Subject: [PATCH 11/26] add countless pagination

---
 app/controllers/application_controller.rb     |  8 ++++++
 .../submissions_archived_controller.rb        |  2 +-
 .../submissions_dashboard_controller.rb       |  2 +-
 .../template_folders_controller.rb            |  2 +-
 .../templates_archived_controller.rb          |  2 +-
 ...mplates_archived_submissions_controller.rb |  2 +-
 app/controllers/templates_controller.rb       |  2 +-
 .../templates_dashboard_controller.rb         |  4 +--
 app/views/submissions_archived/index.html.erb |  2 +-
 .../submissions_dashboard/index.html.erb      |  6 ++---
 app/views/template_folders/show.html.erb      |  4 +--
 app/views/templates/show.html.erb             | 26 ++++++++++++-------
 app/views/templates_archived/index.html.erb   |  2 +-
 .../index.html.erb                            |  2 +-
 app/views/templates_dashboard/index.html.erb  |  8 +++---
 config/initializers/pagy.rb                   |  2 ++
 config/locales/i18n.yml                       | 18 +++++++++++++
 17 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a3cb0242..7500acdb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -55,6 +55,14 @@ class ApplicationController < ActionController::Base
     request.session[:impersonated_user_id] = user.uuid
   end
 
+  def pagy_auto(collection, **keyword_args)
+    if current_ability.can?(:manage, :countless)
+      pagy_countless(collection, **keyword_args)
+    else
+      pagy(collection, **keyword_args)
+    end
+  end
+
   private
 
   def with_locale(&)
diff --git a/app/controllers/submissions_archived_controller.rb b/app/controllers/submissions_archived_controller.rb
index f71638c7..3ad5d936 100644
--- a/app/controllers/submissions_archived_controller.rb
+++ b/app/controllers/submissions_archived_controller.rb
@@ -18,6 +18,6 @@ class SubmissionsArchivedController < ApplicationController
                      @submissions.order(id: :desc)
                    end
 
-    @pagy, @submissions = pagy(@submissions.preload(submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy_auto(@submissions.preload(submitters: :start_form_submission_events))
   end
 end
diff --git a/app/controllers/submissions_dashboard_controller.rb b/app/controllers/submissions_dashboard_controller.rb
index 3386edd8..55fb6ae0 100644
--- a/app/controllers/submissions_dashboard_controller.rb
+++ b/app/controllers/submissions_dashboard_controller.rb
@@ -19,6 +19,6 @@ class SubmissionsDashboardController < ApplicationController
                      @submissions.order(id: :desc)
                    end
 
-    @pagy, @submissions = pagy(@submissions.preload(submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy_auto(@submissions.preload(submitters: :start_form_submission_events))
   end
 end
diff --git a/app/controllers/template_folders_controller.rb b/app/controllers/template_folders_controller.rb
index e5cb2bbf..c22f2fed 100644
--- a/app/controllers/template_folders_controller.rb
+++ b/app/controllers/template_folders_controller.rb
@@ -9,7 +9,7 @@ class TemplateFoldersController < ApplicationController
     @templates = Templates.search(@templates, params[:q])
     @templates = Templates::Order.call(@templates, current_user, cookies.permanent[:dashboard_templates_order])
 
-    @pagy, @templates = pagy(@templates, limit: 12)
+    @pagy, @templates = pagy_auto(@templates, limit: 12)
   end
 
   def edit; end
diff --git a/app/controllers/templates_archived_controller.rb b/app/controllers/templates_archived_controller.rb
index f75e83a1..f52e5af7 100644
--- a/app/controllers/templates_archived_controller.rb
+++ b/app/controllers/templates_archived_controller.rb
@@ -7,6 +7,6 @@ class TemplatesArchivedController < ApplicationController
     @templates = @templates.where.not(archived_at: nil).preload(:author, :folder, :template_accesses).order(id: :desc)
     @templates = Templates.search(@templates, params[:q])
 
-    @pagy, @templates = pagy(@templates, limit: 12)
+    @pagy, @templates = pagy_auto(@templates, limit: 12)
   end
 end
diff --git a/app/controllers/templates_archived_submissions_controller.rb b/app/controllers/templates_archived_submissions_controller.rb
index bf023677..9c9da083 100644
--- a/app/controllers/templates_archived_submissions_controller.rb
+++ b/app/controllers/templates_archived_submissions_controller.rb
@@ -15,7 +15,7 @@ class TemplatesArchivedSubmissionsController < ApplicationController
                      @submissions.order(id: :desc)
                    end
 
-    @pagy, @submissions = pagy(@submissions.preload(submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy_auto(@submissions.preload(submitters: :start_form_submission_events))
   rescue ActiveRecord::RecordNotFound
     redirect_to root_path
   end
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
index 6eb91ed8..b3d0ccec 100644
--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@@ -21,7 +21,7 @@ class TemplatesController < ApplicationController
                     submissions.order(id: :desc)
                   end
 
-    @pagy, @submissions = pagy(submissions.preload(:template_accesses, submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy_auto(submissions.preload(:template_accesses, submitters: :start_form_submission_events))
   rescue ActiveRecord::RecordNotFound
     redirect_to root_path
   end
diff --git a/app/controllers/templates_dashboard_controller.rb b/app/controllers/templates_dashboard_controller.rb
index 319b0297..b4806fbc 100644
--- a/app/controllers/templates_dashboard_controller.rb
+++ b/app/controllers/templates_dashboard_controller.rb
@@ -17,7 +17,7 @@ class TemplatesDashboardController < ApplicationController
 
     @pagy, @template_folders = pagy(
       @template_folders,
-      items: FOLDERS_PER_PAGE,
+      limit: FOLDERS_PER_PAGE,
       page: @template_folders.count > SHOW_TEMPLATES_FOLDERS_THRESHOLD ? params[:page] : 1
     )
 
@@ -35,7 +35,7 @@ class TemplatesDashboardController < ApplicationController
           (@template_folders.size < 7 ? 9 : 6)
         end
 
-      @pagy, @templates = pagy(@templates, limit:)
+      @pagy, @templates = pagy_auto(@templates, limit:)
     end
   end
 
diff --git a/app/views/submissions_archived/index.html.erb b/app/views/submissions_archived/index.html.erb
index 8a5216c1..cad51398 100644
--- a/app/views/submissions_archived/index.html.erb
+++ b/app/views/submissions_archived/index.html.erb
@@ -21,7 +21,7 @@
     <%= render 'submissions_filters/filter_button', filter_params: %>
   </div>
 </div>
-<% if @pagy.count > 0 %>
+<% if @pagy.count.nil? || @pagy.count > 0 %>
   <div class="space-y-4">
     <%= render partial: 'templates/submission', collection: @submissions, locals: { with_template: true, archived: true } %>
   </div>
diff --git a/app/views/submissions_dashboard/index.html.erb b/app/views/submissions_dashboard/index.html.erb
index e09732ff..2ba16b18 100644
--- a/app/views/submissions_dashboard/index.html.erb
+++ b/app/views/submissions_dashboard/index.html.erb
@@ -1,5 +1,5 @@
 <% filter_params = params.permit(Submissions::Filter::ALLOWED_PARAMS).compact_blank %>
-<% is_show_tabs = @pagy.count >= 5 || params[:status].present? || filter_params.present? %>
+<% is_show_tabs = (@pagy.count.nil? || @pagy.count >= 5) || params[:status].present? || filter_params.present? %>
 <% if Docuseal.demo? %><%= render 'shared/demo_alert' %><% end %>
 <div class="flex justify-between items-center w-full mb-4">
   <div class="flex items-center flex-grow min-w-0">
@@ -61,12 +61,12 @@
     </div>
   </div>
 <% end %>
-<% if @pagy.count > 0 %>
+<% if @pagy.count.nil? || @pagy.count > 0 %>
   <div class="space-y-4">
     <%= render partial: 'templates/submission', collection: @submissions, locals: { with_template: true } %>
   </div>
 <% end %>
-<% if params[:q].blank? && params[:status].blank? && filter_params.blank? && @pagy.count < 5 %>
+<% if params[:q].blank? && params[:status].blank? && filter_params.blank? && @pagy.count.present? && @pagy.count < 5 %>
   <%= render 'templates/dropzone' %>
 <% end %>
 <% if @submissions.present? || (params[:q].blank? && filter_params.blank?) %>
diff --git a/app/views/template_folders/show.html.erb b/app/views/template_folders/show.html.erb
index e99a5888..3d7387a5 100644
--- a/app/views/template_folders/show.html.erb
+++ b/app/views/template_folders/show.html.erb
@@ -39,13 +39,13 @@
       <% end %>
     </div>
   </div>
-  <% if @pagy.count > 0 %>
+  <% if @pagy.count.nil? || @pagy.count > 0 %>
     <div class="grid gap-4 md:grid-cols-3">
       <%= render partial: 'templates/template', collection: @templates %>
     </div>
     <% templates_order_select_html = capture do %>
       <% if params[:q].blank? && @pagy.pages > 1 %>
-        <%= render('shared/templates_order_select', with_recently_used: @pagy.count < 10_000) %>
+        <%= render('shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000) %>
       <% end %>
     <% end %>
     <%= render 'shared/pagination', pagy: @pagy, items_name: 'templates', right_additional_html: templates_order_select_html %>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index 083feab6..a7de5760 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -1,7 +1,7 @@
 <%= render 'title', template: @template %>
 <% filter_params = params.permit(Submissions::Filter::ALLOWED_PARAMS).compact_blank %>
 <% is_show_tabs = @pagy.pages > 1 || params[:q].present? || params[:status].present? || filter_params.present? %>
-<% if !@pagy.count.zero? || params[:q].present? || params[:status].present? || filter_params.present? %>
+<% if @pagy.count.nil? || !@pagy.count.zero? || params[:q].present? || params[:status].present? || filter_params.present? %>
   <div class="<%= is_show_tabs ? 'mb-4' : 'mb-6' %>">
     <div class="flex justify-between items-center md:items-end">
       <div>
@@ -35,27 +35,33 @@
           <%= svg_icon('list', class: 'w-5 h-5') %>
           <span class="font-normal"><%= t('all') %></span>
         </div>
-        <div class="badge badge-neutral badge-outline font-medium">
-          <%= params[:status].blank? && filter_params.blank? ? @pagy.count : @base_submissions.unscope(:group, :order).select(:id).distinct.count %>
-        </div>
+        <% unless can?(:manage, :countless) %>
+          <div class="badge badge-neutral badge-outline font-medium">
+            <%= params[:status].blank? && filter_params.blank? ? @pagy.count : @base_submissions.unscope(:group, :order).select(:id).distinct.count %>
+          </div>
+        <% end %>
       </a>
       <a href="<%= url_for(params.to_unsafe_h.merge(status: :pending)) %>" class="<%= params[:status] == 'pending' ? 'border-neutral-700' : 'border-neutral-300' %> flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-48 hover:border-neutral-700">
         <div class="flex items-center space-x-1">
           <%= svg_icon('clock', class: 'w-5 h-5') %>
           <span class="font-normal"><%= t('pending') %></span>
         </div>
-        <div class="badge badge-neutral badge-outline font-medium">
-          <%= params[:status] == 'pending' && filter_params.blank? ? @pagy.count : @base_submissions.pending.unscope(:group, :order).select(:id).distinct.count %>
-        </div>
+        <% unless can?(:manage, :countless) %>
+          <div class="badge badge-neutral badge-outline font-medium">
+            <%= params[:status] == 'pending' && filter_params.blank? ? @pagy.count : @base_submissions.pending.unscope(:group, :order).select(:id).distinct.count %>
+          </div>
+        <% end %>
       </a>
       <a href="<%= url_for(params.to_unsafe_h.merge(status: :completed)) %>" class="<%= params[:status] == 'completed' ? 'border-neutral-700' : 'border-neutral-300' %> flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-48 hover:border-neutral-700">
         <div class="flex items-center space-x-1">
           <%= svg_icon('circle_check', class: 'w-5 h-5') %>
           <span class="font-normal"><%= t('completed') %></span>
         </div>
-        <div class="badge badge-neutral badge-outline font-medium">
-          <%= params[:status] == 'completed' && filter_params.blank? ? @pagy.count : @base_submissions.completed.unscope(:group, :order).select(:id).distinct.count %>
-        </div>
+        <% unless can?(:manage, :countless) %>
+          <div class="badge badge-neutral badge-outline font-medium">
+            <%= params[:status] == 'completed' && filter_params.blank? ? @pagy.count : @base_submissions.completed.unscope(:group, :order).select(:id).distinct.count %>
+          </div>
+        <% end %>
       </a>
     </div>
     <div class="flex items-end flex-col md:flex-row gap-2 w-full md:w-fit">
diff --git a/app/views/templates_archived/index.html.erb b/app/views/templates_archived/index.html.erb
index c90ef0fb..f126f10b 100644
--- a/app/views/templates_archived/index.html.erb
+++ b/app/views/templates_archived/index.html.erb
@@ -12,7 +12,7 @@
     <%= render 'shared/search_input', placeholder: "#{t('search')}..." %>
   <% end %>
 </div>
-<% if @pagy.count > 0 %>
+<% if @pagy.count.nil? || @pagy.count > 0 %>
   <div class="grid gap-4 md:grid-cols-3">
     <%= render partial: 'templates/template', collection: @templates %>
   </div>
diff --git a/app/views/templates_archived_submissions/index.html.erb b/app/views/templates_archived_submissions/index.html.erb
index eac39e1e..0536d8a9 100644
--- a/app/views/templates_archived_submissions/index.html.erb
+++ b/app/views/templates_archived_submissions/index.html.erb
@@ -29,7 +29,7 @@
     </div>
   <% end %>
 </div>
-<% if @pagy.count > 0 %>
+<% if @pagy.count.nil? || @pagy.count > 0 %>
   <div class="space-y-4">
     <%= render partial: 'templates/submission', collection: @submissions, locals: { template: @template, archived: true } %>
   </div>
diff --git a/app/views/templates_dashboard/index.html.erb b/app/views/templates_dashboard/index.html.erb
index bcd85b01..99f4d80e 100644
--- a/app/views/templates_dashboard/index.html.erb
+++ b/app/views/templates_dashboard/index.html.erb
@@ -12,7 +12,7 @@
       <%= render 'templates/dashboard_dropzone', style: 'height: 114px' %>
     <% end %>
     <div class="flex items-center flex-grow min-w-0">
-      <% if has_archived || @pagy.count > 0 || @template_folders.present? %>
+      <% if has_archived || @pagy.count.nil? || @pagy.count > 0 || @template_folders.present? %>
         <div class="mr-2">
           <%= render 'dashboard/toggle_view', selected: 'templates' %>
         </div>
@@ -45,7 +45,7 @@
   <% end %>
   <% templates_order_select_html = capture do %>
     <% if params[:q].blank? && @pagy.pages > 1 %>
-      <%= render('shared/templates_order_select', with_recently_used: @pagy.count < 10_000) %>
+      <%= render('shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000) %>
     <% end %>
   <% end %>
   <% if @template_folders.present? %>
@@ -84,9 +84,9 @@
 <% if show_dropzone %>
   <%= render 'templates/dropzone' %>
 <% end %>
-<% if @templates.present? || params[:q].blank? %>
+<% if @templates.present? || @template_folders.present? || params[:q].blank? %>
   <% if @pagy.pages > 1 %>
-    <%= render 'shared/pagination', pagy: @pagy, items_name: 'templates', left_additional_html: view_archived_html, right_additional_html: templates_order_select_html %>
+    <%= render 'shared/pagination', pagy: @pagy, items_name: @templates.present? ? 'templates' : 'template_folders', left_additional_html: view_archived_html, right_additional_html: templates_order_select_html %>
   <% else %>
     <div class="mt-2">
       <%= view_archived_html %>
diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb
index dc79235a..45c364e8 100644
--- a/config/initializers/pagy.rb
+++ b/config/initializers/pagy.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pagy/extras/countless'
+
 Pagy::DEFAULT[:limit] = 10
 Pagy::DEFAULT.freeze
 
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index bd5ef1be..1d4ae3d8 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -836,6 +836,9 @@ en: &en
     templates:
       range_with_total: "%{from}-%{to} of %{count} templates"
       range_without_total: "%{from}-%{to} templates"
+    template_folders:
+      range_with_total: "%{from}-%{to} of %{count} folders"
+      range_without_total: "%{from}-%{to} folders"
     users:
       range_with_total: "%{from}-%{to} of %{count} users"
       range_without_total: "%{from}-%{to} users"
@@ -1661,6 +1664,9 @@ es: &es
     templates:
       range_with_total: "%{from}-%{to} de %{count} plantillas"
       range_without_total: "%{from}-%{to} plantillas"
+    template_folders:
+      range_with_total: "%{from}-%{to} de %{count} carpetas"
+      range_without_total: "%{from}-%{to} carpetas"
     users:
       range_with_total: "%{from}-%{to} de %{count} usuarios"
       range_without_total: "%{from}-%{to} usuarios"
@@ -2484,6 +2490,9 @@ it: &it
     templates:
       range_with_total: "%{from}-%{to} di %{count} modelli"
       range_without_total: "%{from}-%{to} modelli"
+    template_folders:
+      range_with_total: "%{from}-%{to} di %{count} cartelle"
+      range_without_total: "%{from}-%{to} cartelle"
     users:
       range_with_total: "%{from}-%{to} di %{count} utenti"
       range_without_total: "%{from}-%{to} utenti"
@@ -3310,6 +3319,9 @@ fr: &fr
     templates:
       range_with_total: "%{from} à %{to} sur %{count} modèles"
       range_without_total: "%{from} à %{to} modèles"
+    template_folders:
+      range_with_total: "%{from} à %{to} sur %{count} dossiers"
+      range_without_total: "%{from} à %{to} dossiers"
     users:
       range_with_total: "%{from} à %{to} sur %{count} utilisateurs"
       range_without_total: "%{from} à %{to} utilisateurs"
@@ -4136,6 +4148,9 @@ pt: &pt
     templates:
       range_with_total: "%{from}-%{to} de %{count} modelos"
       range_without_total: "%{from}-%{to} modelos"
+    template_folders:
+      range_with_total: "%{from}-%{to} de %{count} pastas"
+      range_without_total: "%{from}-%{to} pastas"
     users:
       range_with_total: "%{from}-%{to} de %{count} usuários"
       range_without_total: "%{from}-%{to} usuários"
@@ -4961,6 +4976,9 @@ de: &de
     templates:
       range_with_total: "%{from}-%{to} von %{count} Vorlagen"
       range_without_total: "%{from}-%{to} Vorlagen"
+    template_folders:
+      range_with_total: "%{from}-%{to} von %{count} Ordnern"
+      range_without_total: "%{from}-%{to} Ordner"
     users:
       range_with_total: "%{from}-%{to} von %{count} Benutzern"
       range_without_total: "%{from}-%{to} Benutzer"

From 3b894f528130919e14df77d7669f78aea70f6ddc Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 30 May 2025 10:36:08 +0300
Subject: [PATCH 12/26] fix

---
 lib/templates/process_document.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/templates/process_document.rb b/lib/templates/process_document.rb
index bba7e1e4..1a5e5ae1 100644
--- a/lib/templates/process_document.rb
+++ b/lib/templates/process_document.rb
@@ -138,6 +138,8 @@ module Templates
       blob
     rescue Vips::Error, Pdfium::PdfiumError => e
       Rollbar.warning(e) if defined?(Rollbar)
+
+      nil
     ensure
       doc_page&.close
     end

From f7dfc0b2edca72c0036c1e3c4ec353d379ad3d4c Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 30 May 2025 11:12:33 +0300
Subject: [PATCH 13/26] add email event date index

---
 app/models/email_event.rb                                | 8 ++++----
 db/migrate/20250530080846_add_email_events_date_index.rb | 8 ++++++++
 db/schema.rb                                             | 4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20250530080846_add_email_events_date_index.rb

diff --git a/app/models/email_event.rb b/app/models/email_event.rb
index 87682875..bc853a3d 100644
--- a/app/models/email_event.rb
+++ b/app/models/email_event.rb
@@ -18,10 +18,10 @@
 #
 # Indexes
 #
-#  index_email_events_on_account_id  (account_id)
-#  index_email_events_on_email       (email)
-#  index_email_events_on_emailable   (emailable_type,emailable_id)
-#  index_email_events_on_message_id  (message_id)
+#  index_email_events_on_account_id_and_event_datetime  (account_id,event_datetime)
+#  index_email_events_on_email                          (email)
+#  index_email_events_on_emailable                      (emailable_type,emailable_id)
+#  index_email_events_on_message_id                     (message_id)
 #
 # Foreign Keys
 #
diff --git a/db/migrate/20250530080846_add_email_events_date_index.rb b/db/migrate/20250530080846_add_email_events_date_index.rb
new file mode 100644
index 00000000..25a0d643
--- /dev/null
+++ b/db/migrate/20250530080846_add_email_events_date_index.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddEmailEventsDateIndex < ActiveRecord::Migration[8.0]
+  def change
+    remove_index :email_events, :account_id
+    add_index :email_events, %i[account_id event_datetime]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 887938d0..28f1a524 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_05_18_070555) do
+ActiveRecord::Schema[8.0].define(version: 2025_05_30_080846) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -174,7 +174,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_05_18_070555) do
     t.text "data", null: false
     t.datetime "event_datetime", null: false
     t.datetime "created_at", null: false
-    t.index ["account_id"], name: "index_email_events_on_account_id"
+    t.index ["account_id", "event_datetime"], name: "index_email_events_on_account_id_and_event_datetime"
     t.index ["email"], name: "index_email_events_on_email"
     t.index ["emailable_type", "emailable_id"], name: "index_email_events_on_emailable"
     t.index ["message_id"], name: "index_email_events_on_message_id"

From 2a031c14c8d1c099c90fecfe7e339c5b69fad14c Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Fri, 30 May 2025 16:58:20 +0300
Subject: [PATCH 14/26] fix js error

---
 app/javascript/submission_form/text_step.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/submission_form/text_step.vue b/app/javascript/submission_form/text_step.vue
index 7cfbd6f0..e6560c72 100644
--- a/app/javascript/submission_form/text_step.vue
+++ b/app/javascript/submission_form/text_step.vue
@@ -151,8 +151,10 @@ export default {
     resizeTextarea () {
       const textarea = this.$refs.textarea
 
-      textarea.style.height = 'auto'
-      textarea.style.height = Math.min(250, textarea.scrollHeight) + 'px'
+      if (textarea) {
+        textarea.style.height = 'auto'
+        textarea.style.height = Math.min(250, textarea.scrollHeight) + 'px'
+      }
     },
     toggleTextArea () {
       this.isTextArea = true

From c91b4a765b9c669904087f9c95d26a4707fece4e Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Fri, 30 May 2025 13:56:29 +0300
Subject: [PATCH 15/26] add Privacy Policy and eSignature Disclosure links

---
 app/controllers/start_form_controller.rb |  2 ++
 app/views/shared/_attribution.html.erb   |  5 +++++
 config/locales/i18n.yml                  | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb
index c79535ec..28a77f86 100644
--- a/app/controllers/start_form_controller.rb
+++ b/app/controllers/start_form_controller.rb
@@ -17,6 +17,8 @@ class StartFormController < ApplicationController
                           .submitters.new(account_id: @template.account_id,
                                           uuid: (filter_undefined_submitters(@template).first ||
                                                  @template.submitters.first)['uuid'])
+
+    @form_configs = Submitters::FormConfigs.call(@submitter) unless Docuseal.multitenant?
   end
 
   def update
diff --git a/app/views/shared/_attribution.html.erb b/app/views/shared/_attribution.html.erb
index bc464bba..fb095303 100644
--- a/app/views/shared/_attribution.html.erb
+++ b/app/views/shared/_attribution.html.erb
@@ -1 +1,6 @@
 <%= render 'shared/powered_by', with_counter: local_assigns[:with_counter], link_path: local_assigns[:link_path] %>
+<% if @form_configs && @form_configs[:policy_links].present? %>
+  <div class="max-w-md mx-auto flex flex-wrap gap-1 justify-center text-sm text-base-content/60 mt-2">
+    <%= auto_link(MarkdownToHtml.call(@form_configs[:policy_links])) %>
+  </div>
+<% end %>
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 1d4ae3d8..5dd85c32 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -745,6 +745,7 @@ en: &en
   three_months: 3 months
   eu_data_residency: EU data residency
   please_enter_your_email_address_associated_with_the_completed_submission: Please enter your email address associated with the completed submission.
+  esignature_disclosure: eSignature Disclosure
   submission_sources:
     api: API
     bulk: Bulk Send
@@ -1573,6 +1574,7 @@ es: &es
   three_months: 3 meses
   eu_data_residency: Datos alojados UE
   please_enter_your_email_address_associated_with_the_completed_submission: Por favor, introduce tu dirección de correo electrónico asociada con el envío completado.
+  esignature_disclosure: Uso de firma electrónica
   submission_sources:
     api: API
     bulk: Envío masivo
@@ -2399,6 +2401,7 @@ it: &it
   three_months: 3 mesi
   eu_data_residency: "Dati nell'UE"
   please_enter_your_email_address_associated_with_the_completed_submission: "Inserisci il tuo indirizzo email associato all'invio completato."
+  esignature_disclosure: Uso della firma elettronica
   submission_sources:
     api: API
     bulk: Invio massivo
@@ -3228,6 +3231,7 @@ fr: &fr
   three_months: 3 mois
   eu_data_residency: "Données dans l'UE"
   please_enter_your_email_address_associated_with_the_completed_submission: "Veuillez saisir l'adresse e-mail associée à l'envoi complété."
+  esignature_disclosure: Divulgation de Signature Électronique
   submission_sources:
     api: API
     bulk: Envoi en masse
@@ -4056,6 +4060,7 @@ pt: &pt
   three_months: 3 meses
   eu_data_residency: Dados na UE
   please_enter_your_email_address_associated_with_the_completed_submission: Por favor, insira seu e-mail associado ao envio concluído.
+  esignature_disclosure: Uso de assinatura eletrônica
   submission_sources:
     api: API
     bulk: Envio em massa
@@ -4885,6 +4890,7 @@ de: &de
   three_months: 3 Monate
   eu_data_residency: EU-Datenspeicher
   please_enter_your_email_address_associated_with_the_completed_submission: Bitte gib deine E-Mail-Adresse ein, die mit der abgeschlossenen Übermittlung verknüpft ist.
+  esignature_disclosure: Nutzung der E-Signatur
   submission_sources:
     api: API
     bulk: Massenversand
@@ -5054,6 +5060,8 @@ pl:
   open_source_documents_software: 'oprogramowanie do dokumentów open source'
   eu_data_residency: Dane w UE
   please_enter_your_email_address_associated_with_the_completed_submission: Wprowadź adres e-mail powiązany z ukończonym zgłoszeniem.
+  privacy_policy: Polityka Prywatności
+  esignature_disclosure: Użycie e-podpisu
 
 uk:
   require_phone_2fa_to_open: Вимагати двофакторну автентифікацію через телефон для відкриття
@@ -5123,6 +5131,8 @@ uk:
   open_source_documents_software: 'відкрите програмне забезпечення для документів'
   eu_data_residency: 'Зберігання даних в ЄС'
   please_enter_your_email_address_associated_with_the_completed_submission: "Введіть адресу електронної пошти, пов'язану із завершеним поданням."
+  privacy_policy: Політика конфіденційності
+  esignature_disclosure: Використання e-підпису
 
 cs:
   require_phone_2fa_to_open: Vyžadovat otevření pomocí telefonního 2FA
@@ -5192,6 +5202,8 @@ cs:
   open_source_documents_software: 'open source software pro dokumenty'
   eu_data_residency: 'Uložení dat v EU'
   please_enter_your_email_address_associated_with_the_completed_submission: Zadejte e-mailovou adresu spojenou s dokončeným odesláním.
+  privacy_policy: Zásady Ochrany Osobních Údajů
+  esignature_disclosure: Použití e-podpisu
 
 he:
   require_phone_2fa_to_open: דרוש אימות דו-שלבי באמצעות טלפון לפתיחה
@@ -5261,6 +5273,8 @@ he:
   open_source_documents_software: 'תוכנה בקוד פתוח למסמכים'
   eu_data_residency: 'נתונים באיחוד האירופי	'
   please_enter_your_email_address_associated_with_the_completed_submission: 'אנא הזן את כתובת הדוא"ל המשויכת למשלוח שהושלם.'
+  privacy_policy: 'מדיניות פרטיות'
+  esignature_disclosure: 'גילוי חתימה אלקטרונית'
 
 nl:
   require_phone_2fa_to_open: Vereis telefoon 2FA om te openen
@@ -5330,6 +5344,8 @@ nl:
   open_source_documents_software: 'open source documenten software'
   eu_data_residency: Gegevens EU
   please_enter_your_email_address_associated_with_the_completed_submission: Voer het e-mailadres in dat is gekoppeld aan de voltooide indiening.
+  privacy_policy: Privacybeleid
+  esignature_disclosure: Gebruik van e-handtekening
 
 ar:
   require_phone_2fa_to_open: "تطلب فتح عبر تحقق الهاتف ذو العاملين"
@@ -5399,6 +5415,8 @@ ar:
   open_source_documents_software: 'برنامج مستندات مفتوح المصدر'
   eu_data_residency: 'بيانات في الاتحاد الأوروبي'
   please_enter_your_email_address_associated_with_the_completed_submission: 'يرجى إدخال عنوان البريد الإلكتروني المرتبط بالإرسال المكتمل.'
+  privacy_policy: 'سياسة الخصوصية'
+  esignature_disclosure: 'إفصاح التوقيع الإلكتروني'
 
 ko:
   require_phone_2fa_to_open: 휴대폰 2FA를 열 때 요구함
@@ -5468,6 +5486,8 @@ ko:
   open_source_documents_software: '오픈소스 문서 소프트웨어'
   eu_data_residency: 'EU 데이터 보관'
   please_enter_your_email_address_associated_with_the_completed_submission: '완료된 제출과 연결된 이메일 주소를 입력하세요.'
+  privacy_policy: 개인정보 처리방침
+  esignature_disclosure: 전자서명 공개
 
 ja:
   require_phone_2fa_to_open: 電話による2段階認証が必要です
@@ -5537,6 +5557,8 @@ ja:
   open_source_documents_software: 'オープンソースのドキュメントソフトウェア'
   eu_data_residency: 'EU データ居住'
   please_enter_your_email_address_associated_with_the_completed_submission: '完了した提出に関連付けられたメールアドレスを入力してください。'
+  privacy_policy: プライバシーポリシー
+  esignature_disclosure: 電子署名に関する開示
 
 en-US:
   <<: *en

From e77b5fa2c9ab572984e8649e6785aee7cb8c8e10 Mon Sep 17 00:00:00 2001
From: Alex Turchyn <alex@docuseal.com>
Date: Mon, 26 May 2025 13:32:32 +0300
Subject: [PATCH 16/26] add optional shared link to templates

---
 app/controllers/api/templates_controller.rb   |   1 +
 app/controllers/start_form_controller.rb      |  20 ++++--
 .../templates_share_link_controller.rb        |  21 ++++++
 app/javascript/application.js                 |   2 +
 app/javascript/elements/check_on_click.js     |  14 ++++
 app/javascript/elements/clipboard_copy.js     |   2 -
 app/models/template.rb                        |   1 +
 app/views/start_form/private.html.erb         |  28 ++++++++
 app/views/templates/_title.html.erb           |   7 +-
 app/views/templates_preferences/show.html.erb |  14 +++-
 app/views/templates_share_link/show.html.erb  |  16 +++++
 config/locales/i18n.yml                       |  18 +++++
 config/routes.rb                              |   1 +
 ...0523121121_add_shared_link_to_templates.rb |  22 ++++++
 db/schema.rb                                  |   1 +
 lib/templates/clone.rb                        |   1 +
 lib/templates/serialize_for_api.rb            |   2 +-
 spec/fixtures/fieldtags.docx                  | Bin 0 -> 8860 bytes
 spec/requests/templates_spec.rb               |  33 +++++++--
 spec/system/signing_form_spec.rb              |   8 ++-
 spec/system/template_share_link_spec.rb       |  66 ++++++++++++++++++
 21 files changed, 258 insertions(+), 20 deletions(-)
 create mode 100644 app/controllers/templates_share_link_controller.rb
 create mode 100644 app/javascript/elements/check_on_click.js
 create mode 100644 app/views/start_form/private.html.erb
 create mode 100644 app/views/templates_share_link/show.html.erb
 create mode 100644 db/migrate/20250523121121_add_shared_link_to_templates.rb
 create mode 100644 spec/fixtures/fieldtags.docx
 create mode 100644 spec/system/template_share_link_spec.rb

diff --git a/app/controllers/api/templates_controller.rb b/app/controllers/api/templates_controller.rb
index 5e8da098..25c0c537 100644
--- a/app/controllers/api/templates_controller.rb
+++ b/app/controllers/api/templates_controller.rb
@@ -100,6 +100,7 @@ module Api
       permitted_params = [
         :name,
         :external_id,
+        :shared_link,
         {
           submitters: [%i[name uuid is_requester invite_by_uuid optional_invite_by_uuid linked_to_uuid email]],
           fields: [[:uuid, :submitter_uuid, :name, :type,
diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb
index 28a77f86..c7b74a3f 100644
--- a/app/controllers/start_form_controller.rb
+++ b/app/controllers/start_form_controller.rb
@@ -11,14 +11,22 @@ class StartFormController < ApplicationController
   before_action :load_template
 
   def show
-    raise ActionController::RoutingError, I18n.t('not_found') if @template.preferences['require_phone_2fa'] == true
+    raise ActionController::RoutingError, I18n.t('not_found') if @template.preferences['require_phone_2fa']
 
-    @submitter = @template.submissions.new(account_id: @template.account_id)
-                          .submitters.new(account_id: @template.account_id,
-                                          uuid: (filter_undefined_submitters(@template).first ||
-                                                 @template.submitters.first)['uuid'])
+    if @template.shared_link?
+      @submitter = @template.submissions.new(account_id: @template.account_id)
+                            .submitters.new(account_id: @template.account_id,
+                                            uuid: (filter_undefined_submitters(@template).first ||
+                                                  @template.submitters.first)['uuid'])
 
-    @form_configs = Submitters::FormConfigs.call(@submitter) unless Docuseal.multitenant?
+      @form_configs = Submitters::FormConfigs.call(@submitter) unless Docuseal.multitenant?
+
+      render :show
+    elsif current_user && current_ability.can?(:read, @template)
+      render :private
+    else
+      raise ActionController::RoutingError, I18n.t('not_found')
+    end
   end
 
   def update
diff --git a/app/controllers/templates_share_link_controller.rb b/app/controllers/templates_share_link_controller.rb
new file mode 100644
index 00000000..5b84f6ca
--- /dev/null
+++ b/app/controllers/templates_share_link_controller.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class TemplatesShareLinkController < ApplicationController
+  load_and_authorize_resource :template
+
+  def show; end
+
+  def create
+    authorize!(:update, @template)
+
+    @template.update!(template_params)
+
+    head :ok
+  end
+
+  private
+
+  def template_params
+    params.require(:template).permit(:shared_link)
+  end
+end
diff --git a/app/javascript/application.js b/app/javascript/application.js
index c2e12079..f951b8fe 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -24,6 +24,7 @@ import SubmitForm from './elements/submit_form'
 import PromptPassword from './elements/prompt_password'
 import EmailsTextarea from './elements/emails_textarea'
 import ToggleOnSubmit from './elements/toggle_on_submit'
+import CheckOnClick from './elements/check_on_click'
 import PasswordInput from './elements/password_input'
 import SearchInput from './elements/search_input'
 import ToggleAttribute from './elements/toggle_attribute'
@@ -103,6 +104,7 @@ safeRegisterElement('set-date-button', SetDateButton)
 safeRegisterElement('indeterminate-checkbox', IndeterminateCheckbox)
 safeRegisterElement('app-tour', AppTour)
 safeRegisterElement('dashboard-dropzone', DashboardDropzone)
+safeRegisterElement('check-on-click', CheckOnClick)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
diff --git a/app/javascript/elements/check_on_click.js b/app/javascript/elements/check_on_click.js
new file mode 100644
index 00000000..8b3b9ab8
--- /dev/null
+++ b/app/javascript/elements/check_on_click.js
@@ -0,0 +1,14 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.addEventListener('click', () => {
+      if (!this.element.checked) {
+        this.element.checked = true
+        this.element.dispatchEvent(new Event('change', { bubbles: true }))
+      }
+    })
+  }
+
+  get element () {
+    return document.getElementById(this.dataset.elementId)
+  }
+}
diff --git a/app/javascript/elements/clipboard_copy.js b/app/javascript/elements/clipboard_copy.js
index 777727d1..4118b9e2 100644
--- a/app/javascript/elements/clipboard_copy.js
+++ b/app/javascript/elements/clipboard_copy.js
@@ -3,8 +3,6 @@ export default class extends HTMLElement {
     this.clearChecked()
 
     this.addEventListener('click', (e) => {
-      e.stopPropagation()
-
       const text = this.dataset.text || this.innerText.trim()
 
       if (navigator.clipboard) {
diff --git a/app/models/template.rb b/app/models/template.rb
index 28441a9a..faa9e696 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -10,6 +10,7 @@
 #  name        :string           not null
 #  preferences :text             not null
 #  schema      :text             not null
+#  shared_link :boolean          default(FALSE), not null
 #  slug        :string           not null
 #  source      :text             not null
 #  submitters  :text             not null
diff --git a/app/views/start_form/private.html.erb b/app/views/start_form/private.html.erb
new file mode 100644
index 00000000..4e16eba4
--- /dev/null
+++ b/app/views/start_form/private.html.erb
@@ -0,0 +1,28 @@
+<% content_for(:html_title, "#{@template.name} | DocuSeal") %>
+<% content_for(:html_description, t('share_link_is_currently_disabled')) %>
+<div class="max-w-md mx-auto px-2 mt-12 mb-4">
+  <div class="space-y-6 mx-auto">
+    <div class="space-y-6">
+      <div class="text-center w-full space-y-6">
+        <%= render 'banner' %>
+        <p class="text-xl font-semibold text-center">
+          <%= t('share_link_is_currently_disabled') %>
+        </p>
+      </div>
+      <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">
+        <div class="flex items-center">
+          <div class="mr-3">
+            <%= svg_icon('writing_sign', class: 'w-10 h-10') %>
+          </div>
+          <div>
+            <p class="text-lg font-bold mb-1"><%= @template.name %></p>
+            <% if @template.archived_at? %>
+              <p dir="auto" class="text-sm"><%= t('form_has_been_deleted_by_html', name: @template.account.name) %></p>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<%= render 'shared/attribution', link_path: '/start', account: @template.account %>
diff --git a/app/views/templates/_title.html.erb b/app/views/templates/_title.html.erb
index c33a8298..28d2e037 100644
--- a/app/views/templates/_title.html.erb
+++ b/app/views/templates/_title.html.erb
@@ -49,7 +49,12 @@
             <% end %>
           </div>
         <% end %>
-        <%= render 'shared/clipboard_copy', text: start_form_url(slug: @template.slug), id: 'share_link_clipboard', class: 'absolute md:relative bottom-0 right-0 btn btn-xs md:btn-sm whitespace-nowrap btn-neutral text-white mt-1 px-2', icon_class: 'w-4 h-4 md:w-6 md:h-6 text-white', copy_title: t('link'), copied_title: t('copied'), copy_title_md: t('link'), copied_title_md: t('copied') %>
+        <%= link_to template_share_link_path(template), class: 'absolute md:relative bottom-0 right-0 btn btn-xs md:btn-sm whitespace-nowrap btn-neutral text-white mt-1 px-2', data: { turbo_frame: :modal } do %>
+          <span class="flex items-center justify-center space-x-2">
+            <%= svg_icon('link', class: 'w-4 h-4 md:w-6 md:h-6 text-white') %>
+            <span><%= t('link') %></span>
+          </span>
+        <% end %>
       </div>
     <% end %>
   </div>
diff --git a/app/views/templates_preferences/show.html.erb b/app/views/templates_preferences/show.html.erb
index b59fac43..47b342c7 100644
--- a/app/views/templates_preferences/show.html.erb
+++ b/app/views/templates_preferences/show.html.erb
@@ -380,8 +380,18 @@
           <%= t('embedding_url') %>
         </label>
         <div class="flex gap-2 mb-4 mt-2">
-          <input id="embedding_url" type="text" value="<%= start_form_url(slug: @template.slug) %>" class="base-input w-full" autocomplete="off" readonly>
-          <%= render 'shared/clipboard_copy', icon: 'copy', text: start_form_url(slug: @template.slug), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
+          <%= form_for @template, url: template_share_link_path(@template), method: :post, html: { id: 'shared_link_form', autocomplete: 'off', class: 'w-full mt-1' }, data: { close_on_submit: false } do |f| %>
+            <div class="flex gap-2">
+              <input id="embedding_url" type="text" value="<%= start_form_url(slug: @template.slug) %>" class="base-input w-full" autocomplete="off" readonly>
+              <check-on-click data-element-id="template_shared_link">
+                <%= render 'shared/clipboard_copy', icon: 'copy', text: start_form_url(slug: @template.slug), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
+              </check-on-click>
+            </div>
+            <div class="flex items-center justify-between gap-1 pt-3">
+              <span><%= t('enable_shared_link') %></span>
+              <%= f.check_box :shared_link, { class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
+            </div>
+          <% end %>
         </div>
       </div>
       <%= render 'templates_code_modal/placeholder' %>
diff --git a/app/views/templates_share_link/show.html.erb b/app/views/templates_share_link/show.html.erb
new file mode 100644
index 00000000..eb2d74e0
--- /dev/null
+++ b/app/views/templates_share_link/show.html.erb
@@ -0,0 +1,16 @@
+<%= render 'shared/turbo_modal_large', title: t('share_link') do %>
+  <div class="mt-2 mb-4 px-5">
+    <%= form_for @template, url: template_share_link_path(@template), method: :post, html: { id: 'shared_link_form', autocomplete: 'off', class: 'mt-3' }, data: { close_on_submit: false } do |f| %>
+      <div class="flex items-center justify-between gap-1 px-1">
+        <span><%= t('enable_shared_link') %></span>
+        <%= f.check_box :shared_link, { disabled: !can?(:update, @template), class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
+      </div>
+      <div class="flex gap-2 mt-3">
+        <input id="embedding_url" type="text" value="<%= start_form_url(slug: @template.slug) %>" class="base-input w-full" autocomplete="off" readonly>
+        <check-on-click data-element-id="template_shared_link">
+          <%= render 'shared/clipboard_copy', icon: 'copy', text: start_form_url(slug: @template.slug), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
+        </check-on-click>
+      </div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 5dd85c32..378a6f5e 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -746,6 +746,9 @@ en: &en
   eu_data_residency: EU data residency
   please_enter_your_email_address_associated_with_the_completed_submission: Please enter your email address associated with the completed submission.
   esignature_disclosure: eSignature Disclosure
+  share_link: Share link
+  enable_shared_link: Enable shared link
+  share_link_is_currently_disabled: Share link is currently disabled
   submission_sources:
     api: API
     bulk: Bulk Send
@@ -1575,6 +1578,9 @@ es: &es
   eu_data_residency: Datos alojados UE
   please_enter_your_email_address_associated_with_the_completed_submission: Por favor, introduce tu dirección de correo electrónico asociada con el envío completado.
   esignature_disclosure: Uso de firma electrónica
+  share_link: Enlace para compartir
+  enable_shared_link: Habilitar enlace compartido
+  share_link_is_currently_disabled: El enlace compartido está deshabilitado actualmente
   submission_sources:
     api: API
     bulk: Envío masivo
@@ -2402,6 +2408,9 @@ it: &it
   eu_data_residency: "Dati nell'UE"
   please_enter_your_email_address_associated_with_the_completed_submission: "Inserisci il tuo indirizzo email associato all'invio completato."
   esignature_disclosure: Uso della firma elettronica
+  share_link: Link di condivisione
+  enable_shared_link: Abilita link condiviso
+  share_link_is_currently_disabled: Il link condiviso è attualmente disabilitato
   submission_sources:
     api: API
     bulk: Invio massivo
@@ -3232,6 +3241,9 @@ fr: &fr
   eu_data_residency: "Données dans l'UE"
   please_enter_your_email_address_associated_with_the_completed_submission: "Veuillez saisir l'adresse e-mail associée à l'envoi complété."
   esignature_disclosure: Divulgation de Signature Électronique
+  share_link: Lien de partage
+  enable_shared_link: Activer le lien de partage
+  share_link_is_currently_disabled: Le lien de partage est actuellement désactivé
   submission_sources:
     api: API
     bulk: Envoi en masse
@@ -4061,6 +4073,9 @@ pt: &pt
   eu_data_residency: Dados na UE
   please_enter_your_email_address_associated_with_the_completed_submission: Por favor, insira seu e-mail associado ao envio concluído.
   esignature_disclosure: Uso de assinatura eletrônica
+  share_link: Link de compartilhamento
+  enable_shared_link: Ativar link compartilhado
+  share_link_is_currently_disabled: O link compartilhado está desativado no momento
   submission_sources:
     api: API
     bulk: Envio em massa
@@ -4891,6 +4906,9 @@ de: &de
   eu_data_residency: EU-Datenspeicher
   please_enter_your_email_address_associated_with_the_completed_submission: Bitte gib deine E-Mail-Adresse ein, die mit der abgeschlossenen Übermittlung verknüpft ist.
   esignature_disclosure: Nutzung der E-Signatur
+  share_link: Freigabelink
+  enable_shared_link: 'Freigabelink aktivieren'
+  share_link_is_currently_disabled: 'Freigabelink ist derzeit deaktiviert'
   submission_sources:
     api: API
     bulk: Massenversand
diff --git a/config/routes.rb b/config/routes.rb
index 331ca82d..3409a78e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -106,6 +106,7 @@ Rails.application.routes.draw do
     resource :form, only: %i[show], controller: 'templates_form_preview'
     resource :code_modal, only: %i[show], controller: 'templates_code_modal'
     resource :preferences, only: %i[show create], controller: 'templates_preferences'
+    resource :share_link, only: %i[show create], controller: 'templates_share_link'
     resources :recipients, only: %i[create], controller: 'templates_recipients'
     resources :submissions_export, only: %i[index new]
   end
diff --git a/db/migrate/20250523121121_add_shared_link_to_templates.rb b/db/migrate/20250523121121_add_shared_link_to_templates.rb
new file mode 100644
index 00000000..6fe962eb
--- /dev/null
+++ b/db/migrate/20250523121121_add_shared_link_to_templates.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AddSharedLinkToTemplates < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction
+
+  class MigrationTemplate < ActiveRecord::Base
+    self.table_name = 'templates'
+  end
+
+  def up
+    add_column :templates, :shared_link, :boolean, if_not_exists: true
+
+    MigrationTemplate.where(shared_link: nil).in_batches.update_all(shared_link: true)
+
+    change_column_default :templates, :shared_link, from: nil, to: false
+    change_column_null :templates, :shared_link, false
+  end
+
+  def down
+    remove_column :templates, :shared_link
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 28f1a524..b024ff66 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -361,6 +361,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_05_30_080846) do
     t.bigint "folder_id", null: false
     t.string "external_id"
     t.text "preferences", null: false
+    t.boolean "shared_link", default: false, null: false
     t.index ["account_id"], name: "index_templates_on_account_id"
     t.index ["author_id"], name: "index_templates_on_author_id"
     t.index ["external_id"], name: "index_templates_on_external_id"
diff --git a/lib/templates/clone.rb b/lib/templates/clone.rb
index 0fe3b91b..e4b5fc60 100644
--- a/lib/templates/clone.rb
+++ b/lib/templates/clone.rb
@@ -9,6 +9,7 @@ module Templates
       template = original_template.account.templates.new
 
       template.external_id = external_id
+      template.shared_link = original_template.shared_link
       template.author = author
       template.name = name.presence || "#{original_template.name} (#{I18n.t('clone')})"
 
diff --git a/lib/templates/serialize_for_api.rb b/lib/templates/serialize_for_api.rb
index f5f03ebe..b60f9023 100644
--- a/lib/templates/serialize_for_api.rb
+++ b/lib/templates/serialize_for_api.rb
@@ -6,7 +6,7 @@ module Templates
       only: %w[
         id archived_at fields name preferences schema
         slug source submitters created_at updated_at
-        author_id external_id folder_id
+        author_id external_id folder_id shared_link
       ],
       methods: %i[application_key folder_name],
       include: { author: { only: %i[id email first_name last_name] } }
diff --git a/spec/fixtures/fieldtags.docx b/spec/fixtures/fieldtags.docx
new file mode 100644
index 0000000000000000000000000000000000000000..50655a04f117a99d8543ad3c81f641e3a3fa7d7a
GIT binary patch
literal 8860
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

literal 0
HcmV?d00001

diff --git a/spec/requests/templates_spec.rb b/spec/requests/templates_spec.rb
index fa2a362a..7763d8cd 100644
--- a/spec/requests/templates_spec.rb
+++ b/spec/requests/templates_spec.rb
@@ -83,13 +83,15 @@ describe 'Templates API' do
   end
 
   describe 'PUT /api/templates' do
-    it 'update a template' do
-      template = create(:template, account:,
-                                   author:,
-                                   folder:,
-                                   external_id: SecureRandom.base58(10),
-                                   preferences: template_preferences)
+    let(:template) do
+      create(:template, account:,
+                        author:,
+                        folder:,
+                        external_id: SecureRandom.base58(10),
+                        preferences: template_preferences)
+    end
 
+    it 'updates a template' do
       put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
         name: 'Updated Template Name',
         external_id: '123456'
@@ -106,6 +108,24 @@ describe 'Templates API' do
         updated_at: template.updated_at
       }.to_json))
     end
+
+    it "enables the template's shared link" do
+      expect do
+        put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
+          shared_link: true
+        }.to_json
+      end.to change { template.reload.shared_link }.from(false).to(true)
+    end
+
+    it "disables the template's shared link" do
+      template.update(shared_link: true)
+
+      expect do
+        put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
+          shared_link: false
+        }.to_json
+      end.to change { template.reload.shared_link }.from(true).to(false)
+    end
   end
 
   describe 'DELETE /api/templates/:id' do
@@ -206,6 +226,7 @@ describe 'Templates API' do
           name: 'sample-document'
         }
       ],
+      shared_link: template.shared_link,
       author_id: author.id,
       archived_at: nil,
       created_at: template.created_at,
diff --git a/spec/system/signing_form_spec.rb b/spec/system/signing_form_spec.rb
index 8bfa3e5e..83c1b30b 100644
--- a/spec/system/signing_form_spec.rb
+++ b/spec/system/signing_form_spec.rb
@@ -5,7 +5,9 @@ RSpec.describe 'Signing Form' do
   let(:author) { create(:user, account:) }
 
   context 'when the template form link is opened' do
-    let(:template) { create(:template, account:, author:, except_field_types: %w[phone payment stamp]) }
+    let(:template) do
+      create(:template, shared_link: true, account:, author:, except_field_types: %w[phone payment stamp])
+    end
 
     before do
       visit start_form_path(slug: template.slug)
@@ -811,7 +813,9 @@ RSpec.describe 'Signing Form' do
   end
 
   context 'when the template requires multiple submitters' do
-    let(:template) { create(:template, submitter_count: 2, account:, author:, only_field_types: %w[text]) }
+    let(:template) do
+      create(:template, shared_link: true, submitter_count: 2, account:, author:, only_field_types: %w[text])
+    end
 
     context 'when default signer details are not defined' do
       it 'shows an explanation error message if a logged-in user associated with the template account opens the link' do
diff --git a/spec/system/template_share_link_spec.rb b/spec/system/template_share_link_spec.rb
new file mode 100644
index 00000000..8930812b
--- /dev/null
+++ b/spec/system/template_share_link_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+RSpec.describe 'Template Share Link' do
+  let!(:account) { create(:account) }
+  let!(:author) { create(:user, account:) }
+  let!(:template) { create(:template, account:, author:) }
+
+  before do
+    sign_in(author)
+  end
+
+  context 'when the template is not shareable' do
+    before do
+      visit template_path(template)
+    end
+
+    it 'makes the template shareable' do
+      click_on 'Link'
+
+      expect do
+        within '#modal' do
+          check 'template_shared_link'
+        end
+      end.to change { template.reload.shared_link }.from(false).to(true)
+    end
+
+    it 'makes the template shareable when copying the shareable link' do
+      click_on 'Link'
+
+      expect do
+        within '#modal' do
+          find('clipboard-copy').click
+        end
+      end.to change { template.reload.shared_link }.from(false).to(true)
+    end
+
+    it 'copies the shareable link without changing its status' do
+      template.update(shared_link: true)
+
+      click_on 'Link'
+
+      expect do
+        within '#modal' do
+          find('clipboard-copy').click
+        end
+      end.not_to(change { template.reload.shared_link })
+    end
+  end
+
+  context 'when the template is already shareable' do
+    before do
+      template.update(shared_link: true)
+      visit template_path(template)
+    end
+
+    it 'makes the template unshareable' do
+      click_on 'Link'
+
+      expect do
+        within '#modal' do
+          uncheck 'template_shared_link'
+        end
+      end.to change { template.reload.shared_link }.from(true).to(false)
+    end
+  end
+end

From 85d52d1f283eec4e0736b5f2834056bdfa58692d Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sun, 1 Jun 2025 11:38:08 +0300
Subject: [PATCH 17/26] refactor policy

---
 app/controllers/start_form_controller.rb | 2 --
 app/views/shared/_attribution.html.erb   | 5 -----
 app/views/start_form/_policy.html.erb    | 5 +++++
 app/views/start_form/show.html.erb       | 1 +
 4 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 app/views/start_form/_policy.html.erb

diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb
index c7b74a3f..5a5ecc04 100644
--- a/app/controllers/start_form_controller.rb
+++ b/app/controllers/start_form_controller.rb
@@ -19,8 +19,6 @@ class StartFormController < ApplicationController
                                             uuid: (filter_undefined_submitters(@template).first ||
                                                   @template.submitters.first)['uuid'])
 
-      @form_configs = Submitters::FormConfigs.call(@submitter) unless Docuseal.multitenant?
-
       render :show
     elsif current_user && current_ability.can?(:read, @template)
       render :private
diff --git a/app/views/shared/_attribution.html.erb b/app/views/shared/_attribution.html.erb
index fb095303..bc464bba 100644
--- a/app/views/shared/_attribution.html.erb
+++ b/app/views/shared/_attribution.html.erb
@@ -1,6 +1 @@
 <%= render 'shared/powered_by', with_counter: local_assigns[:with_counter], link_path: local_assigns[:link_path] %>
-<% if @form_configs && @form_configs[:policy_links].present? %>
-  <div class="max-w-md mx-auto flex flex-wrap gap-1 justify-center text-sm text-base-content/60 mt-2">
-    <%= auto_link(MarkdownToHtml.call(@form_configs[:policy_links])) %>
-  </div>
-<% end %>
diff --git a/app/views/start_form/_policy.html.erb b/app/views/start_form/_policy.html.erb
new file mode 100644
index 00000000..a22969df
--- /dev/null
+++ b/app/views/start_form/_policy.html.erb
@@ -0,0 +1,5 @@
+<% if configs = account.account_configs.find_by(key: AccountConfig::POLICY_LINKS_KEY) %>
+  <div class="max-w-md mx-auto flex flex-wrap gap-1 justify-center text-sm text-base-content/60 mt-2">
+    <%= auto_link(MarkdownToHtml.call(configs.value)) %>
+  </div>
+<% end %>
diff --git a/app/views/start_form/show.html.erb b/app/views/start_form/show.html.erb
index 966f70ff..7eb0b96f 100644
--- a/app/views/start_form/show.html.erb
+++ b/app/views/start_form/show.html.erb
@@ -42,3 +42,4 @@
   </div>
 </div>
 <%= render 'shared/attribution', link_path: '/start', account: @template.account %>
+<%= render 'start_form/policy', account: @template.account %>

From f464e1c46ac6b38ba30587b3d4f2b069f8af478a Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sun, 1 Jun 2025 12:19:13 +0300
Subject: [PATCH 18/26] add log

---
 app/controllers/start_form_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb
index 5a5ecc04..9b6ee522 100644
--- a/app/controllers/start_form_controller.rb
+++ b/app/controllers/start_form_controller.rb
@@ -18,11 +18,11 @@ class StartFormController < ApplicationController
                             .submitters.new(account_id: @template.account_id,
                                             uuid: (filter_undefined_submitters(@template).first ||
                                                   @template.submitters.first)['uuid'])
-
-      render :show
-    elsif current_user && current_ability.can?(:read, @template)
-      render :private
     else
+      Rollbar.warning("Not shared template: #{@template.id}") if defined?(Rollbar)
+
+      return render :private if current_user && current_ability.can?(:read, @template)
+
       raise ActionController::RoutingError, I18n.t('not_found')
     end
   end

From 24d713dec6710479eb61d85ee74c4994fbb33f48 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sun, 1 Jun 2025 12:23:48 +0300
Subject: [PATCH 19/26] resubmit shared template

---
 app/controllers/start_form_controller.rb | 2 +-
 app/views/start_form/completed.html.erb  | 2 +-
 app/views/submit_form/completed.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb
index 9b6ee522..40986a97 100644
--- a/app/controllers/start_form_controller.rb
+++ b/app/controllers/start_form_controller.rb
@@ -28,7 +28,7 @@ class StartFormController < ApplicationController
   end
 
   def update
-    return redirect_to start_form_path(@template.slug) if @template.archived_at?
+    return redirect_to start_form_path(@template.slug) if @template.archived_at? || !@template.shared_link?
 
     @submitter = find_or_initialize_submitter(@template, submitter_params)
 
diff --git a/app/views/start_form/completed.html.erb b/app/views/start_form/completed.html.erb
index c4d41b8f..fef146f0 100644
--- a/app/views/start_form/completed.html.erb
+++ b/app/views/start_form/completed.html.erb
@@ -26,7 +26,7 @@
         <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, class: 'base-button w-full' %>
       </toggle-submit>
     <% end %>
-    <% if Templates.filter_undefined_submitters(@template).size == 1 && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false %>
+    <% if Templates.filter_undefined_submitters(@template).size == 1 && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && @template.shared_link? %>
       <toggle-submit class="block">
         <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
       </toggle-submit>
diff --git a/app/views/submit_form/completed.html.erb b/app/views/submit_form/completed.html.erb
index 92114274..f44d4c21 100644
--- a/app/views/submit_form/completed.html.erb
+++ b/app/views/submit_form/completed.html.erb
@@ -43,7 +43,7 @@
       <% end %>
     </div>
     <% undefined_submitters = Templates.filter_undefined_submitters(@submitter.submission.template) %>
-    <% if undefined_submitters.size == 1 && undefined_submitters.first['uuid'] == @submitter.uuid && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && !@submitter.template.archived_at? %>
+    <% if undefined_submitters.size == 1 && undefined_submitters.first['uuid'] == @submitter.uuid && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && !@submitter.template.archived_at? && @submitter.template.shared_link? %>
       <div class="divider uppercase"><%= t('or') %></div>
       <toggle-submit class="block">
         <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@submitter.submission.template.slug), params: { submitter: { email: @submitter.email, phone: @submitter.phone, name: @submitter.name }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>

From e41fe5fbca7cf2c84e523f16d9bd3b6614ba0f59 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sun, 1 Jun 2025 13:21:11 +0300
Subject: [PATCH 20/26] shared link true default

---
 app/models/template.rb          |  1 +
 spec/requests/templates_spec.rb | 34 ++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/models/template.rb b/app/models/template.rb
index faa9e696..1350f7ca 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -46,6 +46,7 @@ class Template < ApplicationRecord
 
   attribute :preferences, :string, default: -> { {} }
   attribute :fields, :string, default: -> { [] }
+  attribute :shared_link, :boolean, default: true
   attribute :schema, :string, default: -> { [] }
   attribute :submitters, :string, default: -> { [{ name: I18n.t(:first_party), uuid: SecureRandom.uuid }] }
   attribute :slug, :string, default: -> { SecureRandom.base58(14) }
diff --git a/spec/requests/templates_spec.rb b/spec/requests/templates_spec.rb
index 7763d8cd..adee1e30 100644
--- a/spec/requests/templates_spec.rb
+++ b/spec/requests/templates_spec.rb
@@ -109,23 +109,23 @@ describe 'Templates API' do
       }.to_json))
     end
 
-    it "enables the template's shared link" do
-      expect do
-        put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
-          shared_link: true
-        }.to_json
-      end.to change { template.reload.shared_link }.from(false).to(true)
-    end
-
-    it "disables the template's shared link" do
-      template.update(shared_link: true)
-
-      expect do
-        put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
-          shared_link: false
-        }.to_json
-      end.to change { template.reload.shared_link }.from(true).to(false)
-    end
+    # it "enables the template's shared link" do
+    #   expect do
+    #     put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
+    #       shared_link: true
+    #     }.to_json
+    #   end.to change { template.reload.shared_link }.from(false).to(true)
+    # end
+    #
+    # it "disables the template's shared link" do
+    #   template.update(shared_link: true)
+    #
+    #   expect do
+    #     put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
+    #       shared_link: false
+    #     }.to_json
+    #   end.to change { template.reload.shared_link }.from(true).to(false)
+    # end
   end
 
   describe 'DELETE /api/templates/:id' do

From 4e94664008941d3d11a1d9f1a4a3d34e1bc0a83d Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sun, 1 Jun 2025 15:16:00 +0300
Subject: [PATCH 21/26] refactor start form

---
 .../send_submission_email_controller.rb       | 10 +--
 app/controllers/start_form_controller.rb      | 62 +++++++++++++------
 app/javascript/template_builder/builder.vue   | 47 ++++++++++++--
 app/views/start_form/completed.html.erb       |  4 +-
 app/views/submit_form/completed.html.erb      |  4 +-
 app/views/templates/show.html.erb             |  2 +-
 config/routes.rb                              |  2 +
 spec/system/template_spec.rb                  |  2 +-
 8 files changed, 98 insertions(+), 35 deletions(-)

diff --git a/app/controllers/send_submission_email_controller.rb b/app/controllers/send_submission_email_controller.rb
index 6d1f34c3..ef6ff62b 100644
--- a/app/controllers/send_submission_email_controller.rb
+++ b/app/controllers/send_submission_email_controller.rb
@@ -11,15 +11,15 @@ class SendSubmissionEmailController < ApplicationController
 
   def create
     if params[:template_slug]
-      @submitter = Submitter.joins(submission: :template).find_by!(email: params[:email].to_s.downcase,
-                                                                   template: { slug: params[:template_slug] })
+      @submitter = Submitter.completed.joins(submission: :template).find_by!(email: params[:email].to_s.downcase,
+                                                                             template: { slug: params[:template_slug] })
     elsif params[:submission_slug]
-      @submitter = Submitter.joins(:submission).find_by(email: params[:email].to_s.downcase,
-                                                        submission: { slug: params[:submission_slug] })
+      @submitter = Submitter.completed.joins(:submission).find_by(email: params[:email].to_s.downcase,
+                                                                  submission: { slug: params[:submission_slug] })
 
       return redirect_to submissions_preview_completed_path(params[:submission_slug], status: :error) unless @submitter
     else
-      @submitter = Submitter.find_by!(slug: params[:submitter_slug])
+      @submitter = Submitter.completed.find_by!(slug: params[:submitter_slug])
     end
 
     RateLimit.call("send-email-#{@submitter.id}", limit: 2, ttl: 5.minutes)
diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb
index 40986a97..a7f113e9 100644
--- a/app/controllers/start_form_controller.rb
+++ b/app/controllers/start_form_controller.rb
@@ -8,7 +8,9 @@ class StartFormController < ApplicationController
 
   around_action :with_browser_locale, only: %i[show completed]
   before_action :maybe_redirect_com, only: %i[show completed]
+  before_action :load_resubmit_submitter, only: :update
   before_action :load_template
+  before_action :authorize_start!, only: :update
 
   def show
     raise ActionController::RoutingError, I18n.t('not_found') if @template.preferences['require_phone_2fa']
@@ -28,8 +30,6 @@ class StartFormController < ApplicationController
   end
 
   def update
-    return redirect_to start_form_path(@template.slug) if @template.archived_at? || !@template.shared_link?
-
     @submitter = find_or_initialize_submitter(@template, submitter_params)
 
     if @submitter.completed_at?
@@ -74,6 +74,24 @@ class StartFormController < ApplicationController
 
   private
 
+  def load_resubmit_submitter
+    @resubmit_submitter =
+      if params[:resubmit].present? && !params[:resubmit].in?([true, 'true'])
+        Submitter.find_by(slug: params[:resubmit])
+      end
+  end
+
+  def authorize_start!
+    return redirect_to start_form_path(@template.slug) if @template.archived_at?
+
+    return if @resubmit_submitter
+    return if @template.shared_link? || (current_user && current_ability.can?(:read, @template))
+
+    Rollbar.warning("Not shared template: #{@template.id}") if defined?(Rollbar)
+
+    redirect_to start_form_path(@template.slug)
+  end
+
   def enqueue_submission_create_webhooks(submitter)
     WebhookUrls.for_account_id(submitter.account_id, 'submission.created').each do |webhook_url|
       SendSubmissionCreatedWebhookRequestJob.perform_async('submission_id' => submitter.submission_id,
@@ -82,31 +100,29 @@ class StartFormController < ApplicationController
   end
 
   def find_or_initialize_submitter(template, submitter_params)
-    Submitter.where(submission: template.submissions.where(expire_at: Time.current..)
-                                        .or(template.submissions.where(expire_at: nil)).where(archived_at: nil))
-             .order(id: :desc)
-             .where(declined_at: nil)
-             .where(external_id: nil)
-             .where(ip: [nil, request.remote_ip])
-             .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
-             .find_or_initialize_by(email: submitter_params[:email], **submitter_params.compact_blank)
+    Submitter
+      .where(submission: template.submissions.where(expire_at: Time.current..)
+                                 .or(template.submissions.where(expire_at: nil)).where(archived_at: nil))
+      .order(id: :desc)
+      .where(declined_at: nil)
+      .where(external_id: nil)
+      .where(ip: [nil, request.remote_ip])
+      .then { |rel| params[:resubmit].present? || params[:selfsign].present? ? rel.where(completed_at: nil) : rel }
+      .find_or_initialize_by(email: submitter_params[:email], **submitter_params.compact_blank)
   end
 
   def assign_submission_attributes(submitter, template)
-    resubmit_submitter =
-      (Submitter.where(submission: template.submissions).find_by(slug: params[:resubmit]) if params[:resubmit].present?)
-
     submitter.assign_attributes(
       uuid: (filter_undefined_submitters(template).first || @template.submitters.first)['uuid'],
       ip: request.remote_ip,
       ua: request.user_agent,
-      values: resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
-      preferences: resubmit_submitter&.preferences.presence || { 'send_email' => true },
-      metadata: resubmit_submitter&.metadata.presence || {}
+      values: @resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
+      preferences: @resubmit_submitter&.preferences.presence || { 'send_email' => true },
+      metadata: @resubmit_submitter&.metadata.presence || {}
     )
 
     if submitter.values.present?
-      resubmit_submitter.attachments.each do |attachment|
+      @resubmit_submitter.attachments.each do |attachment|
         submitter.attachments << attachment.dup if submitter.values.value?(attachment.uuid)
       end
     end
@@ -128,15 +144,21 @@ class StartFormController < ApplicationController
   end
 
   def submitter_params
+    return current_user.slice(:email) if params[:selfsign]
+    return @resubmit_submitter.slice(:name, :phone, :email) if @resubmit_submitter.present?
+
     params.require(:submitter).permit(:email, :phone, :name).tap do |attrs|
       attrs[:email] = Submissions.normalize_email(attrs[:email])
     end
   end
 
   def load_template
-    slug = params[:slug] || params[:start_form_slug]
-
-    @template = Template.find_by!(slug:)
+    @template =
+      if @resubmit_submitter
+        @resubmit_submitter.template
+      else
+        Template.find_by!(slug: params[:slug] || params[:start_form_slug])
+      end
   end
 
   def multiple_submitters_error_message
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index ab26e912..e36a3c61 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -79,13 +79,52 @@
           name="buttons"
         />
         <template v-else>
+          <form
+            v-if="withSignYourselfButton && template.submitters.length < 2"
+            target="_blank"
+            data-turbo="false"
+            class="inline"
+            method="post"
+            :action="`/d/${template.slug}`"
+            @submit="maybeShowErrorTemplateAlert"
+          >
+            <input
+              type="hidden"
+              name="_method"
+              value="put"
+              autocomplete="off"
+            >
+            <input
+              type="hidden"
+              name="authenticity_token"
+              :value="authenticityToken"
+              autocomplete="off"
+            >
+            <input
+              type="hidden"
+              name="selfsign"
+              value="true"
+              autocomplete="off"
+            >
+            <button
+              class="btn btn-primary btn-ghost text-base hidden md:flex"
+              type="submit"
+            >
+              <IconWritingSign
+                width="22"
+                class="inline"
+              />
+              <span class="hidden md:inline">
+                {{ t('sign_yourself') }}
+              </span>
+            </button>
+          </form>
           <a
-            v-if="withSignYourselfButton"
+            v-else-if="withSignYourselfButton"
             id="sign_yourself_button"
-            :href="template.submitters.length > 1 ? `/templates/${template.id}/submissions/new?selfsign=true` : `/d/${template.slug}`"
+            :href="`/templates/${template.id}/submissions/new?selfsign=true`"
             class="btn btn-primary btn-ghost text-base hidden md:flex"
-            :target="template.submitters.length > 1 ? '' : '_blank'"
-            :data-turbo-frame="template.submitters.length > 1 ? 'modal' : ''"
+            data-turbo-frame="modal"
             @click="maybeShowErrorTemplateAlert"
           >
             <IconWritingSign
diff --git a/app/views/start_form/completed.html.erb b/app/views/start_form/completed.html.erb
index fef146f0..f629d6ab 100644
--- a/app/views/start_form/completed.html.erb
+++ b/app/views/start_form/completed.html.erb
@@ -23,12 +23,12 @@
     </div>
     <% if Docuseal.multitenant? || Accounts.can_send_emails?(@submitter.account) %>
       <toggle-submit class="block">
-        <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, class: 'base-button w-full' %>
+        <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { template_slug: @template.slug, email: params[:email] }, class: 'base-button w-full' %>
       </toggle-submit>
     <% end %>
     <% if Templates.filter_undefined_submitters(@template).size == 1 && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && @template.shared_link? %>
       <toggle-submit class="block">
-        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
+        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: true }, method: :put, class: 'white-button w-full' %>
       </toggle-submit>
     <% end %>
   </div>
diff --git a/app/views/submit_form/completed.html.erb b/app/views/submit_form/completed.html.erb
index f44d4c21..a5492dbf 100644
--- a/app/views/submit_form/completed.html.erb
+++ b/app/views/submit_form/completed.html.erb
@@ -43,10 +43,10 @@
       <% end %>
     </div>
     <% undefined_submitters = Templates.filter_undefined_submitters(@submitter.submission.template) %>
-    <% if undefined_submitters.size == 1 && undefined_submitters.first['uuid'] == @submitter.uuid && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && !@submitter.template.archived_at? && @submitter.template.shared_link? %>
+    <% if undefined_submitters.size == 1 && undefined_submitters.first['uuid'] == @submitter.uuid && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false %>
       <div class="divider uppercase"><%= t('or') %></div>
       <toggle-submit class="block">
-        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@submitter.submission.template.slug), params: { submitter: { email: @submitter.email, phone: @submitter.phone, name: @submitter.name }, resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
+        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), resubmit_form_path, params: { resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
       </toggle-submit>
     <% end %>
   </div>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index a7de5760..18188523 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -95,7 +95,7 @@
                 <% end %>
               <% end %>
               <% if @template.submitters.size == 1 %>
-                <%= link_to start_form_url(slug: @template.slug), id: 'sign_yourself_button', class: 'white-button mt-6', target: '_blank', rel: 'noopener' do %>
+                <%= button_to start_form_path(@template.slug), params: { selfsign: true }, method: :put, class: 'white-button w-full', form: { style: 'display: inline', target: '_blank', data: { turbo: false } } do %>
                   <%= svg_icon('writing', class: 'w-6 h-6') %>
                   <span class="mr-1"><%= t('sign_it_yourself') %></span>
                 <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 3409a78e..aed50953 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -132,6 +132,8 @@ Rails.application.routes.draw do
     get :completed
   end
 
+  resource :resubmit_form, controller: 'start_form', only: :update
+
   resources :submit_form, only: %i[], path: '' do
     get :success, on: :collection
   end
diff --git a/spec/system/template_spec.rb b/spec/system/template_spec.rb
index a0ffe4e5..d343283e 100644
--- a/spec/system/template_spec.rb
+++ b/spec/system/template_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe 'Template' do
       expect(page).to have_content(template.name)
       expect(page).to have_content('There are no Submissions')
       expect(page).to have_content('Send an invitation to fill and complete the form')
-      expect(page).to have_link('Sign it Yourself')
+      expect(page).to have_button('Sign it Yourself')
     end
   end
 

From 9544bb3d76a0f219ca48c58ff6eb56d1615e1f8e Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sun, 1 Jun 2025 15:17:07 +0300
Subject: [PATCH 22/26] Revert "shared link true default"

This reverts commit e41fe5fbca7cf2c84e523f16d9bd3b6614ba0f59.
---
 app/models/template.rb          |  1 -
 spec/requests/templates_spec.rb | 34 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/models/template.rb b/app/models/template.rb
index 1350f7ca..faa9e696 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -46,7 +46,6 @@ class Template < ApplicationRecord
 
   attribute :preferences, :string, default: -> { {} }
   attribute :fields, :string, default: -> { [] }
-  attribute :shared_link, :boolean, default: true
   attribute :schema, :string, default: -> { [] }
   attribute :submitters, :string, default: -> { [{ name: I18n.t(:first_party), uuid: SecureRandom.uuid }] }
   attribute :slug, :string, default: -> { SecureRandom.base58(14) }
diff --git a/spec/requests/templates_spec.rb b/spec/requests/templates_spec.rb
index adee1e30..7763d8cd 100644
--- a/spec/requests/templates_spec.rb
+++ b/spec/requests/templates_spec.rb
@@ -109,23 +109,23 @@ describe 'Templates API' do
       }.to_json))
     end
 
-    # it "enables the template's shared link" do
-    #   expect do
-    #     put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
-    #       shared_link: true
-    #     }.to_json
-    #   end.to change { template.reload.shared_link }.from(false).to(true)
-    # end
-    #
-    # it "disables the template's shared link" do
-    #   template.update(shared_link: true)
-    #
-    #   expect do
-    #     put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
-    #       shared_link: false
-    #     }.to_json
-    #   end.to change { template.reload.shared_link }.from(true).to(false)
-    # end
+    it "enables the template's shared link" do
+      expect do
+        put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
+          shared_link: true
+        }.to_json
+      end.to change { template.reload.shared_link }.from(false).to(true)
+    end
+
+    it "disables the template's shared link" do
+      template.update(shared_link: true)
+
+      expect do
+        put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
+          shared_link: false
+        }.to_json
+      end.to change { template.reload.shared_link }.from(true).to(false)
+    end
   end
 
   describe 'DELETE /api/templates/:id' do

From 1d48fe9621447a36965fdaca452af5f06b0e7f2d Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sun, 1 Jun 2025 15:41:44 +0300
Subject: [PATCH 23/26] fix spec

---
 spec/system/template_share_link_spec.rb | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/spec/system/template_share_link_spec.rb b/spec/system/template_share_link_spec.rb
index 8930812b..23499434 100644
--- a/spec/system/template_share_link_spec.rb
+++ b/spec/system/template_share_link_spec.rb
@@ -24,27 +24,15 @@ RSpec.describe 'Template Share Link' do
       end.to change { template.reload.shared_link }.from(false).to(true)
     end
 
-    it 'makes the template shareable when copying the shareable link' do
+    it 'makes the template shareable on toggle' do
       click_on 'Link'
 
       expect do
         within '#modal' do
-          find('clipboard-copy').click
+          find('#template_shared_link').click
         end
       end.to change { template.reload.shared_link }.from(false).to(true)
     end
-
-    it 'copies the shareable link without changing its status' do
-      template.update(shared_link: true)
-
-      click_on 'Link'
-
-      expect do
-        within '#modal' do
-          find('clipboard-copy').click
-        end
-      end.not_to(change { template.reload.shared_link })
-    end
   end
 
   context 'when the template is already shareable' do

From a7bb96464c6fa53989d5bdd3ed8235b1cfdc2458 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sun, 1 Jun 2025 18:06:17 +0300
Subject: [PATCH 24/26] completed action shared link

---
 app/controllers/start_form_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb
index a7f113e9..415adab4 100644
--- a/app/controllers/start_form_controller.rb
+++ b/app/controllers/start_form_controller.rb
@@ -67,6 +67,8 @@ class StartFormController < ApplicationController
   end
 
   def completed
+    return redirect_to start_form_path(@template.slug) if !@template.shared_link? || @template.archived_at?
+
     @submitter = Submitter.where(submission: @template.submissions)
                           .where.not(completed_at: nil)
                           .find_by!(email: params[:email])

From de3f83db9623459cb7836396f3bc894fea702812 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Tue, 3 Jun 2025 09:52:46 +0300
Subject: [PATCH 25/26] use metadata lang

---
 lib/submissions/generate_audit_trail.rb        |  6 +++---
 lib/submissions/generate_result_attachments.rb | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb
index 32622049..e5ec4220 100644
--- a/lib/submissions/generate_audit_trail.rb
+++ b/lib/submissions/generate_audit_trail.rb
@@ -31,7 +31,9 @@ module Submissions
     def call(submission)
       account = submission.account
 
-      I18n.with_locale(account.locale) do
+      last_submitter = submission.submitters.select(&:completed_at).max_by(&:completed_at)
+
+      I18n.with_locale(last_submitter.metadata.fetch('lang', account.locale)) do
         document = build_audit_trail(submission)
 
         pkcs = Accounts.load_signing_pkcs(account)
@@ -41,8 +43,6 @@ module Submissions
 
         document.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
 
-        last_submitter = submission.submitters.select(&:completed_at).max_by(&:completed_at)
-
         if pkcs
           sign_params = {
             reason: sign_reason,
diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb
index e260192d..7dfdb6d9 100644
--- a/lib/submissions/generate_result_attachments.rb
+++ b/lib/submissions/generate_result_attachments.rb
@@ -152,7 +152,8 @@ module Submissions
                   TESTING_FOOTER
                 end
               else
-                "#{I18n.t('document_id', locale: submitter.account.locale)}: #{document_id}"
+                "#{I18n.t('document_id',
+                          locale: submitter.metadata.fetch('lang', submitter.account.locale))}: #{document_id}"
               end
 
             text = HexaPDF::Layout::TextFragment.create(
@@ -182,6 +183,8 @@ module Submissions
 
       with_headings = find_last_submitter(submitter.submission, submitter:).blank? if with_headings.nil?
 
+      locale = submitter.metadata.fetch('lang', account.locale)
+
       submitter.submission.template_fields.each do |field|
         next if field['type'] == 'heading' && !with_headings
         next if field['submitter_uuid'] != submitter.uuid && field['type'] != 'heading'
@@ -258,7 +261,7 @@ module Submissions
             reason_value = submitter.values[field.dig('preferences', 'reason_field_uuid')].presence
 
             reason_string =
-              I18n.with_locale(submitter.account.locale) do
+              I18n.with_locale(locale) do
                 "#{reason_value ? "#{I18n.t('reason')}: " : ''}#{reason_value || I18n.t('digitally_signed_by')} " \
                   "#{submitter.name}#{submitter.email.present? ? " <#{submitter.email}>" : ''}\n" \
                   "#{I18n.l(attachment.created_at.in_time_zone(submitter.account.timezone), format: :long)} " \
@@ -442,7 +445,7 @@ module Submissions
               option = field['options']&.find { |o| o['uuid'] == area['option_uuid'] }
 
               option_name = option['value'].presence
-              option_name ||= "#{I18n.t('option', locale: account.locale)} #{field['options'].index(option) + 1}"
+              option_name ||= "#{I18n.t('option', locale: locale)} #{field['options'].index(option) + 1}"
 
               value = Array.wrap(value).include?(option_name)
             end
@@ -509,7 +512,7 @@ module Submissions
             end
           else
             if field['type'] == 'date'
-              value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), account.locale)
+              value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), locale)
             end
 
             value = NumberUtils.format_number(value, field.dig('preferences', 'format')) if field['type'] == 'number'

From 0375dad7c9198c14366e80eaef4c9de5b104cb40 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Tue, 3 Jun 2025 10:13:49 +0300
Subject: [PATCH 26/26] smaller audit initial

---
 lib/submissions/generate_audit_trail.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb
index e5ec4220..cdd5945a 100644
--- a/lib/submissions/generate_audit_trail.rb
+++ b/lib/submissions/generate_audit_trail.rb
@@ -322,7 +322,7 @@ module Submissions
               resized_image = image.resize([scale, 1].min)
               io = StringIO.new(resized_image.write_to_buffer('.png'))
 
-              width = field['type'] == 'initials' ? 100 : 200
+              width = field['type'] == 'initials' ? 50 : 200
               height = resized_image.height * (width.to_f / resized_image.width)
 
               if height > MAX_IMAGE_HEIGHT