fix font url

.github/workflows/ci.yml

@@ -107,8 +107,6 @@ jobs:
           node-version: 20.9.0
       - name: Install Chrome
         uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: 125
       - name: Cache node_modules
         uses: actions/cache@v1
         with:

Gemfile

@@ -23,7 +23,6 @@ gem 'image_processing'
 gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
-gem 'net-smtp', '0.4.0'
 gem 'oj'
 gem 'pagy'
 gem 'pg', require: false

Gemfile.lock

@@ -326,7 +326,7 @@ GEM
     net-pop (0.1.2)
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
     nokogiri (1.16.7)
@@ -591,7 +591,6 @@ DEPENDENCIES
   letter_opener_web
   lograge
   mysql2
-  net-smtp (= 0.4.0)
   oj
   pagy
   pg

app/controllers/api/submission_events_controller.rb

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

app/controllers/api/templates_controller.rb

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

app/controllers/start_form_controller.rb

@@ -82,8 +82,6 @@ class StartFormController < ApplicationController
                                             template_submitters: template.submitters,
                                             source: :link)
 
-    submitter.account_id = submitter.submission.account_id
-
     submitter
   end
 

app/javascript/application.js

@@ -25,7 +25,6 @@ import PromptPassword from './elements/prompt_password'
 import EmailsTextarea from './elements/emails_textarea'
 import ToggleOnSubmit from './elements/toggle_on_submit'
 import PasswordInput from './elements/password_input'
-import SearchInput from './elements/search_input'
 
 import * as TurboInstantClick from './lib/turbo_instant_click'
 
@@ -88,7 +87,6 @@ safeRegisterElement('emails-textarea', EmailsTextarea)
 safeRegisterElement('toggle-cookies', ToggleCookies)
 safeRegisterElement('toggle-on-submit', ToggleOnSubmit)
 safeRegisterElement('password-input', PasswordInput)
-safeRegisterElement('search-input', SearchInput)
 
 safeRegisterElement('template-builder', class extends HTMLElement {
   connectedCallback () {

app/javascript/elements/search_input.js

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

app/javascript/submission_form/form.vue

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

app/javascript/template_builder/mobile_fields.vue

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

app/jobs/process_submitter_completion_job.rb

@@ -20,10 +20,10 @@ class ProcessSubmitterCompletionJob
       enqueue_completed_emails(submitter)
     end
 
-    enqueue_completed_webhooks(submitter, is_all_completed:)
+    enqueue_completed_webhooks(submitter)
   end
 
-  def enqueue_completed_webhooks(submitter, is_all_completed: false)
+  def enqueue_completed_webhooks(submitter)
     webhook_config = Accounts.load_webhook_config(submitter.account)
 
     if webhook_config
@@ -31,26 +31,13 @@ class ProcessSubmitterCompletionJob
                                                          'encrypted_config_id' => webhook_config.id })
     end
 
-    webhook_urls = submitter.account.webhook_urls
-
-    webhook_urls = webhook_urls.where(
+    webhook_ids = submitter.account.webhook_urls.where(
       Arel::Table.new(:webhook_urls)[:events].matches('%"form.completed"%')
-    ).or(
-      webhook_urls.where(
-        Arel::Table.new(:webhook_urls)[:events].matches('%"submission.completed"%')
-      )
-    )
+    ).pluck(:id)
 
-    webhook_urls.each do |webhook|
-      if webhook.events.include?('form.completed')
-        SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
-                                                           'webhook_url_id' => webhook.id })
-      end
-
-      if webhook.events.include?('submission.completed') && is_all_completed
-        SendSubmissionCompletedWebhookRequestJob.perform_async({ 'submission_id' => submitter.submission_id,
-                                                                 'webhook_url_id' => webhook.id })
-      end
+    webhook_ids.each do |webhook_id|
+      SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+                                                         'webhook_url_id' => webhook_id })
     end
   end
 

app/jobs/send_submission_completed_webhook_request_job.rb

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

app/models/account.rb

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

app/models/submission.rb

@@ -22,7 +22,7 @@
 #
 # Indexes
 #
-#  index_submissions_on_account_id_and_id   (account_id,id)
+#  index_submissions_on_account_id          (account_id)
 #  index_submissions_on_created_by_user_id  (created_by_user_id)
 #  index_submissions_on_slug                (slug) UNIQUE
 #  index_submissions_on_template_id         (template_id)

app/models/submitter.rb

@@ -20,17 +20,15 @@
 #  values        :text             not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
-#  account_id    :bigint           not null
 #  external_id   :string
 #  submission_id :bigint           not null
 #
 # Indexes
 #
-#  index_submitters_on_account_id_and_id  (account_id,id)
-#  index_submitters_on_email              (email)
-#  index_submitters_on_external_id        (external_id)
-#  index_submitters_on_slug               (slug) UNIQUE
-#  index_submitters_on_submission_id      (submission_id)
+#  index_submitters_on_email          (email)
+#  index_submitters_on_external_id    (external_id)
+#  index_submitters_on_slug           (slug) UNIQUE
+#  index_submitters_on_submission_id  (submission_id)
 #
 # Foreign Keys
 #
@@ -38,8 +36,8 @@
 #
 class Submitter < ApplicationRecord
   belongs_to :submission
-  belongs_to :account
   has_one :template, through: :submission
+  has_one :account, through: :submission
 
   attribute :values, :string, default: -> { {} }
   attribute :preferences, :string, default: -> { {} }

