fix font url

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.4
+          ruby-version: 3.3.3
       - name: Cache gems
         uses: actions/cache@v1
         with:
@@ -35,7 +35,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.4
+          ruby-version: 3.3.3
       - name: Cache gems
         uses: actions/cache@v1
         with:
@@ -100,15 +100,13 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.4
+          ruby-version: 3.3.3
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
           node-version: 20.9.0
       - name: Install Chrome
         uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: 125
       - name: Cache node_modules
         uses: actions/cache@v1
         with:

.rubocop.yml

@@ -34,7 +34,6 @@ Metrics/MethodLength:
   Max: 30
   Exclude:
     - 'db/migrate/**'
-    - 'spec/**/*'
 
 Metrics/CyclomaticComplexity:
   Max: 15
@@ -47,8 +46,6 @@ Layout/LineLength:
 
 Metrics/AbcSize:
   Max: 45
-  Exclude:
-    - spec/**/*
 
 Metrics/ModuleLength:
   Max: 500

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.3.4-alpine as fonts
+FROM ruby:3.3.3-alpine as fonts
 
 WORKDIR /fonts
 
@@ -6,7 +6,7 @@ RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-
 
 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
 
-FROM ruby:3.3.4-alpine as webpack
+FROM ruby:3.3.3-alpine as webpack
 
 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -32,7 +32,7 @@ COPY ./app/views ./app/views
 
 RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker
 
-FROM ruby:3.3.4-alpine as app
+FROM ruby:3.3.3-alpine as app
 
 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '3.3.4'
+ruby '3.3.3'
 
 gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic'
 gem 'aws-sdk-s3', require: false
@@ -23,7 +23,6 @@ gem 'image_processing'
 gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
-gem 'net-smtp', '0.4.0'
 gem 'oj'
 gem 'pagy'
 gem 'pg', require: false

Gemfile.lock

@@ -324,10 +324,9 @@ GEM
       date
       net-protocol
     net-pop (0.1.2)
-      net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
     nokogiri (1.16.7)
@@ -435,7 +434,7 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.3.6)
+    rexml (3.3.3)
       strscan
     rotp (6.3.0)
     rqrcode (2.2.0)
@@ -592,7 +591,6 @@ DEPENDENCIES
   letter_opener_web
   lograge
   mysql2
-  net-smtp (= 0.4.0)
   oj
   pagy
   pg
@@ -625,7 +623,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.3.3p89
 
 BUNDLED WITH
    2.5.3

app/controllers/account_configs_controller.rb

@@ -15,7 +15,6 @@ class AccountConfigsController < ApplicationController
     AccountConfig::FORCE_SSO_AUTH_KEY,
     AccountConfig::FLATTEN_RESULT_PDF_KEY,
     AccountConfig::WITH_SIGNATURE_ID,
-    AccountConfig::COMBINE_PDF_RESULT_KEY,
     AccountConfig::REQUIRE_SIGNING_REASON_KEY
   ].freeze
 

app/controllers/api/form_events_controller.rb

@@ -11,8 +11,7 @@ module Api
       params[:before] = Time.zone.at(params[:before].to_i) if params[:before].present?
 
       submitters = paginate(
-        submitters.preload(template: :folder, submission: [:submitters, { audit_trail_attachment: :blob,
-                                                                          combined_document_attachment: :blob }],
+        submitters.preload(template: :folder, submission: [:submitters, { audit_trail_attachment: :blob }],
                            documents_attachments: :blob, attachments_attachments: :blob),
         field: :completed_at
       )

app/controllers/api/submission_events_controller.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmissionEventsController < ApiBaseController
-    load_and_authorize_resource :submission, parent: false
-
-    def index
-      submissions = build_completed_query(@submissions)
-
-      params[:after] = Time.zone.at(params[:after].to_i) if params[:after].present?
-      params[:before] = Time.zone.at(params[:before].to_i) if params[:before].present?
-
-      submissions = paginate(submissions.preload(
-                               :created_by_user, :submission_events,
-                               template: :folder,
-                               submitters: { documents_attachments: :blob, attachments_attachments: :blob },
-                               audit_trail_attachment: :blob
-                             ),
-                             field: :completed_at)
-
-      render json: {
-        data: submissions.map do |s|
-                {
-                  event_type: 'submission.completed',
-                  timestamp: s.completed_at,
-                  data: Submissions::SerializeForApi.call(s, s.submitters)
-                }
-              end,
-        pagination: {
-          count: submissions.size,
-          next: submissions.last&.completed_at&.to_i,
-          prev: submissions.first&.completed_at&.to_i
-        }
-      }
-    end
-
-    private
-
-    def build_completed_query(submissions)
-      submissions = submissions.where(
-        Submitter.where(completed_at: nil).where(
-          Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id])
-        ).select(1).arel.exists.not
-      )
-
-      submissions.joins(:submitters)
-                 .group(:id)
-                 .select(Submission.arel_table[Arel.star],
-                         Submitter.arel_table[:completed_at].maximum.as('completed_at'))
-    end
-  end
-end

app/controllers/api/submissions_controller.rb

