Merge from docusealco/wip

.github/workflows/ci.yml

@@ -157,7 +157,10 @@ jobs:
           bundle install --jobs 4 --retry 4
           yarn install
           sudo apt-get update
-          sudo apt-get install libvips
+          sudo apt-get install -y libvips
+          wget -O pdfium-linux.tgz "https://github.com/docusealco/pdfium-binaries/releases/latest/download/pdfium-linux-$(uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/').tgz"
+          sudo tar -xzf pdfium-linux.tgz --strip-components=1 -C /usr/lib lib/libpdfium.so
+          rm -f pdfium-linux.tgz
       - name: Run
         env:
           RAILS_ENV: test

.rspec

@@ -0,0 +1 @@
+--require rails_helper

Dockerfile

@@ -1,8 +1,17 @@
-FROM ruby:3.4.2-alpine AS fonts
+FROM ruby:3.4.2-alpine AS download
 
 WORKDIR /fonts
 
-RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
+RUN apk --no-cache add fontforge wget && \
+    wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && \
+    wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && \
+    wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && \
+    wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && \
+    wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && \
+    wget https://github.com/impallari/DancingScript/raw/master/OFL.txt && \
+    wget -O pdfium-linux.tgz "https://github.com/docusealco/pdfium-binaries/releases/latest/download/pdfium-linux-$(uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/').tgz" && \
+    mkdir -p /pdfium-linux && \
+    tar -xzf pdfium-linux.tgz -C /pdfium-linux
 
 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
 
@@ -41,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 vips-poppler poppler-utils 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 gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
 
 RUN echo $'.include = /etc/ssl/openssl.cnf\n\
 \n\
@@ -70,8 +79,10 @@ COPY ./tmp ./tmp
 COPY LICENSE README.md Rakefile config.ru .version ./
 COPY .version ./public/version
 
-COPY --from=fonts /fonts/GoNotoKurrent-Regular.ttf /fonts/GoNotoKurrent-Bold.ttf /fonts/DancingScript-Regular.otf /fonts/OFL.txt /fonts
-COPY --from=fonts /fonts/FreeSans.ttf /usr/share/fonts/freefont
+COPY --from=download /fonts/GoNotoKurrent-Regular.ttf /fonts/GoNotoKurrent-Bold.ttf /fonts/DancingScript-Regular.otf /fonts/OFL.txt /fonts
+COPY --from=download /fonts/FreeSans.ttf /usr/share/fonts/freefont
+COPY --from=download /pdfium-linux/lib/libpdfium.so /usr/lib/libpdfium.so
+COPY --from=download /pdfium-linux/licenses/pdfium.txt /usr/lib/libpdfium-LICENSE.txt
 COPY --from=webpack /app/public/packs ./public/packs
 
 RUN ln -s /fonts /app/public/fonts

Gemfile.lock

@@ -338,18 +338,18 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.5)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.5-aarch64-linux-gnu)
+    nokogiri (1.18.8-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.5-aarch64-linux-musl)
+    nokogiri (1.18.8-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.5-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.5-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.5-x86_64-linux-musl)
+    nokogiri (1.18.8-x86_64-linux-musl)
       racc (~> 1.4)
     oj (3.16.8)
       bigdecimal (>= 3.0)
@@ -387,7 +387,7 @@ GEM
     puma (6.5.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.12)
+    rack (3.1.14)
     rack-proxy (0.7.7)
       rack
     rack-session (2.0.0)

README.md

@@ -42,7 +42,7 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - PDF signature verification
 - Users management
 - Mobile-optimized
-- 6 UI languages with signing available in 13 languages
+- 6 UI languages with signing available in 14 languages
 - API and Webhooks for integrations
 - Easy to deploy in minutes
 

