mirror of
https://github.com/docusealco/docuseal.git
synced 2026-06-23 04:10:11 +00:00
adjust normalize values
This commit is contained in:
@@ -156,7 +156,7 @@ module Api
|
||||
params:)
|
||||
else
|
||||
submissions_attrs, attachments =
|
||||
Submissions::NormalizeParamUtils.normalize_submissions_params!(submissions_params, template)
|
||||
Submissions::NormalizeParamUtils.normalize_submissions_params!(submissions_params, template, purpose: :api)
|
||||
|
||||
submissions = Submissions.create_from_submitters(
|
||||
template:,
|
||||
|
||||
@@ -50,7 +50,8 @@ module Api
|
||||
normalized_params, new_attachments = Submissions::NormalizeParamUtils.normalize_submitter_params!(
|
||||
submitter_params.merge(role:),
|
||||
@submitter.template || Template.new(submitters: submission.template_submitters, account: @submitter.account),
|
||||
for_submitter: @submitter
|
||||
for_submitter: @submitter,
|
||||
purpose: :api
|
||||
)
|
||||
|
||||
Submissions::CreateFromSubmitters.maybe_set_template_fields(submission, [normalized_params],
|
||||
|
||||
@@ -4,14 +4,14 @@ module Submissions
|
||||
module NormalizeParamUtils
|
||||
module_function
|
||||
|
||||
def normalize_submissions_params!(submissions_params, template, add_fields: false)
|
||||
def normalize_submissions_params!(submissions_params, template, add_fields: false, purpose: nil)
|
||||
attachments = []
|
||||
fields = []
|
||||
|
||||
Array.wrap(submissions_params).each do |submission|
|
||||
submission[:submitters].each_with_index do |submitter, index|
|
||||
_, new_attachments, new_fields =
|
||||
normalize_submitter_params!(submitter, template, submitter[:index] || index, add_fields:)
|
||||
normalize_submitter_params!(submitter, template, submitter[:index] || index, add_fields:, purpose:)
|
||||
|
||||
attachments.push(*new_attachments)
|
||||
fields.push(*new_fields)
|
||||
@@ -21,7 +21,8 @@ module Submissions
|
||||
[submissions_params, attachments, fields]
|
||||
end
|
||||
|
||||
def normalize_submitter_params!(submitter_params, template, index = nil, for_submitter: nil, add_fields: false)
|
||||
def normalize_submitter_params!(submitter_params, template, index = nil, for_submitter: nil, add_fields: false,
|
||||
purpose: nil)
|
||||
with_values = submitter_params[:values].present?
|
||||
|
||||
default_values = with_values ? submitter_params[:values] : {}
|
||||
@@ -44,7 +45,8 @@ module Submissions
|
||||
role_names: submitter_params[:roles],
|
||||
for_submitter:,
|
||||
add_fields:,
|
||||
throw_errors: !with_values
|
||||
throw_errors: !with_values,
|
||||
purpose:
|
||||
)
|
||||
|
||||
submitter_params[:values] = values
|
||||
|
||||
@@ -23,7 +23,7 @@ module Submitters
|
||||
{ 'type' => 'signature' },
|
||||
submitter.account,
|
||||
attachments,
|
||||
submitter)
|
||||
for_submitter: submitter)
|
||||
|
||||
attachment.record ||= submitter
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ module Submitters
|
||||
|
||||
# rubocop:disable Metrics
|
||||
def call(template, values, submitter_name: nil, role_names: nil, for_submitter: nil, throw_errors: false,
|
||||
add_fields: false)
|
||||
add_fields: false, purpose: nil)
|
||||
fields =
|
||||
if role_names.present?
|
||||
fetch_roles_fields(template, roles: role_names)
|
||||
@@ -68,7 +68,7 @@ module Submitters
|
||||
value_fields.each do |field|
|
||||
if field['type'].in?(%w[initials signature image file stamp]) && value.present?
|
||||
new_value, new_attachments =
|
||||
normalize_attachment_value(value, field, template.account, attachments, for_submitter)
|
||||
normalize_attachment_value(value, field, template.account, attachments, for_submitter:, purpose:)
|
||||
|
||||
attachments.push(*new_attachments)
|
||||
|
||||
@@ -153,17 +153,17 @@ module Submitters
|
||||
.merge(fields.group_by { |e| e['name'].to_s.downcase })
|
||||
end
|
||||
|
||||
def normalize_attachment_value(value, field, account, attachments, for_submitter = nil)
|
||||
def normalize_attachment_value(value, field, account, attachments, for_submitter: nil, purpose: nil)
|
||||
if value.is_a?(Array)
|
||||
new_attachments = value.map do |v|
|
||||
new_attachment = find_or_build_attachment(v, field, account, for_submitter)
|
||||
new_attachment = find_or_build_attachment(v, field, account, for_submitter:, purpose:)
|
||||
|
||||
attachments.find { |a| a.blob_id == new_attachment.blob_id } || new_attachment
|
||||
end
|
||||
|
||||
[new_attachments.map(&:uuid), new_attachments]
|
||||
else
|
||||
new_attachment = find_or_build_attachment(value, field, account, for_submitter)
|
||||
new_attachment = find_or_build_attachment(value, field, account, for_submitter:, purpose:)
|
||||
|
||||
existing_attachment = attachments.find { |a| a.blob_id == new_attachment.blob_id }
|
||||
|
||||
@@ -173,11 +173,15 @@ module Submitters
|
||||
end
|
||||
end
|
||||
|
||||
def find_or_build_attachment(value, field, account, for_submitter = nil)
|
||||
def find_or_build_attachment(value, field, account, for_submitter: nil, purpose: nil)
|
||||
type = field['type']
|
||||
|
||||
raise InvalidDefaultValue, "Invalid #{type} value" if purpose == :bulk
|
||||
|
||||
blob =
|
||||
if value.match?(%r{\Ahttps?://})
|
||||
raise InvalidDefaultValue, "Invalid #{type} value" unless purpose == :api
|
||||
|
||||
find_or_create_blob_from_url(account, value)
|
||||
elsif type.in?(%w[signature initials]) && value.length < 60
|
||||
find_or_create_blob_from_text(account, value, type)
|
||||
@@ -185,6 +189,8 @@ module Submitters
|
||||
Marcel::MimeType.for(data).exclude?('octet-stream')
|
||||
find_or_create_blob_from_base64(account, data, type)
|
||||
elsif type == 'image' && (value.starts_with?('<html>') || value.starts_with?('<!DOCTYPE'))
|
||||
raise InvalidDefaultValue, "Invalid #{type} value" unless purpose == :api
|
||||
|
||||
find_or_create_blob_from_html(account, value, field)
|
||||
else
|
||||
raise InvalidDefaultValue, "Invalid value, url, base64 or text < 60 chars is expected: #{value.first(200)}..."
|
||||
|
||||
Reference in New Issue
Block a user