@@ -19,14 +19,10 @@ module Api
 
       submissions = paginate(submissions.preload(:created_by_user, :submitters,
                                                  template: :folder,
-                                                 combined_document_attachment: :blob,
                                                  audit_trail_attachment: :blob))
 
       render json: {
-        data: submissions.map do |s|
-          Submissions::SerializeForApi.call(s, s.submitters, params,
-                                            with_events: false, with_documents: false, with_values: false)
-        end,
+        data: submissions.as_json(Submissions::SerializeForApi::SERIALIZE_PARAMS),
         pagination: {
           count: submissions.size,
           next: submissions.last&.id,

app/controllers/api/submitters_controller.rb

@@ -77,10 +77,6 @@ module Api
                                                                 with_urls: true,
                                                                 with_events: false,
                                                                 params:)
-    rescue Submitters::NormalizeValues::BaseError => e
-      Rollbar.warning(e) if defined?(Rollbar)
-
-      render json: { error: e.message }, status: :unprocessable_entity
     end
 
     def submitter_params

app/controllers/api/templates_controller.rb

@@ -95,7 +95,6 @@ module Api
     def template_params
       permitted_params = [
         :name,
-        :external_id,
         {
           submitters: [%i[name uuid]],
           fields: [[:uuid, :submitter_uuid, :name, :type,

app/controllers/start_form_controller.rb

@@ -17,12 +17,16 @@ class StartFormController < ApplicationController
   def update
     return redirect_to start_form_path(@template.slug) if @template.archived_at?
 
-    @submitter = find_or_initialize_submitter(@template, submitter_params)
+    @submitter = Submitter.where(submission: @template.submissions.where(expire_at: Time.current..)
+                                             .or(@template.submissions.where(expire_at: nil)).where(archived_at: nil))
+                          .order(id: :desc)
+                          .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
+                          .find_or_initialize_by(**submitter_params.compact_blank)
 
     if @submitter.completed_at?
       redirect_to start_form_completed_path(@template.slug, email: submitter_params[:email])
     else
-      if @template.submitters.to_a.size > 2 && @submitter.new_record?
+      if @template.submitters.to_a.size > 1 && @submitter.new_record?
         @error_message = 'Not found'
 
         return render :show
@@ -52,18 +56,11 @@ class StartFormController < ApplicationController
 
   private
 
-  def find_or_initialize_submitter(template, submitter_params)
-    Submitter.where(submission: template.submissions.where(expire_at: Time.current..)
-                                        .or(template.submissions.where(expire_at: nil)).where(archived_at: nil))
-             .order(id: :desc)
-             .where(declined_at: nil)
-             .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
-             .find_or_initialize_by(**submitter_params.compact_blank)
-  end
-
   def assign_submission_attributes(submitter, template)
     resubmit_submitter =
-      (Submitter.where(submission: template.submissions).find_by(slug: params[:resubmit]) if params[:resubmit].present?)
+      if params[:resubmit].present?
+        Submitter.where(submission: @template.submissions).find_by(slug: params[:resubmit])
+      end
 
     submitter.assign_attributes(
       uuid: template.submitters.first['uuid'],
@@ -85,25 +82,9 @@ class StartFormController < ApplicationController
                                             template_submitters: template.submitters,
                                             source: :link)
 
-    maybe_assign_default_second_submitter(submitter.submission)
-
-    submitter.account_id = submitter.submission.account_id
-
     submitter
   end
 
-  def maybe_assign_default_second_submitter(submission)
-    return unless submission.new_record?
-    return if submission.template.submitters.to_a.size != 2
-
-    submission.submitters_order = 'preserved'
-    submission.submitters.new(
-      account_id: submission.account_id,
-      uuid: submission.template.submitters.second['uuid'],
-      email: submission.template.author.email
-    )
-  end
-
   def submitter_params
     params.require(:submitter).permit(:email, :phone, :name).tap do |attrs|
       attrs[:email] = Submissions.normalize_email(attrs[:email])

app/controllers/submissions_download_controller.rb

@@ -33,7 +33,7 @@ class SubmissionsDownloadController < ApplicationController
       return head :not_found
     end
 
-    if params[:combined] == 'true'
+    if params[:combined]
       url = build_combined_url(submitter)
 
       if url

app/controllers/submit_form_controller.rb

@@ -15,7 +15,6 @@ class SubmitFormController < ApplicationController
     return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
     return render :archived if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
     return render :expired if @submitter.submission.expired?
-    return render :declined if @submitter.declined_at?
 
     Submitters.preload_with_pages(@submitter)
 
@@ -57,8 +56,6 @@ class SubmitFormController < ApplicationController
       return render json: { error: 'Form has been expired.' }, status: :unprocessable_entity
     end
 
-    return render json: { error: 'Form has been declined.' }, status: :unprocessable_entity if submitter.declined_at?
-
     Submitters::SubmitValues.call(submitter, params, request)
 
     head :ok

app/controllers/submit_form_decline_controller.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormDeclineController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  def create
-    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
-
-    return redirect_to submit_form_path(submitter.slug) if submitter.declined_at? ||
-                                                           submitter.completed_at? ||
-                                                           submitter.submission.archived_at? ||
-                                                           submitter.submission.expired? ||
-                                                           submitter.submission.template.archived_at?
-
-    ApplicationRecord.transaction do
-      submitter.update!(declined_at: Time.current)
-
-      SubmissionEvents.create_with_tracking_data(submitter, 'decline_form', request, { reason: params[:reason] })
-    end
-
-    user = submitter.submission.created_by_user || submitter.template.author
-
-    SubmitterMailer.declined_email(submitter, user).deliver_later!
-    SendFormDeclinedWebhookRequestJob.perform_async('submitter_id' => submitter.id)
-
-    redirect_to submit_form_path(submitter.slug)
-  end
-end

app/controllers/submit_form_download_controller.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-class SubmitFormDownloadController < ApplicationController
-  skip_before_action :authenticate_user!
-  skip_authorization_check
-
-  FILES_TTL = 5.minutes
-
-  def index
-    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
-
-    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?
-
-    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)
-      end
-
-    urls = attachments.map do |attachment|
-      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
-    end
-
-    render json: urls
-  end
-end

app/controllers/submit_form_values_controller.rb

@@ -7,10 +7,8 @@ class SubmitFormValuesController < ApplicationController
   def index
     submitter = Submitter.find_by!(slug: params[:submit_form_slug])
 
-    return render json: {} if submitter.completed_at? || submitter.declined_at?
-    return render json: {} if submitter.submission.template.archived_at? ||
-                              submitter.submission.archived_at? ||
-                              submitter.submission.expired?
+    return render json: {} if submitter.completed_at?
+    return render json: {} if submitter.submission.template.archived_at? || submitter.submission.archived_at?
 
     value = submitter.values[params['field_uuid']]
     attachment = submitter.attachments.where(created_at: params[:after]..).find_by(uuid: value) if value.present?

app/controllers/templates_controller.rb

@@ -123,7 +123,7 @@ class TemplatesController < ApplicationController
     if template.account == current_account
       redirect_to(edit_template_path(@template))
     else
-      redirect_back(fallback_location: root_path, notice: 'Template has been cloned')
+      redirect_back(fallback_location: root_path, notice: 'Template has been clonned')
     end
   end
 

app/controllers/webhook_preferences_controller.rb

@@ -5,7 +5,6 @@ class WebhookPreferencesController < ApplicationController
     form.viewed
     form.started
     form.completed
-    form.declined
     template.created
     template.updated
     submission.created

app/javascript/application.js

@@ -25,7 +25,6 @@ import PromptPassword from './elements/prompt_password'
 import EmailsTextarea from './elements/emails_textarea'
 import ToggleOnSubmit from './elements/toggle_on_submit'
 import PasswordInput from './elements/password_input'
-import SearchInput from './elements/search_input'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -88,7 +87,6 @@ safeRegisterElement('emails-textarea', EmailsTextarea)
 safeRegisterElement('toggle-cookies', ToggleCookies)
 safeRegisterElement('toggle-on-submit', ToggleOnSubmit)
 safeRegisterElement('password-input', PasswordInput)
-safeRegisterElement('search-input', SearchInput)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {
@@ -107,8 +105,6 @@ safeRegisterElement('template-builder', class extends HTMLElement {
       withPayment: this.dataset.withPayment === 'true',
       isPaymentConnected: this.dataset.isPaymentConnected === 'true',
       withFormula: this.dataset.withFormula === 'true',
-      withSendButton: this.dataset.withSendButton !== 'false',
-      withSignYourselfButton: this.dataset.withSignYourselfButton !== 'false',
       withConditions: this.dataset.withConditions === 'true',
       currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
       acceptFileTypes: this.dataset.acceptFileTypes

app/javascript/elements/search_input.js

@@ -1,25 +0,0 @@
-export default class extends HTMLElement {
-  connectedCallback () {
-    this.input.addEventListener('focus', () => {
-      if (this.title) {
-        this.title.classList.add('hidden', 'md:block')
-        this.input.classList.add('w-60')
-      }
-    })
-
-    this.input.addEventListener('blur', (e) => {
-      if (this.title && !e.target.value) {
-        this.title.classList.remove('hidden')
-        this.input.classList.remove('w-60')
-      }
-    })
-  }
-
-  get input () {
-    return this.querySelector('input')
-  }
-
-  get title () {
-    return document.querySelector(this.dataset.title)
-  }
-}

app/javascript/rollbar.js

@@ -18,15 +18,9 @@ if (token) {
     transform (payload) {
       payload.body.telemetry = []
 
-      if (payload.request.query_string) {
-        payload.request.query_string = ''
-      }
+      const string = JSON.stringify(payload)
 
-      if (payload.request.url) {
-        payload.request.url = payload.request.url.replace(/(\/[sdep]\/)(\w{5})[^/]+/, '$1$2')
-      }
-
-      return payload
+      return JSON.parse(string.replace(/(\/[des]\/)\w{6}/g, (_, m) => m))
     },
     payload: {
       client: {

app/javascript/submission_form/areas.vue

@@ -28,7 +28,7 @@
             :with-field-placeholder="withFieldPlaceholder"
             :with-signature-id="withSignatureId"
             :is-active="currentStep === step"
-            :with-label="withLabel && !withFieldPlaceholder && step.length < 2"
+            :with-label="withLabel && !withFieldPlaceholder"
             :is-value-set="step.some((f) => f.uuid in values)"
             :attachments-index="attachmentsIndex"
             @click="$emit('focus-step', stepIndex)"

app/javascript/submission_form/completed.vue

@@ -181,10 +181,6 @@ export default {
         spread: 140
       })
     }
-
-    if (window.decline_button) {
-      window.decline_button.setAttribute('disabled', 'true')
-    }
   },
   methods: {
     sendCopyToEmail () {

app/javascript/submission_form/form.vue

@@ -925,7 +925,7 @@ export default {
         return field.conditions.reduce((acc, c) => {
           const field = this.fieldsUuidIndex[c.field_uuid]
 
-          if (['not_empty', 'checked', 'equal', 'contains'].includes(c.action) && field && !this.checkFieldConditions(field)) {
+          if (['not_empty', 'checked', 'equal', 'contains'].includes(c.action) && !this.checkFieldConditions(field)) {
             return false
           }
 

app/javascript/submission_form/initials_step.vue

@@ -50,26 +50,6 @@
             </span>
           </a>
         </span>
-        <span
-          class="tooltip"
-          :data-tip="t('click_to_upload')"
-        >
-          <label
-            class="btn btn-outline btn-sm font-medium inline-flex flex-nowrap"
-          >
-            <IconUpload :width="16" />
-            <input
-              :key="uploadImageInputKey"
-              type="file"
-              hidden
-              accept="image/*"
-              @change="drawImage"
-            >
-            <span class="hidden sm:inline">
-              {{ t('upload') }}
-            </span>
-          </label>
-        </span>
         <a
           v-if="modelValue || computedPreviousValue"
           href="#"
@@ -117,7 +97,7 @@
     <img
       v-if="modelValue || computedPreviousValue"
       :src="attachmentsIndex[modelValue || computedPreviousValue].url"
-      class="mx-auto bg-white border border-base-300 rounded max-h-44"
+      class="mx-auto bg-white border border-base-300 rounded max-h-72"
     >
     <canvas
       v-show="!modelValue && !computedPreviousValue"
@@ -140,18 +120,16 @@
 
 <script>
 import { cropCanvasAndExportToPNG } from './crop_canvas'
-import { IconReload, IconTextSize, IconUpload, IconSignature, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
+import { IconReload, IconTextSize, IconSignature, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
 import MarkdownContent from './markdown_content'
-import SignatureStep from './signature_step'
 
 const scale = 3
 
 export default {
   name: 'InitialsStep',
   components: {
-    IconUpload,
     AppearsOn,
     IconReload,
     IconTextSize,
@@ -200,8 +178,7 @@ export default {
     return {
       isInitialsStarted: !!this.previousValue,
       isUsePreviousValue: true,
-      isDrawInitials: false,
-      uploadImageInputKey: Math.random().toString()
+      isDrawInitials: false
     }
   },
   computed: {
@@ -252,15 +229,6 @@ export default {
     this.intersectionObserver?.disconnect()
   },
   methods: {
-    drawOnCanvas: SignatureStep.methods.drawOnCanvas,
-    drawImage (event) {
-      this.remove()
-      this.isInitialsStarted = true
-
-      this.drawOnCanvas(event.target.files[0], this.$refs.canvas)
-
-      this.uploadImageInputKey = Math.random().toString()
-    },
     remove () {
       this.$emit('update:model-value', '')
 

app/javascript/submission_form/signature_step.vue

@@ -569,11 +569,8 @@ export default {
       this.remove()
       this.isSignatureStarted = true
 
-      this.drawOnCanvas(event.target.files[0], this.$refs.canvas)
+      const file = event.target.files[0]
 
-      this.uploadImageInputKey = Math.random().toString()
-    },
-    drawOnCanvas (file, canvas) {
       if (file && file.type.match('image.*')) {
         const reader = new FileReader()
 
@@ -583,6 +580,7 @@ export default {
           img.src = event.target.result
 
           img.onload = () => {
+            const canvas = this.$refs.canvas
             const context = canvas.getContext('2d')
 
             const aspectRatio = img.width / img.height
@@ -617,6 +615,8 @@ export default {
         }
 
         reader.readAsDataURL(file)
+
+        this.uploadImageInputKey = Math.random().toString()
       }
     },
     maybeSetSignedUuid (signedUuid) {

app/javascript/template_builder/builder.vue

@@ -58,7 +58,6 @@
         />
         <template v-else>
           <a
-            v-if="withSignYourselfButton"
             :href="template.submitters.length > 1 ? `/templates/${template.id}/submissions/new?selfsign=true` : `/d/${template.slug}`"
             class="btn btn-primary btn-ghost text-base hidden md:flex"
             :target="template.submitters.length > 1 ? '' : '_blank'"
@@ -74,7 +73,6 @@
             </span>
           </a>
           <a
-            v-if="withSendButton"
             :href="`/templates/${template.id}/submissions/new?with_link=true`"
             data-turbo-frame="modal"
             class="white-button md:!px-6"
@@ -481,16 +479,6 @@ export default {
       required: false,
       default: true
     },
-    withSendButton: {
-      type: Boolean,
-      required: false,
-      default: true
-    },
-    withSignYourselfButton: {
-      type: Boolean,
-      required: false,
-      default: true
-    },
     inputMode: {
       type: Boolean,
       required: false,

app/javascript/template_builder/mobile_fields.vue

@@ -52,7 +52,7 @@
       </template>
       <template v-else>
         <template
-          v-for="(icon, type) in fieldIconsSorted"
+          v-for="(icon, type) in fieldIcons"
           :key="type"
         >
           <li v-if="(fieldTypes.length === 0 || fieldTypes.includes(type)) && (withPhone || type != 'phone') && (withPayment || type != 'payment')">

app/jobs/process_submitter_completion_job.rb

@@ -15,19 +15,15 @@ class ProcessSubmitterCompletionJob
     Submissions::EnsureResultGenerated.call(submitter)
 
     if is_all_completed && submitter.completed_at == submitter.submission.submitters.maximum(:completed_at)
-      if submitter.submission.account.account_configs.exists?(key: AccountConfig::COMBINE_PDF_RESULT_KEY, value: true)
-        Submissions::GenerateCombinedAttachment.call(submitter)
-      end
-
       Submissions::GenerateAuditTrail.call(submitter.submission)
 
       enqueue_completed_emails(submitter)
     end
 
-    enqueue_completed_webhooks(submitter, is_all_completed:)
+    enqueue_completed_webhooks(submitter)
   end
 
-  def enqueue_completed_webhooks(submitter, is_all_completed: false)
+  def enqueue_completed_webhooks(submitter)
     webhook_config = Accounts.load_webhook_config(submitter.account)
 
     if webhook_config
@@ -35,26 +31,13 @@ class ProcessSubmitterCompletionJob
                                                          'encrypted_config_id' => webhook_config.id })
     end
 
-    webhook_urls = submitter.account.webhook_urls
-
-    webhook_urls = webhook_urls.where(
+    webhook_ids = submitter.account.webhook_urls.where(
       Arel::Table.new(:webhook_urls)[:events].matches('%"form.completed"%')
-    ).or(
-      webhook_urls.where(
-        Arel::Table.new(:webhook_urls)[:events].matches('%"submission.completed"%')
-      )
-    )
+    ).pluck(:id)
 
-    webhook_urls.each do |webhook|
-      if webhook.events.include?('form.completed')
-        SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
-                                                           'webhook_url_id' => webhook.id })
-      end
-
-      if webhook.events.include?('submission.completed') && is_all_completed
-        SendSubmissionCompletedWebhookRequestJob.perform_async({ 'submission_id' => submitter.submission_id,
-                                                                 'webhook_url_id' => webhook.id })
-      end
+    webhook_ids.each do |webhook_id|
+      SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+                                                         'webhook_url_id' => webhook_id })
     end
   end
 

app/jobs/send_form_declined_webhook_request_job.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-class SendFormDeclinedWebhookRequestJob
-  include Sidekiq::Job
-
-  sidekiq_options queue: :webhooks
-
-  USER_AGENT = 'DocuSeal.co Webhook'
-
-  MAX_ATTEMPTS = 10
-
-  def perform(params = {})
-    submitter = Submitter.find(params['submitter_id'])
-
-    attempt = params['attempt'].to_i
-    config = Accounts.load_webhook_config(submitter.submission.account)
-    url = config&.value.presence
-
-    return if url.blank?
-
-    preferences = Accounts.load_webhook_preferences(submitter.submission.account)
-
-    return if preferences['form.declined'] == false
-
-    ActiveStorage::Current.url_options = Docuseal.default_url_options
-
-    resp = begin
-      Faraday.post(url,
-                   {
-                     event_type: 'form.declined',
-                     timestamp: Time.current,
-                     data: Submitters::SerializeForWebhook.call(submitter)
-                   }.to_json,
-                   **EncryptedConfig.find_or_initialize_by(account_id: config.account_id,
-                                                           key: EncryptedConfig::WEBHOOK_SECRET_KEY)&.value.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
-
-    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
-       (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
-      SendFormDeclinedWebhookRequestJob.perform_in((2**attempt).minutes, {
-                                                     'submitter_id' => submitter.id,
-                                                     'attempt' => attempt + 1,
-                                                     'last_status' => resp&.status.to_i
-                                                   })
-    end
-  end
-end

app/jobs/send_submission_completed_webhook_request_job.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-class SendSubmissionCompletedWebhookRequestJob
-  include Sidekiq::Job
-
-  sidekiq_options queue: :webhooks
-
-  USER_AGENT = 'DocuSeal.co Webhook'
-
-  MAX_ATTEMPTS = 10
-
-  def perform(params = {})
-    submission = Submission.find(params['submission_id'])
-
-    attempt = params['attempt'].to_i
-
-    webhook_url = submission.account.webhook_urls.find(params['webhook_url_id'])
-
-    url = webhook_url.url if webhook_url.events.include?('submission.completed')
-
-    return if url.blank?
-
-    resp = begin
-      Faraday.post(url,
-                   {
-                     event_type: 'submission.completed',
-                     timestamp: Time.current,
-                     data: Submissions::SerializeForApi.call(submission)
-                   }.to_json,
-                   **EncryptedConfig.find_or_initialize_by(account_id: submission.account_id,
-                                                           key: EncryptedConfig::WEBHOOK_SECRET_KEY)&.value.to_h,
-                   'Content-Type' => 'application/json',
-                   'User-Agent' => USER_AGENT)
-    rescue Faraday::Error
-      nil
-    end
-
-    if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
-       (!Docuseal.multitenant? || submission.account.account_configs.exists?(key: :plan))
-      SendSubmissionCompletedWebhookRequestJob.perform_in((2**attempt).minutes, {
-                                                            **params,
-                                                            'attempt' => attempt + 1,
-                                                            'last_status' => resp&.status.to_i
-                                                          })
-    end
-  end
-end

app/mailers/submitter_mailer.rb

@@ -78,24 +78,6 @@ class SubmitterMailer < ApplicationMailer
          subject:)
   end
 
-  def declined_email(submitter, user)
-    @current_account = submitter.submission.account
-    @submitter = submitter
-    @submission = submitter.submission
-    @user = user
-
-    assign_message_metadata('submitter_declined', @submitter)
-
-    I18n.with_locale(submitter.account.locale) do
-      mail(from: from_address_for_submitter(submitter),
-           to: user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name,
-           reply_to: @submitter.friendly_name,
-           subject: I18n.t(:name_declined_by_submitter,
-                           name: @submission.template.name.truncate(20),
-                           submitter: @submitter.name || @submitter.email || @submitter.phone))
-    end
-  end
-
   def documents_copy_email(submitter, to: nil, sig: false)
     @current_account = submitter.submission.account
     @submitter = submitter
@@ -157,7 +139,7 @@ class SubmitterMailer < ApplicationMailer
     total_size = 0
     audit_trail_data = nil
 
-    if with_audit_log && submitter.submission.audit_trail.present? && documents.first&.name != 'combined_document'
+    if with_audit_log && submitter.submission.audit_trail.present?
       audit_trail_data = submitter.submission.audit_trail.download
 
       total_size = audit_trail_data.size

app/models/account.rb

@@ -29,7 +29,7 @@ class Account < ApplicationRecord
   has_one :default_template_folder, -> { where(name: TemplateFolder::DEFAULT_NAME) },
           class_name: 'TemplateFolder', dependent: :destroy, inverse_of: :account
   has_many :submissions, dependent: :destroy
-  has_many :submitters, dependent: :destroy
+  has_many :submitters, through: :submissions
   has_many :account_linked_accounts, dependent: :destroy
   has_many :email_events, dependent: :destroy
   has_many :webhook_urls, dependent: :destroy

app/models/account_config.rb

@@ -40,7 +40,6 @@ class AccountConfig < ApplicationRecord
   FLATTEN_RESULT_PDF_KEY = 'flatten_result_pdf'
   WITH_SIGNATURE_ID = 'with_signature_id'
   REQUIRE_SIGNING_REASON_KEY = 'require_signing_reason'
-  COMBINE_PDF_RESULT_KEY = 'combine_pdf_result_key'
 
   DEFAULT_VALUES = {
     SUBMITTER_INVITATION_EMAIL_KEY => {

app/models/submission.rb

@@ -22,7 +22,7 @@
 #
 # Indexes
 #
-#  index_submissions_on_account_id_and_id   (account_id,id)
+#  index_submissions_on_account_id          (account_id)
 #  index_submissions_on_created_by_user_id  (created_by_user_id)
 #  index_submissions_on_slug                (slug) UNIQUE
 #  index_submissions_on_template_id         (template_id)
@@ -86,10 +86,4 @@ class Submission < ApplicationRecord
     ActiveStorage::Blob.proxy_url(audit_trail.blob)
   end
   alias audit_log_url audit_trail_url
-
-  def combined_document_url
-    return if combined_document.blank?
-
-    ActiveStorage::Blob.proxy_url(combined_document.blob)
-  end
 end

app/models/submission_event.rb

@@ -48,7 +48,6 @@ class SubmissionEvent < ApplicationRecord
     start_form: 'start_form',
     view_form: 'view_form',
     complete_form: 'complete_form',
-    decline_form: 'decline_form',
     api_complete_form: 'api_complete_form'
   }, scope: false
 

app/models/submitter.rb

@@ -6,7 +6,6 @@
 #
 #  id            :bigint           not null, primary key
 #  completed_at  :datetime
-#  declined_at   :datetime
 #  email         :string
 #  ip            :string
 #  metadata      :text             not null
@@ -21,17 +20,15 @@
 #  values        :text             not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
-#  account_id    :bigint           not null
 #  external_id   :string
 #  submission_id :bigint           not null
 #
 # Indexes
 #
-#  index_submitters_on_account_id_and_id  (account_id,id)
-#  index_submitters_on_email              (email)
-#  index_submitters_on_external_id        (external_id)
-#  index_submitters_on_slug               (slug) UNIQUE
-#  index_submitters_on_submission_id      (submission_id)
+#  index_submitters_on_email          (email)
+#  index_submitters_on_external_id    (external_id)
+#  index_submitters_on_slug           (slug) UNIQUE
+#  index_submitters_on_submission_id  (submission_id)
 #
 # Foreign Keys
 #
@@ -39,8 +36,8 @@
 #
 class Submitter < ApplicationRecord
   belongs_to :submission
-  belongs_to :account
   has_one :template, through: :submission
+  has_one :account, through: :submission
 
   attribute :values, :string, default: -> { {} }
   attribute :preferences, :string, default: -> { {} }
@@ -60,9 +57,7 @@ class Submitter < ApplicationRecord
   scope :completed, -> { where.not(completed_at: nil) }
 
   def status
-    if declined_at?
-      'declined'
-    elsif completed_at?
+    if completed_at?
       'completed'
     elsif opened_at?
       'opened'
@@ -85,15 +80,7 @@ class Submitter < ApplicationRecord
     end
   end
 
-  def first_name
-    name.split(/\s+/, 2).first
-  end
-
-  def last_name
-    name.split(/\s+/, 2).last
-  end
-
   def status_event_at
-    declined_at || completed_at || opened_at || sent_at || created_at
+    completed_at || opened_at || sent_at || created_at
   end
 end

app/views/accounts/show.html.erb

@@ -22,7 +22,7 @@
         </div>
       <% end %>
       <% encrypted_config = @encrypted_config || EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::APP_URL_KEY) %>
-      <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) && !current_account.testing? && ENV['APP_URL'].blank? %>
+      <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) && !current_account.testing? %>
         <%= fields_for encrypted_config do |ff| %>
           <div class="form-control">
             <%= ff.label :value, 'App URL', class: 'label' %>
@@ -123,18 +123,6 @@
             </div>
           <% end %>
         <% end %>
-        <% account_config = AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::COMBINE_PDF_RESULT_KEY) %>
-        <% if can?(:manage, account_config) %>
-          <%= 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">
-              <span>
-                Combine completed documents and Audit Log
-              </span>
-              <%= f.check_box :value, class: 'toggle', checked: account_config.value, onchange: 'this.form.requestSubmit()' %>
-            </div>
-          <% end %>
-        <% end %>
       </div>
     <% end %>
     <%= render 'integrations' %>

app/views/dashboard/_toggle_view.html.erb

@@ -1,4 +1,4 @@
-<form action="<%= root_path %>" method="get" class="bg-base-200 px-1.5 rounded-xl py-1 whitespace-nowrap">
+<form action="<%= root_path %>" method="get" class="bg-base-200 px-1.5 rounded-xl py-1">
   <toggle-cookies data-value="templates" data-key="dashboard_view" class="sm:tooltip tooltip-top" data-tip="Templates">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9' : 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_grid', class: 'w-6 h-6 stroke-2') %>

app/views/errors/404.html

@@ -13,13 +13,20 @@
     }
 
     .error-page h1 {
+      font-weight: 700;
+      font-size: 3em;
+      color: #291434;
+      margin: 0 0 0.1em;
+    }
+
+    .error-page h2 {
       font-weight: 700;
       font-size: 10em;
       color: #3BBFF7;
       margin: 0 0 0.1em;
     }
 
-    .error-page h2 {
+    .error-page h3 {
       font-weight: 600;
       font-size: 1.75em;
       color: #291434;
@@ -49,8 +56,9 @@
   <body class="error-page">
     <div class="dialog">
       <div>
-        <h1>404</h1>
-        <h2>Sorry, we couldn't find this page.</h2>
+        <h1>DocuSeal</h1>
+        <h2>404</h2>
+        <h3>Sorry, we couldn't find this page.</h3>
       </div>
       <a rel="noopener noreferrer" href="/" class="btn">Back to homepage</a>
     </div>

app/views/errors/422.html

@@ -13,13 +13,20 @@
     }
 
     .error-page h1 {
+      font-weight: 700;
+      font-size: 3em;
+      color: #291434;
+      margin: 0 0 0.1em;
+    }
+
+    .error-page h2 {
       font-weight: 700;
       font-size: 10em;
       color: #FABE22;
       margin: 0 0 0.1em;
     }
 
-    .error-page h2 {
+    .error-page h3 {
       font-weight: 600;
       font-size: 1.75em;
       color: #291434;
@@ -49,8 +56,9 @@
   <body class="error-page">
     <div class="dialog">
       <div>
-        <h1>422</h1>
-        <h2>You're not allowed to access this page</h2>
+        <h1>DocuSeal</h1>
+        <h2>422</h2>
+        <h3>You're not allowed to access this page</h3>
       </div>
       <a rel="noopener noreferrer" href="/" class="btn">Back to homepage</a>
     </div>

app/views/errors/500.html

@@ -13,13 +13,20 @@
     }
 
     .error-page h1 {
+      font-weight: 700;
+      font-size: 3em;
+      color: #291434;
+      margin: 0 0 0.1em;
+    }
+
+    .error-page h2 {
       font-weight: 700;
       font-size: 10em;
       color: #F97272;
       margin: 0 0 0.1em;
     }
 
-    .error-page h2 {
+    .error-page h3 {
       font-weight: 600;
       font-size: 1.75em;
       color: #291434;
@@ -49,8 +56,9 @@
   <body class="error-page">
     <div class="dialog">
       <div>
-        <h1>500</h1>
-        <h2>We're sorry, but something went wrong</h2>
+        <h1>DocuSeal</h1>
+        <h2>500</h2>
+        <h3>We're sorry, but something went wrong</h3>
       </div>
       <a rel="noopener noreferrer" href="/" class="btn">Back to homepage</a>
     </div>

app/views/layouts/application.html.erb

@@ -2,7 +2,7 @@
 <html data-theme="docuseal" lang="<%= I18n.locale %>">
   <head>
     <%= render 'layouts/head_tags' %>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <% if ENV['ROLLBAR_CLIENT_TOKEN'] %>

app/views/shared/_html_modal.html.erb

@@ -1,19 +0,0 @@
-<% 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">
-  <div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none">
-    <% if local_assigns[:title] %>
-      <div class="flex justify-between items-center border-b pb-2 mb-2 font-medium">
-        <span>
-          <%= local_assigns[:title] %>
-        </span>
-        <label for="<%= uuid %>" class="text-xl">&times;</label>
-      </div>
-    <% end %>
-    <div>
-      <%= yield %>
-    </div>
-  </div>
-  <label class="modal-backdrop" for="<%= uuid %>">Close</label>
-</div>

app/views/shared/_search_input.html.erb

@@ -1,4 +1,4 @@
-<form action="<%= url_for %>" method="get" class="items-center flex">
+<form action="<%= url_for %>" method="get" class="items-center hidden md:flex">
   <% if params[:status].present? %>
     <input name="status" value="<%= params[:status] %>" class="hidden">
   <% end %>
@@ -9,9 +9,7 @@
       </a>
     </div>
   <% end %>
-  <search-input data-title="<%= local_assigns[:title_selector] || 'h1' %>">
-    <input id="search" name="q" value="<%= params[:q] %>" class="input input-ghost text-lg pr-10 -mr-12 w-0 md:w-64 <%= 'pl-8 input-outlined w-64' if params[:q].present? %>" placeholder="<%= local_assigns[:placeholder] %>">
-  </search-input>
+  <input id="search" name="q" value="<%= params[:q] %>" class="input input-ghost text-lg pr-10 -mr-12 <%= 'pl-8 input-outlined' if params[:q].present? %>" placeholder="<%= local_assigns[:placeholder] %>">
   <button type="submit" title="Search" class="btn btn-ghost btn-circle" onclick="window.search.value || document.activeElement === window.search ? null : [event.preventDefault(), window.search.focus()]">
     <span class="enabled">
       <%= svg_icon('search', class: 'w-6 h-6 stroke-2') %>

app/views/submissions/show.html.erb

@@ -1,7 +1,7 @@
 <% if params[:controller] == 'submissions_preview' %>
   <%= render 'submissions/preview_tags' %>
 <% end %>
-<% with_signature_id, is_combined_enabled = AccountConfig.where(account_id: @submission.account_id, key: [AccountConfig::COMBINE_PDF_RESULT_KEY, AccountConfig::WITH_SIGNATURE_ID], value: true).then { |configs| [configs.any? { |e| e.key == AccountConfig::WITH_SIGNATURE_ID }, configs.any? { |e| e.key == AccountConfig::COMBINE_PDF_RESULT_KEY }] } %>
+<% with_signature_id = @submission.account.account_configs.exists?(key: AccountConfig::WITH_SIGNATURE_ID, value: true) %>
 <div style="max-width: 1600px" class="mx-auto pl-4">
   <div class="flex justify-between py-1.5 items-center pr-4 sticky top-0 md:relative z-10 bg-base-100">
     <a href="<%= signed_in? && @submission.account_id == current_account&.id ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
@@ -20,7 +20,7 @@
       <% if last_submitter = @submission.submitters.to_a.select(&:completed_at?).max_by(&:completed_at) %>
         <% is_all_completed = @submission.submitters.to_a.all?(&:completed_at?) %>
         <div class="join relative">
-          <download-button data-src="<%= submitter_download_index_path(last_submitter.slug, { sig: params[:sig], combined: is_combined_enabled }.compact) %>" class="base-button <%= '!rounded-r-none !pr-2' if is_all_completed && !is_combined_enabled %>">
+          <download-button data-src="<%= submitter_download_index_path(last_submitter.slug, { sig: params[:sig] }.compact) %>" class="base-button <%= '!rounded-r-none !pr-2' if is_all_completed %>">
             <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
               <%= svg_icon('download', class: 'w-6 h-6') %>
               <span class="hidden md:inline">Download</span>
@@ -30,7 +30,7 @@
               <span class="hidden md:inline">Downloading</span>
             </span>
           </download-button>
-          <% if is_all_completed && !is_combined_enabled %>
+          <% if is_all_completed %>
             <div class="dropdown dropdown-end">
               <label tabindex="0" class="base-button !rounded-l-none !pl-1 !pr-2 !border-l-neutral-500">
                 <span class="text-sm align-text-top">
@@ -54,8 +54,8 @@
             </div>
           <% end %>
         </div>
-      <% elsif @submission.submitters.to_a.size == 1 && !@submission.expired? && !@submission.submitters.to_a.first.declined_at? %>
-        <%= render 'shared/clipboard_copy', text: submit_form_url(slug: @submission.submitters.to_a.first.slug), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy Share Link', copied_title: 'Copied to Clipboard' %>
+      <% elsif @submission.submitters.to_a.size == 1 && !@submission.expired? %>
+        <%= render 'shared/clipboard_copy', text: start_form_url(slug: @submission.template.slug), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy Share Link', copied_title: 'Copied to Clipboard' %>
       <% end %>
     </div>
   </div>
@@ -143,30 +143,18 @@
             <div class="flex items-center space-x-1 mt-1">
               <%= svg_icon('writing', class: 'w-5 h-5') %>
               <span>
-                <% if submitter&.declined_at? %>
-                  Declined on <%= l(submitter.declined_at.in_time_zone(@submission.account.timezone), format: :short, locale: @submission.account.locale) %>
-                <% else %>
-                  <%= submitter&.completed_at? ? l(submitter.completed_at.in_time_zone(@submission.account.timezone), format: :long, locale: @submission.account.locale) : 'Not completed yet' %>
-                <% end %>
+                <%= submitter&.completed_at? ? l(submitter.completed_at.in_time_zone(@submission.account.timezone), format: :long, locale: @submission.account.locale) : 'Not completed yet' %>
               </span>
             </div>
-            <% if submitter&.declined_at? %>
-              <div class="flex items-center space-x-1 mt-1">
-                <span>
-                  Reason:
-                  <%= simple_format(submitter.submission_events.find_by(event_type: :decline_form).data['reason']) %>
-                </span>
-              </div>
-            <% end %>
-            <% if signed_in? && submitter && submitter.email && !submitter.completed_at && !@submission.archived_at? && can?(:update, submitter) && Accounts.can_send_emails?(current_account) && !@submission.expired? && !submitter.declined_at? %>
+            <% if signed_in? && submitter && submitter.email && !submitter.completed_at && !@submission.archived_at? && can?(:update, submitter) && Accounts.can_send_emails?(current_account) && !@submission.expired? %>
               <div class="mt-2 mb-1">
                 <%= button_to button_title(title: submitter.sent_at? ? 'Re-send Email' : 'Send Email', disabled_with: 'Sending'), submitter_send_email_index_path(submitter_slug: submitter.slug), class: 'btn btn-sm btn-primary w-full' %>
               </div>
             <% end %>
-            <% if signed_in? && submitter && submitter.phone && !submitter.completed_at && !@submission.archived_at? && can?(:update, submitter) && !@submission.expired? && !submitter.declined_at? %>
+            <% if signed_in? && submitter && submitter.phone && !submitter.completed_at && !@submission.archived_at? && can?(:update, submitter) && !@submission.expired? %>
               <%= render 'submissions/send_sms_button', submitter: %>
             <% end %>
-            <% if signed_in? && submitter && !submitter.completed_at? && !@submission.archived_at? && can?(:create, submitter) && !@submission.expired? && !submitter.declined_at? %>
+            <% if signed_in? && submitter && !submitter.completed_at? && !@submission.archived_at? && can?(:create, submitter) && !@submission.expired? %>
               <div class="mt-2 mb-1">
                 <a class="btn btn-sm btn-primary w-full" target="_blank" href="<%= submit_form_path(slug: submitter.slug) %>">
                   Sign In-person

app/views/submissions_archived/index.html.erb

@@ -5,9 +5,7 @@
   <% end %>
 </div>
 <div class="flex justify-between mb-4 items-center">
-  <div>
-    <h1 class="text-4xl font-bold md:block <%= 'hidden' if params[:q].present? %>">Submissions <span class="badge badge-outline badge-lg align-middle">Archived</span></h1>
-  </div>
+  <h1 class="text-4xl font-bold">Submissions <span class="badge badge-outline badge-lg align-middle">Archived</span></h1>
   <% if params[:q].present? || @pagy.pages > 1 %>
     <%= render 'shared/search_input', placeholder: 'Search...' %>
   <% end %>

app/views/submissions_dashboard/index.html.erb

@@ -5,7 +5,7 @@
     <div class="mr-2">
       <%= render 'dashboard/toggle_view', selected: 'submissions' %>
     </div>
-    <h1 class="text-2xl md:text-3xl sm:text-4xl font-bold md:block <%= 'hidden' if params[:q].present? %>">Submissions</h1>
+    <h1 class="text-3xl sm:text-4xl font-bold">Submissions</h1>
   </div>
   <div class="flex space-x-2">
     <% if params[:q].present? || @pagy.pages > 1 %>

app/views/submit_form/_decline_form.html.erb

@@ -1,11 +0,0 @@
-<%= form_for '', url: submit_form_decline_index_path(submitter.slug), method: :post do |f| %>
-  <div class="mt-4 text-center">
-    <%= t(:notify_the_sender_with_the_reason_you_declined) %>
-  </div>
-  <div class="form-control mt-2">
-    <%= f.text_area :reason, required: true, class: 'base-input w-full py-2 h-40', dir: 'auto', placeholder: t('provide_a_reason'), style: 'height: 200px', rows: '10' %>
-  </div>
-  <toggle-submit dir="auto" class="form-control mt-4">
-    <%= f.button button_title(title: t(:decline)), class: 'base-button' %>
-  </toggle-submit>
-<% end %>

app/views/submit_form/declined.html.erb

@@ -1,21 +0,0 @@
-<div class="max-w-md mx-auto px-2 mt-12 mb-4">
-  <div class="space-y-6 mx-auto">
-    <div class="space-y-6">
-      <div class="flex items-center justify-center">
-        <%= render 'start_form/banner' %>
-      </div>
-      <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">
-        <div class="flex items-center">
-          <div class="mr-3">
-            <%= svg_icon('writing_sign', class: 'w-10 h-10') %>
-          </div>
-          <div dir="auto">
-            <p class="text-lg font-bold mb-1"><%= @submitter.submission.template.name %></p>
-            <p class="text-sm"><%= t('form_has_been_declined_on_html', time: l(@submitter.declined_at, format: :long)) %></p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<%= render 'shared/attribution', link_path: '/start', account: @submitter.account %>

app/views/submit_form/show.html.erb

@@ -8,30 +8,7 @@
   <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 %>
-      <%= 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 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">
-            <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 'submit_form/decline_form', submitter: @submitter %>
-              <% end %>
-            </div>
-            <download-button data-src="<%= submit_form_download_index_path(@submitter.slug) %>" class="btn btn-neutral text-white btn-sm !px-4">
-              <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
-                <span><%= t('download') %></span>
-              </span>
-              <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
-                <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
-                <span><%= t('downloading') %></span>
-              </span>
-            </download-button>
-          </div>
-        </div>
-      <% end %>
+      <%= local_assigns[:banner_html] || render('submit_form/banner') %>
       <% (@submitter.submission.template_schema || @submitter.submission.template.schema).each do |item| %>
         <% document = @submitter.submission.template_schema_documents.find { |a| a.uuid == item['attachment_uuid'] } %>
         <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %>
@@ -65,7 +42,7 @@
 <div class="fixed bottom-0 w-full h-0 z-20">
   <div class="mx-auto" style="max-width: 1000px">
     <div class="relative md:mx-32">
-      <%= render 'submit_form/submission_form', attachments_index: @attachments_index, submitter: @submitter, signature_attachment: @signature_attachment, configs: @form_configs, dry_run: local_assigns[:dry_run], expand: local_assigns[:expand], scroll_padding: local_assigns.fetch(:scroll_padding, '-110px') %>
+      <%= render 'submit_form/submission_form', attachments_index: @attachments_index, submitter: @submitter, signature_attachment: @signature_attachment, configs: @form_configs, dry_run: local_assigns[:dry_run], expand: local_assigns[:expand], scroll_padding: local_assigns[:scroll_padding] %>
     </div>
   </div>
 </div>

app/views/submitter_mailer/declined_email.html.erb

@@ -1,4 +0,0 @@
-<p><%= t('hi_there') %>,</p>
-<p><%= t('name_declined_by_submitter_with_the_following_reason', name: @submitter.submission.template.name, submitter: @submitter.name || @submitter.email || @submitter.phone) %></p>
-<%= simple_format(@submitter.submission_events.find_by(event_type: :decline_form).data['reason']) %>
-<p><%= link_to t('view'), submission_url(@submitter.submission) %></p>

app/views/template_folders/show.html.erb

@@ -5,7 +5,7 @@
   <% end %>
 </div>
 <div class="flex justify-between mb-4 items-center">
-  <h1 class="text-4xl font-bold flex items-center space-x-2 md:flex <%= 'hidden' if params[:q].present? %>">
+  <h1 class="text-4xl font-bold flex items-center space-x-2">
     <%= svg_icon('folder', class: 'w-9 h-9 flex-shrink-0') %>
     <span class="peer">
       <%= @template_folder.name %>

app/views/templates/_submission.html.erb

@@ -1,4 +1,4 @@
-<% status_badges = { 'awaiting' => 'badge-info', 'sent' => 'badge-info', 'completed' => 'badge-success', 'opened' => 'badge-warning', 'declined' => 'badge-error' } %>
+<% status_badges = { 'awaiting' => 'badge-info', 'sent' => 'badge-info', 'completed' => 'badge-success', 'opened' => 'badge-warning' } %>
 <div class="bg-base-200 rounded-2xl flex flex-col sm:flex-row items-strech">
   <% if local_assigns[:with_template] %>
     <% template = submission.template %>
@@ -7,12 +7,12 @@
         <div class="font-medium items-start w-full group-hover:link text-sm flex space-x-1">
           <%= svg_icon('file_text', class: 'w-4 h-4 mt-0.5 flex-shrink-0') %>
           <span style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
-            <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
+            <%= template.name %>
             <%= svg_icon('arrow_right', class: 'w-4 h-4 sm:inline group-hover:visible invisible hidden') %>
           </span>
         </div>
       </div>
-      <div class="flex-shrink-0 sm:mt-2 max-w-[50%] md:max-w-full">
+      <div class="flex-shrink-0 sm:mt-2">
         <div class="flex text-xs flex-col text-base-content/60  space-y-0.5">
           <span class="flex items-center space-x-1">
             <%= svg_icon('user', class: 'w-4 h-4 flex-shrink-0') %>
@@ -69,7 +69,7 @@
               </download-button>
             </button>
           </form>
-        <% elsif !submission.archived_at? && !template.archived_at? && !submission.expired? && !submitter.declined_at? %>
+        <% elsif !submission.archived_at? && !template.archived_at? && !submission.expired? %>
           <% if current_user.email == submitter.email %>
             <form data-turbo="false" method="get" action="<%= submit_form_url(slug: submitter.slug) %>" class="flex-1 md:flex-none">
               <button onclick="event.stopPropagation()" class="btn btn-sm btn-neutral btn-outline bg-white w-full md:w-36 flex">
@@ -146,7 +146,7 @@
                       </download-button>
                     </button>
                   </form>
-                <% elsif !template.archived_at? && !submission.archived_at? && !is_submission_completed && !submission.expired? && !submitter.declined_at? %>
+                <% elsif !template.archived_at? && !submission.archived_at? && !is_submission_completed && !submission.expired? %>
                   <div class="relative flex items-center space-x-3">
                     <% if current_user.email == submitter.email %>
                       <form data-turbo="false" method="get" action="<%= submit_form_url(slug: submitter.slug) %>">
@@ -195,11 +195,6 @@
             <%= button_to button_title(title: nil, disabled_with: 'Arch', icon: svg_icon('archive', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: 'Archive', method: :delete, onclick: 'event.stopPropagation()' %>
           </span>
         <% end %>
-        <% if local_assigns[:archived] && can?(:destroy, submission) %>
-          <span data-tip="Remove" class="sm:tooltip tooltip-top">
-            <%= button_to button_title(title: nil, disabled_with: 'Rem', icon: svg_icon('trash', class: 'w-6 h-6')), submission_path(submission, permanently: true), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: 'Remove', method: :delete, data: { turbo_confirm: 'Submission deletion is irreversible and will permanently remove all associated signed documents with it. Are you sure?' }, onclick: 'event.stopPropagation()' %>
-          </span>
-        <% end %>
       </div>
     <% end %>
   </a>

app/views/templates/_template.html.erb

@@ -1,7 +1,7 @@
 <div class="h-36 relative group">
   <a href="<%= template_path(template) %>" class="flex h-full flex-col justify-between rounded-2xl pt-6 px-7 w-full bg-base-200 peer">
     <div class="pb-4 text-xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
-      <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
+      <%= template.name %>
     </div>
     <div class="pb-6 pt-1 space-y-1">
       <p class="flex items-center space-x-1 text-xs text-base-content/60">

app/views/templates/_title.html.erb

@@ -1,7 +1,7 @@
 <div class="flex flex-col items-start md:flex-row space-y-2 md:space-y-0 md:space-x-2 md:justify-between md:items-start mb-6 md:mb-3">
   <div class="relative flex items-start justify-between w-full space-x-0">
     <div>
-      <h1 class="text-3xl md:text-4xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+      <h1 class="text-4xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
         <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
         <% if template.archived_at? %>
           <span class="ml-1 badge badge-outline badge-lg align-middle">Archived</span>
@@ -70,7 +70,7 @@
             <span>Edit</span>
           </span>
         <% end %>
-      <% elsif can?(:read, template) && !template.archived_at? %>
+      <% elsif can?(:read, template) %>
         <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm flex-1' do %>
           <span class="flex items-center justify-center space-x-2">
             <%= svg_icon('file_text', class: 'w-6 h-6') %>
@@ -79,16 +79,8 @@
         <% end %>
       <% end %>
     <% end %>
-    <% if template.archived_at? %>
-      <% if can?(:create, template) %>
-        <%= button_to button_title(title: 'Restore', disabled_with: 'Restoring', icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm flex-1' %>
-      <% end %>
-      <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm flex-1' do %>
-        <span class="flex items-center justify-center space-x-2">
-          <%= svg_icon('file_text', class: 'w-6 h-6') %>
-          <span>Preview</span>
-        </span>
-      <% end %>
+    <% if template.archived_at? && can?(:create, template) %>
+      <%= button_to button_title(title: 'Restore', disabled_with: 'Restoring', icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm flex-1' %>
     <% end %>
   </div>
 </div>

app/views/templates/edit.html.erb

@@ -1 +1 @@
-<template-builder class="grid" data-template="<%= @template_data %>" data-with-sign-yourself-button="<%= !@template.archived_at? %>" data-with-send-button="<%= !@template.archived_at? && can?(:create, @template.submissions.new(account: current_account)) %>" data-locale="<%= current_account.locale %>"></template-builder>
+<template-builder class="grid" data-template="<%= @template_data %>" data-locale="<%= current_account.locale %>"></template-builder>

app/views/templates/show.html.erb

@@ -3,12 +3,10 @@
 <% if !@pagy.count.zero? || params[:q].present? || params[:status].present? %>
   <div class="<%= is_show_tabs ? 'mb-4' : 'mb-6' %>">
     <div class="flex justify-between items-center md:items-end">
-      <div>
-        <h2 class="text-3xl font-bold md:block <%= 'hidden' if params[:q].present? %>">Submissions</h2>
-      </div>
+      <p class="text-3xl font-bold">Submissions</p>
       <div class="flex justify-end space-x-2">
         <% if params[:q].present? || params[:status].present? || @pagy.pages > 1 %>
-          <%= render 'shared/search_input', title_selector: 'h2' %>
+          <%= render 'shared/search_input' %>
         <% end %>
         <%= link_to new_template_submissions_export_path(@template), class: 'hidden md:flex btn btn-ghost text-base', data: { turbo_frame: 'modal' } do %>
           <%= svg_icon('download', class: 'w-6 h-6 stroke-2') %>

app/views/templates_archived/index.html.erb

@@ -5,9 +5,7 @@
   <% end %>
 </div>
 <div class="flex justify-between mb-4 items-center">
-  <div>
-  <h1 class="text-4xl font-bold md:block <%= 'hidden' if params[:q].present? %>"><span class="hidden md:inline">Document</span> Templates <span class="badge badge-outline badge-lg align-middle">Archived</span></h1>
-  </div>
+  <h1 class="text-4xl font-bold"><span class="hidden md:inline">Document</span> Templates <span class="badge badge-outline badge-lg align-middle">Archived</span></h1>
   <% if params[:q].present? || @pagy.pages > 1 %>
     <%= render 'shared/search_input', placeholder: 'Search...' %>
   <% end %>

app/views/templates_archived_submissions/index.html.erb

@@ -6,11 +6,11 @@
   <% end %>
 </div>
 <div class="flex justify-between mb-6 md:items-end flex-col md:flex-row">
-  <div>
-    <h1 class="text-3xl font-bold md:block">Submissions <span class="badge badge-outline badge-lg align-middle">Archived</span></h1>
-  </div>
-  <div class="flex space-x-2 mt-3 md:mt-0 justify-end">
-    <%= render 'shared/search_input' %>
+  <p class="text-3xl font-bold">Submissions <span class="badge badge-outline badge-lg align-middle">Archived</span></p>
+  <div class="flex space-x-2 mt-3 md:mt-0">
+    <% if params[:q].present? || @pagy.pages > 1 %>
+      <%= render 'shared/search_input' %>
+    <% end %>
     <%= link_to new_template_submissions_export_path(@template), class: 'order-3 md:order-1 btn btn-ghost text-base', data: { turbo_frame: 'modal' } do %>
       <%= svg_icon('download', class: 'w-6 h-6 stroke-2') %>
       <span>Export</span>

app/views/templates_dashboard/index.html.erb

@@ -7,7 +7,7 @@
         <%= render 'dashboard/toggle_view', selected: 'templates' %>
       </div>
     <% end %>
-    <h1 class="text-2xl md:text-3xl sm:text-4xl font-bold md:block <%= 'hidden' if params[:q].present? %>"><span class="hidden md:inline">Document</span> Templates</h1>
+    <h1 class="text-3xl sm:text-4xl font-bold"><span class="hidden md:inline">Document</span> Templates</h1>
   </div>
   <div class="flex space-x-2">
     <% if params[:q].present? || @pagy.pages > 1 || @template_folders.present? %>

app/views/templates_preview/show.html.erb

@@ -1 +1 @@
-<template-builder class="grid" data-editable="false" data-with-sign-yourself-button="<%= !@template.archived_at? %>" data-with-send-button="<%= !@template.archived_at? && can?(:create, @template.submissions.new(account: current_account)) %>" data-template="<%= @template_data %>"></template-builder>
+<template-builder class="grid" data-editable="false" data-template="<%= @template_data %>"></template-builder>

config/environments/production.rb

@@ -126,32 +126,39 @@ Rails.application.configure do
   config.lograge.enabled = true
   config.lograge.base_controller_class = ['ActionController::API', 'ActionController::Base']
 
-  config.lograge.formatter = ->(data) { data.except(:path, :location).to_json }
+  if ENV['MULTITENANT'] == 'true'
+    config.lograge.formatter = ->(data) { data.except(:path, :location).to_json }
 
-  config.lograge.custom_payload do |controller|
-    params =
-      begin
-        controller.request.try(:params) || {}
-      rescue StandardError
-        {}
-      end
+    config.lograge.custom_payload do |controller|
+      params =
+        begin
+          controller.request.try(:params) || {}
+        rescue StandardError
+          {}
+        end
 
-    {
-      fwd: controller.request.remote_ip,
-      params: {
-        id: params[:id],
-        template_id: params[:template_id],
-        submission_id: params[:submission_id],
-        submitter_id: params[:submitter_id],
-        sig: (params[:signed_uuid] || params[:signed_id]).to_s.split('--').first,
-        slug: (params[:slug] ||
-               params[:submitter_slug] ||
-               params[:submission_slug] ||
-               params[:submit_form_slug] ||
-               params[:template_slug]).to_s.first(5)
-      }.compact_blank,
-      host: controller.request.host,
-      uid: controller.instance_variable_get(:@current_user).try(:id)
-    }
+      {
+        fwd: controller.request.remote_ip,
+        params: {
+          id: params[:id],
+          sig: (params[:signed_uuid] || params[:signed_id]).to_s.split('--').first,
+          slug: (params[:slug] ||
+                 params[:submitter_slug] ||
+                 params[:submission_slug] ||
+                 params[:submit_form_slug] ||
+                 params[:template_slug]).to_s.last(5)
+        }.compact_blank,
+        host: controller.request.host,
+        uid: controller.instance_variable_get(:@current_user).try(:id)
+      }
+    end
+  else
+    config.lograge.formatter = Lograge::Formatters::Json.new
+
+    config.lograge.custom_payload do |controller|
+      {
+        fwd: controller.request.remote_ip
+      }
+    end
   end
 end

config/locales/en.yml

@@ -18,8 +18,6 @@ en: &en
   language_nl: Nederlands
   language_ar: العربية
   language_ko: 한국어
-  view: View
-  hi_there: Hi there
   email: Email
   form_expired_at_html: 'Form expired on <span class="font-semibold">%{time}</span>'
   verification_code_code: 'Verification code: %{code}'
@@ -41,15 +39,6 @@ en: &en
   or: or
   download_documents: Download documents
   downloading: Downloading
-  download: Download
-  decline: Decline
-  declined: Declined
-  decline_reason: Decline reason
-  provide_a_reason: Provide a reason
-  notify_the_sender_with_the_reason_you_declined: Notify the sender with the reason you declined
-  form_has_been_declined_on_html: 'Form has been declined on <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" declined by %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" has been declined by %{submitter} with the following reason:'
   completed_successfully: Completed Successfully
   password: Password
   sign_in: Sign In
@@ -76,17 +65,6 @@ en: &en
       read: Read your data
 
 es: &es
-  view: Vista
-  hi_there: Hola
-  download: Descargar
-  decline: Rechazar
-  declined: Rechazado
-  decline_reason: Motivo de rechazo
-  provide_a_reason: Proporcione un motivo
-  notify_the_sender_with_the_reason_you_declined: Notifique al remitente con el motivo por el que rechazó
-  form_has_been_declined_on_html: 'El formulario ha sido rechazado el <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" rechazado por %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" ha sido rechazado por %{submitter} con el siguiente motivo:'
   role: Rol
   reason: Razón
   form_expired_at_html: 'El formulario expiró el <span class="font-semibold">%{time}</span>'
@@ -131,17 +109,6 @@ es: &es
   enter_email_to_continue: Ingresa tu correo electrónico para continuar
 
 it: &it
-  view: View
-  hi_there: Bonjour,
-  download: Télécharger
-  decline: Refuser
-  declined: Refusé
-  decline_reason: Raison du refus
-  provide_a_reason: Fournir une raison
-  notify_the_sender_with_the_reason_you_declined: Informer l'expéditeur de la raison pour laquelle vous avez refusé
-  form_has_been_declined_on_html: 'Le formulaire a été refusé le <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" refusé par %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" a été refusé par %{submitter} pour la raison suivante :'
   role: Rôle
   reason: Ragione
   verification_code_code: 'Codice di verifica: %{code}'
@@ -185,17 +152,6 @@ it: &it
   enter_email_to_continue: Inserisci l'email per continuare
 
 fr: &fr
-  view: Vue
-  hi_there: Salut,
-  download: Télécharger
-  decline: Refuser
-  declined: Refusé
-  decline_reason: Raison du refus
-  provide_a_reason: Fournir une raison
-  notify_the_sender_with_the_reason_you_declined: Informer l'expéditeur de la raison pour laquelle vous avez refusé
-  form_has_been_declined_on_html: 'Le formulaire a été refusé le <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" a été refusé par %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" a été refusé par %{submitter} avec la raison suivante :'
   email: Email
   verification_code_code: 'Code de vérification: %{code}'
   digitally_signed_by: Signé numériquement par
@@ -239,23 +195,13 @@ fr: &fr
   enter_email_to_continue: Entrez votre e-mail pour continuer
 
 pt: &pt
-  view: Visualizar
-  hi_there: Olá,
-  download: Baixar
-  decline: Recusar
-  declined: Recusado
-  decline_reason: Motivo da recusa
-  provide_a_reason: Forneça um motivo
-  notify_the_sender_with_the_reason_you_declined: Notifique o remetente com o motivo que você recusou
-  form_has_been_declined_on_html: 'O formulário foi recusado em <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" foi recusado por %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" foi recusado por %{submitter} com o seguinte motivo:'
   role: Função
   email: Email
   reason: Razão
   verification_code_code: 'Código de verificação: %{code}'
   digitally_signed_by: Assinado digitalmente por
   form_expired_at_html: 'O formulário expirou em <span class="font-semibold">%{time}</span>'
+  role: Função
   provide_your_email_to_start: Forneça o seu email para começar
   start: Iniciar
   starting: Iniciando
@@ -292,23 +238,13 @@ pt: &pt
   enter_email_to_continue: Insira o e-mail para continuar
 
 de: &de
-  view: Ansicht
-  hi_there: Hallo,
-  download: Herunterladen
-  decline: Ablehnen
-  declined: Abgelehnt
-  decline_reason: Ablehnungsgrund
-  provide_a_reason: Geben Sie einen Grund an
-  notify_the_sender_with_the_reason_you_declined: Benachrichtigen Sie den Absender über den Grund für Ihre Ablehnung
-  form_has_been_declined_on_html: 'Das Formular wurde am <span class="font-semibold">%{time}</span> abgelehnt'
-  name_declined_by_submitter: '"%{name}" wurde von %{submitter} abgelehnt'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" wurde von %{submitter} mit folgendem Grund abgelehnt:'
   role: Rolle
   verification_code_code: 'Verifizierungscode: %{code}'
   reason: Grund
   email: E-Mail
   form_expired_at_html: 'Das Formular ist am <span class="font-semibold">%{time}</span> abgelaufen'
   digitally_signed_by: Digital signiert von
+  role: Rolle
   provide_your_email_to_start: Gib deine E-Mail-Adresse ein, um zu starten
   start: Starten
   starting: Starten
@@ -345,18 +281,7 @@ de: &de
   enter_email_to_continue: E-Mail eingeben, um fortzufahren
 
 pl:
-  view: Widok
-  hi_there: Cześć,
-  download: Pobierz
-  decline: Odrzuć
-  declined: Odrzucono
-  decline_reason: Powód odrzucenia
-  provide_a_reason: Podaj powód
-  notify_the_sender_with_the_reason_you_declined: Powiadom nadawcę o powodzie, dla którego odrzuciłeś
-  form_has_been_declined_on_html: 'Formularz został odrzucony o <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" odrzucono przez %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" został odrzucony przez %{submitter} z następującym powodem:'
-  email: E-mail
+  email: Email
   verification_code_code: 'Kod weryfikacyjny: %{code}'
   digitally_signed_by: Podpis cyfrowy przez
   form_expired_at_html: 'Formularz wygasł o <span class="font-semibold">%{time}</span>'
@@ -398,18 +323,7 @@ pl:
   enter_email_to_continue: Wprowadź e-mail, aby kontynuować
 
 uk:
-  view: Переглянути
-  hi_there: Привіт,
-  download: Завантажити
-  decline: Відхилити
-  declined: Відхилено
-  decline_reason: Причина відхилення
-  provide_a_reason: Надайте причину
-  notify_the_sender_with_the_reason_you_declined: Повідомте відправника про причину, з якої ви відхилили
-  form_has_been_declined_on_html: 'Форму було відхилено о <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" відхилено %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" було відхилено %{submitter} з такою причиною:'
-  email: E-mail
+  email: Email
   digitally_signed_by: Цифровий підпис від
   verification_code_code: 'Код підтвердження: %{code}'
   role: Роль
@@ -451,18 +365,7 @@ uk:
   enter_email_to_continue: Введіть електронну пошту, щоб продовжити
 
 cs:
-  view: Zobrazit
-  hi_there: Ahoj,
-  download: Stáhnout
-  decline: Odmítnout
-  declined: Odmítnuto
-  decline_reason: Důvod odmítnutí
-  provide_a_reason: Uveďte důvod
-  notify_the_sender_with_the_reason_you_declined: Informujte odesílatele o důvodu odmítnutí
-  form_has_been_declined_on_html: 'Formulář byl odmítnut dne <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" odmítnuto %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" bylo odmítnuto %{submitter} s následujícím důvodem:'
-  email: E-mail
+  email: Email
   digitally_signed_by: Digitálně podepsáno uživatelem
   verification_code_code: 'Ověřovací kód: %{code}'
   role: Role
@@ -504,17 +407,6 @@ cs:
   enter_email_to_continue: Zadejte e-mail pro pokračování
 
 he:
-  view: תצוגה
-  hi_there: שלום,
-  download: הורד
-  decline: דחייה
-  declined: דחוי
-  decline_reason: סיבת דחייה
-  provide_a_reason: אנא ספק סיבה
-  notify_the_sender_with_the_reason_you_declined: הודע לשולח על הסיבה לדחייה
-  form_has_been_declined_on_html: 'הטופס נדחה בתאריך <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" נדחה על ידי %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" נדחה על ידי %{submitter} עם הסיבה הבאה:'
   email: דוא"ל
   digitally_signed_by: חתום דיגיטלית על ידי
   role: תפקיד
@@ -557,17 +449,6 @@ he:
   enter_email_to_continue: הכנס דוא"ל כדי להמשיך
 
 nl:
-  view: Bekijken
-  hi_there: Hallo,
-  download: Downloaden
-  decline: Weigeren
-  declined: Geweigerd
-  decline_reason: Weigeringsreden
-  provide_a_reason: Geef een reden op
-  notify_the_sender_with_the_reason_you_declined: Informeer de afzender over de reden waarom je hebt geweigerd
-  form_has_been_declined_on_html: 'Formulier is afgewezen op <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" is geweigerd door %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" is geweigerd door %{submitter} met de volgende reden:'
   email: E-mail
   digitally_signed_by: Digitaal ondertekend door
   role: Rol
@@ -611,17 +492,6 @@ nl:
   enter_email_to_continue: Voer e-mail in om door te gaan
 
 ar:
-  view: عرض
-  hi_there: مرحبا,
-  download: تحميل
-  decline: رفض
-  declined: مرفوض
-  decline_reason: سبب الرفض
-  provide_a_reason: قدم سببًا
-  notify_the_sender_with_the_reason_you_declined: أخطر المرسل بسبب الرفض
-  form_has_been_declined_on_html: 'تم رفض النموذج في <span class="font-semibold">%{time}</span>'
-  name_declined_by_submitter: '"%{name}" مرفوض بواسطة %{submitter}'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}" تم رفضه بواسطة %{submitter} مع السبب التالي:'
   email: البريد الإلكتروني
   digitally_signed_by: تم التوقيع الرقمي بواسطة
   role: الدور
@@ -665,17 +535,6 @@ ar:
   enter_email_to_continue: أدخل البريد الإلكتروني للمتابعة
 
 ko:
-  view: 보기
-  hi_there: 안녕하세요,
-  download: 다운로드
-  decline: 거절
-  declined: 거절됨
-  decline_reason: 거절 사유
-  provide_a_reason: 사유를 제공하세요
-  notify_the_sender_with_the_reason_you_declined: 거절한 이유로 발신자에게 알리기
-  form_has_been_declined_on_html: '양식이 <span class="font-semibold">%{time}</span>에 거절되었습니다.'
-  name_declined_by_submitter: '"%{name}"이(가) %{submitter}에 의해 거절되었습니다.'
-  name_declined_by_submitter_with_the_following_reason: '"%{name}"이(가) %{submitter}에 의해 다음과 같은 사유로 거절되었습니다:'
   email: 이메일
   digitally_signed_by: 디지털로 서명됨
   role: 역할

config/routes.rb

@@ -49,7 +49,6 @@ Rails.application.routes.draw do
     end
     scope 'events' do
       resources :form_events, only: %i[index], path: 'form/:type'
-      resources :submission_events, only: %i[index], path: 'submission/:type'
     end
   end
 
@@ -125,8 +124,6 @@ Rails.application.routes.draw do
 
   resources :submit_form, only: %i[show update], path: 's', param: 'slug' do
     resources :values, only: %i[index], controller: 'submit_form_values'
-    resources :download, only: %i[index], controller: 'submit_form_download'
-    resources :decline, only: %i[create], controller: 'submit_form_decline'
     get :completed
   end
 

db/migrate/20240816064633_add_account_id_to_submitters.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class AddAccountIdToSubmitters < ActiveRecord::Migration[7.1]
-  def change
-    add_reference :submitters, :account, index: false, null: true
-
-    add_index :submitters, %i[account_id id]
-  end
-end

db/migrate/20240816072859_populate_submitter_account_id.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-class PopulateSubmitterAccountId < ActiveRecord::Migration[7.1]
-  disable_ddl_transaction
-
-  class MigrationSubmitter < ApplicationRecord
-    self.table_name = 'submitters'
-    belongs_to :submission, class_name: 'MigrationSubmission'
-  end
-
-  class MigrationSubmission < ApplicationRecord
-    self.table_name = 'submissions'
-  end
-
-  def up
-    MigrationSubmitter.where(account_id: nil).preload(:submission).find_each do |submitter|
-      submitter.update_columns(account_id: submitter.submission.account_id)
-    end
-
-    if MigrationSubmitter.exists?(account_id: nil)
-      MigrationSubmitter.where(account_id: nil).preload(:submission).find_each do |submitter|
-        submitter.update_columns(account_id: submitter.submission.account_id)
-      end
-    end
-
-    change_column_null :submitters, :account_id, false
-  end
-
-  def down
-    nil
-  end
-end

db/migrate/20240816075917_update_submission_account_id_index.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-class UpdateSubmissionAccountIdIndex < ActiveRecord::Migration[7.1]
-  def change
-    add_index :submissions, %i[account_id id]
-    remove_index :submissions, :account_id
-  end
-end

db/migrate/20240816121641_remove_active_storage_uniq_index.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveActiveStorageUniqIndex < ActiveRecord::Migration[7.1]
-  def change
-    remove_index :active_storage_attachments, %i[record_type record_id name blob_id],
-                 unique: true,
-                 name: 'index_active_storage_attachments_uniqueness'
-
-    add_index :active_storage_attachments, %i[record_type record_id name blob_id]
-  end
-end

db/migrate/20240820180922_add_declined_at_to_submitters.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class AddDeclinedAtToSubmitters < ActiveRecord::Migration[7.1]
-  def change
-    add_column :submitters, :declined_at, :datetime
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_08_20_180922) do
+ActiveRecord::Schema[7.1].define(version: 2024_08_01_125558) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -64,7 +64,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_08_20_180922) do
     t.bigint "blob_id", null: false
     t.datetime "created_at", null: false
     t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
-    t.index ["record_type", "record_id", "name", "blob_id"], name: "idx_on_record_type_record_id_name_blob_id_0be5805727"
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
     t.index ["uuid"], name: "index_active_storage_attachments_on_uuid"
   end
 
@@ -219,7 +219,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_08_20_180922) do
     t.text "preferences", null: false
     t.bigint "account_id", null: false
     t.datetime "expire_at"
-    t.index ["account_id", "id"], name: "index_submissions_on_account_id_and_id"
+    t.index ["account_id"], name: "index_submissions_on_account_id"
     t.index ["created_by_user_id"], name: "index_submissions_on_created_by_user_id"
     t.index ["slug"], name: "index_submissions_on_slug", unique: true
     t.index ["template_id"], name: "index_submissions_on_template_id"
@@ -243,9 +243,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_08_20_180922) do
     t.string "external_id"
     t.text "preferences", null: false
     t.text "metadata", null: false
-    t.bigint "account_id", null: false
-    t.datetime "declined_at"
-    t.index ["account_id", "id"], name: "index_submitters_on_account_id_and_id"
     t.index ["email"], name: "index_submitters_on_email"
     t.index ["external_id"], name: "index_submitters_on_external_id"
     t.index ["slug"], name: "index_submitters_on_slug", unique: true

lib/ability.rb

@@ -14,7 +14,7 @@ class Ability
     can :manage, TemplateFolder, account_id: user.account_id
     can :manage, TemplateSharing, template: { account_id: user.account_id }
     can :manage, Submission, account_id: user.account_id
-    can :manage, Submitter, account_id: user.account_id
+    can :manage, Submitter, submission: { account_id: user.account_id }
     can :manage, User, account_id: user.account_id
     can :manage, EncryptedConfig, account_id: user.account_id
     can :manage, EncryptedUserConfig, user_id: user.id

lib/action_mailer_configs_interceptor.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module ActionMailerConfigsInterceptor
-  OPEN_TIMEOUT = ENV.fetch('SMTP_OPEN_TIMEOUT', '15').to_i
-  READ_TIMEOUT = ENV.fetch('SMTP_READ_TIMEOUT', '25').to_i
+  OPEN_TIMEOUT = 15
+  READ_TIMEOUT = 25
 
   module_function
 

lib/docuseal.rb

@@ -6,7 +6,7 @@ module Docuseal
   NEWSLETTER_URL = "#{PRODUCT_URL}/newsletters".freeze
   ENQUIRIES_URL = "#{PRODUCT_URL}/enquiries".freeze
   PRODUCT_NAME = 'DocuSeal'
-  DEFAULT_APP_URL = ENV.fetch('APP_URL', 'http://localhost:3000')
+  DEFAULT_APP_URL = 'http://localhost:3000'
   GITHUB_URL = 'https://github.com/docusealco/docuseal'
   DISCORD_URL = 'https://discord.gg/qygYCDGck9'
   TWITTER_URL = 'https://twitter.com/docusealco'
@@ -76,7 +76,7 @@ module Docuseal
     return DEFAULT_URL_OPTIONS if multitenant?
 
     @default_url_options ||= begin
-      value = EncryptedConfig.find_by(key: EncryptedConfig::APP_URL_KEY)&.value if ENV['APP_URL'].blank?
+      value = EncryptedConfig.find_by(key: EncryptedConfig::APP_URL_KEY)&.value
       value ||= DEFAULT_APP_URL
       url = Addressable::URI.parse(value)
       { host: url.host, port: url.port, protocol: url.scheme }

lib/replace_email_variables.rb

@@ -6,11 +6,9 @@ module ReplaceEmailVariables
   SUBMITTER_LINK = /\{+submitter\.link\}+/i
   ACCOUNT_NAME = /\{+account\.name\}+/i
   SENDER_NAME = /\{+sender\.name\}+/i
-  SENDER_FIRST_NAME = /\{+sender\.first_name\}+/i
   SENDER_EMAIL = /\{+sender\.email\}+/i
   SUBMITTER_EMAIL = /\{+submitter\.email\}+/i
   SUBMITTER_NAME = /\{+submitter\.name\}+/i
-  SUBMITTER_FIRST_NAME = /\{+submitter\.first_name\}+/i
   SUBMITTER_ID = /\{+submitter\.id\}+/i
   SUBMITTER_SLUG = /\{+submitter\.slug\}+/i
   SUBMISSION_LINK = /\{+submission\.link\}+/i
@@ -30,7 +28,6 @@ module ReplaceEmailVariables
     text = replace(text, SUBMISSION_ID, html_escape:) { submitter.submission.id }
     text = replace(text, SUBMITTER_EMAIL, html_escape:) { submitter.email }
     text = replace(text, SUBMITTER_NAME, html_escape:) { submitter.name || submitter.email || submitter.phone }
-    text = replace(text, SUBMITTER_FIRST_NAME, html_escape:) { submitter.first_name }
     text = replace(text, SUBMITTER_LINK, html_escape:) { build_submitter_link(submitter, tracking_event_type) }
     text = replace(text, SUBMISSION_LINK, html_escape:) do
       submitter.submission ? build_submission_link(submitter.submission) : ''
@@ -40,7 +37,6 @@ module ReplaceEmailVariables
     text = replace(text, DOCUMENTS_LINK, html_escape:) { build_documents_links_text(submitter, sig) }
     text = replace(text, ACCOUNT_NAME, html_escape:) { submitter.submission.account.name }
     text = replace(text, SENDER_NAME, html_escape:) { submitter.submission.created_by_user&.full_name }
-    text = replace(text, SENDER_FIRST_NAME, html_escape:) { submitter.submission.created_by_user&.first_name }
 
     replace(text, SENDER_EMAIL, html_escape:) { submitter.submission.created_by_user&.email.to_s.sub(/\+\w+@/, '@') }
   end

lib/submissions.rb

@@ -67,7 +67,6 @@ module Submissions
 
       submission.submitters.new(email: normalize_email(email),
                                 uuid: template.submitters.first['uuid'],
-                                account_id: user.account_id,
                                 preferences:,
                                 sent_at: mark_as_sent ? Time.current : nil)
 
@@ -114,7 +113,9 @@ module Submissions
 
     fixed_email = EmailTypo.call(email.delete_prefix('<'))
 
-    Rails.logger.info("Fixed email #{email.split('@').last}") if fixed_email != email.downcase.delete_prefix('<').strip
+    if defined?(Rollbar) && fixed_email != email.downcase.delete_prefix('<').strip
+      Rollbar.warning("Fixed email #{email}")
+    end
 
     fixed_email
   end

lib/submissions/create_from_submitters.rb

@@ -155,14 +155,16 @@ module Submissions
       submitter_preferences = Submitters.normalize_preferences(submission.account, user, attrs)
       values = attrs[:values] || {}
 
-      phone_field_uuid = find_phone_field(submission, values)&.dig('uuid')
+      phone_field_uuid =
+        (submission.template_fields || submission.template.fields).find do |f|
+          values[f['uuid']].present? && f['type'] == 'phone'
+        end&.dig('uuid')
 
       submitter =
         submission.submitters.new(
           email:,
           phone: (attrs[:phone] || values[phone_field_uuid]).to_s.gsub(/[^0-9+]/, ''),
           name: attrs[:name],
-          account_id: user.account_id,
           external_id: attrs[:external_id].presence || attrs[:application_key],
           completed_at: attrs[:completed].present? ? Time.current : nil,
           values: values.except(phone_field_uuid),
@@ -181,12 +183,6 @@ module Submissions
       submitter
     end
 
-    def find_phone_field(submission, values)
-      (submission.template_fields || submission.template.fields).find do |f|
-        values[f['uuid']].present? && f['type'] == 'phone'
-      end
-    end
-
     def assign_completed_attributes(submitter)
       submitter.values = Submitters::SubmitValues.merge_default_values(submitter)
       submitter.values = Submitters::SubmitValues.merge_formula_values(submitter)

lib/submissions/generate_audit_trail.rb

@@ -21,8 +21,6 @@ module Submissions
       'GBP' => '£'
     }.freeze
 
-    TESTING_FOOTER = GenerateResultAttachments::TESTING_FOOTER
-
     RTL_REGEXP = TextUtils::RTL_REGEXP
     MAX_IMAGE_HEIGHT = 100
 
@@ -107,41 +105,6 @@ module Submissions
 
           maybe_add_background(canvas, submission, page_size)
         end
-
-        with_signature_id = submission.account.account_configs
-                                      .exists?(key: AccountConfig::WITH_SIGNATURE_ID, value: true)
-
-        if with_signature_id || submission.account.testing?
-          canvas.save_graphics_state do
-            document_id = Digest::MD5.hexdigest(submission.slug).upcase
-
-            font = composer.document.fonts.add(FONT_NAME)
-
-            text =
-              if submission.account.testing?
-                if with_signature_id
-                  "#{TESTING_FOOTER} | ID: #{document_id}"
-                else
-                  TESTING_FOOTER
-                end
-              else
-                "Document ID: #{document_id}"
-              end
-
-            text = HexaPDF::Layout::TextFragment.create(
-              text, font:, font_size: FONT_SIZE, underlays: [
-                lambda do |canv, box|
-                  canv.fill_color('white').rectangle(-1, 0, box.width + 2, box.height).fill
-                end
-              ]
-            )
-
-            HexaPDF::Layout::TextLayouter.new(font:, font_size: FONT_SIZE)
-                                         .fit([text], 1000, 1000)
-                                         .draw(canvas, 1, FONT_SIZE * 1.37)
-          end
-        end
-
         style.frame = style.create_frame(canvas.context, 50)
       end
 

lib/submissions/generate_result_attachments.rb

@@ -58,15 +58,13 @@ module Submissions
         submitter.submission.template_schema.map do |item|
           pdf = pdfs_index[item['attachment_uuid']]
 
-          if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
-            pdf = normalize_image_pdf(pdf)
+          attachment = build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:,
+                                            uuid: item['attachment_uuid'],
+                                            name: item['name'])
 
-            image_pdfs << pdf
-          end
+          image_pdfs << pdf if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
 
-          build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:,
-                               uuid: item['attachment_uuid'],
-                               name: item['name'])
+          attachment
         end
 
       return result_attachments.map { |e| e.tap(&:save!) } if image_pdfs.size < 2
@@ -76,8 +74,6 @@ module Submissions
           pdf.pages.each { |page| doc.pages << doc.import(page) }
         end
 
-      images_pdf = normalize_image_pdf(images_pdf)
-
       images_pdf_attachment =
         build_pdf_attachment(
           pdf: images_pdf,
@@ -110,8 +106,6 @@ module Submissions
         pdfs_index.each_value do |pdf|
           next if pdf.trailer.info[:DocumentID].present?
 
-          font = pdf.fonts.add(FONT_NAME)
-
           document_id = Digest::MD5.hexdigest(submitter.submission.slug).upcase
 
           pdf.trailer.info[:DocumentID] = document_id
@@ -119,6 +113,8 @@ module Submissions
             font_size = (([page.box.width, page.box.height].min / A4_SIZE[0].to_f) * 9).to_i
             cnv = page.canvas(type: :overlay)
 
+            cnv.font(FONT_NAME, size: font_size)
+
             text =
               if submitter.account.testing?
                 if with_signature_id
@@ -130,17 +126,7 @@ module Submissions
                 "Document ID: #{document_id}"
               end
 
-            text = HexaPDF::Layout::TextFragment.create(
-              text, font:, font_size:, underlays: [
-                lambda do |canv, box|
-                  canv.fill_color('white').rectangle(-1, 0, box.width + 2, box.height).fill
-                end
-              ]
-            )
-
-            HexaPDF::Layout::TextLayouter.new(font:, font_size:)
-                                         .fit([text], page.box.width, page.box.height)
-                                         .draw(cnv, 1, font_size * 1.37)
+            cnv.text(text, at: [2, 4])
           end
         end
       end
@@ -604,14 +590,6 @@ module Submissions
       pdf
     end
 
-    def normalize_image_pdf(pdf)
-      io = StringIO.new
-      pdf.write(io)
-      io.rewind
-
-      HexaPDF::Document.new(io:)
-    end
-
     def sign_reason(name)
       format(SIGN_REASON, name:)
     end

lib/submissions/serialize_for_api.rb

@@ -4,9 +4,12 @@ module Submissions
   module SerializeForApi
     SERIALIZE_PARAMS = {
       only: %i[id slug source submitters_order expire_at created_at updated_at archived_at],
-      methods: %i[audit_log_url combined_document_url],
+      methods: %i[audit_log_url],
       include: {
-        submitters: { only: %i[id] },
+        submitters: { only: %i[id slug uuid name email phone
+                               completed_at opened_at sent_at
+                               created_at updated_at external_id metadata],
+                      methods: %i[status application_key] },
         template: { only: %i[id name external_id created_at updated_at],
                     methods: %i[folder_name] },
         created_by_user: { only: %i[id email first_name last_name] }
@@ -15,35 +18,30 @@ module Submissions
 
     module_function
 
-    def call(submission, submitters = nil, params = {}, with_events: true, with_documents: true, with_values: true)
+    def call(submission, submitters = nil, params = {})
       submitters ||= submission.submitters.preload(documents_attachments: :blob, attachments_attachments: :blob)
 
-      serialized_submitters = submitters.map do |submitter|
-        Submitters::SerializeForApi.call(submitter, with_documents:, with_events: false, with_values:, params:)
-      end
+      serialized_submitters = submitters.map { |submitter| Submitters::SerializeForApi.call(submitter, params:) }
 
-      json = submission.as_json(SERIALIZE_PARAMS)
-
-      json['created_by_user'] ||= nil
-
-      if with_events
-        json['submission_events'] = Submitters::SerializeForApi.serialize_events(submission.submission_events)
-      end
-
-      json['combined_document_url'] ||= maybe_build_combined_url(submitters, submission, params)
+      json = submission.as_json(
+        SERIALIZE_PARAMS.deep_merge(
+          include: { submission_events: { only: %i[id submitter_id event_type event_timestamp] } }
+        )
+      )
 
       if submitters.all?(&:completed_at?)
         last_submitter = submitters.max_by(&:completed_at)
 
-        if with_documents
-          json[:documents] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
+        if params[:include].to_s.include?('combined_document_url')
+          json[:combined_document_url] = build_combined_url(submitters.max_by(&:completed_at), submission)
         end
 
+        json[:documents] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
         json[:status] = 'completed'
         json[:completed_at] = last_submitter.completed_at
       else
-        json[:documents] = [] if with_documents
-        json[:status] = build_status(submission, submitters)
+        json[:documents] = []
+        json[:status] = submission.expired? ? 'expired' : 'pending'
         json[:completed_at] = nil
       end
 
@@ -52,26 +50,13 @@ module Submissions
       json
     end
 
-    def build_status(submission, submitters)
-      if submitters.any?(&:declined_at?)
-        'declined'
-      else
-        submission.expired? ? 'expired' : 'pending'
-      end
-    end
-
-    def maybe_build_combined_url(submitters, submission, params)
-      return unless submitters.all?(&:completed_at?)
+    def build_combined_url(submitter, submission)
+      return unless submitter.completed_at?
 
       attachment = submission.combined_document_attachment
+      attachment ||= Submissions::GenerateCombinedAttachment.call(submitter)
 
-      if !attachment && params[:include].to_s.include?('combined_document_url')
-        submitter = submitters.max_by(&:completed_at)
-
-        attachment = Submissions::GenerateCombinedAttachment.call(submitter)
-      end
-
-      ActiveStorage::Blob.proxy_url(attachment.blob) if attachment
+      ActiveStorage::Blob.proxy_url(attachment.blob)
     end
   end
 end

lib/submitters.rb

@@ -21,12 +21,6 @@ module Submitters
   end
 
   def select_attachments_for_download(submitter)
-    if AccountConfig.exists?(account_id: submitter.submission.account_id,
-                             key: AccountConfig::COMBINE_PDF_RESULT_KEY,
-                             value: true) && submitter.submission.combined_document_attachment
-      return [submitter.submission.combined_document_attachment]
-    end
-
     original_documents = submitter.submission.template.documents.preload(:blob)
     is_more_than_two_images = original_documents.count(&:image?) > 1
 

lib/submitters/normalize_values.rb

@@ -4,8 +4,6 @@ module Submitters
   module NormalizeValues
     CHECKSUM_CACHE_STORE = ActiveSupport::Cache::MemoryStore.new
 
-    BASE64_PREFIX_REGEXP = %r{\Adata:image/\w+;base64,}
-
     BaseError = Class.new(StandardError)
 
     UnknownFieldName = Class.new(BaseError)
@@ -136,8 +134,7 @@ module Submitters
           find_or_create_blob_from_url(account, value)
         elsif type.in?(%w[signature initials]) && value.length < 60
           find_or_create_blob_from_text(account, value, type)
-        elsif (data = Base64.decode64(value.sub(BASE64_PREFIX_REGEXP, ''))) &&
-              Marcel::MimeType.for(data).include?('image')
+        elsif (data = Base64.decode64(value)) && Marcel::MimeType.for(data).include?('image')
           find_or_create_blob_from_base64(account, data, type)
         else
           raise InvalidDefaultValue, "Invalid value, url, base64 or text < 60 chars is expected: #{value.first(200)}..."

lib/submitters/serialize_for_api.rb

@@ -3,20 +3,19 @@
 module Submitters
   module SerializeForApi
     SERIALIZE_PARAMS = {
-      only: %i[id slug uuid name email phone completed_at declined_at external_id
+      only: %i[id slug uuid name email phone completed_at external_id
                submission_id metadata opened_at sent_at created_at updated_at],
       methods: %i[status application_key]
     }.freeze
 
     module_function
 
-    def call(submitter, with_template: false, with_events: false, with_documents: true, with_urls: false,
-             with_values: true, params: {})
+    def call(submitter, with_template: false, with_events: false, with_documents: true, with_urls: false, params: {})
       ActiveRecord::Associations::Preloader.new(
         records: [submitter],
         associations: if with_documents
                         [documents_attachments: :blob, attachments_attachments: :blob]
-                      elsif with_values
+                      else
                         [attachments_attachments: :blob]
                       end
       ).call
@@ -27,10 +26,9 @@ module Submitters
         additional_attrs['fields'] = SerializeForWebhook.build_fields_array(submitter)
       end
 
-      additional_attrs['values'] = SerializeForWebhook.build_values_array(submitter) if with_values
+      additional_attrs['values'] = SerializeForWebhook.build_values_array(submitter)
       additional_attrs['documents'] = SerializeForWebhook.build_documents_array(submitter) if with_documents
       additional_attrs['preferences'] = submitter.preferences.except('default_values')
-      additional_attrs['submission_events'] = serialize_events(submitter.submission_events) if with_events
 
       additional_attrs['role'] =
         (submitter.submission.template_submitters ||
@@ -43,14 +41,9 @@ module Submitters
 
       include_params = {}
       include_params[:template] = { only: %i[id name created_at updated_at] } if with_template
+      include_params[:submission_events] = { only: %i[id submitter_id event_type event_timestamp] } if with_events
 
       submitter.as_json(SERIALIZE_PARAMS.merge(include: include_params)).merge(additional_attrs)
     end
-
-    def serialize_events(events)
-      events.map do |event|
-        event.as_json(only: %i[id submitter_id event_type event_timestamp]).merge('data' => event.data.slice('reason'))
-      end
-    end
   end
 end

lib/submitters/serialize_for_webhook.rb

@@ -5,7 +5,7 @@ module Submitters
     SERIALIZE_PARAMS = {
       methods: %i[status application_key],
       only: %i[id submission_id email phone name ua ip sent_at opened_at
-               completed_at declined_at created_at updated_at external_id metadata]
+               completed_at created_at updated_at external_id metadata]
     }.freeze
 
     module_function
@@ -33,8 +33,8 @@ module Submitters
                       'template' => submitter.template.as_json(only: %i[id name external_id created_at updated_at],
                                                                methods: %i[folder_name]),
                       'submission' => {
-                        **submitter.submission.slice(:id, :audit_log_url, :combined_document_url, :created_at),
-                        status: build_submission_status(submitter.submission),
+                        **submitter.submission.slice(:id, :audit_log_url, :created_at),
+                        status: submitter.submission.submitters.all?(&:completed_at?) ? 'completed' : 'pending',
                         url: r.submissions_preview_url(submitter.submission.slug, **Docuseal.default_url_options)
                       })
     end
@@ -83,18 +83,6 @@ module Submitters
       end
     end
 
-    def build_submission_status(submission)
-      submitters = submission.submitters
-
-      if submitters.all?(&:completed_at?)
-        'completed'
-      elsif submitters.any?(&:declined_at?)
-        'declined'
-      else
-        submission.expired? ? 'expired' : 'pending'
-      end
-    end
-
     def build_documents_array(submitter)
       submitter.documents.map do |attachment|
         { name: attachment.filename.base, url: rails_storage_proxy_url(attachment) }

lib/templates/serialize_for_api.rb

@@ -3,11 +3,6 @@
 module Templates
   module SerializeForApi
     SERIALIZE_PARAMS = {
-      only: %w[
-        id archived_at fields name preferences schema
-        slug source submitters created_at updated_at
-        author_id external_id folder_id
-      ],
       methods: %i[application_key folder_name],
       include: { author: { only: %i[id email first_name last_name] } }
     }.freeze

package.json

@@ -37,7 +37,7 @@
     "uuid": "^9.0.0",
     "vue": "^3.3.2",
     "vue-loader": "^17.1.1",
-    "webpack": "5.94.0",
+    "webpack": "5.82.1",
     "webpack-assets-manifest": "5",
     "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "5.1.1",

spec/factories/submission_events.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :submission_event do
-    submission
-    submitter
-    event_type { 'view_form' }
-    event_timestamp { Time.zone.now }
-    data do
-      {
-        ip: Faker::Internet.ip_v4_address,
-        ua: Faker::Internet.user_agent,
-        sid: SecureRandom.base58(10),
-        uid: Faker::Number.number(digits: 4)
-      }
-    end
-  end
-end

spec/factories/submissions.rb

@@ -11,23 +11,5 @@ FactoryBot.define do
       submission.template_schema = submission.template.schema
       submission.template_submitters = submission.template.submitters
     end
-
-    trait :with_submitters do
-      after(:create) do |submission, _|
-        submission.template_submitters.each do |template_submitter|
-          create(:submitter, submission:,
-                             account_id: submission.account_id,
-                             uuid: template_submitter['uuid'])
-        end
-      end
-    end
-
-    trait :with_events do
-      after(:create) do |submission, _|
-        submission.submitters.each do |submitter|
-          create(:submission_event, submission:, submitter:)
-        end
-      end
-    end
   end
 end

spec/factories/submitters.rb

@@ -4,11 +4,5 @@ FactoryBot.define do
   factory :submitter do
     submission
     email { Faker::Internet.email }
-    name { Faker::Name.name }
-    phone { Faker::PhoneNumber.phone_number }
-
-    before(:create) do |submitter, _|
-      submitter.account_id = submitter.submission.account_id
-    end
   end
 end

spec/mailers/previews/submitter_mailer_preview.rb

@@ -11,12 +11,6 @@ class SubmitterMailerPreview < ActionMailer::Preview
     SubmitterMailer.completed_email(submitter, User.last)
   end
 
-  def declined_email
-    submitter = Submitter.where.not(declined_at: nil).last
-
-    SubmitterMailer.declined_email(submitter, User.last)
-  end
-
   def documents_copy_email
     submitter = Submitter.where.not(completed_at: nil).joins(:documents_attachments).last
 

spec/requests/submissions_spec.rb

@@ -1,247 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'Submission API', type: :request do
-  let!(:account) { create(:account) }
-  let!(:author) { create(:user, account:) }
-  let!(:folder) { create(:template_folder, account:) }
-  let!(:templates) { create_list(:template, 2, account:, author:, folder:) }
-
-  describe 'GET /api/submissions' do
-    it 'returns a list of submissions' do
-      submissions = [
-        create(:submission, :with_submitters,
-               template: templates[0],
-               created_by_user: author),
-        create(:submission, :with_submitters,
-               template: templates[1],
-               created_by_user: author)
-      ].reverse
-
-      get '/api/submissions', headers: { 'x-auth-token': author.access_token.token }
-
-      expect(response).to have_http_status(:ok)
-      expect(response.parsed_body['pagination']).to eq(JSON.parse({
-        count: submissions.size,
-        next: submissions.last.id,
-        prev: submissions.first.id
-      }.to_json))
-      expect(response.parsed_body['data']).to eq(JSON.parse(submissions.map { |t| index_submission_body(t) }.to_json))
-    end
-  end
-
-  describe 'GET /api/submissions/:id' do
-    it 'returns a submission' do
-      submission = create(:submission, :with_submitters, :with_events, template: templates[0], created_by_user: author)
-
-      get "/api/submissions/#{submission.id}", headers: { 'x-auth-token': author.access_token.token }
-
-      expect(response).to have_http_status(:ok)
-      expect(response.parsed_body).to eq(JSON.parse(show_submission_body(submission).to_json))
-    end
-  end
-
-  describe 'POST /api/submissions' do
-    it 'creates a submission' do
-      post '/api/submissions', headers: { 'x-auth-token': author.access_token.token }, params: {
-        template_id: templates[0].id,
-        send_email: true,
-        submitters: [{ role: 'First Role', email: 'john.doe@example.com' }]
-      }.to_json
-
-      expect(response).to have_http_status(:ok)
-
-      submission = Submission.last
-
-      expect(response.parsed_body).to eq(JSON.parse(create_submission_body(submission).to_json))
-    end
-  end
-
-  describe 'POST /api/submissions/emails' do
-    it 'creates a submission using email' do
-      post '/api/submissions', headers: { 'x-auth-token': author.access_token.token }, params: {
-        template_id: templates[0].id,
-        emails: 'john.doe@example.com'
-      }.to_json
-
-      expect(response).to have_http_status(:ok)
-
-      submission = Submission.last
-
-      expect(response.parsed_body).to eq(JSON.parse(create_submission_body(submission).to_json))
-    end
-  end
-
-  describe 'DELETE /api/submissions/:id' do
-    it 'archives a submission' do
-      submission = create(:submission, :with_submitters, template: templates[0], created_by_user: author)
-
-      delete "/api/submissions/#{submission.id}", headers: { 'x-auth-token': author.access_token.token }
-
-      expect(response).to have_http_status(:ok)
-
-      submission.reload
-
-      expect(submission.archived_at).not_to be_nil
-      expect(response.parsed_body).to eq(JSON.parse({
-        id: submission.id,
-        archived_at: submission.archived_at
-      }.to_json))
-    end
-  end
-
-  private
-
-  def index_submission_body(submission)
-    submitters = submission.submitters.map do |submitter|
-      {
-        id: submitter.id,
-        submission_id: submission.id,
-        uuid: submitter.uuid,
-        email: submitter.email,
-        slug: submitter.slug,
-        sent_at: submitter.sent_at,
-        opened_at: submitter.opened_at,
-        completed_at: submitter.completed_at,
-        declined_at: nil,
-        created_at: submitter.created_at,
-        updated_at: submitter.updated_at,
-        name: submitter.name,
-        phone: submitter.phone,
-        status: submitter.status,
-        role: submitter.template.submitters.find { |s| s['uuid'] == submitter.uuid }['name'],
-        external_id: nil,
-        application_key: nil, # Backward compatibility
-        metadata: {},
-        preferences: {}
-      }
-    end
-
-    {
-      id: submission.id,
-      source: 'link',
-      submitters_order: 'random',
-      slug: submission.slug,
-      audit_log_url: nil,
-      combined_document_url: nil,
-      expire_at: nil,
-      completed_at: nil,
-      created_at: submission.created_at,
-      updated_at: submission.updated_at,
-      archived_at: nil,
-      status: 'pending',
-      submitters:,
-      template: {
-        id: submission.template.id,
-        name: submission.template.name,
-        external_id: nil,
-        folder_name: folder.name,
-        created_at: submission.template.created_at,
-        updated_at: submission.template.updated_at
-      },
-      created_by_user: {
-        id: author.id,
-        first_name: author.first_name,
-        last_name: author.last_name,
-        email: author.email
-      }
-    }
-  end
-
-  def show_submission_body(submission)
-    submitters = submission.submitters.map do |submitter|
-      {
-        id: submitter.id,
-        submission_id: submission.id,
-        uuid: submitter.uuid,
-        email: submitter.email,
-        slug: submitter.slug,
-        sent_at: submitter.sent_at,
-        opened_at: submitter.opened_at,
-        completed_at: submitter.completed_at,
-        declined_at: nil,
-        created_at: submitter.created_at,
-        updated_at: submitter.updated_at,
-        name: submitter.name,
-        phone: submitter.phone,
-        status: submitter.status,
-        external_id: nil,
-        application_key: nil, # Backward compatibility
-        metadata: {},
-        preferences: {},
-        role: submitter.template.submitters.find { |s| s['uuid'] == submitter.uuid }['name'],
-        documents: [],
-        values: []
-      }
-    end
-
-    {
-      id: submission.id,
-      source: 'link',
-      status: 'pending',
-      submitters_order: 'random',
-      slug: submission.slug,
-      audit_log_url: nil,
-      combined_document_url: nil,
-      expire_at: nil,
-      completed_at: nil,
-      created_at: submission.created_at,
-      updated_at: submission.updated_at,
-      archived_at: nil,
-      submitters:,
-      template: {
-        id: submission.template.id,
-        name: submission.template.name,
-        external_id: nil,
-        folder_name: folder.name,
-        created_at: submission.template.created_at,
-        updated_at: submission.template.updated_at
-      },
-      created_by_user: {
-        id: author.id,
-        first_name: author.first_name,
-        last_name: author.last_name,
-        email: author.email
-      },
-      documents: [],
-      submission_events: submission.submission_events.map do |event|
-        {
-          id: event.id,
-          submitter_id: event.submitter_id,
-          event_type: event.event_type,
-          event_timestamp: event.event_timestamp,
-          data: event.data.slice(:reason)
-        }
-      end
-    }
-  end
-
-  def create_submission_body(submission)
-    submission.submitters.map do |submitter|
-      {
-        id: submitter.id,
-        submission_id: submission.id,
-        uuid: submitter.uuid,
-        email: submitter.email,
-        slug: submitter.slug,
-        sent_at: submitter.sent_at,
-        opened_at: submitter.opened_at,
-        completed_at: submitter.completed_at,
-        declined_at: nil,
-        created_at: submitter.created_at,
-        updated_at: submitter.updated_at,
-        name: submitter.name,
-        phone: submitter.phone,
-        status: submitter.status,
-        external_id: nil,
-        application_key: nil, # Backward compatibility
-        metadata: {},
-        preferences: { send_email: true, send_sms: false },
-        role: submitter.template.submitters.find { |s| s['uuid'] == submitter.uuid }['name'],
-        embed_src: "#{Docuseal::DEFAULT_APP_URL}/s/#{submitter.slug}",
-        values: []
-      }
-    end
-  end
-end

spec/requests/submitters_spec.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'Submitter API', type: :request do
-  let!(:account) { create(:account) }
-  let!(:author) { create(:user, account:) }
-  let!(:folder) { create(:template_folder, account:) }
-  let!(:templates) { create_list(:template, 2, account:, author:, folder:) }
-
-  describe 'GET /api/submitters' do
-    it 'returns a list of submitters' do
-      submitters = [
-        create(:submission, :with_submitters, :with_events,
-               template: templates[0],
-               created_by_user: author),
-        create(:submission, :with_submitters,
-               template: templates[1],
-               created_by_user: author)
-      ].map(&:submitters).flatten.reverse
-
-      get '/api/submitters', headers: { 'x-auth-token': author.access_token.token }
-
-      expect(response).to have_http_status(:ok)
-      expect(response.parsed_body['pagination']).to eq(JSON.parse({
-        count: submitters.size,
-        next: submitters.last.id,
-        prev: submitters.first.id
-      }.to_json))
-      expect(response.parsed_body['data']).to eq(JSON.parse(submitters.map { |t| submitter_body(t) }.to_json))
-    end
-  end
-
-  describe 'GET /api/submitters/:id' do
-    it 'returns a submitter' do
-      submitter = create(:submission, :with_submitters, :with_events,
-                         template: templates[0],
-                         created_by_user: author).submitters.first
-
-      get "/api/submitters/#{submitter.id}", headers: { 'x-auth-token': author.access_token.token }
-
-      expect(response).to have_http_status(:ok)
-      expect(response.parsed_body).to eq(JSON.parse(submitter_body(submitter).to_json))
-    end
-  end
-
-  describe 'PUT /api/submitters' do
-    it 'update a submitter' do
-      submitter = create(:submission, :with_submitters, :with_events,
-                         template: templates[0],
-                         created_by_user: author).submitters.first
-
-      put "/api/submitters/#{submitter.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
-        email: 'john.doe+updated@example.com'
-      }.to_json
-
-      expect(response).to have_http_status(:ok)
-
-      submitter.reload
-
-      expect(submitter.email).to eq('john.doe+updated@example.com')
-      expect(response.parsed_body).to eq(JSON.parse(update_submitter_body(submitter).to_json))
-    end
-  end
-
-  private
-
-  def submitter_body(submitter)
-    {
-      id: submitter.id,
-      submission_id: submitter.submission_id,
-      uuid: submitter.uuid,
-      email: submitter.email,
-      status: submitter.status,
-      slug: submitter.slug,
-      sent_at: submitter.sent_at,
-      opened_at: submitter.opened_at,
-      completed_at: submitter.completed_at,
-      declined_at: submitter.declined_at,
-      created_at: submitter.created_at,
-      updated_at: submitter.updated_at,
-      name: submitter.name,
-      phone: submitter.phone,
-      external_id: nil,
-      application_key: nil, # Backward compatibility
-      template: {
-        id: submitter.template.id,
-        name: submitter.template.name,
-        created_at: submitter.template.created_at,
-        updated_at: submitter.template.updated_at
-      },
-      metadata: {},
-      preferences: {},
-      submission_events: submitter.submission_events.map do |event|
-        {
-          id: event.id,
-          submitter_id: event.submitter_id,
-          event_type: event.event_type,
-          event_timestamp: event.event_timestamp,
-          data: event.data.slice(:reason)
-        }
-      end,
-      values: [],
-      documents: [],
-      role: submitter.template.submitters.find { |s| s['uuid'] == submitter.uuid }['name']
-    }
-  end
-
-  def update_submitter_body(submitter)
-    submitter_body(submitter).except(:template, :submission_events)
-                             .merge(embed_src: "#{Docuseal::DEFAULT_APP_URL}/s/#{submitter.slug}")
-  end
-end

spec/requests/templates_spec.rb

@@ -1,226 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'Templates API', type: :request do
-  let!(:account) { create(:account) }
-  let!(:author) { create(:user, account:) }
-  let!(:folder) { create(:template_folder, account:) }
-  let!(:template_preferences) { { 'request_email_subject' => 'Subject text', 'request_email_body' => 'Body Text' } }
-
-  describe 'GET /api/templates' do
-    it 'returns a list of templates' do
-      templates = [
-        create(:template, account:,
-                          author:,
-                          folder:,
-                          external_id: SecureRandom.base58(10),
-                          preferences: template_preferences),
-        create(:template, account:,
-                          author:,
-                          folder:,
-                          external_id: SecureRandom.base58(10),
-                          preferences: template_preferences)
-      ].reverse
-
-      get '/api/templates', headers: { 'x-auth-token': author.access_token.token }
-
-      expect(response).to have_http_status(:ok)
-      expect(response.parsed_body['pagination']).to eq(JSON.parse({
-        count: templates.size,
-        next: templates.last.id,
-        prev: templates.first.id
-      }.to_json))
-      expect(response.parsed_body['data']).to eq(JSON.parse(templates.map { |t| template_body(t) }.to_json))
-    end
-  end
-
-  describe 'GET /api/templates/:id' do
-    it 'returns a template' do
-      template = create(:template, account:,
-                                   author:,
-                                   folder:,
-                                   external_id: SecureRandom.base58(10),
-                                   preferences: template_preferences)
-
-      get "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }
-
-      expect(response).to have_http_status(:ok)
-      expect(response.parsed_body).to eq(JSON.parse(template_body(template).to_json))
-    end
-  end
-
-  describe 'PUT /api/templates' do
-    it 'update a template' do
-      template = create(:template, account:,
-                                   author:,
-                                   folder:,
-                                   external_id: SecureRandom.base58(10),
-                                   preferences: template_preferences)
-
-      put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
-        name: 'Updated Template Name',
-        external_id: '123456'
-      }.to_json
-
-      expect(response).to have_http_status(:ok)
-
-      template.reload
-
-      expect(template.name).to eq('Updated Template Name')
-      expect(template.external_id).to eq('123456')
-      expect(response.parsed_body).to eq(JSON.parse({
-        id: template.id,
-        updated_at: template.updated_at
-      }.to_json))
-    end
-  end
-
-  describe 'DELETE /api/templates/:id' do
-    it 'archives a template' do
-      template = create(:template, account:,
-                                   author:,
-                                   folder:,
-                                   external_id: SecureRandom.base58(10),
-                                   preferences: template_preferences)
-
-      delete "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }
-
-      expect(response).to have_http_status(:ok)
-
-      template.reload
-
-      expect(template.archived_at).not_to be_nil
-      expect(response.parsed_body).to eq(JSON.parse({
-        id: template.id,
-        archived_at: template.archived_at
-      }.to_json))
-    end
-  end
-
-  describe 'POST /api/templates/:id/clone' do
-    it 'clones a template' do
-      template = create(:template, account:,
-                                   author:,
-                                   folder:,
-                                   external_id: SecureRandom.base58(10),
-                                   preferences: template_preferences)
-
-      expect do
-        post "/api/templates/#{template.id}/clone", headers: { 'x-auth-token': author.access_token.token }, params: {
-          name: 'Cloned Template Name',
-          external_id: '123456'
-        }.to_json
-      end.to change(Template, :count)
-
-      expect(response).to have_http_status(:ok)
-
-      cloned_template = Template.last
-
-      expect(cloned_template.name).to eq('Cloned Template Name')
-      expect(cloned_template.external_id).to eq('123456')
-      expect(response.parsed_body).to eq(JSON.parse(clone_template_body(cloned_template).to_json))
-    end
-  end
-
-  private
-
-  def template_body(template)
-    template_attachment_uuid = template.schema.first['attachment_uuid']
-    attachment = template.schema_documents.preload(:blob).find { |e| e.uuid == template_attachment_uuid }
-    first_page_blob =
-      ActiveStorage::Attachment.joins(:blob)
-                               .where(blob: { filename: '0.jpg' })
-                               .where(record_id: template.schema_documents.map(&:id),
-                                      record_type: 'ActiveStorage::Attachment',
-                                      name: :preview_images)
-                               .preload(:blob)
-                               .first
-                               .blob
-
-    {
-      id: template.id,
-      slug: template.slug,
-      name: template.name,
-      fields: [
-        {
-          'uuid' => '21637fc9-0655-45df-8952-04ec64949e85',
-          'submitter_uuid' => '513848eb-1096-4abc-a743-68596b5aaa4c',
-          'name' => 'First Name',
-          'type' => 'text',
-          'required' => true,
-          'areas' => [
-            {
-              'x' => 0.09027777777777778,
-              'y' => 0.1197252208047105,
-              'w' => 0.3069444444444444,
-              'h' => 0.03336604514229637,
-              'attachment_uuid' => template_attachment_uuid,
-              'page' => 0
-            }
-          ]
-        },
-        {
-          'uuid' => '1f97f8e3-dc82-4586-aeea-6ebed6204e46',
-          'submitter_uuid' => '513848eb-1096-4abc-a743-68596b5aaa4c',
-          'name' => '',
-          'type' => 'signature',
-          'required' => true,
-          'areas' => []
-        }
-      ],
-      submitters: [
-        {
-          name: 'First Party',
-          uuid: template.submitters.first['uuid']
-        }
-      ],
-      author: {
-        id: author.id,
-        first_name: author.first_name,
-        last_name: author.last_name,
-        email: author.email
-      },
-      documents: [
-        {
-          id: template.documents.first.id,
-          uuid: template.documents.first.uuid,
-          url: ActiveStorage::Blob.proxy_url(attachment.blob),
-          preview_image_url: ActiveStorage::Blob.proxy_url(first_page_blob),
-          filename: 'sample-document.pdf'
-        }
-      ],
-      preferences: {
-        'request_email_subject' => 'Subject text',
-        'request_email_body' => 'Body Text'
-      },
-      schema: [
-        {
-          attachment_uuid: template_attachment_uuid,
-          name: 'sample-document'
-        }
-      ],
-      author_id: author.id,
-      archived_at: nil,
-      created_at: template.created_at,
-      updated_at: template.updated_at,
-      folder_id: folder.id,
-      folder_name: folder.name,
-      source: 'native',
-      external_id: template.external_id,
-      application_key: template.external_id # Backward compatibility
-    }
-  end
-
-  def clone_template_body(cloned_template)
-    body = template_body(cloned_template).merge(source: 'api')
-    body[:fields].each_with_index do |field, index|
-      field.merge!(
-        'submitter_uuid' => cloned_template.fields[index]['submitter_uuid'],
-        'uuid' => cloned_template.fields[index]['uuid']
-      )
-    end
-
-    body
-  end
-end

spec/system/template_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'Template' do
       visit template_path(template)
 
       submitters.each do |submitter|
-        expect(page).to have_content(submitter.name)
+        expect(page).to have_content(submitter.email)
       end
 
       expect(page).to have_content(template.name)

tailwind.form.config.js

@@ -6,7 +6,6 @@ module.exports = {
     './app/javascript/submission_form/**/*.vue',
     './app/views/submit_form/**/*.erb',
     './app/views/start_form/**/*.erb',
-    './app/views/shared/_html_modal.html.erb',
     './app/views/shared/_button_title.html.erb',
     './app/views/shared/_attribution.html.erb',
     './app/views/scripts/_autosize_field.html.erb',

yarn.lock

@@ -1143,14 +1143,6 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/source-map@^0.3.3":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
-  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-
 "@jridgewell/sourcemap-codec@1.4.14":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
@@ -1174,7 +1166,7 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
   integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -1277,10 +1269,26 @@
   dependencies:
     "@types/node" "*"
 
-"@types/estree@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+"@types/eslint-scope@^3.7.3":
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "8.37.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.37.0.tgz#29cebc6c2a3ac7fea7113207bf5a828fdf4d7ef1"
+  integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
   version "4.17.35"
@@ -1328,7 +1336,7 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -1512,10 +1520,10 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
   integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
-  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
+"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
+  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
   dependencies:
     "@webassemblyjs/helper-numbers" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
@@ -1530,10 +1538,10 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
   integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
-  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
+"@webassemblyjs/helper-buffer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
+  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
 
 "@webassemblyjs/helper-numbers@1.11.6":
   version "1.11.6"
@@ -1549,15 +1557,15 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
   integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
-  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
+"@webassemblyjs/helper-wasm-section@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
+  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.11.6"
 
 "@webassemblyjs/ieee754@1.11.6":
   version "1.11.6"
@@ -1578,59 +1586,59 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
   integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
-  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
+"@webassemblyjs/wasm-edit@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
+  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-opt" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
-    "@webassemblyjs/wast-printer" "1.12.1"
+    "@webassemblyjs/helper-wasm-section" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-opt" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wast-printer" "1.11.6"
 
-"@webassemblyjs/wasm-gen@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
-  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
+"@webassemblyjs/wasm-gen@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
+  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/ast" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
     "@webassemblyjs/ieee754" "1.11.6"
     "@webassemblyjs/leb128" "1.11.6"
     "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wasm-opt@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
-  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
+"@webassemblyjs/wasm-opt@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
+  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
 
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
-  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
+"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
+  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/ast" "1.11.6"
     "@webassemblyjs/helper-api-error" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
     "@webassemblyjs/ieee754" "1.11.6"
     "@webassemblyjs/leb128" "1.11.6"
     "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wast-printer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
-  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
+"@webassemblyjs/wast-printer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
+  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^2.1.0":
@@ -1666,10 +1674,10 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-import-attributes@^1.9.5:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
-  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
+acorn-import-assertions@^1.7.6:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -1681,10 +1689,10 @@ acorn-walk@^8.0.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2:
-  version "8.12.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
-  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
+acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
+  version "8.8.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
 ajv-formats@^2.1.1:
   version "2.1.1"
@@ -1971,15 +1979,15 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
-  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+  version "4.21.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
+  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
   dependencies:
-    caniuse-lite "^1.0.30001646"
-    electron-to-chromium "^1.5.4"
-    node-releases "^2.0.18"
-    update-browserslist-db "^1.1.0"
+    caniuse-lite "^1.0.30001449"
+    electron-to-chromium "^1.4.284"
+    node-releases "^2.0.8"
+    update-browserslist-db "^1.0.10"
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -2031,16 +2039,11 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
   version "1.0.30001488"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz#d19d7b6e913afae3e98f023db97c19e9ddc5e91f"
   integrity sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ==
 
-caniuse-lite@^1.0.30001646:
-  version "1.0.30001655"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz#0ce881f5a19a2dcfda2ecd927df4d5c1684b982f"
-  integrity sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==
-
 canvas-confetti@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/canvas-confetti/-/canvas-confetti-1.6.0.tgz#193f71aa8f38fc850a5ba94f59091a7afdb43ead"
@@ -2586,20 +2589,20 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.5.4:
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6"
-  integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==
+electron-to-chromium@^1.4.284:
+  version "1.4.402"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.402.tgz#9aa7bbb63081513127870af6d22f829344c5ba57"
+  integrity sha512-gWYvJSkohOiBE6ecVYXkrDgNaUjo47QEKK0kQzmWyhkH+yoYiG44bwuicTGNSIQRG3WDMsWVZJLRnJnLNkbWvA==
 
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-enhanced-resolve@^5.17.1:
-  version "5.17.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
-  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
+enhanced-resolve@^5.14.0:
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz#0b6c676c8a3266c99fa281e4433a706f5c0c61c4"
+  integrity sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -2698,10 +2701,10 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-escalade@^3.1.2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
-  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -3302,7 +3305,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4119,10 +4122,10 @@ node-forge@^1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-releases@^2.0.18:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
-  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
+node-releases@^2.0.8:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.11.tgz#59d7cef999d13f908e43b5a70001cf3129542f0f"
+  integrity sha512-+M0PwXeU80kRohZ3aT4J/OnR+l9/KD2nVLNNoRgFtnf+umQVFdGBAO2N8+nCnEi0xlh/Wk3zOGC+vNNx+uM79Q==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
@@ -4347,11 +4350,6 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picocolors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
-  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
-
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -4949,10 +4947,10 @@ sass@^1.62.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-schema-utils@^3.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
-  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
+schema-utils@^3.0, schema-utils@^3.1.1, schema-utils@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99"
+  integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
@@ -5386,16 +5384,16 @@ terser-webpack-plugin@5.3.8:
     serialize-javascript "^6.0.1"
     terser "^5.16.8"
 
-terser-webpack-plugin@^5.3.10:
-  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
-  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
+terser-webpack-plugin@^5.3.7:
+  version "5.3.9"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
+  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.20"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.1"
-    terser "^5.26.0"
+    terser "^5.16.8"
 
 terser@^5.16.8:
   version "5.17.4"
@@ -5407,16 +5405,6 @@ terser@^5.16.8:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-terser@^5.26.0:
-  version "5.31.6"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1"
-  integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -5560,13 +5548,13 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-update-browserslist-db@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
-  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
+update-browserslist-db@^1.0.10:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
-    escalade "^3.1.2"
-    picocolors "^1.0.1"
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -5633,10 +5621,10 @@ vue@^3.3.2:
     "@vue/server-renderer" "3.3.4"
     "@vue/shared" "3.3.4"
 
-watchpack@^2.4.0, watchpack@^2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
-  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
+watchpack@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -5756,33 +5744,34 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@5.94.0:
-  version "5.94.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
-  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
+webpack@5.82.1:
+  version "5.82.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.82.1.tgz#8f38c78e53467556e8a89054ebd3ef6e9f67dbab"
+  integrity sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==
   dependencies:
-    "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.12.1"
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^1.0.0"
+    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-attributes "^1.9.5"
-    browserslist "^4.21.10"
+    acorn-import-assertions "^1.7.6"
+    browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.17.1"
+    enhanced-resolve "^5.14.0"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.11"
+    graceful-fs "^4.2.9"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.2.0"
+    schema-utils "^3.1.2"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.1"
+    terser-webpack-plugin "^5.3.7"
+    watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4: