Merge from docusealco/wip

.github/workflows/docker.yml

@@ -1,13 +1,26 @@
 name: Build Docker Images
 
 on:
-  push:
-    tags:
-      - "*.*.*"
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version
+        type: string
+        required: true
+      image:
+        description: QEMU image
+        type: string
+        required: false
+        default: tonistiigi/binfmt:latest
+      os:
+        description: OS
+        type: string
+        required: false
+        default: ubuntu-24.04-arm
 
 jobs:
   build:
-    runs-on: ubuntu-24.04-arm
+    runs-on: ${{ inputs.os }}
     timeout-minutes: 20
 
     steps:
@@ -16,23 +29,23 @@ jobs:
       with:
         submodules: recursive
 
-    -
-      name: Docker meta
+    - name: Docker meta
       id: meta
       uses: docker/metadata-action@v4
       with:
-        images: |
-          docuseal/docuseal
-        tags: |
-          type=semver,pattern={{version}}
+        images: docuseal/docuseal
+        tags: latest,${{ inputs.version }}
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
+      with:
+        image: ${{ inputs.image }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Create .version file
-      run: echo ${{ github.ref_name }} > .version
+      run: echo ${{ inputs.version }} > .version
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3

Gemfile.lock

@@ -319,7 +319,7 @@ GEM
     method_source (1.1.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.25.4)
     msgpack (1.7.5)
     multi_json (1.15.0)
@@ -338,18 +338,18 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.8)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-gnu)
+    nokogiri (1.18.9-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-aarch64-linux-musl)
+    nokogiri (1.18.9-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-musl)
+    nokogiri (1.18.9-x86_64-linux-musl)
       racc (~> 1.4)
     oj (3.16.8)
       bigdecimal (>= 3.0)
@@ -541,7 +541,7 @@ GEM
     stringio (3.1.2)
     strip_attributes (1.14.1)
       activemodel (>= 3.0, < 9.0)
-    thor (1.3.2)
+    thor (1.4.0)
     timeout (0.4.3)
     trailblazer-option (0.1.2)
     turbo-rails (2.0.11)

app/controllers/api/attachments_controller.rb

@@ -10,10 +10,21 @@ module Api
     def create
       submitter = Submitter.find_by!(slug: params[:submitter_slug])
 
-      if params[:type].in?(%w[initials signature]) && ImageUtils.blank?(Vips::Image.new_from_file(params[:file].path))
-        Rollbar.error("Empty signature: #{submitter.id}") if defined?(Rollbar)
+      if params[:type].in?(%w[initials signature])
+        image = Vips::Image.new_from_file(params[:file].path)
 
-        return render json: { error: "#{params[:type]} is empty" }, status: :unprocessable_entity
+        if ImageUtils.blank?(image)
+          Rollbar.error("Empty signature: #{submitter.id}") if defined?(Rollbar)
+
+          return render json: { error: "#{params[:type]} is empty" }, status: :unprocessable_entity
+        end
+
+        if ImageUtils.error?(image)
+          Rollbar.error("Error signature: #{submitter.id}") if defined?(Rollbar)
+
+          return render json: { error: "#{params[:type]} error, try to sign on another device" },
+                        status: :unprocessable_entity
+        end
       end
 
       attachment = Submitters.create_attachment!(submitter, params)

app/controllers/api/form_events_controller.rb

@@ -11,8 +11,9 @@ 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: :parent_folder },
+                           submission: [:submitters, { audit_trail_attachment: :blob,
+                                                       combined_document_attachment: :blob }],
                            documents_attachments: :blob, attachments_attachments: :blob),
         field: :completed_at
       )

app/controllers/api/submissions_controller.rb

@@ -14,7 +14,7 @@ module Api
       submissions = filter_submissions(submissions, params)
 
       submissions = paginate(submissions.preload(:created_by_user, :submitters,
-                                                 template: :folder,
+                                                 template: { folder: :parent_folder },
                                                  combined_document_attachment: :blob,
                                                  audit_trail_attachment: :blob))
 
@@ -104,9 +104,10 @@ module Api
       submissions = submissions.where(slug: params[:slug]) if params[:slug].present?
 
       if params[:template_folder].present?
-        folder_ids = TemplateFolder.accessible_by(current_ability).where(name: params[:template_folder]).pluck(:id)
+        folders =
+          TemplateFolders.filter_by_full_name(TemplateFolder.accessible_by(current_ability), params[:template_folder])
 
-        submissions = submissions.joins(:template).where(template: { folder_id: folder_ids })
+        submissions = submissions.joins(:template).where(template: { folder_id: folders.pluck(:id) })
       end
 
       if params.key?(:archived)
@@ -184,7 +185,7 @@ module Api
           message: %i[subject body],
           submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
                         :completed, :phone, :application_key, :external_id, :reply_to, :go_to_last,