app/views/dashboard/_toggle_view.html.erb

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

app/views/layouts/application.html.erb

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

app/views/shared/_search_input.html.erb

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

app/views/submissions_archived/index.html.erb

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

app/views/submissions_dashboard/index.html.erb

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

app/views/template_folders/show.html.erb

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

app/views/templates/_submission.html.erb

@@ -7,12 +7,12 @@
         <div class="font-medium items-start w-full group-hover:link text-sm flex space-x-1">
           <%= svg_icon('file_text', class: 'w-4 h-4 mt-0.5 flex-shrink-0') %>
           <span style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
-            <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
+            <%= template.name %>
             <%= svg_icon('arrow_right', class: 'w-4 h-4 sm:inline group-hover:visible invisible hidden') %>
           </span>
         </div>
       </div>
-      <div class="flex-shrink-0 sm:mt-2 max-w-[50%] md:max-w-full">
+      <div class="flex-shrink-0 sm:mt-2">
         <div class="flex text-xs flex-col text-base-content/60  space-y-0.5">
           <span class="flex items-center space-x-1">
             <%= svg_icon('user', class: 'w-4 h-4 flex-shrink-0') %>
@@ -195,11 +195,6 @@
             <%= button_to button_title(title: nil, disabled_with: 'Arch', icon: svg_icon('archive', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: 'Archive', method: :delete, onclick: 'event.stopPropagation()' %>
           </span>
         <% end %>
-        <% if local_assigns[:archived] && can?(:destroy, submission) %>
-          <span data-tip="Remove" class="sm:tooltip tooltip-top">
-            <%= button_to button_title(title: nil, disabled_with: 'Rem', icon: svg_icon('trash', class: 'w-6 h-6')), submission_path(submission, permanently: true), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: 'Remove', method: :delete, data: { turbo_confirm: 'Submission deletion is irreversible and will permanently remove all associated signed documents with it. Are you sure?' }, onclick: 'event.stopPropagation()' %>
-          </span>
-        <% end %>
       </div>
     <% end %>
   </a>

app/views/templates/_template.html.erb

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

app/views/templates/_title.html.erb

@@ -1,7 +1,7 @@
 <div class="flex flex-col items-start md:flex-row space-y-2 md:space-y-0 md:space-x-2 md:justify-between md:items-start mb-6 md:mb-3">
   <div class="relative flex items-start justify-between w-full space-x-0">
     <div>
-      <h1 class="text-3xl md:text-4xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+      <h1 class="text-4xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
         <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
         <% if template.archived_at? %>
           <span class="ml-1 badge badge-outline badge-lg align-middle">Archived</span>

app/views/templates/show.html.erb

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

app/views/templates_archived/index.html.erb

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

app/views/templates_archived_submissions/index.html.erb

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

app/views/templates_dashboard/index.html.erb

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

config/environments/production.rb

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

config/routes.rb

@@ -49,7 +49,6 @@ Rails.application.routes.draw do
     end
     scope 'events' do
       resources :form_events, only: %i[index], path: 'form/:type'
-      resources :submission_events, only: %i[index], path: 'submission/:type'
     end
   end
 

db/migrate/20240816064633_add_account_id_to_submitters.rb

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

db/migrate/20240816072859_populate_submitter_account_id.rb

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

db/migrate/20240816075917_update_submission_account_id_index.rb

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

db/migrate/20240816121641_remove_active_storage_uniq_index.rb

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

db/schema.rb

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

lib/ability.rb

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

lib/action_mailer_configs_interceptor.rb

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

lib/submissions.rb

@@ -67,7 +67,6 @@ module Submissions
 
       submission.submitters.new(email: normalize_email(email),
                                 uuid: template.submitters.first['uuid'],
-                                account_id: user.account_id,
                                 preferences:,
                                 sent_at: mark_as_sent ? Time.current : nil)
 

lib/submissions/create_from_submitters.rb

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

lib/submissions/generate_result_attachments.rb

@@ -58,15 +58,13 @@ module Submissions
         submitter.submission.template_schema.map do |item|
           pdf = pdfs_index[item['attachment_uuid']]
 
-          if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
-            pdf = normalize_image_pdf(pdf)
+          attachment = build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:,
+                                            uuid: item['attachment_uuid'],
+                                            name: item['name'])
 
-            image_pdfs << pdf
-          end
+          image_pdfs << pdf if original_documents.find { |a| a.uuid == item['attachment_uuid'] }.image?
 
-          build_pdf_attachment(pdf:, submitter:, pkcs:, tsa_url:,
-                               uuid: item['attachment_uuid'],
-                               name: item['name'])
+          attachment
         end
 
       return result_attachments.map { |e| e.tap(&:save!) } if image_pdfs.size < 2
@@ -76,8 +74,6 @@ module Submissions
           pdf.pages.each { |page| doc.pages << doc.import(page) }
         end
 
-      images_pdf = normalize_image_pdf(images_pdf)
-
       images_pdf_attachment =
         build_pdf_attachment(
           pdf: images_pdf,
@@ -594,14 +590,6 @@ module Submissions
       pdf
     end
 
-    def normalize_image_pdf(pdf)
-      io = StringIO.new
-      pdf.write(io)
-      io.rewind
-
-      HexaPDF::Document.new(io:)
-    end
-
     def sign_reason(name)
       format(SIGN_REASON, name:)
     end

spec/factories/submitters.rb

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