app/controllers/account_configs_controller.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 class AccountConfigsController < ApplicationController
-  before_action :load_account_config
-  authorize_resource :account_config
+  before_action :load_account_config, only: :create
+  authorize_resource :account_config, only: :create
+
+  load_and_authorize_resource :account_config, only: :destroy
 
   ALLOWED_KEYS = [
     AccountConfig::ALLOW_TYPED_SIGNATURE,
@@ -30,6 +32,14 @@ class AccountConfigsController < ApplicationController
     head :ok
   end
 
+  def destroy
+    raise InvalidKey unless ALLOWED_KEYS.include?(@account_config.key)
+
+    @account_config.destroy!
+
+    redirect_back(fallback_location: root_path)
+  end
+
   private
 
   def load_account_config

app/controllers/accounts_controller.rb

@@ -45,7 +45,7 @@ class AccountsController < ApplicationController
   def destroy
     authorize!(:manage, current_account)
 
-    true_user.update!(locked_at: Time.current)
+    true_user.update!(locked_at: Time.current, email: true_user.email.sub('@', '+removed@'))
 
     # rubocop:disable Layout/LineLength
     render turbo_stream: turbo_stream.replace(

app/controllers/api/active_storage_blobs_proxy_controller.rb

@@ -21,7 +21,11 @@ module Api
 
       blob = ActiveStorage::Blob.find_by!(uuid: blob_uuid)
 
-      authorization_check!(blob) if exp.blank?
+      attachment = blob.attachments.take
+
+      @record = attachment.record
+
+      authorization_check!(attachment) if exp.blank?
 
       if request.headers['Range'].present?
         send_blob_byte_range_data blob, request.headers['Range']
@@ -37,9 +41,7 @@ module Api
 
     private
 
-    def authorization_check!(blob)
-      attachment = blob.attachments.take
-
+    def authorization_check!(attachment)
       is_authorized = attachment.name.in?(%w[logo preview_images]) ||
                       (current_user && attachment.record.account.id == current_user.account_id) ||
                       (current_user && !Docuseal.multitenant? && current_user.role == 'superadmin') ||

app/controllers/api/submissions_controller.rb

@@ -11,17 +11,7 @@ module Api
 
     def index
       submissions = Submissions.search(@submissions, params[:q])
-      submissions = submissions.where(template_id: params[:template_id]) if params[:template_id].present?
-
-      if params[:template_folder].present?
-        submissions = submissions.joins(template: :folder).where(folder: { name: params[:template_folder] })
-      end
-
-      if params.key?(:archived)
-        submissions = params[:archived].in?(['true', true]) ? submissions.archived : submissions.active
-      end
-
-      submissions = Submissions::Filter.call(submissions, current_user, params)
+      submissions = filter_submissions(submissions, params)
 
       submissions = paginate(submissions.preload(:created_by_user, :submitters,
                                                  template: :folder,
@@ -115,6 +105,21 @@ module Api
 
     private
 
+    def filter_submissions(submissions, params)
+      submissions = submissions.where(template_id: params[:template_id]) if params[:template_id].present?
+      submissions = submissions.where(slug: params[:slug]) if params[:slug].present?
+
+      if params[:template_folder].present?
+        submissions = submissions.joins(template: :folder).where(folder: { name: params[:template_folder] })
+      end
+
+      if params.key?(:archived)
+        submissions = params[:archived].in?(['true', true]) ? submissions.archived : submissions.active
+      end
+
+      Submissions::Filter.call(submissions, current_user, params)
+    end
+
     def build_create_json(submissions)
       json = submissions.flat_map do |submission|
         submission.submitters.map do |s|

app/controllers/api/submitter_email_clicks_controller.rb

@@ -6,10 +6,10 @@ module Api
     skip_authorization_check
 
     def create
-      submitter = Submitter.find_by!(slug: params[:submitter_slug])
+      @submitter = Submitter.find_by!(slug: params[:submitter_slug])
 
-      if params[:t] == SubmissionEvents.build_tracking_param(submitter, 'click_email')
-        SubmissionEvents.create_with_tracking_data(submitter, 'click_email', request)
+      if params[:t] == SubmissionEvents.build_tracking_param(@submitter, 'click_email')
+        SubmissionEvents.create_with_tracking_data(@submitter, 'click_email', request)
       end
 
       render json: {}

app/controllers/api/submitter_form_views_controller.rb

@@ -6,15 +6,15 @@ module Api
     skip_authorization_check
 
     def create
-      submitter = Submitter.find_by!(slug: params[:submitter_slug])
+      @submitter = Submitter.find_by!(slug: params[:submitter_slug])
 
-      submitter.opened_at = Time.current
-      submitter.save
+      @submitter.opened_at = Time.current
+      @submitter.save
 
-      SubmissionEvents.create_with_tracking_data(submitter, 'view_form', request)
+      SubmissionEvents.create_with_tracking_data(@submitter, 'view_form', request)
 
-      WebhookUrls.for_account_id(submitter.account_id, 'form.viewed').each do |webhook_url|
-        SendFormViewedWebhookRequestJob.perform_async('submitter_id' => submitter.id,
+      WebhookUrls.for_account_id(@submitter.account_id, 'form.viewed').each do |webhook_url|
+        SendFormViewedWebhookRequestJob.perform_async('submitter_id' => @submitter.id,
                                                       'webhook_url_id' => webhook_url.id)
       end
 

app/controllers/api/submitters_controller.rb

@@ -7,15 +7,7 @@ module Api
     def index
       submitters = Submitters.search(@submitters, params[:q])
 
-      submitters = submitters.where(external_id: params[:application_key]) if params[:application_key].present?
-      submitters = submitters.where(external_id: params[:external_id]) if params[:external_id].present?
-      submitters = submitters.where(submission_id: params[:submission_id]) if params[:submission_id].present?
-
-      if params[:template_id].present?
-        submitters = submitters.joins(:submission).where(submission: { template_id: params[:template_id] })
-      end
-
-      submitters = maybe_filder_by_completed_at(submitters, params)
+      submitters = filter_submitters(submitters, params)
 
       submitters = paginate(
         submitters.preload(:template, :submission, :submission_events,
@@ -163,6 +155,19 @@ module Api
       submitter
     end
 
+    def filter_submitters(submitters, params)
+      submitters = submitters.where(external_id: params[:application_key]) if params[:application_key].present?
+      submitters = submitters.where(external_id: params[:external_id]) if params[:external_id].present?
+      submitters = submitters.where(slug: params[:slug]) if params[:slug].present?
+      submitters = submitters.where(submission_id: params[:submission_id]) if params[:submission_id].present?
+
+      if params[:template_id].present?
+        submitters = submitters.joins(:submission).where(submissions: { template_id: params[:template_id] })
+      end
+
+      maybe_filder_by_completed_at(submitters, params)
+    end
+
     def assign_external_id(submitter, attrs)
       submitter.external_id = attrs[:application_key] if attrs.key?(:application_key)
       submitter.external_id = attrs[:external_id] if attrs.key?(:external_id)

app/controllers/api/templates_clone_controller.rb

@@ -5,7 +5,7 @@ module Api
     load_and_authorize_resource :template
 
     def create
-      authorize!(:manage, @template)
+      authorize!(:create, @template)
 
       ActiveRecord::Associations::Preloader.new(
         records: [@template],

app/controllers/api/templates_controller.rb

@@ -90,6 +90,7 @@ module Api
       templates = params[:archived].in?(['true', true]) ? templates.archived : templates.active
       templates = templates.where(external_id: params[:application_key]) if params[:application_key].present?
       templates = templates.where(external_id: params[:external_id]) if params[:external_id].present?
+      templates = templates.where(slug: params[:slug]) if params[:slug].present?
       templates = templates.joins(:folder).where(folder: { name: params[:folder] }) if params[:folder].present?
 
       templates

app/controllers/preview_document_page_controller.rb

@@ -12,6 +12,8 @@ class PreviewDocumentPageController < ActionController::API
 
     return head :not_found unless attachment
 
+    @template = attachment.record
+
     preview_image = attachment.preview_images.joins(:blob)
                               .find_by(blob: { filename: ["#{params[:id]}.png", "#{params[:id]}.jpg"] })
 

app/controllers/send_submission_email_controller.rb

@@ -10,16 +10,17 @@ class SendSubmissionEmailController < ApplicationController
   SEND_DURATION = 30.minutes
 
   def create
-    @submitter =
-      if params[:template_slug]
-        Submitter.joins(submission: :template).find_by!(email: params[:email].to_s.downcase,
-                                                        template: { slug: params[:template_slug] })
-      elsif params[:submission_slug]
-        Submitter.joins(:submission).find_by!(email: params[:email].to_s.downcase,
-                                              submission: { slug: params[:submission_slug] })
-      else
-        Submitter.find_by!(slug: params[:submitter_slug])
-      end
+    if params[:template_slug]
+      @submitter = Submitter.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] })
+
+      return redirect_to submissions_preview_completed_path(params[:submission_slug], status: :error) unless @submitter
+    else
+      @submitter = Submitter.find_by!(slug: params[:submitter_slug])
+    end
 
     RateLimit.call("send-email-#{@submitter.id}", limit: 2, ttl: 5.minutes)
 

app/controllers/start_form_controller.rb

@@ -11,8 +11,11 @@ class StartFormController < ApplicationController
   before_action :load_template
 
   def show
+    raise ActionController::RoutingError, I18n.t('not_found') if @template.preferences['require_phone_2fa'] == true
+
     @submitter = @template.submissions.new(account_id: @template.account_id)
-                          .submitters.new(uuid: (filter_undefined_submitters(@template).first ||
+                          .submitters.new(account_id: @template.account_id,
+                                          uuid: (filter_undefined_submitters(@template).first ||
                                                  @template.submitters.first)['uuid'])
   end
 
@@ -40,9 +43,11 @@ class StartFormController < ApplicationController
 
       if @submitter.save
         if is_new_record
-          WebhookUrls.for_account_id(@submitter.account_id, 'submission.created').each do |webhook_url|
-            SendSubmissionCreatedWebhookRequestJob.perform_async('submission_id' => @submitter.submission_id,
-                                                                 'webhook_url_id' => webhook_url.id)
+          enqueue_submission_create_webhooks(@submitter)
+
+          if @submitter.submission.expire_at?
+            ProcessSubmissionExpiredJob.perform_at(@submitter.submission.expire_at,
+                                                   'submission_id' => @submitter.submission_id)
           end
         end
 
@@ -61,6 +66,13 @@ class StartFormController < ApplicationController
 
   private
 
+  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,
+                                                           'webhook_url_id' => webhook_url.id)
+    end
+  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))
@@ -94,6 +106,7 @@ class StartFormController < ApplicationController
     submitter.submission ||= Submission.new(template:,
                                             account_id: template.account_id,
                                             template_submitters: template.submitters,
+                                            expire_at: Templates.build_default_expire_at(template),
                                             submitters: [submitter],
                                             source: :link)
 

app/controllers/submissions_archived_controller.rb

@@ -7,9 +7,7 @@ class SubmissionsArchivedController < ApplicationController
     @submissions = @submissions.joins(:template)
     @submissions = @submissions.where.not(archived_at: nil)
                                .or(@submissions.where.not(templates: { archived_at: nil }))
-                               .preload(:created_by_user, template: :author)
-
-    @submissions = @submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
+                               .preload(:template_accesses, :created_by_user, template: :author)
 
     @submissions = Submissions.search(@submissions, params[:q], search_template: true)
     @submissions = Submissions::Filter.call(@submissions, current_user, params)

app/controllers/submissions_controller.rb

@@ -57,6 +57,11 @@ class SubmissionsController < ApplicationController
     Submissions.send_signature_requests(submissions)
 
     redirect_to template_path(@template), notice: I18n.t('new_recipients_have_been_added')
+  rescue Submissions::CreateFromSubmitters::BaseError => e
+    render turbo_stream: turbo_stream.replace(:submitters_error,
+                                              partial: 'submissions/error',
+                                              locals: { error: e.message }),
+           status: :unprocessable_entity
   end
 
   def destroy

app/controllers/submissions_dashboard_controller.rb

@@ -8,9 +8,7 @@ class SubmissionsDashboardController < ApplicationController
 
     @submissions = @submissions.where(archived_at: nil)
                                .where(templates: { archived_at: nil })
-                               .preload(:created_by_user, template: :author)
-
-    @submissions = @submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
+                               .preload(:template_accesses, :created_by_user, template: :author)
 
     @submissions = Submissions.search(@submissions, params[:q], search_template: true)
     @submissions = Submissions::Filter.call(@submissions, current_user, params)

app/controllers/submissions_download_controller.rb

@@ -8,20 +8,20 @@ class SubmissionsDownloadController < ApplicationController
   FILES_TTL = 5.minutes
 
   def index
-    submitter = Submitter.find_signed(params[:sig], purpose: :download_completed) if params[:sig].present?
+    @submitter = Submitter.find_signed(params[:sig], purpose: :download_completed) if params[:sig].present?
 
     signature_valid =
-      if submitter&.slug == params[:submitter_slug]
+      if @submitter&.slug == params[:submitter_slug]
         true
       else
-        submitter = nil
+        @submitter = nil
       end
 
-    submitter ||= Submitter.find_by!(slug: params[:submitter_slug])
+    @submitter ||= Submitter.find_by!(slug: params[:submitter_slug])
 
-    Submissions::EnsureResultGenerated.call(submitter)
+    Submissions::EnsureResultGenerated.call(@submitter)
 
-    last_submitter = submitter.submission.submitters.where.not(completed_at: nil).order(:completed_at).last
+    last_submitter = @submitter.submission.submitters.where.not(completed_at: nil).order(:completed_at).last
 
     return head :not_found unless last_submitter
 
@@ -34,7 +34,7 @@ class SubmissionsDownloadController < ApplicationController
     end
 
     if params[:combined] == 'true'
-      url = build_combined_url(submitter)
+      url = build_combined_url(@submitter)
 
       if url
         render json: [url]

app/controllers/submissions_preview_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class SubmissionsPreviewController < ApplicationController
+  around_action :with_browser_locale
   skip_before_action :authenticate_user!
   skip_authorization_check
 

app/controllers/submit_form_controller.rb

@@ -7,11 +7,11 @@ class SubmitFormController < ApplicationController
   skip_before_action :authenticate_user!
   skip_authorization_check
 
+  before_action :load_submitter, only: %i[show update completed]
+
   CONFIG_KEYS = [].freeze
 
   def show
-    @submitter = Submitter.find_by!(slug: params[:slug])
-
     submission = @submitter.submission
 
     return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
@@ -50,44 +50,44 @@ class SubmitFormController < ApplicationController
   end
 
   def update
-    submitter = Submitter.find_by!(slug: params[:slug])
-
-    if submitter.completed_at?
+    if @submitter.completed_at?
       return render json: { error: I18n.t('form_has_been_completed_already') }, status: :unprocessable_entity
     end
 
-    if submitter.template.archived_at? || submitter.submission.archived_at?
+    if @submitter.template.archived_at? || @submitter.submission.archived_at?
       return render json: { error: I18n.t('form_has_been_archived') }, status: :unprocessable_entity
     end
 
-    if submitter.submission.expired?
+    if @submitter.submission.expired?
       return render json: { error: I18n.t('form_has_been_expired') }, status: :unprocessable_entity
     end
 
-    if submitter.declined_at?
+    if @submitter.declined_at?
       return render json: { error: I18n.t('form_has_been_declined') },
                     status: :unprocessable_entity
     end
 
-    Submitters::SubmitValues.call(submitter, params, request)
+    Submitters::SubmitValues.call(@submitter, params, request)
 
     head :ok
   rescue Submitters::SubmitValues::RequiredFieldError => e
-    Rollbar.warning("Required field #{submitter.id}: #{e.message}") if defined?(Rollbar)
+    Rollbar.warning("Required field #{@submitter.id}: #{e.message}") if defined?(Rollbar)
 
     render json: { field_uuid: e.message }, status: :unprocessable_entity
   rescue Submitters::SubmitValues::ValidationError => e
     render json: { error: e.message }, status: :unprocessable_entity
   end
 
-  def completed
-    @submitter = Submitter.completed.find_by!(slug: params[:submit_form_slug])
-  end
+  def completed; end
 
   def success; end
 
   private
 
+  def load_submitter
+    @submitter = Submitter.find_by!(slug: params[:slug] || params[:submit_form_slug])
+  end
+
   def build_attachments_index(submission)
     ActiveStorage::Attachment.where(record: submission.submitters, name: :attachments)
                              .preload(:blob).index_by(&:uuid)

app/controllers/submit_form_download_controller.rb

@@ -7,25 +7,25 @@ class SubmitFormDownloadController < ApplicationController
   FILES_TTL = 5.minutes
 
   def index
-    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+    @submitter = Submitter.find_by!(slug: params[:submit_form_slug])
 
-    return redirect_to submitter_download_index_path(submitter.slug) if submitter.completed_at?
+    return redirect_to submitter_download_index_path(@submitter.slug) if @submitter.completed_at?
 
-    return head :unprocessable_entity if submitter.declined_at? ||
-                                         submitter.submission.archived_at? ||
-                                         submitter.submission.expired? ||
-                                         submitter.submission.template.archived_at?
+    return head :unprocessable_entity if @submitter.declined_at? ||
+                                         @submitter.submission.archived_at? ||
+                                         @submitter.submission.expired? ||
+                                         @submitter.submission.template.archived_at?
 
-    last_completed_submitter = submitter.submission.submitters
-                                        .where.not(id: submitter.id)
-                                        .where.not(completed_at: nil)
-                                        .max_by(&:completed_at)
+    last_completed_submitter = @submitter.submission.submitters
+                                         .where.not(id: @submitter.id)
+                                         .where.not(completed_at: nil)
+                                         .max_by(&:completed_at)
 
     attachments =
       if last_completed_submitter
         Submitters.select_attachments_for_download(last_completed_submitter)
       else
-        submitter.submission.template.schema_documents.preload(:blob)
+        @submitter.submission.template.schema_documents.preload(:blob)
       end
 
     urls = attachments.map do |attachment|

app/controllers/template_folders_controller.rb

@@ -5,8 +5,9 @@ class TemplateFoldersController < ApplicationController
 
   def show
     @templates = @template_folder.templates.active.accessible_by(current_ability)
-                                 .preload(:author, :template_accesses).order(id: :desc)
+                                 .preload(:author, :template_accesses)
     @templates = Templates.search(@templates, params[:q])
+    @templates = Templates::Order.call(@templates, current_user, cookies.permanent[:dashboard_templates_order])
 
     @pagy, @templates = pagy(@templates, limit: 12)
   end

app/controllers/templates_clone_and_replace_controller.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class TemplatesCloneAndReplaceController < ApplicationController
+  load_and_authorize_resource :template
+
+  def create
+    return head :unprocessable_entity if params[:files].blank?
+
+    ActiveRecord::Associations::Preloader.new(
+      records: [@template],
+      associations: [schema_documents: :preview_images_attachments]
+    ).call
+
+    cloned_template = Templates::Clone.call(@template, author: current_user)
+    cloned_template.name = File.basename(params[:files].first.original_filename, '.*')
+    cloned_template.save!
+
+    documents = Templates::ReplaceAttachments.call(cloned_template, params, extract_fields: true)
+
+    cloned_template.save!
+
+    Templates::CloneAttachments.call(template: cloned_template, original_template: @template,
+                                     excluded_attachment_uuids: documents.map(&:uuid))
+
+    respond_to do |f|
+      f.html { redirect_to edit_template_path(cloned_template) }
+      f.json { render json: { id: cloned_template.id } }
+    end
+  rescue Templates::CreateAttachments::PdfEncrypted
+    respond_to do |f|
+      f.html { render turbo_stream: turbo_stream.append(params[:form_id], html: helpers.tag.prompt_password) }
+      f.json { render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_entity }
+    end
+  end
+end

app/controllers/templates_controller.rb

@@ -21,9 +21,7 @@ class TemplatesController < ApplicationController
                     submissions.order(id: :desc)
                   end
 
-    submissions = submissions.preload(:template_accesses) unless current_user.role.in?(%w[admin superadmin])
-
-    @pagy, @submissions = pagy(submissions.preload(submitters: :start_form_submission_events))
+    @pagy, @submissions = pagy(submissions.preload(:template_accesses, submitters: :start_form_submission_events))
   rescue ActiveRecord::RecordNotFound
     redirect_to root_path
   end

app/controllers/templates_dashboard_controller.rb

@@ -9,9 +9,11 @@ class TemplatesDashboardController < ApplicationController
   FOLDERS_PER_PAGE = 18
 
   def index
-    @template_folders = @template_folders.where(id: @templates.active.select(:folder_id)).order(id: :desc)
+    @template_folders = @template_folders.where(id: @templates.active.select(:folder_id))
 
     @template_folders = TemplateFolders.search(@template_folders, params[:q])
+    @template_folders = sort_template_folders(@template_folders, current_user,
+                                              cookies.permanent[:dashboard_templates_order])
 
     @pagy, @template_folders = pagy(
       @template_folders,
@@ -24,6 +26,7 @@ class TemplatesDashboardController < ApplicationController
     else
       @template_folders = @template_folders.reject { |e| e.name == TemplateFolder::DEFAULT_NAME }
       @templates = filter_templates(@templates)
+      @templates = Templates::Order.call(@templates, current_user, cookies.permanent[:dashboard_templates_order])
 
       limit =
         if @template_folders.size < 4
@@ -39,19 +42,55 @@ class TemplatesDashboardController < ApplicationController
   private
 
   def filter_templates(templates)
-    rel = templates.active.preload(:author, :template_accesses).order(id: :desc)
+    rel = templates.active.preload(:author, :template_accesses)
 
     if params[:q].blank?
-      if Docuseal.multitenant? && !current_account.testing?
-        rel = rel.where(folder_id: current_account.default_template_folder.id)
-      else
-        shared_template_ids =
-          TemplateSharing.where(account_id: [current_account.id, TemplateSharing::ALL_ID]).select(:template_id)
+      if Docuseal.multitenant? ? current_account.testing? : current_account.linked_account_account
+        shared_account_ids = [current_user.account_id]
+        shared_account_ids << TemplateSharing::ALL_ID if !Docuseal.multitenant? && !current_account.testing?
+
+        shared_template_ids = TemplateSharing.where(account_id: shared_account_ids).select(:template_id)
 
         rel = rel.where(folder_id: current_account.default_template_folder.id).or(rel.where(id: shared_template_ids))
+      else
+        rel = rel.where(folder_id: current_account.default_template_folder.id)
       end
     end
 
     Templates.search(rel, params[:q])
   end
+
+  def sort_template_folders(template_folders, current_user, order)
+    case order
+    when 'used_at'
+      subquery =
+        Template.left_joins(:submissions)
+                .group(:folder_id)
+                .where(account_id: current_user.account_id)
+                .select(
+                  :folder_id,
+                  Template.arel_table[:updated_at].maximum.as('updated_at_max'),
+                  Submission.arel_table[:created_at].maximum.as('submission_created_at_max')
+                )
+
+      template_folders = template_folders.joins(
+        Template.arel_table
+                .join(subquery.arel.as('templates'), Arel::Nodes::OuterJoin)
+                .on(TemplateFolder.arel_table[:id].eq(Template.arel_table[:folder_id]))
+                .join_sources
+      )
+
+      template_folders.order(
+        Arel::Nodes::Case.new
+                         .when(Template.arel_table[:submission_created_at_max].gt(Template.arel_table[:updated_at_max]))
+                         .then(Template.arel_table[:submission_created_at_max])
+                         .else(Template.arel_table[:updated_at_max])
+                         .desc
+      )
+    when 'name'
+      template_folders.order(name: :asc)
+    else
+      template_folders.order(id: :desc)
+    end
+  end
 end

app/controllers/templates_preferences_controller.rb

@@ -24,14 +24,22 @@ class TemplatesPreferencesController < ApplicationController
                       documents_copy_email_enabled documents_copy_email_attach_audit
                       documents_copy_email_attach_documents documents_copy_email_reply_to
                       completed_notification_email_attach_documents
-                      completed_redirect_url
-                      submitters_order
+                      completed_redirect_url validate_unique_submitters
+                      submitters_order require_phone_2fa
+                      default_expire_at_duration
+                      default_expire_at
                       completed_notification_email_subject completed_notification_email_body
                       completed_notification_email_enabled completed_notification_email_attach_audit] +
                       [completed_message: %i[title body],
                        submitters: [%i[uuid request_email_subject request_email_body]]]
     ).tap do |attrs|
       attrs[:preferences].delete(:submitters) if params[:request_email_per_submitter] != '1'
+
+      if (default_expire_at = attrs.dig(:preferences, :default_expire_at).presence)
+        attrs[:preferences][:default_expire_at] =
+          (ActiveSupport::TimeZone[current_account.timezone] || Time.zone).parse(default_expire_at).utc
+      end
+
       attrs[:preferences] = attrs[:preferences].transform_values do |value|
         if %w[true false].include?(value)
           value == 'true'

app/controllers/users_controller.rb

@@ -16,7 +16,7 @@ class UsersController < ApplicationController
         @users.active.where.not(role: 'integration')
       end
 
-    @pagy, @users = pagy(@users.where(account: current_account).order(id: :desc))
+    @pagy, @users = pagy(@users.preload(account: :account_accesses).where(account: current_account).order(id: :desc))
   end
 
   def new; end

app/javascript/application.js

@@ -33,6 +33,7 @@ import MaskedInput from './elements/masked_input'
 import SetDateButton from './elements/set_date_button'
 import IndeterminateCheckbox from './elements/indeterminate_checkbox'
 import AppTour from './elements/app_tour'
+import DashboardDropzone from './elements/dashboard_dropzone'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -101,6 +102,7 @@ safeRegisterElement('masked-input', MaskedInput)
 safeRegisterElement('set-date-button', SetDateButton)
 safeRegisterElement('indeterminate-checkbox', IndeterminateCheckbox)
 safeRegisterElement('app-tour', AppTour)
+safeRegisterElement('dashboard-dropzone', DashboardDropzone)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
@@ -125,6 +127,7 @@ safeRegisterElement('template-builder', class extends HTMLElement {
       withSendButton: this.dataset.withSendButton !== 'false',
       withSignYourselfButton: this.dataset.withSignYourselfButton !== 'false',
       withConditions: this.dataset.withConditions === 'true',
+      withReplaceAndCloneUpload: true,
       currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
       acceptFileTypes: this.dataset.acceptFileTypes,
       showTourStartForm: this.dataset.showTourStartForm === 'true'

app/javascript/elements/dashboard_dropzone.js

@@ -0,0 +1,222 @@
+import { target, targets, targetable } from '@github/catalyst/lib/targetable'
+
+const loadingIconHtml = `<svg xmlns="http://www.w3.org/2000/svg" class="animate-spin" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M12 3a9 9 0 1 0 9 9" />
+</svg>`
+
+export default targetable(class extends HTMLElement {
+  static [targets.static] = [
+    'hiddenOnDrag',
+    'folderCards',
+    'templateCards'
+  ]
+
+  static [target.static] = [
+    'form',
+    'fileDropzone',
+    'fileDropzoneLoading'
+  ]
+
+  connectedCallback () {
+    document.addEventListener('drop', this.onWindowDragdrop)
+    document.addEventListener('dragover', this.onWindowDropover)
+
+    window.addEventListener('dragleave', this.onWindowDragleave)
+
+    this.fileDropzone?.addEventListener('drop', this.onDropFile)
+
+    this.folderCards.forEach((el) => el.addEventListener('drop', (e) => this.onDropFolder(e, el)))
+    this.templateCards.forEach((el) => el.addEventListener('drop', this.onDropTemplate))
+    this.templateCards.forEach((el) => el.addEventListener('dragstart', this.onTemplateDragStart))
+
+    return [this.fileDropzone, ...this.folderCards, ...this.templateCards].forEach((el) => {
+      el?.addEventListener('dragover', this.onDragover)
+      el?.addEventListener('dragleave', this.onDragleave)
+    })
+  }
+
+  disconnectedCallback () {
+    document.removeEventListener('drop', this.onWindowDragdrop)
+    document.removeEventListener('dragover', this.onWindowDropover)
+
+    window.removeEventListener('dragleave', this.onWindowDragleave)
+  }
+
+  onTemplateDragStart = (e) => {
+    const id = e.target.href.split('/').pop()
+
+    e.dataTransfer.effectAllowed = 'move'
+
+    if (id) {
+      e.dataTransfer.setData('template_id', id)
+
+      const dragPreview = e.target.cloneNode(true)
+      const rect = e.target.getBoundingClientRect()
+
+      const height = e.target.children[0].getBoundingClientRect().height + 50
+
+      dragPreview.children[1].remove()
+      dragPreview.style.width = `${rect.width}px`
+      dragPreview.style.height = `${height}px`
+      dragPreview.style.position = 'absolute'
+      dragPreview.style.top = '-1000px'
+      dragPreview.style.pointerEvents = 'none'
+      dragPreview.style.opacity = '0.9'
+
+      document.body.appendChild(dragPreview)
+
+      e.dataTransfer.setDragImage(dragPreview, rect.width / 2, height / 2)
+
+      setTimeout(() => document.body.removeChild(dragPreview), 0)
+    }
+  }
+
+  onDropFile = (e) => {
+    e.preventDefault()
+
+    this.fileDropzoneLoading.classList.remove('hidden')
+    this.fileDropzoneLoading.previousElementSibling.classList.add('hidden')
+    this.fileDropzoneLoading.classList.add('opacity-50')
+
+    this.uploadFiles(e.dataTransfer.files, '/templates_upload')
+  }
+
+  onDropFolder = (e, el) => {
+    e.preventDefault()
+
+    const templateId = e.dataTransfer.getData('template_id')
+
+    if (e.dataTransfer.files.length || templateId) {
+      const loading = document.createElement('div')
+      const svg = el.querySelector('svg')
+
+      loading.innerHTML = loadingIconHtml
+      loading.children[0].classList.add(...svg.classList)
+
+      el.replaceChild(loading.children[0], svg)
+      el.classList.add('opacity-50')
+
+      if (e.dataTransfer.files.length) {
+        const params = new URLSearchParams({ folder_name: el.innerText }).toString()
+
+        this.uploadFiles(e.dataTransfer.files, `/templates_upload?${params}`)
+      } else {
+        const formData = new FormData()
+
+        formData.append('name', el.innerText)
+
+        fetch(`/templates/${templateId}/folder`, {
+          method: 'PUT',
+          redirect: 'manual',
+          body: formData,
+          headers: {
+            'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]').content
+          }
+        }).finally(() => {
+          window.Turbo.cache.clear()
+          window.Turbo.visit(location.href)
+        })
+      }
+    }
+  }
+
+  onDropTemplate = (e) => {
+    e.preventDefault()
+
+    if (e.dataTransfer.files.length) {
+      const loading = document.createElement('div')
+      loading.classList.add('bottom-5', 'left-0', 'flex', 'justify-center', 'w-full', 'absolute')
+      loading.innerHTML = loadingIconHtml
+
+      e.target.appendChild(loading)
+      e.target.classList.add('opacity-50')
+
+      const id = e.target.href.split('/').pop()
+
+      this.uploadFiles(e.dataTransfer.files, `/templates/${id}/clone_and_replace`)
+    }
+  }
+
+  onWindowDragdrop = (e) => {
+    e.preventDefault()
+
+    if (!this.isLoading) this.hideDraghover()
+  }
+
+  uploadFiles (files, url) {
+    this.isLoading = true
+
+    this.form.action = url
+
+    this.form.querySelector('[type="file"]').files = files
+
+    this.form.querySelector('[type="submit"]').click()
+  }
+
+  onWindowDropover = (e) => {
+    e.preventDefault()
+
+    if (e.dataTransfer?.types?.includes('Files')) {
+      this.showDraghover()
+    }
+  }
+
+  onDragover (e) {
+    if (e.dataTransfer?.types?.includes('Files') || this.dataset.targets !== 'dashboard-dropzone.templateCards') {
+      this.style.backgroundColor = '#F7F3F0'
+
+      if (this.classList.contains('before:border-base-300')) {
+        this.classList.remove('before:border-base-300')
+        this.classList.add('before:border-base-content/30')
+      } else if (this.classList.contains('border-base-300')) {
+        this.classList.remove('border-base-300')
+        this.classList.add('border-base-content/30')
+      }
+    }
+  }
+
+  onDragleave () {
+    this.style.backgroundColor = null
+
+    if (this.classList.contains('before:border-base-content/30')) {
+      this.classList.remove('before:border-base-content/30')
+      this.classList.add('before:border-base-300')
+    } else if (this.classList.contains('border-base-content/30')) {
+      this.classList.remove('border-base-content/30')
+      this.classList.add('border-base-300')
+    }
+  }
+
+  onWindowDragleave = (e) => {
+    if (e.clientX <= 0 || e.clientY <= 0 || e.clientX >= window.innerWidth || e.clientY >= window.innerHeight) {
+      this.hideDraghover()
+    }
+  }
+
+  showDraghover = () => {
+    if (this.isDrag) return
+
+    this.isDrag = true
+
+    this.fileDropzone?.classList?.remove('hidden')
+
+    this.hiddenOnDrag.forEach((el) => { el.style.display = 'none' })
+
+    return [...this.folderCards, ...this.templateCards].forEach((el) => {
+      el.classList.remove('bg-base-200', 'before:hidden')
+    })
+  }
+
+  hideDraghover = () => {
+    this.isDrag = false
+
+    this.fileDropzone?.classList?.add('hidden')
+
+    this.hiddenOnDrag.forEach((el) => { el.style.display = null })
+
+    return [...this.folderCards, ...this.templateCards].forEach((el) => {
+      el.classList.add('bg-base-200', 'before:hidden')
+    })
+  }
+})

app/javascript/elements/fetch_form.js

@@ -0,0 +1,36 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.form.addEventListener('submit', (e) => {
+      e.preventDefault()
+
+      this.submit()
+    })
+
+    if (this.dataset.onload === 'true') {
+      this.form.querySelector('button').click()
+    }
+  }
+
+  submit () {
+    fetch(this.form.action, {
+      method: this.form.method,
+      body: new FormData(this.form)
+    }).then(async (resp) => {
+      if (!resp.ok) {
+        try {
+          const data = JSON.parse(await resp.text())
+
+          if (data.error) {
+            alert(data.error)
+          }
+        } catch (err) {
+          console.error(err)
+        }
+      }
+    })
+  }
+
+  get form () {
+    return this.querySelector('form')
+  }
+}

app/javascript/elements/file_dropzone.js

@@ -5,19 +5,37 @@ export default actionable(targetable(class extends HTMLElement {
   static [target.static] = [
     'loading',
     'icon',
-    'input'
+    'input',
+    'area'
   ]
 
   connectedCallback () {
-    this.addEventListener('drop', this.onDrop)
-
     this.addEventListener('dragover', (e) => e.preventDefault())
-
+    this.addEventListener('drop', this.onDrop)
     document.addEventListener('turbo:submit-end', this.toggleLoading)
+    this.area?.addEventListener('dragover', this.onDragover)
+    this.area?.addEventListener('dragleave', this.onDragleave)
   }
 
   disconnectedCallback () {
+    this.removeEventListener('drop', this.onDrop)
     document.removeEventListener('turbo:submit-end', this.toggleLoading)
+    this.area?.removeEventListener('dragover', this.onDragover)
+    this.area?.removeEventListener('dragleave', this.onDragleave)
+  }
+
+  onDragover (e) {
+    if (e.dataTransfer?.types?.includes('Files')) {
+      this.style.backgroundColor = '#F7F3F0'
+      this.classList.remove('border-base-300', 'hover:bg-base-200/30')
+      this.classList.add('border-base-content/30')
+    }
+  }
+
+  onDragleave () {
+    this.style.backgroundColor = null
+    this.classList.remove('border-base-content/30')
+    this.classList.add('border-base-300', 'hover:bg-base-200/30')
   }
 
   onDrop (e) {

app/javascript/elements/scroll_buttons.js

@@ -0,0 +1,62 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.header = document.querySelector('#signing_form_header')
+
+    window.addEventListener('scroll', this.onScroll)
+    window.addEventListener('resize', this.onResize)
+
+    if (!this.isNarrow() && this.isHeaderNotVisible()) {
+      this.showButtons({ animate: false })
+    }
+  }
+
+  disconnectedCallback () {
+    window.removeEventListener('scroll', this.onScroll)
+    window.removeEventListener('resize', this.onResize)
+  }
+
+  onResize = () => {
+    if (this.isNarrow()) {
+      this.hideButtons(true)
+    } else if (this.isHeaderNotVisible()) {
+      this.showButtons()
+    }
+  }
+
+  isNarrow () {
+    return window.innerWidth < 1230
+  }
+
+  onScroll = () => {
+    if (this.isHeaderNotVisible() && !this.isNarrow()) {
+      this.showButtons()
+    } else {
+      this.hideButtons()
+    }
+  }
+
+  isHeaderNotVisible () {
+    const rect = this.header.getBoundingClientRect()
+    return rect.bottom <= 0 || rect.top >= window.innerHeight
+  }
+
+  showButtons ({ animate } = { animate: true }) {
+    if (animate) {
+      this.classList.add('transition-transform', 'duration-300')
+    }
+
+    this.classList.remove('hidden', '-translate-y-10', 'opacity-0')
+    this.classList.add('translate-y-0', 'opacity-100')
+  }
+
+  hideButtons () {
+    this.classList.remove('translate-y-0', 'opacity-100')
+    this.classList.add('-translate-y-10', 'opacity-0')
+
+    setTimeout(() => {
+      if (this.classList.contains('-translate-y-10')) {
+        this.classList.add('hidden')
+      }
+    }, 300)
+  }
+}

app/javascript/elements/toggle_visible.js

@@ -5,7 +5,7 @@ export default actionable(class extends HTMLElement {
     const elementIds = JSON.parse(this.dataset.elementIds)
 
     elementIds.forEach((elementId) => {
-      document.getElementById(elementId).classList.toggle('hidden', event.target.value !== elementId)
+      document.getElementById(elementId).classList.toggle('hidden', (event.target.dataset.toggleId || event.target.value) !== elementId)
     })
   }
 })

app/javascript/form.js

@@ -3,11 +3,15 @@ import { createApp, reactive } from 'vue'
 import Form from './submission_form/form'
 import DownloadButton from './elements/download_button'
 import ToggleSubmit from './elements/toggle_submit'
+import FetchForm from './elements/fetch_form'
+import ScrollButtons from './elements/scroll_buttons'
 
 const safeRegisterElement = (name, element, options = {}) => !window.customElements.get(name) && window.customElements.define(name, element, options)
 
 safeRegisterElement('download-button', DownloadButton)
 safeRegisterElement('toggle-submit', ToggleSubmit)
+safeRegisterElement('fetch-form', FetchForm)
+safeRegisterElement('scroll-buttons', ScrollButtons)
 safeRegisterElement('submission-form', class extends HTMLElement {
   connectedCallback () {
     this.appElem = document.createElement('div')

app/javascript/submission_form/area.vue

@@ -55,10 +55,12 @@
     >
     <div
       v-else-if="field.type === 'signature' && signature"
-      class="flex flex-col justify-between h-full overflow-hidden"
+      class="flex justify-between h-full gap-1 overflow-hidden"
+      :class="isNarrow ? 'flex-row' : 'flex-col'"
     >
       <div
-        class="flex-grow flex overflow-hidden"
+        class="flex overflow-hidden"
+        :class="isNarrow ? 'w-1/2' : 'flex-grow'"
         style="min-height: 50%"
       >
         <img
@@ -68,7 +70,8 @@
       </div>
       <div
         v-if="withSignatureId"
-        class="w-full mt-1 text-[1vw] lg:text-[0.55rem] lg:leading-[0.65rem]"
+        class="text-[1vw] lg:text-[0.55rem] lg:leading-[0.65rem]"
+        :class="isNarrow ? 'w-1/2' : 'w-full'"
       >
         <div class="truncate uppercase">
           ID: {{ signature.uuid }}
@@ -183,7 +186,7 @@
       v-else
       ref="textContainer"
       dir="auto"
-      class="flex items-center px-0.5 w-full"
+      class="flex px-0.5 w-full"
       :class="{ ...alignClasses, ...fontClasses }"
     >
       <span
@@ -327,13 +330,16 @@ export default {
     },
     alignClasses () {
       if (!this.field.preferences) {
-        return {}
+        return { 'items-center': true }
       }
 
       return {
         'text-center': this.field.preferences.align === 'center',
         'text-left': this.field.preferences.align === 'left',
-        'text-right': this.field.preferences.align === 'right'
+        'text-right': this.field.preferences.align === 'right',
+        'items-center': !this.field.preferences.valign || this.field.preferences.valign === 'center',
+        'items-start': this.field.preferences.valign === 'top',
+        'items-end': this.field.preferences.valign === 'bottom'
       }
     },
     fontClasses () {
@@ -441,6 +447,9 @@ export default {
       }
 
       return style
+    },
+    isNarrow () {
+      return this.area.h > 0 && (this.area.w / this.area.h) > 6
     }
   },
   watch: {

app/javascript/submission_form/completed.vue

@@ -193,9 +193,9 @@ export default {
       })
     }
 
-    if (window.decline_button) {
-      window.decline_button.setAttribute('disabled', 'true')
-    }
+    document.querySelectorAll('#decline_button').forEach((button) => {
+      button.setAttribute('disabled', 'true')
+    })
   },
   methods: {
     sendCopyToEmail () {

app/javascript/submission_form/crop_canvas.js

@@ -1,4 +1,4 @@
-function cropCanvasAndExportToPNG (canvas) {
+function cropCanvasAndExportToPNG (canvas, { errorOnTooSmall } = { errorOnTooSmall: false }) {
   const ctx = canvas.getContext('2d')
 
   const width = canvas.width
@@ -33,6 +33,10 @@ function cropCanvasAndExportToPNG (canvas) {
   croppedCanvas.height = croppedHeight
   const croppedCtx = croppedCanvas.getContext('2d')
 
+  if (errorOnTooSmall && (croppedWidth < 20 || croppedHeight < 20)) {
+    return Promise.reject(new Error('Image too small'))
+  }
+
   croppedCtx.drawImage(canvas, leftmost, topmost, croppedWidth, croppedHeight, 0, 0, croppedWidth, croppedHeight)
 
   return new Promise((resolve, reject) => {

app/javascript/submission_form/form.vue

@@ -11,7 +11,7 @@
     :with-label="!isAnonymousChecboxes && showFieldNames"
     :current-step="currentStepFields"
     :scroll-padding="scrollPadding"
-    @focus-step="[saveStep(), goToStep($event, false, true), currentField.type !== 'checkbox' ? isFormVisible = true : '']"
+    @focus-step="[saveStep(), currentField.type !== 'checkbox' ? isFormVisible = true : '', goToStep($event, false, true)]"
   />
   <FieldAreas
     :steps="readonlyConditionalFields.map((e) => [e])"
@@ -93,7 +93,7 @@
   <div
     v-show="isFormVisible"
     id="form_container"
-    class="shadow-md bg-base-100 absolute bottom-0 w-full border-base-200 border p-4 rounded form-container"
+    class="shadow-md bg-base-100 absolute bottom-0 w-full border-base-200 border p-4 rounded form-container overflow-hidden"
     :class="{ 'md:bottom-4': isBreakpointMd }"
     :style="{ backgroundColor: backgroundColor }"
   >
@@ -1133,7 +1133,7 @@ export default {
         parent.style.overflow = 'hidden'
 
         scrollbox.classList.add('h-full', 'overflow-y-auto')
-        scrollbox.parentNode.classList.add('h-screen', 'overflow-y-auto')
+        scrollbox.parentNode.classList.add('h-screen', 'h-[100dvh]', 'overflow-y-auto')
         scrollbox.parentNode.style.maxHeight = '-webkit-fill-available'
       })
     }

app/javascript/submission_form/i18n.js

@@ -148,6 +148,7 @@ const es = {
   sign_now: 'Firmar ahora',
   type_here_: 'Escribe aquí...',
   optional: 'opcional',
+  option: 'Opción',
   appears_on: 'Aparece en',
   page: 'Página',
   select_your_option: 'Selecciona tu opción',
@@ -245,6 +246,7 @@ const it = {
   sign_now: 'Firma ora',
   type_here_: 'Digita qui...',
   optional: 'opzionale',
+  option: 'Opzione',
   appears_on: 'Compare su',
   page: 'Pagina',
   take_photo: 'Scattare una foto',
@@ -265,7 +267,7 @@ const it = {
   document_has_been_signed: 'Il documento è stato firmato!',
   documents_have_been_signed: 'I documenti sono stati firmati!',
   create_a_free_account: 'Crea un Account Gratuito',
-  powered_by: 'Desarrollado por',
+  powered_by: 'Fornito da',
   please_check_the_box_to_continue: 'Si prega di spuntare la casella per continuare.',
   open_source_documents_software: 'software di documenti open source',
   verified_phone_number: 'Verifica numero di telefono',
@@ -343,6 +345,7 @@ const de = {
   sign_now: 'Jetzt unterschreiben',
   type_here_: 'Hier eingeben...',
   optional: 'optional',
+  option: 'Option',
   appears_on: 'Erscheint auf',
   page: 'Seite',
   take_photo: 'Foto aufnehmen',
@@ -393,8 +396,8 @@ const de = {
 
 const fr = {
   complete_all_required_fields_to_proceed_with_identity_verification: "Veuillez remplir tous les champs obligatoires pour continuer la vérification de l'identité.",
-  verif_id: "Vérification de l'ID",
-  verif_identite: "Vérification de l'identité",
+  verify_id: "Vérification de l'ID",
+  identity_verification: "Vérification de l'identité",
   complete: 'Terminer',
   fill_all_required_fields_to_complete: 'Veuillez remplir tous les champs obligatoires pour compléter',
   sign_and_complete: 'Signer et Terminer',
@@ -441,6 +444,7 @@ const fr = {
   sign_now: 'Signer maintenant',
   type_here_: 'Tapez ici...',
   optional: 'facultatif',
+  option: 'Option',
   appears_on: 'Apparaît sur',
   page: 'Page',
   take_photo: 'Prendre une photo',
@@ -539,6 +543,7 @@ const pl = {
   sign_now: 'Podpisz teraz',
   type_here_: 'Wpisz tutaj...',
   optional: 'opcjonalny',
+  option: 'Opcja',
   appears_on: 'Pojawia się na',
   page: 'Strona',
   select_your_option: 'Wybierz swoją opcję',
@@ -583,7 +588,8 @@ const pl = {
   reupload: 'Ponowne przesłanie',
   upload: 'Przesyłanie',
   files: 'Pliki',
-  signature_is_too_small_or_simple_please_redraw: 'Podpis jest zbyt mały lub zbyt prosty. Proszę narysować go ponownie.'
+  signature_is_too_small_or_simple_please_redraw: 'Podpis jest zbyt mały lub zbyt prosty. Proszę narysować go ponownie.',
+  wait_countdown_seconds: 'Poczekaj {countdown} sekund'
 }
 
 const uk = {
@@ -636,6 +642,7 @@ const uk = {
   sign_now: 'Підписати зараз',
   type_here_: 'Введіть тут',
   optional: 'необов’язково',
+  option: 'Опція',
   appears_on: "З'являється на",
   page: 'Сторінка',
   take_photo: 'Зробити фото',
@@ -658,7 +665,7 @@ const uk = {
   create_a_free_account: 'Створити безкоштовний обліковий запис',
   powered_by: 'Працює на базі',
   please_check_the_box_to_continue: 'Будь ласка, позначте прапорець, щоб продовжити.',
-  open_source_documents_software: 'відкритий програмний засіб для документів',
+  open_source_documents_software: 'відкрите програмне забезпечення для документів',
   verified_phone_number: 'Підтвердіть номер телефону',
   use_international_format: 'Використовуйте міжнародний формат: +1xxx',
   six_digits_code: '6-значний код',
@@ -734,6 +741,7 @@ const cs = {
   sign_now: 'Podepsat nyní',
   type_here_: 'Zadejte zde',
   optional: 'volitelné',
+  option: 'Možnost',
   appears_on: 'Zobrazuje se na',
   page: 'Stránka',
   select_your_option: 'Vyberte svou volbu',
@@ -832,6 +840,7 @@ const pt = {
   sign_now: 'Assinar agora',
   type_here_: 'Digite aqui',
   optional: 'opcional',
+  option: 'Opção',
   appears_on: 'Aparece em',
   page: 'Página',
   take_photo: 'Tirar foto',
@@ -1097,6 +1106,7 @@ const ar = {
   select_a_reason: 'اختر سببًا',
   value_is_invalid: 'القيمة غير صالحة',
   verification_code_is_invalid: 'رمز التحقق غير صالح',
+  already_paid: 'تم الدفع بالفعل',
   drawn_signature_on_a_touchscreen_device: 'توقيع مرسوم على جهاز بشاشة تعمل باللمس',
   scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'امسح رمز الاستجابة السريعة باستخدام تطبيق الكاميرا لفتح النموذج على الهاتف المحمول ورسم توقيعك',
   by_clicking_you_agree_to_the: 'بالنقر فوق "{button}"، أنت توافق على',
@@ -1198,6 +1208,8 @@ const ko = {
   by_clicking_you_agree_to_the: '"{button}"를 클릭함으로써, 다음에 동의하게 됩니다',
   electronic_signature_disclosure: '전자 서명 공개',
   esignature_disclosure: '전자 서명 공개',
+  value_is_invalid: '값이 올바르지 않습니다',
+  verification_code_is_invalid: '인증 코드가 올바르지 않습니다',
   already_paid: '이미 지불됨',
   text: '텍스트',
   signature: '서명',
@@ -1273,6 +1285,105 @@ const ko = {
   wait_countdown_seconds: '{countdown}초 기다리세요'
 }
 
-const i18n = { en, es, it, de, fr, pl, uk, cs, pt, he, nl, ar, ko }
+const ja = {
+  complete_all_required_fields_to_proceed_with_identity_verification: '本人確認を進めるには、すべての必須項目を入力してください。',
+  verify_id: '本人確認',
+  identity_verification: '本人確認',
+  complete: '完了',
+  fill_all_required_fields_to_complete: '完了するにはすべての必須項目を入力してください',
+  sign_and_complete: '署名して完了',
+  text: 'テキスト',
+  by_clicking_you_agree_to_the: '"{button}" をクリックすることで、次に同意したことになります：',
+  electronic_signature_disclosure: '電子署名に関する開示',
+  esignature_disclosure: '電子署名開示',
+  signature: '署名',
+  initials: 'イニシャル',
+  drawn_signature_on_a_touchscreen_device: 'タッチスクリーンデバイスで描かれた署名',
+  approved: '承認済み',
+  reviewed: '確認済み',
+  other: 'その他',
+  authored_by_me: '自分が作成',
+  invite: '招待',
+  email: 'メール',
+  approved_by: '承認者',
+  reviewed_by: '確認者',
+  authored_by: '作成者',
+  select_a_reason: '理由を選択',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'QRコードをカメラアプリで読み取り、モバイルでフォームを開いて署名を描いてください',
+  date: '日付',
+  number: '数値',
+  value_is_invalid: '無効な値です',
+  verification_code_is_invalid: '認証コードが無効です',
+  already_paid: 'すでに支払い済み',
+  image: '画像',
+  pay: '支払う',
+  take_photo: '写真を撮る',
+  number_phone_is_invalid: '{number} の電話番号は無効です',
+  file: 'ファイル',
+  digitally_signed_by: '電子署名者：',
+  reason: '理由',
+  select: '選択',
+  checkbox: 'チェックボックス',
+  multiple: '複数選択',
+  radio: 'ラジオボタン',
+  cells: 'セル',
+  stamp: 'スタンプ',
+  minimize: '最小化',
+  payment: '支払い',
+  phone: '電話',
+  start_now: '今すぐ開始',
+  continue: '続行',
+  sign_now: '今すぐ署名',
+  type_here_: 'ここに入力...',
+  optional: '任意',
+  option: 'オプション',
+  appears_on: '表示ページ',
+  page: 'ページ',
+  select_your_option: 'オプションを選択',
+  complete_hightlighted_checkboxes_and_click: 'ハイライトされたチェックボックスを完了し、クリックしてください',
+  submit: '送信',
+  next: '次へ',
+  click_to_upload: 'クリックしてアップロード',
+  or_drag_and_drop_files: 'またはファイルをドラッグ＆ドロップ',
+  send_copy_via_email: 'メールでコピーを送信',
+  download: 'ダウンロード',
+  clear: 'クリア',
+  redraw: '描き直す',
+  draw_initials: 'イニシャルを描く',
+  type_signature_here: 'ここに署名を入力',
+  type_initial_here: 'ここにイニシャルを入力',
+  form_has_been_completed: 'フォームが完了しました！',
+  document_has_been_signed: 'ドキュメントが署名されました！',
+  documents_have_been_signed: 'ドキュメントがすべて署名されました！',
+  create_a_free_account: '無料アカウントを作成',
+  powered_by: '提供元：',
+  please_check_the_box_to_continue: '続行するにはボックスにチェックを入れてください。',
+  open_source_documents_software: 'オープンソースのドキュメントソフトウェア',
+  verified_phone_number: '電話番号を認証',
+  use_international_format: '国際形式を使用してください：+1xxx',
+  six_digits_code: '6桁のコード',
+  change_phone_number: '電話番号を変更',
+  sending: '送信中...',
+  resend_code: 'コードを再送信',
+  verification_code_has_been_resent: '認証コードがSMSで再送信されました',
+  please_fill_all_required_fields: 'すべての必須項目を入力してください',
+  set_today: '今日の日付を設定',
+  toggle_multiline_text: '複数行テキスト切り替え',
+  draw_signature: '署名を描く',
+  type_initial: 'イニシャルを入力',
+  draw: '描く',
+  type: '入力',
+  type_text: 'テキストを入力',
+  email_has_been_sent: 'メールが送信されました',
+  processing: '処理中',
+  pay_with_strip: 'Stripeで支払う',
+  reupload: '再アップロード',
+  upload: 'アップロード',
+  files: 'ファイル',
+  signature_is_too_small_or_simple_please_redraw: '署名が小さすぎるか単純すぎます。もう一度描いてください。',
+  wait_countdown_seconds: '{countdown} 秒お待ちください'
+}
+
+const i18n = { en, es, it, de, fr, pl, uk, cs, pt, he, nl, ar, ko, ja }
 
 export default i18n

app/javascript/submission_form/initials_step.vue

@@ -339,8 +339,8 @@ export default {
         return Promise.resolve({})
       }
 
-      return new Promise((resolve) => {
-        cropCanvasAndExportToPNG(this.$refs.canvas).then(async (blob) => {
+      return new Promise((resolve, reject) => {
+        cropCanvasAndExportToPNG(this.$refs.canvas, { errorOnTooSmall: true }).then(async (blob) => {
           const file = new File([blob], 'initials.png', { type: 'image/png' })
 
           if (this.dryRun) {
@@ -373,6 +373,14 @@ export default {
               return resolve(attachment)
             })
           }
+        }).catch((error) => {
+          if (this.field.required === true) {
+            alert(this.t('signature_is_too_small_or_simple_please_redraw'))
+
+            return reject(error)
+          } else {
+            return resolve({})
+          }
         })
       })
     }

app/javascript/submission_form/signature_step.vue

@@ -683,13 +683,17 @@ export default {
       }
 
       if (this.isSignatureStarted && this.pad.toData().length > 0 && !isValidSignatureCanvas(this.pad.toData())) {
-        alert(this.t('signature_is_too_small_or_simple_please_redraw'))
+        if (this.field.required === true || this.pad.toData().length > 0) {
+          alert(this.t('signature_is_too_small_or_simple_please_redraw'))
 
-        return Promise.reject(new Error('Image too small or simple'))
+          return Promise.reject(new Error('Image too small or simple'))
+        } else {
+          Promise.resolve({})
+        }
       }
 
-      return new Promise((resolve) => {
-        cropCanvasAndExportToPNG(this.$refs.canvas).then(async (blob) => {
+      return new Promise((resolve, reject) => {
+        cropCanvasAndExportToPNG(this.$refs.canvas, { errorOnTooSmall: true }).then(async (blob) => {
           const file = new File([blob], 'signature.png', { type: 'image/png' })
 
           if (this.dryRun) {
@@ -725,6 +729,14 @@ export default {
               return resolve(attachment)
             })
           }
+        }).catch((error) => {
+          if (this.field.required === true) {
+            alert(this.t('signature_is_too_small_or_simple_please_redraw'))
+
+            return reject(error)
+          } else {
+            return resolve({})
+          }
         })
       })
     }

app/javascript/template_builder/area.vue

@@ -160,15 +160,15 @@
     </div>
     <div
       ref="touchValueTarget"
-      class="flex items-center h-full w-full field-area"
+      class="flex h-full w-full field-area"
       dir="auto"
-      :class="[isValueInput ? 'bg-opacity-50' : 'bg-opacity-80', field.type === 'heading' ? 'bg-gray-50' : bgColors[submitterIndex % bgColors.length], isDefaultValuePresent || isValueInput || (withFieldPlaceholder && field.areas) ? fontClasses : 'justify-center']"
+      :class="[isValueInput ? 'bg-opacity-50' : 'bg-opacity-80', field.type === 'heading' ? 'bg-gray-50' : bgColors[submitterIndex % bgColors.length], isDefaultValuePresent || isValueInput || (withFieldPlaceholder && field.areas) ? fontClasses : 'justify-center items-center']"
       @click="focusValueInput"
     >
       <span
         v-if="field"
         class="flex justify-center items-center space-x-1"
-        :class="{ 'w-full': ['cells', 'checkbox'].includes(field.type), 'h-full': !isValueInput }"
+        :class="{ 'w-full': ['cells', 'checkbox'].includes(field.type), 'h-full': !isValueInput && !isDefaultValuePresent }"
       >
         <div
           v-if="isDefaultValuePresent || isValueInput || (withFieldPlaceholder && field.areas && field.type !== 'checkbox')"
@@ -403,10 +403,13 @@ export default {
     },
     fontClasses () {
       if (!this.field.preferences) {
-        return {}
+        return { 'items-center': true }
       }
 
       return {
+        'items-center': !this.field.preferences.valign || this.field.preferences.valign === 'center',
+        'items-start': this.field.preferences.valign === 'top',
+        'items-end': this.field.preferences.valign === 'bottom',
         'justify-center': this.field.preferences.align === 'center',
         'justify-start': this.field.preferences.align === 'left',
         'justify-end': this.field.preferences.align === 'right',

app/javascript/template_builder/builder.vue

@@ -5,7 +5,19 @@
     class="mx-auto pl-3 h-full"
     :class="isMobile ? 'pl-4' : 'md:pl-4'"
     @dragover="onDragover"
+    @drop="isDragFile = false"
   >
+    <HoverDropzone
+      v-if="sortedDocuments.length && withUploadButton && editable"
+      :is-dragging="isDragFile"
+      :template-id="template.id"
+      :accept-file-types="acceptFileTypes"
+      :with-replace-and-clone="withReplaceAndCloneUpload"
+      @add="[updateFromUpload($event), isDragFile = false]"
+      @replace="[onDocumentsReplace($event), isDragFile = false]"
+      @replace-and-clone="onDocumentsReplaceAndTemplateClone($event)"
+      @error="[onUploadFailed($event), isDragFile = false]"
+    />
     <DragPlaceholder
       ref="dragPlaceholder"
       :field="fieldsDragFieldRef.value || toRaw(dragField)"
@@ -433,6 +445,7 @@
 <script>
 import Upload from './upload'
 import Dropzone from './dropzone'
+import HoverDropzone from './hover_dropzone'
 import DragPlaceholder from './drag_placeholder'
 import Fields from './fields'
 import MobileDrawField from './mobile_draw_field'
@@ -462,6 +475,7 @@ export default {
     MobileFields,
     Logo,
     Dropzone,
+    HoverDropzone,
     DocumentPreview,
     DocumentControls,
     IconInnerShadowTop,
@@ -665,6 +679,11 @@ export default {
       required: false,
       default: true
     },
+    withReplaceAndCloneUpload: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withPhone: {
       type: Boolean,
       required: false,
@@ -724,7 +743,8 @@ export default {
       copiedArea: null,
       drawFieldType: null,
       drawOption: null,
-      dragField: null
+      dragField: null,
+      isDragFile: false
     }
   },
   computed: {
@@ -836,6 +856,7 @@ export default {
     window.addEventListener('keydown', this.onKeyDown)
 
     window.addEventListener('resize', this.onWindowResize)
+    window.addEventListener('dragleave', this.onWindowDragLeave)
 
     this.$nextTick(() => {
       if (document.location.search?.includes('stripe_connect_success')) {
@@ -854,6 +875,7 @@ export default {
     window.removeEventListener('keydown', this.onKeyDown)
 
     window.removeEventListener('resize', this.onWindowResize)
+    window.removeEventListener('dragleave', this.onWindowDragLeave)
   },
   beforeUpdate () {
     this.documentRefs = []
@@ -868,6 +890,13 @@ export default {
 
         ref.x = e.clientX - ref.offsetX
         ref.y = e.clientY - ref.offsetY
+      } else if (e.dataTransfer?.types?.includes('Files')) {
+        this.isDragFile = true
+      }
+    },
+    onWindowDragLeave (event) {
+      if (event.clientX <= 0 || event.clientY <= 0 || event.clientX >= window.innerWidth || event.clientY >= window.innerHeight) {
+        this.isDragFile = false
       }
     },
     reorderFields (item) {
@@ -1250,7 +1279,7 @@ export default {
         area.h = (pageMask.clientWidth / 35 / pageMask.clientWidth)
       }
     },
-    onDraw (area) {
+    onDraw ({ area, isTooSmall }) {
       if (this.drawField) {
         if (this.drawOption) {
           const areaWithoutOption = this.drawField.areas?.find((a) => !a.option_uuid)
@@ -1345,7 +1374,7 @@ export default {
           area.y -= area.h / 2
         }
 
-        if (area.w) {
+        if (area.w && (type !== 'checkbox' || this.drawFieldType || !isTooSmall)) {
           this.addField(type, area)
 
           this.selectedAreaRef.value = area
@@ -1529,6 +1558,9 @@ export default {
         })
       }, 'image/png')
     },
+    onUploadFailed (error) {
+      if (error) alert(error)
+    },
     updateFromUpload (data) {
       this.template.schema.push(...data.schema)
       this.template.documents.push(...data.documents)
@@ -1649,6 +1681,29 @@ export default {
 
       this.save()
     },
+    onDocumentsReplace (data) {
+      data.schema.forEach((schemaItem, index) => {
+        const existingSchemaItem = this.template.schema[index]
+
+        if (this.template.schema[index]) {
+          this.onDocumentReplace({
+            replaceSchemaItem: existingSchemaItem,
+            schema: [schemaItem],
+            documents: [data.documents.find((doc) => doc.uuid === schemaItem.attachment_uuid)]
+          })
+        } else {
+          this.updateFromUpload({
+            schema: [schemaItem],
+            documents: [data.documents.find((doc) => doc.uuid === schemaItem.attachment_uuid)],
+            fields: data.fields,
+            submitters: data.submitters
+          })
+        }
+      })
+    },
+    onDocumentsReplaceAndTemplateClone (template) {
+      window.Turbo.visit(`/templates/${template.id}/edit`)
+    },
     moveDocument (item, direction) {
       const currentIndex = this.template.schema.indexOf(item)
 

app/javascript/template_builder/conditions_modal.vue

@@ -175,7 +175,7 @@ export default {
     fields () {
       if (this.item.submitter_uuid) {
         return this.template.fields.reduce((acc, f) => {
-          if (f !== this.item) {
+          if (f !== this.item && (!f.conditions?.length || !f.conditions.find((c) => c.field_uuid === this.item.uuid))) {
             acc.push(f)
           }
 

app/javascript/template_builder/document.vue

@@ -23,7 +23,7 @@
       @drop-field="$emit('drop-field', {...$event, attachment_uuid: document.uuid })"
       @remove-area="$emit('remove-area', $event)"
       @scroll-to="scrollToArea"
-      @draw="$emit('draw', {...$event, attachment_uuid: document.uuid })"
+      @draw="$emit('draw', { area: {...$event.area, attachment_uuid: document.uuid }, isTooSmall: $event.isTooSmall })"
     />
   </div>
 </template>

app/javascript/template_builder/dropzone.vue

@@ -2,34 +2,42 @@
   <div
     class="flex h-60 w-full"
     @dragover.prevent
+    @dragenter="isDragEntering = true"
+    @dragleave="isDragEntering = false"
     @drop.prevent="onDropFiles"
   >
     <label
       id="document_dropzone"
-      class="w-full relative hover:bg-base-200/30 rounded-md border border-2 border-base-content/10 border-dashed"
+      class="w-full relative rounded-md border-2 border-base-content/10 border-dashed"
       :for="inputId"
-      :class="{ 'opacity-50': isLoading || isProcessing }"
+      :class="{ 'opacity-50': isLoading, 'hover:bg-base-200/50': withHoverClass && !isDragEntering, 'bg-base-200/50 border-base-content/30': isDragEntering }"
     >
-      <div class="absolute top-0 right-0 left-0 bottom-0 flex items-center justify-center">
+      <div class="absolute top-0 right-0 left-0 bottom-0 flex items-center justify-center pointer-events-none">
         <div class="flex flex-col items-center">
           <IconInnerShadowTop
-            v-if="isLoading || isProcessing"
+            v-if="isLoading"
             class="animate-spin"
             :width="40"
             :height="40"
           />
-          <IconCloudUpload
+          <component
+            :is="icon"
             v-else
+            class="stroke-[1.5px]"
             :width="40"
             :height="40"
           />
           <div
             v-if="message"
-            class="font-medium text-lg mb-1"
+            class="text-lg mb-1"
+            :class="{ 'mt-1': !withDescription, 'font-medium': withDescription }"
           >
             {{ message }}
           </div>
-          <div class="text-sm">
+          <div
+            v-if="withDescription"
+            class="text-sm"
+          >
             <span class="font-medium">{{ t('click_to_upload') }}</span> {{ t('or_drag_and_drop_files') }}
           </div>
         </div>
@@ -54,13 +62,16 @@
 
 <script>
 import Upload from './upload'
-import { IconCloudUpload, IconInnerShadowTop } from '@tabler/icons-vue'
+import { IconCloudUpload, IconFilePlus, IconFileSymlink, IconFiles, IconInnerShadowTop } from '@tabler/icons-vue'
 
 export default {
   name: 'FileDropzone',
   components: {
+    IconFilePlus,
     IconCloudUpload,
-    IconInnerShadowTop
+    IconInnerShadowTop,
+    IconFileSymlink,
+    IconFiles
   },
   inject: ['baseFetch', 't'],
   props: {
@@ -68,35 +79,70 @@ export default {
       type: [Number, String],
       required: true
     },
+    withHoverClass: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    icon: {
+      type: String,
+      required: false,
+      default: 'IconCloudUpload'
+    },
+    cloneTemplateOnUpload: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    withDescription: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    title: {
+      type: String,
+      required: false,
+      default: ''
+    },
     acceptFileTypes: {
       type: String,
       required: false,
       default: 'image/*, application/pdf'
     }
   },
-  emits: ['success'],
+  emits: ['success', 'error', 'loading'],
   data () {
     return {
       isLoading: false,
-      isProcessing: false
+      isDragEntering: false
     }
   },
   computed: {
     inputId () {
       return 'el' + Math.random().toString(32).split('.')[1]
     },
+    uploadUrl () {
+      if (this.cloneTemplateOnUpload) {
+        return `/templates/${this.templateId}/clone_and_replace`
+      } else {
+        return `/templates/${this.templateId}/documents`
+      }
+    },
     message () {
       if (this.isLoading) {
         return this.t('uploading')
-      } else if (this.isProcessing) {
-        return this.t('processing_')
       } else if (this.acceptFileTypes === 'image/*, application/pdf') {
-        return this.t('add_pdf_documents_or_images')
+        return this.title || this.t('add_pdf_documents_or_images')
       } else {
-        return this.t('add_documents_or_images')
+        return this.title || this.t('add_documents_or_images')
       }
     }
   },
+  watch: {
+    isLoading (value) {
+      this.$emit('loading', value)
+    }
+  },
   methods: {
     upload: Upload.methods.upload,
     onDropFiles (e) {

app/javascript/template_builder/field_type.vue

@@ -30,7 +30,7 @@
         v-for="(icon, type) in fieldIconsSorted"
         :key="type"
       >
-        <li v-if="(fieldTypes.length === 0 || fieldTypes.includes(type)) && (withPhone || type != 'phone') && (withPayment || type != 'payment') && (withVerification || type != 'verification')">
+        <li v-if="fieldTypes.includes(type) || ((withPhone || type != 'phone') && (withPayment || type != 'payment') && (withVerification || type != 'verification'))">
           <a
             href="#"
             class="text-sm py-1 px-2"

app/javascript/template_builder/fields.vue

@@ -112,7 +112,7 @@
       :key="type"
     >
       <button
-        v-if="(fieldTypes.length === 0 || fieldTypes.includes(type)) && (withPhone || type != 'phone') && (withPayment || type != 'payment') && (withVerification || type != 'verification')"
+        v-if="fieldTypes.includes(type) || ((withPhone || type != 'phone') && (withPayment || type != 'payment') && (withVerification || type != 'verification'))"
         :id="`${type}_type_field_button`"
         draggable="true"
         class="field-type-button group flex items-center justify-center border border-dashed w-full rounded relative fields-grid-item"
@@ -168,7 +168,7 @@
         :data-tip="t('obtain_qualified_electronic_signature_with_the_trusted_provider_click_to_learn_more')"
       >
         <a
-          href="https://www.docuseal.com/contact"
+          href="https://www.docuseal.com/qualified-electronic-signature"
           target="_blank"
           class="opacity-50 flex items-center justify-center border border-dashed border-base-300 w-full rounded relative fields-grid-item"
           :style="{ backgroundColor }"

app/javascript/template_builder/font_modal.vue

@@ -57,7 +57,7 @@
             <span class="relative">
               <select
                 class="select input-bordered bg-white select-sm text-center pl-2"
-                style="font-size: 16px; width: 86px; text-align-last: center;"
+                style="font-size: 16px; line-height: 12px; width: 86px; text-align-last: center;"
                 @change="$event.target.value ? preferences.font_size = parseInt($event.target.value) : delete preferences.font_size"
               >
                 <option
@@ -77,12 +77,12 @@
               </select>
               <span
                 class="border-l pl-1.5 absolute bg-white bottom-0 pointer-events-none text-sm h-5"
-                style="right: 13px; top: 7px"
+                style="right: 13px; top: 6px"
               >
                 pt
               </span>
             </span>
-            <span>
+            <span class="flex">
               <div
                 class="join"
                 style="height: 32px"
@@ -98,7 +98,7 @@
                 </button>
               </div>
             </span>
-            <span>
+            <span class="flex">
               <div
                 class="join"
                 style="height: 32px"
@@ -114,6 +114,32 @@
                 </button>
               </div>
             </span>
+            <span class="flex">
+              <div class="dropdown modal-field-font-dropdown">
+                <label
+                  tabindex="0"
+                  class="cursor-pointer flex bg-white border input-bordered rounded-md h-8 items-center justify-center px-1"
+                  style="-webkit-appearance: none; -moz-appearance: none;"
+                >
+                  <component :is="valigns.find((v) => v.value === (preferences.valign || 'center'))?.icon" />
+                </label>
+                <div
+                  tabindex="0"
+                  class="dropdown-content p-0 mt-1 block z-10 menu shadow bg-white border border-base-300 rounded-md"
+                >
+                  <div
+                    v-for="(valign, index) in valigns"
+                    :key="index"
+                    :value="valign.value"
+                    :class="{ 'bg-base-300': preferences.valign == valign.value }"
+                    class="hover:bg-base-300 px-2 py-1.5 cursor-pointer"
+                    @click="[valign.value ? preferences.valign = valign.value : delete preferences.valign, closeDropdown()]"
+                  >
+                    <component :is="valign.icon" />
+                  </div>
+                </div>
+              </div>
+            </span>
             <span>
               <select
                 class="input input-bordered bg-white input-sm text-lg rounded-md"
@@ -134,7 +160,7 @@
         </div>
         <div class="mt-4">
           <div
-            class="flex items-center border border-base-content/20 rounded-xl bg-white px-4 h-16 modal-field-font-preview"
+            class="flex border border-base-content/20 rounded-xl bg-white px-4 h-16 modal-field-font-preview"
             :style="{
               color: preferences.color || 'black',
               fontSize: (preferences.font_size || 12) + 'pt',
@@ -163,7 +189,7 @@
 </template>
 
 <script>
-import { IconChevronDown, IconBold, IconItalic, IconAlignLeft, IconAlignRight, IconAlignCenter } from '@tabler/icons-vue'
+import { IconChevronDown, IconBold, IconItalic, IconAlignLeft, IconAlignRight, IconAlignCenter, IconAlignBoxCenterTop, IconAlignBoxCenterBottom, IconAlignBoxCenterMiddle } from '@tabler/icons-vue'
 
 export default {
   name: 'FontModal',
@@ -213,6 +239,13 @@ export default {
         { icon: IconAlignRight, value: 'right' }
       ]
     },
+    valigns () {
+      return [
+        { icon: IconAlignBoxCenterTop, value: 'top' },
+        { icon: IconAlignBoxCenterMiddle, value: 'center' },
+        { icon: IconAlignBoxCenterBottom, value: 'bottom' }
+      ]
+    },
     sizes () {
       return [...Array(23).keys()].map(i => i + 6)
     },
@@ -230,12 +263,15 @@ export default {
         'justify-center': this.preferences.align === 'center',
         'justify-start': this.preferences.align === 'left',
         'justify-end': this.preferences.align === 'right',
+        'items-center': !this.preferences.valign || this.preferences.valign === 'center',
+        'items-start': this.preferences.valign === 'top',
+        'items-end': this.preferences.valign === 'bottom',
         'font-bold': ['bold_italic', 'bold'].includes(this.preferences.font_type),
         italic: ['bold_italic', 'italic'].includes(this.preferences.font_type)
       }
     },
     keys () {
-      return ['font_type', 'font_size', 'color', 'align', 'font']
+      return ['font_type', 'font_size', 'color', 'align', 'valign', 'font']
     }
   },
   created () {

app/javascript/template_builder/formula_modal.vue

@@ -154,7 +154,7 @@ export default {
   computed: {
     fields () {
       return this.template.fields.reduce((acc, f) => {
-        if (f !== this.field && f.submitter_uuid === this.field.submitter_uuid && ['number'].includes(f.type) && !f.preferences?.formula) {
+        if (f !== this.field && ['number'].includes(f.type) && (!f.preferences?.formula || f.submitter_uuid !== this.field.submitter_uuid)) {
           acc.push(f)
         }
 

app/javascript/template_builder/hover_dropzone.vue

@@ -0,0 +1,89 @@
+<template>
+  <div
+    v-if="isDragging || isLoading"
+    class="modal modal-open"
+  >
+    <div class="flex flex-col gap-2 p-4 items-center bg-base-100 h-full max-h-[85vh] max-w-6xl rounded-2xl w-full">
+      <Dropzone
+        class="flex-1 h-full"
+        icon="IconFilePlus"
+        :template-id="templateId"
+        :accept-file-types="acceptFileTypes"
+        :with-hover-class="false"
+        :with-description="false"
+        :title="t('add_a_new_document')"
+        type="add_files"
+        @loading="isLoading = $event"
+        @success="$emit('add', $event)"
+        @error="$emit('error', $event)"
+      />
+      <div class="flex-1 flex gap-2 w-full">
+        <Dropzone
+          class="flex-1 h-full"
+          icon="IconFileSymlink"
+          :template-id="templateId"
+          :accept-file-types="acceptFileTypes"
+          :with-hover-class="false"
+          :with-description="false"
+          :title="t('replace_existing_document')"
+          @loading="isLoading = $event"
+          @success="$emit('replace', $event)"
+          @error="$emit('error', $event)"
+        />
+        <Dropzone
+          v-if="withReplaceAndClone"
+          class="flex-1 h-full"
+          icon="IconFiles"
+          :template-id="templateId"
+          :accept-file-types="acceptFileTypes"
+          :with-hover-class="false"
+          :with-description="false"
+          :clone-template-on-upload="true"
+          :title="t('clone_and_replace_documents')"
+          @loading="isLoading = $event"
+          @success="$emit('replace-and-clone', $event)"
+          @error="$emit('error', $event)"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Dropzone from './dropzone'
+
+export default {
+  name: 'HoverDropzone',
+  components: {
+    Dropzone
+  },
+  inject: ['t'],
+  props: {
+    isDragging: {
+      type: Boolean,
+      required: true,
+      default: false
+    },
+    templateId: {
+      type: [Number, String],
+      required: true
+    },
+    withReplaceAndClone: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    acceptFileTypes: {
+      type: String,
+      required: false,
+      default: 'image/*, application/pdf'
+    }
+  },
+  emits: ['add', 'replace', 'replace-and-clone', 'error'],
+  data () {
+    return {
+      isLoading: false
+    }
+  }
+}
+</script>

app/javascript/template_builder/i18n.js

@@ -63,6 +63,9 @@ const en = {
   processing_: 'Processing...',
   add_pdf_documents_or_images: 'Add PDF documents or images',
   add_documents_or_images: 'Add documents or images',
+  add_a_new_document: 'Add a new document',
+  replace_existing_document: 'Replace existing document',
+  clone_and_replace_documents: 'Clone and replace documents',
   required: 'Required',
   default_value: 'Default value',
   format: 'Format',
@@ -225,6 +228,9 @@ const es = {
   processing_: 'Procesando...',
   add_pdf_documents_or_images: 'Agregar documentos PDF o imágenes',
   add_documents_or_images: 'Agregar documentos o imágenes',
+  add_a_new_document: 'Agregar un nuevo documento',
+  replace_existing_document: 'Reemplazar documento existente',
+  clone_and_replace_documents: 'Clonar y reemplazar documentos',
   required: 'Requerido',
   default_value: 'Valor predeterminado',
   format: 'Formato',
@@ -393,6 +399,9 @@ const it = {
   processing_: 'Elaborazione...',
   add_pdf_documents_or_images: 'Aggiungi documenti PDF o immagini',
   add_documents_or_images: 'Aggiungi documenti o immagini',
+  add_a_new_document: 'Aggiungi un nuovo documento',
+  replace_existing_document: 'Sostituisci documento esistente',
+  clone_and_replace_documents: 'Clona e sostituisci documenti',
   required: 'Obbligatorio',
   default_value: 'Valore predefinito',
   format: 'Formato',
@@ -555,6 +564,9 @@ const pt = {
   processing_: 'Processando...',
   add_pdf_documents_or_images: 'Adicionar documentos PDF ou imagens',
   add_documents_or_images: 'Adicionar documentos ou imagens',
+  add_a_new_document: 'Ajouter un nouveau document',
+  replace_existing_document: 'Substituir documento existente',
+  clone_and_replace_documents: 'Clonar e substituir documentos',
   required: 'Obrigatório',
   default_value: 'Valor padrão',
   format: 'Formato',
@@ -719,6 +731,9 @@ const fr = {
   processing_: 'Traitement en cours...',
   add_pdf_documents_or_images: 'Ajoutez des documents PDF ou des images',
   add_documents_or_images: 'Ajoutez des documents ou des images',
+  add_a_new_document: 'Adicionar um novo documento',
+  replace_existing_document: 'Remplacer le document existant',
+  clone_and_replace_documents: 'Cloner et remplacer les documents',
   required: 'Requis',
   default_value: 'Valeur par défaut',
   format: 'Format',
@@ -884,6 +899,9 @@ const de = {
   processing_: 'Verarbeitung...',
   add_pdf_documents_or_images: 'PDF-Dokumente oder Bilder hinzufügen',
   add_documents_or_images: 'Dokumente oder Bilder hinzufügen',
+  add_a_new_document: 'Neues Dokument hinzufügen',
+  replace_existing_document: 'Vorhandenes Dokument ersetzen',
+  clone_and_replace_documents: 'Dokumente klonen und ersetzen',
   required: 'Erforderlich',
   default_value: 'Standardwert',
   format: 'Format',

app/javascript/template_builder/mobile_fields.vue

@@ -54,7 +54,7 @@
           v-for="(icon, type) in fieldIconsSorted"
           :key="type"
         >
-          <li v-if="(fieldTypes.length === 0 || fieldTypes.includes(type)) && (withPhone || type != 'phone') && (withPayment || type != 'payment') && (withVerification || type != 'verification')">
+          <li v-if="fieldTypes.includes(type) || ((withPhone || type != 'phone') && (withPayment || type != 'payment') && (withVerification || type != 'verification'))">
             <a
               href="#"
               class="text-sm py-1 px-2"

app/javascript/template_builder/page.vue

@@ -290,7 +290,12 @@ export default {
           area.cell_w = this.newArea.cell_w
         }
 
-        this.$emit('draw', area)
+        const dx = Math.abs(e.offsetX - this.$refs.mask.clientWidth * this.newArea.initialX)
+        const dy = Math.abs(e.offsetY - this.$refs.mask.clientHeight * this.newArea.initialY)
+
+        const isTooSmall = dx < 8 && dy < 8
+
+        this.$emit('draw', { area, isTooSmall })
       }
 
       this.showMask = false

app/javascript/template_builder/replace.vue

@@ -2,7 +2,7 @@
   <label
     :for="inputId"
     class="btn btn-neutral btn-xs text-white transition-none replace-document-button"
-    :class="{ 'opacity-100': isLoading || isProcessing }"
+    :class="{ 'opacity-100': isLoading }"
   >
     {{ message }}
     <form
@@ -41,19 +41,19 @@ export default {
   emits: ['success'],
   data () {
     return {
-      isLoading: false,
-      isProcessing: false
+      isLoading: false
     }
   },
   computed: {
     inputId () {
       return 'el' + Math.random().toString(32).split('.')[1]
     },
+    uploadUrl () {
+      return `/templates/${this.templateId}/documents`
+    },
     message () {
       if (this.isLoading) {
         return this.t('uploading_')
-      } else if (this.isProcessing) {
-        return this.t('processing_')
       } else {
         return this.t('replace')
       }

app/javascript/template_builder/upload.vue

@@ -4,10 +4,10 @@
       id="add_document_button"
       :for="inputId"
       class="btn btn-outline w-full add-document-button"
-      :class="{ 'btn-disabled': isLoading || isProcessing }"
+      :class="{ 'btn-disabled': isLoading }"
     >
       <IconInnerShadowTop
-        v-if="isLoading || isProcessing"
+        v-if="isLoading"
         width="20"
         class="animate-spin"
       />
@@ -18,9 +18,6 @@
       <span v-if="isLoading">
         {{ t('uploading_') }}
       </span>
-      <span v-else-if="isProcessing">
-        {{ t('processing_') }}
-      </span>
       <span v-else>
         {{ t('add_document') }}
       </span>
@@ -63,30 +60,34 @@ export default {
       default: 'image/*, application/pdf'
     }
   },
-  emits: ['success'],
+  emits: ['success', 'error'],
   data () {
     return {
-      isLoading: false,
-      isProcessing: false
+      isLoading: false
     }
   },
   computed: {
     inputId () {
       return 'el' + Math.random().toString(32).split('.')[1]
+    },
+    uploadUrl () {
+      return `/templates/${this.templateId}/documents`
     }
   },
   methods: {
     async upload () {
       this.isLoading = true
 
-      this.baseFetch(`/templates/${this.templateId}/documents`, {
+      this.baseFetch(this.uploadUrl, {
         method: 'POST',
+        headers: { Accept: 'application/json' },
         body: new FormData(this.$refs.form)
       }).then((resp) => {
         if (resp.ok) {
           resp.json().then((data) => {
             this.$emit('success', data)
             this.$refs.input.value = ''
+            this.isLoading = false
           })
         } else if (resp.status === 422) {
           resp.json().then((data) => {
@@ -95,21 +96,33 @@ export default {
 
               formData.append('password', prompt(this.t('enter_pdf_password')))
 
-              this.baseFetch(`/templates/${this.templateId}/documents`, {
+              this.baseFetch(this.uploadUrl, {
                 method: 'POST',
                 body: formData
               }).then(async (resp) => {
                 if (resp.ok) {
                   this.$emit('success', await resp.json())
                   this.$refs.input.value = ''
+                  this.isLoading = false
                 } else {
                   alert(this.t('wrong_password'))
+
+                  this.$emit('error', await resp.json().error)
+                  this.isLoading = false
                 }
               })
+            } else {
+              this.$emit('error', data.error)
+              this.isLoading = false
             }
           })
+        } else {
+          resp.json().then((data) => {
+            this.$emit('error', data.error)
+            this.isLoading = false
+          })
         }
-      }).finally(() => {
+      }).catch(() => {
         this.isLoading = false
       })
     }

app/mailers/application_mailer.rb

@@ -20,7 +20,7 @@ class ApplicationMailer < ActionMailer::Base
   end
 
   def set_message_metadata
-    message.instance_variable_set(:@message_metadata, @message_metadata)
+    message.instance_variable_set(:@message_metadata, @message_metadata || {})
   end
 
   def set_message_uuid
@@ -28,10 +28,14 @@ class ApplicationMailer < ActionMailer::Base
   end
 
   def assign_message_metadata(tag, record)
-    @message_metadata = {
+    @message_metadata = (@message_metadata || {}).merge(
       'tag' => tag,
       'record_id' => record.id,
       'record_type' => record.class.name
-    }
+    )
+  end
+
+  def put_metadata(attrs)
+    @message_metadata = (@message_metadata || {}).merge(attrs)
   end
 end

app/mailers/submitter_mailer.rb

@@ -233,9 +233,17 @@ class SubmitterMailer < ApplicationMailer
   def from_address_for_submitter(submitter)
     if submitter.submission.source.in?(%w[api embed]) &&
        (from_email = AccountConfig.find_by(account: submitter.account, key: 'integration_from_email')&.value.presence)
+      user = submitter.account.users.find_by(email: from_email)
+
+      put_metadata('from_user_id' => user.id)
+
       from_email
     else
-      (submitter.submission.created_by_user || submitter.submission.template.author).friendly_name
+      user = submitter.submission.created_by_user || submitter.submission.template.author
+
+      put_metadata('from_user_id' => user.id)
+
+      user.friendly_name
     end
   end
 end

app/models/account.rb

@@ -33,6 +33,7 @@ class Account < ApplicationRecord
   has_many :account_linked_accounts, dependent: :destroy
   has_many :email_events, dependent: :destroy
   has_many :webhook_urls, dependent: :destroy
+  has_many :account_accesses, dependent: :destroy
   has_many :account_testing_accounts, -> { testing }, dependent: :destroy,
                                                       class_name: 'AccountLinkedAccount',
                                                       inverse_of: :account

app/models/account_access.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: account_accesses
+#
+#  id         :bigint           not null, primary key
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  account_id :bigint           not null
+#  user_id    :bigint           not null
+#
+# Indexes
+#
+#  index_account_accesses_on_account_id_and_user_id  (account_id,user_id) UNIQUE
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#
+class AccountAccess < ApplicationRecord
+  belongs_to :account
+  belongs_to :user
+end

app/models/submission.rb

@@ -71,7 +71,7 @@ class Submission < ApplicationRecord
      .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 :expired, -> { where(expire_at: ..Time.current) }
+  scope :expired, -> { pending.where(expire_at: ..Time.current) }
 
   enum :source, {
     invite: 'invite',
@@ -90,6 +90,10 @@ class Submission < ApplicationRecord
     expire_at && expire_at <= Time.current
   end
 
+  def fields_uuid_index
+    @fields_uuid_index ||= (template_fields || template.fields).index_by { |f| f['uuid'] }
+  end
+
   def audit_trail_url
     return if audit_trail.blank?
 

app/models/submission_event.rb

@@ -38,6 +38,8 @@ class SubmissionEvent < ApplicationRecord
 
   enum :event_type, {
     send_email: 'send_email',
+    bounce_email: 'bounce_email',
+    complaint_email: 'complaint_email',
     send_reminder_email: 'send_reminder_email',
     send_sms: 'send_sms',
     send_2fa_sms: 'send_2fa_sms',

app/models/submitter.rb

@@ -54,7 +54,7 @@ class Submitter < ApplicationRecord
   has_many_attached :documents
   has_many_attached :attachments
   has_many_attached :preview_documents
-  has_many :template_accesses, through: :template
+  has_many :template_accesses, through: :submission
   has_many :email_events, as: :emailable, dependent: (Docuseal.multitenant? ? nil : :destroy)
 
   has_many :document_generation_events, dependent: :destroy

app/views/devise/shared/_select_server.html.erb

@@ -1,12 +1,52 @@
-<div class="text-center">
-  <div class="join">
-    <a href="https://docuseal.com<%= request.fullpath.gsub('docuseal.eu', 'docuseal.com') %>" class="btn bg-base-200 join-item w-32  <%= 'bg-base-300' if request.host == 'docuseal.com' %>">
-      <%= svg_icon 'world', class: 'w-5 h-5' %>
-      Global
-    </a>
-    <a href="https://docuseal.eu<%= request.fullpath.gsub('docuseal.com', 'docuseal.eu') %>" class="btn bg-base-200 join-item w-32 <%= 'bg-base-300' if request.host == 'docuseal.eu' %>">
-      <%= svg_icon 'eu_flag', class: 'w-5 h-5' %>
-      Europe
-    </a>
+<% eu_server = request.host == 'docuseal.eu' %>
+<server-selector>
+  <div id="global_server_selector" class="text-center hidden">
+    <div class="join">
+      <a href="https://docuseal.com<%= request.fullpath.gsub('docuseal.eu', 'docuseal.com') %>" class="btn bg-base-200 join-item w-40 <%= 'bg-base-300' unless eu_server %>">
+        <%= svg_icon 'world', class: 'w-5 h-5' %>
+        Global
+      </a>
+      <a href="https://docuseal.eu<%= request.fullpath.gsub('docuseal.com', 'docuseal.eu') %>" class="relative btn bg-base-200 join-item w-40 <%= 'bg-base-300' if eu_server %>">
+        <%= svg_icon 'eu_flag', class: 'w-5 h-5' %>
+        Europe
+        <% unless eu_server %>
+          <span id="eu_server_alert" class="absolute flex space-x-0.5 hidden" style="top: -1.5rem;">
+            <span class="text-xs font-normal leading-none text-base-content normal-case">
+              <%= t('eu_data_residency') %>
+            </span>
+            <%= svg_icon 'corner_right_down', class: 'w-4 h-5 stroke-1 shrink-0 pt-1' %>
+          </span>
+        <% end %>
+      </a>
+    </div>
   </div>
-</div>
+  <div id="us_server_selector" class="flex justify-center hidden">
+    <div class="dropdown">
+      <label tabindex="0" class="relative btn btn-sm bg-transparent font-medium normal-case border-base-content/20 justify-start" style="width: 141px; padding: 0 20px">
+        <% if eu_server %>
+          <%= svg_icon 'eu_flag', class: 'w-5 h-5' %>
+          <span>EU Cloud</span>
+        <% else %>
+          <%= svg_icon 'usa_flag', class: 'w-5 h-5' %>
+          <span>US Cloud</span>
+        <% end %>
+        <%= svg_icon 'chevron_down', class: 'mr-1 w-4 h-4 absolute right-1' %>
+      </label>
+      <ul tabindex="0" class="dropdown-content z-[1] menu border border-base-content/20 mt-1 bg-base-100 rounded-box w-36">
+        <li>
+          <a href="https://docuseal.com<%= request.fullpath.gsub('docuseal.eu', 'docuseal.com') %>" class="flex items-center space-x-2 <%= 'bg-base-300' unless eu_server %>">
+            <%= svg_icon 'usa_flag', class: 'w-5 h-5' %>
+            US Cloud
+          </a>
+        </li>
+        <li>
+          <a href="https://docuseal.eu<%= request.fullpath.gsub('docuseal.com', 'docuseal.eu') %>" class="flex items-center space-x-2 <%= 'bg-base-300' if eu_server %>">
+            <%= svg_icon 'eu_flag', class: 'w-5 h-5' %>
+            EU Cloud
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</server-selector>
+<%= render 'scripts/server_selector' %>

app/views/esign_settings/show.html.erb

@@ -141,7 +141,7 @@
             <%= t('preferences') %>
           </h2>
         </div>
-        <% if can?(:manage, account_config) %>
+        <% if can?(:manage, account_config) && (can?(:manage, :personalization_advanced) || !Docuseal.multitenant?) %>
           <%= form_for account_config, url: account_configs_path, method: :post do |f| %>
             <%= f.hidden_field :key %>
             <div class="flex items-center justify-between py-2.5">

app/views/icons/_arrow_sort.html.erb

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M3 9l4 -4l4 4m-4 -4v14" />
+  <path d="M21 15l-4 4l-4 -4m4 4v-14" />
+</svg>

app/views/icons/_clock_exclamation.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M20.986 12.502a9 9 0 1 0 -5.973 7.98" /><path d="M12 7v5l3 3" /><path d="M19 16v3" /><path d="M19 22v.01" />
+</svg>

app/views/icons/_corner_right_down.html.erb

@@ -0,0 +1,3 @@
+<svg class="<%= local_assigns[:class] %>" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" width="24" height="24" stroke-width="2">
+  <path d="M6 6h6a3 3 0 0 1 3 3v10l-4 -4m8 0l-4 4"></path>
+</svg>

app/views/icons/_file_upload.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M14 3v4a1 1 0 0 0 1 1h4" /><path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" /><path d="M12 11v6" /><path d="M9.5 13.5l2.5 -2.5l2.5 2.5" />
+</svg>

app/views/icons/_files.html.erb

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M15 3v4a1 1 0 0 0 1 1h4" />
+  <path d="M18 17h-7a2 2 0 0 1 -2 -2v-10a2 2 0 0 1 2 -2h4l5 5v7a2 2 0 0 1 -2 2z" />
+  <path d="M16 17v2a2 2 0 0 1 -2 2h-7a2 2 0 0 1 -2 -2v-10a2 2 0 0 1 2 -2h2" />
+</svg>

app/views/icons/_lock_access.html.erb

@@ -1,9 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-   <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-   <path d="M4 8v-2a2 2 0 0 1 2 -2h2"></path>
-   <path d="M4 16v2a2 2 0 0 0 2 2h2"></path>
-   <path d="M16 4h2a2 2 0 0 1 2 2v2"></path>
-   <path d="M16 20h2a2 2 0 0 0 2 -2v-2"></path>
-   <path d="M8 11m0 1a1 1 0 0 1 1 -1h6a1 1 0 0 1 1 1v3a1 1 0 0 1 -1 1h-6a1 1 0 0 1 -1 -1z"></path>
-   <path d="M10 11v-2a2 2 0 1 1 4 0v2"></path>
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M4 8v-2a2 2 0 0 1 2 -2h2" /><path d="M4 16v2a2 2 0 0 0 2 2h2" /><path d="M16 4h2a2 2 0 0 1 2 2v2" /><path d="M16 20h2a2 2 0 0 0 2 -2v-2" /><path d="M8 11m0 1a1 1 0 0 1 1 -1h6a1 1 0 0 1 1 1v3a1 1 0 0 1 -1 1h-6a1 1 0 0 1 -1 -1z" /><path d="M10 11v-2a2 2 0 1 1 4 0v2" />
 </svg>

app/views/icons/_mail_up.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" width="24" height="24" stroke-width="2">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M12 19h-7a2 2 0 0 1 -2 -2v-10a2 2 0 0 1 2 -2h14a2 2 0 0 1 2 2v5.5" /><path d="M19 22v-6" /><path d="M22 19l-3 -3l-3 3" /><path d="M3 7l9 6l9 -6" />
+</svg>

app/views/icons/_sort_ascending_letters.html.erb

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" width="24" height="24" stroke-width="2">
+  <path d="M15 10v-5c0 -1.38 .62 -2 2 -2s2 .62 2 2v5m0 -3h-4"></path>
+  <path d="M19 21h-4l4 -7h-4"></path> <path d="M4 15l3 3l3 -3"></path>
+  <path d="M7 6v12"></path>
+</svg>

app/views/icons/_sort_descending_numbers.html.erb

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" width="24" height="24" stroke-width="2">
+  <path d="M4 15l3 3l3 -3"></path>
+  <path d="M7 6v12"></path>
+  <path d="M17 14a2 2 0 0 1 2 2v3a2 2 0 1 1 -4 0v-3a2 2 0 0 1 2 -2z"></path>
+  <path d="M17 5m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0"></path>
+  <path d="M19 5v3a2 2 0 0 1 -2 2h-1.5"></path>
+</svg>

app/views/icons/_sort_descending_small_big.html.erb

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" width="24" height="24" stroke-width="2">
+  <path d="M10 15l-3 3l-3 -3"></path>
+  <path d="M7 6v12"></path>
+  <path d="M14 18.333c0 .369 .298 .667 .667 .667h2.666a.667 .667 0 0 0 .667 -.667v-2.666a.667 .667 0 0 0 -.667 -.667h-2.666a.667 .667 0 0 0 -.667 .667v2.666z"></path>
+  <path d="M14 10.833c0 .645 .522 1.167 1.167 1.167h4.666c.645 0 1.167 -.522 1.167 -1.167v-4.666c0 -.645 -.522 -1.167 -1.167 -1.167h-4.666c-.645 0 -1.167 .522 -1.167 1.167v4.666z"></path>
+</svg>

app/views/icons/_sparkles.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M16 18a2 2 0 0 1 2 2a2 2 0 0 1 2 -2a2 2 0 0 1 -2 -2a2 2 0 0 1 -2 2zm0 -12a2 2 0 0 1 2 2a2 2 0 0 1 2 -2a2 2 0 0 1 -2 -2a2 2 0 0 1 -2 2zm-7 12a6 6 0 0 1 6 -6a6 6 0 0 1 -6 -6a6 6 0 0 1 -6 6a6 6 0 0 1 6 6z" />
+</svg>

app/views/icons/_usa_flag.html.erb

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" viewBox="0 0 640 480">
+  <path fill="#bd3d44" d="M0 0h640v480H0" />
+  <path stroke="#fff" stroke-width="37" d="M0 55.3h640M0 129h640M0 203h640M0 277h640M0 351h640M0 425h640" />
+  <path fill="#192f5d" d="M0 0h364.8v258.5H0" />
+  <marker id="um-a" markerHeight="30" markerWidth="30">
+    <path fill="#fff" d="m14 0 9 27L0 10h28L5 27z" />
+  </marker>
+  <path fill="none" marker-mid="url(#um-a)" d="m0 0 16 11h61 61 61 61 60L47 37h61 61 60 61L16 63h61 61 61 61 60L47 89h61 61 60 61L16 115h61 61 61 61 60L47 141h61 61 60 61L16 166h61 61 61 61 60L47 192h61 61 60 61L16 218h61 61 61 61 60z" />
+</svg>

app/views/notifications_settings/_reminder_form.html.erb

@@ -7,19 +7,19 @@
       <div class="w-full">
         <%= f.fields_for :value, record  do |ff| %>
           <%= ff.label :first_duration, t('first_reminder_in'), class: 'label truncate' %>
-          <%= ff.select :first_duration, durations, { include_blank: 'None' }, class: 'base-select' %>
+          <%= ff.select :first_duration, durations, { include_blank: t('none') }, class: 'base-select' %>
         <% end %>
       </div>
       <div class="w-full">
         <%= f.fields_for :value, record  do |ff| %>
           <%= ff.label :second_duration, t('second_reminder_in'), class: 'label truncate' %>
-          <%= ff.select :second_duration, durations, { include_blank: 'None' }, class: 'base-select' %>
+          <%= ff.select :second_duration, durations, { include_blank: t('none') }, class: 'base-select' %>
         <% end %>
       </div>
       <div class="w-full">
         <%= f.fields_for :value, record  do |ff| %>
           <%= ff.label :third_duration, t('third_reminder_in'), class: 'label truncate' %>
-          <%= ff.select :third_duration, durations, { include_blank: 'None' }, class: 'base-select' %>
+          <%= ff.select :third_duration, durations, { include_blank: t('none') }, class: 'base-select' %>
         <% end %>
       </div>
     </div>

app/views/profile/index.html.erb

@@ -12,7 +12,7 @@
         </div>
         <div class="form-control">
           <%= f.label :last_name, t('last_name'), class: 'label' %>
-          <%= f.text_field :last_name, required: true, class: 'base-input', dir: 'auto' %>
+          <%= f.text_field :last_name, required: false, class: 'base-input', dir: 'auto' %>
         </div>
       </div>
       <div class="form-control">

app/views/scripts/_server_selector.html.erb

@@ -0,0 +1,22 @@
+<script>
+  if (!window.customElements.get('server-selector')) {
+    customElements.define('server-selector', class extends HTMLElement {
+      connectedCallback() {
+        const usServerSelector = this.querySelector('#us_server_selector');
+        const globalServerSelector = this.querySelector('#global_server_selector');
+        const euServerAlert = this.querySelector('#eu_server_alert');
+        const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+        const usTimezones = /^(?:America\/(?:New_York|Detroit|Kentucky|Indiana|Chicago|Menominee|North_Dakota|Denver|Boise|Phoenix|Los_Angeles|Anchorage|Juneau|Sitka|Metlakatla|Yakutat|Nome|Adak)|Pacific\/Honolulu)/;
+
+        if (usTimezones.test(timezone)) {
+          usServerSelector.classList.remove('hidden');
+        } else if (timezone.includes('Europe')) {
+          globalServerSelector.classList.remove('hidden');
+          euServerAlert?.classList?.remove('hidden');
+        } else {
+          globalServerSelector.classList.remove('hidden');
+        }
+      }
+    });
+  }
+</script>

app/views/shared/_app_tour.html.erb

@@ -1,5 +1,5 @@
 <% if current_user.created_at > 2.weeks.ago || params[:tour] == 'true' %>
-  <% user_config = current_user.user_configs.find_or_initialize_by(key: UserConfig::SHOW_APP_TOUR) %>
+  <% user_config = current_user.user_configs.find_by(key: UserConfig::SHOW_APP_TOUR) || UserConfig.new(key: UserConfig::SHOW_APP_TOUR, user: current_user) %>
   <% if user_config.new_record? || user_config.value || params[:tour] == 'true' %>
     <app-tour data-show-tour="<%= params[:tour] == 'true' || user_config.value %>" data-type="<%= local_assigns[:type] %>" data-next-page-path="<%= local_assigns[:next_page_path] %>" data-i18n="<%= t('app_tour').to_json %>"></app-tour>
   <% end %>

app/views/shared/_classes.html.erb

@@ -1 +1 @@
-<% 'stats stat stat-figure stat-title stat-value text-accent w-fit hover:bg-white dropdown-open' %>
+<% 'stats stat stat-figure stat-title stat-value text-accent w-fit hover:bg-white dropdown-open border-base-content/30 before:border-base-content/30' %>

app/views/shared/_html_modal.html.erb

@@ -1,4 +1,4 @@
-<% uuid = SecureRandom.uuid %>
+<% uuid = local_assigns[:uuid] || SecureRandom.uuid %>
 <label id="<%= local_assigns[:button_id] %>" for="<%= uuid %>" class="<%= local_assigns[:btn_class] %>"><%= local_assigns[:btn_text] %></label>
 <input type="checkbox" id="<%= uuid %>" class="modal-toggle">
 <div id="<%= local_assigns[:id] %>" class="modal items-start !animate-none overflow-y-auto">

app/views/shared/_navbar.html.erb

@@ -50,6 +50,14 @@
               <% end %>
             </li>
           <% end %>
+          <% if Docuseal.multitenant? || current_user.role == 'superadmin' %>
+            <li>
+              <%= link_to Docuseal::CHATGPT_URL, target: 'blank', class: 'flex items-center' do %>
+                <%= svg_icon('sparkles', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
+                <span class="mr-1 whitespace-nowrap"><%= t('ask_ai') %></span>
+              <% end %>
+            </li>
+          <% end %>
           <% if (can?(:manage, EncryptedConfig) && current_user == true_user) || (current_user != true_user && current_account.testing?) %>
             <%= form_for '', url: testing_account_path, method: current_account.testing? ? :delete : :get, html: { class: 'w-full py-1' } do |f| %>
               <label class="flex items-center pl-6 pr-4 py-2 border-y border-base-300 -ml-2 -mr-2" for="testing_toggle">

app/views/shared/_pagination.html.erb

@@ -5,20 +5,23 @@
       <%= @pagy.from %>-<%= local_assigns.fetch(:to, @pagy.to) %> of <%= local_assigns.fetch(:count, @pagy.count) %> <%= local_assigns[:items_name] || 'items' %>
       <%= local_assigns[:left_additional_html] %>
     </div>
-    <div class="join">
-      <% if @pagy.prev %>
-        <%== link.call(@pagy.prev, '«', classes: 'join-item btn min-h-full h-10') %>
-      <% else %>
-        <span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">«</span>
-      <% end %>
-      <span class="join-item btn uppercase min-h-full h-10">
-        <%= t('page_number', number: @pagy.page) %>
-      </span>
-      <% if @pagy.next %>
-        <%== link.call(@pagy.next, '»', classes: 'join-item btn min-h-full h-10') %>
-      <% else %>
-        <span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">»</span>
-      <% end %>
+    <div class="flex items-center space-x-1.5">
+      <%= local_assigns[:right_additional_html] %>
+      <div class="join">
+        <% if @pagy.prev %>
+          <%== link.call(@pagy.prev, '«', classes: 'join-item btn min-h-full h-10') %>
+        <% else %>
+          <span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">«</span>
+        <% end %>
+        <span class="join-item btn font-medium uppercase min-h-full h-10">
+          <%= t('page_number', number: @pagy.page) %>
+        </span>
+        <% if @pagy.next %>
+          <%== link.call(@pagy.next, '»', classes: 'join-item btn min-h-full h-10') %>
+        <% else %>
+          <span class="join-item btn btn-disabled !bg-base-200 min-h-full h-10">»</span>
+        <% end %>
+      </div>
     </div>
   </div>
 <% end %>

app/views/shared/_templates_order_select.html.erb

@@ -0,0 +1,34 @@
+<% dashboard_templates_order = cookies.permanent[:dashboard_templates_order] || 'created_at' %>
+<form action="<%= url_for %>" method="get" class="dropdown dropdown-top hidden md:inline">
+  <label tabindex="0" class="btn btn-sm h-10">
+    <%= svg_icon('arrow_sort', class: 'w-5 h-5') %>
+  </label>
+  <ul tabindex="0" class="dropdown-content z-[10] menu p-2 shadow bg-base-100 rounded-box mb-1 min-w-48">
+    <toggle-cookies data-value="created_at" data-key="dashboard_templates_order">
+      <li>
+        <button class="<%= 'bg-base-200' if dashboard_templates_order == 'created_at' %>">
+          <%= svg_icon('sort_descending_numbers', class: 'w-4 h-4') %>
+          <span class="whitespace-nowrap"><%= t('newest_first') %></span>
+        </button>
+      </li>
+    </toggle-cookies>
+    <% if local_assigns[:with_recently_used] != false %>
+      <toggle-cookies data-value="used_at" data-key="dashboard_templates_order">
+        <li>
+          <button class="<%= 'bg-base-200' if dashboard_templates_order == 'used_at' %>">
+            <%= svg_icon('sort_descending_small_big', class: 'w-4 h-4') %>
+            <span class="whitespace-nowrap"><%= t('recently_used') %></span>
+          </button>
+        </li>
+      </toggle-cookies>
+    <% end %>
+    <toggle-cookies data-value="name" data-key="dashboard_templates_order">
+      <li>
+        <button class="<%= 'bg-base-200' if dashboard_templates_order == 'name' %>">
+          <%= svg_icon('sort_ascending_letters', class: 'w-4 h-4') %>
+          <span class="whitespace-nowrap"><%= t('name_a_z') %></span>
+        </button>
+      </li>
+    </toggle-cookies>
+  </ul>
+</form>

app/views/submission_events/index.html.erb

@@ -38,6 +38,8 @@
               <%= t('submission_event_names.invite_party_by_html', invited_submitter_name: [invited_submitter.name || invited_submitter.email || invited_submitter.phone, name].join(' '), submitter_name:) %>
             <% elsif event.event_type.include?('send_') %>
               <%= t("submission_event_names.#{event.event_type}_to_html", submitter_name:) %>
+            <% elsif event.event_type.start_with?('bounce_') ||  event.event_type.start_with?('complaint_') %>
+              <%= t("submission_event_names.#{event.event_type}_html", submitter_name:) %>
             <% else %>
               <%= t("submission_event_names.#{event.event_type}_by_html", submitter_name:) %>
             <% end %>

app/views/submissions/_detailed_form.html.erb

@@ -31,7 +31,7 @@
                   </submitters-autocomplete>
                   <submitters-autocomplete data-field="phone">
                     <linked-input data-target-id="<%= "detailed_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                      <input type="tel" pattern="^\+[0-9\s\-]+$" oninvalid="this.value ? this.setCustomValidity('<%= t('use_international_format_1xxx_') %>') : ''" oninput="this.setCustomValidity('')" name="submission[1][submitters][][phone]" autocomplete="off" class="base-input !h-10 mt-1.5 w-full" placeholder="<%= "#{t('phone')} (#{t('optional')})" %>" id="detailed_phone_<%= item['uuid'] %>">
+                      <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full', placeholder: local_assigns[:require_phone_2fa] == true ? t(:phone) : "#{t('phone')} (#{t('optional')})", id: "detailed_phone_#{item['uuid']}", required: local_assigns[:require_phone_2fa] == true %>
                     </linked-input>
                   </submitters-autocomplete>
                 </div>

app/views/submissions/_error.html.erb

@@ -0,0 +1,7 @@
+<div id="submitters_error">
+  <% if local_assigns[:error] %>
+    <div class="text-center text-red-500">
+      <%= local_assigns[:error] %>
+    </div>
+  <% end %>
+</div>

app/views/submissions/_value.html.erb

@@ -1,15 +1,17 @@
 <% align = field.dig('preferences', 'align') %>
+<% valign = field.dig('preferences', 'valign') %>
 <% color = field.dig('preferences', 'color') %>
 <% font = field.dig('preferences', 'font') %>
 <% font_type = field.dig('preferences', 'font_type') %>
-<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' ? 'justify-end' : (align == 'center' ? 'justify-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') %>">
+<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' %>
-    <div class="flex flex-col justify-between h-full overflow-hidden">
-      <div class="flex-grow flex overflow-hidden" style="min-height: 50%">
+    <% 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%">
         <img class="object-contain mx-auto" src="<%= attachments_index[value].url %>">
       </div>
       <% if local_assigns[:with_signature_id] && attachment = attachments_index[value] %>
-        <div class="w-full mt-1 text-[1vw] lg:text-[0.55rem] lg:leading-[0.65rem]">
+        <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 %>
           </div>
@@ -61,17 +63,19 @@
     </div>
   <% elsif field['type'] == 'date' %>
     <autosize-field></autosize-field>
-    <div class="flex items-center px-0.5">
+    <div class="flex w-full px-0.5 <%= valign == 'top' ? 'items-start' : (valign == 'bottom' ? 'items-end' : 'items-center') %>">
       <% value = Time.current.in_time_zone(local_assigns[:timezone]).to_date.to_s if value == '{{date}}' %>
-      <%= TimeUtils.format_date_string(value, field.dig('preferences', 'format'), local_assigns[:locale]) %>
+      <div class="w-full"><%= TimeUtils.format_date_string(value, field.dig('preferences', 'format'), local_assigns[:locale]) %></div>
     </div>
   <% elsif field['type'] == 'number' %>
     <autosize-field></autosize-field>
-    <div class="flex items-center px-0.5 whitespace-nowrap">
-      <%= NumberUtils.format_number(value, field.dig('preferences', 'format')) %>
+    <div class="flex w-full px-0.5 whitespace-nowrap <%= valign == 'top' ? 'items-start' : (valign == 'bottom' ? 'items-end' : 'items-center') %>">
+      <div class="w-full"><%= NumberUtils.format_number(value, field.dig('preferences', 'format')) %></div>
     </div>
   <% else %>
     <autosize-field></autosize-field>
-    <div class="flex items-center px-0.5 whitespace-pre-wrap"><%= Array.wrap(value).join(', ') %></div>
+    <div class="flex w-full px-0.5 whitespace-pre-wrap <%= valign == 'top' ? 'items-start' : (valign == 'bottom' ? 'items-end' : 'items-center') %>">
+      <div class="w-full"><%= Array.wrap(value).join(', ') %></div>
+    </div>
   <% end %>
 </field-value>

app/views/submissions/new.html.erb

@@ -1,10 +1,11 @@
+<% require_phone_2fa = @template.preferences['require_phone_2fa'] == true %>
 <%= render 'shared/turbo_modal_large', title: params[:selfsign] ? t('add_recipients') : t('add_new_recipients') do %>
-  <% options = [[t('via_email'), 'email'], [t('via_phone'), 'phone'], [t('detailed'), 'detailed'], [t('upload_list'), 'list']].compact %>
+  <% options = [require_phone_2fa ? nil : [t('via_email'), 'email'], require_phone_2fa ? nil : [t('via_phone'), 'phone'], [t('detailed'), 'detailed'], [t('upload_list'), 'list']].compact %>
   <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center px-2 mt-4 block">
     <div class="flex justify-center">
       <% options.each_with_index do |(label, value), index| %>
         <div>
-          <%= radio_button_tag 'option', value, value == 'email', class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
+          <%= radio_button_tag 'option', value, value == (require_phone_2fa ? 'detailed' : 'email'), class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
           <label for="option_<%= value %>" class="block bg-base-200 md:min-w-[112px] text-sm font-semibold whitespace-nowrap py-1.5 px-4 peer-checked:bg-base-300 <%= 'hidden sm:inline-block' if value == 'list' %> <%= 'rounded-l-3xl' if index.zero? %> <%= 'rounded-r-3xl sm:rounded-r-none' if value == 'detailed' %> <%= 'rounded-r-3xl' if index == options.size - 1 %>">
             <%= label %>
           </label>
@@ -13,18 +14,21 @@
     </div>
   </toggle-visible>
   <div class="px-5 mb-5 mt-4">
-    <div id="email">
-      <%= render 'email_form', template: @template %>
-    </div>
-    <div id="phone" class="hidden">
-      <%= render 'phone_form', template: @template %>
-    </div>
-    <div id="detailed" class="hidden">
-      <%= render 'detailed_form', template: @template %>
+    <% unless require_phone_2fa %>
+      <div id="email">
+        <%= render 'email_form', template: @template %>
+      </div>
+      <div id="phone" class="hidden">
+        <%= render 'phone_form', template: @template %>
+      </div>
+    <% end %>
+    <div id="detailed" class="<%= 'hidden' unless require_phone_2fa %>">
+      <%= render 'detailed_form', template: @template, require_phone_2fa: %>
     </div>
     <div id="list" class="hidden">
       <%= render 'list_form', template: @template %>
     </div>
+    <%= render 'submissions/error' %>
   </div>
   <%= content_for(:modal_extra) %>
 <% end %>

app/views/submissions/show.html.erb

@@ -172,12 +172,26 @@
               </div>
             <% end %>
             <div class="flex items-center space-x-1 mt-1">
-              <%= svg_icon('writing', class: 'w-5 h-5') %>
+              <% if @submission.expire_at? && submitter && !submitter.completed_at? %>
+                <%= svg_icon('clock_exclamation', class: 'w-5 h-5') %>
+              <% else %>
+                <%= svg_icon('writing', class: 'w-5 h-5') %>
+              <% end %>
               <span>
                 <% if submitter&.declined_at? %>
                   <%= t('declined_on_time', time: l(submitter.declined_at.in_time_zone(@submission.account.timezone), format: :short, locale: @submission.account.locale)) %>
                 <% elsif submitter %>
-                  <%= submitter.completed_at? ? l(submitter.completed_at.in_time_zone(@submission.account.timezone), format: :long, locale: @submission.account.locale) : t('not_completed_yet') %>
+                  <% if submitter.completed_at? %>
+                    <%= l(submitter.completed_at.in_time_zone(@submission.account.timezone), format: :long, locale: @submission.account.locale) %>
+                  <% elsif @submission.expire_at? %>
+                    <% if @submission.expired? %>
+                      <%= t(:expired) %>
+                    <% else %>
+                      <%= t('expire_on_time', time: l(@submission.expire_at.in_time_zone(@submission.account.timezone), format: :short, locale: @submission.account.locale)) %>
+                    <% end %>
+                  <% else %>
+                    <%= t('not_completed_yet') %>
+                  <% end %>
                 <% else %>
                   <%= t('not_invited_yet') %>
                 <% end %>

app/views/submissions_dashboard/index.html.erb

@@ -57,6 +57,7 @@
     <div class="flex items-end flex-col md:flex-row gap-2 w-full md:w-fit">
       <%= render 'submissions_filters/applied_filters', filter_params: %>
       <%= render 'submissions_filters/filter_button', filter_params: %>
+      <%= render 'submissions_filters/actions', filter_params: %>
     </div>
   </div>
 <% end %>

app/views/submissions_preview/completed.html.erb

@@ -28,6 +28,11 @@
           <%= f.hidden_field :submission_slug, value: @submission.slug %>
           <%= f.label :email, t('email'), class: 'label' %>
           <%= f.email_field :email, value: current_user&.email || params[:email], required: true, class: 'base-input', placeholder: t('send_copy_to_email') %>
+          <% if params[:status] == 'error' %>
+            <span class="label-text-alt text-red-400 mt-1">
+              <%= t('please_enter_your_email_address_associated_with_the_completed_submission') %>
+            </span>
+          <% end %>
         </div>
         <toggle-submit dir="auto" class="form-control">
           <%= f.button button_title(title: t('send_copy_to_email'), disabled_with: t('starting')), class: 'base-button' %>

app/views/submit_form/show.html.erb

@@ -8,17 +8,18 @@
 <div style="max-height: -webkit-fill-available;">
   <div id="scrollbox">
     <div class="mx-auto block pb-72" style="max-width: 1000px">
-      <%# flex block w-full sticky top-0 z-50 space-x-2 items-center bg-yellow-100 p-2 border-y border-yellow-200 %>
+      <%# flex block w-full sticky top-0 z-50 space-x-2 items-center bg-yellow-100 p-2 border-y border-yellow-200 transition-transform duration-300 %>
       <%= local_assigns[:banner_html] || capture do %>
         <%= render('submit_form/banner') %>
-        <div class="sticky top-0 z-50 bg-base-100 py-2 px-2 flex items-center md:-mx-[8px]" style="margin-bottom: -16px">
+        <div id="signing_form_header" class="sticky min-[1230px]:static top-0 z-50 bg-base-100 py-2 px-2 flex items-center md:-mx-[8px]" style="margin-bottom: -16px">
           <div class="text-xl md:text-2xl font-medium focus:text-clip" style="width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
             <%= @submitter.submission.template.name %>
           </div>
           <div class="flex items-center space-x-2" style="margin-left: 20px; flex-shrink: 0">
             <% if @form_configs[:with_decline] %>
+              <% decline_modal_checkbox_uuid = SecureRandom.uuid %>
               <div>
-                <%= render 'shared/html_modal', title: t(:decline), btn_text: t(:decline), btn_class: 'btn btn-sm !px-5', button_id: 'decline_button' do %>
+                <%= render 'shared/html_modal', title: t(:decline), btn_text: t(:decline), btn_class: 'btn btn-sm !px-5', button_id: 'decline_button', uuid: decline_modal_checkbox_uuid do %>
                   <%= render 'submit_form/decline_form', submitter: @submitter %>
                 <% end %>
               </div>
@@ -35,6 +36,26 @@
             </download-button>
           </div>
         </div>
+        <scroll-buttons class="fixed right-5 top-2 hidden md:flex gap-1 z-50 ease-in-out opacity-0 -translate-y-10">
+          <% if @form_configs[:with_decline] %>
+            <label id="decline_button" for="<%= decline_modal_checkbox_uuid %>" class="btn btn-sm px-0">
+              <span class="min-[1366px]:inline hidden px-3">
+                <%= t(:decline) %>
+              </span>
+              <span class="inline min-[1366px]:hidden px-2">
+                <%= svg_icon('x', class: 'w-5 h-5') %>
+              </span>
+            </label>
+          <% end %>
+          <download-button data-src="<%= submit_form_download_index_path(@submitter.slug) %>" class="btn btn-neutral text-white btn-sm px-2">
+            <span data-target="download-button.defaultButton">
+              <%= svg_icon('download', class: 'w-5 h-5') %>
+            </span>
+            <span class="hidden" data-target="download-button.loadingButton">
+              <%= svg_icon('loader', class: 'w-5 h-5 animate-spin') %>
+            </span>
+          </download-button>
+        </scroll-buttons>
       <% end %>
       <% schema.each do |item| %>
         <% document = @submitter.submission.template_schema_documents.find { |a| a.uuid == item['attachment_uuid'] } %>

app/views/template_folders/_folder.html.erb

@@ -1,5 +1,5 @@
 <% is_long = folder.name.size > 32 %>
-<a href="<%= folder_path(folder) %>" class="flex h-full flex-col justify-between rounded-2xl py-5 px-6 w-full bg-base-200">
+<a href="<%= folder_path(folder) %>" class="flex h-full flex-col justify-between rounded-2xl py-5 px-6 w-full bg-base-200 before:border-2 before:border-base-300 before:border-dashed before:absolute before:left-0 before:right-0 before:top-0 before:bottom-0 before:hidden before:rounded-2xl relative" data-targets="dashboard-dropzone.folderCards">
   <% if !is_long %>
     <%= svg_icon('folder', class: 'w-6 h-6') %>
   <% end %>