From c45ad2f4e9b4cb96f29d6214b202f650555710d0 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Mon, 9 Nov 2026 19:00:29 +0200 Subject: [PATCH 01/22] show submissions toggle --- app/views/templates_dashboard/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/templates_dashboard/index.html.erb b/app/views/templates_dashboard/index.html.erb index 4a65f5cd6..cc20d5a41 100644 --- a/app/views/templates_dashboard/index.html.erb +++ b/app/views/templates_dashboard/index.html.erb @@ -14,7 +14,7 @@ <% end %> <%= render 'templates/dashboard_folder_dropzone', style: 'height: 114px' %>
- <% if has_archived || @pagy.count.nil? || @pagy.count > 0 || @template_folders.present? %> + <% if current_account.created_at < 1.day.ago || has_archived || @pagy.count.nil? || @pagy.count > 0 || @template_folders.present? %>
<%= render 'dashboard/toggle_view', selected: 'templates' %>
From e947c9269b729bc86ed19e5c1f3bb5f6da379155 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 10 Nov 2026 08:57:58 +0200 Subject: [PATCH 02/22] 19k stars --- app/views/shared/_github.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_github.html.erb b/app/views/shared/_github.html.erb index be9d7c0b2..a3360a7fc 100644 --- a/app/views/shared/_github.html.erb +++ b/app/views/shared/_github.html.erb @@ -1,6 +1,6 @@ <%= svg_icon('start', class: 'h-3 w-3') %> - 18k + 19k From a33dc9d657a157321c67f93d8ea9fcef70f6115e Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 10 Nov 2026 11:43:40 +0200 Subject: [PATCH 03/22] add submission email variables --- lib/replace_email_variables.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/replace_email_variables.rb b/lib/replace_email_variables.rb index 115944b1e..cb6ccb447 100644 --- a/lib/replace_email_variables.rb +++ b/lib/replace_email_variables.rb @@ -18,6 +18,7 @@ module ReplaceEmailVariables SUBMISSION_LINK = /\{+submission\.link\}+/i SUBMISSION_ID = /\{+submission\.id\}+/i SUBMISSION_EXPIRE_AT = /\{+submission\.expire_at\}+/i + SUBMISSION_VARIABLE = /\{+submission\.(?[^}]+)\}+/i SUBMITTERS = /\{+(?:submission\.)?submitters\}+/i SUBMITTERS_N_EMAIL = /\{+submitters\[(?\d+)\]\.email\}+/i SUBMITTERS_N_NAME = /\{+submitters\[(?\d+)\]\.name\}+/i @@ -65,6 +66,10 @@ module ReplaceEmailVariables end end + text = replace(text, SUBMISSION_VARIABLE, html_escape:) do |match| + build_submission_variable(submitter.submission, match[:variable_name].to_s.strip) + end + text = replace(text, SUBMITTERS_N_NAME, html_escape:) do |match| build_submitters_n_field(submitter.submission, match[:index].to_i - 1, :name) end @@ -103,6 +108,12 @@ module ReplaceEmailVariables ) end + def build_submission_variable(submission, variable_name) + variable_name.split('.').reduce(submission.variables) do |value, key| + value[key] if value.is_a?(Hash) + end + end + def build_submitters_n_field(submission, index, field_name, value_name = nil) uuid = (submission.template_submitters || submission.template.submitters).dig(index, 'uuid') From de08736b168d7667d974d35daf0202ddd3ec0e9b Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 10 Nov 2026 13:14:48 +0200 Subject: [PATCH 04/22] do not show steps if 2 fields --- app/javascript/submission_form/form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue index 1070304e2..b76917863 100644 --- a/app/javascript/submission_form/form.vue +++ b/app/javascript/submission_form/form.vue @@ -660,7 +660,7 @@ :native-platform="nativePlatform" />
From a24e2532d50a6f6879aea76bb8a7126597af72ab Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 10 Nov 2026 16:26:08 +0200 Subject: [PATCH 06/22] fix i18n --- lib/submissions/generate_audit_trail.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb index 0fe383044..1f7f84cfd 100644 --- a/lib/submissions/generate_audit_trail.rb +++ b/lib/submissions/generate_audit_trail.rb @@ -231,7 +231,7 @@ module Submissions document.metadata['sha256'] || document.checksum, "\n", { text: "#{I18n.t('generated_at')}: ", font: [FONT_NAME, { variant: :bold }] }, - "#{I18n.l(document.created_at.in_time_zone(timezone), format: :long, locale: account.locale)} " \ + "#{I18n.l(document.created_at.in_time_zone(timezone), format: :long)} " \ "#{TimeUtils.timezone_abbr(timezone, document.created_at)}" ], line_spacing: 1.3 ) @@ -440,7 +440,7 @@ module Submissions composer.formatted_text_box([{ text: value.to_s.titleize }], padding: [0, 0, 10, 0]) else if field['type'] == 'date' - value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), account.locale, + value = TimeUtils.format_date_string(value, field.dig('preferences', 'format'), I18n.locale, timezone:) end @@ -533,7 +533,7 @@ module Submissions time_format = with_timestamp_seconds ? :detailed : :long [ - "#{I18n.l(event.event_timestamp.in_time_zone(timezone), format: time_format, locale: account.locale)} " \ + "#{I18n.l(event.event_timestamp.in_time_zone(timezone), format: time_format)} " \ "#{TimeUtils.timezone_abbr(timezone, event.event_timestamp)}", composer.document.layout.formatted_text_box(text_box) ] From 704bb2219e5b81d327dd61ac0dac41494eed1cf0 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 10 Nov 2026 19:36:37 +0200 Subject: [PATCH 07/22] i18n --- config/locales/i18n.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml index 53543e3cc..2a67c5fe1 100644 --- a/config/locales/i18n.yml +++ b/config/locales/i18n.yml @@ -835,6 +835,9 @@ en: &en manage_subscription: Manage Subscription docuseal_version_security_release_is_available: "DocuSeal v%{version} security release is available." click_here_to_view_the_instructions_and_update_your_app_html: 'Click here to view the instructions and update your app.' + your_pro_subscription_includes_count_user_seats_but_there_are_users_active_users_in_your_account_html: + one: 'Your Pro subscription includes %{count} user seat, but there are %{users} active users in your account.
Upgrade your plan to cover %{users} users or remove inactive users via Settings.' + other: 'Your Pro subscription includes %{count} user seats, but there are %{users} active users in your account.
Upgrade your plan to cover %{users} users or remove inactive users via Settings.' submission_created_by_email_html: 'Submission created by %{email}' submission_created_by_email_via_source_html: 'Submission created by %{email} via %{source}' submission_created_via_source_html: 'Submission created via %{source}' @@ -1997,6 +2000,9 @@ es: &es manage_subscription: Gestionar Suscripción docuseal_version_security_release_is_available: "La versión de seguridad DocuSeal v%{version} está disponible." click_here_to_view_the_instructions_and_update_your_app_html: 'Haz clic aquí para ver las instrucciones y actualizar tu aplicación.' + your_pro_subscription_includes_count_user_seats_but_there_are_users_active_users_in_your_account_html: + one: 'Tu suscripción Pro incluye %{count} plaza de usuario, pero hay %{users} usuarios activos en tu cuenta.
Amplía tu plan para cubrir %{users} usuarios o elimina los usuarios inactivos en la Configuración.' + other: 'Tu suscripción Pro incluye %{count} plazas de usuario, pero hay %{users} usuarios activos en tu cuenta.
Amplía tu plan para cubrir %{users} usuarios o elimina los usuarios inactivos en la Configuración.' submission_created_by_email_html: 'Envío creado por %{email}' submission_created_by_email_via_source_html: 'Envío creado por %{email} a través de %{source}' submission_created_via_source_html: 'Envío creado a través de %{source}' @@ -3165,6 +3171,9 @@ it: &it manage_subscription: Gestisci Abbonamento docuseal_version_security_release_is_available: "È disponibile il rilascio di sicurezza DocuSeal v%{version}." click_here_to_view_the_instructions_and_update_your_app_html: 'Fai clic qui per vedere le istruzioni e aggiornare la tua app.' + your_pro_subscription_includes_count_user_seats_but_there_are_users_active_users_in_your_account_html: + one: 'Il tuo abbonamento Pro include %{count} posto utente, ma nel tuo account ci sono %{users} utenti attivi.
Aggiorna il tuo piano per coprire %{users} utenti oppure rimuovi gli utenti inattivi dalle Impostazioni.' + other: 'Il tuo abbonamento Pro include %{count} posti utente, ma nel tuo account ci sono %{users} utenti attivi.
Aggiorna il tuo piano per coprire %{users} utenti oppure rimuovi gli utenti inattivi dalle Impostazioni.' submission_created_by_email_html: 'Invio creato da %{email}' submission_created_by_email_via_source_html: 'Invio creato da %{email} tramite %{source}' submission_created_via_source_html: 'Invio creato tramite %{source}' @@ -4319,6 +4328,9 @@ fr: &fr manage_subscription: Gérer l’abonnement docuseal_version_security_release_is_available: "La mise à jour de sécurité DocuSeal v%{version} est disponible." click_here_to_view_the_instructions_and_update_your_app_html: 'Cliquez ici pour voir les instructions et mettre à jour votre application.' + your_pro_subscription_includes_count_user_seats_but_there_are_users_active_users_in_your_account_html: + one: 'Votre abonnement Pro inclut %{count} place d’utilisateur, mais votre compte compte %{users} utilisateurs actifs.
Mettez à niveau votre offre pour couvrir %{users} utilisateurs ou supprimez les utilisateurs inactifs dans les Paramètres.' + other: 'Votre abonnement Pro inclut %{count} places d’utilisateur, mais votre compte compte %{users} utilisateurs actifs.
Mettez à niveau votre offre pour couvrir %{users} utilisateurs ou supprimez les utilisateurs inactifs dans les Paramètres.' submission_created_by_email_html: "Soumission créée par %{email}" submission_created_by_email_via_source_html: "Soumission créée par %{email} via %{source}" submission_created_via_source_html: "Soumission créée via %{source}" @@ -5483,6 +5495,9 @@ pt: &pt manage_subscription: Gerenciar Assinatura docuseal_version_security_release_is_available: "A versão de segurança DocuSeal v%{version} está disponível." click_here_to_view_the_instructions_and_update_your_app_html: 'Clique aqui para ver as instruções e atualizar seu aplicativo.' + your_pro_subscription_includes_count_user_seats_but_there_are_users_active_users_in_your_account_html: + one: 'Sua assinatura Pro inclui %{count} lugar de usuário, mas há %{users} usuários ativos na sua conta.
Atualize seu plano para cobrir %{users} usuários ou remova os usuários inativos nas Configurações.' + other: 'Sua assinatura Pro inclui %{count} lugares de usuário, mas há %{users} usuários ativos na sua conta.
Atualize seu plano para cobrir %{users} usuários ou remova os usuários inativos nas Configurações.' submission_created_by_email_html: 'Envio criado por %{email}' submission_created_by_email_via_source_html: 'Envio criado por %{email} via %{source}' submission_created_via_source_html: 'Envio criado via %{source}' @@ -6650,6 +6665,9 @@ de: &de manage_subscription: Abonnement verwalten docuseal_version_security_release_is_available: "Das Sicherheitsupdate DocuSeal v%{version} ist verfügbar." click_here_to_view_the_instructions_and_update_your_app_html: 'Klicken Sie hier, um die Anleitung anzuzeigen und Ihre App zu aktualisieren.' + your_pro_subscription_includes_count_user_seats_but_there_are_users_active_users_in_your_account_html: + one: 'Ihr Pro-Abonnement umfasst %{count} Benutzerplatz, aber in Ihrem Konto gibt es %{users} aktive Benutzer.
Erweitern Sie Ihren Plan auf %{users} Benutzer oder entfernen Sie inaktive Benutzer in den Einstellungen.' + other: 'Ihr Pro-Abonnement umfasst %{count} Benutzerplätze, aber in Ihrem Konto gibt es %{users} aktive Benutzer.
Erweitern Sie Ihren Plan auf %{users} Benutzer oder entfernen Sie inaktive Benutzer in den Einstellungen.' submission_created_by_email_html: 'Einreichung erstellt von %{email}' submission_created_by_email_via_source_html: 'Einreichung erstellt von %{email} über %{source}' submission_created_via_source_html: 'Einreichung erstellt über %{source}' @@ -8345,6 +8363,9 @@ nl: &nl manage_subscription: Abonnement beheren docuseal_version_security_release_is_available: "Beveiligingsupdate DocuSeal v%{version} is beschikbaar." click_here_to_view_the_instructions_and_update_your_app_html: 'Klik hier om de instructies te bekijken en uw app bij te werken.' + your_pro_subscription_includes_count_user_seats_but_there_are_users_active_users_in_your_account_html: + one: 'Uw Pro-abonnement omvat %{count} gebruikersplaats, maar er zijn %{users} actieve gebruikers in uw account.
Upgrade uw abonnement naar %{users} gebruikers of verwijder inactieve gebruikers via de Instellingen.' + other: 'Uw Pro-abonnement omvat %{count} gebruikersplaatsen, maar er zijn %{users} actieve gebruikers in uw account.
Upgrade uw abonnement naar %{users} gebruikers of verwijder inactieve gebruikers via de Instellingen.' submission_created_by_email_html: "Inzending aangemaakt door %{email}" submission_created_by_email_via_source_html: "Inzending aangemaakt door %{email} via %{source}" submission_created_via_source_html: "Inzending aangemaakt via %{source}" From 4702a68ad1dcbbc4896fef0f2ca5ff1b08064ea4 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Wed, 11 Nov 2026 14:33:46 +0200 Subject: [PATCH 08/22] adjust variables schema --- .../dynamic_variables_schema.js | 51 +++++++------------ 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/app/javascript/template_builder/dynamic_variables_schema.js b/app/javascript/template_builder/dynamic_variables_schema.js index 64869bc34..3a702f8fc 100644 --- a/app/javascript/template_builder/dynamic_variables_schema.js +++ b/app/javascript/template_builder/dynamic_variables_schema.js @@ -436,29 +436,28 @@ function hasBlankKey (keyString) { return !keyString || keyString.split('.').some((key) => !key.trim()) } +function digProperties (properties, keys) { + return keys.reduce((current, key) => { + if (!current[key]) current[key] = { type: 'object', properties: {} } + + const item = current[key].type === 'array' ? current[key].items : current[key] + + if (!item.properties) { + item.type = 'object' + item.properties = {} + } + + return item.properties + }, properties) +} + function assignNestedSchema (propertiesHash, parentProperties, keyString, value) { if (hasBlankKey(keyString)) return const keys = keyString.split('.') const lastKey = keys.pop() - let currentLevel = null - - if (keys.length > 0 && parentProperties[keys[0]]) { - currentLevel = keys.reduce((current, key) => { - if (!current[key]) current[key] = { type: 'object', properties: {} } - - return current[key].properties - }, parentProperties) - } - - if (!currentLevel) { - currentLevel = keys.reduce((current, key) => { - if (!current[key]) current[key] = { type: 'object', properties: {} } - - return current[key].properties - }, propertiesHash) - } + const currentLevel = digProperties(keys.length > 0 && parentProperties[keys[0]] ? parentProperties : propertiesHash, keys) currentLevel[lastKey] = value } @@ -469,23 +468,7 @@ function assignNestedSchemaWithPriority (propertiesHash, parentProperties, keySt const keys = keyString.split('.') const lastKey = keys.pop() - let currentLevel = null - - if (keys.length > 0 && parentProperties[keys[0]]) { - currentLevel = keys.reduce((current, key) => { - if (!current[key]) current[key] = { type: 'object', properties: {} } - - return current[key].properties - }, parentProperties) - } - - if (!currentLevel) { - currentLevel = keys.reduce((current, key) => { - if (!current[key]) current[key] = { type: 'object', properties: {} } - - return current[key].properties - }, propertiesHash) - } + const currentLevel = digProperties(keys.length > 0 && parentProperties[keys[0]] ? parentProperties : propertiesHash, keys) const existing = currentLevel[lastKey] From 4fb3e5bd474432e830e93e85a8e0081346faefa7 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Thu, 12 Nov 2026 14:58:14 +0200 Subject: [PATCH 09/22] add with order check --- app/controllers/submit_form_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/submit_form_controller.rb b/app/controllers/submit_form_controller.rb index 662ec8dee..cda3992fc 100644 --- a/app/controllers/submit_form_controller.rb +++ b/app/controllers/submit_form_controller.rb @@ -51,7 +51,7 @@ class SubmitFormController < ApplicationController end def update - unless Submitters::AuthorizedForForm.call(@submitter, current_user, request) + unless Submitters::AuthorizedForForm.call(@submitter, current_user, request, with_order: with_order(@submitter)) return render json: { error: I18n.t('verification_required_refresh_the_page_and_pass_2fa') }, status: :unprocessable_content end @@ -154,6 +154,11 @@ class SubmitFormController < ApplicationController .preload(:blob).index_by(&:uuid) end + def with_order(submitter) + params[:completed] == 'true' && submitter.present? && + submitter.submission.template&.preferences&.dig('submitters_order') == 'preserved' + end + def lang params[:lang].presence end From 06c44e8b2f2f2ff5b87d49f6c45fe082fba9d1f4 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Thu, 12 Nov 2026 20:12:53 +0200 Subject: [PATCH 10/22] shift enter value --- app/javascript/template_builder/area.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue index e15bf2f8e..fe03845fb 100644 --- a/app/javascript/template_builder/area.vue +++ b/app/javascript/template_builder/area.vue @@ -700,11 +700,12 @@ export default { this.save() }, onDefaultValueEnter (e) { - if (this.field.type !== 'heading') { - e.preventDefault() + if (this.field.type === 'heading') return + if (e.shiftKey && this.field.type === 'text') return - this.$refs.defaultValue.blur() - } + e.preventDefault() + + this.$refs.defaultValue.blur() }, resize (e) { if (e.target.id === 'mask') { From 0490ff483507b0d4925641cb5a21538f34b90242 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 13 Nov 2026 20:58:38 +0200 Subject: [PATCH 11/22] formula condition --- app/controllers/api/submitters_controller.rb | 4 +- app/javascript/submission_form/form.vue | 57 ++++++++++++++++---- lib/submissions/create_from_submitters.rb | 4 +- lib/submitters/submit_values.rb | 15 +++--- 4 files changed, 61 insertions(+), 19 deletions(-) diff --git a/app/controllers/api/submitters_controller.rb b/app/controllers/api/submitters_controller.rb index eee1e835c..5b91fec68 100644 --- a/app/controllers/api/submitters_controller.rb +++ b/app/controllers/api/submitters_controller.rb @@ -158,7 +158,9 @@ module Api if attrs[:completed] submitter.values = Submitters::SubmitValues.merge_default_values(submitter) - submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter) + submitter.values = Submitters::SubmitValues.maybe_remove_condition_values( + submitter, formula_values: Submitters::SubmitValues.build_formula_values(submitter) + ) formula_values = Submitters::SubmitValues.build_formula_values(submitter) diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue index bf8ca66cb..8bdc64960 100644 --- a/app/javascript/submission_form/form.vue +++ b/app/javascript/submission_form/form.vue @@ -1093,7 +1093,8 @@ export default { submittedValues: {}, isFormStarted: false, recalculateButtonDisabledKey: '', - isAccessibilityMode: false + isAccessibilityMode: false, + isMathLoaded: false } }, computed: { @@ -1197,6 +1198,24 @@ export default { return acc }, {}) }, + formulaFieldsUuidIndex () { + return this.fields.reduce((acc, f) => { + if (f.preferences?.formula && f.type !== 'payment') { + acc[f.uuid] = f + } + + return acc + }, {}) + }, + readonlyValues () { + return this.fields.reduce((acc, f) => { + if (f.readonly) { + acc[f.uuid] = isEmpty(this.values[f.uuid]) ? f.default_value : this.values[f.uuid] + } + + return acc + }, {}) + }, previousInitialsValue () { if (this.reuseSignature !== false) { const initialsField = this.fields.findLast @@ -1449,6 +1468,16 @@ export default { }) }, methods: { + normalizeFormula: FormulaFieldAreas.methods.normalizeFormula, + calculateFormula: FormulaFieldAreas.methods.calculateFormula, + dateFormulaValue: FormulaFieldAreas.methods.dateFormulaValue, + evalTextFormula: FormulaFieldAreas.methods.evalTextFormula, + loadCalculator () { + this.calculatorPromise ||= import('./calculator').then(({ Calculator }) => { + this.math = new Calculator() + this.isMathLoaded = true + }) + }, t (key) { return this.i18n[key] || i18n[this.language?.toLowerCase()]?.[key] || i18n[this.browserLanguage]?.[key] || i18n.en[key] || key }, @@ -1497,17 +1526,25 @@ export default { } const defaultValue = !field || isEmpty(field.default_value) ? null : field.default_value + const isFormulaField = !!field?.preferences?.formula && field.type !== 'payment' + + if (isFormulaField && !this.isMathLoaded) { + this.loadCalculator() + } + + const formulaValue = isFormulaField && this.isMathLoaded + ? (field.type === 'text' ? this.evalTextFormula(field) : this.calculateFormula(field)) + : null + const fieldValue = formulaValue ?? this.values[condition.field_uuid] ?? defaultValue if (['empty', 'unchecked'].includes(condition.action)) { - return isEmpty(this.values[condition.field_uuid] ?? defaultValue) + return isEmpty(fieldValue) } else if (['not_empty', 'checked'].includes(condition.action)) { - return !isEmpty(this.values[condition.field_uuid] ?? defaultValue) + return !isEmpty(fieldValue) } else if (field?.type === 'number' && ['equal', 'not_equal', 'greater_than', 'less_than'].includes(condition.action)) { - const value = this.values[condition.field_uuid] ?? defaultValue + if (isEmpty(fieldValue) || isEmpty(condition.value)) return false - if (isEmpty(value) || isEmpty(condition.value)) return false - - const actual = parseFloat(value) + const actual = parseFloat(fieldValue) const expected = parseFloat(condition.value) if (Number.isNaN(actual) || Number.isNaN(expected)) return false @@ -1523,21 +1560,21 @@ export default { const option = field.options.find((o) => o.uuid === condition.value) if (option) { - const values = [this.values[condition.field_uuid] ?? defaultValue].flat() + const values = [fieldValue].flat() return values.includes(this.optionValue(option, field.options.indexOf(option))) } else { return false } } else { - return [this.values[condition.field_uuid] ?? defaultValue].flat().includes(condition.value) + return [fieldValue].flat().includes(condition.value) } } else if (['not_equal', 'does_not_contain'].includes(condition.action) && field) { if (field.options) { const option = field.options.find((o) => o.uuid === condition.value) if (option) { - const values = [this.values[condition.field_uuid] ?? defaultValue].flat() + const values = [fieldValue].flat() return !values.includes(this.optionValue(option, field.options.indexOf(option))) } else { diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb index dd2780537..28f55fa2e 100644 --- a/lib/submissions/create_from_submitters.rb +++ b/lib/submissions/create_from_submitters.rb @@ -459,7 +459,9 @@ module Submissions def assign_completed_attributes(submitter, with_verification: true) submitter.values = Submitters::SubmitValues.merge_default_values(submitter, with_verification:) - submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter) + submitter.values = Submitters::SubmitValues.maybe_remove_condition_values( + submitter, formula_values: Submitters::SubmitValues.build_formula_values(submitter) + ) formula_values = Submitters::SubmitValues.build_formula_values(submitter) diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb index f1313e389..9b3b9fb40 100644 --- a/lib/submitters/submit_values.rb +++ b/lib/submitters/submit_values.rb @@ -81,7 +81,8 @@ module Submitters required_field_uuids_acc = Set.new - submitter.values = maybe_remove_condition_values(submitter, required_field_uuids_acc:) + submitter.values = maybe_remove_condition_values(submitter, formula_values: build_formula_values(submitter), + required_field_uuids_acc:) formula_values = build_formula_values(submitter) @@ -204,10 +205,10 @@ module Submitters default_values.compact_blank.merge(submitter.values) end - def build_formula_values(submitter) - submission_values = nil + def build_formula_values(submitter, submission_values: nil) + submission = submitter.submission - computed_values = submitter.submission.template_fields.each_with_object({}) do |field, acc| + computed_values = (submission.template_fields || submission.template.fields).each_with_object({}) do |field, acc| next if field['submitter_uuid'] != submitter.uuid next if field['type'] == 'payment' @@ -297,17 +298,17 @@ module Submitters field:) end - def maybe_remove_condition_values(submitter, required_field_uuids_acc: nil) + def maybe_remove_condition_values(submitter, formula_values: {}, required_field_uuids_acc: nil) submission = submitter.submission - submitters_values = nil + submitters_values = formula_values.merge(merge_submitters_values(submitter)) if formula_values.present? has_other_submitters = submission.template_submitters.size > 1 has_document_conditions = submission_has_document_conditions?(submission) attachments_index = if has_document_conditions - submitters_values = merge_submitters_values(submitter) + submitters_values ||= merge_submitters_values(submitter) Submissions.filtered_conditions_schema(submission, values: submitters_values) .index_by { |i| i['attachment_uuid'] } From a44a2dcdaf99520026988f92c7049875955f8434 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 13 Nov 2026 21:01:40 +0200 Subject: [PATCH 12/22] update deps --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index cf3505a23..437ca5c48 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,7 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) - addressable (2.9.0) + addressable (2.9.2) public_suffix (>= 2.0.2, < 8.0) annotaterb (4.22.0) activerecord (>= 6.0.0) @@ -309,7 +309,7 @@ GEM minitest (6.0.6) drb (~> 2.0) prism (~> 1.5) - msgpack (1.8.4) + msgpack (1.8.7) multi_json (1.21.2) net-http (0.9.1) uri (>= 0.11.1) From c364746f6216a7171a9c6d148eafee051320241a Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 13 Nov 2026 21:36:18 +0200 Subject: [PATCH 13/22] fix ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7e74b9b3..39a5a8caf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: bundle install --jobs 4 --retry 4 yarn install sudo apt-get update - sudo apt-get install libvips liblept5 + sudo apt-get install libvips libleptonica6 - name: Run Brakeman run: bundle exec brakeman -q --exit-on-warn From 1b50efe511564fc5e9554c8e1742aeb0d14b1288 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sat, 14 Nov 2026 08:38:23 +0200 Subject: [PATCH 14/22] add with order --- app/controllers/submit_form_decline_controller.rb | 3 ++- app/controllers/submit_form_invite_controller.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/submit_form_decline_controller.rb b/app/controllers/submit_form_decline_controller.rb index 139175cf1..9f8fcf5fa 100644 --- a/app/controllers/submit_form_decline_controller.rb +++ b/app/controllers/submit_form_decline_controller.rb @@ -16,7 +16,8 @@ class SubmitFormDeclineController < ApplicationController @submitter.viewer? || !Submitters::AuthorizedForForm.call(@submitter, current_user, - request) + request, + with_order: true) ApplicationRecord.transaction do @submitter.update!(declined_at: Time.current, values: @submitter.preferences['default_values'] || {}) diff --git a/app/controllers/submit_form_invite_controller.rb b/app/controllers/submit_form_invite_controller.rb index 0976d028f..ed9796ff0 100644 --- a/app/controllers/submit_form_invite_controller.rb +++ b/app/controllers/submit_form_invite_controller.rb @@ -49,7 +49,7 @@ class SubmitFormInviteController < ApplicationController !submitter.submission.expired? && !submitter.submission.template&.archived_at? && !submitter.viewer? && - Submitters::AuthorizedForForm.call(submitter, current_user, request) + Submitters::AuthorizedForForm.call(submitter, current_user, request, with_order: true) end def filter_invite_submitters(submitter, key = 'invite_by_uuid') From dd790be5cb1d5559a9665f8d0273376041858f5a Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sat, 14 Nov 2026 14:49:39 +0200 Subject: [PATCH 15/22] url escape --- app/javascript/submission_form/kba_step.vue | 2 +- app/javascript/submission_form/payment_step.vue | 2 +- app/javascript/submission_form/verification_step.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/submission_form/kba_step.vue b/app/javascript/submission_form/kba_step.vue index 4f5c456b6..ffa7c5ef6 100644 --- a/app/javascript/submission_form/kba_step.vue +++ b/app/javascript/submission_form/kba_step.vue @@ -557,7 +557,7 @@ export default { }, {}) try { - const resp = await fetch(this.baseUrl + `/s/${this.submitterSlug}/kba/${this.field.uuid}`, { + const resp = await fetch(this.baseUrl + `/s/${this.submitterSlug}/kba/${encodeURIComponent(this.field.uuid)}`, { method: 'PUT', body: JSON.stringify({ token: this.token, diff --git a/app/javascript/submission_form/payment_step.vue b/app/javascript/submission_form/payment_step.vue index 8ba8e7437..2bc872431 100644 --- a/app/javascript/submission_form/payment_step.vue +++ b/app/javascript/submission_form/payment_step.vue @@ -253,7 +253,7 @@ export default { }, async submit () { if (this.sessionId) { - return fetch(this.baseUrl + this.paymentEndpoint + '/' + this.sessionId, { + return fetch(this.baseUrl + this.paymentEndpoint + '/' + encodeURIComponent(this.sessionId), { method: 'PUT', ...this.fetchOptions, headers: { 'Content-Type': 'application/json', ...this.fetchOptions.headers } diff --git a/app/javascript/submission_form/verification_step.vue b/app/javascript/submission_form/verification_step.vue index f6af173b8..8bdf52ab9 100644 --- a/app/javascript/submission_form/verification_step.vue +++ b/app/javascript/submission_form/verification_step.vue @@ -162,7 +162,7 @@ export default { }, methods: { start () { - return fetch(this.baseUrl + `/s/${this.submitterSlug}/identity_verification/${this.field.uuid}`, { + return fetch(this.baseUrl + `/s/${this.submitterSlug}/identity_verification/${encodeURIComponent(this.field.uuid)}`, { method: 'PUT', body: JSON.stringify({ redirect_url: document.location.href From 353a0bc39c2cf475f7939c114ac4d43569421bfb Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sat, 14 Nov 2026 15:43:30 +0200 Subject: [PATCH 16/22] no blob cache --- .../active_storage_blobs_proxy_controller.rb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/api/active_storage_blobs_proxy_controller.rb b/app/controllers/api/active_storage_blobs_proxy_controller.rb index 5696830ec..bbcd8c694 100644 --- a/app/controllers/api/active_storage_blobs_proxy_controller.rb +++ b/app/controllers/api/active_storage_blobs_proxy_controller.rb @@ -42,21 +42,21 @@ module Api authorization_check!(attachment, @record, exp) + no_store + if request.headers['Range'].present? send_blob_byte_range_data blob, request.headers['Range'] else - http_cache_forever public: true do - response.headers['Accept-Ranges'] = 'bytes' + response.headers['Accept-Ranges'] = 'bytes' - if request.head? - response.headers['Content-Type'] = blob.content_type_for_serving - head :ok - else - send_blob_stream blob, disposition: params[:disposition] - end - - response.headers['Content-Length'] = blob.byte_size.to_s + if request.head? + response.headers['Content-Type'] = blob.content_type_for_serving + head :ok + else + send_blob_stream blob, disposition: params[:disposition] end + + response.headers['Content-Length'] = blob.byte_size.to_s end end From 82a691018138640336c03ddc0c18c6b07e73eea9 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sat, 14 Nov 2026 15:44:43 +0200 Subject: [PATCH 17/22] mcp variables error --- app/controllers/mcp/send_documents_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/mcp/send_documents_controller.rb b/app/controllers/mcp/send_documents_controller.rb index a4c5a7125..0517008cc 100644 --- a/app/controllers/mcp/send_documents_controller.rb +++ b/app/controllers/mcp/send_documents_controller.rb @@ -78,6 +78,12 @@ module Mcp return render_tool_error('Template has no fields') if @template.fields.blank? + if @template.variables_schema.present? + Rollbar.warning("MCP send variables template: #{@template.id}") if defined?(Rollbar) + + return render_tool_error('Templates with variables are not supported') + end + submitters = (mcp_params['submitters'] || []).map do |s| attrs = s.slice('email', 'name', 'role', 'phone').compact_blank From 1cd3212736dd824c91fe1b0925fb247b1f62a08c Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sat, 14 Nov 2026 15:45:34 +0200 Subject: [PATCH 18/22] drop turbo attrs --- app/javascript/template_builder/dynamic_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/template_builder/dynamic_editor.js b/app/javascript/template_builder/dynamic_editor.js index cad495254..a15270727 100644 --- a/app/javascript/template_builder/dynamic_editor.js +++ b/app/javascript/template_builder/dynamic_editor.js @@ -178,7 +178,7 @@ const SAFE_URL_REGEXP = /^(?:https?:\/\/|data:image\/|blob:|mailto:|tel:|\{|#)/i function isSafeAttr (name, value) { const lowerName = name.toLowerCase() - if (lowerName.startsWith('on') || DROP_ATTRS.includes(lowerName)) return false + if (lowerName.startsWith('on') || lowerName.startsWith('data-turbo') || DROP_ATTRS.includes(lowerName)) return false if ((lowerName === 'href' || lowerName === 'src') && !SAFE_URL_REGEXP.test(value.trim())) return false return true From e5b9ee950273ccee8bb752b99c945cefefdab271 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sat, 14 Nov 2026 15:46:25 +0200 Subject: [PATCH 19/22] skip unsafe keys --- app/javascript/template_builder/dynamic_variables_schema.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/javascript/template_builder/dynamic_variables_schema.js b/app/javascript/template_builder/dynamic_variables_schema.js index 3a702f8fc..c86cfa345 100644 --- a/app/javascript/template_builder/dynamic_variables_schema.js +++ b/app/javascript/template_builder/dynamic_variables_schema.js @@ -432,8 +432,10 @@ function buildOperators (tags) { return operators } +const UNSAFE_KEYS = ['__proto__', 'constructor', 'prototype'] + function hasBlankKey (keyString) { - return !keyString || keyString.split('.').some((key) => !key.trim()) + return !keyString || keyString.split('.').some((key) => !key.trim() || UNSAFE_KEYS.includes(key.trim())) } function digProperties (properties, keys) { From cd5cb9c082fc998c3c0aa116fd8fd62b83fc587b Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sat, 14 Nov 2026 15:47:16 +0200 Subject: [PATCH 20/22] zip size limit --- lib/templates/create_attachments.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/templates/create_attachments.rb b/lib/templates/create_attachments.rb index ee2b9a8d5..197e8b52b 100644 --- a/lib/templates/create_attachments.rb +++ b/lib/templates/create_attachments.rb @@ -100,13 +100,15 @@ module Templates Zip::File.open(file.tempfile).each do |entry| next if entry.directory? - total_size += entry.size + tempfile = Tempfile.new(entry.name) + tempfile.binmode + + total_size += entry.get_input_stream do |in_stream| + IO.copy_stream(in_stream, tempfile, MAX_ZIP_SIZE - total_size + 1) + end raise InvalidFileType, 'zip_too_large' if total_size > MAX_ZIP_SIZE - tempfile = Tempfile.new(entry.name) - tempfile.binmode - entry.get_input_stream { |in_stream| IO.copy_stream(in_stream, tempfile) } tempfile.rewind type = Marcel::MimeType.for(tempfile, name: entry.name) From 3b4fdd1615373fe6275cf20c334e402bf8ef470d Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sun, 15 Nov 2026 08:14:06 +0200 Subject: [PATCH 21/22] validate timezone --- lib/submitters/submit_values.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb index 9b3b9fb40..8d45d079f 100644 --- a/lib/submitters/submit_values.rb +++ b/lib/submitters/submit_values.rb @@ -75,7 +75,7 @@ module Submitters submitter.completed_at = Time.current submitter.ip = request.remote_ip submitter.ua = request.user_agent - submitter.timezone = request.params[:timezone] + submitter.timezone = request.params[:timezone] if ActiveSupport::TimeZone[request.params[:timezone].to_s] submitter.values = merge_default_values(submitter) From d45ff6b2af26fe514fe5c9de0f2d6e92832b8889 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sun, 15 Nov 2026 09:49:17 +0200 Subject: [PATCH 22/22] fix remove account --- app/controllers/accounts_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 949cea168..141ecdeae 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -49,9 +49,11 @@ class AccountsController < ApplicationController def destroy authorize!(:manage, current_account) + removed_email = true_user.email.sub('@', '+removed@') + removed_email = true_user.email.sub('@', "+removed#{Time.current.to_i}@") if User.exists?(email: removed_email) + true_user.skip_reconfirmation! - true_user.update!(locked_at: Time.current, archived_at: Time.current, - email: true_user.email.sub('@', '+removed@')) + true_user.update!(locked_at: Time.current, archived_at: Time.current, email: removed_email) true_user.account.update!(archived_at: Time.current) # rubocop:disable-next Layout/LineLength