optimize for large files

https://github.com/devise-two-factor/devise-two-factor#disabling-automatic-login-after-password-resets
thanks Greg Molnar

.rubocop.yml

@@ -67,6 +67,9 @@ RSpec/MultipleMemoizedHelpers:
 Rails/I18nLocaleTexts:
   Enabled: false
 
+Rails/FindEach:
+  Enabled: false
+
 Rails/SkipsModelValidations:
   Enabled: false
 

app/controllers/api/submissions_controller.rb

@@ -106,7 +106,7 @@ module Api
 
     def submissions_params
       params.permit(submission: [{
-                      submitters: [[:uuid, :name, :email, :role, :completed, :phone,
+                      submitters: [[:uuid, :name, :email, :role, :completed, :phone, :application_key,
                                     { values: {}, readonly_fields: [],
                                       fields: [%i[name default_value readonly validation_pattern invalid_message]] }]]
                     }])

app/controllers/api/submitters_controller.rb

@@ -4,6 +4,27 @@ module Api
   class SubmittersController < ApiBaseController
     load_and_authorize_resource :submitter
 
+    def index
+      submitters = Submitters.search(@submitters, params[:q])
+
+      submitters = submitters.where(application_key: params[:application_key]) if params[:application_key].present?
+      submitters = submitters.where(submission_id: params[:submission_id]) if params[:submission_id].present?
+
+      submitters = paginate(
+        submitters.preload(:template, :submission, :submission_events,
+                           documents_attachments: :blob, attachments_attachments: :blob)
+      )
+
+      render json: {
+        data: submitters.map { |s| Submitters::SerializeForApi.call(s, with_template: true, with_events: true) },
+        pagination: {
+          count: submitters.size,
+          next: submitters.last&.id,
+          prev: submitters.first&.id
+        }
+      }
+    end
+
     def show
       Submissions::EnsureResultGenerated.call(@submitter) if @submitter.completed_at?
 

app/controllers/api/templates_documents_controller.rb

@@ -16,6 +16,7 @@ module Api
       render json: {
         schema:,
         documents: documents.as_json(
+          methods: [:metadata],
           include: {
             preview_images: { methods: %i[url metadata filename] }
           }

app/controllers/enquiries_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class EnquiriesController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def create
+    if params[:talk_to_sales] == 'on'
+      Faraday.post(Docuseal::ENQUIRIES_URL,
+                   enquiry_params.merge(type: :talk_to_sales).to_json,
+                   'Content-Type' => 'application/json')
+    end
+
+    head :ok
+  end
+
+  private
+
+  def enquiry_params
+    params.require(:user).permit(:email)
+  end
+end

app/controllers/passwords_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class PasswordsController < Devise::PasswordsController
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :user
+  end
+
+  def update
+    super do |resource|
+      Current.user = resource
+    end
+  end
+end

app/controllers/preview_document_page_controller.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+class PreviewDocumentPageController < ActionController::API
+  include ActiveStorage::SetCurrent
+
+  FORMAT = Templates::ProcessDocument::FORMAT
+
+  def show
+    if Docuseal.multitenant?
+      Rollbar.warning('load page')
+
+      return head :not_found
+    end
+
+    attachment = ActiveStorage::Attachment.find_by(uuid: params[:attachment_uuid])
+
+    return head :not_found unless attachment
+
+    preview_image = attachment.preview_images.joins(:blob).find_by(blob: { filename: "#{params[:id]}#{FORMAT}" })
+
+    return redirect_to preview_image.url, allow_other_host: true if preview_image
+
+    file_path =
+      if attachment.service.name == :disk
+        ActiveStorage::Blob.service.path_for(attachment.key)
+      else
+        find_or_create_document_tempfile_path(attachment)
+      end
+
+    io = Templates::ProcessDocument.generate_pdf_preview_from_file(attachment, file_path, params[:id].to_i)
+
+    render plain: io.tap(&:rewind).read
+  end
+
+  def find_or_create_document_tempfile_path(attachment)
+    file_path = "#{Dir.tmpdir}/#{attachment.uuid}"
+
+    File.open(file_path, File::RDWR | File::CREAT, 0o644) do |f|
+      f.flock(File::LOCK_EX)
+
+      # rubocop:disable Style/ZeroLengthPredicate
+      if f.size.zero?
+        f.binmode
+
+        f.write(attachment.download)
+      end
+      # rubocop:enable Style/ZeroLengthPredicate
+    end
+
+    file_path
+  end
+end

app/controllers/registrations_controller.rb

@@ -31,10 +31,10 @@ class RegistrationsController < Devise::RegistrationsController
     redirect_to after_sign_up_path_for(current_user), allow_other_host: true
   end
 
-  def require_no_authentication
-    super
+  def set_flash_message(key, kind, options = {})
+    return if key == :alert && kind == 'already_authenticated'
 
-    flash.clear
+    super
   end
 
   def build_resource(_hash = {})

app/controllers/sessions_controller.rb

@@ -32,9 +32,9 @@ class SessionsController < Devise::SessionsController
     devise_parameter_sanitizer.permit(:sign_in, keys: [:otp_attempt])
   end
 
-  def require_no_authentication
-    super
+  def set_flash_message(key, kind, options = {})
+    return if key == :alert && kind == 'already_authenticated'
 
-    flash.clear
+    super
   end
 end

app/controllers/start_form_controller.rb

@@ -14,7 +14,8 @@ class StartFormController < ApplicationController
 
   def update
     @submitter = Submitter.where(submission: @template.submissions.where(deleted_at: nil))
-                          .find_or_initialize_by(email: submitter_params[:email])
+                          .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
+                          .find_or_initialize_by(**submitter_params.compact_blank)
 
     if @submitter.completed_at?
       redirect_to start_form_completed_path(@template.slug, email: submitter_params[:email])
@@ -46,7 +47,7 @@ class StartFormController < ApplicationController
   private
 
   def submitter_params
-    params.require(:submitter).permit(:email).tap do |attrs|
+    params.require(:submitter).permit(:email, :phone).tap do |attrs|
       attrs[:email] = Submissions.normalize_email(attrs[:email])
     end
   end

app/controllers/submissions_controller.rb

@@ -6,12 +6,24 @@ class SubmissionsController < ApplicationController
 
   load_and_authorize_resource :submission, only: %i[show destroy]
 
+  PRELOAD_ALL_PAGES_AMOUNT = 200
+
   def show
     ActiveRecord::Associations::Preloader.new(
       records: [@submission],
-      associations: [:template, { template_schema_documents: [:blob, { preview_images_attachments: :blob }] }]
+      associations: [:template, { template_schema_documents: :blob }]
     ).call
 
+    total_pages =
+      @submission.template_schema_documents.sum { |e| e.metadata.dig('pdf', 'number_of_pages').to_i }
+
+    if total_pages < PRELOAD_ALL_PAGES_AMOUNT
+      ActiveRecord::Associations::Preloader.new(
+        records: @submission.template_schema_documents,
+        associations: [:blob, { preview_images_attachments: :blob }]
+      ).call
+    end
+
     render :show, layout: 'plain'
   end
 

app/controllers/submit_form_controller.rb

@@ -6,15 +6,28 @@ class SubmitFormController < ApplicationController
   skip_before_action :authenticate_user!
   skip_authorization_check
 
+  PRELOAD_ALL_PAGES_AMOUNT = 200
+
   def show
-    @submitter =
-      Submitter.preload(submission: [
-                          :template, { template_schema_documents: [:blob, { preview_images_attachments: :blob }] }
-                        ])
-               .find_by!(slug: params[:slug])
+    @submitter = Submitter.find_by!(slug: params[:slug])
 
     return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
 
+    ActiveRecord::Associations::Preloader.new(
+      records: [@submitter],
+      associations: [submission: [:template, { template_schema_documents: :blob }]]
+    ).call
+
+    total_pages =
+      @submitter.submission.template_schema_documents.sum { |e| e.metadata.dig('pdf', 'number_of_pages').to_i }
+
+    if total_pages < PRELOAD_ALL_PAGES_AMOUNT
+      ActiveRecord::Associations::Preloader.new(
+        records: @submitter.submission.template_schema_documents,
+        associations: [:blob, { preview_images_attachments: :blob }]
+      ).call
+    end
+
     Submitters::MaybeUpdateDefaultValues.call(@submitter, current_user)
 
     cookies[:submitter_sid] = @submitter.signed_id

app/controllers/templates_controller.rb

@@ -10,6 +10,11 @@ class TemplatesController < ApplicationController
     submissions = submissions.active if @template.deleted_at.blank?
     submissions = Submissions.search(submissions, params[:q])
 
+    @base_submissions = submissions
+
+    submissions = submissions.pending if params[:status] == 'pending'
+    submissions = submissions.completed if params[:status] == 'completed'
+
     @pagy, @submissions = pagy(submissions.preload(:submitters).order(id: :desc))
   rescue ActiveRecord::RecordNotFound
     redirect_to root_path
@@ -25,6 +30,14 @@ class TemplatesController < ApplicationController
       associations: [schema_documents: { preview_images_attachments: :blob }]
     ).call
 
+    @template_data =
+      @template.as_json.merge(
+        documents: @template.schema_documents.as_json(
+          methods: [:metadata],
+          include: { preview_images: { methods: %i[url metadata filename] } }
+        )
+      ).to_json
+
     render :edit, layout: 'plain'
   end
 

app/javascript/submission_form/completed.vue

@@ -78,7 +78,7 @@
     >
       {{ t('signed_with') }}
       <a
-        href="https://www.docuseal.co"
+        href="https://www.docuseal.co/start"
         target="_blank"
         class="underline"
       >DocuSeal</a> - {{ t('open_source_documents_software') }}

app/javascript/submission_form/form.vue

@@ -425,7 +425,7 @@ export default {
     allowToSkip: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     },
     goToLast: {
       type: Boolean,
@@ -461,7 +461,6 @@ export default {
       currentStep: 0,
       isSubmitting: false,
       submittedValues: {},
-      isSecondWalkthrough: false,
       recalculateButtonDisabledKey: ''
     }
   },
@@ -662,7 +661,7 @@ export default {
 
       stepPromise().then(async () => {
         const emptyRequiredField = this.stepFields.find((fields, index) => {
-          return index < this.currentStep && fields[0].required && (fields[0].type === 'phone' || !this.allowToSkip || !this.isSecondWalkthrough) && !this.submittedValues[fields[0].uuid]
+          return index < this.currentStep && fields[0].required && (fields[0].type === 'phone' || !this.allowToSkip) && !this.submittedValues[fields[0].uuid]
         })
 
         const formData = new FormData(this.$refs.form)

app/javascript/template_builder/document.vue

@@ -56,8 +56,26 @@ export default {
     }
   },
   computed: {
+    numberOfPages () {
+      return this.document.metadata?.pdf?.number_of_pages || this.document.preview_images.length
+    },
     sortedPreviewImages () {
-      return [...this.document.preview_images].sort((a, b) => parseInt(a.filename) - parseInt(b.filename))
+      const lazyloadMetadata = this.document.preview_images[this.document.preview_images.length - 1].metadata
+
+      return [...Array(this.numberOfPages).keys()].map((i) => {
+        return this.previewImagesIndex[i] || {
+          metadata: lazyloadMetadata,
+          id: Math.random().toString(),
+          url: `/preview/${this.document.uuid}/${i}.jpg`
+        }
+      })
+    },
+    previewImagesIndex () {
+      return this.document.preview_images.reduce((acc, e) => {
+        acc[parseInt(e.filename)] = e
+
+        return acc
+      }, {})
     }
   },
   beforeUpdate () {

app/javascript/template_builder/page.vue

@@ -5,11 +5,12 @@
   >
     <img
       ref="image"
+      loading="lazy"
       :src="image.url"
       :width="width"
-      class="border rounded mb-4"
       :height="height"
-      loading="lazy"
+      class="border rounded mb-4"
+      @load="onImageLoad"
     >
     <div
       class="top-0 bottom-0 left-0 right-0 absolute"
@@ -117,6 +118,10 @@ export default {
     this.areaRefs = []
   },
   methods: {
+    onImageLoad (e) {
+      e.target.setAttribute('width', e.target.naturalWidth)
+      e.target.setAttribute('height', e.target.naturalHeight)
+    },
     setAreaRefs (el) {
       if (el) {
         this.areaRefs.push(el)

app/javascript/template_builder/preview.vue

@@ -114,7 +114,7 @@ export default {
   emits: ['scroll-to', 'change', 'remove', 'up', 'down', 'replace'],
   computed: {
     previewImage () {
-      return this.document.preview_images[0]
+      return [...this.document.preview_images].sort((a, b) => parseInt(a.filename) - parseInt(b.filename))[0]
     }
   },
   mounted () {

app/mailers/submitter_mailer.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SubmitterMailer < ApplicationMailer
+  MAX_ATTACHMENTS_SIZE = 10.megabytes
+
   def invitation_email(submitter, body: nil, subject: nil)
     @current_account = submitter.submission.template.account
     @submitter = submitter
@@ -75,14 +77,26 @@ class SubmitterMailer < ApplicationMailer
   def add_completed_email_attachments!(submitter)
     documents = Submitters.select_attachments_for_download(submitter)
 
-    documents.each do |attachment|
-      attachments[attachment.filename.to_s] = attachment.download
-    end
+    total_size = 0
+    audit_trail_data = nil
 
     if submitter.submission.audit_trail.present?
-      attachments[submitter.submission.audit_trail.filename.to_s] = submitter.submission.audit_trail.download
+      audit_trail_data = submitter.submission.audit_trail.download
+
+      total_size = audit_trail_data.size
     end
 
+    documents.each do |attachment|
+      data = attachment.download
+      total_size += data.size
+
+      break if total_size >= MAX_ATTACHMENTS_SIZE
+
+      attachments[attachment.filename.to_s] = data
+    end
+
+    attachments[submitter.submission.audit_trail.filename.to_s] = audit_trail_data if audit_trail_data
+
     documents
   end
 

app/models/encrypted_user_config.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: encrypted_user_configs
+#
+#  id         :bigint           not null, primary key
+#  key        :string           not null
+#  value      :text             not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  user_id    :bigint           not null
+#
+# Indexes
+#
+#  index_encrypted_user_configs_on_user_id          (user_id)
+#  index_encrypted_user_configs_on_user_id_and_key  (user_id,key) UNIQUE
+#
+# Foreign Keys
+#
+#  fk_rails_...  (user_id => users.id)
+#
+class EncryptedUserConfig < ApplicationRecord
+  belongs_to :user
+
+  encrypts :value
+
+  serialize :value, JSON
+end

app/models/submission.rb

@@ -48,6 +48,8 @@ class Submission < ApplicationRecord
            through: :template, source: :documents_attachments
 
   scope :active, -> { where(deleted_at: nil) }
+  scope :pending, -> { joins(:submitters).where(submitters: { completed_at: nil }).distinct }
+  scope :completed, -> { left_joins(:submitters).where.not(submitters: { completed_at: nil }).distinct }
 
   enum :source, {
     invite: 'invite',

app/models/submitter.rb

@@ -4,21 +4,22 @@
 #
 # Table name: submitters
 #
-#  id            :bigint           not null, primary key
-#  completed_at  :datetime
-#  email         :string
-#  ip            :string
-#  name          :string
-#  opened_at     :datetime
-#  phone         :string
-#  sent_at       :datetime
-#  slug          :string           not null
-#  ua            :string
-#  uuid          :string           not null
-#  values        :text             not null
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
-#  submission_id :bigint           not null
+#  id              :bigint           not null, primary key
+#  application_key :string
+#  completed_at    :datetime
+#  email           :string
+#  ip              :string
+#  name            :string
+#  opened_at       :datetime
+#  phone           :string
+#  sent_at         :datetime
+#  slug            :string           not null
+#  ua              :string
+#  uuid            :string           not null
+#  values          :text             not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  submission_id   :bigint           not null
 #
 # Indexes
 #

app/models/user.rb

@@ -53,6 +53,7 @@ class User < ApplicationRecord
   has_one :access_token, dependent: :destroy
   has_many :templates, dependent: :destroy, foreign_key: :author_id, inverse_of: :author
   has_many :user_configs, dependent: :destroy
+  has_many :encrypted_configs, dependent: :destroy, class_name: 'EncryptedUserConfig'
 
   devise :two_factor_authenticatable, :recoverable, :rememberable, :validatable, :trackable
   devise :registerable, :omniauthable, omniauth_providers: [:google_oauth2] if Docuseal.multitenant?
@@ -75,6 +76,14 @@ class User < ApplicationRecord
     true
   end
 
+  def self.sign_in_after_reset_password
+    if PasswordsController::Current.user.present?
+      !PasswordsController::Current.user.otp_required_for_login
+    else
+      true
+    end
+  end
+
   def initials
     [first_name&.first, last_name&.first].compact_blank.join.upcase
   end

app/views/devise/registrations/new.html.erb

@@ -41,6 +41,13 @@
     </div>
     <div class="form-control">
       <%= f.button button_title(title: 'Sign up', disabled_with: 'Signing up'), class: 'base-button' %>
+      <% if Docuseal.multitenant? %>
+        <button id="talk_to_sales_button" class="hidden" type="submit" formaction="<%= enquiries_path %>" formnovalidate="true" formmethod="post"></button>
+        <label class="flex items-center cursor-pointer">
+          <input type="checkbox" name="talk_to_sales" class="base-checkbox" onchange="window.talk_to_sales_button.click()">
+          <span class="label">I would like to talk to sales</span>
+        </label>
+      <% end %>
     </div>
   <% end %>
   <%= render 'devise/shared/links' %>

app/views/icons/_clock.html.erb

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

app/views/icons/_list.html.erb

@@ -0,0 +1,9 @@
+<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="M9 6l11 0" />
+  <path d="M9 12l11 0" />
+  <path d="M9 18l11 0" />
+  <path d="M5 6l0 .01" />
+  <path d="M5 12l0 .01" />
+  <path d="M5 18l0 .01" />
+</svg>

app/views/icons/_reload.html.erb

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="2" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+  <path d="M19.933 13.041a8 8 0 1 1 -9.925 -8.788c3.899 -1 7.935 1.007 9.425 4.747"></path>
+  <path d="M20 4v5h-5"></path>
+</svg>

app/views/profile/index.html.erb

@@ -21,6 +21,7 @@
         <%= f.button button_title(title: 'Update', disabled_with: 'Updating'), class: 'base-button' %>
       </div>
     <% end %>
+    <%= render 'email_configs' %>
     <p class="text-2xl font-bold mt-8 mb-4">Signature</p>
     <% signature = UserConfigs.load_signature(current_user) %>
     <% if signature %>

app/views/send_submission_email/success.html.erb

@@ -10,4 +10,4 @@
     </div>
   </div>
 </div>
-<%= render 'shared/attribution' %>
+<%= render 'shared/attribution', link_path: '/start' %>

app/views/shared/_attribution.html.erb

@@ -1 +1 @@
-<%= render 'shared/powered_by', with_counter: local_assigns[:with_counter] %>
+<%= render 'shared/powered_by', with_counter: local_assigns[:with_counter], link_path: local_assigns[:link_path] %>

app/views/shared/_email_attribution.html.erb

@@ -2,5 +2,5 @@
   ---
 </p>
 <p>
-  Sent using <a href="<%= Docuseal::PRODUCT_URL %>"><%= Docuseal.product_name %></a> free document signing.
+  Sent using <a href="<%= Docuseal::PRODUCT_URL %>/start"><%= Docuseal.product_name %></a> free document signing.
 </p>

app/views/shared/_powered_by.html.erb

@@ -9,5 +9,5 @@
   <% else %>
     Powered by
   <% end %>
-  <a href="<%= Docuseal::PRODUCT_URL %>" class="underline"><%= Docuseal.product_name %></a> - open source documents software
+  <a href="<%= Docuseal::PRODUCT_URL %><%= local_assigns[:link_path] %>" class="underline"><%= Docuseal.product_name %></a> - open source documents software
 </div>

app/views/shared/_search_input.html.erb

@@ -1,7 +1,10 @@
-<form action="<%= request.path %>" method="get" class="items-center hidden md:flex">
+<form action="<%= url_for %>" method="get" class="items-center hidden md:flex">
+  <% if params[:status].present? %>
+    <input name="status" value="<%= params[:status] %>" class="hidden">
+  <% end %>
   <% if params[:q].present? %>
     <div class="relative">
-      <a href="<%= request.path %>" title="Clear" class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-auto text-neutral text-2xl font-extralight">
+      <a href="<%= url_for(params.to_unsafe_h.except(:q)) %>" title="Clear" class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-auto text-neutral text-2xl font-extralight">
         &times;
       </a>
     </div>

app/views/start_form/completed.html.erb

@@ -24,6 +24,9 @@
         <%= button_to button_title(title: 'Send copy to Email', disabled_with: 'Sending', icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'base-button w-full' %>
       </div>
     <% end %>
+    <div>
+      <%= button_to button_title(title: 'Resubmit', disabled_with: 'Resubmit', icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: { email: params[:email] }, resubmit: true }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
+    </div>
   </div>
 </div>
-<%= render 'shared/attribution' %>
+<%= render 'shared/attribution', link_path: '/start' %>

app/views/start_form/show.html.erb

@@ -24,7 +24,7 @@
       </div>
     </div>
     <% unless @template.deleted_at? %>
-      <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %>
+      <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4', onsubmit: 'event.submitter.disabled = true' } do |f| %>
         <div class="form-control !mt-0">
           <%= f.label :email, class: 'label' %>
           <%= f.email_field :email, value: current_user&.email, required: true, class: 'base-input', placeholder: 'Provide your email to start' %>
@@ -36,4 +36,4 @@
     <% end %>
   </div>
 </div>
-<%= render 'shared/attribution' %>
+<%= render 'shared/attribution', link_path: '/start' %>

app/views/submissions/_send_email.html.erb

@@ -41,6 +41,7 @@
           <%= f.text_area :body, value: config.value['body'], required: true, class: 'base-textarea w-full', rows: 10 %>
         </autoresize-textarea>
       </div>
+      <%= render 'message_fields' %>
     </div>
   </div>
 </div>

app/views/submissions/new.html.erb

@@ -23,4 +23,5 @@
       <%= render 'detailed_form', template: @template %>
     </div>
   </div>
+  <%= content_for(:modal_extra) %>
 <% end %>

app/views/submissions/show.html.erb

@@ -44,12 +44,16 @@
         <% fields_index = Templates.build_field_areas_index(@submission.template_fields || @submission.template.fields) %>
         <% values = @submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) } %>
         <% attachments_index = ActiveStorage::Attachment.where(record: @submission.submitters, name: :attachments).preload(:blob).index_by(&:uuid) %>
+        <% page_blob_struct = Struct.new(:url, :metadata, keyword_init: true) %>
         <% (@submission.template_schema || @submission.template.schema).each do |item| %>
           <% document = @submission.template_schema_documents.find { |e| e.uuid == item['attachment_uuid'] } %>
           <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %>
-          <% document.preview_images.sort_by { |a| a.filename.base.to_i }.each_with_index do |page, index| %>
+          <% preview_images_index = document.preview_images.loaded? ? document.preview_images.index_by { |e| e.filename.base.to_i } : {} %>
+          <% lazyload_metadata = document.preview_images.first.metadata %>
+          <% (document.metadata.dig('pdf', 'number_of_pages') || (document.preview_images.loaded? ? preview_images_index.size : document.preview_images.size)).times do |index| %>
+            <% page = preview_images_index[index] || page_blob_struct.new(metadata: lazyload_metadata, url: preview_document_page_path(document.uuid, "#{index}.jpg")) %>
             <div id="<%= "page-#{document.uuid}-#{index}" %>" class="relative">
-              <img src="<%= page.url %>" width="<%= page.metadata['width'] %>" class="shadow-md mb-4" height="<%= page.metadata['height'] %>" loading="lazy">
+              <img loading="lazy" src="<%= page.url %>" width="<%= page.metadata['width'] %>" class="shadow-md mb-4" height="<%= page.metadata['height'] %>">
               <div class="top-0 bottom-0 left-0 right-0 absolute">
                 <% document_annots_index[index]&.each do |annot| %>
                   <%= render 'submissions/annotation', annot: %>

app/views/submit_form/archived.html.erb

@@ -18,4 +18,4 @@
     </div>
   </div>
 </div>
-<%= render 'shared/attribution' %>
+<%= render 'shared/attribution', link_path: '/start' %>

app/views/submit_form/completed.html.erb

@@ -19,7 +19,11 @@
     <div>
       <% if Accounts.can_send_emails?(@submitter.submission.template.account) && @submitter.email.present? %>
         <%= button_to button_title(title: 'Send copy to Email', disabled_with: 'Sending', icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
-        <div class="divider">OR</div>
+        <% if @submitter.submission.template.submitters.size != 1 %>
+          <div class="divider">OR</div>
+        <% else %>
+          <div class="py-2"></div>
+        <% end %>
       <% end %>
       <download-button data-src="<%= submitter_download_index_path(@submitter.slug) %>" class="base-button w-full">
         <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
@@ -32,6 +36,12 @@
         </span>
       </download-button>
     </div>
+    <% if @submitter.submission.template.submitters.size == 1 %>
+      <div class="divider">OR</div>
+      <div>
+        <%= button_to button_title(title: 'Resubmit', disabled_with: 'Resubmit', icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@submitter.submission.template.slug), params: { submitter: { email: @submitter.email, phone: @submitter.phone }, resubmit: true }, method: :put, form: { onsubmit: 'event.submitter.disabled = true' }, class: 'white-button w-full' %>
+      </div>
+    <% end %>
   </div>
 </div>
-<%= render 'shared/attribution' %>
+<%= render 'shared/attribution', link_path: '/start' %>

app/views/submit_form/show.html.erb

@@ -1,6 +1,7 @@
 <% fields_index = Templates.build_field_areas_index(@submitter.submission.template_fields || @submitter.submission.template.fields) %>
 <% values = @submitter.submission.submitters.reduce({}) { |acc, sub| acc.merge(sub.values) } %>
 <% attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments).preload(:blob).index_by(&:uuid) %>
+<% page_blob_struct = Struct.new(:url, :metadata, keyword_init: true) %>
 <div style="max-height: -webkit-fill-available;">
   <div id="scrollbox">
     <div class="mx-auto block pb-72" style="max-width: 1000px">
@@ -10,9 +11,12 @@
       <% (@submitter.submission.template_schema || @submitter.submission.template.schema).each do |item| %>
         <% document = @submitter.submission.template_schema_documents.find { |a| a.uuid == item['attachment_uuid'] } %>
         <% document_annots_index = document.metadata.dig('pdf', 'annotations')&.group_by { |e| e['page'] } || {} %>
-        <% document.preview_images.sort_by { |a| a.filename.base.to_i }.each_with_index do |page, index| %>
+        <% preview_images_index = document.preview_images.loaded? ? document.preview_images.index_by { |e| e.filename.base.to_i } : {} %>
+        <% lazyload_metadata = document.preview_images.last.metadata %>
+        <% (document.metadata.dig('pdf', 'number_of_pages') || (document.preview_images.loaded? ? preview_images_index.size : document.preview_images.size)).times do |index| %>
+          <% page = preview_images_index[index] || page_blob_struct.new(metadata: lazyload_metadata, url: preview_document_page_path(document.uuid, "#{index}.jpg")) %>
           <div class="relative my-4 shadow-md">
-            <img src="<%= page.url %>" width="<%= page.metadata['width'] %>" height="<%= page.metadata['height'] %>" loading="lazy">
+            <img loading="lazy" src="<%= page.url %>" width="<%= page.metadata['width'] %>" height="<%= page.metadata['height'] %>">
             <div id="page-<%= [document.uuid, index].join('-') %>" class="top-0 bottom-0 left-0 right-0 absolute">
               <% document_annots_index[index]&.each do |annot| %>
                 <%= render 'submissions/annotation', annot: %>
@@ -27,7 +31,7 @@
           </div>
         <% end %>
       <% end %>
-      <%= render 'shared/attribution' %>
+      <%= render 'shared/attribution', link_path: '/start' %>
     </div>
   </div>
 </div>

app/views/templates/edit.html.erb

@@ -1 +1 @@
-<template-builder class="grid" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-template="<%= @template.as_json.merge(documents: @template.schema_documents.as_json(include: { preview_images: { methods: %i[url metadata filename] } })).to_json %>"></template-builder>
+<template-builder class="grid" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-template="<%= @template_data %>"></template-builder>

app/views/templates/show.html.erb

@@ -1,9 +1,10 @@
 <%= render 'title', template: @template %>
+<% is_show_tabs = @pagy.pages > 1 || params[:status].present? %>
 <% if !@pagy.count.zero? || @template.submitters.to_a.size == 1 || params[:q].present? %>
-  <div class="flex justify-between mb-6 md:items-end flex-col md:flex-row">
+  <div class="flex justify-between md:items-end flex-col md:flex-row <%= is_show_tabs ? 'mb-4' : 'mb-6' %>">
     <p class="text-3xl font-bold">Submissions</p>
-    <div class="flex space-x-2 mt-3 md:mt-0">
-      <% if params[:q].present? || @pagy.pages > 1 %>
+    <div class="flex md:space-x-2 mt-3 md:mt-0">
+      <% if params[:q].present? || params[:status].present? || @pagy.pages > 1 %>
         <%= render 'shared/search_input' %>
       <% end %>
       <%= link_to new_template_submissions_export_path(@template), class: 'order-3 md:order-1 btn btn-ghost text-base', data: { turbo_frame: 'modal' } do %>
@@ -24,6 +25,37 @@
     </div>
   </div>
 <% end %>
+<% if is_show_tabs %>
+  <div class="flex items-center md:items-end flex-col space-y-2 md:space-y-0 md:flex-row md:space-x-2 mb-4">
+    <a href="<%= url_for(params.to_unsafe_h.except(:status)) %>" class="<%= params[:status].blank? ? 'border-neutral-700' : 'border-neutral-300' %> flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-48 hover:border-neutral-600">
+      <div class="flex items-center space-x-1">
+        <%= svg_icon('list', class: 'w-5 h-5') %>
+        <span class="font-normal">All</span>
+      </div>
+      <div class="badge badge-neutral badge-outline font-medium">
+        <%= params[:status].blank? ? @pagy.count : @base_submissions.count %>
+      </div>
+    </a>
+    <a href="<%= url_for(params.to_unsafe_h.merge(status: :pending)) %>" class="<%= params[:status] == 'pending' ? 'border-neutral-700' : 'border-neutral-300' %> flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-48 hover:border-neutral-600">
+      <div class="flex items-center space-x-1">
+        <%= svg_icon('clock', class: 'w-5 h-5') %>
+        <span class="font-normal">Pending</span>
+      </div>
+      <div class="badge badge-neutral badge-outline font-medium">
+        <%= params[:status] == 'pending' ? @pagy.count : @base_submissions.pending.count %>
+      </div>
+    </a>
+    <a href="<%= url_for(params.to_unsafe_h.merge(status: :completed)) %>" class="<%= params[:status] == 'completed' ? 'border-neutral-700' : 'border-neutral-300' %> flex h-10 px-2 py-1 text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl w-full md:w-48 hover:border-neutral-600">
+      <div class="flex items-center space-x-1">
+        <%= svg_icon('circle_check', class: 'w-5 h-5') %>
+        <span class="font-normal">Completed</span>
+      </div>
+      <div class="badge badge-neutral badge-outline font-medium">
+        <%= params[:status] == 'completed' ? @pagy.count : @base_submissions.completed.count %>
+      </div>
+    </a>
+  </div>
+<% end %>
 <% if @submissions.present? %>
   <div class="space-y-4">
     <%= render partial: 'submission', collection: @submissions %>

config/routes.rb

@@ -9,7 +9,7 @@ Rails.application.routes.draw do
   devise_for :users,
              path: '/', only: %i[sessions passwords omniauth_callbacks],
              controllers: begin
-               options = { sessions: 'sessions' }
+               options = { sessions: 'sessions', passwords: 'passwords' }
                options[:omniauth_callbacks] = 'omniauth_callbacks' if Docuseal.multitenant?
                options
              end
@@ -35,7 +35,7 @@ Rails.application.routes.draw do
     resources :template_folders_autocomplete, only: %i[index]
     resources :submitter_email_clicks, only: %i[create]
     resources :submitter_form_views, only: %i[create]
-    resources :submitters, only: %i[show]
+    resources :submitters, only: %i[index show]
     resources :submissions, only: %i[index show create destroy] do
       collection do
         resources :emails, only: %i[create], controller: 'submissions', as: :submissions_emails
@@ -52,6 +52,7 @@ Rails.application.routes.draw do
   resources :dashboard, only: %i[index]
   resources :setup, only: %i[index create]
   resource :newsletter, only: %i[show update]
+  resources :enquiries, only: %i[create]
   resources :users, only: %i[new create edit update destroy]
   resource :user_signature, only: %i[edit update]
   resources :submissions, only: %i[show destroy]
@@ -66,6 +67,7 @@ Rails.application.routes.draw do
     resource :folder, only: %i[edit update], controller: 'templates_folders'
     resources :submissions_export, only: %i[index new]
   end
+  resources :preview_document_page, only: %i[show], path: '/preview/:attachment_uuid'
 
   resources :start_form, only: %i[show update], path: 'd', param: 'slug' do
     get :completed

db/migrate/20230924184657_create_encrypted_user_configs.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateEncryptedUserConfigs < ActiveRecord::Migration[7.0]
+  def change
+    create_table :encrypted_user_configs do |t|
+      t.references :user, null: false, foreign_key: true, index: true
+      t.string :key, null: false
+      t.text :value, null: false
+
+      t.index %i[user_id key], unique: true
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20231017213639_add_application_id_to_submitters.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddApplicationIdToSubmitters < ActiveRecord::Migration[7.0]
+  def change
+    add_column :submitters, :application_key, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_10_07_052818) do
+ActiveRecord::Schema[7.0].define(version: 2023_10_17_213639) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -91,6 +91,16 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_07_052818) do
     t.index ["account_id"], name: "index_encrypted_configs_on_account_id"
   end
 
+  create_table "encrypted_user_configs", force: :cascade do |t|
+    t.bigint "user_id", null: false
+    t.string "key", null: false
+    t.text "value", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_id", "key"], name: "index_encrypted_user_configs_on_user_id_and_key", unique: true
+    t.index ["user_id"], name: "index_encrypted_user_configs_on_user_id"
+  end
+
   create_table "submission_events", force: :cascade do |t|
     t.bigint "submission_id", null: false
     t.bigint "submitter_id"
@@ -133,6 +143,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_07_052818) do
     t.datetime "updated_at", null: false
     t.string "name"
     t.string "phone"
+    t.string "application_key"
     t.index ["email"], name: "index_submitters_on_email"
     t.index ["slug"], name: "index_submitters_on_slug", unique: true
     t.index ["submission_id"], name: "index_submitters_on_submission_id"
@@ -216,6 +227,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_07_052818) do
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "document_generation_events", "submitters"
   add_foreign_key "encrypted_configs", "accounts"
+  add_foreign_key "encrypted_user_configs", "users"
   add_foreign_key "submission_events", "submissions"
   add_foreign_key "submission_events", "submitters"
   add_foreign_key "submissions", "templates"

lib/ability.rb

@@ -10,6 +10,7 @@ class Ability
     can :manage, Submitter, template: { account_id: user.account_id }
     can :manage, User, account_id: user.account_id
     can :manage, EncryptedConfig, account_id: user.account_id
+    can :manage, EncryptedUserConfig, user_id: user.id
     can :manage, AccountConfig, account_id: user.account_id
     can :manage, UserConfig, user_id: user.id
     can :manage, Account, id: user.account_id

lib/docuseal.rb

@@ -3,6 +3,7 @@
 module Docuseal
   PRODUCT_URL = 'https://www.docuseal.co'
   NEWSLETTER_URL = "#{PRODUCT_URL}/newsletters".freeze
+  ENQUIRIES_URL = "#{PRODUCT_URL}/enquiries".freeze
   PRODUCT_NAME = 'DocuSeal'
   DEFAULT_APP_URL = 'http://localhost:3000'
   GITHUB_URL = 'https://github.com/docusealco/docuseal'

lib/submissions/create_from_submitters.rb

@@ -92,6 +92,7 @@ module Submissions
         email:,
         phone: attrs[:phone].to_s.gsub(/[^0-9+]/, ''),
         name: attrs[:name],
+        application_key: attrs[:application_key],
         completed_at: attrs[:completed] ? Time.current : nil,
         sent_at: mark_as_sent && email.present? && is_order_sent ? Time.current : nil,
         values: attrs[:values] || {},

lib/submissions/ensure_result_generated.rb

@@ -4,7 +4,7 @@ module Submissions
   module EnsureResultGenerated
     WAIT_FOR_RETRY = 2.seconds
     CHECK_EVENT_INTERVAL = 1.second
-    CHECK_COMPLETE_TIMEOUT = 20.seconds
+    CHECK_COMPLETE_TIMEOUT = 90.seconds
 
     WaitForCompleteTimeout = Class.new(StandardError)
 

lib/submitters/serialize_for_api.rb

@@ -18,7 +18,7 @@ module Submitters
 
       serialize_params = {
         include: {},
-        only: %i[id slug uuid name email phone completed_at
+        only: %i[id slug uuid name email phone completed_at application_key
                  opened_at sent_at created_at updated_at]
       }
 

lib/submitters/serialize_for_webhook.rb

@@ -24,8 +24,8 @@ module Submitters
     end
 
     def build_values_array(submitter)
-      fields_index = (submitter.submission.template_fields ||
-                      submitter.submission.template.fields).index_by { |e| e['uuid'] }
+      fields_index = (submitter.submission.template.fields +
+                      submitter.submission.template_fields.to_a).index_by { |e| e['uuid'] }
       attachments_index = submitter.attachments.index_by(&:uuid)
       submitter_field_counters = Hash.new { 0 }
 

lib/templates/clone_attachments.rb

@@ -13,13 +13,15 @@ module Templates
           record: template
         )
 
-        document.preview_images_attachments.each do |preview_image|
-          ActiveStorage::Attachment.create!(
-            uuid: preview_image.uuid,
-            blob_id: preview_image.blob_id,
-            name: 'preview_images',
-            record: new_document
-          )
+        ApplicationRecord.no_touching do
+          document.preview_images_attachments.each do |preview_image|
+            ActiveStorage::Attachment.create!(
+              uuid: preview_image.uuid,
+              blob_id: preview_image.blob_id,
+              name: 'preview_images',
+              record: new_document
+            )
+          end
         end
       end
     end

lib/templates/create_attachments.rb

@@ -3,6 +3,7 @@
 module Templates
   module CreateAttachments
     PDF_CONTENT_TYPE = 'application/pdf'
+    ANNOTATIONS_SIZE_LIMIT = 6.megabytes
     InvalidFileType = Class.new(StandardError)
 
     module_function
@@ -18,7 +19,10 @@ module Templates
         document = template.documents.create!(blob:)
 
         if blob.content_type == PDF_CONTENT_TYPE && blob.metadata['pdf'].nil?
-          blob.metadata['pdf'] = { 'annotations' => Templates::BuildAnnotations.call(document_data) }
+          annotations =
+            document_data.size > ANNOTATIONS_SIZE_LIMIT ? [] : Templates::BuildAnnotations.call(document_data)
+
+          blob.metadata['pdf'] = { 'annotations' => annotations }
           blob.metadata['sha256'] = Base64.urlsafe_encode64(Digest::SHA256.digest(document_data))
         end
 
@@ -37,9 +41,10 @@ module Templates
         data = file.read
 
         if file.content_type == PDF_CONTENT_TYPE
+          annotations = data.size > ANNOTATIONS_SIZE_LIMIT ? [] : Templates::BuildAnnotations.call(data)
           metadata = { 'identified' => true, 'analyzed' => true,
                        'sha256' => Base64.urlsafe_encode64(Digest::SHA256.digest(data)),
-                       'pdf' => { 'annotations' => Templates::BuildAnnotations.call(data) } }
+                       'pdf' => { 'annotations' => annotations } }
         end
 
         ActiveStorage::Blob.create_and_upload!(

lib/templates/process_document.rb

@@ -9,6 +9,12 @@ module Templates
     PDF_CONTENT_TYPE = 'application/pdf'
     Q = 35
     MAX_WIDTH = 1400
+    MAX_NUMBER_OF_PAGES_PROCESSED =
+      if Docuseal.multitenant?
+        70
+      else
+        40
+      end
 
     module_function
 
@@ -42,14 +48,38 @@ module Templates
 
     def generate_pdf_preview_images(attachment, data)
       ActiveStorage::Attachment.where(name: ATTACHMENT_NAME, record: attachment).destroy_all
-      number_of_pages = HexaPDF::Document.new(io: StringIO.new(data)).pages.size - 1
+      number_of_pages = HexaPDF::Document.new(io: StringIO.new(data)).pages.size
 
-      (0..number_of_pages).each do |page_number|
+      (attachment.metadata['pdf'] ||= {})[:number_of_pages] = number_of_pages
+
+      attachment.save!
+
+      (0..[number_of_pages - 1, MAX_NUMBER_OF_PAGES_PROCESSED].min).each do |page_number|
         page = Vips::Image.new_from_buffer(data, '', dpi: DPI, page: page_number)
         page = page.resize(MAX_WIDTH / page.width.to_f)
 
         io = StringIO.new(page.write_to_buffer(FORMAT, Q: Q, interlace: true))
 
+        ApplicationRecord.no_touching do
+          ActiveStorage::Attachment.create!(
+            blob: ActiveStorage::Blob.create_and_upload!(
+              io:, filename: "#{page_number}#{FORMAT}",
+              metadata: { analyzed: true, identified: true, width: page.width, height: page.height }
+            ),
+            name: ATTACHMENT_NAME,
+            record: attachment
+          )
+        end
+      end
+    end
+
+    def generate_pdf_preview_from_file(attachment, file_path, page_number)
+      page = Vips::Image.new_from_file(file_path, dpi: DPI, page: page_number)
+      page = page.resize(MAX_WIDTH / page.width.to_f)
+
+      io = StringIO.new(page.write_to_buffer(FORMAT, Q: Q, interlace: true))
+
+      ApplicationRecord.no_touching do
         ActiveStorage::Attachment.create!(
           blob: ActiveStorage::Blob.create_and_upload!(
             io:, filename: "#{page_number}#{FORMAT}",
@@ -59,6 +89,8 @@ module Templates
           record: attachment
         )
       end
+
+      io
     end
   end
 end