Hi there,
Please check the copy of your "<%= @submitter.submission.template.name %>" submission in the email attachments.
Alternatively, you can review and download your copy using:
- <%= link_to @submitter.template.name, submissions_preview_url(@submitter.submission.slug) %> + <%= link_to @submitter.template.name, submissions_preview_url(@submitter.submission.slug, { sig: @sig }.compact) %>
Thanks,
<%= @current_account.name %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4ca0ee80..c08aa1d1 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -129,7 +129,7 @@ Rails.application.configure do
config.lograge.custom_payload do |controller|
{
- fwd: controller.request.ip.to_s[/\A\d+\.(.*)/, 1],
+ fwd: controller.request.ip,
params: controller.request.params&.slice(:id),
host: controller.request.host,
uid: controller.instance_variable_get(:@current_user).try(:id)
diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index ef04d0ac..8fb88efe 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -13,9 +13,9 @@ end
ActiveSupport.on_load(:active_storage_blob) do
attribute :uuid, :string, default: -> { SecureRandom.uuid }
- def self.proxy_url(blob, expires_in: nil)
+ def self.proxy_url(blob, expires_at: nil)
Rails.application.routes.url_helpers.blobs_proxy_url(
- signed_uuid: blob.signed_uuid(expires_in:), filename: blob.filename,
+ signed_uuid: blob.signed_uuid(expires_at:), filename: blob.filename,
**Docuseal.default_url_options
)
end
@@ -28,8 +28,10 @@ ActiveSupport.on_load(:active_storage_blob) do
end
end
- def signed_uuid(expires_in: nil)
- ApplicationRecord.signed_id_verifier.generate([uuid, 'blob'], expires_in:)
+ def signed_uuid(expires_at: nil)
+ expires_at = expires_at.to_i if expires_at
+
+ ApplicationRecord.signed_id_verifier.generate([uuid, 'blob', expires_at].compact)
end
def delete
diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb
index 6b894eab..5fbe881f 100644
--- a/lib/replace_email_variables.rb
+++ b/lib/replace_email_variables.rb
@@ -18,7 +18,7 @@ module ReplaceEmailVariables
module_function
# rubocop:disable Metrics
- def call(text, submitter:, tracking_event_type: 'click_email')
+ def call(text, submitter:, tracking_event_type: 'click_email', sig: nil)
submitter_link = build_submitter_link(submitter, tracking_event_type)
submission_link = build_submission_link(submitter.submission) if submitter.submission
@@ -35,8 +35,8 @@ module ReplaceEmailVariables
if text.include?(SUBMISSION_SUBMITTERS)
text = text.gsub(SUBMISSION_SUBMITTERS, build_submission_submitters(submitter.submission))
end
- text = text.gsub(DOCUMENTS_LINKS, build_documents_links_text(submitter))
- text = text.gsub(DOCUMENTS_LINK, build_documents_links_text(submitter))
+ text = text.gsub(DOCUMENTS_LINKS, build_documents_links_text(submitter, sig))
+ text = text.gsub(DOCUMENTS_LINK, build_documents_links_text(submitter, sig))
text = text.gsub(ACCOUNT_NAME, submitter.template.account.name) if submitter.template
@@ -44,9 +44,9 @@ module ReplaceEmailVariables
end
# rubocop:enable Metrics
- def build_documents_links_text(submitter)
+ def build_documents_links_text(submitter, sig = nil)
Rails.application.routes.url_helpers.submissions_preview_url(
- submitter.submission.slug, **Docuseal.default_url_options
+ submitter.submission.slug, { sig:, **Docuseal.default_url_options }.compact
)
end
diff --git a/lib/submissions.rb b/lib/submissions.rb
index 6bac4a0c..20f47932 100644
--- a/lib/submissions.rb
+++ b/lib/submissions.rb
@@ -3,6 +3,8 @@
module Submissions
DEFAULT_SUBMITTERS_ORDER = 'random'
+ PRELOAD_ALL_PAGES_AMOUNT = 200
+
module_function
def search(submissions, keyword)
@@ -27,6 +29,25 @@ module Submissions
submission.save!
end
+ def preload_with_pages(submission)
+ ActiveRecord::Associations::Preloader.new(
+ records: [submission],
+ 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
+
+ submission
+ end
+
def create_from_emails(template:, user:, emails:, source:, mark_as_sent: false, params: {})
preferences = Submitters.normalize_preferences(user.account, user, params)