-                        :require_phone_2fa,
+                        :require_phone_2fa, :order,
                         { metadata: {}, values: {}, roles: [], readonly_fields: [], message: %i[subject body],
                           fields: [:name, :uuid, :default_value, :value, :title, :description,
                                    :readonly, :required, :validation_pattern, :invalid_message,

app/controllers/api/templates_controller.rb

@@ -7,7 +7,7 @@ module Api
     def index
       templates = filter_templates(@templates, params)
 
-      templates = paginate(templates.preload(:author, :folder))
+      templates = paginate(templates.preload(:author, folder: :parent_folder))
 
       schema_documents =
         ActiveStorage::Attachment.where(record_id: templates.map(&:id),
@@ -92,9 +92,9 @@ module Api
       templates = templates.where(slug: params[:slug]) if params[:slug].present?
 
       if params[:folder].present?
-        folder_ids = TemplateFolder.accessible_by(current_ability).where(name: params[:folder]).pluck(:id)
+        folders = TemplateFolders.filter_by_full_name(TemplateFolder.accessible_by(current_ability), params[:folder])
 
-        templates = templates.where(folder_id: folder_ids)
+        templates = templates.where(folder_id: folders.pluck(:id))
       end
 
       templates
@@ -106,10 +106,10 @@ module Api
         :external_id,
         :shared_link,
         {
-          submitters: [%i[name uuid is_requester invite_by_uuid optional_invite_by_uuid linked_to_uuid email]],
+          submitters: [%i[name uuid is_requester invite_by_uuid optional_invite_by_uuid linked_to_uuid email order]],
           fields: [[:uuid, :submitter_uuid, :name, :type,
                     :required, :readonly, :default_value,
-                    :title, :description,
+                    :title, :description, :prefillable,
                     { preferences: {},
                       conditions: [%i[field_uuid value action operation]],
                       options: [%i[value uuid]],

app/controllers/submissions_controller.rb

@@ -32,10 +32,7 @@ class SubmissionsController < ApplicationController
   def create
     save_template_message(@template, params) if params[:save_message] == '1'
 
-    if params[:is_custom_message] != '1'
-      params.delete(:subject)
-      params.delete(:body)
-    end
+    [params.delete(:subject), params.delete(:body)] if params[:is_custom_message] != '1'
 
     submissions =
       if params[:emails].present?
@@ -46,11 +43,16 @@ class SubmissionsController < ApplicationController
                                        emails: params[:emails],
                                        params: params.merge('send_completed_email' => true))
       else
+        submissions_attrs = submissions_params[:submission].to_h.values
+
+        submissions_attrs, =
+          Submissions::NormalizeParamUtils.normalize_submissions_params!(submissions_attrs, @template)
+
         Submissions.create_from_submitters(template: @template,
                                            user: current_user,
                                            source: :invite,
                                            submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
-                                           submissions_attrs: submissions_params[:submission].to_h.values,
+                                           submissions_attrs:,
                                            params: params.merge('send_completed_email' => true))
       end
 
@@ -62,9 +64,8 @@ class SubmissionsController < ApplicationController
 
     redirect_to template_path(@template), notice: I18n.t('new_recipients_have_been_added')
   rescue Submissions::CreateFromSubmitters::BaseError => e
-    render turbo_stream: turbo_stream.replace(:submitters_error,
-                                              partial: 'submissions/error',
-                                              locals: { error: e.message }),
+    render turbo_stream: turbo_stream.replace(:submitters_error, partial: 'submissions/error',
+                                                                 locals: { error: e.message }),
            status: :unprocessable_entity
   end
 
@@ -95,7 +96,7 @@ class SubmissionsController < ApplicationController
   end
 
   def submissions_params
-    params.permit(submission: { submitters: [%i[uuid email phone name]] })
+    params.permit(submission: { submitters: [:uuid, :email, :phone, :name, { values: {} }] })
   end
 
   def load_template

app/controllers/template_folders_autocomplete_controller.rb

@@ -3,14 +3,31 @@
 class TemplateFoldersAutocompleteController < ApplicationController
   load_and_authorize_resource :template_folder, parent: false
 
-  LIMIT = 100
+  LIMIT = 30
 
   def index
-    templates_query = Template.accessible_by(current_ability).where(archived_at: nil)
+    parent_name, name =
+      if params[:parent_name].present?
+        [params[:parent_name], params[:q]]
+      else
+        params[:q].to_s.split(' /', 2).map(&:squish)
+      end
 
-    template_folders = @template_folders.where(id: templates_query.select(:folder_id))
-    template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)
+    if name
+      parent_folder = @template_folders.find_by(name: parent_name, parent_folder_id: nil)
+    else
+      name = parent_name
+    end
 
-    render json: template_folders.as_json(only: %i[name archived_at])
+    template_folders = TemplateFolders.filter_active_folders(@template_folders.where(parent_folder:),
+                                                             Template.accessible_by(current_ability))
+
+    name = name.to_s.downcase
+
+    template_folders = TemplateFolders.search(template_folders, name).order(id: :desc).limit(LIMIT)
+
+    render json: template_folders.preload(:parent_folder)
+                                 .sort_by { |e| e.name.downcase.index(name) || Float::MAX }
+                                 .as_json(only: %i[name archived_at], methods: %i[full_name])
   end
 end

app/controllers/template_folders_controller.rb

@@ -5,13 +5,39 @@ class TemplateFoldersController < ApplicationController
 
   helper_method :selected_order
 
-  def show
-    @templates = @template_folder.templates.active.accessible_by(current_ability)
-                                 .preload(:author, :template_accesses)
-    @templates = Templates.search(current_user, @templates, params[:q])
-    @templates = Templates::Order.call(@templates, current_user, selected_order)
+  TEMPLATES_PER_PAGE = 12
+  FOLDERS_PER_PAGE = 18
 
-    @pagy, @templates = pagy_auto(@templates, limit: 12)
+  def show
+    @templates = Template.active.accessible_by(current_ability)
+                         .where(folder: [@template_folder, *(params[:q].present? ? @template_folder.subfolders : [])])
+                         .preload(:author, :template_accesses)
+
+    @template_folders =
+      @template_folder.subfolders.where(id: Template.accessible_by(current_ability).active.select(:folder_id))
+
+    @template_folders = TemplateFolders.search(@template_folders, params[:q])
+    @template_folders = TemplateFolders.sort(@template_folders, current_user, selected_order)
+
+    if @templates.exists?
+      @templates = Templates.search(current_user, @templates, params[:q])
+      @templates = Templates::Order.call(@templates, current_user, selected_order)
+
+      limit =
+        if @template_folders.size < 4
+          TEMPLATES_PER_PAGE
+        else
+          (@template_folders.size < 7 ? 9 : 6)
+        end
+
+      @pagy, @templates = pagy_auto(@templates, limit:)
+
+      load_related_submissions if params[:q].present? && @templates.blank?
+    else
+      @pagy, @template_folders = pagy(@template_folders, limit: FOLDERS_PER_PAGE)
+
+      @templates = @templates.none
+    end
   end
 
   def edit; end
@@ -40,4 +66,21 @@ class TemplateFoldersController < ApplicationController
   def template_folder_params
     params.require(:template_folder).permit(:name)
   end
+
+  def load_related_submissions
+    @related_submissions =
+      Submission.accessible_by(current_ability)
+                .where(archived_at: nil)
+                .where(template_id: current_account.templates.active
+                                                   .where(folder: [@template_folder, *@template_folder.subfolders])
+                                                   .select(:id))
+                .preload(:template_accesses, :created_by_user,
+                         template: :author,
+                         submitters: :start_form_submission_events)
+
+    @related_submissions = Submissions.search(current_user, @related_submissions, params[:q])
+                                      .order(id: :desc)
+
+    @related_submissions_pagy, @related_submissions = pagy_auto(@related_submissions, limit: 5)
+  end
 end

app/controllers/templates_archived_controller.rb

@@ -4,9 +4,27 @@ class TemplatesArchivedController < ApplicationController
   load_and_authorize_resource :template, parent: false
 
   def index
-    @templates = @templates.where.not(archived_at: nil).preload(:author, :folder, :template_accesses).order(id: :desc)
+    @templates = @templates.where.not(archived_at: nil)
+                           .preload(:author, :template_accesses, folder: :parent_folder)
+                           .order(id: :desc)
+
     @templates = Templates.search(current_user, @templates, params[:q])
 
     @pagy, @templates = pagy_auto(@templates, limit: 12)
+
+    return unless params[:q].present? && @templates.blank?
+
+    @related_submissions =
+      Submission.accessible_by(current_ability)
+                .joins(:template)
+                .where.not(templates: { archived_at: nil })
+                .preload(:template_accesses, :created_by_user,
+                         template: :author,
+                         submitters: :start_form_submission_events)
+
+    @related_submissions = Submissions.search(current_user, @related_submissions, params[:q])
+                                      .order(id: :desc)
+
+    @related_submissions_pagy, @related_submissions = pagy_auto(@related_submissions, limit: 5)
   end
 end

app/controllers/templates_controller.rb

@@ -117,10 +117,10 @@ class TemplatesController < ApplicationController
     params.require(:template).permit(
       :name,
       { schema: [[:attachment_uuid, :name, { conditions: [%i[field_uuid value action operation]] }]],
-        submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid optional_invite_by_uuid email]],
+        submitters: [%i[name uuid is_requester linked_to_uuid invite_by_uuid optional_invite_by_uuid email order]],
         fields: [[:uuid, :submitter_uuid, :name, :type,
                   :required, :readonly, :default_value,
-                  :title, :description,
+                  :title, :description, :prefillable,
                   { preferences: {},
                     conditions: [%i[field_uuid value action operation]],
                     options: [%i[value uuid]],

app/controllers/templates_dashboard_controller.rb

@@ -11,10 +11,11 @@ class TemplatesDashboardController < ApplicationController
   helper_method :selected_order
 
   def index
-    @template_folders = @template_folders.where(id: @templates.active.select(:folder_id))
+    @template_folders =
+      TemplateFolders.filter_active_folders(@template_folders.where(parent_folder_id: nil), @templates)
 
     @template_folders = TemplateFolders.search(@template_folders, params[:q])
-    @template_folders = sort_template_folders(@template_folders, current_user, selected_order)
+    @template_folders = TemplateFolders.sort(@template_folders, current_user, selected_order)
 
     @pagy, @template_folders = pagy(
       @template_folders,
@@ -68,40 +69,6 @@ class TemplatesDashboardController < ApplicationController
     Templates.search(current_user, rel, params[:q])
   end
 
-  def sort_template_folders(template_folders, current_user, order)
-    case order
-    when 'used_at'
-      subquery =
-        Template.left_joins(:submissions)
-                .group(:folder_id)
-                .where(account_id: current_user.account_id)
-                .select(
-                  :folder_id,
-                  Template.arel_table[:updated_at].maximum.as('updated_at_max'),
-                  Submission.arel_table[:created_at].maximum.as('submission_created_at_max')
-                )
-
-      template_folders = template_folders.joins(
-        Template.arel_table
-                .join(subquery.arel.as('templates'), Arel::Nodes::OuterJoin)
-                .on(TemplateFolder.arel_table[:id].eq(Template.arel_table[:folder_id]))
-                .join_sources
-      )
-
-      template_folders.order(
-        Arel::Nodes::Case.new
-                         .when(Template.arel_table[:submission_created_at_max].gt(Template.arel_table[:updated_at_max]))
-                         .then(Template.arel_table[:submission_created_at_max])
-                         .else(Template.arel_table[:updated_at_max])
-                         .desc
-      )
-    when 'name'
-      template_folders.order(name: :asc)
-    else
-      template_folders.order(id: :desc)
-    end
-  end
-
   def selected_order
     @selected_order ||=
       if cookies.permanent[:dashboard_templates_order].blank? ||

app/controllers/templates_folders_controller.rb

@@ -6,7 +6,9 @@ class TemplatesFoldersController < ApplicationController
   def edit; end
 
   def update
-    @template.folder = TemplateFolders.find_or_create_by_name(current_user, params[:name])
+    name = [params[:parent_name], params[:name]].compact_blank.join(' / ')
+
+    @template.folder = TemplateFolders.find_or_create_by_name(current_user, name)
 
     if @template.save
       redirect_back(fallback_location: template_path(@template), notice: I18n.t('document_template_has_been_moved'))

app/controllers/templates_preferences_controller.rb

@@ -27,7 +27,7 @@ class TemplatesPreferencesController < ApplicationController
                       completed_redirect_url validate_unique_submitters
                       require_all_submitters submitters_order require_phone_2fa
                       default_expire_at_duration shared_link_2fa
-                      default_expire_at
+                      default_expire_at request_email_enabled
                       completed_notification_email_subject completed_notification_email_body
                       completed_notification_email_enabled completed_notification_email_attach_audit] +
                       [completed_message: %i[title body],

app/controllers/templates_prefillable_fields_controller.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class TemplatesPrefillableFieldsController < ApplicationController
+  PREFILLABLE_FIELD_TYPES = %w[text number cells date checkbox select radio phone].freeze
+
+  load_and_authorize_resource :template
+
+  def create
+    authorize!(:update, @template)
+
+    field = @template.fields.find { |f| f['uuid'] == params[:field_uuid] }
+
+    if params[:prefillable] == 'false'
+      field.delete('prefillable')
+      field.delete('readonly')
+    elsif params[:prefillable] == 'true'
+      field['prefillable'] = true
+      field['readonly'] = true
+    end
+
+    @template.save!
+
+    render turbo_stream: turbo_stream.replace(:prefillable_fields_list, partial: 'list',
+                                                                        locals: { template: @template })
+  end
+end

app/controllers/templates_recipients_controller.rb

@@ -9,6 +9,10 @@ class TemplatesRecipientsController < ApplicationController
     @template.submitters =
       submitters_params.map { |s| s.reject { |_, v| v.is_a?(String) && v.blank? } }
 
+    if @template.submitters.each_with_index.all? { |s, index| s['order'] == index }
+      @template.submitters.each { |s| s.delete('order') }
+    end
+
     @template.save!
 
     render json: { submitters: @template.submitters }
@@ -18,7 +22,7 @@ class TemplatesRecipientsController < ApplicationController
 
   def submitters_params
     permit_params = { submitters: [%i[name uuid is_requester optional_invite_by_uuid
-                                      invite_by_uuid linked_to_uuid email option]] }
+                                      invite_by_uuid linked_to_uuid email option order]] }
 
     params.require(:template).permit(permit_params).fetch(:submitters, {}).values.filter_map do |s|
       next if s[:uuid].blank?
@@ -29,6 +33,7 @@ class TemplatesRecipientsController < ApplicationController
         s.delete(:is_requester)
       end
 
+      s[:order] = s[:order].to_i if s[:order].present?
       s.delete(:invite_by_uuid) if s[:invite_by_uuid].blank?
       s.delete(:optional_invite_by_uuid) if s[:optional_invite_by_uuid].blank?
 

app/javascript/application.js

@@ -37,6 +37,8 @@ import AppTour from './elements/app_tour'
 import DashboardDropzone from './elements/dashboard_dropzone'
 import RequiredCheckboxGroup from './elements/required_checkbox_group'
 import PageContainer from './elements/page_container'
+import EmailEditor from './elements/email_editor'
+import MountOnClick from './elements/mount_on_click'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -109,6 +111,8 @@ safeRegisterElement('dashboard-dropzone', DashboardDropzone)
 safeRegisterElement('check-on-click', CheckOnClick)
 safeRegisterElement('required-checkbox-group', RequiredCheckboxGroup)
 safeRegisterElement('page-container', PageContainer)
+safeRegisterElement('email-editor', EmailEditor)
+safeRegisterElement('mount-on-click', MountOnClick)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {

app/javascript/elements/dashboard_dropzone.js

@@ -15,6 +15,7 @@ export default targetable(class extends HTMLElement {
   static [target.static] = [
     'form',
     'fileDropzone',
+    'folderDropzone',
     'fileDropzoneLoading'
   ]
 
@@ -25,12 +26,13 @@ export default targetable(class extends HTMLElement {
     window.addEventListener('dragleave', this.onWindowDragleave)
 
     this.fileDropzone?.addEventListener('drop', this.onDropFile)
+    this.folderDropzone?.addEventListener('drop', this.onDropNewFolder)
 
     this.folderCards.forEach((el) => el.addEventListener('drop', (e) => this.onDropFolder(e, el)))
     this.templateCards.forEach((el) => el.addEventListener('drop', this.onDropTemplate))
     this.templateCards.forEach((el) => el.addEventListener('dragstart', this.onTemplateDragStart))
 
-    return [this.fileDropzone, ...this.folderCards, ...this.templateCards].forEach((el) => {
+    return [this.fileDropzone, this.folderDropzone, ...this.folderCards, ...this.templateCards].forEach((el) => {
       el?.addEventListener('dragover', this.onDragover)
       el?.addEventListener('dragleave', this.onDragleave)
     })
@@ -46,6 +48,10 @@ export default targetable(class extends HTMLElement {
   onTemplateDragStart = (e) => {
     const id = e.target.href.split('/').pop()
 
+    this.folderCards.forEach((el) => el.classList.remove('bg-base-200', 'before:hidden'))
+    this.folderDropzone?.classList?.remove('hidden')
+    window.flash?.remove()
+
     e.dataTransfer.effectAllowed = 'move'
 
     if (id) {
@@ -104,7 +110,7 @@ export default targetable(class extends HTMLElement {
       } else {
         const formData = new FormData()
 
-        formData.append('name', el.innerText.trim())
+        formData.append('name', el.dataset.fullName)
 
         fetch(`/templates/${templateId}/folder`, {
           method: 'PUT',
@@ -176,6 +182,24 @@ export default targetable(class extends HTMLElement {
     }
   }
 
+  onDropNewFolder (e) {
+    e.preventDefault()
+
+    const templateId = e.dataTransfer.getData('template_id')
+
+    const a = document.createElement('a')
+
+    a.href = `/templates/${templateId}/folder/edit?autocomplete=false`
+    a.dataset.turboFrame = 'modal'
+    a.classList.add('hidden')
+
+    document.body.append(a)
+
+    a.click()
+
+    a.remove()
+  }
+
   onDragleave () {
     this.style.backgroundColor = null
 
@@ -199,6 +223,7 @@ export default targetable(class extends HTMLElement {
 
     this.isDrag = true
 
+    window.flash?.remove()
     this.fileDropzone?.classList?.remove('hidden')
 
     this.hiddenOnDrag.forEach((el) => { el.style.display = 'none' })
@@ -212,6 +237,7 @@ export default targetable(class extends HTMLElement {
     this.isDrag = false
 
     this.fileDropzone?.classList?.add('hidden')
+    this.folderDropzone?.classList?.add('hidden')
 
     this.hiddenOnDrag.forEach((el) => { el.style.display = null })
 

app/javascript/elements/email_editor.js

@@ -0,0 +1,131 @@
+import { target, targetable } from '@github/catalyst/lib/targetable'
+
+let loaderPromise = null
+
+function loadCodeMirror () {
+  if (!loaderPromise) {
+    loaderPromise = Promise.all([
+      import(/* webpackChunkName: "email-editor" */ '@codemirror/view'),
+      import(/* webpackChunkName: "email-editor" */ '@codemirror/commands'),
+      import(/* webpackChunkName: "email-editor" */ '@codemirror/language'),
+      import(/* webpackChunkName: "email-editor" */ '@codemirror/lang-html'),
+      import(/* webpackChunkName: "email-editor" */ '@specious/htmlflow')
+    ]).then(([view, commands, language, html, htmlflow]) => {
+      return {
+        minimalSetup: [
+          commands.history(),
+          language.syntaxHighlighting(language.defaultHighlightStyle, { fallback: true }),
+          view.keymap.of([...commands.defaultKeymap, ...commands.historyKeymap])
+        ],
+        EditorView: view.EditorView,
+        html: html.html,
+        htmlflow: htmlflow.default || htmlflow
+      }
+    })
+  }
+
+  return loaderPromise
+}
+
+export default targetable(class extends HTMLElement {
+  static [target.static] = [
+    'codeViewTab',
+    'previewViewTab',
+    'editorContainer',
+    'previewIframe'
+  ]
+
+  connectedCallback () {
+    this.mount()
+
+    if (this.input.value) {
+      this.showPreviewView()
+    } else {
+      this.showCodeView()
+    }
+
+    this.previewViewTab.addEventListener('click', this.showPreviewView)
+    this.codeViewTab.addEventListener('click', this.showCodeView)
+  }
+
+  showCodeView = () => {
+    this.editorView.dispatch({
+      changes: { from: 0, to: this.editorView.state.doc.length, insert: this.input.value }
+    })
+
+    this.previewViewTab.classList.remove('tab-active', 'tab-bordered')
+    this.previewViewTab.classList.add('pb-[3px]')
+    this.codeViewTab.classList.remove('pb-[3px]')
+    this.codeViewTab.classList.add('tab-active', 'tab-bordered')
+    this.editorContainer.classList.remove('hidden')
+    this.previewIframe.classList.add('hidden')
+  }
+
+  showPreviewView = () => {
+    this.previewIframe.srcdoc = this.input.value
+
+    this.codeViewTab.classList.remove('tab-active', 'tab-bordered')
+    this.codeViewTab.classList.add('pb-[3px]')
+    this.previewViewTab.classList.remove('pb-[3px]')
+    this.previewViewTab.classList.add('tab-active', 'tab-bordered')
+    this.editorContainer.classList.add('hidden')
+    this.previewIframe.classList.remove('hidden')
+  }
+
+  async mount () {
+    this.input = this.querySelector('input[type="hidden"]')
+    this.input.style.display = 'none'
+
+    const { EditorView, minimalSetup, html, htmlflow } = await loadCodeMirror()
+
+    this.editorView = new EditorView({
+      doc: this.input.value,
+      parent: this.editorContainer,
+      extensions: [
+        html(),
+        minimalSetup,
+        EditorView.lineWrapping,
+        EditorView.updateListener.of(update => {
+          if (update.docChanged) this.input.value = update.state.doc.toString()
+        }),
+        EditorView.theme({
+          '&': {
+            backgroundColor: 'white',
+            color: 'black',
+            fontSize: '14px',
+            fontFamily: 'monospace'
+          },
+          '&.cm-focused': {
+            outline: 'none'
+          },
+          '&.cm-editor': {
+            borderRadius: '0.375rem',
+            border: 'none'
+          },
+          '.cm-gutters': {
+            display: 'none'
+          }
+        })
+      ]
+    })
+
+    this.previewIframe.srcdoc = this.editorView.state.doc.toString()
+
+    this.previewIframe.onload = () => {
+      const previewIframeDoc = this.previewIframe.contentDocument
+
+      if (previewIframeDoc.body) {
+        previewIframeDoc.body.contentEditable = true
+      }
+
+      const contentDocument = this.previewIframe.contentDocument || this.previewIframe.contentWindow.document
+
+      contentDocument.body.addEventListener('input', async () => {
+        const html = contentDocument.documentElement.outerHTML.replace(' contenteditable="true"', '')
+        const prettifiedHtml = await htmlflow(html)
+
+        this.input.value = prettifiedHtml
+      })
+    }
+  }
+})

app/javascript/elements/folder_autocomplete.js

@@ -2,6 +2,8 @@ import autocomplete from 'autocompleter'
 
 export default class extends HTMLElement {
   connectedCallback () {
+    if (this.dataset.enabled === 'false') return
+
     autocomplete({
       input: this.input,
       preventSubmit: this.dataset.submitOnSelect === 'true' ? 0 : 1,
@@ -14,12 +16,16 @@ export default class extends HTMLElement {
   }
 
   onSelect = (item) => {
-    this.input.value = item.name
+    this.input.value = this.dataset.parentName ? item.name : item.full_name
   }
 
   fetch = (text, resolve) => {
     const queryParams = new URLSearchParams({ q: text })
 
+    if (this.dataset.parentName) {
+      queryParams.append('parent_name', this.dataset.parentName)
+    }
+
     fetch('/template_folders_autocomplete?' + queryParams).then(async (resp) => {
       const items = await resp.json()
 
@@ -34,7 +40,7 @@ export default class extends HTMLElement {
 
     div.setAttribute('dir', 'auto')
 
-    div.textContent = item.name
+    div.textContent = this.dataset.parentName ? item.name : item.full_name
 
     return div
   }

app/javascript/elements/mount_on_click.js

@@ -0,0 +1,11 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.addEventListener('click', () => {
+      document.body.append(this.template.content)
+    })
+  }
+
+  get template () {
+    return document.getElementById(this.dataset.templateId)
+  }
+}

app/javascript/elements/page_container.js

@@ -1,14 +1,12 @@
 export default class extends HTMLElement {
   connectedCallback () {
-    this.image.addEventListener('load', (e) => {
-      this.image.setAttribute('width', e.target.naturalWidth)
-      this.image.setAttribute('height', e.target.naturalHeight)
+    const image = this.querySelector('img')
+
+    image.addEventListener('load', (e) => {
+      image.setAttribute('width', e.target.naturalWidth)
+      image.setAttribute('height', e.target.naturalHeight)
 
       this.style.aspectRatio = `${e.target.naturalWidth} / ${e.target.naturalHeight}`
     })
   }
-
-  get image () {
-    return this.querySelector('img')
-  }
 }

app/javascript/elements/toggle_visible.js

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

app/javascript/submission_form/area.vue

@@ -56,11 +56,11 @@
     <div
       v-else-if="field.type === 'signature' && signature"
       class="flex justify-between h-full gap-1 overflow-hidden w-full"
-      :class="isNarrow && (withSignatureId || field.preferences?.reason_field_uuid) ? 'flex-row' : 'flex-col'"
+      :class="isNarrow && (isShowSignatureId || field.preferences?.reason_field_uuid) ? 'flex-row' : 'flex-col'"
     >
       <div
         class="flex overflow-hidden"
-        :class="isNarrow && (withSignatureId || field.preferences?.reason_field_uuid) ? 'w-1/2' : 'flex-grow'"
+        :class="isNarrow && (isShowSignatureId || field.preferences?.reason_field_uuid) ? 'w-1/2' : 'flex-grow'"
         style="min-height: 50%"
       >
         <img
@@ -69,7 +69,7 @@
         >
       </div>
       <div
-        v-if="withSignatureId || field.preferences?.reason_field_uuid"
+        v-if="isShowSignatureId || field.preferences?.reason_field_uuid"
         class="text-[1vw] lg:text-[0.55rem] lg:leading-[0.65rem]"
         :class="isNarrow ? 'w-1/2' : 'w-full'"
       >
@@ -333,6 +333,13 @@ export default {
         verification: this.t('verify_id')
       }
     },
+    isShowSignatureId () {
+      if ([true, false].includes(this.field.preferences?.with_signature_id)) {
+        return this.field.preferences.with_signature_id
+      } else {
+        return this.withSignatureId
+      }
+    },
     alignClasses () {
       if (!this.field.preferences) {
         return { 'items-center': true }
@@ -460,9 +467,6 @@ export default {
     fontScale () {
       return 1000 / 612.0
     },
-    ladscapeScale () {
-      return 8.5 / 11.0
-    },
     computedStyle () {
       const { x, y, w, h } = this.area
 

app/javascript/submission_form/dropzone.vue

@@ -112,11 +112,23 @@ export default {
     onSelectFiles (e) {
       e.preventDefault()
 
-      this.uploadFiles(this.$refs.input.files).then(() => {
-        if (this.$refs.input) {
-          this.$refs.input.value = ''
+      const files = Array.from(this.$refs.input.files).filter((f) => {
+        if (this.accept === 'image/*') {
+          return f.type.startsWith('image')
+        } else {
+          return true
         }
       })
+
+      if (this.accept === 'image/*' && !files.length) {
+        alert(this.t('please_upload_an_image_file'))
+      } else {
+        this.uploadFiles(files).then(() => {
+          if (this.$refs.input) {
+            this.$refs.input.value = ''
+          }
+        })
+      }
     },
     async uploadFiles (files) {
       this.isLoading = true

app/javascript/submission_form/signature_step.vue

@@ -21,7 +21,7 @@
       </label>
       <div class="space-x-2 flex flex-none">
         <span
-          v-if="isTextSignature && format !== 'typed' && format !== 'upload'"
+          v-if="isTextSignature && format !== 'typed_or_upload' && format !== 'typed' && format !== 'upload'"
           class="tooltip"
           :data-tip="t('draw_signature')"
         >
@@ -38,7 +38,7 @@
           </a>
         </span>
         <span
-          v-else-if="withTypedSignature && format !== 'typed' && format !== 'drawn' && format !== 'upload'"
+          v-else-if="withTypedSignature && format !== 'drawn_or_upload' && format !== 'typed_or_upload' && format !== 'typed' && format !== 'drawn' && format !== 'upload'"
           class="tooltip ml-2"
           :class="{ 'hidden sm:inline': modelValue || computedPreviousValue }"
           :data-tip="t('type_text')"
@@ -85,8 +85,8 @@
           {{ t(format === 'upload' ? 'reupload' : 'redraw') }}
         </a>
         <span
-          v-if="withQrButton && !modelValue && !computedPreviousValue && format !== 'typed' && format !== 'upload'"
-          class=" tooltip"
+          v-if="withQrButton && !modelValue && !computedPreviousValue && format !== 'typed_or_upload' && format !== 'typed' && format !== 'upload'"
+          class="tooltip before:translate-x-[-90%]"
           :data-tip="t('drawn_signature_on_a_touchscreen_device')"
         >
           <a
@@ -395,7 +395,7 @@ export default {
       isShowQr: false,
       isOtherReason: false,
       isUsePreviousValue: true,
-      isTextSignature: this.field.preferences?.format === 'typed',
+      isTextSignature: this.field.preferences?.format === 'typed' || this.field.preferences?.format === 'typed_or_upload',
       uploadImageInputKey: Math.random().toString()
     }
   },

app/javascript/submission_form/verification_step.vue

@@ -149,7 +149,8 @@ export default {
       return fetch(this.baseUrl + `/api/identity_verification/${this.field.uuid}`, {
         method: 'PUT',
         body: JSON.stringify({
-          submitter_slug: this.submitterSlug
+          submitter_slug: this.submitterSlug,
+          redirect_url: document.location.href
         }),
         headers: { 'Content-Type': 'application/json' }
       }).then(async (resp) => {

app/javascript/template_builder/area.vue

@@ -140,6 +140,8 @@
               :background-color="'white'"
               :with-required="false"
               :with-areas="false"
+              :with-signature-id="withSignatureId"
+              :with-prefillable="withPrefillable"
               @click-formula="isShowFormulaModal = true"
               @click-font="isShowFontModal = true"
               @click-description="isShowDescriptionModal = true"
@@ -347,6 +349,16 @@ export default {
       required: false,
       default: false
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     defaultSubmitters: {
       type: Array,
       required: false,
@@ -414,9 +426,6 @@ export default {
     fontScale () {
       return 1040 / 612.0
     },
-    ladscapeScale () {
-      return 8.5 / 11.0
-    },
     isDefaultValuePresent () {
       if (this.field?.type === 'radio' && this.field?.areas?.length > 1) {
         return false

app/javascript/template_builder/builder.vue

@@ -330,6 +330,8 @@
                 :input-mode="inputMode"
                 :default-fields="[...defaultRequiredFields, ...defaultFields]"
                 :allow-draw="!onlyDefinedFields || drawField"
+                :with-signature-id="withSignatureId"
+                :with-prefillable="withPrefillable"
                 :data-document-uuid="document.uuid"
                 :default-submitters="defaultSubmitters"
                 :drag-field-placeholder="fieldsDragFieldRef.value || dragField"
@@ -436,6 +438,8 @@
             :default-required-fields="defaultRequiredFields"
             :field-types="fieldTypes"
             :with-sticky-submitters="withStickySubmitters"
+            :with-signature-id="withSignatureId"
+            :with-prefillable="withPrefillable"
             :only-defined-fields="onlyDefinedFields"
             :editable="editable"
             :show-tour-start-form="showTourStartForm"
@@ -563,6 +567,11 @@ export default {
       required: false,
       default: false
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
     backgroundColor: {
       type: String,
       required: false,
@@ -794,6 +803,13 @@ export default {
     language () {
       return this.locale.split('-')[0].toLowerCase()
     },
+    withPrefillable () {
+      if (this.template.fields) {
+        return this.template.fields.some((f) => f.prefillable)
+      } else {
+        return false
+      }
+    },
     isInlineSize () {
       return CSS.supports('container-type: size')
     },
@@ -1068,6 +1084,11 @@ export default {
         }
       }
 
+      if (type === 'signature' && [true, false].includes(this.withSignatureId)) {
+        field.preferences ||= {}
+        field.preferences.with_signature_id = this.withSignatureId
+      }
+
       this.template.fields.push(field)
 
       this.save()
@@ -1474,6 +1495,11 @@ export default {
           field.preferences ||= {}
           field.preferences.format ||= this.defaultDateFormat
         }
+
+        if (field.type === 'signature' && [true, false].includes(this.withSignatureId)) {
+          field.preferences ||= {}
+          field.preferences.with_signature_id = this.withSignatureId
+        }
       }
 
       const fieldArea = {

app/javascript/template_builder/document.vue

@@ -10,6 +10,8 @@
       :data-page="index"
       :areas="areasIndex[index]"
       :allow-draw="allowDraw"
+      :with-signature-id="withSignatureId"
+      :with-prefillable="withPrefillable"
       :is-drag="isDrag"
       :with-field-placeholder="withFieldPlaceholder"
       :default-fields="defaultFields"
@@ -66,6 +68,16 @@ export default {
       required: false,
       default: false
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     drawFieldType: {
       type: String,
       required: false,

app/javascript/template_builder/field.vue

@@ -125,6 +125,8 @@
                 :field="field"
                 :default-field="defaultField"
                 :editable="editable"
+                :with-signature-id="withSignatureId"
+                :with-prefillable="withPrefillable"
                 :background-color="dropdownBgColor"
                 @click-formula="isShowFormulaModal = true"
                 @click-font="isShowFontModal = true"
@@ -302,6 +304,16 @@ export default {
       type: Object,
       required: true
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withOptions: {
       type: Boolean,
       required: false,

app/javascript/template_builder/field_settings.vue

@@ -304,7 +304,7 @@
         {{ t('any') }}
       </option>
       <option
-        v-for="type in ['drawn', 'typed', 'drawn_or_typed', 'upload']"
+        v-for="type in ['drawn', 'typed', 'drawn_or_typed', 'drawn_or_upload', 'upload']"
         :key="type"
         :value="type"
         :selected="field.preferences?.format === type"
@@ -320,6 +320,21 @@
       {{ t('format') }}
     </label>
   </div>
+  <li
+    v-if="[true, false].includes(withSignatureId) && field.type === 'signature'"
+    @click.stop
+  >
+    <label class="cursor-pointer py-1.5">
+      <input
+        :checked="field.preferences?.with_signature_id"
+        type="checkbox"
+        :disabled="!editable || (defaultField && [true, false].includes(defaultField.required))"
+        class="toggle toggle-xs"
+        @change="[field.preferences ||= {}, field.preferences.with_signature_id = $event.target.checked, save()]"
+      >
+      <span class="label-text">{{ t('signature_id') }}</span>
+    </label>
+  </li>
   <li
     v-if="withRequired && field.type !== 'phone' && field.type !== 'stamp' && field.type !== 'verification'"
     @click.stop
@@ -391,6 +406,21 @@
       <span class="label-text">{{ t('read_only') }}</span>
     </label>
   </li>
+  <li
+    v-if="withPrefillable && ['text', 'number', 'cells', 'date', 'checkbox', 'select', 'radio', 'phone'].includes(field['type'])"
+    @click.stop
+  >
+    <label class="cursor-pointer py-1.5">
+      <input
+        v-model="field.prefillable"
+        type="checkbox"
+        :disabled="!editable || (defaultField && [true, false].includes(defaultField.prefillable))"
+        class="toggle toggle-xs"
+        @update:model-value="save"
+      >
+      <span class="label-text">{{ t('prefillable') }}</span>
+    </label>
+  </li>
   <hr
     v-if="field.type != 'stamp'"
     class="pb-0.5 mt-0.5"
@@ -525,6 +555,11 @@ export default {
       type: Object,
       required: true
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
     backgroundColor: {
       type: String,
       required: false,
@@ -535,6 +570,11 @@ export default {
       required: false,
       default: null
     },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withRequired: {
       type: Boolean,
       required: false,

app/javascript/template_builder/fields.vue

@@ -26,6 +26,8 @@
       :field="field"
       :type-index="fields.filter((f) => f.type === field.type).indexOf(field)"
       :editable="editable"
+      :with-signature-id="withSignatureId"
+      :with-prefillable="withPrefillable"
       :default-field="defaultFieldsIndex[field.name]"
       :draggable="editable"
       @dragstart="[fieldsDragFieldRef.value = field, removeDragOverlay($event), setDragPlaceholder($event)]"
@@ -253,6 +255,16 @@ export default {
       required: false,
       default: null
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     template: {
       type: Object,
       required: true

app/javascript/template_builder/font_modal.vue

@@ -163,7 +163,7 @@
             class="flex border border-base-content/20 rounded-xl bg-white px-4 h-16 modal-field-font-preview"
             :style="{
               color: preferences.color || 'black',
-              fontSize: (preferences.font_size || 12) + 'pt',
+              fontSize: (preferences.font_size || 11) + 'pt',
             }"
             :class="textClasses"
           >

app/javascript/template_builder/hover_dropzone.vue

@@ -2,6 +2,8 @@
   <div
     v-if="isDragging || isLoading"
     class="modal modal-open"
+    @dragover.prevent
+    @drop.prevent="$emit('error')"
   >
     <div class="flex flex-col gap-2 p-4 items-center bg-base-100 h-full max-h-[85vh] max-w-6xl rounded-2xl w-full">
       <Dropzone

app/javascript/template_builder/i18n.js

@@ -1,4 +1,6 @@
 const en = {
+  prefillable: 'Prefillable',
+  signature_id: 'Signature ID',
   error_message: 'Error message',
   length: 'Length',
   min: 'Min',
@@ -58,6 +60,7 @@ const en = {
   any: 'Any',
   drawn: 'Drawn',
   drawn_or_typed: 'Drawn or Typed',
+  drawn_or_upload: 'Drawn or Upload',
   upload: 'Upload',
   formula: 'Formula',
   typed: 'Typed',
@@ -172,6 +175,8 @@ const en = {
 }
 
 const es = {
+  prefillable: 'Rellenable',
+  signature_id: 'ID de Firma',
   error_message: 'Mensaje de error',
   length: 'Longitud',
   min: 'Mín',
@@ -318,6 +323,7 @@ const es = {
   any: 'Cualquier',
   drawn: 'Dibujado',
   drawn_or_typed: 'Dibujado o Escrito',
+  drawn_or_upload: 'Dibujado o Subido',
   upload: 'Subir',
   typed: 'Escrito',
   none: 'Ninguno',
@@ -345,6 +351,8 @@ const es = {
 }
 
 const it = {
+  prefillable: 'Precompilabile',
+  signature_id: 'ID firma',
   error_message: 'Messaggio di errore',
   length: 'Lunghezza',
   min: 'Min',
@@ -404,6 +412,7 @@ const it = {
   any: 'Qualsiasi',
   drawn: 'Disegnato',
   drawn_or_typed: 'Disegnato o Digitato',
+  drawn_or_upload: 'Disegnato o Caricato',
   upload: 'Caricare',
   formula: 'Formula',
   typed: 'Digitato',
@@ -518,6 +527,8 @@ const it = {
 }
 
 const pt = {
+  prefillable: 'Pré-preenchível',
+  signature_id: 'ID da Assinatura',
   error_message: 'Mensagem de erro',
   length: 'Comprimento',
   min: 'Mín',
@@ -664,6 +675,7 @@ const pt = {
   any: 'Qualquer',
   drawn: 'Desenhado',
   drawn_or_typed: 'Desenhado ou Digitado',
+  drawn_or_upload: 'Desenhado ou Enviado',
   upload: 'Carregar',
   typed: 'Digitado',
   none: 'Nenhum',
@@ -691,6 +703,8 @@ const pt = {
 }
 
 const fr = {
+  prefillable: 'Pré-remplissable',
+  signature_id: 'ID de signature',
   error_message: 'Message d\'erreur',
   length: 'Longueur',
   min: 'Min',
@@ -837,6 +851,7 @@ const fr = {
   any: 'Tout',
   drawn: 'Dessiné',
   drawn_or_typed: 'Dessiné ou Tapé',
+  drawn_or_upload: 'Dessiné ou Téléchargé',
   upload: 'Téléverser',
   typed: 'Tapé',
   none: 'Aucun',
@@ -864,6 +879,8 @@ const fr = {
 }
 
 const de = {
+  prefillable: 'Vorausfüllbar',
+  signature_id: 'Signatur-ID',
   error_message: 'Fehlermeldung',
   length: 'Länge',
   min: 'Min',
@@ -1010,6 +1027,7 @@ const de = {
   any: 'Jede',
   drawn: 'Gezeichnet',
   drawn_or_typed: 'Gezeichnet oder getippt',
+  drawn_or_upload: 'Gezeichnet oder hochgeladen',
   upload: 'Upload',
   typed: 'Getippt',
   none: 'Keine',

app/javascript/template_builder/page.vue

@@ -27,6 +27,8 @@
         :field="item.field"
         :editable="editable"
         :with-field-placeholder="withFieldPlaceholder"
+        :with-signature-id="withSignatureId"
+        :with-prefillable="withPrefillable"
         :default-field="defaultFieldsIndex[item.field.name]"
         :default-submitters="defaultSubmitters"
         :max-page="totalPages - 1"
@@ -78,6 +80,16 @@ export default {
       required: false,
       default: null
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
+    withPrefillable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     areas: {
       type: Array,
       required: false,

app/jobs/process_submitter_completion_job.rb

@@ -135,19 +135,32 @@ class ProcessSubmitterCompletionJob
   end
 
   def enqueue_next_submitter_request_notification(submitter)
-    next_submitter_item =
-      submitter.submission.template_submitters.find do |e|
-        sub = submitter.submission.submitters.find { |s| s.uuid == e['uuid'] }
+    submission = submitter.submission
+    submitters_index = submission.submitters.index_by(&:uuid)
 
-        next unless sub
+    next_submitter_items =
+      if submission.template_submitters.any? { |s| s['order'] }
+        submitter_groups =
+          submission.template_submitters.group_by.with_index { |s, index| s['order'] || index }
 
-        sub.completed_at.blank? && sub.sent_at.blank?
+        current_group_index = submitter_groups.find { |_, group| group.any? { |s| s['uuid'] == submitter.uuid } }&.first
+
+        if submitter_groups[current_group_index + 1] &&
+           submitters_index.values_at(*submitter_groups[current_group_index].pluck('uuid')).all?(&:completed_at?)
+          submitter_groups[current_group_index + 1]
+        end
+      else
+        submission.template_submitters.find do |e|
+          sub = submitters_index[e['uuid']]
+
+          next unless sub
+
+          sub.completed_at.blank? && sub.sent_at.blank?
+        end
       end
 
-    return unless next_submitter_item
+    next_submitters = submitters_index.values_at(*Array.wrap(next_submitter_items).pluck('uuid'))
 
-    next_submitter = submitter.submission.submitters.find { |s| s.uuid == next_submitter_item['uuid'] }
-
-    Submitters.send_signature_requests([next_submitter])
+    Submitters.send_signature_requests(next_submitters)
   end
 end

app/jobs/send_submitter_invitation_email_job.rb

@@ -6,6 +6,7 @@ class SendSubmitterInvitationEmailJob
   def perform(params = {})
     submitter = Submitter.find(params['submitter_id'])
 
+    return if submitter.completed_at?
     return if submitter.submission.source == 'invite' && !Accounts.can_send_emails?(submitter.account, on_events: true)
 
     unless Accounts.can_send_invitation_emails?(submitter.account)

app/mailers/submitter_mailer.rb

@@ -30,6 +30,7 @@ class SubmitterMailer < ApplicationMailer
                @submitter.template&.preferences&.dig('request_email_subject').presence
 
     @email_config = AccountConfigs.find_for_account(@current_account, AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY)
+    @body ||= fetch_config_email_body(@email_config, @submitter)
 
     assign_message_metadata('submitter_invitation', @submitter)
 
@@ -71,7 +72,7 @@ class SubmitterMailer < ApplicationMailer
     @subject ||= @email_config.value['subject'] if @email_config
 
     @body = template_preferences['completed_notification_email_body'].presence
-    @body ||= @email_config.value['body'] if @email_config
+    @body ||= fetch_config_email_body(@email_config, @submitter)
 
     assign_message_metadata('submitter_completed', @submitter)
 
@@ -127,7 +128,7 @@ class SubmitterMailer < ApplicationMailer
     @subject ||= @email_config.value['subject'] if @email_config
 
     @body = template_preferences['documents_copy_email_body'].presence
-    @body ||= @email_config.value['body'] if @email_config
+    @body ||= fetch_config_email_body(@email_config, @submitter)
 
     assign_message_metadata('submitter_documents_copy', @submitter)
     reply_to = build_submitter_reply_to(submitter, email_config: @email_config, documents_copy_email: true)
@@ -246,4 +247,8 @@ class SubmitterMailer < ApplicationMailer
       user.friendly_name
     end
   end
+
+  def fetch_config_email_body(email_config, _submitter = nil)
+    email_config ? email_config.value['body'].presence : nil
+  end
 end

app/mailers/template_mailer.rb

@@ -2,6 +2,7 @@
 
 class TemplateMailer < ApplicationMailer
   def otp_verification_email(template, email:)
+    @current_account = template.account
     @template = template
 
     @otp_code = EmailVerificationCodes.generate([email.downcase.strip, template.slug].join(':'))

app/models/account_config.rb

@@ -41,6 +41,7 @@ class AccountConfig < ApplicationRecord
   FORCE_SSO_AUTH_KEY = 'force_sso_auth'
   FLATTEN_RESULT_PDF_KEY = 'flatten_result_pdf'
   WITH_SIGNATURE_ID = 'with_signature_id'
+  WITH_SIGNATURE_ID_REASON_KEY = 'with_signature_id_reason'
   WITH_AUDIT_VALUES_KEY = 'with_audit_values'
   WITH_SUBMITTER_TIMEZONE_KEY = 'with_submitter_timezone'
   REQUIRE_SIGNING_REASON_KEY = 'require_signing_reason'

app/models/template.rb

@@ -72,12 +72,14 @@ class Template < ApplicationRecord
   scope :active, -> { where(archived_at: nil) }
   scope :archived, -> { where.not(archived_at: nil) }
 
-  delegate :name, to: :folder, prefix: true
-
   def application_key
     external_id
   end
 
+  def folder_name
+    folder.full_name
+  end
+
   private
 
   def maybe_set_default_folder

app/models/template_folder.rb

@@ -4,36 +4,50 @@
 #
 # Table name: template_folders
 #
-#  id          :bigint           not null, primary key
-#  archived_at :datetime
-#  name        :string           not null
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  account_id  :bigint           not null
-#  author_id   :bigint           not null
+#  id               :bigint           not null, primary key
+#  archived_at      :datetime
+#  name             :string           not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  account_id       :bigint           not null
+#  author_id        :bigint           not null
+#  parent_folder_id :bigint
 #
 # Indexes
 #
-#  index_template_folders_on_account_id  (account_id)
-#  index_template_folders_on_author_id   (author_id)
+#  index_template_folders_on_account_id        (account_id)
+#  index_template_folders_on_author_id         (author_id)
+#  index_template_folders_on_parent_folder_id  (parent_folder_id)
 #
 # Foreign Keys
 #
 #  fk_rails_...  (account_id => accounts.id)
 #  fk_rails_...  (author_id => users.id)
+#  fk_rails_...  (parent_folder_id => template_folders.id)
 #
 class TemplateFolder < ApplicationRecord
   DEFAULT_NAME = 'Default'
 
   belongs_to :author, class_name: 'User'
   belongs_to :account
+  belongs_to :parent_folder, class_name: 'TemplateFolder', optional: true
 
   has_many :templates, dependent: :destroy, foreign_key: :folder_id, inverse_of: :folder
+  has_many :subfolders, class_name: 'TemplateFolder', foreign_key: :parent_folder_id, inverse_of: :parent_folder,
+                        dependent: :destroy
   has_many :active_templates, -> { where(archived_at: nil) },
            class_name: 'Template', dependent: :destroy, foreign_key: :folder_id, inverse_of: :folder
 
   scope :active, -> { where(archived_at: nil) }
 
+  def full_name
+    if parent_folder_id?
+      [parent_folder.name, name].join(' / ')
+    else
+      name
+    end
+  end
+
   def default?
     name == DEFAULT_NAME
   end

app/views/api_settings/index.html.erb

@@ -53,7 +53,7 @@
             <span class="top-0 right-0 absolute">
               <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
             </span>
-            <pre data-prefix="$"><code class="overflow-hidden w-full"><%= text %></code></pre>
+            <pre data-prefix="$"><code class="overflow-hidden w-full"><%== HighlightCode.call(text, 'Shell', theme: 'base16.dark') %></code></pre>
           </div>
         </div>
       </div>
@@ -79,7 +79,7 @@
             <span class="top-0 right-0 absolute">
               <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
             </span>
-            <pre data-prefix="$"><code class="overflow-hidden w-full"><%= text %></code></pre>
+            <pre data-prefix="$"><code class="overflow-hidden w-full"><%== HighlightCode.call(text, 'Shell', theme: 'base16.dark') %></code></pre>
           </div>
         </div>
       </div>
@@ -101,7 +101,7 @@
             <span class="top-0 right-0 absolute">
               <%= render 'shared/clipboard_copy', icon: 'copy', text:, class: 'btn btn-ghost text-white', icon_class: 'w-6 h-6 text-white', copy_title: t('copy'), copied_title: t('copied') %>
             </span>
-            <pre data-prefix="$"><code class="overflow-hidden w-full"><%= text %></code></pre>
+            <pre data-prefix="$"><code class="overflow-hidden w-full"><%== HighlightCode.call(text, 'Shell', theme: 'base16.dark') %></code></pre>
           </div>
         </div>
       </div>

app/views/email_smtp_settings/index.html.erb

@@ -35,17 +35,19 @@
             <%= ff.select :authentication, options_for_select([%w[Plain plain], %w[Login login], %w[CRAM-MD5 cram_md5]], value.fetch('authentication', 'plain')), { prompt: true }, required: true, class: 'base-select' %>
           </div>
         </div>
-        <div class="form-control">
-          <%= ff.label :security_label, 'SMTP Security', class: 'label' %>
-          <div class="flex items-center space-x-6">
-            <% [%w[Auto none], %w[SSL ssl], %w[TLS tls], %w[Noverify noverify]].each do |(label, val)| %>
-              <%= ff.label :security, value: val, for: "#{val}_radio", class: 'label' do %>
-                <%= ff.radio_button :security, val, checked: (value['security'].blank? && val == 'none') || value['security'] == val, id: "#{val}_radio", class: 'base-radio mr-2' %>
-                <%= label %>
+        <% if !Docuseal.multitenant? || can?(:manage, :personalization_advanced) %>
+          <div class="form-control">
+            <%= ff.label :security_label, 'SMTP Security', class: 'label' %>
+            <div class="flex items-center space-x-6">
+              <% [%w[Auto none], %w[SSL ssl], %w[TLS tls], %w[Noverify noverify]].each do |(label, val)| %>
+                <%= ff.label :security, value: val, for: "#{val}_radio", class: 'label' do %>
+                  <%= ff.radio_button :security, val, checked: (value['security'].blank? && val == 'none') || value['security'] == val, id: "#{val}_radio", class: 'base-radio mr-2' %>
+                  <%= label %>
+                <% end %>
               <% end %>
-            <% end %>
+            </div>
           </div>
-        </div>
+        <% end %>
         <div class="form-control">
           <%= ff.label :from_email, t('send_from_email'), class: 'label' %>
           <%= ff.email_field :from_email, value: value['from_email'], required: !Docuseal.multitenant?, class: 'base-input' %>

app/views/esign_settings/show.html.erb

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

app/views/icons/_arrow_left.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M5 12l14 0" /><path d="M5 12l6 6" /><path d="M5 12l6 -6" />
+</svg>

app/views/icons/_circle_arrow_left.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M12 21a9 9 0 1 0 0 -18a9 9 0 0 0 0 18" /><path d="M8 12l4 4" /><path d="M8 12h8" /><path d="M12 8l-4 4" />
+</svg>

app/views/icons/_circle_chevron_left.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M12 21a9 9 0 1 0 0 -18a9 9 0 0 0 0 18" /><path d="M9 12l4 4" /><path d="M13 8l-4 4" />
+</svg>

app/views/icons/_folder_plus.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M12 19h-7a2 2 0 0 1 -2 -2v-11a2 2 0 0 1 2 -2h4l3 3h7a2 2 0 0 1 2 2v3.5" /><path d="M16 19h6" /><path d="M19 16v6" />
+</svg>

app/views/icons/_slash.html.erb

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M17 5l-10 14" />
+</svg>

app/views/layouts/application.html.erb

@@ -18,7 +18,6 @@
       <link href="<%= canonical_url %>" rel="canonical">
     <% end %>
     <%= stylesheet_pack_tag 'application', media: 'all' %>
-    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
     <%= render 'shared/plausible' if !signed_in? && ENV['PLAUSIBLE_DOMAIN'] %>
   </head>
   <body>

app/views/layouts/form.html.erb

@@ -12,7 +12,6 @@
       <%= javascript_pack_tag 'form', defer: true %>
     <% end %>
     <%= stylesheet_pack_tag 'form', media: 'all' %>
-    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
   </head>
   <body>
     <%= yield %>

app/views/layouts/plain.html.erb

@@ -12,7 +12,6 @@
       <%= javascript_pack_tag 'application', defer: true %>
     <% end %>
     <%= stylesheet_pack_tag 'application', media: 'all' %>
-    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
   </head>
   <body>
     <% if flash.present? %><%= render 'shared/flash' %><% end %>

app/views/personalization_settings/_documents_copy_email_form.html.erb

@@ -13,17 +13,7 @@
           <%= ff.label :subject, t('subject'), class: 'label' %>
           <%= ff.text_field :subject, required: true, class: 'base-input', dir: 'auto' %>
         </div>
-        <div class="form-control">
-          <div class="flex items-center">
-            <%= ff.label :body, t('body'), class: 'label' %>
-            <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::DEFAULT_VALUES[AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY].call['body'].scan(/{.*?}/).join(', ') %>">
-              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
-            </span>
-          </div>
-          <autoresize-textarea>
-            <%= ff.text_area :body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
-          </autoresize-textarea>
-        </div>
+        <%= render 'personalization_settings/email_body_field', ff:, config: f.object %>
         <% if can?(:manage, :reply_to) || can?(:manage, :personalization_advanced) %>
           <div class="form-control">
             <%= ff.label :reply_to, t('reply_to'), class: 'label' %>

app/views/personalization_settings/_email_body_field.html.erb

@@ -0,0 +1,11 @@
+<div class="form-control">
+  <div class="flex items-center">
+    <%= ff.label :body, t('body'), class: 'label' %>
+    <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::DEFAULT_VALUES[local_assigns[:config].key].call['body'].scan(/{.*?}/).join(', ') %>">
+      <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+    </span>
+  </div>
+  <autoresize-textarea>
+    <%= ff.text_area :body, required: true, class: 'base-input w-full !rounded-2xl py-2', dir: 'auto' %>
+  </autoresize-textarea>
+</div>

app/views/personalization_settings/_signature_request_email_form.html.erb

@@ -13,17 +13,7 @@
           <%= ff.label :subject, t('subject'), class: 'label' %>
           <%= ff.text_field :subject, required: true, class: 'base-input', dir: 'auto' %>
         </div>
-        <div class="form-control">
-          <div class="flex items-center">
-            <%= ff.label :body, t('body'), class: 'label' %>
-            <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::DEFAULT_VALUES[AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY].call['body'].scan(/{.*?}/).join(', ') %>">
-              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
-            </span>
-          </div>
-          <autoresize-textarea>
-            <%= ff.text_area :body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
-          </autoresize-textarea>
-        </div>
+        <%= render 'personalization_settings/email_body_field', ff:, config: f.object %>
       <% end %>
       <div class="form-control pt-2">
         <%= f.button button_title(title: t('save'), disabled_with: t('saving')), class: 'base-button' %>

app/views/personalization_settings/_submitter_completed_email_form.html.erb

@@ -18,17 +18,7 @@
           </div>
           <%= ff.text_field :subject, required: true, class: 'base-input', dir: 'auto' %>
         </div>
-        <div class="form-control">
-          <div class="flex items-center">
-            <%= ff.label :body, t('body'), class: 'label' %>
-            <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::DEFAULT_VALUES[AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY].call['body'].scan(/{.*?}/).join(', ') %>">
-              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
-            </span>
-          </div>
-          <autoresize-textarea>
-            <%= ff.text_area :body, required: true, class: 'base-input w-full py-2', dir: 'auto' %>
-          </autoresize-textarea>
-        </div>
+        <%= render 'personalization_settings/email_body_field', ff:, config: f.object %>
         <div class="flex items-center justify-between pt-2.5 mx-1">
           <span>
             <%= t('attach_documents') %>

app/views/shared/_github.html.erb

@@ -1,5 +1,5 @@
 <a target="_blank" href="<%= Docuseal::GITHUB_URL %>" rel="noopener noreferrer nofollow" class="relative flex items-center rounded-full px-2 py-0.5 text-xs leading-4 mt-1 text-base-content border border-base-300 tooltip tooltip-bottom" data-tip="Give a star on GitHub">
-  <span class="flex items-center justify-between space-x-0.5 font-extrabold">
+  <span class="flex items-center justify-between space-x-0.5 font-medium">
     <%= svg_icon('start', class: 'h-3 w-3') %>
     <span>9k</span>
   </span>

app/views/shared/_posthog.html.erb

@@ -1,4 +0,0 @@
-<script>
-  !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures getActiveMatchingSurveys getSurveys".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);
-  posthog.init('<%= ENV.fetch('POSTHOG_TOKEN', nil) %>',{api_host:'https://app.posthog.com',autocapture: false,enable_recording_console_log: true,capture_pageview: false,session_recording:{maskAllInputs: false,maskInputOptions: {password: true}}})
-</script>

app/views/shared/_settings_nav.html.erb

@@ -1,7 +1,7 @@
 <div class="block w-full md:w-52 flex-none">
   <menu-active>
     <ul id="account_settings_menu" class="menu px-0">
-      <li class="menu-title py-0 !bg-transparent mb-3 -mt-5"><a href="<%= '/' %>" class="!bg-transparent !text-neutral font-medium">&larr; <%= t('back') %></a></li>
+      <li class="menu-title py-0 !bg-transparent mb-3 -mt-5"><a href="<%= '/' %>" class="!bg-transparent !text-neutral font-medium flex items-center space-x-0.5"><%= svg_icon('arrow_left', class: 'w-4 h-4 stroke-2') %><span><%= t('back') %></span></a></li>
       <li class="menu-title py-0 !bg-transparent">
         <span class="!bg-transparent"><%= t('settings') %></span>
       </li>

app/views/submissions/_detailed_form.html.erb

@@ -1,3 +1,4 @@
+<% has_phone_field = false %>
 <%= form_for '', url: template_submissions_path(template), html: { class: 'space-y-4', autocomplete: 'off' }, data: { turbo_frame: :_top } do |f| %>
   <% submitters = template.submitters.reject { |e| e['invite_by_uuid'].present? || e['optional_invite_by_uuid'].present? } %>
   <dynamic-list class="space-y-4">
@@ -11,6 +12,7 @@
           </div>
           <div class="grid <%= 'md:grid-cols-2' if submitters.size > 1 %> gap-4">
             <% submitters.each_with_index do |item, index| %>
+              <% prefillable_fields = local_assigns[:prefillable_fields].to_a.select { |f| f['submitter_uuid'] == item['uuid'] } %>
               <submitter-item class="form-control">
                 <% if submitters.size > 1 %>
                   <label class="label pt-0 pb-1">
@@ -18,30 +20,62 @@
                   </label>
                 <% end %>
                 <input type="hidden" name="submission[1][submitters][][uuid]" value="<%= item['uuid'] %>">
-                <submitters-autocomplete data-field="name">
-                  <linked-input data-target-id="<%= "detailed_name_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                    <%= tag.input type: 'text', name: 'submission[1][submitters][][name]', autocomplete: 'off', class: 'base-input !h-10 w-full', placeholder: t('name'), required: index.zero? || template.preferences['require_all_submitters'], value: item['email'].present? ? current_account.submitters.accessible_by(current_ability).where.not(name: nil).order(id: :desc).find_by(email: item['email'])&.name : ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.full_name : ''), dir: 'auto', id: "detailed_name_#{item['uuid']}" %>
-                  </linked-input>
-                </submitters-autocomplete>
-                <div class="grid <%= 'md:grid-cols-2 gap-1' if submitters.size == 1 %>">
+                <% if prefillable_fields.blank? %>
+                  <submitters-autocomplete data-field="name">
+                    <linked-input data-target-id="<%= "detailed_name_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
+                      <%= tag.input type: 'text', name: 'submission[1][submitters][][name]', autocomplete: 'off', class: 'base-input !h-10 w-full', placeholder: t('name'), required: index.zero? || template.preferences['require_all_submitters'], value: item['email'].present? ? current_account.submitters.accessible_by(current_ability).where.not(name: nil).order(id: :desc).find_by(email: item['email'])&.name : ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.full_name : ''), dir: 'auto', id: "detailed_name_#{item['uuid']}" %>
+                    </linked-input>
+                  </submitters-autocomplete>
+                  <div class="grid <%= 'md:grid-cols-2 gap-1' if submitters.size == 1 %>">
+                    <submitters-autocomplete data-field="email">
+                      <linked-input data-target-id="<%= "detailed_email_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
+                        <input type="email" multiple name="submission[1][submitters][][email]" autocomplete="off" class="base-input !h-10 mt-1.5 w-full" placeholder="<%= "#{t('email')} (#{t('optional')})" %>" value="<%= item['email'].presence || ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.email : '') %>" id="detailed_email_<%= item['uuid'] %>">
+                      </linked-input>
+                    </submitters-autocomplete>
+                    <% has_phone_field = true %>
+                    <submitters-autocomplete data-field="phone">
+                      <linked-input data-target-id="<%= "detailed_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
+                        <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full', placeholder: local_assigns[:require_phone_2fa] == true ? t(:phone) : "#{t('phone')} (#{t('optional')})", id: "detailed_phone_#{item['uuid']}", required: local_assigns[:require_phone_2fa] == true %>
+                      </linked-input>
+                    </submitters-autocomplete>
+                  </div>
+                <% end %>
+                <% if prefillable_fields.present? %>
                   <submitters-autocomplete data-field="email">
                     <linked-input data-target-id="<%= "detailed_email_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                      <input type="email" multiple name="submission[1][submitters][][email]" autocomplete="off" class="base-input !h-10 mt-1.5 w-full" placeholder="<%= "#{t('email')} (#{t('optional')})" %>" value="<%= item['email'].presence || ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.email : '') %>" id="detailed_email_<%= item['uuid'] %>">
+                      <input type="email" multiple name="submission[1][submitters][][email]" autocomplete="off" class="base-input !h-10 w-full" placeholder="<%= t('email') %>" value="<%= item['email'].presence || ((params[:selfsign] && index.zero?) || item['is_requester'] ? current_user.email : '') %>" id="detailed_email_<%= item['uuid'] %>" required>
                     </linked-input>
                   </submitters-autocomplete>
-                  <submitters-autocomplete data-field="phone">
-                    <linked-input data-target-id="<%= "detailed_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
-                      <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full', placeholder: local_assigns[:require_phone_2fa] == true ? t(:phone) : "#{t('phone')} (#{t('optional')})", id: "detailed_phone_#{item['uuid']}", required: local_assigns[:require_phone_2fa] == true %>
-                    </linked-input>
-                  </submitters-autocomplete>
-                </div>
+                  <% if local_assigns[:require_phone_2fa] == true || prefillable_fields.any? { |f| f['type'] == 'phone' } %>
+                    <% has_phone_field = true %>
+                    <submitters-autocomplete data-field="phone">
+                      <linked-input data-target-id="<%= "detailed_phone_#{item['linked_to_uuid']}" if item['linked_to_uuid'].present? %>">
+                        <%= tag.input type: 'tel', pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", name: 'submission[1][submitters][][phone]', autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full', placeholder: t(:phone), id: "detailed_phone_#{item['uuid']}", required: true %>
+                      </linked-input>
+                    </submitters-autocomplete>
+                  <% end %>
+                  <% prefillable_fields.each do |field| %>
+                    <% if field['type'] == 'checkbox' %>
+                      <label for="detailed_field_<%= field['uuid'] %>" class="flex items-center justify-between mt-1.5 pl-3 pr-2.5 h-10 border border-base-content/20 rounded-full cursor-pointer transition-colors bg-white">
+                        <span class="text-base select-none px-1"> <%= field['title'].presence || field['name'] %></span>
+                        <%= tag.input type: 'checkbox', name: "submission[1][submitters][][values][#{field['uuid']}]", id: "detailed_field_#{field['uuid']}", class: 'toggle toggle-sm', style: 'width: 38px; --handleoffset: 17px', checked: field['default_value'].present? && (field['default_value'] == true || field['default_value'].to_s == '1' || field['default_value'].to_s.downcase == 'true'), required: field['required'], value: 'true' %>
+                      </label>
+                    <% elsif field['type'] == 'select' || field['type'] == 'radio' %>
+                      <%= select_tag "submission[1][submitters][][values][#{field['uuid']}]", options_for_select(field['options'].pluck('value'), field['default_value']), prompt: t(:select), id: "detailed_field_#{field['uuid']}", class: 'select select-sm base-input !h-10 mt-1.5 ', required: field['required'] %>
+                    <% elsif field['type'] == 'date' %>
+                      <%= tag.input type: field['type'], name: "submission[1][submitters][][values][#{field['uuid']}]", autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full border rounded p-3', placeholder: (field['required'] ? field['title'].presence || field['name'] : "#{field['title'].presence || field['name']} (#{t('optional')})"), value: field['default_value'], id: "detailed_field_#{field['uuid']}", required: field['required'] %>
+                    <% elsif field['type'] != 'phone' %>
+                      <%= tag.input type: field['type'], name: "submission[1][submitters][][values][#{field['uuid']}]", autocomplete: 'off', class: 'base-input !h-10 mt-1.5 w-full border rounded p-3', placeholder: (field['required'] ? field['title'].presence || field['name'] : "#{field['title'].presence || field['name']} (#{t('optional')})"), value: field['default_value'], id: "detailed_field_#{field['uuid']}", required: field['required'] %>
+                    <% end %>
+                  <% end %>
+                <% end %>
               </submitter-item>
             <% end %>
           </div>
         </div>
       </div>
     </div>
-    <% if params[:selfsign].blank? %>
+    <% if params[:selfsign].blank? && local_assigns[:prefillable_fields].blank? %>
       <a href="#" class="btn btn-primary btn-sm w-full flex items-center justify-center" data-action="click:dynamic-list#addItem">
         <%= svg_icon('user_plus', class: 'w-4 h-4 stroke-2') %>
         <span><%= t('add_new') %></span>
@@ -51,7 +85,9 @@
   <div>
     <%= render('submitters_order', f:, template:) if Accounts.can_send_emails?(current_account) %>
     <%= render 'send_email', f:, template: %>
-    <%= render 'send_sms', f: %>
+    <% if has_phone_field %>
+      <%= render 'send_sms', f: %>
+    <% end %>
   </div>
   <div class="form-control">
     <%= f.button button_title(title: t('add_recipients')), class: 'base-button' %>

app/views/submissions/_send_email.html.erb

@@ -4,7 +4,7 @@
   <% can_send_emails = Accounts.can_send_emails?(current_account) %>
   <div class="flex justify-between items-center">
     <%= f.label :send_email, for: uuid = SecureRandom.uuid, class: 'flex items-center cursor-pointer' do %>
-      <%= f.check_box :send_email, id: uuid, class: 'base-checkbox', disabled: !can_send_emails || local_assigns[:disable_email], checked: can_send_emails && !local_assigns.key?(:resend_email) && !local_assigns[:disable_email] %>
+      <%= f.check_box :send_email, id: uuid, class: 'base-checkbox', disabled: !can_send_emails || local_assigns[:disable_email], checked: can_send_emails && !local_assigns.key?(:resend_email) && !local_assigns[:disable_email] && template&.preferences&.dig('request_email_enabled') != false %>
       <span class="label"><%= local_assigns[:resend_email] ? t('re_send_email') : t('send_email') %></span>
     <% end %>
     <div>

app/views/submissions/_submitters_order.html.erb

@@ -1,4 +1,4 @@
-<% if template.preferences['submitters_order'] == 'preserved' %>
+<% if template.preferences['submitters_order'] == 'preserved' || template.submitters.any? { |s| s['order'] } %>
   <%= f.hidden_field :preserve_order, value: '1' %>
 <% elsif template.submitters.size > 1 %>
   <div class="form-control">

app/views/submissions/_value.html.erb

@@ -16,15 +16,18 @@
           <div class="truncate uppercase">
             ID: <%= attachment.uuid %>
           </div>
+          <% if local_assigns[:with_signature_id_reason] != false %>
+            <div>
+              <% reason_value = submitter.values[field.dig('preferences', 'reason_field_uuid')].presence %>
+              <% if reason_value %><%= t('reason') %>: <% end %><%= reason_value || t('digitally_signed_by') %> <%= submitter.name %>
+              <% if submitter.email %>
+                &lt;<%= submitter.email %>&gt;
+              <% end %>
+            </div>
+          <% end %>
           <div>
-            <% reason_value = submitter.values[field.dig('preferences', 'reason_field_uuid')].presence %>
-            <% if reason_value %><%= t('reason') %>: <% end %><%= reason_value || t('digitally_signed_by') %> <%= submitter.name %>
-            <% if submitter.email %>
-              &lt;<%= submitter.email %>&gt;
-            <% end %>
-          </div>
-          <div>
-            <%= l(attachment.created_at.in_time_zone(local_assigns[:timezone]), format: :long, locale: local_assigns[:locale]) %> <%= TimeUtils.timezone_abbr(local_assigns[:timezone], attachment.created_at) %>
+            <% timezone = local_assigns[:with_submitter_timezone] ? (submitter.timezone || local_assigns[:timezone]) : local_assigns[:timezone] %>
+            <%= l(attachment.created_at.in_time_zone(timezone), format: :long, locale: local_assigns[:locale]) %> <%= TimeUtils.timezone_abbr(timezone, attachment.created_at) %>
           </div>
         </div>
       <% end %>

app/views/submissions/new.html.erb

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

app/views/submissions/show.html.erb

@@ -2,7 +2,11 @@
   <%= render 'submissions/preview_tags' %>
 <% end %>
 <% font_scale = 1040.0 / PdfUtils::US_LETTER_W %>
-<% 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 }] } %>
+<% configs = AccountConfig.where(account_id: @submission.account_id, key: [AccountConfig::COMBINE_PDF_RESULT_KEY, AccountConfig::WITH_SIGNATURE_ID, AccountConfig::WITH_SUBMITTER_TIMEZONE_KEY, AccountConfig::WITH_SIGNATURE_ID_REASON_KEY]) %>
+<% with_signature_id = configs.find { |e| e.key == AccountConfig::WITH_SIGNATURE_ID }&.value == true %>
+<% is_combined_enabled = configs.find { |e| e.key == AccountConfig::COMBINE_PDF_RESULT_KEY }&.value == true %>
+<% with_submitter_timezone = configs.find { |e| e.key == AccountConfig::WITH_SUBMITTER_TIMEZONE_KEY }&.value == true %>
+<% with_signature_id_reason = configs.find { |e| e.key == AccountConfig::WITH_SIGNATURE_ID_REASON_KEY }&.value != false %>
 <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 && @submission.template ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
@@ -108,17 +112,18 @@
                   <% value = values[field['uuid']] %>
                   <% value ||= field['default_value'] if field['type'] == 'heading' %>
                   <% next if value.blank? %>
+                  <% submitter = submitters_index[field['submitter_uuid']] %>
                   <% if (mask = field.dig('preferences', 'mask').presence) && signed_in? && can?(:read, @submission) %>
                     <span class="group">
                       <span class="hidden group-hover:inline">
-                        <%= render 'submissions/value', font_scale:, area:, field:, attachments_index:, value:, locale: @submission.account.locale, timezone: @submission.account.timezone, submitter: submitters_index[field['submitter_uuid']], with_signature_id: %>
+                        <%= render 'submissions/value', font_scale:, area:, field:, attachments_index:, value:, locale: @submission.account.locale, timezone: @submission.account.timezone, submitter:, with_signature_id: %>
                       </span>
                       <span class="group-hover:hidden">
-                        <%= render 'submissions/value', font_scale:, area:, field:, attachments_index:, value: Array.wrap(value).map { |e| TextUtils.mask_value(e, mask) }.join(', '), locale: @submission.account.locale, timezone: @submission.account.timezone, submitter: submitters_index[field['submitter_uuid']], with_signature_id: %>
+                        <%= render 'submissions/value', font_scale:, area:, field:, attachments_index:, value: Array.wrap(value).map { |e| TextUtils.mask_value(e, mask) }.join(', '), locale: @submission.account.locale, timezone: @submission.account.timezone, submitter:, with_signature_id: %>
                       </span>
                     </span>
                   <% else %>
-                    <%= render 'submissions/value', font_scale:, area:, field:, attachments_index:, value: mask.present? ? Array.wrap(value).map { |e| TextUtils.mask_value(e, mask) }.join(', ') : value, locale: @submission.account.locale, timezone: @submission.account.timezone, submitter: submitters_index[field['submitter_uuid']], with_signature_id: %>
+                    <%= render 'submissions/value', font_scale:, area:, field:, attachments_index:, value: mask.present? ? Array.wrap(value).map { |e| TextUtils.mask_value(e, mask) }.join(', ') : value, locale: @submission.account.locale, timezone: @submission.account.timezone, submitter:, with_signature_id:, with_submitter_timezone:, with_signature_id_reason: %>
                   <% end %>
                 <% end %>
               </div>

app/views/submissions_archived/index.html.erb

@@ -1,14 +1,14 @@
 <% filter_params = params.permit(Submissions::Filter::ALLOWED_PARAMS).compact_blank %>
 <div>
-  <%= link_to root_path do %>
-    &larr;
-    <span><%= t('back_to_active') %></span>
+  <%= link_to root_path, class: 'flex items-center' do %>
+    <%= svg_icon('chevron_left', class: 'w-5 h-5') %>
+    <span style="margin-left: 3px"><%= t('back_to_active') %></span>
   <% end %>
 </div>
 <div class="flex flex-col md:flex-row md:items-center mb-4 gap-3">
-  <div class="flex w-full justify-between">
+  <div class="flex w-full justify-between items-center">
     <div>
-      <h1 class="text-4xl font-bold md:block <%= 'hidden' if params[:q].present? %>"><%= t('submissions') %> <span class="badge badge-outline badge-lg align-middle"><%= t('archived') %></span></h1>
+      <h1 class="text-2xl md:text-3xl font-bold md:block <%= 'hidden' if params[:q].present? %>"><%= t('submissions') %> <span class="badge badge-outline badge-lg align-middle"><%= t('archived') %></span></h1>
     </div>
     <div>
       <% if params[:q].present? || @pagy.pages > 1 || filter_params.present? %>

app/views/submissions_filters/_applied_filters.html.erb

@@ -10,6 +10,17 @@
     <% end %>
   </div>
 <% end %>
+<% if params[:folder].present? %>
+  <div class="tooltip tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-34 border-neutral-700" data-tip="<%= t('folder') %>">
+    <%= link_to submissions_filter_path('folder', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 w-full pr-1 md:max-w-[140px]' do %>
+      <%= svg_icon('folder', class: 'w-5 h-5 shrink-0') %>
+      <span class="font-normal truncate"><%= params[:folder] %></span>
+    <% end %>
+    <%= link_to url_for(params.to_unsafe_h.except(:folder)), class: 'rounded-lg ml-1 hover:bg-base-content hover:text-white' do %>
+      <%= svg_icon('x', class: 'w-5 h-5') %>
+    <% end %>
+  </div>
+<% end %>
 <% if params[:author].present? %>
   <div class="tooltip tooltip-bottom flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-34 border-neutral-700" data-tip="<%= t('author') %>">
     <%= link_to submissions_filter_path('author', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 w-full pr-1 md:max-w-[140px]' do %>

app/views/submit_form/show.html.erb

@@ -84,7 +84,7 @@
                   <% next if field['conditions'].present? && values[field['uuid']].blank? && field['submitter_uuid'] != @submitter.uuid %>
                   <% next if field['conditions'].present? && field['submitter_uuid'] == @submitter.uuid %>
                   <% next if field.dig('preferences', 'formula').present? && field['submitter_uuid'] == @submitter.uuid %>
-                  <%= render 'submissions/value', font_scale:, area:, field:, attachments_index: @attachments_index, value: field.dig('preferences', 'mask').present? ? TextUtils.mask_value(value, field.dig('preferences', 'mask')) : value, locale: @submitter.account.locale, timezone: @submitter.account.timezone, submitter: submitters_index[field['submitter_uuid']], with_signature_id: @form_configs[:with_signature_id] %>
+                  <%= render 'submissions/value', font_scale:, area:, field:, attachments_index: @attachments_index, value: field.dig('preferences', 'mask').present? ? TextUtils.mask_value(value, field.dig('preferences', 'mask')) : value, locale: @submitter.account.locale, timezone: @submitter.account.timezone, submitter: submitters_index[field['submitter_uuid']], with_signature_id: @form_configs[:with_signature_id], with_submitter_timezone: @form_configs[:with_submitter_timezone], with_signature_id_reason: @form_configs[:with_signature_id_reason] %>
                 <% end %>
               </div>
             </page-container>

app/views/submit_form_draw_signature/show.html.erb

@@ -12,7 +12,6 @@
       <%= javascript_pack_tag 'draw', defer: true %>
     <% end %>
     <%= stylesheet_pack_tag 'form', media: 'all' %>
-    <%= render 'shared/posthog' if ENV['POSTHOG_TOKEN'] %>
   </head>
   <body>
     <% field = (@submitter.submission.template_fields || @submitter.template.fields).find { |f| f['type'] == 'signature' && f['uuid'].starts_with?(params[:f]) } %>

app/views/submitter_mailer/invitation_email.html.erb

@@ -1,14 +1,13 @@
-<% if @email_config || @body.present? %>
-  <% body = (@body.presence || @email_config.value['body']).to_s %>
-  <%= render 'custom_content', content: body, submitter: @submitter %>
-  <% if !body.match?(ReplaceEmailVariables::SUBMITTER_LINK) && !body.match?(ReplaceEmailVariables::SUBMITTER_ID) && !body.match?(ReplaceEmailVariables::SUBMISSION_LINK) && !body.match?(ReplaceEmailVariables::TEMPLATE_ID) && !@submitter.submission.source.in?(%w[api embed]) %>
+<% if @body.present? %>
+  <%= render 'custom_content', content: @body, submitter: @submitter %>
+  <% if !@body.match?(ReplaceEmailVariables::SUBMITTER_LINK) && !@body.match?(ReplaceEmailVariables::SUBMITTER_ID) && !@body.match?(ReplaceEmailVariables::SUBMISSION_LINK) && !@body.match?(ReplaceEmailVariables::TEMPLATE_ID) && !@submitter.submission.source.in?(%w[api embed]) %>
     <p><%= link_to nil, submit_form_url(slug: @submitter.slug, t: SubmissionEvents.build_tracking_param(@submitter, 'click_email')) %></p>
   <% end %>
 <% else %>
   <p><%= t('hi_there') %>,</p>
   <p><%= I18n.t(@submitter.with_signature_fields? ? :you_have_been_invited_to_sign_the_name : :you_have_been_invited_to_submit_the_name_form, name: @submitter.submission.name || @submitter.submission.template.name) %></p>
   <p><%= link_to I18n.t(@submitter.with_signature_fields? ? :review_and_sign : :review_and_submit), submit_form_url(slug: @submitter.slug, t: SubmissionEvents.build_tracking_param(@submitter, 'click_email'), host: ENV.fetch('EMAIL_HOST', Docuseal.default_url_options[:host])) %></p>
-  <p><%= t('please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this') %></p>
+  <p><%= t('please_contact_us_by_replying_to_this_email_if_you_have_any_questions') %></p>
   <p>
   <%= t('thanks') %>,<br><%= @current_account.name %>
   </p>

app/views/template_folders/_folder.html.erb

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

app/views/template_folders/show.html.erb

@@ -1,24 +1,27 @@
 <div>
-  <%= link_to root_path do %>
-    &larr;
-    <span><%= t('home') %></span>
+  <%= link_to @template_folder.parent_folder ? folder_path(@template_folder.parent_folder) : root_path, class: 'flex items-center' do %>
+    <%= svg_icon('chevron_left', class: 'w-5 h-5') %>
+    <span style="margin-left: 3px"><%= @template_folder.parent_folder&.name || t('home') %></span>
   <% end %>
 </div>
 <dashboard-dropzone>
   <div class="relative flex justify-between items-center w-full mb-4">
     <%= form_for '', url: '', id: form_id = SecureRandom.uuid, method: :post, class: 'hidden', data: { target: 'dashboard-dropzone.form' }, html: { enctype: 'multipart/form-data' } do %>
       <input name="form_id" value="<%= form_id %>">
-      <input name="folder_name" value="<%= @template_folder.name %>">
+      <input name="folder_name" value="<%= @template_folder.full_name %>">
       <button type="submit"></button>
       <input id="dashboard_dropzone_input" name="files[]" type="file" multiple>
     <% end %>
     <%= render 'templates/dashboard_dropzone', style: 'height: 137px' %>
+    <% unless @template_folder.parent_folder %>
+      <%= render 'templates/dashboard_folder_dropzone', style: 'height: 137px' %>
+    <% end %>
     <h1 class="text-2xl truncate md:text-3xl font-bold flex items-center flex-grow min-w-0 space-x-2 md:flex <%= 'hidden' if params[:q].present? %>">
       <%= svg_icon('folder', class: 'w-9 h-9 flex-shrink-0') %>
       <span class="peer truncate">
         <%= @template_folder.name %>
       </span>
-      <% if can?(:update, @template_folder) && @template_folder.name != TemplateFolder::DEFAULT_NAME %>
+      <% if can?(:update, @template_folder) && @template_folder.full_name != TemplateFolder::DEFAULT_NAME %>
         <span class="opacity-0 hover:opacity-100 peer-hover:opacity-100">
           <a href="<%= edit_folder_path(@template_folder) %>" data-turbo-frame="modal">
             <%= svg_icon('pencil', class: 'w-7 h-7') %>
@@ -27,18 +30,23 @@
       <% end %>
     </h1>
     <div class="flex space-x-2">
-      <% if params[:q].present? || @pagy.pages > 1 %>
+      <% if params[:q].present? || @pagy.pages > 1 || @template_folders.present? %>
         <%= render 'shared/search_input' %>
       <% end %>
       <% if can?(:create, ::Template) %>
-        <%= render 'templates/upload_button', folder_name: @template_folder.name %>
-        <%= link_to new_template_path(folder_name: @template_folder.name), class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
+        <%= render 'templates/upload_button', folder_name: @template_folder.full_name %>
+        <%= link_to new_template_path(folder_name: @template_folder.full_name), class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
           <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
           <span class="hidden md:block"><%= t('create') %></span>
         <% end %>
       <% end %>
     </div>
   </div>
+  <% if @template_folders.present? %>
+    <div class="grid gap-4 md:grid-cols-3 <%= 'mb-6' if @templates.present? %>">
+      <%= render partial: 'template_folders/folder', collection: @template_folders, as: :folder %>
+    </div>
+  <% end %>
   <% if @pagy.count.nil? || @pagy.count > 0 %>
     <div class="grid gap-4 md:grid-cols-3">
       <%= render partial: 'templates/template', collection: @templates %>
@@ -48,12 +56,21 @@
         <%= render 'shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000 && !can?(:manage, :countless), selected_order: %>
       <% end %>
     <% end %>
-    <%= render 'shared/pagination', pagy: @pagy, items_name: 'templates', right_additional_html: templates_order_select_html %>
+    <%= render 'shared/pagination', pagy: @pagy, items_name: @templates.present? ? 'templates' : 'template_folders', right_additional_html: templates_order_select_html %>
   <% elsif params[:q].present? %>
     <div class="text-center">
       <div class="mt-16 text-3xl font-semibold">
         <%= t('templates_not_found') %>
       </div>
     </div>
+    <% if @related_submissions.present? %>
+      <h1 class="text-2xl md:text-3xl sm:text-4xl font-bold mt-8 md:mt-4">
+        <%= t('submissions') %>
+      </h1>
+      <div class="space-y-4 mt-4">
+        <%= render partial: 'templates/submission', collection: @related_submissions, locals: { with_template: true } %>
+      </div>
+      <%= render 'shared/pagination', pagy: @related_submissions_pagy, items_name: 'submissions', next_page_path: submissions_path(q: params[:q], folder: @template_folder.full_name) %>
+    <% end %>
   <% end %>
 </dashboard-dropzone>

app/views/templates/_dashboard_folder_dropzone.html.erb

@@ -0,0 +1,20 @@
+<div class="absolute bottom-0 w-full cursor-pointer rounded-xl bg-base-100 border-2 border-base-300 border-dashed hidden z-50" data-target="dashboard-dropzone.folderDropzone" style="<%= local_assigns[:style] %>">
+  <div class="absolute top-0 right-0 left-0 bottom-0 flex justify-center p-2 items-center pointer-events-none">
+    <div class="flex flex-col items-center text-center" data-target="dashboard-dropzone.toggleLoading">
+      <span class="flex flex-col items-center">
+        <span>
+          <%= svg_icon('folder_plus', class: 'w-9 h-9') %>
+        </span>
+        <div class="font-medium mb-1">
+          <%= t('create_a_new_folder') %>
+        </div>
+      </span>
+      <span class="flex flex-col items-center hidden" data-target="dashboard-dropzone.fileDropzoneLoading">
+        <%= svg_icon('loader', class: 'w-9 h-9 animate-spin') %>
+        <div class="font-medium mb-1">
+          <%= t('loading') %>...
+        </div>
+      </span>
+    </div>
+  </div>
+</div>

app/views/templates/_template.html.erb

@@ -1,6 +1,6 @@
 <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 before:border-2 before:border-base-300 before:border-dashed before:absolute before:left-0 before:right-0 before:top-0 before:bottom-0 before:hidden before:rounded-2xl" data-targets="dashboard-dropzone.templateCards">
-    <div class="text-xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+    <div class="text-xl font-semibold" style="line-height: 1.6rem; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
       <% if template.template_accesses.present? %>
         <%= svg_icon('lock', class: 'w-6 h-6 inline -translate-y-[4px]') %>
       <% end %>
@@ -22,7 +22,7 @@
         <% if template.archived_at? %>
           <span class="flex items-center space-x-1 w-1/2">
             <%= svg_icon('folder', class: 'w-4 h-4 flex-shrink-0') %>
-            <span class="truncate"><%= template.folder.name %></span>
+            <span class="truncate"><%= template.folder.full_name %></span>
           </span>
         <% end %>
       </p>

app/views/templates/_title.html.erb

@@ -16,12 +16,12 @@
             <a href="<%= folder_path(@template.folder) %>" class="flex items-center space-x-1 mt-1 peer">
               <%= svg_icon('folder', class: 'w-5 h-5 flex-shrink-0') %>
               <span class="text-sm">
-                <%= @template.folder.name %>
+                <%= @template.folder.full_name %>
               </span>
             </a>
             <% if can?(:update, template) %>
               <span class="pl-1 tooltip tooltip-right md:opacity-0 hover:opacity-100 peer-hover:opacity-100" data-tip="<%= t('move') %>">
-                <a href="<%= edit_template_folder_path(template.id) %>" data-turbo-frame="modal">
+                <a href="<%= edit_template_folder_path(template.id, subfolder: @template.folder.parent_folder.present?) %>" data-turbo-frame="modal">
                   <%= svg_icon('pencil_share', class: 'w-5 h-5') %>
                 </a>
               </span>

app/views/templates/new.html.erb

@@ -16,7 +16,7 @@
         <%= svg_icon('folder', class: 'w-6 h-6') %>
       </a>
       <folder-autocomplete class="flex justify-between w-full">
-        <input id="folder_name" placeholder="<%= t('folder_name') %>" type="text" class="w-full outline-none border-transparent focus:border-transparent focus:ring-0 bg-base-100 px-1 peer" name="folder_name" value="<%= params[:folder_name].presence || @base_template&.folder&.name || TemplateFolder::DEFAULT_NAME %>" onblur="window.folder_name.value = window.folder_name.value || 'Default'" autocomplete="off">
+        <input id="folder_name" placeholder="<%= t('folder_name') %>" type="text" class="w-full outline-none border-transparent focus:border-transparent focus:ring-0 bg-base-100 px-1 peer" name="folder_name" value="<%= params[:folder_name].presence || @base_template&.folder&.full_name || TemplateFolder::DEFAULT_NAME %>" onblur="window.folder_name.value = window.folder_name.value || 'Default'" autocomplete="off">
         <a href="#" onclick="[event.preventDefault(), window.folder_name.value = '', window.folder_name.focus()]" class="shrink-0 link peer-focus:hidden mr-1.5">
           <%= t('change_folder') %>
         </a>

app/views/templates_archived/index.html.erb

@@ -1,12 +1,12 @@
 <div>
-  <%= link_to root_path do %>
-    &larr;
-    <span><%= t('back_to_active') %></span>
+  <%= link_to root_path, class: 'flex items-center' do %>
+    <%= svg_icon('chevron_left', class: 'w-5 h-5') %>
+    <span style="margin-left: 3px"><%= t('back_to_active') %></span>
   <% 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? %>"><%= t('document_templates_html') %> <span class="badge badge-outline badge-lg align-middle"><%= t('archived') %></span></h1>
+    <h1 class="text-2xl md:text-3xl font-bold md:block <%= 'hidden' if params[:q].present? %>"><%= t('document_templates_html') %> <span class="badge badge-outline badge-lg align-middle"><%= t('archived') %></span></h1>
   </div>
   <% if params[:q].present? || @pagy.pages > 1 %>
     <%= render 'shared/search_input', placeholder: "#{t('search')}..." %>
@@ -22,5 +22,14 @@
       <%= t('templates_not_found') %>
     </div>
   </div>
+  <% if @related_submissions.present? %>
+    <h1 class="text-2xl md:text-3xl sm:text-4xl font-bold mt-8 md:mt-4">
+      <%= t('submissions') %>
+    </h1>
+    <div class="space-y-4 mt-4">
+      <%= render partial: 'templates/submission', collection: @related_submissions, locals: { with_template: true } %>
+    </div>
+    <%= render 'shared/pagination', pagy: @related_submissions_pagy, items_name: 'submissions', next_page_path: submissions_archived_index_path(q: params[:q]) %>
+  <% end %>
 <% end %>
 <%= render 'shared/pagination', pagy: @pagy, items_name: 'templates' %>

app/views/templates_archived_submissions/index.html.erb

@@ -1,15 +1,15 @@
 <% filter_params = params.permit(Submissions::Filter::ALLOWED_PARAMS).compact_blank %>
 <% with_filters = @pagy.pages > 1 || params[:q].present? || filter_params.present? %>
 <%= render 'templates/title', template: @template %>
-<div>
-  <%= link_to template_path(@template) do %>
-    &larr;
-    <span><%= t('back_to_active') %></span>
-  <% end %>
-</div>
 <div class="flex flex-col md:flex-row md:items-center mb-6 gap-3">
-  <div class="flex w-full justify-between md:items-end items-center">
+  <div class="flex w-full justify-between md:items-end items-end">
     <div>
+      <div>
+        <%= link_to template_path(@template), class: 'flex items-center' do %>
+          <%= svg_icon('chevron_left', class: 'w-5 h-5') %>
+          <span style="margin-left: 3px"><%= t('back_to_active') %></span>
+        <% end %>
+      </div>
       <h1 class="text-3xl font-bold md:block"><%= t('submissions') %> <span class="badge badge-outline badge-lg align-middle"><%= t('archived') %></span></h1>
     </div>
     <div class="flex space-x-2 justify-end">

app/views/templates_dashboard/index.html.erb

@@ -11,6 +11,7 @@
     <% unless show_dropzone %>
       <%= render 'templates/dashboard_dropzone', style: 'height: 114px' %>
     <% end %>
+    <%= render 'templates/dashboard_folder_dropzone', style: 'height: 114px' %>
     <div class="flex items-center flex-grow min-w-0">
       <% if has_archived || @pagy.count.nil? || @pagy.count > 0 || @template_folders.present? %>
         <div class="mr-2">

app/views/templates_folders/edit.html.erb

@@ -1,7 +1,35 @@
+<% with_subfolder = @template.folder.name != TemplateFolder::DEFAULT_NAME && params[:subfolder] != 'false' %>
 <%= render 'shared/turbo_modal', title: t('move_into_folder') do %>
-  <%= form_for '', url: template_folder_path(@template), method: :put, data: { turbo_frame: :_top }, html: { autocomplete: :off } do |f| %>
-    <div class="form-control my-6">
-      <folder-autocomplete class="block" data-submit-on-select="true">
+  <% if with_subfolder %>
+    <%= form_for '', url: template_folder_path(@template), method: :put, data: { turbo_frame: :_top }, html: { id: 'subfolder_form', autocomplete: :off } do |f| %>
+      <%= f.hidden_field :parent_name, value: @template.folder.parent_folder&.name || @template.folder.name %>
+      <toggle-visible data-element-ids="<%= %w[folder_form subfolder_form].to_json %>" class="block relative" data-focus-id="name">
+        <div class="flex items-center justify-between mb-2.5">
+          <label for="is_root_folder" class="flex items-center tooltip tooltip-right pr-2 group" data-tip="<%= t('change_parent_folder') %>">
+            <%= check_box_tag :is_root_folder, 'folder_form', data: { action: 'change:toggle-visible#trigger' }, class: 'hidden' %>
+            <span class="flex items-center mt-1">
+              <%= svg_icon('folder', class: 'w-5 h-5 flex-shrink-0 group-hover:hidden mr-1') %>
+              <%= svg_icon('folder_share', class: 'w-5 h-5 flex-shrink-0 hidden group-hover:inline mr-1') %>
+              <span class="text-md">
+                <%= @template.folder.parent_folder&.name || @template.folder.name %>
+              </span>
+            </span>
+          </label>
+        </div>
+      </toggle-visible>
+      <div class="form-control mb-6">
+        <folder-autocomplete class="block" data-submit-on-select="true" data-parent-name="<%= @template.folder.parent_folder&.name || @template.folder.name %>" data-enabled="<%= params[:autocomplete] != 'false' %>">
+          <%= f.text_field :name, required: true, placeholder: "#{t('new_subfolder_name')}...", class: 'base-input w-full', autofocus: true, id: 'subfolder_name' %>
+        </folder-autocomplete>
+      </div>
+      <div class="form-control">
+        <%= f.button button_title(title: t('move'), disabled_with: t('moving')), class: 'base-button' %>
+      </div>
+    <% end %>
+  <% end %>
+  <%= form_for '', url: template_folder_path(@template), method: :put, data: { turbo_frame: :_top }, html: { id: 'folder_form', autocomplete: :off, class: "mt-6 #{'hidden' if with_subfolder}" } do |f| %>
+    <div class="form-control mb-6">
+      <folder-autocomplete class="block" data-submit-on-select="true" data-enabled="<%= params[:autocomplete] != 'false' %>">
         <%= f.text_field :name, required: true, placeholder: "#{t('new_folder_name')}...", class: 'base-input w-full', autofocus: true %>
       </folder-autocomplete>
     </div>

app/views/templates_preferences/_recipients.html.erb

@@ -1,4 +1,5 @@
 <% close_on_submit = local_assigns.fetch(:close_on_submit, true) %>
+<% is_order_set = template.submitters.any? { |s| s['order'] } %>
 <%= form_for template, url: template_recipients_path(template), method: :post, html: { autocomplete: 'off', class: 'mt-1', id: :submitters_form }, data: { close_on_submit: } do |f| %>
   <% unless close_on_submit %>
     <toggle-on-submit data-element-id="form_saved_alert"></toggle-on-submit>
@@ -6,11 +7,24 @@
   <div class="space-y-3 divide-y">
     <% template.submitters.each_with_index do |submitter, index| %>
       <div class="<%= 'pt-3' if index.positive? %>">
-        <%= f.fields_for :submitters, item = Struct.new(:name, :uuid, :is_requester, :email, :invite_by_uuid, :optional_invite_by_uuid, :linked_to_uuid, :option).new(*submitter.values_at('name', 'uuid', 'is_requester', 'email', 'invite_by_uuid', 'optional_invite_by_uuid', 'linked_to_uuid')), index: do |ff| %>
+        <%= f.fields_for :submitters, item = Struct.new(:name, :uuid, :is_requester, :email, :invite_by_uuid, :optional_invite_by_uuid, :linked_to_uuid, :order, :option).new(*submitter.values_at('name', 'uuid', 'is_requester', 'email', 'invite_by_uuid', 'optional_invite_by_uuid', 'linked_to_uuid', 'order')), index: do |ff| %>
           <% item.option = item.is_requester.present? ? 'is_requester' : (item.email.present? ? 'email' : (item.linked_to_uuid.present? ? "linked_to_#{item.linked_to_uuid}" : (item.invite_by_uuid.present? ? "invite_by_#{item.invite_by_uuid}" : (item.optional_invite_by_uuid.present? ? "optional_invite_by_#{item.optional_invite_by_uuid}" : '')))) %>
           <%= ff.hidden_field :uuid %>
           <div class="form-control">
-            <%= ff.text_field :name, class: 'w-full outline-none border-transparent focus:border-transparent focus:ring-0 bg-base-100 px-1 peer mb-2', autocomplete: 'off', placeholder: "#{index + 1}#{(index + 1).ordinal} Party", required: true %>
+            <div class="flex justify-between">
+              <%= ff.text_field :name, class: 'w-full outline-none border-transparent focus:border-transparent focus:ring-0 bg-base-100 px-1 peer mb-2', autocomplete: 'off', placeholder: "#{index + 1}#{(index + 1).ordinal} Party", required: true %>
+              <% if template.submitters.size > 2 %>
+                <div id="order_<%= submitter['uuid'] %>" class="mr-0.5">
+                  <% if is_order_set %>
+                    <%= ff.select :order, options_for_select(template.submitters.map.with_index { |_, i| [(i + 1).ordinalize, i] }, submitter['order'].presence || index), {}, class: 'select select-xs text-sm input-bordered bg-white pl-3.5' %>
+                  <% elsif index == 0 %>
+                    <mount-on-click data-template-id="order_fields" class="link whitespace-nowrap text-sm mt-1 mr-1 block">
+                      <%= t('edit_order') %>
+                    </mount-on-click>
+                  <% end %>
+                </div>
+              <% end %>
+            </div>
             <% if template.submitters.size == 2 %>
               <%= tag.input name: ff.field_name(:email), value: ff.object.email, type: :email, class: 'base-input', multiple: true, autocomplete: 'off', placeholder: t('default_email'), disabled: ff.object.is_requester || ff.object.invite_by_uuid.present? || ff.object.optional_invite_by_uuid.present?, id: field_uuid = SecureRandom.uuid %>
             <% else %>
@@ -85,3 +99,16 @@
     </div>
   <% end %>
 </div>
+<% if template.submitters.size > 2 && !is_order_set %>
+  <template id="order_fields">
+    <% template.submitters.each_with_index do |submitter, index| %>
+      <turbo-stream action="replace" target="order_<%= submitter['uuid'] %>">
+        <template>
+          <div id="order_<%= submitter['uuid'] %>">
+            <%= select_tag "template[submitters][#{index}][order]", options_for_select(template.submitters.map.with_index { |_, i| [(i + 1).ordinalize, i] }, submitter['order'].presence || index), class: 'select select-xs text-sm input-bordered bg-white pl-3.5' %>
+          </div>
+        </template>
+      </turbo-stream>
+    <% end %>
+  </template>
+<% end %>

app/views/templates_preferences/show.html.erb

@@ -59,6 +59,7 @@
         <%= t('form_preferences') %>
       </div>
       <div class="collapse-content">
+        <%= render 'templates_prefillable_fields/form', template: @template %>
         <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-1' }, data: { close_on_submit: false } do |f| %>
           <toggle-on-submit data-element-id="form_saved_alert"></toggle-on-submit>
           <% configs = AccountConfigs.find_or_initialize_for_key(current_account, AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY).value %>
@@ -68,7 +69,7 @@
               <%= ff.url_field :completed_redirect_url, required: false, class: 'base-input', dir: 'auto' %>
             </div>
             <%= ff.fields_for :completed_message, ff.object.completed_message do |fff| %>
-              <div class="form-control mb-2 border-t mt-4">
+              <div class="form-control mb-2 mt-4">
                 <%= fff.label :body, t('completion_message'), class: 'label' %>
                 <autoresize-textarea>
                   <%= fff.text_area :body, required: false, class: 'base-input w-full py-2', dir: 'auto' %>
@@ -162,6 +163,14 @@
                 <% end %>
               </div>
             <% end %>
+            <%= f.fields_for :preferences, Struct.new(:request_email_enabled).new(@template.preferences['request_email_enabled']) do |ff| %>
+              <div class="flex items-center justify-between py-2.5 px-1 mb-2">
+                <span>
+                  <%= 'Send signature request email' %>
+                </span>
+                <%= ff.check_box :request_email_enabled, { checked: ff.object.request_email_enabled != false, class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
+              </div>
+            <% end %>
             <div class="form-control pt-2">
               <%= f.button button_title(title: t('save'), disabled_with: t('saving')), class: 'base-button' %>
               <div class="flex justify-center">

app/views/templates_prefillable_fields/_form.html.erb

@@ -0,0 +1,16 @@
+<% select_fields = template.fields.filter_map { |f| [f['name'], f['uuid']] if f['name'].present? && f['type'].in?(TemplatesPrefillableFieldsController::PREFILLABLE_FIELD_TYPES) } %>
+<% if select_fields.present? %>
+  <div class="border-b pb-4 mb-4">
+    <%= form_for '', url: template_prefillable_fields_path(template), method: :post, data: { close_on_submit: false } do |f| %>
+      <div class="form-control">
+        <%= f.hidden_field :prefillable, value: 'true' %>
+        <%= f.label :field_uuid, t(:invite_form_fields), class: 'label' %>
+        <div class="join w-full">
+          <%= select_tag :field_uuid, options_for_select(select_fields), prompt: t(:select_field), class: 'base-select w-full join-item', dir: 'auto', required: true %>
+          <%= f.button button_title(title: t('add'), disabled_with: t('add')), class: 'base-button join-item !px-6' %>
+        </div>
+      </div>
+    <% end %>
+    <%= render partial: 'templates_prefillable_fields/list', locals: { template: } %>
+  </div>
+<% end %>

app/views/templates_prefillable_fields/_list.html.erb

@@ -0,0 +1,6 @@
+<div id="prefillable_fields_list" class="flex gap-1 px-0.5 mt-2 flex-wrap">
+  <% template.fields.each do |f| %>
+    <% next unless f['prefillable'] %>
+    <%= button_to button_title(title: f['name'].presence || f['type'].capitalize, disabled_with: f['name'].presence || f['type'].capitalize, icon: svg_icon('x', class: 'w-4 h-4'), icon_disabled: svg_icon('loader', class: 'w-4 h-4 animate-spin')), template_prefillable_fields_path(template), params: { field_uuid: f['uuid'], prefillable: 'false' }, class: 'badge badge-lg badge-primary space-x-1 pr-3 pl-2', form: { data: { close_on_submit: false } } %>
+  <% end %>
+</div>

app/views/templates_share_link/show.html.erb

@@ -1,3 +1,5 @@
+<% multiple_submitters = @template.submitters.to_a.length > 1 %>
+<% enough_defined_submitters = Templates.filter_undefined_submitters(@template.submitters).size < 2 %>
 <%= render 'shared/turbo_modal_large', title: t('share_link') do %>
   <div class="mt-2 mb-4 px-5">
     <%= form_for @template, url: template_share_link_path(@template), method: :post, html: { id: 'shared_link_form', autocomplete: 'off', class: 'mt-3' }, data: { close_on_submit: false } do |f| %>
@@ -12,28 +14,14 @@
         </check-on-click>
       </div>
     <% end %>
-    <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-4 mb-5' }, data: { close_on_submit: false } do |f| %>
-      <% link_form_fields = @template.preferences.fetch('link_form_fields', ['email']) %>
-      <label class="pl-1"><%= t('link_form_fields') %></label>
-      <required-checkbox-group class="flex flex-col md:flex-row items-center gap-2 w-full mt-2">
-        <% %w[name email phone].each do |field| %>
-          <%= label_tag "link_form_fields_#{field}", t(field), class: 'relative flex w-full md:w-1/3 items-center h-12 border-base-300 py-3.5 border rounded-xl' do %>
-            <%= check_box_tag 'template[preferences][link_form_fields][]', field, link_form_fields.include?(field), class: 'absolute !animate-none checkbox left-3', id: "link_form_fields_#{field}" %>
-            <span class="font-medium w-full text-center"><%= t(field) %></span>
-          <% end %>
-        <% end %>
-      </required-checkbox-group>
-    <% end %>
-    <% if Templates.filter_undefined_submitters(@template.submitters).size > 1 %>
+    <% if multiple_submitters && !enough_defined_submitters %>
       <div class="alert items-start bg-base-100 border-base-300 mt-4">
         <%= svg_icon('info_circle', class: 'stroke-current shrink-0 h-6 w-6 mt-1') %>
         <div><%= t('this_template_has_multiple_parties_which_prevents_the_use_of_a_sharing_link') %></div>
       </div>
-    <% end %>
-    <% if @template.submitters.to_a.length > 1 %>
-      <div class="collapse collapse-arrow join-item border border-base-300 mt-4 mb-5">
-        <input type="checkbox" name="accordion">
-        <div class="collapse-title text-xl font-medium">
+      <div class="collapse collapse-arrow join-item border border-base-300 mt-4">
+        <input type="checkbox" name="accordion" class="min-h-0">
+        <div class="collapse-title py-4 min-h-0">
           <%= t('default_parties') %>
         </div>
         <div class="collapse-content !pb-0">
@@ -41,15 +29,46 @@
         </div>
       </div>
     <% end %>
-    <% if Docuseal.multitenant? || Accounts.can_send_emails?(current_account) %>
-      <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-3' }, data: { close_on_submit: false } do |f| %>
-        <%= f.fields_for :preferences, Struct.new(:shared_link_2fa).new(@template.preferences['shared_link_2fa'] == true) do |ff| %>
-          <label for="template_preferences_shared_link_2fa" class="flex items-center my-4 justify-between gap-1 alert bg-base-100 border-base-300">
-            <span><%= t('request_email_otp_verification_with_shared_link') %></span>
-            <%= ff.check_box :shared_link_2fa, { checked: ff.object.shared_link_2fa == true, disabled: !can?(:update, @template), class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
-          </label>
+    <div class="collapse collapse-arrow join-item mt-4">
+      <input id="accordion_checkbox" type="checkbox" name="accordion" class="min-h-0">
+      <div class="collapse-title min-h-0 after:!right-3 p-1">
+        <%= t('advanced_settings') %>
+      </div>
+      <div class="collapse-content !p-0">
+        <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-4 pt-4 border-t border-base-300' }, data: { close_on_submit: false } do |f| %>
+          <% link_form_fields = @template.preferences.fetch('link_form_fields', ['email']) %>
+          <label class="pl-1"><%= t('link_form_fields') %></label>
+          <required-checkbox-group class="flex flex-col md:flex-row items-center gap-2 w-full mt-2">
+            <% %w[name email phone].each do |field| %>
+              <%= label_tag "link_form_fields_#{field}", t(field), class: 'relative flex w-full md:w-1/3 items-center h-14 border-base-300 py-3.5 border rounded-xl' do %>
+                <%= check_box_tag 'template[preferences][link_form_fields][]', field, link_form_fields.include?(field), class: 'absolute !animate-none checkbox left-3', id: "link_form_fields_#{field}" %>
+                <span class="font-medium w-full text-center"><%= t(field) %></span>
+              <% end %>
+            <% end %>
+          </required-checkbox-group>
         <% end %>
-      <% end %>
-    <% end %>
+        <% if multiple_submitters && enough_defined_submitters %>
+          <div class="collapse collapse-arrow join-item border border-base-300 mt-4">
+            <input type="checkbox" name="accordion" class="min-h-0">
+            <div class="collapse-title py-4 min-h-0">
+              <%= t('default_parties') %>
+            </div>
+            <div class="collapse-content !pb-0">
+              <%= render 'templates_preferences/recipients', template: @template, close_on_submit: false, with_toggles: false, with_submission_requester: false %>
+            </div>
+          </div>
+        <% end %>
+        <% if Docuseal.multitenant? || Accounts.can_send_emails?(current_account) %>
+          <%= form_for @template, url: template_preferences_path(@template), method: :post, html: { autocomplete: 'off', class: 'mt-4' }, data: { close_on_submit: false } do |f| %>
+            <%= f.fields_for :preferences, Struct.new(:shared_link_2fa).new(@template.preferences['shared_link_2fa'] == true) do |ff| %>
+              <label for="template_preferences_shared_link_2fa" class="flex items-center mt-4 h-14 justify-between gap-1 alert bg-base-100 border-base-300">
+                <span><%= t('request_email_otp_verification_with_shared_link') %></span>
+                <%= ff.check_box :shared_link_2fa, { checked: ff.object.shared_link_2fa == true, disabled: !can?(:update, @template), class: 'toggle', onchange: 'this.form.requestSubmit()' }, 'true', 'false' %>
+              </label>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
   </div>
 <% end %>

app/views/user_mailer/invitation_email.html.erb

@@ -1,7 +1,7 @@
 <p><%= @user.first_name.present? ? t('hello_name', name: @user.first_name) : t('hi_there') %>,</p>
 <p><%= t('you_have_been_invited_to_account_name_product_name_please_sign_up_using_the_link_below_', account_name: @user.account.name, product_name: Docuseal.product_name) %></p>
 <p><%= link_to t('sign_up'), invitation_url(reset_password_token: @token) %></p>
-<p><%= t('please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this') %></p>
+<p><%= t('please_contact_us_by_replying_to_this_email_if_you_have_any_questions') %></p>
 <p>
   <%= t('thanks') %>,<br><%= @current_account.name %>
 </p>

config/initializers/rouge.rb

@@ -8,6 +8,7 @@ module Rouge
 
   module Lexers
     autoload :JSON, 'rouge/lexers/json'
+    autoload :Shell, 'rouge/lexers/shell'
   end
 
   autoload :Formatter, 'rouge/formatter'

config/locales/i18n.yml

@@ -23,6 +23,9 @@ en: &en
   pro: Pro
   thanks: Thanks
   private: Private
+  select: Select
+  edit_order: Edit Order
+  invite_form_fields: Invite form fields
   default_parties: Default parties
   authenticate_embedded_form_preview_with_token: Authenticate embedded form preview with token
   stripe_integration: Stripe Integration
@@ -42,7 +45,6 @@ en: &en
   send_verification_code: Send verification code
   code_has_been_resent: Code has been re-sent
   invalid_code: Invalid code
-  unarchive: Unarchive
   signed: Signed
   first_party: 'First Party'
   remove_filter: Remove filter
@@ -56,7 +58,6 @@ en: &en
   accessiable_by: Accessible by
   team_access: Team access
   document_download_filename_format: Document download filename format
-  document_name: Document Name
   docuseal_trusted_signature: DocuSeal Trusted Signature
   hello_name: Hello %{name}
   you_are_invited_to_product_name: You are invited to %{product_name}
@@ -73,7 +74,7 @@ en: &en
   awaiting_completion_by_the_other_party: "Awaiting completion by the other party"
   review_and_sign: Review and Sign
   review_and_submit: Review and Submit
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: "Please contact us by replying to this email if you have any questions."
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: "Please contact us by replying to this email if you have any questions."
   submitter_invitation_sms_body_sign: '{account.name} has invited you to sign a document: {submitter.link}'
   verification_code_sms_body: 'Verification code: {code}'
   you_are_invited_to_submit_a_form: 'You are invited to submit a form'
@@ -398,7 +399,6 @@ en: &en
   send_signature_request_emails_without_limits_with_docuseal_pro: Send signature request emails without limits with DocuSeal Pro
   count_emails_used: '%{count} emails used'
   has_been_connected: has been connected
-  but_not_activated: but not activated
   sms_not_configured: SMS not Configure
   configure_sms_settings_in_order_to_send_text_messages_: 'Configure SMS settings in order to send text messages:'
   go_to_sms_settings: Go to SMS settings
@@ -460,6 +460,10 @@ en: &en
   users_count_total_users_count_pro_users_limit_was_reached_to_invite_additional_users_please_purchase_more_pro_user_seats_via_the_manage_plan_button: '%{users_count}/%{total_users_count} Pro users limit was reached. To invite additional users, please purchase more Pro user seats via the "Manage plan" button.'
   move_into_folder: Move Into Folder
   new_folder_name: New Folder Name
+  new_subfolder_name: New Subfolder Name
+  change_parent_folder: Change Parent Folder
+  folder: Folder
+  create_a_new_folder: Create a New Folder
   exit_preview: Exit Preview
   general: General
   recipients: Recipients
@@ -492,7 +496,6 @@ en: &en
   edit_user: Edit User
   new_user: New User
   unarchive: Unarchive
-  role: Role
   last_session: Last session
   unlock_more_user_roles_with_docuseal_pro: Unlock more user roles with DocuSeal Pro.
   view_active: View Active
@@ -559,8 +562,6 @@ en: &en
   new_webhook: New Webhook
   delete_webhook: Delete webhook
   count_submissions_have_been_created: '%{count} submissions have been created.'
-  gmail_has_been_connected: Gmail has been connected
-  microsoft_account_has_been_connected: Microsoft Account has been connected
   sms_length_cant_be_longer_than_120_bytes: SMS length can't be longer than 120 bytes
   connected_successfully: Connected successfully.
   user_nameid_not_found: 'User %{nameid} not found.'
@@ -779,6 +780,19 @@ en: &en
   email_verification: Email verification
   your_verification_code_to_access_the_name: 'Your verification code to access the "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Please reply to this email if you didn't request this.
+  advanced_settings: Advanced settings
+  text: Text
+  code: Code
+  custom_html_emails: Custom HTML emails
+  connect_your_email_to_send_html_emails: Connect your email to send HTML emails
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Connect your Gmail or Outlook account or add SMTP settings to send custom HTML emails.
+  connect_gmail_or_outlook: Connect Gmail or Outlook
+  connect_your_email_to_bulk_send: Connect your email to bulk send
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Connect your Gmail or Outlook account or add SMTP settings to bulk send.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Are you sure you want to add recipients without sending? To send emails it requires to connect Gmail or Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" has been completed by <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Please check the copy of your "<strong>{template.name}</strong>" in the email attachments.'
+  you_have_been_invited_to_sign_the_template_name_html: 'You have been invited to sign the "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Bulk Send
@@ -885,6 +899,9 @@ en: &en
       range_without_total: "%{from}-%{to} events"
 
 es: &es
+  edit_order: Edita Pedido
+  select: Seleccionar
+  invite_form_fields: Invitar campos del formulario
   pro: Pro
   default_parties: Partes predeterminadas
   authenticate_embedded_form_preview_with_token: Autenticar vista previa del formulario incrustado con token
@@ -918,8 +935,6 @@ es: &es
   team_access: Acceso del equipo
   remove_filter: Eliminar filtro
   document_download_filename_format: Formato del nombre del archivo de descarga del documento
-  document_name: Nombre del documento
-  unarchive: Desarchivar
   awaiting_completion_by_the_other_party: "Esperando la finalización por la otra parte"
   enforce_recipients_order: 'Hacer cumplir el orden de los destinatarios'
   first_party: 'Primera Parte'
@@ -940,7 +955,7 @@ es: &es
   please_check_the_copy_of_your_name_in_the_email_attachments: 'Por favor, revisa la copia de tu "%{name}" en los archivos adjuntos del correo electrónico.'
   review_and_sign: Revisar y Firmar
   review_and_submit: Revisar y Enviar
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: "Por favor, contáctanos respondiendo a este correo si tienes alguna pregunta."
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: "Por favor, contáctanos respondiendo a este correo si tienes alguna pregunta."
   submitter_invitation_sms_body_sign: '{account.name} te ha invitado a firmar un documento: {submitter.link}'
   verification_code_sms_body: 'Código de verificación: {code}'
   you_are_invited_to_submit_a_form: 'Estás invitado/a a enviar un formulario'
@@ -969,7 +984,7 @@ es: &es
   submitter_documents_copy_email_body: |
     Hola,
 
-    Por favor, revisa la copia de tu "{template.name}" en los archivos adjuntos.
+    Por favor, revisa la copia de tu "{template.name}" en los archivos adjuntos del correo electrónico.
     Alternativamente, puedes revisar y descargar tu copia usando el enlace a continuación:
 
     [{template.name}]({documents.link})
@@ -1264,7 +1279,6 @@ es: &es
   send_signature_request_emails_without_limits_with_docuseal_pro: Envía solicitudes de firma sin límites con DocuSeal Pro
   count_emails_used: '%{count} correos electrónicos utilizados'
   has_been_connected: ha sido conectado
-  but_not_activated: pero no activado
   sms_not_configured: SMS no configurado
   configure_sms_settings_in_order_to_send_text_messages_: 'Configura los ajustes de SMS para enviar mensajes de texto:'
   go_to_sms_settings: Ir a la configuración de SMS
@@ -1326,6 +1340,10 @@ es: &es
   users_count_total_users_count_pro_users_limit_was_reached_to_invite_additional_users_please_purchase_more_pro_user_seats_via_the_manage_plan_button: 'Se alcanzó el límite de %{users_count}/%{total_users_count} usuarios Pro. Para invitar a más usuarios, compra más plazas Pro usando el botón "Gestionar plan".'
   move_into_folder: Mover a la carpeta
   new_folder_name: Nuevo nombre de la carpeta
+  new_subfolder_name: Nuevo nombre de subcarpeta
+  change_parent_folder: Cambiar carpeta principal
+  folder: Carpeta
+  create_a_new_folder: Crear una nueva carpeta
   exit_preview: Salir de la vista previa
   general: General
   recipients: Destinatarios
@@ -1358,7 +1376,6 @@ es: &es
   edit_user: Editar usuario
   new_user: Nuevo usuario
   unarchive: Desarchivar
-  role: Rol
   last_session: Última sesión
   unlock_more_user_roles_with_docuseal_pro: Desbloquea más roles de usuario con DocuSeal Pro.
   view_active: Ver activos
@@ -1425,8 +1442,6 @@ es: &es
   new_webhook: Nuevo Webhook
   delete_webhook: Eliminar webhook
   count_submissions_have_been_created: '%{count} envíos han sido creados.'
-  gmail_has_been_connected: Gmail ha sido conectado.
-  microsoft_account_has_been_connected: La cuenta de Microsoft ha sido conectada.
   sms_length_cant_be_longer_than_120_bytes: La longitud del SMS no puede ser mayor a 120 bytes.
   connected_successfully: Conectado con éxito.
   user_nameid_not_found: 'Usuario %{nameid} no encontrado.'
@@ -1519,7 +1534,6 @@ es: &es
   select_field: Campo de Selección
   multiple_field: Campo Múltiple
   radio_field: Campo de Grupo Radio
-  radio_field: Campo de Radio
   cells_field: Campo de Celdas
   stamp_field: Campo de Sello
   payment_field: Campo de Pago
@@ -1645,6 +1659,19 @@ es: &es
   email_verification: Verificación por correo electrónico
   your_verification_code_to_access_the_name: 'Su código de verificación para acceder a "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Por favor, responda este correo si no solicitó esto.
+  advanced_settings: Configuración avanzada
+  text: Texto
+  code: Código
+  custom_html_emails: Correos electrónicos HTML personalizados
+  connect_your_email_to_send_html_emails: Conecta tu correo electrónico para enviar correos HTML
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Conecta tu cuenta de Gmail u Outlook o añade ajustes SMTP para enviar correos HTML personalizados.
+  connect_gmail_or_outlook: Conectar Gmail u Outlook
+  connect_your_email_to_bulk_send: Conecta tu correo electrónico para el envío masivo
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Conecta tu cuenta de Gmail u Outlook o añade ajustes SMTP para el envío masivo.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: ¿Estás seguro de que quieres añadir destinatarios sin enviar? Para enviar correos electrónicos necesitas conectar Gmail u Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" ha sido completado por <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Por favor, revisa la copia de tu "<strong>{template.name}</strong>" en los archivos adjuntos del correo electrónico.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Has sido invitado a firmar el "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Envío masivo
@@ -1751,6 +1778,9 @@ es: &es
       range_without_total: "%{from}-%{to} eventos"
 
 it: &it
+  edit_order: Modifica Ordine
+  select: Seleziona
+  invite_form_fields: Invita campi modulo
   pro: Pro
   default_parties: Parti predefiniti
   authenticate_embedded_form_preview_with_token: "Autentica l'anteprima del modulo incorporato con il token"
@@ -1783,8 +1813,6 @@ it: &it
   team_access: Accesso al team
   remove_filter: Rimuovi filtro
   document_download_filename_format: Formato del nome file scaricato
-  document_name: Nome del Documento
-  unarchive: Ripristina
   awaiting_completion_by_the_other_party: "In attesa di completamento da parte dell'altra parte"
   enforce_recipients_order: "Applicare l'ordine dei destinatari"
   first_party: 'Prima parte'
@@ -1805,7 +1833,7 @@ it: &it
   please_check_the_copy_of_your_name_in_the_email_attachments: "Per favore, controlla la copia del tuo \"%{name}\" negli allegati dell'email."
   review_and_sign: Rivedi e Firma
   review_and_submit: Rivedi e Invia
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: "Per favore, contattaci rispondendo a questa email se hai domande."
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: "Per favore, contattaci rispondendo a questa email se hai domande."
   submitter_invitation_sms_body_sign: '{account.name} ti ha invitato a firmare un documento: {submitter.link}'
   verification_code_sms_body: 'Codice di verifica: {code}'
   you_are_invited_to_submit_a_form: 'Sei stato invitato a inviare un modulo'
@@ -2129,7 +2157,6 @@ it: &it
   send_signature_request_emails_without_limits_with_docuseal_pro: Invia email di richiesta di firma senza limiti con DocuSeal Pro
   count_emails_used: '%{count} email utilizzate'
   has_been_connected: è stato connesso
-  but_not_activated: ma non attivato
   sms_not_configured: SMS non configurato
   configure_sms_settings_in_order_to_send_text_messages_: 'Configura le impostazioni SMS per inviare messaggi di testo:'
   go_to_sms_settings: Vai alle impostazioni SMS
@@ -2191,6 +2218,10 @@ it: &it
   users_count_total_users_count_pro_users_limit_was_reached_to_invite_additional_users_please_purchase_more_pro_user_seats_via_the_manage_plan_button: 'È stato raggiunto il limite di %{users_count}/%{total_users_count} utenti Pro. Per invitare altri utenti, acquista più posti Pro tramite il pulsante "Gestisci piano".'
   move_into_folder: Sposta nella cartella
   new_folder_name: Nuovo nome della cartella
+  new_subfolder_name: Nuovo nome della sottocartella
+  change_parent_folder: Cambia cartella principale
+  folder: Cartella
+  create_a_new_folder: Crea una nuova cartella
   exit_preview: "Esci dall'anteprima"
   general: Generale
   recipients: Destinatari
@@ -2222,7 +2253,6 @@ it: &it
   edit_user: Modifica utente
   new_user: Nuovo utente
   unarchive: Disarchivia
-  role: Ruolo
   last_session: Ultima sessione
   unlock_more_user_roles_with_docuseal_pro: Sblocca più ruoli utente con DocuSeal Pro.
   view_active: Visualizza attivi
@@ -2289,8 +2319,6 @@ it: &it
   new_webhook: Nuovo Webhook
   delete_webhook: Elimina webhook
   count_submissions_have_been_created: '%{count} invii sono stati creati.'
-  gmail_has_been_connected: Gmail è stato connesso.
-  microsoft_account_has_been_connected: "L'account Microsoft è stato connesso."
   sms_length_cant_be_longer_than_120_bytes: "La lunghezza dell'SMS non può superare i 120 byte."
   connected_successfully: Collegamento avvenuto con successo.
   user_nameid_not_found: 'Utente %{nameid} non trovato.'
@@ -2510,6 +2538,19 @@ it: &it
   email_verification: Verifica email
   your_verification_code_to_access_the_name: 'Il tuo codice per accedere a "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Rispondi a questa email se non hai richiesto questo.
+  advanced_settings: Impostazioni avanzate
+  text: Testo
+  code: Codice
+  custom_html_emails: Email HTML personalizzate
+  connect_your_email_to_send_html_emails: Collega la tua email per inviare email HTML
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Collega il tuo account Gmail o Outlook oppure aggiungi impostazioni SMTP per inviare email HTML personalizzate.
+  connect_gmail_or_outlook: Collega Gmail o Outlook
+  connect_your_email_to_bulk_send: Collega la tua email per invio multiplo
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Collega il tuo account Gmail o Outlook oppure aggiungi impostazioni SMTP per invio multiplo.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Sei sicuro di voler aggiungere destinatari senza inviare? Per inviare email devi collegare Gmail o Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" è stato completato da <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Per favore, controlla la copia del tuo "<strong>{template.name}</strong>" negli allegati dell''email.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Sei stato invitato a firmare il "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Invio massivo
@@ -2616,6 +2657,9 @@ it: &it
       range_without_total: "%{from}-%{to} eventi"
 
 fr: &fr
+  edit_order: Modifier la commande
+  select: Sélectionner
+  invite_form_fields: Inviter des champs de formulaire
   pro: Pro
   default_parties: Parties par défaut
   authenticate_embedded_form_preview_with_token: Authentifier l’aperçu du formulaire intégré avec un jeton
@@ -2649,8 +2693,6 @@ fr: &fr
   team_access: Accès à l'équipe
   remove_filter: Supprimer le filtre
   document_download_filename_format: Format du nom de fichier du téléchargement de document
-  document_name: Nom du document
-  unarchive: Désarchiver
   awaiting_completion_by_the_other_party: "En attente de la complétion par l'autre partie"
   enforce_recipients_order: "Respecter l'ordre des destinataires"
   first_party: 'Première partie'
@@ -2671,7 +2713,7 @@ fr: &fr
   please_check_the_copy_of_your_name_in_the_email_attachments: "Veuillez vérifier la copie de votre \"%{name}\" dans les pièces jointes de l'email."
   review_and_sign: Consulter et signer
   review_and_submit: Consulter et soumettre
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: 'Veuillez nous contacter en répondant à cet e-mail si vous avez des questions.'
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: 'Veuillez nous contacter en répondant à cet e-mail si vous avez des questions.'
   submitter_invitation_sms_body_sign: '{account.name} vous a invité à signer un document: {submitter.link}'
   verification_code_sms_body: 'Code de vérification: {code}'
   you_are_invited_to_submit_a_form: Vous êtes invité à soumettre un formulaire
@@ -2687,7 +2729,7 @@ fr: &fr
 
     [Consulter et signer]({submitter.link})
 
-    Veuillez nous contacter si vous avez des questions.
+    Veuillez nous contacter en répondant à cet e-mail si vous avez des questions.
 
     Merci,
     {account.name}
@@ -2700,7 +2742,7 @@ fr: &fr
   submitter_documents_copy_email_body: |
     Bonjour,
 
-    Veuillez vérifier la copie de votre "{template.name}" dans les pièces jointes.
+    Veuillez vérifier la copie de votre "{template.name}" dans les pièces jointes de l'email.
     Vous pouvez également consulter et télécharger votre copie en utilisant le lien ci-dessous:
 
     [{template.name}]({documents.link})
@@ -2996,7 +3038,6 @@ fr: &fr
   send_signature_request_emails_without_limits_with_docuseal_pro: Envoyez des e-mails de demande de signature sans limites avec DocuSeal Pro
   count_emails_used: '%{count} e-mails utilisés'
   has_been_connected: a été connecté
-  but_not_activated: mais pas activé
   sms_not_configured: SMS non configuré
   configure_sms_settings_in_order_to_send_text_messages_: 'Configurez les paramètres SMS pour envoyer des messages texte'
   go_to_sms_settings: Aller aux paramètres SMS
@@ -3058,6 +3099,10 @@ fr: &fr
   users_count_total_users_count_pro_users_limit_was_reached_to_invite_additional_users_please_purchase_more_pro_user_seats_via_the_manage_plan_button: 'La limite de %{users_count}/%{total_users_count} utilisateurs Pro a été atteinte. Pour inviter d''autres utilisateurs, veuillez acheter plus de places Pro via le bouton "Gérer le plan".'
   move_into_folder: Déplacer dans le dossier
   new_folder_name: Nouveau nom du dossier
+  new_subfolder_name: Nouveau nom du sous-dossier
+  change_parent_folder: Changer le dossier parent
+  folder: Dossier
+  create_a_new_folder: Créer un nouveau dossier
   exit_preview: "Quitter l'aperçu"
   general: Général
   recipients: Destinataires
@@ -3090,7 +3135,6 @@ fr: &fr
   edit_user: "Modifier l'utilisateur"
   new_user: Nouvel utilisateur
   unarchive: Désarchiver
-  role: Rôle
   last_session: Dernière session
   unlock_more_user_roles_with_docuseal_pro: Déverrouillez plus de rôles d'utilisateurs avec DocuSeal Pro.
   view_active: Voir les actifs
@@ -3157,8 +3201,6 @@ fr: &fr
   new_webhook: Nouveau Webhook
   delete_webhook: Supprimer le webhook
   count_submissions_have_been_created: '%{count} soumissions ont été créées.'
-  gmail_has_been_connected: Gmail a été connecté.
-  microsoft_account_has_been_connected: Le compte Microsoft a été connecté.
   sms_length_cant_be_longer_than_120_bytes: La longueur du SMS ne peut pas dépasser 120 octets.
   connected_successfully: Connecté avec succès.
   user_nameid_not_found: 'Utilisateur %{nameid} introuvable.'
@@ -3378,6 +3420,19 @@ fr: &fr
   email_verification: Vérification de l'email
   your_verification_code_to_access_the_name: 'Votre code pour accéder à "%{name}" :'
   please_reply_to_this_email_if_you_didnt_request_this: Veuillez répondre à cet email si vous n'avez pas fait cette demande.
+  advanced_settings: Paramètres avancés
+  text: Texte
+  code: Code
+  custom_html_emails: E-mails HTML personnalisés
+  connect_your_email_to_send_html_emails: Connectez votre e-mail pour envoyer des e-mails HTML
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Connectez votre compte Gmail ou Outlook ou ajoutez des paramètres SMTP pour envoyer des e-mails HTML personnalisés.
+  connect_gmail_or_outlook: Connecter Gmail ou Outlook
+  connect_your_email_to_bulk_send: Connectez votre e-mail pour l'envoi groupé
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Connectez votre compte Gmail ou Outlook ou ajoutez des paramètres SMTP pour l'envoi groupé.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Êtes-vous sûr de vouloir ajouter des destinataires sans envoi ? Pour envoyer des e-mails, vous devez connecter Gmail ou Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" a été complété par <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Veuillez vérifier la copie de votre "<strong>{template.name}</strong>" dans les pièces jointes de l’e-mail.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Vous avez été invité à signer le "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Envoi en masse
@@ -3484,6 +3539,9 @@ fr: &fr
       range_without_total: "%{from} à %{to} événements"
 
 pt: &pt
+  edit_order: Edita Pedido
+  select: Selecionar
+  invite_form_fields: Convidar campos do formulário
   pro: Pro
   default_parties: Partes padrão
   authenticate_embedded_form_preview_with_token: Autenticar visualização incorporada do formulário com token
@@ -3517,8 +3575,6 @@ pt: &pt
   team_access: Acesso à equipe
   remove_filter: Remover filtro
   document_download_filename_format: Formato do nome do arquivo de download do documento
-  document_name: Nome do documento
-  unarchive: Desarquivar
   awaiting_completion_by_the_other_party: "Aguardando a conclusão pela outra parte"
   enforce_recipients_order: 'Forçar a ordem dos recipientes'
   first_party: 'Primeira Parte'
@@ -3539,7 +3595,7 @@ pt: &pt
   please_check_the_copy_of_your_name_in_the_email_attachments: 'Por favor, verifique a cópia de "%{name}" nos anexos do e-mail.'
   review_and_sign: Revisar e assinar
   review_and_submit: Revisar e submeter
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: 'Por favor, entre em contato conosco respondendo a este e-mail se você tiver alguma dúvida.'
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: 'Por favor, entre em contato conosco respondendo a este e-mail se você tiver alguma dúvida.'
   submitter_invitation_sms_body_sign: '{account.name} convidou você para assinar um documento: {submitter.link}'
   verification_code_sms_body: 'Código de verificação: {code}'
   you_are_invited_to_submit_a_form: Você foi convidado a submeter um formulário
@@ -3551,11 +3607,11 @@ pt: &pt
   submitter_invitation_email_sign_body: |
     Olá,
 
-    Você foi convidado a assinar o documento "{template.name}".
+    Você foi convidado a assinar "{template.name}".
 
     [Revisar e assinar]({submitter.link})
 
-    Por favor, entre em contato conosco se tiver alguma dúvida.
+    Por favor, entre em contato conosco respondendo a este e-mail se você tiver alguma dúvida.
 
     Obrigado,
     {account.name}
@@ -3568,8 +3624,8 @@ pt: &pt
   submitter_documents_copy_email_body: |
     Olá,
 
-    Por favor, verifique a cópia de seu "{template.name}" nos anexos do e-mail.
-    Alternativamente, você pode revisar e baixar sua cópia usando o link abaixo:
+    Por favor, verifique a cópia de "{template.name}" nos anexos do e-mail.
+    Você pode revisar e baixar sua cópia usando o link abaixo:
 
     [{template.name}]({documents.link})
 
@@ -3863,7 +3919,6 @@ pt: &pt
   send_signature_request_emails_without_limits_with_docuseal_pro: Enviar e-mails de solicitação de assinatura sem limites com o DocuSeal Pro
   count_emails_used: '%{count} e-mails usados'
   has_been_connected: foi conectado
-  but_not_activated: mas não ativado
   sms_not_configured: SMS não configurado
   configure_sms_settings_in_order_to_send_text_messages_: 'Configure as configurações de SMS para enviar mensagens de texto:'
   go_to_sms_settings: Ir para configurações de SMS
@@ -3925,6 +3980,10 @@ pt: &pt
   users_count_total_users_count_pro_users_limit_was_reached_to_invite_additional_users_please_purchase_more_pro_user_seats_via_the_manage_plan_button: 'O limite de %{users_count}/%{total_users_count} usuários Pro foi atingido. Para convidar mais usuários, adquira mais licenças Pro através do botão "Gerenciar plano".'
   move_into_folder: Mover para pasta
   new_folder_name: Novo nome da pasta
+  new_subfolder_name: Novo nome da subpasta
+  change_parent_folder: Alterar pasta pai
+  folder: Pasta
+  create_a_new_folder: Criar uma nova pasta
   exit_preview: Sair da pré-visualização
   general: Geral
   recipients: Destinatários
@@ -3957,7 +4016,6 @@ pt: &pt
   edit_user: Editar usuário
   new_user: Novo usuário
   unarchive: Desarquivar
-  role: Função
   last_session: Última sessão
   unlock_more_user_roles_with_docuseal_pro: Desbloqueie mais funções de usuário com DocuSeal Pro.
   view_active: Ver ativos
@@ -4024,8 +4082,6 @@ pt: &pt
   new_webhook: Novo Webhook
   delete_webhook: Excluir webhook
   count_submissions_have_been_created: '%{count} submissões foram criadas.'
-  gmail_has_been_connected: O Gmail foi conectado
-  microsoft_account_has_been_connected: A conta da Microsoft foi conectada
   sms_length_cant_be_longer_than_120_bytes: O comprimento do SMS não pode ultrapassar 120 bytes
   connected_successfully: Conectado com sucesso.
   user_nameid_not_found: 'Usuário %{nameid} não encontrado.'
@@ -4244,6 +4300,19 @@ pt: &pt
   email_verification: Verificação de e-mail
   your_verification_code_to_access_the_name: 'Seu código de verificação para acessar "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Responda a este e-mail se você não solicitou isso.
+  advanced_settings: Configurações avançadas
+  text: Texto
+  code: Código
+  custom_html_emails: E-mails HTML personalizados
+  connect_your_email_to_send_html_emails: Conecte seu e-mail para enviar e-mails HTML
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Conecte sua conta Gmail ou Outlook ou adicione configurações SMTP para enviar e-mails HTML personalizados.
+  connect_gmail_or_outlook: Conectar Gmail ou Outlook
+  connect_your_email_to_bulk_send: Conecte seu e-mail para envio em massa
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Conecte sua conta Gmail ou Outlook ou adicione configurações SMTP para envio em massa.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Tem certeza de que deseja adicionar destinatários sem enviar? Para enviar e-mails é necessário conectar Gmail ou Outlook.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" foi concluído por <strong>{submission.submitters}</strong>'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Por favor, verifique a cópia do seu "<strong>{template.name}</strong>" nos anexos do e-mail.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Você foi convidado a assinar o "<strong>{template.name}</strong>".'
   submission_sources:
     api: API
     bulk: Envio em massa
@@ -4324,7 +4393,6 @@ pt: &pt
     settings_account_description: 'Com configurações completas de conta, você pode personalizar a experiência de assinatura eletrônica e convidar mais usuários.'
     support: 'Suporte'
     support_description: 'Você pode usar nosso assistente de IA ou nos escrever para support@docuseal.com se tiver dúvidas.'
-    settings: 'Configurações'
     settings_template_description: 'Use este botão para acessar a página de configurações da sua conta.'
   doorkeeper:
     scopes:
@@ -4351,6 +4419,9 @@ pt: &pt
       range_without_total: "%{from}-%{to} eventos"
 
 de: &de
+  edit_order: Bestellung bearbeiten
+  select: Auswählen
+  invite_form_fields: Formularfelder einladen
   pro: Pro
   default_parties: Standardparteien
   authenticate_embedded_form_preview_with_token: Authentifizieren Sie die eingebettete Formularvorschau mit Token
@@ -4384,8 +4455,6 @@ de: &de
   team_access: Teamzugang
   remove_filter: Filter entfernen
   document_download_filename_format: Format des Dateinamens beim Herunterladen von Dokumenten
-  document_name: Dokumentname
-  unarchive: Wiederherstellen
   awaiting_completion_by_the_other_party: "Warten auf die Fertigstellung durch die andere Partei"
   enforce_recipients_order: 'Empfängerreihenfolge durchsetzen'
   first_party: 'Erste Partei'
@@ -4406,7 +4475,7 @@ de: &de
   please_check_the_copy_of_your_name_in_the_email_attachments: 'Bitte überprüfe die Kopie von "%{name}" im E-Mail-Anhang.'
   review_and_sign: Überprüfen und unterschreiben
   review_and_submit: Überprüfen und einreichen
-  please_contact_us_by_replying_to_this_email_if_you_didn_t_request_this: 'Bitte kontaktiere uns, indem du auf diese E-Mail antwortest, falls du Fragen hast.'
+  please_contact_us_by_replying_to_this_email_if_you_have_any_questions: 'Bitte kontaktieren Sie uns, indem Sie auf diese E-Mail antworten, falls Sie Fragen haben.'
   submitter_invitation_sms_body_sign: '{account.name} hat dich eingeladen, ein Dokument zu unterschreiben: {submitter.link}'
   verification_code_sms_body: 'Verifizierungscode: {code}'
   you_are_invited_to_submit_a_form: Du wurdest eingeladen, ein Formular einzureichen
@@ -4418,11 +4487,11 @@ de: &de
   submitter_invitation_email_sign_body: |
     Hallo,
 
-    Du wurdest eingeladen, das Dokument "{template.name}" zu unterschreiben.
+    Du wurdest eingeladen, "{template.name}" zu unterschreiben.
 
     [Überprüfen und unterschreiben]({submitter.link})
 
-    Bitte kontaktiere uns, falls du Fragen hast.
+    Bitte kontaktieren Sie uns, indem Sie auf diese E-Mail antworten, falls Sie Fragen haben.
 
     Danke,
     {account.name}
@@ -4435,8 +4504,8 @@ de: &de
   submitter_documents_copy_email_body: |
     Hallo,
 
-    Bitte überprüfe die Kopie deines "{template.name}" im E-Mail-Anhang.
-    Alternativ kannst du deine Kopie mit dem untenstehenden Link überprüfen und herunterladen:
+    Bitte überprüfe die Kopie von "{template.name}" im E-Mail-Anhang.
+    Du kannst alternativ deine Kopie mit dem untenstehenden Link überprüfen und herunterladen:
 
     [{template.name}]({documents.link})
 
@@ -4730,7 +4799,6 @@ de: &de
   send_signature_request_emails_without_limits_with_docuseal_pro: Unterschriftsanfragen ohne Limits mit DocuSeal Pro senden
   count_emails_used: '%{count} E-Mails verwendet'
   has_been_connected: wurde verbunden
-  but_not_activated: aber nicht aktiviert
   sms_not_configured: SMS nicht konfiguriert
   configure_sms_settings_in_order_to_send_text_messages_: 'Konfiguriere die SMS-Einstellungen, um Textnachrichten zu senden:'
   go_to_sms_settings: Zu den SMS-Einstellungen gehen
@@ -4792,6 +4860,10 @@ de: &de
   users_count_total_users_count_pro_users_limit_was_reached_to_invite_additional_users_please_purchase_more_pro_user_seats_via_the_manage_plan_button: 'Das Limit von %{users_count}/%{total_users_count} Pro-Benutzern wurde erreicht. Um weitere Benutzer einzuladen, kaufen Sie bitte zusätzliche Pro-Benutzerplätze über die Schaltfläche "Plan verwalten".'
   move_into_folder: In Ordner verschieben
   new_folder_name: Neuer Ordnername
+  new_subfolder_name: Neuer Unterordnername
+  change_parent_folder: Übergeordneten Ordner ändern
+  folder: Ordner
+  create_a_new_folder: Neuen Ordner erstellen
   exit_preview: Vorschau beenden
   general: Allgemein
   recipients: Empfänger
@@ -4824,7 +4896,6 @@ de: &de
   edit_user: Benutzer bearbeiten
   new_user: Neuer Benutzer
   unarchive: Entarchivieren
-  role: Rolle
   last_session: Letzte Sitzung
   unlock_more_user_roles_with_docuseal_pro: Weitere Benutzerrollen mit DocuSeal Pro freischalten.
   view_active: Aktive anzeigen
@@ -4891,8 +4962,6 @@ de: &de
   new_webhook: Neuer Webhook
   delete_webhook: Webhook löschen
   count_submissions_have_been_created: '%{count} Einreichungen wurden erstellt.'
-  gmail_has_been_connected: Gmail wurde verbunden.
-  microsoft_account_has_been_connected: Microsoft-Konto wurde verbunden.
   sms_length_cant_be_longer_than_120_bytes: Die SMS-Länge darf 120 Bytes nicht überschreiten.
   connected_successfully: Erfolgreich verbunden.
   user_nameid_not_found: 'Benutzer %{nameid} nicht gefunden.'
@@ -5111,6 +5180,19 @@ de: &de
   email_verification: E-Mail-Verifizierung
   your_verification_code_to_access_the_name: 'Ihr Verifizierungscode für den Zugriff auf "%{name}":'
   please_reply_to_this_email_if_you_didnt_request_this: Antworten Sie auf diese E-Mail, wenn Sie dies nicht angefordert haben.
+  advanced_settings: Erweiterte Einstellungen
+  text: Text
+  code: Code
+  custom_html_emails: Benutzerdefinierte HTML-E-Mails
+  connect_your_email_to_send_html_emails: Verbinden Sie Ihr E-Mail-Konto, um HTML-E-Mails zu senden
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_send_custom_html_emails: Verbinden Sie Ihr Gmail- oder Outlook-Konto oder fügen Sie SMTP-Einstellungen hinzu, um benutzerdefinierte HTML-E-Mails zu senden.
+  connect_gmail_or_outlook: Gmail oder Outlook verbinden
+  connect_your_email_to_bulk_send: Verbinden Sie Ihr E-Mail-Konto für Massenversand
+  connect_your_email_or_outlook_account_or_add_smtp_settings_to_bulk_send: Verbinden Sie Ihr Gmail- oder Outlook-Konto oder fügen Sie SMTP-Einstellungen für den Massenversand hinzu.
+  are_you_sure_you_want_to_add_recipients_without_sending_to_send_emails_it_requires_to_connect_gmail_or_outlook: Möchten Sie wirklich Empfänger hinzufügen, ohne zu senden? Zum Senden von E-Mails ist eine Verbindung zu Gmail oder Outlook erforderlich.
+  template_name_has_been_completed_by_submitters_html: '"<strong>{template.name}</strong>" wurde von <strong>{submission.submitters}</strong> abgeschlossen'
+  please_check_the_copy_of_your_template_name_in_the_email_attachments_html: 'Bitte prüfen Sie die Kopie Ihres "<strong>{template.name}</strong>" in den E-Mail-Anhängen.'
+  you_have_been_invited_to_sign_the_template_name_html: 'Du wurdest eingeladen, "<strong>{template.name}</strong>" zu unterschreiben.'
   submission_sources:
     api: API
     bulk: Massenversand

config/routes.rb

@@ -108,6 +108,7 @@ Rails.application.routes.draw do
     resource :preferences, only: %i[show create], controller: 'templates_preferences'
     resource :share_link, only: %i[show create], controller: 'templates_share_link'
     resources :recipients, only: %i[create], controller: 'templates_recipients'
+    resources :prefillable_fields, only: %i[create], controller: 'templates_prefillable_fields'
     resources :submissions_export, only: %i[index new]
   end
   resources :preview_document_page, only: %i[show], path: '/preview/:signed_uuid'

db/migrate/20240816072859_populate_submitter_account_id.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PopulateSubmitterAccountId < ActiveRecord::Migration[7.1]
-  disable_ddl_transaction
+  disable_ddl_transaction!
 
   class MigrationSubmitter < ApplicationRecord
     self.table_name = 'submitters'

db/migrate/20241022125135_populate_completed_submitters_and_documents.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PopulateCompletedSubmittersAndDocuments < ActiveRecord::Migration[7.2]
-  disable_ddl_transaction
+  disable_ddl_transaction!
 
   class MigrationSubmitter < ApplicationRecord
     self.table_name = 'submitters'

db/migrate/20241029192232_populate_webhook_urls.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PopulateWebhookUrls < ActiveRecord::Migration[7.2]
-  disable_ddl_transaction
+  disable_ddl_transaction!
 
   class MigrationWebhookUrl < ActiveRecord::Base
     self.table_name = 'webhook_urls'

db/migrate/20250523121121_add_shared_link_to_templates.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddSharedLinkToTemplates < ActiveRecord::Migration[8.0]
-  disable_ddl_transaction
+  disable_ddl_transaction!
 
   class MigrationTemplate < ActiveRecord::Base
     self.table_name = 'templates'

db/migrate/20250603105556_create_search_enties.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 class CreateSearchEnties < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
   def up
     return unless adapter_name == 'PostgreSQL'
 
-    enable_extension 'btree_gin'
-
     create_table :search_entries do |t|
       t.references :record, null: false, polymorphic: true, index: false
       t.bigint :account_id, null: false
@@ -14,12 +14,24 @@ class CreateSearchEnties < ActiveRecord::Migration[8.0]
       t.timestamps
     end
 
-    add_index :search_entries, %i[account_id tsvector], using: :gin, where: "record_type = 'Submitter'",
-                                                        name: 'index_search_entries_on_account_id_tsvector_submitter'
-    add_index :search_entries, %i[account_id tsvector], using: :gin, where: "record_type = 'Submission'",
-                                                        name: 'index_search_entries_on_account_id_tsvector_submission'
-    add_index :search_entries, %i[account_id tsvector], using: :gin, where: "record_type = 'Template'",
-                                                        name: 'index_search_entries_on_account_id_tsvector_template'
+    begin
+      enable_extension 'btree_gin'
+    rescue StandardError
+      nil
+    end
+
+    btree_gin_enabled = extension_enabled?('btree_gin')
+
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Submitter'",
+              name: 'index_search_entries_on_account_id_tsvector_submitter'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Submission'",
+              name: 'index_search_entries_on_account_id_tsvector_submission'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Template'",
+              name: 'index_search_entries_on_account_id_tsvector_template'
+
     add_index :search_entries, %i[record_id record_type], unique: true
   end
 
@@ -28,6 +40,10 @@ class CreateSearchEnties < ActiveRecord::Migration[8.0]
 
     drop_table :search_entries
 
-    disable_extension 'btree_gin'
+    begin
+      disable_extension 'btree_gin'
+    rescue StandardError
+      nil
+    end
   end
 end

db/migrate/20250608163157_add_ngram_to_search_index.rb

@@ -4,13 +4,18 @@ class AddNgramToSearchIndex < ActiveRecord::Migration[8.0]
   def change
     return unless adapter_name == 'PostgreSQL'
 
+    btree_gin_enabled = extension_enabled?('btree_gin')
+
     add_column :search_entries, :ngram, :tsvector
 
-    add_index :search_entries, %i[account_id ngram], using: :gin, where: "record_type = 'Submitter'",
-                                                     name: 'index_search_entries_on_account_id_ngram_submitter'
-    add_index :search_entries, %i[account_id ngram], using: :gin, where: "record_type = 'Submission'",
-                                                     name: 'index_search_entries_on_account_id_ngram_submission'
-    add_index :search_entries, %i[account_id ngram], using: :gin, where: "record_type = 'Template'",
-                                                     name: 'index_search_entries_on_account_id_ngram_template'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Submitter'",
+              name: 'index_search_entries_on_account_id_ngram_submitter'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Submission'",
+              name: 'index_search_entries_on_account_id_ngram_submission'
+    add_index :search_entries, btree_gin_enabled ? %i[account_id tsvector] : :tsvector,
+              using: :gin, where: "record_type = 'Template'",
+              name: 'index_search_entries_on_account_id_ngram_template'
   end
 end

db/migrate/20250718121133_add_parent_folder_id_to_template_folders.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddParentFolderIdToTemplateFolders < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :template_folders, :parent_folder, foreign_key: { to_table: :template_folders }, index: true
+  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[8.0].define(version: 2025_06_27_130628) do
+ActiveRecord::Schema[8.0].define(version: 2025_07_18_121133) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "plpgsql"
@@ -356,8 +356,10 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_130628) do
     t.datetime "archived_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "parent_folder_id"
     t.index ["account_id"], name: "index_template_folders_on_account_id"
     t.index ["author_id"], name: "index_template_folders_on_author_id"
+    t.index ["parent_folder_id"], name: "index_template_folders_on_parent_folder_id"
   end
 
   create_table "template_sharings", force: :cascade do |t|
@@ -498,6 +500,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_130628) do
   add_foreign_key "submitters", "submissions"
   add_foreign_key "template_accesses", "templates"
   add_foreign_key "template_folders", "accounts"
+  add_foreign_key "template_folders", "template_folders", column: "parent_folder_id"
   add_foreign_key "template_folders", "users", column: "author_id"
   add_foreign_key "template_sharings", "templates"
   add_foreign_key "templates", "accounts"