add app url var

Bumps the bundler group with 1 update in the / directory: [rexml](https://github.com/ruby/rexml).


Updates `rexml` from 3.3.3 to 3.3.6
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.3...v3.3.6)

---
updated-dependencies:
- dependency-name: rexml
  dependency-type: indirect
  dependency-group: bundler
...

Signed-off-by: dependabot[bot] <support@github.com>

.eslintrc

@@ -9,7 +9,7 @@
   "rules": {
     "vue/no-deprecated-html-element-is": 0,
     "vue/no-mutating-props": 0,
-    "vue/no-v-html": 0
+    "vue/one-component-per-file": 0
   },
   "parserOptions": {
     "ecmaVersion": 2022,

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.2
+          ruby-version: 3.3.3
       - name: Cache gems
         uses: actions/cache@v1
         with:
@@ -35,7 +35,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.2
+          ruby-version: 3.3.3
       - name: Cache gems
         uses: actions/cache@v1
         with:
@@ -100,13 +100,15 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.2
+          ruby-version: 3.3.3
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
           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:

.gitignore

@@ -36,3 +36,4 @@ yarn-debug.log*
 /attachments
 /docuseal
 /ee
+dump.rdb

.rubocop.yml

@@ -10,7 +10,8 @@ AllCops:
     - node_modules/**/*
     - bin/*
     - vendor/**/*
-  TargetRubyVersion: '3.2'
+  TargetRubyVersion: '3.3'
+  SuggestExtensions: false
 
 Metrics/BlockLength:
   Exclude:
@@ -44,7 +45,7 @@ Layout/LineLength:
   AllowedPatterns: ['\A\s*#']
 
 Metrics/AbcSize:
-  Max: 40
+  Max: 45
 
 Metrics/ModuleLength:
   Max: 500
@@ -76,5 +77,5 @@ Rails/SkipsModelValidations:
 Rails/ApplicationController:
   Enabled: false
 
-Capybara/ClickLinkOrButtonStyle:
+Rails/Output:
   Enabled: false

Dockerfile

@@ -1,10 +1,12 @@
-FROM ruby:3.2.2-alpine3.18 as fonts
+FROM ruby:3.3.3-alpine as fonts
 
 WORKDIR /fonts
 
-RUN apk --no-cache add wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
+RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Regular.ttf && wget https://github.com/satbyy/go-noto-universal/releases/download/v7.0/GoNotoKurrent-Bold.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansSymbols2/hinted/ttf/NotoSansSymbols2-Regular.ttf && wget https://github.com/Maxattax97/gnu-freefont/raw/master/ttf/FreeSans.ttf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt
 
-FROM ruby:3.2.2-alpine3.18 as webpack
+RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
+
+FROM ruby:3.3.3-alpine as webpack
 
 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -21,28 +23,41 @@ RUN yarn install --network-timeout 1000000
 COPY ./bin/shakapacker ./bin/shakapacker
 COPY ./config/webpack ./config/webpack
 COPY ./config/shakapacker.yml ./config/shakapacker.yml
-COPY ./postcss.config.js ./postcss.config.js ./
+COPY ./postcss.config.js ./postcss.config.js
-COPY ./tailwind.config.js ./tailwind.config.js ./
+COPY ./tailwind.config.js ./tailwind.config.js
-COPY ./tailwind.form.config.js ./tailwind.form.config.js ./
+COPY ./tailwind.form.config.js ./tailwind.form.config.js
-COPY ./tailwind.application.config.js ./tailwind.application.config.js ./
+COPY ./tailwind.application.config.js ./tailwind.application.config.js
 COPY ./app/javascript ./app/javascript
 COPY ./app/views ./app/views
 
 RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker
 
-FROM ruby:3.2.2-alpine3.18 as app
+FROM ruby:3.3.3-alpine as app
 
 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"
-ENV PIDFILE=/dev/null
+ENV LD_PRELOAD=/lib/libgcompat.so.0
+ENV OPENSSL_CONF=/app/openssl_legacy.cnf
 
 WORKDIR /app
 
-RUN apk add --no-cache build-base sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils vips-heif libc6-compat ttf-freefont && mkdir /fonts
+RUN apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils redis vips-heif gcompat ttf-freefont && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf
+
+RUN echo $'.include = /etc/ssl/openssl.cnf\n\
+\n\
+[provider_sect]\n\
+default = default_sect\n\
+legacy = legacy_sect\n\
+\n\
+[default_sect]\n\
+activate = 1\n\
+\n\
+[legacy_sect]\n\
+activate = 1' >> /app/openssl_legacy.cnf
 
 COPY ./Gemfile ./Gemfile.lock ./
 
-RUN bundle update --bundler && bundle install && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales}']" | xargs rm -rf
+RUN apk add --no-cache build-base && bundle install && apk del build-base && rm -rf ~/.bundle /usr/local/bundle/cache && ruby -e "puts Dir['/usr/local/bundle/**/{spec,rdoc,resources/shared,resources/collation,resources/locales}']" | xargs rm -rf
 
 COPY ./bin ./bin
 COPY ./app ./app
@@ -55,6 +70,7 @@ COPY ./tmp ./tmp
 COPY LICENSE README.md Rakefile config.ru .version ./
 
 COPY --from=fonts /fonts/GoNotoKurrent-Regular.ttf /fonts/GoNotoKurrent-Bold.ttf /fonts/DancingScript-Regular.otf /fonts/OFL.txt /fonts
+COPY --from=fonts /fonts/FreeSans.ttf /usr/share/fonts/freefont
 COPY --from=webpack /app/public/packs ./public/packs
 
 RUN ln -s /fonts /app/public/fonts
@@ -64,4 +80,4 @@ WORKDIR /data/docuseal
 ENV WORKDIR=/data/docuseal
 
 EXPOSE 3000
-CMD ["/app/bin/rails", "server"]
+CMD ["/app/bin/bundle", "exec", "puma", "-C", "/app/config/puma.rb", "--dir", "/app"]

Gemfile

@@ -2,13 +2,15 @@
 
 source 'https://rubygems.org'
 
-ruby '3.2.2'
+ruby '3.3.3'
 
 gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic'
 gem 'aws-sdk-s3', require: false
+gem 'aws-sdk-secretsmanager', require: false
 gem 'azure-storage-blob', require: false
 gem 'bootsnap', require: false
 gem 'cancancan'
+gem 'csv'
 gem 'devise'
 gem 'devise-two-factor'
 gem 'dotenv', require: false
@@ -21,13 +23,13 @@ gem 'image_processing'
 gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
+gem 'net-smtp', '0.4.0'
 gem 'oj'
 gem 'pagy'
-gem 'pdf-reader'
 gem 'pg', require: false
 gem 'premailer-rails'
 gem 'pretender'
-gem 'puma'
+gem 'puma', require: false
 gem 'rack'
 gem 'rails'
 gem 'rails_autolink'
@@ -37,8 +39,8 @@ gem 'rqrcode'
 gem 'ruby-vips'
 gem 'rubyXL'
 gem 'shakapacker'
-gem 'sidekiq', require: ENV.key?('REDIS_URL')
+gem 'sidekiq'
-gem 'sqlite3', require: false
+gem 'sqlite3', require: false, force_ruby_platform: true
 gem 'strip_attributes'
 gem 'turbo-rails'
 gem 'twitter_cldr', require: false

Gemfile.lock

@@ -1,36 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.1.0)
+    actioncable (7.1.3.4)
-    actioncable (7.1.2)
+      actionpack (= 7.1.3.4)
-      actionpack (= 7.1.2)
+      activesupport (= 7.1.3.4)
-      activesupport (= 7.1.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
+    actionmailbox (7.1.3.4)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3.4)
-      activejob (= 7.1.2)
+      activejob (= 7.1.3.4)
-      activerecord (= 7.1.2)
+      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.2)
+      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.2)
+    actionmailer (7.1.3.4)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3.4)
-      actionview (= 7.1.2)
+      actionview (= 7.1.3.4)
-      activejob (= 7.1.2)
+      activejob (= 7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
+    actionpack (7.1.3.4)
-      actionview (= 7.1.2)
+      actionview (= 7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -38,35 +37,35 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
+    actiontext (7.1.3.4)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3.4)
-      activerecord (= 7.1.2)
+      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.2)
+      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.2)
+    actionview (7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.2)
+    activejob (7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.2)
+    activemodel (7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
-    activerecord (7.1.2)
+    activerecord (7.1.3.4)
-      activemodel (= 7.1.2)
+      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activestorage (7.1.2)
+    activestorage (7.1.3.4)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3.4)
-      activejob (= 7.1.2)
+      activejob (= 7.1.3.4)
-      activerecord (= 7.1.2)
+      activerecord (= 7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.1.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -78,26 +77,28 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    afm (0.2.2)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     arabic-letter-connector (0.1.1)
     ast (2.4.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.874.0)
+    aws-partitions (1.913.0)
-    aws-sdk-core (3.190.1)
+    aws-sdk-core (3.191.6)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
+    aws-sdk-kms (1.79.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
+    aws-sdk-s3 (1.146.1)
-      aws-sdk-core (~> 3, >= 3.189.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
+    aws-sdk-secretsmanager (1.91.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
@@ -110,52 +111,55 @@ GEM
       nokogiri (~> 1, >= 1.10.8)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    better_html (2.0.2)
+    better_html (2.1.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.8)
     bindex (0.8.1)
-    bootsnap (1.17.0)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
-    builder (3.2.4)
+    builder (3.3.0)
-    bullet (7.1.4)
+    bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     camertron-eprun (1.1.1)
     cancancan (3.5.0)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    childprocess (5.0.0)
     chunky_png (1.4.0)
     cldr-plurals-runtime-rb (1.1.0)
     cmdparse (3.0.7)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.16.0)
+    css_parser (1.17.1)
       addressable
+    csv (3.3.0)
     cuprite (0.15)
       capybara (~> 3.0)
       ferrum (~> 0.14.0)
     date (3.3.4)
-    debug (1.9.1)
+    debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
     declarative (0.0.20)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -166,13 +170,12 @@ GEM
       devise (~> 4.0)
       railties (~> 7.0)
       rotp (~> 6.0)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     docile (1.4.0)
-    dotenv (2.8.1)
+    dotenv (3.1.0)
-    drb (2.2.0)
+    drb (2.2.1)
-      ruby2_keywords
     email_typo (0.2.3)
     erb_lint (0.5.0)
       activesupport
@@ -181,13 +184,13 @@ GEM
       rainbow
       rubocop
       smart_properties
-    erubi (1.12.0)
+    erubi (1.13.0)
-    factory_bot (6.4.4)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.2)
+    factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faker (3.2.2)
+    faker (3.3.1)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
@@ -225,34 +228,34 @@ GEM
     geom2d (0.4.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-apis-core (0.11.2)
+    google-apis-core (0.14.1)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
+    google-apis-iamcredentials_v1 (0.20.0)
-    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.14.0, < 2.a)
-      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.37.0)
-    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.14.0, < 2.a)
-      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
-    google-cloud-core (1.6.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.0)
+    google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.3.1)
+    google-cloud-errors (1.4.0)
-    google-cloud-storage (1.45.0)
+    google-cloud-storage (1.49.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-core (~> 0.13)
-      google-apis-storage_v1 (~> 0.29.0)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (~> 0.33)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.9.1)
+    googleauth (1.11.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
@@ -260,30 +263,31 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     hashdiff (1.1.0)
-    hashery (2.1.2)
+    hexapdf (0.42.0)
-    hexapdf (0.37.1)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.4, >= 0.4.1)
       openssl (>= 2.2.1)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.7.1)
+    io-console (0.7.2)
-    irb (1.11.0)
+    irb (1.13.1)
-      rdoc
+      rdoc (>= 4.0.0)
-      reline (>= 0.3.8)
+      reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.7.1)
+    json (2.7.2)
-    jwt (2.7.1)
+    jwt (2.8.1)
+      base64
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
+    launchy (3.0.0)
       addressable (~> 2.8)
-    letter_opener (1.8.1)
+      childprocess (~> 5.0)
-      launchy (>= 2.2, < 3)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
     letter_opener_web (2.0.0)
       actionmailer (>= 5.2)
       letter_opener (~> 1.7)
@@ -302,51 +306,49 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.7)
-    minitest (5.20.0)
+    minitest (5.24.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
-    mysql2 (0.5.5)
+    mysql2 (0.5.6)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.9)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
-      net-protocol
     net-protocol (0.2.2)
       timeout
     net-smtp (0.4.0)
       net-protocol
-    nio4r (2.7.0)
+    nio4r (2.7.1)
-    nokogiri (1.15.5)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nokogiri (1.16.7-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
+      racc (~> 1.4)
     oj (3.16.3)
       bigdecimal (>= 3.0)
     openssl (3.2.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    pagy (6.2.0)
+    package_json (0.1.0)
-    parallel (1.24.0)
+    pagy (8.1.2)
-    parser (3.2.2.4)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    pdf-reader (2.12.0)
+    pg (1.5.6)
-      Ascii85 (~> 1.0)
+    premailer (1.23.0)
-      afm (~> 0.2.1)
-      hashery (~> 2.0)
-      ruby-rc4
-      ttfunk
-    pg (1.5.4)
-    premailer (1.21.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
@@ -363,34 +365,34 @@ GEM
       pry (>= 0.10.4)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
-    puma (6.4.0)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.3)
+    racc (1.8.1)
-    rack (2.2.8)
+    rack (3.1.7)
     rack-proxy (0.7.7)
       rack
-    rack-session (1.0.2)
+    rack-session (2.0.0)
-      rack (< 3)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (1.0.0)
+    rackup (2.1.0)
-      rack (< 3)
+      rack (>= 3)
-      webrick
+      webrick (~> 1.8)
-    rails (7.1.2)
+    rails (7.1.3.4)
-      actioncable (= 7.1.2)
+      actioncable (= 7.1.3.4)
-      actionmailbox (= 7.1.2)
+      actionmailbox (= 7.1.3.4)
-      actionmailer (= 7.1.2)
+      actionmailer (= 7.1.3.4)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3.4)
-      actiontext (= 7.1.2)
+      actiontext (= 7.1.3.4)
-      actionview (= 7.1.2)
+      actionview (= 7.1.3.4)
-      activejob (= 7.1.2)
+      activejob (= 7.1.3.4)
-      activemodel (= 7.1.2)
+      activemodel (= 7.1.3.4)
-      activerecord (= 7.1.2)
+      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.2)
+      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.1.3.4)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -398,113 +400,108 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_autolink (1.1.8)
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (7.1.2)
+    railties (7.1.3.4)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
-    rdoc (6.6.2)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    redis-client (0.19.1)
+    redis-client (0.22.2)
       connection_pool
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.2)
-    reline (0.4.1)
+    reline (0.5.7)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    request_store (1.5.1)
+    request_store (1.6.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.3.6)
+      strscan
     rotp (6.3.0)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec-core (3.12.2)
+    rspec-core (3.13.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
-    rspec-expectations (3.12.3)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
-    rspec-rails (6.1.0)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
+      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.12)
+      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.12)
+      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.12)
+      rspec-support (~> 3.13)
-    rspec-support (3.12.1)
+    rspec-support (3.13.1)
-    rubocop (1.59.0)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
+    rubocop-ast (1.31.3)
-      parser (>= 3.2.1.0)
+      parser (>= 3.3.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-performance (1.21.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
-    rubocop-performance (1.20.1)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.23.1)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.25.0)
+    rubocop-rspec (3.0.3)
-      rubocop (~> 1.40)
+      rubocop (~> 1.61)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
-    ruby-rc4 (0.1.5)
+    ruby-vips (2.2.1)
-    ruby-vips (2.2.0)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
-    rubyXL (3.4.25)
+    rubyXL (3.4.27)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
     semantic_range (3.0.0)
-    shakapacker (7.1.0)
+    shakapacker (8.0.0)
       activesupport (>= 5.2)
+      package_json
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    sidekiq (7.2.0)
+    sidekiq (7.2.4)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.14.0)
+      redis-client (>= 0.19.0)
-    signet (0.18.0)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -516,17 +513,16 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    sqlite3 (1.7.0)
+    sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (1.7.0-arm64-darwin)
     stringio (3.1.0)
     strip_attributes (1.13.0)
       activemodel (>= 3.0, < 8.0)
-    thor (1.3.0)
+    strscan (3.1.0)
+    thor (1.3.1)
     timeout (0.4.1)
     trailblazer-option (0.1.2)
-    ttfunk (1.7.0)
+    turbo-rails (2.0.5)
-    turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
@@ -536,7 +532,7 @@ GEM
       tzinfo
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.4)
+    tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
     unicode-display_width (2.5.0)
@@ -548,7 +544,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.19.1)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -558,22 +554,25 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.14)
 
 PLATFORMS
-  arm64-darwin-22
+  aarch64-linux
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   annotate
   arabic-letter-connector
   aws-sdk-s3
+  aws-sdk-secretsmanager
   azure-storage-blob
   better_html
   bootsnap
   bullet
   cancancan
   capybara
+  csv
   cuprite
   debug
   devise
@@ -592,9 +591,9 @@ DEPENDENCIES
   letter_opener_web
   lograge
   mysql2
+  net-smtp (= 0.4.0)
   oj
   pagy
-  pdf-reader
   pg
   premailer-rails
   pretender
@@ -625,7 +624,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.3.3p89
 
 BUNDLED WITH
    2.5.3

README.md

@@ -42,7 +42,7 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - PDF signature verification
 - Users management
 - Mobile-optimized
-- Signing available in 12 Languages
+- Signing available in 13 languages
 - API and Webhooks for integrations
 - Easy to deploy in minutes
 
@@ -51,11 +51,13 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 - User roles
 - Automated reminders
 - Invitation and identify verification via SMS
+- Conditional fields and formulas
+- Bulk send with CSV, XLSX spreadsheet import
 - SSO / SAML
 - Template creation with HTML API ([Guide](https://www.docuseal.co/guides/create-pdf-document-fillable-form-with-html-api))
 - Template creation with PDF or DOCX and field tags API ([Guide](https://www.docuseal.co/guides/use-embedded-text-field-tags-in-the-pdf-to-create-a-fillable-form))
-- Embedded signing form ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue) or [JavaScript](https://www.docuseal.co/docs/embedded))
+- Embedded signing form ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.co/docs/embedded))
-- Embedded document form builder ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue) or [JavaScript](https://www.docuseal.co/docs/embedded))
+- Embedded document form builder ([React](https://github.com/docusealco/docuseal-react), [Vue](https://github.com/docusealco/docuseal-vue), [Angular](https://github.com/docusealco/docuseal-angular) or [JavaScript](https://www.docuseal.co/docs/embedded))
 - [Learn more](https://www.docuseal.co/pricing)
 
 ## Deploy
@@ -65,9 +67,6 @@ DocuSeal is an open source platform that provides secure and efficient digital d
 | [<img alt="Deploy on Heroku" src="https://www.herokucdn.com/deploy/button.svg" height="40">](https://heroku.com/deploy?template=https://github.com/docusealco/docuseal-heroku) | [<img alt="Deploy on Railway" src="https://railway.app/button.svg" height="40">](https://railway.app/template/IGoDnc?referralCode=ruU7JR)|
 |**DigitalOcean**|**Render**|
 | [<img alt="Deploy on DigitalOcean" src="https://www.deploytodo.com/do-btn-blue.svg" height="40">](https://cloud.digitalocean.com/apps/new?repo=https://github.com/docusealco/docuseal-digitalocean/tree/master&refcode=421d50f53990) | [<img alt="Deploy to Render" src="https://render.com/images/deploy-to-render-button.svg" height="40">](https://render.com/deploy?repo=https://github.com/docusealco/docuseal-render)
-|**Koyeb**|**Elestio**|
-| [<img alt="Deploy on Koyeb" src="https://www.koyeb.com/static/images/deploy/button.svg" height="40">](https://app.koyeb.com/deploy?name=docuseal&type=docker&image=docker.io/docuseal/docuseal&env[PORT]=8000&env[DATABASE_URL]=CHANGE_ME&env[SECRET_KEY_BASE]=CHANGE_ME&ports=8000;http;/) | [<img alt="Deploy on Elestio" src="https://pub-da36157c854648669813f3f76c526c2b.r2.dev/deploy-on-elestio-black.png">](https://dash.elest.io/deploy?soft=DocuSeal&id=339) |
-
 
 #### Docker
 
@@ -100,3 +99,9 @@ At DocuSeal we have expertise and technologies to make documents creation, filli
 
 Distributed under the AGPLv3 License. See [LICENSE](https://github.com/docusealco/docuseal/blob/master/LICENSE) for more information.
 Unless otherwise noted, all files © 2023 DocuSeal LLC.
+
+## Tools
+
+- [Signature Maker](https://www.docuseal.co/online-signature)
+- [Sign Document Online](https://www.docuseal.co/sign-documents-online)
+- [Fill PDF Online](https://www.docuseal.co/fill-pdf)

SECURITY.md

@@ -3,3 +3,12 @@
 If you come across any security concern or vulnarability, please report the information via email to security@docuseal.co instead of opening a GitHub issue. We will promptly respond and will collaborate with you to validate the issue, and resolve it ASAP.
 
 **We have a bug bounty program to reward security researchers.**
+
+Out of scope vulnerabilities:
+
+- CSRF
+- DNSSEC, CAA, CSP headers
+- DNS or email security related
+- Rate Limiting
+
+Note: We reserve the right to classify any reported vulnerability as out of scope for the bug bounty program.

app/controllers/account_configs_controller.rb

@@ -8,9 +8,19 @@ class AccountConfigsController < ApplicationController
     AccountConfig::ALLOW_TYPED_SIGNATURE,
     AccountConfig::FORCE_MFA,
     AccountConfig::ALLOW_TO_RESUBMIT,
-    AccountConfig::ESIGNING_PREFERENCE_KEY
+    AccountConfig::FORM_PREFILL_SIGNATURE_KEY,
+    AccountConfig::ESIGNING_PREFERENCE_KEY,
+    AccountConfig::FORM_WITH_CONFETTI_KEY,
+    AccountConfig::DOWNLOAD_LINKS_AUTH_KEY,
+    AccountConfig::FORCE_SSO_AUTH_KEY,
+    AccountConfig::FLATTEN_RESULT_PDF_KEY,
+    AccountConfig::WITH_SIGNATURE_ID,
+    AccountConfig::COMBINE_PDF_RESULT_KEY,
+    AccountConfig::REQUIRE_SIGNING_REASON_KEY
   ].freeze
 
+  InvalidKey = Class.new(StandardError)
+
   def create
     @account_config.update!(account_config_params)
 
@@ -20,7 +30,7 @@ class AccountConfigsController < ApplicationController
   private
 
   def load_account_config
-    return head :not_found unless ALLOWED_KEYS.include?(account_config_params[:key])
+    raise InvalidKey unless ALLOWED_KEYS.include?(account_config_params[:key])
 
     @account_config =
       AccountConfig.find_or_initialize_by(account: current_account, key: account_config_params[:key])

app/controllers/accounts_controller.rb

@@ -7,7 +7,8 @@ class AccountsController < ApplicationController
     'fr-FR' => 'French (France)',
     'es-ES' => 'Spanish (Spain)',
     'pt-PT' => 'Portuguese (Portugal)',
-    'de-DE' => 'German (Germany)'
+    'de-DE' => 'German (Germany)',
+    'it-IT' => 'Italian (Italy)'
   }.freeze
 
   before_action :load_account

app/controllers/api/active_storage_blobs_proxy_controller.rb

@@ -8,11 +8,12 @@ module Api
     skip_authorization_check
 
     before_action :set_cors_headers
+    before_action :set_noindex_headers
 
     def show
       blob_uuid, purp, exp = ApplicationRecord.signed_id_verifier.verified(params[:signed_uuid])
 
-      if blob_uuid.blank? || purp != 'blob' || (exp && exp < Time.current.to_i)
+      if blob_uuid.blank? || (purp.present? && purp != 'blob') || (exp && exp < Time.current.to_i)
         Rollbar.error('Blob not found') if defined?(Rollbar)
 
         return head :not_found
@@ -20,6 +21,8 @@ module Api
 
       blob = ActiveStorage::Blob.find_by!(uuid: blob_uuid)
 
+      authorization_check!(blob) if exp.blank?
+
       if request.headers['Range'].present?
         send_blob_byte_range_data blob, request.headers['Range']
       else
@@ -31,5 +34,22 @@ module Api
         end
       end
     end
+
+    private
+
+    def authorization_check!(blob)
+      is_authorized =
+        blob.attachments.all? do |a|
+          a.name.in?(%w[logo preview_images]) ||
+            (current_user && a.record.account.id == current_user.account_id) ||
+            !a.record.account.account_configs.find_or_initialize_by(key: AccountConfig::DOWNLOAD_LINKS_AUTH_KEY).value
+        end
+
+      return if is_authorized
+
+      Rollbar.error('Blob aunauthorized') if defined?(Rollbar)
+
+      raise CanCan::AccessDenied
+    end
   end
 end

app/controllers/api/active_storage_blobs_proxy_legacy_controller.rb

@@ -7,6 +7,9 @@ module Api
     skip_before_action :authenticate_user!
     skip_authorization_check
 
+    before_action :set_cors_headers
+    before_action :set_noindex_headers
+
     # rubocop:disable Metrics
     def show
       Rollbar.info('Blob legacy') if defined?(Rollbar)

app/controllers/api/api_base_controller.rb

@@ -19,10 +19,14 @@ module Api
       render json: { error: e.message }, status: :unprocessable_entity
     end
 
+    rescue_from RateLimit::LimitApproached do |e|
+      Rollbar.error(e) if defined?(Rollbar)
+
+      render json: { error: 'Too many requests' }, status: :too_many_requests
+    end
+
     if Rails.env.production?
       rescue_from CanCan::AccessDenied do |e|
-        Rollbar.warning(e) if defined?(Rollbar)
-
         render json: { error: e.message }, status: :forbidden
       end
 
@@ -35,31 +39,42 @@ module Api
 
     private
 
-    def paginate(relation)
+    def paginate(relation, field: :id)
-      result = relation.order(id: :desc)
+      result = relation.order(field => :desc)
                        .limit([params.fetch(:limit, DEFAULT_LIMIT).to_i, MAX_LIMIT].min)
 
-      result = result.where(relation.arel_table[:id].lt(params[:after])) if params[:after].present?
+      if field == :id
-      result = result.where(relation.arel_table[:id].gt(params[:before])) if params[:before].present?
+        result = result.where(id: ...params[:after].to_i) if params[:after].present?
+        result = result.where(id: (params[:before].to_i + 1)...) if params[:before].present?
+      else
+        result = result.where(field => ...params[:after]) if params[:after].present?
+        result = result.where(field => (params[:before] + 1)...) if params[:before].present?
+      end
 
       result
     end
 
     def authenticate_user!
-      @current_user ||=
-        if request.headers['X-Auth-Token'].present?
-          sha256 = Digest::SHA256.hexdigest(request.headers['X-Auth-Token'])
-
-          User.joins(:access_token).active.find_by(access_token: { sha256: })
-        end
-
       render json: { error: 'Not authenticated' }, status: :unauthorized unless current_user
     end
 
+    def current_user
+      super || @current_user ||=
+                 if request.headers['X-Auth-Token'].present?
+                   sha256 = Digest::SHA256.hexdigest(request.headers['X-Auth-Token'])
+
+                   User.joins(:access_token).active.find_by(access_token: { sha256: })
+                 end
+    end
+
     def current_account
       current_user&.account
     end
 
+    def set_noindex_headers
+      headers['X-Robots-Tag'] = 'noindex'
+    end
+
     def set_cors_headers
       headers['Access-Control-Allow-Origin'] = '*'
       headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, PATCH, DELETE, OPTIONS'

app/controllers/api/attachments_controller.rb

@@ -1,16 +1,37 @@
 # frozen_string_literal: true
 
 module Api
-  class AttachmentsController < ApiBaseController
+  class AttachmentsController < ActionController::API
-    skip_before_action :authenticate_user!
+    include ActionController::Cookies
-    skip_authorization_check
+    include ActiveStorage::SetCurrent
+
+    COOKIE_STORE_LIMIT = 10
 
     def create
       submitter = Submitter.find_by!(slug: params[:submitter_slug])
 
       attachment = Submitters.create_attachment!(submitter, params)
 
-      render json: attachment.as_json(only: %i[uuid], methods: %i[url filename content_type])
+      if params[:remember_signature] == 'true' && submitter.email.present?
+        cookies.encrypted[:signature_uuids] = build_new_cookie_signatures_json(submitter, attachment)
+      end
+
+      render json: attachment.as_json(only: %i[uuid created_at], methods: %i[url filename content_type])
+    end
+
+    def build_new_cookie_signatures_json(submitter, attachment)
+      values =
+        begin
+          JSON.parse(cookies.encrypted[:signature_uuids].presence || '{}')
+        rescue JSON::ParserError
+          {}
+        end
+
+      values[submitter.email] = attachment.uuid
+
+      values = values.to_a.last(COOKIE_STORE_LIMIT).to_h if values.size > COOKIE_STORE_LIMIT
+
+      values.to_json
     end
   end
 end

app/controllers/api/form_events_controller.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Api
+  class FormEventsController < ApiBaseController
+    load_and_authorize_resource :submitter, parent: false
+
+    def index
+      submitters = @submitters.where.not(completed_at: nil)
+
+      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?
+
+      submitters = paginate(
+        submitters.preload(template: :folder, submission: [:submitters, { audit_trail_attachment: :blob,
+                                                                          combined_document_attachment: :blob }],
+                           documents_attachments: :blob, attachments_attachments: :blob),
+        field: :completed_at
+      )
+
+      render json: {
+        data: submitters.map do |s|
+                {
+                  event_type: 'form.completed',
+                  timestamp: s.completed_at,
+                  data: Submitters::SerializeForWebhook.call(s)
+                }
+              end,
+        pagination: {
+          count: submitters.size,
+          next: submitters.last&.completed_at&.to_i,
+          prev: submitters.first&.completed_at&.to_i
+        }
+      }
+    end
+  end
+end

app/controllers/api/submission_events_controller.rb

@@ -0,0 +1,52 @@
+# 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/submissions_controller.rb

@@ -17,11 +17,13 @@ module Api
         submissions = submissions.joins(template: :folder).where(folder: { name: params[:template_folder] })
       end
 
-      submissions = paginate(submissions.preload(:created_by_user, :template, :submitters,
+      submissions = paginate(submissions.preload(:created_by_user, :submitters,
+                                                 template: :folder,
+                                                 combined_document_attachment: :blob,
                                                  audit_trail_attachment: :blob))
 
       render json: {
-        data: submissions.as_json(serialize_params),
+        data: submissions.as_json(Submissions::SerializeForApi::SERIALIZE_PARAMS),
         pagination: {
           count: submissions.size,
           next: submissions.last&.id,
@@ -43,33 +45,11 @@ module Api
         @submission.audit_trail_attachment = Submissions::GenerateAuditTrail.call(@submission)
       end
 
-      serialized_submitters = submitters.map { |submitter| Submitters::SerializeForApi.call(submitter) }
+      render json: Submissions::SerializeForApi.call(@submission, submitters, params)
-
-      json = @submission.as_json(
-        serialize_params.deep_merge(
-          include: { submission_events: { only: %i[id submitter_id event_type event_timestamp] } }
-        )
-      )
-
-      if submitters.all?(&:completed_at?)
-        last_submitter = submitters.max_by(&:completed_at)
-
-        json[:documents] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
-        json[:status] = 'completed'
-        json[:completed_at] = last_submitter.completed_at
-      else
-        json[:documents] = []
-        json[:status] = 'pending'
-        json[:completed_at] = nil
-      end
-
-      json[:submitters] = serialized_submitters
-
-      render json:
     end
 
     def create
-      Params::SubmissionCreateValidator.call(params, dry_run: !Docuseal.multitenant?)
+      Params::SubmissionCreateValidator.call(params)
 
       return render json: { error: 'Template not found' }, status: :unprocessable_entity if @template.nil?
 
@@ -84,15 +64,19 @@ module Api
 
       submissions = create_submissions(@template, params)
 
+      submissions.each do |submission|
+        SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id })
+      end
+
       Submissions.send_signature_requests(submissions)
 
       submissions.each do |submission|
         if submission.submitters.all?(&:completed_at?) && submission.submitters.last
-          ProcessSubmitterCompletionJob.perform_later(submission.submitters.last)
+          ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => submission.submitters.last.id })
         end
       end
 
-      render json: submissions.flat_map(&:submitters)
+      render json: build_create_json(submissions)
     rescue Submitters::NormalizeValues::BaseError => e
       Rollbar.warning(e) if defined?(Rollbar)
 
@@ -100,13 +84,31 @@ module Api
     end
 
     def destroy
-      @submission.update!(archived_at: Time.current)
+      if params[:permanently] == 'true'
+        @submission.destroy!
+      else
+        @submission.update!(archived_at: Time.current)
 
-      render json: @submission.as_json(only: %i[id], methods: %i[archived_at])
+        SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
+      end
+
+      render json: @submission.as_json(only: %i[id archived_at])
     end
 
     private
 
+    def build_create_json(submissions)
+      json = submissions.flat_map do |submission|
+        submission.submitters.map do |s|
+          Submitters::SerializeForApi.call(s, with_documents: false, with_urls: true, params:)
+        end
+      end
+
+      json = { submitters: json } if request.path.ends_with?('/init')
+
+      json
+    end
+
     def create_submissions(template, params)
       is_send_email = !params[:send_email].in?(['false', false])
 
@@ -126,7 +128,6 @@ module Api
           template:,
           user: current_user,
           source: :api,
-          mark_as_sent: is_send_email,
           submitters_order: params[:submitters_order] || params[:order] || 'preserved',
           submissions_attrs:,
           params:
@@ -144,31 +145,18 @@ module Api
       end
     end
 
-    def serialize_params
-      {
-        only: %i[id source submitters_order created_at updated_at archived_at],
-        methods: %i[audit_log_url],
-        include: {
-          submitters: { only: %i[id slug uuid name email phone
-                                 completed_at opened_at sent_at
-                                 created_at updated_at external_id metadata],
-                        methods: %i[status application_key] },
-          template: { only: %i[id name created_at updated_at] },
-          created_by_user: { only: %i[id email first_name last_name] }
-        }
-      }
-    end
-
     def submissions_params
       permitted_attrs = [
-        :send_email, :send_sms, :bcc_completed, :completed_redirect_url,
+        :send_email, :send_sms, :bcc_completed, :completed_redirect_url, :reply_to, :go_to_last,
+        :expire_at,
         {
           message: %i[subject body],
           submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
-                        :completed, :phone, :application_key, :external_id,
+                        :completed, :phone, :application_key, :external_id, :reply_to, :go_to_last,
                         { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
-                          fields: [%i[name default_value title description
+                          fields: [:name, :uuid, :default_value, :value, :title, :description,
-                                      readonly validation_pattern invalid_message]] }]]
+                                   :readonly, :redacted, :validation_pattern, :invalid_message,
+                                   { default_value: [], value: [], preferences: {} }] }]]
         }
       ]
 

app/controllers/api/submitter_form_views_controller.rb

@@ -13,7 +13,7 @@ module Api
 
       SubmissionEvents.create_with_tracking_data(submitter, 'view_form', request)
 
-      SendFormViewedWebhookRequestJob.perform_later(submitter)
+      SendFormViewedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })
 
       render json: {}
     end

app/controllers/api/submitters_autocomplete_controller.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class SubmittersAutocompleteController < ApiBaseController
-    load_and_authorize_resource :submitter, parent: false
-
-    SELECT_COLUMNS = %w[email phone name].freeze
-    LIMIT = 100
-
-    def index
-      submitters = search_submitters(@submitters)
-
-      values = submitters.limit(LIMIT).group(SELECT_COLUMNS.join(', ')).pluck(SELECT_COLUMNS.join(', '))
-
-      attrs = values.map { |row| SELECT_COLUMNS.zip(row).to_h }
-      attrs = attrs.uniq { |e| e[params[:field]] } if params[:field].present?
-
-      render json: attrs
-    end
-
-    private
-
-    def search_submitters(submitters)
-      if SELECT_COLUMNS.include?(params[:field])
-        column = Submitter.arel_table[params[:field].to_sym]
-
-        term = "%#{params[:q].downcase}%"
-
-        submitters.where(column.lower.matches(term))
-      else
-        Submitters.search(submitters, params[:q])
-      end
-    end
-  end
-end

app/controllers/api/submitters_controller.rb

@@ -11,13 +11,21 @@ module Api
       submitters = submitters.where(external_id: params[:external_id]) if params[:external_id].present?
       submitters = submitters.where(submission_id: params[:submission_id]) if params[:submission_id].present?
 
+      if params[:template_id].present?
+        submitters = submitters.joins(:submission).where(submission: { template_id: params[:template_id] })
+      end
+
+      submitters = maybe_filder_by_completed_at(submitters, params)
+
       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) },
+        data: submitters.map do |s|
+                Submitters::SerializeForApi.call(s, with_template: true, with_events: true, params:)
+              end,
         pagination: {
           count: submitters.size,
           next: submitters.last&.id,
@@ -29,7 +37,7 @@ module Api
     def show
       Submissions::EnsureResultGenerated.call(@submitter) if @submitter.completed_at?
 
-      render json: Submitters::SerializeForApi.call(@submitter, with_template: true, with_events: true)
+      render json: Submitters::SerializeForApi.call(@submitter, with_template: true, with_events: true, params:)
     end
 
     def update
@@ -60,42 +68,101 @@ module Api
       end
 
       if @submitter.completed_at?
-        ProcessSubmitterCompletionJob.perform_later(@submitter)
+        ProcessSubmitterCompletionJob.perform_async({ 'submitter_id' => @submitter.id })
       elsif normalized_params[:send_email] || normalized_params[:send_sms]
         Submitters.send_signature_requests([@submitter])
       end
 
-      render json: Submitters::SerializeForApi.call(@submitter, with_template: false, with_events: false)
+      render json: Submitters::SerializeForApi.call(@submitter, with_template: false,
+                                                                with_urls: true,
+                                                                with_events: false,
+                                                                params:)
+    rescue Submitters::NormalizeValues::BaseError => e
+      Rollbar.warning(e) if defined?(Rollbar)
+
+      render json: { error: e.message }, status: :unprocessable_entity
     end
 
     def submitter_params
       submitter_params = params.key?(:submitter) ? params.require(:submitter) : params
 
       submitter_params.permit(
-        :send_email, :send_sms, :uuid, :name, :email, :role,
+        :send_email, :send_sms, :reply_to, :completed_redirect_url, :uuid, :name, :email, :role,
-        :completed, :phone, :application_key, :external_id,
+        :completed, :phone, :application_key, :external_id, :go_to_last,
         { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
-          fields: [%i[name default_value readonly validation_pattern invalid_message]] }
+          fields: [[:name, :uuid, :default_value, :value,
+                    :readonly, :redacted, :validation_pattern, :invalid_message,
+                    { default_value: [], value: [], preferences: {} }]] }
       )
     end
 
     private
 
+    def maybe_filder_by_completed_at(submitters, params)
+      if params[:completed_after].present?
+        submitters = submitters.where(completed_at: Time.zone.parse(params[:completed_after])..)
+      end
+
+      if params[:completed_before].present?
+        submitters = submitters.where(completed_at: ..Time.zone.parse(params[:completed_before]))
+      end
+
+      submitters
+    end
+
     def assign_submitter_attrs(submitter, attrs)
-      submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
+      values = attrs[:values]&.to_unsafe_h || {}
-      submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '') if attrs.key?(:phone)
-      submitter.values = submitter.values.merge(attrs[:values].to_unsafe_h) if attrs[:values].present?
-      submitter.completed_at = attrs[:completed] ? Time.current : submitter.completed_at
-      submitter.external_id = attrs[:application_key] if attrs.key?(:application_key)
-      submitter.external_id = attrs[:external_id] if attrs.key?(:external_id)
-      submitter.metadata = attrs[:metadata] if attrs.key?(:metadata)
 
       assign_submission_fields(submitter.submission)
+
+      phone_field_uuid = submitter.submission.template_fields.find do |f|
+        values[f['uuid']].present? && f['type'] == 'phone'
+      end&.dig('uuid')
+
+      submitter.email = Submissions.normalize_email(attrs[:email]) if attrs.key?(:email)
+
+      if attrs.key?(:phone)
+        submitter.phone = attrs[:phone].to_s.gsub(/[^0-9+]/, '')
+      elsif values[phone_field_uuid].present?
+        submitter.phone = values[phone_field_uuid].to_s.gsub(/[^0-9+]/, '')
+      end
+
+      values = values.except(phone_field_uuid)
+
+      submitter.values = submitter.values.merge(values) if values.present?
+      submitter.metadata = attrs[:metadata] if attrs.key?(:metadata)
+
+      maybe_assign_completed_attributes(submitter, attrs)
+
+      assign_external_id(submitter, attrs)
       assign_preferences(submitter, attrs)
 
       submitter
     end
 
+    def maybe_assign_completed_attributes(submitter, attrs)
+      submitter.completed_at = attrs[:completed] ? Time.current : submitter.completed_at
+
+      if attrs[:completed]
+        submitter.values = Submitters::SubmitValues.merge_default_values(submitter)
+        submitter.values = Submitters::SubmitValues.merge_formula_values(submitter)
+        submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter)
+
+        submitter.values = submitter.values.transform_values do |v|
+          v == '{{date}}' ? Time.current.in_time_zone(submitter.account.timezone).to_date.to_s : v
+        end
+      end
+
+      submitter
+    end
+
+    def assign_external_id(submitter, attrs)
+      submitter.external_id = attrs[:application_key] if attrs.key?(:application_key)
+      submitter.external_id = attrs[:external_id] if attrs.key?(:external_id)
+
+      submitter
+    end
+
     def assign_submission_fields(submission)
       submission.template_fields ||= submission.template.fields
       submission.template_schema ||= submission.template.schema
@@ -111,6 +178,14 @@ module Api
       end
 
       submitter.preferences['send_sms'] = submitter_preferences['send_sms'] if submitter_preferences.key?('send_sms')
+      submitter.preferences['reply_to'] = submitter_preferences['reply_to'] if submitter_preferences.key?('reply_to')
+      if submitter_preferences.key?('go_to_last')
+        submitter.preferences['go_to_last'] = submitter_preferences['go_to_last']
+      end
+
+      if submitter_preferences.key?('completed_redirect_url')
+        submitter.preferences['completed_redirect_url'] = submitter_preferences['completed_redirect_url']
+      end
 
       return unless submitter_preferences.key?('email_message_uuid')
 

app/controllers/api/template_folders_autocomplete_controller.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class TemplateFoldersAutocompleteController < ApiBaseController
-    load_and_authorize_resource :template_folder, parent: false
-
-    LIMIT = 100
-
-    def index
-      template_folders = @template_folders.joins(:templates).where(templates: { archived_at: nil }).distinct
-      template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)
-
-      render json: template_folders.as_json(only: %i[name archived_at])
-    end
-  end
-end

app/controllers/api/templates_clone_controller.rb

@@ -7,6 +7,11 @@ module Api
     def create
       authorize!(:manage, @template)
 
+      ActiveRecord::Associations::Preloader.new(
+        records: [@template],
+        associations: [schema_documents: :preview_images_attachments]
+      ).call
+
       cloned_template = Templates::Clone.call(
         @template,
         author: current_user,
@@ -18,18 +23,11 @@ module Api
       cloned_template.source = :api
       cloned_template.save!
 
-      Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
+      schema_documents = Templates::CloneAttachments.call(template: cloned_template, original_template: @template)
 
-      render json: cloned_template.as_json(serialize_params)
+      SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => cloned_template.id)
-    end
 
-    private
+      render json: Templates::SerializeForApi.call(cloned_template, schema_documents)
-
-    def serialize_params
-      {
-        include: { author: { only: %i[id email first_name last_name] },
-                   documents: { only: %i[id uuid], methods: %i[url filename] } }
-      }
     end
   end
 end

app/controllers/api/templates_controller.rb

@@ -49,6 +49,14 @@ module Api
         @template.folder = TemplateFolders.find_or_create_by_name(current_user, folder_name)
       end
 
+      Array.wrap(params[:roles].presence || params.dig(:template, :roles).presence).each_with_index do |role, index|
+        if (item = @template.submitters[index])
+          item['name'] = role
+        else
+          @template.submitters << { 'name' => role, 'uuid' => SecureRandom.uuid }
+        end
+      end
+
       archived = params.key?(:archived) ? params[:archived] : params.dig(:template, :archived)
 
       if archived.in?([true, false])
@@ -57,11 +65,13 @@ module Api
 
       @template.update!(template_params)
 
+      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
+
       render json: @template.as_json(only: %i[id updated_at])
     end
 
     def destroy
-      if params[:permanently] == 'true' && !Docuseal.multitenant?
+      if params[:permanently] == 'true'
         @template.destroy!
       else
         @template.update!(archived_at: Time.current)
@@ -83,20 +93,26 @@ module Api
     end
 
     def template_params
-      permit_params = [
+      permitted_params = [
         :name,
-        { schema: [%i[attachment_uuid name]],
+        :external_id,
+        {
           submitters: [%i[name uuid]],
-          fields: [[:uuid, :submitter_uuid, :name, :type, :required, :readonly, :default_value,
+          fields: [[:uuid, :submitter_uuid, :name, :type,
+                    :required, :readonly, :default_value,
+                    :title, :description,
                     { preferences: {},
+                      conditions: [%i[field_uuid value action]],
                       options: [%i[value uuid]],
-                      areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]] }
+                      validation: %i[message pattern],
+                      areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]]
+        }
       ]
 
       if params.key?(:template)
-        params.require(:template).permit(*permit_params)
+        params.require(:template).permit(permitted_params)
       else
-        params.permit(*permit_params)
+        params.permit(permitted_params)
       end
     end
   end

app/controllers/api/templates_documents_controller.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  class TemplatesDocumentsController < ApiBaseController
-    load_and_authorize_resource :template
-
-    def create
-      return head :unprocessable_entity if params[:blobs].blank? && params[:files].blank?
-
-      documents = Templates::CreateAttachments.call(@template, params)
-
-      schema = documents.map do |doc|
-        { attachment_uuid: doc.uuid, name: doc.filename.base }
-      end
-
-      render json: {
-        schema:,
-        documents: documents.as_json(
-          methods: %i[metadata signed_uuid],
-          include: {
-            preview_images: { methods: %i[url metadata filename] }
-          }
-        )
-      }
-    rescue Templates::CreateAttachments::PdfEncrypted
-      render json: { error: 'PDF encrypted' }, status: :unprocessable_entity
-    end
-  end
-end

app/controllers/api/tools_controller.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Api
+  class ToolsController < ApiBaseController
+    skip_authorization_check
+
+    def merge
+      files = params[:files] || []
+
+      return render json: { error: 'Files are required' }, status: :unprocessable_entity if files.blank?
+      return render json: { error: 'At least 2 files are required' }, status: :unprocessable_entity if files.size < 2
+
+      render json: {
+        data: Base64.encode64(PdfUtils.merge(files.map { |base64| StringIO.new(Base64.decode64(base64)) }).string)
+      }
+    end
+
+    def verify
+      file = Base64.decode64(params[:file])
+      pdf = HexaPDF::Document.new(io: StringIO.new(file))
+
+      trusted_certs = Accounts.load_trusted_certs(current_account)
+
+      is_checksum_found = ActiveStorage::Attachment.joins(:blob)
+                                                   .where(name: 'documents', record_type: 'Submitter')
+                                                   .exists?(blob: { checksum: Digest::MD5.base64digest(file) })
+
+      render json: {
+        checksum_status: is_checksum_found ? 'verified' : 'not_found',
+        signatures: pdf.signatures.map do |sig|
+          {
+            verification_result: sig.verify(trusted_certs:).messages,
+            signer_name: sig.signer_name,
+            signing_reason: sig.signing_reason,
+            signing_time: sig.signing_time,
+            signature_type: sig.signature_type
+          }
+        end
+      }
+    end
+  end
+end

app/controllers/api/users_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Api
+  class UsersController < ApiBaseController
+    authorize_resource :current_user
+
+    def show
+      render json: current_user.as_json(only: %i[id first_name last_name email])
+    end
+  end
+end

app/controllers/application_controller.rb

@@ -22,6 +22,12 @@ class ApplicationController < ActionController::Base
     redirect_to request.path
   end
 
+  rescue_from RateLimit::LimitApproached do |e|
+    Rollbar.error(e) if defined?(Rollbar)
+
+    redirect_to request.referer, alert: 'Too many requests', status: :too_many_requests
+  end
+
   if Rails.env.production?
     rescue_from CanCan::AccessDenied do |e|
       Rollbar.warning(e) if defined?(Rollbar)
@@ -46,7 +52,8 @@ class ApplicationController < ActionController::Base
   private
 
   def with_browser_locale(&)
-    locale = request.env['HTTP_ACCEPT_LANGUAGE'].to_s[BROWSER_LOCALE_REGEXP].to_s
+    locale   = params[:lang].presence
+    locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s[BROWSER_LOCALE_REGEXP].to_s
 
     locale =
       if locale.starts_with?('en-') && locale != 'en-US'

app/controllers/console_redirect_controller.rb

@@ -5,6 +5,12 @@ class ConsoleRedirectController < ApplicationController
   skip_authorization_check
 
   def index
+    if request.path == '/upgrade'
+      params[:redir] = Docuseal.multitenant? ? "#{Docuseal::CONSOLE_URL}/plans" : "#{Docuseal::CONSOLE_URL}/on_premise"
+    end
+
+    params[:redir] = "#{Docuseal::CONSOLE_URL}/manage" if request.path == '/manage'
+
     return redirect_to(new_user_session_path({ redir: params[:redir] }.compact)) if true_user.blank?
 
     auth = JsonWebToken.encode(uuid: true_user.uuid,

app/controllers/dashboard_controller.rb

@@ -7,62 +7,18 @@ class DashboardController < ApplicationController
   before_action :maybe_render_landing
   before_action :maybe_redirect_mfa_setup
 
-  load_and_authorize_resource :template_folder, parent: false
+  skip_authorization_check
-  load_and_authorize_resource :template, parent: false
-
-  SHOW_TEMPLATES_FOLDERS_THRESHOLD = 9
-  TEMPLATES_PER_PAGE = 12
-  FOLDERS_PER_PAGE = 18
 
   def index
-    @template_folders = filter_template_folders(@template_folders)
+    if cookies.permanent[:dashboard_view] == 'submissions'
-
+      SubmissionsDashboardController.dispatch(:index, request, response)
-    @pagy, @template_folders = pagy(
-      @template_folders,
-      items: FOLDERS_PER_PAGE,
-      page: @template_folders.count > SHOW_TEMPLATES_FOLDERS_THRESHOLD ? params[:page] : 1
-    )
-
-    if @pagy.count > SHOW_TEMPLATES_FOLDERS_THRESHOLD
-      @templates = @templates.none
     else
-      @template_folders = @template_folders.reject { |e| e.name == TemplateFolder::DEFAULT_NAME }
+      TemplatesDashboardController.dispatch(:index, request, response)
-      @templates = filter_templates(@templates)
-
-      items =
-        if @template_folders.size < 4
-          TEMPLATES_PER_PAGE
-        else
-          (@template_folders.size < 7 ? 9 : 6)
-        end
-
-      @pagy, @templates = pagy(@templates, items:)
     end
   end
 
   private
 
-  def filter_template_folders(template_folders)
-    rel = template_folders.joins(:active_templates)
-                          .order(id: :desc)
-                          .distinct
-
-    TemplateFolders.search(rel, params[:q])
-  end
-
-  def filter_templates(templates)
-    rel = templates.active.preload(:author).order(id: :desc)
-
-    if params[:q].blank?
-      shared_template_ids =
-        TemplateSharing.where(account_id: [current_account.id, TemplateSharing::ALL_ID]).select(:template_id)
-
-      rel = rel.where(folder_id: current_account.default_template_folder.id).or(rel.where(id: shared_template_ids))
-    end
-
-    Templates.search(rel, params[:q])
-  end
-
   def maybe_redirect_product_url
     return if !Docuseal.multitenant? || signed_in?
 

app/controllers/embed_scripts_controller.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class EmbedScriptsController < ActionController::Metal
+  DUMMY_SCRIPT = <<~JAVASCRIPT.freeze
+    const DummyBuilder = class extends HTMLElement {
+      connectedCallback() {
+        this.innerHTML = `
+          <div style="text-align: center; padding: 20px; font-family: Arial, sans-serif;">
+            <h2>Upgrade to Pro</h2>
+            <p>Unlock embedded components by upgrading to Pro</p>
+            <div style="margin-top: 40px;">
+              <a href="#{Docuseal::CONSOLE_URL}/on_premise" target="_blank" style="padding: 15px 25px; background-color: #222; color: white; text-decoration: none; border-radius: 5px; font-size: 16px; cursor: pointer;">
+                Learn More
+              </a>
+            </div>
+          </div>
+        `;
+      }
+    };
+
+    const DummyForm = class extends DummyBuilder {};
+
+    if (!window.customElements.get('docuseal-builder')) {
+      window.customElements.define('docuseal-builder', DummyBuilder);
+    }
+
+    if (!window.customElements.get('docuseal-form')) {
+      window.customElements.define('docuseal-form', DummyForm);
+    }
+  JAVASCRIPT
+
+  def show
+    headers['Content-Type'] = 'application/javascript'
+
+    self.response_body = DUMMY_SCRIPT
+
+    self.status = 200
+  end
+end

app/controllers/errors_controller.rb

@@ -15,6 +15,11 @@ class ErrorsController < ActionController::Base
     '/api/templates/docx'
   ].freeze
 
+  SAFE_ERROR_MESSAGE_CLASSES = [
+    ActionDispatch::Http::Parameters::ParseError,
+    JSON::ParserError
+  ].freeze
+
   def show
     if request.original_fullpath.in?(ENTERPRISE_PATHS) && error_status_code == 404
       return render json: { status: 404, message: ENTERPRISE_FEATURE_MESSAGE }, status: :not_found
@@ -22,7 +27,13 @@ class ErrorsController < ActionController::Base
 
     respond_to do |f|
       f.json do
-        render json: { status: error_status_code }, status: error_status_code
+        set_cors_headers
+
+        exception = request.env['action_dispatch.exception']
+
+        error = exception.message if exception.class.in?(SAFE_ERROR_MESSAGE_CLASSES)
+
+        render json: { status: error_status_code, error: }.compact, status: error_status_code
       end
 
       f.html { render error_status_code.to_s, status: error_status_code }
@@ -31,6 +42,14 @@ class ErrorsController < ActionController::Base
 
   private
 
+  def set_cors_headers
+    headers['Access-Control-Allow-Origin'] = '*'
+    headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, PATCH, DELETE, OPTIONS'
+    headers['Access-Control-Allow-Headers'] = '*'
+    headers['Access-Control-Max-Age'] = '1728000'
+    headers['Access-Control-Allow-Credentials'] = true
+  end
+
   def error_status_code
     @error_status_code ||=
       ActionDispatch::ExceptionWrapper.new(request.env,

app/controllers/esign_settings_controller.rb

@@ -57,8 +57,10 @@ class EsignSettingsController < ApplicationController
     save_new_cert!(@encrypted_config, @cert_record)
 
     redirect_to settings_esign_path, notice: 'Certificate has been successfully added!'
-  rescue OpenSSL::PKCS12::PKCS12Error
+  rescue OpenSSL::PKCS12::PKCS12Error => e
-    @cert_record.errors.add(:password, "is invalid. Make sure you're uploading a valid .p12 file")
+    Rollbar.error(e) if defined?(Rollbar)
+
+    @cert_record.errors.add(:password, e.message)
 
     render turbo_stream: turbo_stream.replace(:modal, template: 'esign_settings/new'), status: :unprocessable_entity
   end

app/controllers/notifications_settings_controller.rb

@@ -35,12 +35,12 @@ class NotificationsSettingsController < ApplicationController
 
   def load_reminder_config
     @reminder_config =
-      AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::SUBMITTER_REMAILERS)
+      AccountConfig.find_or_initialize_by(account: current_account, key: AccountConfig::SUBMITTER_REMINDERS)
   end
 
   def email_config_params
     params.require(:account_config).permit!.tap do |attrs|
-      attrs[:key] = nil unless attrs[:key].in?([AccountConfig::BCC_EMAILS, AccountConfig::SUBMITTER_REMAILERS])
+      attrs[:key] = nil unless attrs[:key].in?([AccountConfig::BCC_EMAILS, AccountConfig::SUBMITTER_REMINDERS])
     end
   end
 end

app/controllers/passwords_controller.rb

@@ -5,6 +5,12 @@ class PasswordsController < Devise::PasswordsController
     attribute :user
   end
 
+  def create
+    super do |resource|
+      resource.errors.clear unless Docuseal.multitenant?
+    end
+  end
+
   def update
     super do |resource|
       Current.user = resource

app/controllers/personalization_settings_controller.rb

@@ -1,26 +1,58 @@
 # frozen_string_literal: true
 
 class PersonalizationSettingsController < ApplicationController
+  ALLOWED_KEYS = [
+    AccountConfig::FORM_COMPLETED_BUTTON_KEY,
+    AccountConfig::SUBMITTER_INVITATION_EMAIL_KEY,
+    AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY,
+    AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY,
+    AccountConfig::FORM_COMPLETED_MESSAGE_KEY
+  ].freeze
+
+  InvalidKey = Class.new(StandardError)
+
+  before_action :load_and_authorize_account_config, only: :create
+
   def show
     authorize!(:read, AccountConfig)
   end
 
   def create
-    account_config =
+    if @account_config.value.is_a?(Hash)
-      current_account.account_configs.find_or_initialize_by(key: account_config_params[:key])
+      @account_config.value = @account_config.value.reject do |_, v|
+        v.blank? && v != false
+      end
+    end
 
-    authorize!(:create, account_config)
+    if @account_config.value != false && @account_config.value.blank?
-
+      @account_config.destroy!
-    account_config.update!(account_config_params)
+    else
+      @account_config.save!
+    end
 
     redirect_back(fallback_location: settings_personalization_path, notice: 'Settings have been saved.')
   end
 
   private
 
+  def load_and_authorize_account_config
+    @account_config =
+      current_account.account_configs.find_or_initialize_by(key: account_config_params[:key])
+
+    @account_config.assign_attributes(account_config_params)
+
+    authorize!(:create, @account_config)
+
+    raise InvalidKey unless ALLOWED_KEYS.include?(@account_config.key)
+
+    @account_config
+  end
+
   def account_config_params
     attrs = params.require(:account_config).permit!
 
+    return attrs if attrs[:value].is_a?(String)
+
     attrs[:value]&.transform_values! do |value|
       if value.in?(%w[true false])
         value == 'true'

app/controllers/registrations_controller.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-class RegistrationsController < Devise::RegistrationsController
-  prepend_before_action :require_no_authentication, only: [:show]
-  prepend_before_action :maybe_redirect_if_signed_in, only: [:show]
-
-  def show; end
-
-  def create
-    super
-
-    Accounts.create_default_template(resource.account) if resource.account.persisted?
-  end
-
-  private
-
-  def after_sign_up_path_for(...)
-    if params[:redir].present?
-      return console_redirect_index_path(redir: params[:redir]) if params[:redir].starts_with?(Docuseal::CONSOLE_URL)
-
-      return params[:redir]
-    end
-
-    super
-  end
-
-  def maybe_redirect_if_signed_in
-    return unless signed_in?
-    return if params[:redir].blank?
-
-    redirect_to after_sign_up_path_for(current_user), allow_other_host: true
-  end
-
-  def set_flash_message(key, kind, options = {})
-    return if key == :alert && kind == 'already_authenticated'
-
-    super
-  end
-
-  def build_resource(_hash = {})
-    account = Account.new(account_params)
-    account.timezone = Accounts.normalize_timezone(account.timezone)
-
-    self.resource = account.users.new(user_params)
-
-    account.name ||= resource.full_name if params[:action] == 'create'
-  end
-
-  def user_params
-    return {} if params[:user].blank?
-
-    params.require(:user).permit(:first_name, :last_name, :email, :password).compact_blank.tap do |attrs|
-      attrs[:password] ||= SecureRandom.hex if params[:action] == 'create'
-    end
-  end
-
-  def account_params
-    return {} if params[:account].blank?
-
-    params.require(:account).permit(:name, :timezone).compact_blank
-  end
-end

app/controllers/send_submission_email_controller.rb

@@ -21,6 +21,8 @@ class SendSubmissionEmailController < ApplicationController
         Submitter.find_by!(slug: params[:submitter_slug])
       end
 
+    RateLimit.call("send-email-#{@submitter.id}", limit: 2, ttl: 5.minutes)
+
     SubmitterMailer.documents_copy_email(@submitter, sig: true).deliver_later!
 
     respond_to do |f|

app/controllers/sessions_controller.rb

@@ -3,10 +3,14 @@
 class SessionsController < Devise::SessionsController
   before_action :configure_permitted_parameters
 
+  around_action :with_browser_locale
+
   def create
     email = sign_in_params[:email].to_s.downcase
 
     if Docuseal.multitenant? && !User.exists?(email:)
+      Rollbar.warning('Sign in new user') if defined?(Rollbar)
+
       return redirect_to new_registration_path(sign_up: true, user: sign_in_params.slice(:email)),
                          notice: 'Create a new account'
     end

app/controllers/sso_settings_controller.rb

@@ -3,7 +3,6 @@
 class SsoSettingsController < ApplicationController
   before_action :load_encrypted_config
   authorize_resource :encrypted_config, only: :index
-  authorize_resource :encrypted_config, parent: false, except: :index
 
   def index; end
 

app/controllers/start_form_controller.rb

@@ -17,10 +17,7 @@ class StartFormController < ApplicationController
   def update
     return redirect_to start_form_path(@template.slug) if @template.archived_at?
 
-    @submitter = Submitter.where(submission: @template.submissions.where(archived_at: nil))
+    @submitter = find_or_initialize_submitter(@template, submitter_params)
-                          .order(id: :desc)
-                          .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])
@@ -33,7 +30,13 @@ class StartFormController < ApplicationController
 
       assign_submission_attributes(@submitter, @template) if @submitter.new_record?
 
+      is_new_record = @submitter.new_record?
+
       if @submitter.save
+        if is_new_record
+          SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => @submitter.submission.id })
+        end
+
         redirect_to submit_form_path(@submitter.slug)
       else
         render :show
@@ -49,6 +52,15 @@ class StartFormController < ApplicationController
 
   private
 
+  def find_or_initialize_submitter(template, submitter_params)
+    Submitter.where(submission: template.submissions.where(expire_at: Time.current..)
+                                        .or(template.submissions.where(expire_at: nil)).where(archived_at: nil))
+             .order(id: :desc)
+             .where(declined_at: nil)
+             .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
+             .find_or_initialize_by(**submitter_params.compact_blank)
+  end
+
   def assign_submission_attributes(submitter, template)
     resubmit_submitter =
       if params[:resubmit].present?
@@ -75,6 +87,8 @@ class StartFormController < ApplicationController
                                             template_submitters: template.submitters,
                                             source: :link)
 
+    submitter.account_id = submitter.submission.account_id
+
     submitter
   end
 

app/controllers/submissions_archived_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class SubmissionsArchivedController < ApplicationController
+  load_and_authorize_resource :submission, parent: false
+
+  def index
+    @submissions = @submissions.joins(:template)
+    @submissions = @submissions.where.not(archived_at: nil)
+                               .or(@submissions.where.not(templates: { archived_at: nil }))
+                               .preload(:created_by_user, template: :author)
+    @submissions = Submissions.search(@submissions, params[:q], search_template: true)
+
+    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
+  end
+end

app/controllers/submissions_controller.rb

@@ -19,6 +19,8 @@ class SubmissionsController < ApplicationController
   def create
     authorize!(:create, Submission)
 
+    save_template_message(@template, params) if params[:save_message] == '1'
+
     if params[:is_custom_message] != '1'
       params.delete(:subject)
       params.delete(:body)
@@ -37,24 +39,45 @@ class SubmissionsController < ApplicationController
                                            user: current_user,
                                            source: :invite,
                                            submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
-                                           mark_as_sent: params[:send_email] == '1',
                                            submissions_attrs: submissions_params[:submission].to_h.values,
                                            params: params.merge('send_completed_email' => true))
       end
 
+    submissions.each do |submission|
+      SendSubmissionCreatedWebhookRequestJob.perform_async({ 'submission_id' => submission.id })
+    end
+
     Submissions.send_signature_requests(submissions)
 
     redirect_to template_path(@template), notice: 'New recipients have been added'
   end
 
   def destroy
-    @submission.update!(archived_at: Time.current)
+    notice =
+      if params[:permanently].present?
+        @submission.destroy!
 
-    redirect_back(fallback_location: template_path(@submission.template), notice: 'Submission has been archived')
+        'Submission has been removed'
+      else
+        @submission.update!(archived_at: Time.current)
+
+        SendSubmissionArchivedWebhookRequestJob.perform_async('submission_id' => @submission.id)
+
+        'Submission has been archived'
+      end
+
+    redirect_back(fallback_location: template_path(@submission.template), notice:)
   end
 
   private
 
+  def save_template_message(template, params)
+    template.preferences['request_email_subject'] = params[:subject] if params[:subject].present?
+    template.preferences['request_email_body'] = params[:body] if params[:body].present?
+
+    template.save!
+  end
+
   def submissions_params
     params.permit(submission: { submitters: [%i[uuid email phone name]] })
   end

app/controllers/submissions_dashboard_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class SubmissionsDashboardController < ApplicationController
+  load_and_authorize_resource :submission, parent: false
+
+  def index
+    @submissions = @submissions.joins(:template)
+
+    @submissions = @submissions.where(archived_at: nil)
+                               .where(templates: { archived_at: nil })
+                               .preload(:created_by_user, template: :author)
+
+    @submissions = Submissions.search(@submissions, params[:q], search_template: true)
+
+    @submissions = @submissions.pending if params[:status] == 'pending'
+    @submissions = @submissions.completed if params[:status] == 'completed'
+
+    @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
+  end
+end

app/controllers/submissions_debug_controller.rb

@@ -16,13 +16,16 @@ class SubmissionsDebugController < ApplicationController
         render 'submit_form/show'
       end
       f.pdf do
-        if params[:audit]
+        result =
-          Submissions::GenerateAuditTrail.call(@submitter.submission)
+          if params[:audit]
-        else
+            Submissions::GenerateAuditTrail.call(@submitter.submission)
-          Submissions::GenerateResultAttachments.call(@submitter)
+          elsif params[:combined]
-        end
+            Submissions::GenerateCombinedAttachment.call(@submitter)
+          else
+            Submissions::GenerateResultAttachments.call(@submitter)
+          end
 
-        send_data ActiveStorage::Attachment.where(name: params[:audit] ? :audit_trail : :documents).last.download,
+        send_data Array.wrap(result).first.download,
                   filename: 'debug.pdf',
                   disposition: 'inline',
                   type: 'application/pdf'

app/controllers/submissions_download_controller.rb

@@ -33,7 +33,17 @@ class SubmissionsDownloadController < ApplicationController
       return head :not_found
     end
 
-    render json: build_urls(last_submitter)
+    if params[:combined] == 'true'
+      url = build_combined_url(submitter)
+
+      if url
+        render json: [url]
+      else
+        head :not_found
+      end
+    else
+      render json: build_urls(last_submitter)
+    end
   end
 
   private
@@ -44,7 +54,17 @@ class SubmissionsDownloadController < ApplicationController
 
   def build_urls(submitter)
     Submitters.select_attachments_for_download(submitter).map do |attachment|
-      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.minutes.from_now.to_i)
+      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
     end
   end
+
+  def build_combined_url(submitter)
+    return if submitter.submission.submitters.exists?(completed_at: nil)
+    return if submitter.submission.submitters.order(:completed_at).last != submitter
+
+    attachment = submitter.submission.combined_document_attachment
+    attachment ||= Submissions::GenerateCombinedAttachment.call(submitter)
+
+    ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
+  end
 end

app/controllers/submit_form_controller.rb

@@ -7,33 +7,39 @@ class SubmitFormController < ApplicationController
   skip_before_action :authenticate_user!
   skip_authorization_check
 
-  PRELOAD_ALL_PAGES_AMOUNT = 200
+  CONFIG_KEYS = [].freeze
 
   def show
     @submitter = Submitter.find_by!(slug: params[:slug])
 
     return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
+    return render :archived if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
+    return render :expired if @submitter.submission.expired?
+    return render :declined if @submitter.declined_at?
 
-    ActiveRecord::Associations::Preloader.new(
+    Submitters.preload_with_pages(@submitter)
-      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
+    @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
+                                                  .preload(:blob).index_by(&:uuid)
 
-    render(@submitter.submission.template.archived_at? || @submitter.submission.archived_at? ? :archived : :show)
+    @form_configs = Submitters::FormConfigs.call(@submitter, CONFIG_KEYS)
+
+    return unless @form_configs[:prefill_signature]
+
+    if (user_signature = UserConfigs.load_signature(current_user))
+      @signature_attachment = ActiveStorage::Attachment.find_or_create_by!(
+        blob_id: user_signature.blob_id,
+        name: 'attachments',
+        record: @submitter
+      )
+    end
+
+    @signature_attachment ||=
+      Submitters::MaybeAssignDefaultBrowserSignature.call(@submitter, params, cookies, @attachments_index.values)
+
+    @attachments_index[@signature_attachment.uuid] = @signature_attachment if @signature_attachment
   end
 
   def update
@@ -44,11 +50,15 @@ class SubmitFormController < ApplicationController
     end
 
     if submitter.template.archived_at? || submitter.submission.archived_at?
-      Rollbar.info("Archived template: #{submitter.template.id}") if defined?(Rollbar)
-
       return render json: { error: 'Form has been archived.' }, status: :unprocessable_entity
     end
 
+    if submitter.submission.expired?
+      return render json: { error: 'Form has been expired.' }, status: :unprocessable_entity
+    end
+
+    return render json: { error: 'Form has been declined.' }, status: :unprocessable_entity if submitter.declined_at?
+
     Submitters::SubmitValues.call(submitter, params, request)
 
     head :ok
@@ -57,7 +67,7 @@ class SubmitFormController < ApplicationController
   end
 
   def completed
-    @submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+    @submitter = Submitter.completed.find_by!(slug: params[:submit_form_slug])
   end
 
   def success; end

app/controllers/submit_form_decline_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class SubmitFormDeclineController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def create
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return redirect_to submit_form_path(submitter.slug) if submitter.declined_at? ||
+                                                           submitter.completed_at? ||
+                                                           submitter.submission.archived_at? ||
+                                                           submitter.submission.expired? ||
+                                                           submitter.submission.template.archived_at?
+
+    ApplicationRecord.transaction do
+      submitter.update!(declined_at: Time.current)
+
+      SubmissionEvents.create_with_tracking_data(submitter, 'decline_form', request, { reason: params[:reason] })
+    end
+
+    user = submitter.submission.created_by_user || submitter.template.author
+
+    SubmitterMailer.declined_email(submitter, user).deliver_later!
+    SendFormDeclinedWebhookRequestJob.perform_async('submitter_id' => submitter.id)
+
+    redirect_to submit_form_path(submitter.slug)
+  end
+end

app/controllers/submit_form_download_controller.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class SubmitFormDownloadController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  FILES_TTL = 5.minutes
+
+  def index
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return redirect_to submitter_download_index_path(submitter.slug) if submitter.completed_at?
+
+    return head :unprocessable_entity if submitter.declined_at? ||
+                                         submitter.submission.archived_at? ||
+                                         submitter.submission.expired? ||
+                                         submitter.submission.template.archived_at?
+
+    last_completed_submitter = submitter.submission.submitters
+                                        .where.not(id: submitter.id)
+                                        .where.not(completed_at: nil)
+                                        .max_by(&:completed_at)
+
+    attachments =
+      if last_completed_submitter
+        Submitters.select_attachments_for_download(last_completed_submitter)
+      else
+        submitter.submission.template.schema_documents.preload(:blob)
+      end
+
+    urls = attachments.map do |attachment|
+      ActiveStorage::Blob.proxy_url(attachment.blob, expires_at: FILES_TTL.from_now.to_i)
+    end
+
+    render json: urls
+  end
+end

app/controllers/submit_form_draw_signature_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class SubmitFormDrawSignatureController < ApplicationController
+  layout false
+
+  around_action :with_browser_locale, only: %i[show]
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def show
+    @submitter = Submitter.find_by!(slug: params[:slug])
+
+    return redirect_to submit_form_completed_path(@submitter.slug) if @submitter.completed_at?
+
+    if @submitter.submission.template.archived_at? || @submitter.submission.archived_at?
+      return redirect_to submit_form_path(@submitter.slug)
+    end
+
+    render :show
+  end
+end

app/controllers/submit_form_values_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class SubmitFormValuesController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  def index
+    submitter = Submitter.find_by!(slug: params[:submit_form_slug])
+
+    return render json: {} if submitter.completed_at?
+    return render json: {} if submitter.submission.template.archived_at? || submitter.submission.archived_at?
+
+    value = submitter.values[params['field_uuid']]
+    attachment = submitter.attachments.where(created_at: params[:after]..).find_by(uuid: value) if value.present?
+
+    render json: {
+      value:,
+      attachment: attachment&.as_json(only: %i[uuid created_at], methods: %i[url filename content_type])
+    }, head: :ok
+  end
+end

app/controllers/submitters_autocomplete_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class SubmittersAutocompleteController < ApplicationController
+  load_and_authorize_resource :submitter, parent: false
+
+  SELECT_COLUMNS = %w[email phone name].freeze
+  LIMIT = 100
+
+  def index
+    submitters = search_submitters(@submitters)
+
+    values = submitters.limit(LIMIT).group(SELECT_COLUMNS.join(', ')).pluck(SELECT_COLUMNS.join(', '))
+
+    attrs = values.map { |row| SELECT_COLUMNS.zip(row).to_h }
+    attrs = attrs.uniq { |e| e[params[:field]] } if params[:field].present?
+
+    render json: attrs
+  end
+
+  private
+
+  def search_submitters(submitters)
+    if SELECT_COLUMNS.include?(params[:field])
+      column = Submitter.arel_table[params[:field].to_sym]
+
+      term = "#{params[:q].downcase}%"
+
+      submitters.where(column.matches(term))
+    else
+      Submitters.search(submitters, params[:q])
+    end
+  end
+end

app/controllers/submitters_send_email_controller.rb

@@ -7,11 +7,13 @@ class SubmittersSendEmailController < ApplicationController
     if Docuseal.multitenant? && SubmissionEvent.exists?(submitter: @submitter,
                                                         event_type: 'send_email',
                                                         created_at: 24.hours.ago..Time.current)
+      Rollbar.warning("Already sent: #{@submitter.id}") if defined?(Rollbar)
+
       return redirect_back(fallback_location: submission_path(@submitter.submission),
                            alert: 'Email has been sent already.')
     end
 
-    SendSubmitterInvitationEmailJob.perform_later('submitter_id' => @submitter.id)
+    SendSubmitterInvitationEmailJob.perform_async('submitter_id' => @submitter.id)
 
     @submitter.sent_at ||= Time.current
     @submitter.save!

app/controllers/template_documents_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class TemplateDocumentsController < ApplicationController
+  load_and_authorize_resource :template
+
+  def create
+    if params[:blobs].blank? && params[:files].blank?
+      return render json: { error: 'File is missing' }, status: :unprocessable_entity
+    end
+
+    old_fields_hash = @template.fields.hash
+
+    documents = Templates::CreateAttachments.call(@template, params, extract_fields: true)
+
+    schema = documents.map do |doc|
+      { attachment_uuid: doc.uuid, name: doc.filename.base }
+    end
+
+    render json: {
+      schema:,
+      fields: old_fields_hash == @template.fields.hash ? nil : @template.fields,
+      submitters: old_fields_hash == @template.fields.hash ? nil : @template.submitters,
+      documents: documents.as_json(
+        methods: %i[metadata signed_uuid],
+        include: {
+          preview_images: { methods: %i[url metadata filename] }
+        }
+      )
+    }
+  rescue Templates::CreateAttachments::PdfEncrypted
+    render json: { error: 'PDF encrypted' }, status: :unprocessable_entity
+  end
+end

app/controllers/template_folders_autocomplete_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class TemplateFoldersAutocompleteController < ApplicationController
+  load_and_authorize_resource :template_folder, parent: false
+
+  LIMIT = 100
+
+  def index
+    template_folders = @template_folders.joins(:templates).where(templates: { archived_at: nil }).distinct
+    template_folders = TemplateFolders.search(template_folders, params[:q]).limit(LIMIT)
+
+    render json: template_folders.as_json(only: %i[name archived_at])
+  end
+end

app/controllers/templates_archived_submissions_controller.rb

@@ -6,7 +6,7 @@ class TemplatesArchivedSubmissionsController < ApplicationController
 
   def index
     @submissions = @submissions.where.not(archived_at: nil)
-    @submissions = Submissions.search(@submissions, params[:q])
+    @submissions = Submissions.search(@submissions, params[:q], search_values: true)
 
     @pagy, @submissions = pagy(@submissions.preload(:submitters).order(id: :desc))
   rescue ActiveRecord::RecordNotFound

app/controllers/templates_controller.rb

@@ -8,7 +8,7 @@ class TemplatesController < ApplicationController
   def show
     submissions = @template.submissions.accessible_by(current_ability)
     submissions = submissions.active if @template.archived_at.blank?
-    submissions = Submissions.search(submissions, params[:q])
+    submissions = Submissions.search(submissions, params[:q], search_values: true)
 
     @base_submissions = submissions
 
@@ -27,7 +27,7 @@ class TemplatesController < ApplicationController
   def edit
     ActiveRecord::Associations::Preloader.new(
       records: [@template],
-      associations: [schema_documents: { preview_images_attachments: :blob }]
+      associations: [schema_documents: [:blob, { preview_images_attachments: :blob }]]
     ).call
 
     @template_data =
@@ -43,6 +43,11 @@ class TemplatesController < ApplicationController
 
   def create
     if @base_template
+      ActiveRecord::Associations::Preloader.new(
+        records: [@base_template],
+        associations: [schema_documents: :preview_images_attachments]
+      ).call
+
       @template = Templates::Clone.call(@base_template, author: current_user,
                                                         name: params.dig(:template, :name),
                                                         folder_name: params[:folder_name])
@@ -53,7 +58,7 @@ class TemplatesController < ApplicationController
 
     if params[:account_id].present? && authorized_clone_account_id?(params[:account_id])
       @template.account_id = params[:account_id]
-      @template.folder = @template.account.default_template_folder
+      @template.folder = @template.account.default_template_folder if @template.account_id != current_account.id
     else
       @template.account = current_account
     end
@@ -61,19 +66,27 @@ class TemplatesController < ApplicationController
     if @template.save
       Templates::CloneAttachments.call(template: @template, original_template: @base_template) if @base_template
 
+      SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
+
       maybe_redirect_to_template(@template)
     else
       render turbo_stream: turbo_stream.replace(:modal, template: 'templates/new'), status: :unprocessable_entity
     end
   end
 
+  def update
+    @template.update!(template_params)
+
+    SendTemplateUpdatedWebhookRequestJob.perform_async('template_id' => @template.id)
+
+    head :ok
+  end
+
   def destroy
     notice =
       if params[:permanently].present?
         @template.destroy!
 
-        Rollbar.info("Remove template: #{@template.id}") if defined?(Rollbar)
-
         'Template has been removed.'
       else
         @template.update!(archived_at: Time.current)
@@ -86,6 +99,22 @@ class TemplatesController < ApplicationController
 
   private
 
+  def template_params
+    params.require(:template).permit(
+      :name,
+      { schema: [%i[attachment_uuid name]],
+        submitters: [%i[name uuid]],
+        fields: [[:uuid, :submitter_uuid, :name, :type,
+                  :required, :readonly, :default_value,
+                  :title, :description,
+                  { preferences: {},
+                    conditions: [%i[field_uuid value action]],
+                    options: [%i[value uuid]],
+                    validation: %i[message pattern],
+                    areas: [%i[x y w h cell_w attachment_uuid option_uuid page]] }]] }
+    )
+  end
+
   def authorized_clone_account_id?(account_id)
     true_user.account_id.to_s == account_id.to_s || true_user.account.linked_accounts.exists?(id: account_id)
   end
@@ -98,10 +127,6 @@ class TemplatesController < ApplicationController
     end
   end
 
-  def template_params
-    params.require(:template).permit(:name)
-  end
-
   def load_base_template
     return if params[:base_template_id].blank?
 

app/controllers/templates_dashboard_controller.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class TemplatesDashboardController < ApplicationController
+  load_and_authorize_resource :template_folder, parent: false
+  load_and_authorize_resource :template, parent: false
+
+  SHOW_TEMPLATES_FOLDERS_THRESHOLD = 9
+  TEMPLATES_PER_PAGE = 12
+  FOLDERS_PER_PAGE = 18
+
+  def index
+    @template_folders = filter_template_folders(@template_folders)
+
+    @pagy, @template_folders = pagy(
+      @template_folders,
+      items: FOLDERS_PER_PAGE,
+      page: @template_folders.count > SHOW_TEMPLATES_FOLDERS_THRESHOLD ? params[:page] : 1
+    )
+
+    if @pagy.count > SHOW_TEMPLATES_FOLDERS_THRESHOLD
+      @templates = @templates.none
+    else
+      @template_folders = @template_folders.reject { |e| e.name == TemplateFolder::DEFAULT_NAME }
+      @templates = filter_templates(@templates)
+
+      items =
+        if @template_folders.size < 4
+          TEMPLATES_PER_PAGE
+        else
+          (@template_folders.size < 7 ? 9 : 6)
+        end
+
+      @pagy, @templates = pagy(@templates, items:)
+    end
+  end
+
+  private
+
+  def filter_template_folders(template_folders)
+    rel = template_folders.joins(:active_templates)
+                          .order(id: :desc)
+                          .distinct
+
+    TemplateFolders.search(rel, params[:q])
+  end
+
+  def filter_templates(templates)
+    rel = templates.active.preload(:author).order(id: :desc)
+
+    if params[:q].blank?
+      if Docuseal.multitenant? && !current_account.testing?
+        rel = rel.where(folder_id: current_account.default_template_folder.id)
+      else
+        shared_template_ids =
+          TemplateSharing.where(account_id: [current_account.id, TemplateSharing::ALL_ID]).select(:template_id)
+
+        rel = rel.where(folder_id: current_account.default_template_folder.id).or(rel.where(id: shared_template_ids))
+      end
+    end
+
+    Templates.search(rel, params[:q])
+  end
+end

app/controllers/templates_debug_controller.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class TemplatesDebugController < ApplicationController
+  load_and_authorize_resource :template
+
+  def show
+    attachment = @template.documents.first
+
+    pdf = HexaPDF::Document.new(io: StringIO.new(attachment.download))
+
+    fields = Templates::FindAcroFields.call(pdf, attachment)
+
+    attachment.metadata['pdf'] ||= {}
+    attachment.metadata['pdf']['fields'] = fields
+
+    @template.update!(fields: Templates::ProcessDocument.normalize_attachment_fields(@template, [attachment]))
+
+    ActiveRecord::Associations::Preloader.new(
+      records: [@template],
+      associations: [schema_documents: { preview_images_attachments: :blob }]
+    ).call
+
+    @template_data =
+      @template.as_json.merge(
+        documents: @template.schema_documents.as_json(
+          methods: %i[metadata signed_uuid],
+          include: { preview_images: { methods: %i[url metadata filename] } }
+        )
+      ).to_json
+
+    render 'templates/edit', layout: 'plain'
+  end
+end

app/controllers/templates_form_preview_controller.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class TemplatesFormPreviewController < ApplicationController
+  layout 'form'
+
+  load_and_authorize_resource :template
+
+  def show
+    @submitter = Submitter.new(uuid: params[:uuid] || @template.submitters.first['uuid'],
+                               account: current_account,
+                               submission: @template.submissions.new(template_submitters: @template.submitters,
+                                                                     account: current_account))
+
+    @submitter.submission.submitters = @template.submitters.map { |item| Submitter.new(uuid: item['uuid']) }
+
+    Submitters.preload_with_pages(@submitter)
+
+    @attachments_index = ActiveStorage::Attachment.where(record: @submitter.submission.submitters, name: :attachments)
+                                                  .preload(:blob).index_by(&:uuid)
+
+    @form_configs = Submitters::FormConfigs.call(@submitter)
+  end
+end

app/controllers/templates_preferences_controller.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class TemplatesPreferencesController < ApplicationController
+  load_and_authorize_resource :template
+
+  def show; end
+
+  def create
+    authorize!(:update, @template)
+
+    @template.preferences = @template.preferences.merge(template_params[:preferences])
+    @template.preferences = @template.preferences.reject { |_, v| v.is_a?(String) && v.blank? }
+    @template.save!
+
+    head :ok
+  end
+
+  private
+
+  def template_params
+    params.require(:template).permit(
+      preferences: %i[bcc_completed request_email_subject request_email_body
+                      documents_copy_email_subject documents_copy_email_body
+                      documents_copy_email_enabled documents_copy_email_attach_audit
+                      completed_notification_email_attach_documents
+                      completed_notification_email_subject completed_notification_email_body
+                      completed_notification_email_enabled completed_notification_email_attach_audit]
+    ).tap do |attrs|
+      attrs[:preferences] = attrs[:preferences].transform_values do |value|
+        if %w[true false].include?(value)
+          value == 'true'
+        else
+          value
+        end
+      end
+    end
+  end
+end

app/controllers/templates_uploads_controller.rb

@@ -12,18 +12,27 @@ class TemplatesUploadsController < ApplicationController
 
     save_template!(@template, url_params)
 
-    documents = Templates::CreateAttachments.call(@template, url_params || params)
+    documents = Templates::CreateAttachments.call(@template, url_params || params, extract_fields: true)
-
     schema = documents.map { |doc| { attachment_uuid: doc.uuid, name: doc.filename.base } }
 
+    if @template.fields.blank?
+      @template.fields = Templates::ProcessDocument.normalize_attachment_fields(@template, documents)
+
+      schema.each { |item| item['pending_fields'] = true } if @template.fields.present?
+    end
+
     @template.update!(schema:)
 
+    SendTemplateCreatedWebhookRequestJob.perform_async('template_id' => @template.id)
+
     redirect_to edit_template_path(@template)
   rescue Templates::CreateAttachments::PdfEncrypted
     render turbo_stream: turbo_stream.append(params[:form_id], html: helpers.tag.prompt_password)
   rescue StandardError => e
     Rollbar.error(e) if defined?(Rollbar)
 
+    raise if Rails.env.local?
+
     redirect_to root_path, alert: 'Unable to upload file'
   end
 
@@ -49,7 +58,7 @@ class TemplatesUploadsController < ApplicationController
     file = ActionDispatch::Http::UploadedFile.new(
       tempfile:,
       filename: File.basename(
-        URI.decode_www_form_component(params[:filename].presence || params[:url])
+        URI.decode_www_form_component(params[:filename].presence || params[:url]), '.*'
       ),
       type: Marcel::MimeType.for(tempfile)
     )

app/controllers/timestamp_server_controller.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 class TimestampServerController < ApplicationController
+  HASH_ALGORITHM = 'SHA256'
+
   before_action :build_encrypted_config
   authorize_resource :encrypted_config
 
+  TimestampError = Class.new(StandardError)
+
   def create
     return head :not_found if Docuseal.multitenant?
 
@@ -14,25 +18,29 @@ class TimestampServerController < ApplicationController
     else
       redirect_back fallback_location: settings_notifications_path, alert: 'Unable to save'
     end
-  rescue HexaPDF::Error, SocketError, Submissions::TimestampHandler::TimestampError, OpenSSL::Timestamp::TimestampError
+  rescue SocketError, TimestampError, OpenSSL::Timestamp::TimestampError
     redirect_back fallback_location: settings_notifications_path, alert: 'Invalid Timeserver'
   end
 
   private
 
   def test_timeserver_url(url)
-    pdf = HexaPDF::Document.new
+    req = OpenSSL::Timestamp::Request.new
-    pdf.pages.add
+    req.algorithm = HASH_ALGORITHM
+    req.message_imprint = OpenSSL::Digest.digest(HASH_ALGORITHM, 'test')
 
-    pkcs = Accounts.load_signing_pkcs(current_account)
+    uri = Addressable::URI.parse(url)
 
-    pdf.sign(StringIO.new,
+    conn = Faraday.new(uri.origin) do |c|
-             reason: 'Test',
+      c.basic_auth(uri.user, uri.password) if uri.password.present?
-             certificate: pkcs.certificate,
+    end
-             key: pkcs.key,
+
-             signature_size: 10_000,
+    response = conn.post(uri.path, req.to_der,
-             certificate_chain: pkcs.ca_certs || [],
+                         'content-type' => 'application/timestamp-query')
-             timestamp_handler: Submissions::TimestampHandler.new(tsa_url: url))
+
+    raise TimestampError if response.status != 200 || response.body.blank?
+
+    response
   end
 
   def load_encrypted_config

app/controllers/user_configs_controller.rb

@@ -8,6 +8,8 @@ class UserConfigsController < ApplicationController
     UserConfig::RECEIVE_COMPLETED_EMAIL
   ].freeze
 
+  InvalidKey = Class.new(StandardError)
+
   def create
     @user_config.update!(user_config_params)
 
@@ -17,7 +19,7 @@ class UserConfigsController < ApplicationController
   private
 
   def load_user_config
-    return head :not_found unless ALLOWED_KEYS.include?(user_config_params[:key])
+    raise InvalidKey unless ALLOWED_KEYS.include?(user_config_params[:key])
 
     @user_config =
       UserConfig.find_or_initialize_by(user: current_user, key: user_config_params[:key])

app/controllers/user_initials_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class UserInitialsController < ApplicationController
+  before_action :load_user_config
+  authorize_resource :user_config
+
+  def edit; end
+
+  def update
+    file = params[:file]
+
+    return redirect_to settings_profile_index_path, notice: 'Unable to save initials' if file.blank?
+
+    blob = ActiveStorage::Blob.create_and_upload!(io: file.open,
+                                                  filename: file.original_filename,
+                                                  content_type: file.content_type)
+
+    attachment = ActiveStorage::Attachment.create!(
+      blob:,
+      name: 'initials',
+      record: current_user
+    )
+
+    if @user_config.update(value: attachment.uuid)
+      redirect_to settings_profile_index_path, notice: 'Initials has been saved'
+    else
+      redirect_to settings_profile_index_path, notice: 'Unable to save initials'
+    end
+  end
+
+  def destroy
+    @user_config.destroy
+
+    redirect_to settings_profile_index_path, notice: 'Initials has been removed'
+  end
+
+  private
+
+  def load_user_config
+    @user_config =
+      UserConfig.find_or_initialize_by(user: current_user, key: UserConfig::INITIALS_KEY)
+  end
+end

app/controllers/users_controller.rb

@@ -1,13 +1,20 @@
 # frozen_string_literal: true
 
 class UsersController < ApplicationController
-  load_and_authorize_resource :user, only: %i[index edit new update destroy]
+  load_and_authorize_resource :user, only: %i[index edit update destroy]
 
-  before_action :build_user, only: :create
+  before_action :build_user, only: %i[new create]
-  authorize_resource :user, only: :create
+  authorize_resource :user, only: %i[new create]
 
   def index
-    @pagy, @users = pagy(@users.active.order(id: :desc))
+    @users =
+      if params[:status] == 'archived'
+        @users.archived
+      else
+        @users.active
+      end
+
+    @pagy, @users = pagy(@users.where(account: current_account).order(id: :desc))
   end
 
   def new; end
@@ -15,10 +22,20 @@ class UsersController < ApplicationController
   def edit; end
 
   def create
+    existing_user = User.accessible_by(current_ability).find_by(email: @user.email)
+
+    if existing_user
+      existing_user.archived_at = nil
+      existing_user.assign_attributes(user_params)
+      existing_user.account = current_account
+
+      @user = existing_user
+    end
+
     if @user.save
       UserMailer.invitation_email(@user).deliver_later!
 
-      redirect_to settings_users_path, notice: 'User has been invited'
+      redirect_back fallback_location: settings_users_path, notice: 'User has been invited'
     else
       render turbo_stream: turbo_stream.replace(:modal, template: 'users/new'), status: :unprocessable_entity
     end
@@ -27,11 +44,19 @@ class UsersController < ApplicationController
   def update
     return redirect_to settings_users_path, notice: 'Unable to update user.' if Docuseal.demo?
 
-    attrs = user_params.compact_blank
+    attrs = user_params.compact_blank.merge(user_params.slice(:archived_at))
     attrs.delete(:role) if !role_valid?(attrs[:role]) || current_user == @user
 
+    if params.dig(:user, :account_id).present?
+      account = Account.accessible_by(current_ability).find(params[:user][:account_id])
+
+      authorize!(:manage, account)
+
+      @user.account = account
+    end
+
     if @user.update(attrs)
-      redirect_to settings_users_path, notice: 'User has been updated'
+      redirect_back fallback_location: settings_users_path, notice: 'User has been updated'
     else
       render turbo_stream: turbo_stream.replace(:modal, template: 'users/edit'), status: :unprocessable_entity
     end
@@ -44,7 +69,7 @@ class UsersController < ApplicationController
 
     @user.update!(archived_at: Time.current)
 
-    redirect_to settings_users_path, notice: 'User has been removed'
+    redirect_back fallback_location: settings_users_path, notice: 'User has been removed'
   end
 
   private
@@ -65,6 +90,11 @@ class UsersController < ApplicationController
   end
 
   def user_params
-    params.require(:user).permit(:email, :first_name, :last_name, :password, :role)
+    if params.key?(:user)
+      params.require(:user).permit(:email, :first_name, :last_name, :password,
+                                   :role, :archived_at, :account_id)
+    else
+      {}
+    end
   end
 end

app/controllers/verify_pdf_signature_controller.rb

@@ -9,22 +9,7 @@ class VerifyPdfSignatureController < ApplicationController
         HexaPDF::Document.new(io: file.open)
       end
 
-    cert_data = if Docuseal.multitenant?
+    trusted_certs = Accounts.load_trusted_certs(current_account)
-                  Docuseal::CERTS
-                else
-                  EncryptedConfig.find_by(key: EncryptedConfig::ESIGN_CERTS_KEY)&.value || {}
-                end
-
-    default_pkcs = GenerateCertificate.load_pkcs(cert_data)
-
-    custom_certs = cert_data.fetch('custom', []).map do |e|
-      OpenSSL::PKCS12.new(Base64.urlsafe_decode64(e['data']), e['password'].to_s)
-    end
-
-    trusted_certs = [default_pkcs.certificate,
-                     *default_pkcs.ca_certs,
-                     *custom_certs.map(&:certificate),
-                     *custom_certs.flat_map(&:ca_certs).compact]
 
     render turbo_stream: turbo_stream.replace('result', partial: 'result',
                                                         locals: { pdfs:, files: params[:files], trusted_certs: })

app/controllers/webhook_preferences_controller.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class WebhookPreferencesController < ApplicationController
+  EVENTS = %w[
+    form.viewed
+    form.started
+    form.completed
+    form.declined
+    template.created
+    template.updated
+    submission.created
+    submission.archived
+  ].freeze
+
+  before_action :load_account_config
+  authorize_resource :account_config, parent: false
+
+  def create
+    @account_config.value[account_config_params[:event]] = account_config_params[:value] == '1'
+
+    @account_config.save!
+
+    head :ok
+  end
+
+  private
+
+  def load_account_config
+    @account_config =
+      current_account.account_configs.find_or_initialize_by(key: AccountConfig::WEBHOOK_PREFERENCES_KEY)
+    @account_config.value ||= {}
+  end
+
+  def account_config_params
+    params.permit(:event, :value)
+  end
+end

app/controllers/webhook_secret_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class WebhookSecretController < ApplicationController
+  before_action :load_encrypted_config
+  authorize_resource :encrypted_config, parent: false
+
+  def index; end
+
+  def create
+    @encrypted_config.assign_attributes(value: {
+      encrypted_config_params[:key] => encrypted_config_params[:value]
+    }.compact_blank)
+
+    @encrypted_config.value.present? ? @encrypted_config.save! : @encrypted_config.delete
+
+    redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook Secret has been saved.')
+  end
+
+  private
+
+  def load_encrypted_config
+    @encrypted_config =
+      current_account.encrypted_configs.find_or_initialize_by(key: EncryptedConfig::WEBHOOK_SECRET_KEY)
+  end
+
+  def encrypted_config_params
+    params.require(:encrypted_config).permit(value: %i[key value]).fetch(:value, {})
+  end
+end

app/controllers/webhook_settings_controller.rb

@@ -17,7 +17,8 @@ class WebhookSettingsController < ApplicationController
   def update
     submitter = current_account.submitters.where.not(completed_at: nil).order(:id).last
 
-    SendFormCompletedWebhookRequestJob.perform_later(submitter)
+    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+                                                       'encrypted_config_id' => @encrypted_config.id })
 
     redirect_back(fallback_location: settings_webhooks_path, notice: 'Webhook request has been sent.')
   end

app/javascript/application.js

@@ -3,8 +3,10 @@ import { encodeMethodIntoRequestBody } from '@hotwired/turbo-rails/app/javascrip
 
 import { createApp, reactive } from 'vue'
 import TemplateBuilder from './template_builder/builder'
+import ImportList from './template_builder/import_list'
 
 import ToggleVisible from './elements/toggle_visible'
+import ToggleCookies from './elements/toggle_cookies'
 import DisableHidden from './elements/disable_hidden'
 import TurboModal from './elements/turbo_modal'
 import FileDropzone from './elements/file_dropzone'
@@ -20,6 +22,10 @@ import FolderAutocomplete from './elements/folder_autocomplete'
 import SignatureForm from './elements/signature_form'
 import SubmitForm from './elements/submit_form'
 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'
 
@@ -37,23 +43,6 @@ document.addEventListener('keyup', (e) => {
   }
 })
 
-window.customElements.define('toggle-visible', ToggleVisible)
-window.customElements.define('disable-hidden', DisableHidden)
-window.customElements.define('turbo-modal', TurboModal)
-window.customElements.define('file-dropzone', FileDropzone)
-window.customElements.define('menu-active', MenuActive)
-window.customElements.define('clipboard-copy', ClipboardCopy)
-window.customElements.define('dynamic-list', DynamicList)
-window.customElements.define('download-button', DownloadButton)
-window.customElements.define('set-origin-url', SetOriginUrl)
-window.customElements.define('set-timezone', SetTimezone)
-window.customElements.define('autoresize-textarea', AutoresizeTextarea)
-window.customElements.define('submitters-autocomplete', SubmittersAutocomplete)
-window.customElements.define('folder-autocomplete', FolderAutocomplete)
-window.customElements.define('signature-form', SignatureForm)
-window.customElements.define('submit-form', SubmitForm)
-window.customElements.define('prompt-password', PromptPassword)
-
 document.addEventListener('turbo:before-fetch-request', encodeMethodIntoRequestBody)
 document.addEventListener('turbo:submit-end', async (event) => {
   const resp = event.detail?.formSubmission?.result?.fetchResponse?.response
@@ -77,7 +66,31 @@ document.addEventListener('turbo:submit-end', async (event) => {
   URL.revokeObjectURL(url)
 })
 
-window.customElements.define('template-builder', class extends HTMLElement {
+const safeRegisterElement = (name, element, options = {}) => !window.customElements.get(name) && window.customElements.define(name, element, options)
+
+safeRegisterElement('toggle-visible', ToggleVisible)
+safeRegisterElement('disable-hidden', DisableHidden)
+safeRegisterElement('turbo-modal', TurboModal)
+safeRegisterElement('file-dropzone', FileDropzone)
+safeRegisterElement('menu-active', MenuActive)
+safeRegisterElement('clipboard-copy', ClipboardCopy)
+safeRegisterElement('dynamic-list', DynamicList)
+safeRegisterElement('download-button', DownloadButton)
+safeRegisterElement('set-origin-url', SetOriginUrl)
+safeRegisterElement('set-timezone', SetTimezone)
+safeRegisterElement('autoresize-textarea', AutoresizeTextarea)
+safeRegisterElement('submitters-autocomplete', SubmittersAutocomplete)
+safeRegisterElement('folder-autocomplete', FolderAutocomplete)
+safeRegisterElement('signature-form', SignatureForm)
+safeRegisterElement('submit-form', SubmitForm)
+safeRegisterElement('prompt-password', PromptPassword)
+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 () {
     this.appElem = document.createElement('div')
 
@@ -86,14 +99,38 @@ window.customElements.define('template-builder', class extends HTMLElement {
     this.app = createApp(TemplateBuilder, {
       template: reactive(JSON.parse(this.dataset.template)),
       backgroundColor: '#faf7f5',
+      locale: this.dataset.locale,
       withPhone: this.dataset.withPhone === 'true',
       withLogo: this.dataset.withLogo !== 'false',
       editable: this.dataset.editable !== 'false',
+      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
       withPayment: this.dataset.withPayment === 'true',
+      isPaymentConnected: this.dataset.isPaymentConnected === 'true',
       withFormula: this.dataset.withFormula === 'true',
+      withConditions: this.dataset.withConditions === 'true',
       currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
-      acceptFileTypes: this.dataset.acceptFileTypes,
+      acceptFileTypes: this.dataset.acceptFileTypes
-      isDirectUpload: this.dataset.isDirectUpload === 'true'
+    })
+
+    this.app.mount(this.appElem)
+
+    this.appendChild(this.appElem)
+  }
+
+  disconnectedCallback () {
+    this.app?.unmount()
+    this.appElem?.remove()
+  }
+})
+
+safeRegisterElement('import-list', class extends HTMLElement {
+  connectedCallback () {
+    this.appElem = document.createElement('div')
+
+    this.app = createApp(ImportList, {
+      template: JSON.parse(this.dataset.template),
+      multitenant: this.dataset.multitenant === 'true',
+      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content
     })
 
     this.app.mount(this.appElem)

app/javascript/application.scss

@@ -83,6 +83,11 @@ button[disabled] .enabled {
   bottom: auto;
 }
 
+.tooltip-pre:before {
+  white-space: pre;
+  text-align: left;
+}
+
 .tooltip-bottom-end:after {
   transform: translateX(-25%);
   border-color: transparent transparent var(--tooltip-color) transparent;
@@ -125,3 +130,7 @@ button[disabled] .enabled {
   outline-offset: 3px;
   outline-color: hsl(var(--bc) / 0.2);
 }
+
+select:required:invalid {
+  color: gray !important;
+}

app/javascript/draw.js

@@ -0,0 +1,114 @@
+import SignaturePad from 'signature_pad'
+import { cropCanvasAndExportToPNG } from './submission_form/crop_canvas'
+
+window.customElements.define('draw-signature', class extends HTMLElement {
+  connectedCallback () {
+    const scale = 3
+
+    this.canvas.width = this.canvas.parentNode.clientWidth * scale
+    this.canvas.height = this.canvas.parentNode.clientHeight * scale
+
+    this.canvas.getContext('2d').scale(scale, scale)
+
+    this.pad = new SignaturePad(this.canvas)
+
+    this.pad.addEventListener('endStroke', () => {
+      this.updateSubmitButtonVisibility()
+    })
+
+    this.clearButton.addEventListener('click', (e) => {
+      e.preventDefault()
+
+      this.clearSignaturePad()
+    })
+
+    this.form.addEventListener('submit', (e) => {
+      e.preventDefault()
+
+      this.submitButton.disabled = true
+
+      this.submitImage().then((data) => {
+        this.valueInput.value = data.uuid
+
+        return fetch(this.form.action, {
+          method: 'PUT',
+          body: new FormData(this.form)
+        }).then((response) => {
+          this.form.classList.add('hidden')
+          this.success.classList.remove('hidden')
+
+          return response
+        })
+      }).finally(() => {
+        this.submitButton.disabled = false
+      })
+    })
+  }
+
+  clearSignaturePad () {
+    this.pad.clear()
+    this.updateSubmitButtonVisibility()
+  }
+
+  updateSubmitButtonVisibility () {
+    if (this.pad.isEmpty()) {
+      this.submitButton.style.display = 'none'
+      this.placeholderButton.style.display = 'block'
+    } else {
+      this.submitButton.style.display = 'block'
+      this.placeholderButton.style.display = 'none'
+    }
+  }
+
+  async submitImage () {
+    return new Promise((resolve, reject) => {
+      cropCanvasAndExportToPNG(this.canvas, { errorOnTooSmall: true }).then(async (blob) => {
+        const file = new File([blob], 'signature.png', { type: 'image/png' })
+
+        const formData = new FormData()
+
+        formData.append('file', file)
+        formData.append('submitter_slug', this.dataset.slug)
+        formData.append('name', 'attachments')
+        formData.append('remember_signature', 'true')
+
+        return fetch('/api/attachments', {
+          method: 'POST',
+          body: formData
+        }).then((resp) => resp.json()).then((attachment) => {
+          return resolve(attachment)
+        })
+      }).catch((error) => {
+        return reject(error)
+      })
+    })
+  }
+
+  get submitButton () {
+    return this.querySelector('button[type="submit"]')
+  }
+
+  get clearButton () {
+    return this.querySelector('button[aria-label="Clear"]')
+  }
+
+  get placeholderButton () {
+    return this.querySelector('button[disabled]')
+  }
+
+  get canvas () {
+    return this.querySelector('canvas')
+  }
+
+  get valueInput () {
+    return this.querySelector('input[name^="values"]')
+  }
+
+  get form () {
+    return this.querySelector('form')
+  }
+
+  get success () {
+    return this.querySelector('#success')
+  }
+})

app/javascript/elements/autoresize_textarea.js

@@ -7,7 +7,7 @@ export default class extends HTMLElement {
 
   resize () {
     if (this.textarea.clientHeight < this.textarea.scrollHeight) {
-      this.textarea.style.height = `${this.textarea.scrollHeight}px`
+      this.textarea.style.height = `${this.textarea.scrollHeight + 5}px`
     }
   }
 

app/javascript/elements/download_button.js

@@ -17,13 +17,18 @@ export default targetable(class extends HTMLElement {
 
     this.toggleState()
 
-    fetch(this.dataset.src).then((response) => response.json()).then((urls) => {
+    fetch(this.dataset.src).then(async (response) => {
-      const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
+      if (response.ok) {
+        const urls = await response.json()
+        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
 
-      if (isSafariIos && urls.length > 1) {
+        if (isSafariIos && urls.length > 1) {
-        this.downloadSafariIos(urls)
+          this.downloadSafariIos(urls)
+        } else {
+          this.downloadUrls(urls)
+        }
       } else {
-        this.downloadUrls(urls)
+        alert('Failed to download files')
       }
     })
   }
@@ -48,9 +53,9 @@ export default targetable(class extends HTMLElement {
     fileRequests.reduce(
       (prevPromise, request) => prevPromise.then(() => request()),
       Promise.resolve()
-    )
+    ).finally(() => {
-
+      this.toggleState()
-    this.toggleState()
+    })
   }
 
   downloadSafariIos (urls) {

app/javascript/elements/emails_textarea.js

@@ -0,0 +1,56 @@
+const emailRegexp = /([^@;,<>\s]+@[^@;,<>\s]+)/g
+
+export default class extends HTMLElement {
+  connectedCallback () {
+    if (this.dataset.limit) {
+      this.textarea.addEventListener('input', () => {
+        const emails = this.textarea.value.match(emailRegexp) || []
+
+        this.updateCounter(emails.length)
+      })
+    }
+  }
+
+  updateCounter (count) {
+    let counter = document.getElementById('emails_counter')
+    let bulkMessage = document.getElementById('bulk_message')
+
+    if (count < 2) {
+      counter?.remove()
+
+      return
+    }
+
+    if ((count + 10) > this.dataset.limit) {
+      if (!counter) {
+        counter = document.createElement('span')
+
+        counter.id = 'emails_counter'
+        counter.classList.add('text-xs', 'right-0', 'absolute')
+        counter.style.bottom = '-15px'
+
+        this.textarea.parentNode.append(counter)
+      }
+
+      counter.innerText = `${count} / ${this.dataset.limit}`
+    }
+
+    if (this.dataset.bulkEnabled !== 'true') {
+      if (!bulkMessage) {
+        bulkMessage = document.createElement('span')
+
+        bulkMessage.id = 'bulk_message'
+        bulkMessage.classList.add('text-xs', 'left-0', 'absolute')
+        bulkMessage.style.bottom = '-15px'
+
+        this.textarea.parentNode.append(bulkMessage)
+      }
+
+      bulkMessage.innerHTML = '<a class="link" data-turbo="false" href="/upgrade">Upgrade</a> to bulk send multiple recipients'
+    }
+  }
+
+  get textarea () {
+    return this.querySelector('textarea')
+  }
+}

app/javascript/elements/file_dropzone.js

@@ -9,10 +9,6 @@ export default actionable(targetable(class extends HTMLElement {
   ]
 
   connectedCallback () {
-    if (this.dataset.isDirectUpload === 'true') {
-      import('@rails/activestorage')
-    }
-
     this.addEventListener('drop', this.onDrop)
 
     this.addEventListener('dragover', (e) => e.preventDefault())
@@ -48,61 +44,11 @@ export default actionable(targetable(class extends HTMLElement {
     this.classList.toggle('opacity-50')
   }
 
-  async uploadFiles (files) {
+  uploadFiles () {
     this.toggleLoading()
 
-    if (this.dataset.isDirectUpload === 'true') {
+    if (this.dataset.submitOnUpload) {
-      const { DirectUpload } = await import('@rails/activestorage')
+      this.closest('form').querySelector('button[type="submit"]').click()
-
-      await Promise.all(
-        Array.from(files).map(async (file) => {
-          const upload = new DirectUpload(
-            file,
-            '/direct_uploads',
-            this.input
-          )
-
-          return new Promise((resolve, reject) => {
-            upload.create((error, blob) => {
-              if (error) {
-                console.error(error)
-
-                return reject(error)
-              } else {
-                return resolve(blob)
-              }
-            })
-          }).catch((error) => {
-            console.error(error)
-          })
-        })
-      ).then((blobs) => {
-        if (this.dataset.submitOnUpload) {
-          this.querySelectorAll('[name="blob_signed_ids[]"]').forEach((e) => e.remove())
-        }
-
-        blobs.forEach((blob) => {
-          const input = document.createElement('input')
-
-          input.type = 'hidden'
-          input.name = 'blob_signed_ids[]'
-          input.value = blob.signed_id
-
-          this.append(input)
-        })
-
-        if (this.dataset.submitOnUpload === 'true') {
-          this.closest('form').querySelector('button[type="submit"]').click()
-        }
-      }).finally(() => {
-        if (this.dataset.submitOnUpload !== 'true') {
-          this.toggleLoading()
-        }
-      })
-    } else {
-      if (this.dataset.submitOnUpload) {
-        this.closest('form').querySelector('button[type="submit"]').click()
-      }
     }
   }
 }))

app/javascript/elements/folder_autocomplete.js

@@ -20,7 +20,7 @@ export default class extends HTMLElement {
   fetch = (text, resolve) => {
     const queryParams = new URLSearchParams({ q: text })
 
-    fetch('/api/template_folders_autocomplete?' + queryParams).then(async (resp) => {
+    fetch('/template_folders_autocomplete?' + queryParams).then(async (resp) => {
       const items = await resp.json()
 
       resolve(items)

app/javascript/elements/password_input.js

@@ -0,0 +1,35 @@
+import { target, targetable } from '@github/catalyst/lib/targetable'
+
+export default targetable(class extends HTMLElement {
+  static [target.static] = [
+    'visiblePasswordIcon',
+    'hiddenPasswordIcon',
+    'passwordInput',
+    'togglePasswordVisibility'
+  ]
+
+  connectedCallback () {
+    this.togglePasswordVisibility.addEventListener('click', this.handleTogglePasswordVisibility)
+    document.addEventListener('turbo:submit-start', this.setInitialPasswordType)
+  }
+
+  disconnectedCallback () {
+    this.togglePasswordVisibility.removeEventListener('click', this.handleTogglePasswordVisibility)
+    document.removeEventListener('turbo:submit-start', this.setInitialPasswordType)
+  }
+
+  handleTogglePasswordVisibility = () => {
+    this.passwordInput.type = this.passwordInput.type === 'password' ? 'text' : 'password'
+    this.toggleIcon()
+  }
+
+  setInitialPasswordType = () => {
+    this.passwordInput.type = 'password'
+    this.toggleIcon()
+  }
+
+  toggleIcon = () => {
+    this.visiblePasswordIcon.classList.toggle('hidden', this.passwordInput.type === 'password')
+    this.hiddenPasswordIcon.classList.toggle('hidden', this.passwordInput.type === 'text')
+  }
+})

app/javascript/elements/search_input.js

@@ -0,0 +1,25 @@
+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/elements/signature_form.js

@@ -5,8 +5,12 @@ export default targetable(class extends HTMLElement {
   static [target.static] = ['canvas', 'input', 'clear', 'button']
 
   async connectedCallback () {
-    this.canvas.width = this.canvas.parentNode.parentNode.clientWidth
+    const scale = 3
-    this.canvas.height = this.canvas.parentNode.parentNode.clientWidth / 3
+
+    this.canvas.width = this.canvas.parentNode.clientWidth * scale
+    this.canvas.height = this.canvas.parentNode.clientHeight * scale
+
+    this.canvas.getContext('2d').scale(scale, scale)
 
     const { default: SignaturePad } = await import('signature_pad')
 

app/javascript/elements/submitter_autocomplete.js

@@ -7,6 +7,7 @@ export default class extends HTMLElement {
       preventSubmit: 1,
       minLength: 1,
       showOnFocus: true,
+      debounceWaitMs: 200,
       onSelect: this.onSelect,
       render: this.render,
       fetch: this.fetch
@@ -27,6 +28,8 @@ export default class extends HTMLElement {
 
       if (textarea && item[field]) {
         textarea.value = textarea.value.replace(/[^;,\s]+$/, item[field] + ' ')
+
+        textarea.dispatchEvent(new Event('input', { bubbles: true }))
       }
     })
   }
@@ -37,16 +40,16 @@ export default class extends HTMLElement {
     if (q) {
       const queryParams = new URLSearchParams({ q, field: this.dataset.field })
 
-      fetch('/api/submitters_autocomplete?' + queryParams).then(async (resp) => {
+      this.currentFetch ||= fetch('/submitters_autocomplete?' + queryParams)
+
+      this.currentFetch.then(async (resp) => {
         const items = await resp.json()
 
-        if (q.length < 3) {
+        resolve(items)
-          resolve(items.filter((e) => e[this.dataset.field].startsWith(q)))
-        } else {
-          resolve(items)
-        }
       }).catch(() => {
         resolve([])
+      }).finally(() => {
+        this.currentFetch = null
       })
     } else {
       resolve([])

app/javascript/elements/toggle_cookies.js

@@ -0,0 +1,17 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.button.addEventListener('click', () => {
+      const expirationDate = new Date()
+
+      expirationDate.setFullYear(expirationDate.getFullYear() + 10)
+
+      const expires = expirationDate.toUTCString()
+
+      document.cookie = this.dataset.key + '=' + this.dataset.value + '; expires=' + expires + '; path=/'
+    })
+  }
+
+  get button () {
+    return this.querySelector('button')
+  }
+}

app/javascript/elements/toggle_on_submit.js

@@ -0,0 +1,35 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    document.addEventListener('turbo:submit-end', this.onSubmitEnd)
+
+    this.form.addEventListener('submit', this.onSubmit)
+  }
+
+  disconnectedCallback () {
+    document.removeEventListener('turbo:submit-end', this.onSubmitEnd)
+
+    this.form.removeEventListener('submit', this.onSubmit)
+  }
+
+  onSubmit = () => {
+    this.element.classList.add('invisible')
+  }
+
+  onSubmitEnd = (event) => {
+    if (event.target === this.form) {
+      const resp = event.detail?.formSubmission?.result?.fetchResponse?.response
+
+      if (resp?.status / 100 === 2) {
+        this.element.classList.remove('invisible')
+      }
+    }
+  }
+
+  get element () {
+    return document.getElementById(this.dataset.elementId)
+  }
+
+  get form () {
+    return this.closest('form')
+  }
+}

app/javascript/elements/toggle_submit.js

@@ -0,0 +1,21 @@
+export default class extends HTMLElement {
+  connectedCallback () {
+    this.button.disabled = false
+
+    this.form.addEventListener('submit', () => {
+      this.button.disabled = true
+    })
+  }
+
+  disconnectedCallback () {
+    this.button.disabled = false
+  }
+
+  get button () {
+    return this.querySelector('[type="submit"]')
+  }
+
+  get form () {
+    return this.querySelector('form') || this.closest('form')
+  }
+}

app/javascript/form.js

@@ -2,23 +2,37 @@ import { createApp, reactive } from 'vue'
 
 import Form from './submission_form/form'
 import DownloadButton from './elements/download_button'
+import ToggleSubmit from './elements/toggle_submit'
 
-window.customElements.define('download-button', DownloadButton)
+const safeRegisterElement = (name, element, options = {}) => !window.customElements.get(name) && window.customElements.define(name, element, options)
-window.customElements.define('submission-form', class extends HTMLElement {
+
+safeRegisterElement('download-button', DownloadButton)
+safeRegisterElement('toggle-submit', ToggleSubmit)
+safeRegisterElement('submission-form', class extends HTMLElement {
   connectedCallback () {
     this.appElem = document.createElement('div')
 
     this.app = createApp(Form, {
       submitter: JSON.parse(this.dataset.submitter),
       canSendEmail: this.dataset.canSendEmail === 'true',
-      isDirectUpload: this.dataset.isDirectUpload === 'true',
+      previousSignatureValue: this.dataset.previousSignatureValue,
       goToLast: this.dataset.goToLast === 'true',
       isDemo: this.dataset.isDemo === 'true',
       attribution: this.dataset.attribution !== 'false',
+      scrollPadding: this.dataset.scrollPadding || '-80px',
+      dryRun: this.dataset.dryRun === 'true',
+      expand: ['true', 'false'].includes(this.dataset.expand) ? this.dataset.expand === 'true' : null,
+      withSignatureId: this.dataset.withSignatureId === 'true',
+      requireSigningReason: this.dataset.requireSigningReason === 'true',
       withConfetti: this.dataset.withConfetti !== 'false',
+      withDisclosure: this.dataset.withDisclosure === 'true',
       withTypedSignature: this.dataset.withTypedSignature !== 'false',
+      authenticityToken: document.querySelector('meta[name="csrf-token"]')?.content,
+      rememberSignature: this.dataset.rememberSignature === 'true',
       values: reactive(JSON.parse(this.dataset.values)),
-      completedButton: JSON.parse(this.dataset.completedButton),
+      completedButton: JSON.parse(this.dataset.completedButton || '{}'),
+      withQrButton: true,
+      completedMessage: JSON.parse(this.dataset.completedMessage || '{}'),
       completedRedirectUrl: this.dataset.completedRedirectUrl,
       attachments: reactive(JSON.parse(this.dataset.attachments)),
       fields: JSON.parse(this.dataset.fields)

app/javascript/rollbar.js

@@ -0,0 +1,34 @@
+import Rollbar from 'rollbar/dist/rollbar.umd'
+
+const token = document.querySelector('meta[name="rollbar-token"]')?.getAttribute('content')
+
+if (token) {
+  window.Rollbar ||= new Rollbar({
+    accessToken: token,
+    captureUncaught: true,
+    captureUnhandledRejections: true,
+    captureIp: false,
+    autoInstrument: false,
+    ignoredMessages: [
+      /Failed to fetch/i,
+      /NetworkError/i,
+      /Load failed/i,
+      /Clipboard write is not allowed/i
+    ],
+    transform (payload) {
+      payload.body.telemetry = []
+
+      const string = JSON.stringify(payload)
+
+      return JSON.parse(string.replace(/(\/[des]\/)\w{6}/g, (_, m) => m))
+    },
+    payload: {
+      client: {
+        javascript: {
+          source_map_enabled: true
+        }
+      },
+      environment: 'production'
+    }
+  })
+}

app/javascript/submission_form/area.vue

@@ -1,12 +1,12 @@
 <template>
   <div
-    class="flex absolute lg:text-base -outline-offset-1"
+    class="field-area flex absolute lg:text-base -outline-offset-1"
     dir="auto"
     :style="computedStyle"
-    :class="{ 'text-[1.5vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars, 'cursor-default': !submittable, 'border border-red-100 bg-red-100 cursor-pointer': submittable, 'border border-red-100': !isActive && submittable, 'bg-opacity-80': !isActive && !isValueSet && submittable, 'outline-red-500 outline-dashed outline-2 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
+    :class="{ 'text-[1.6vw] lg:text-base': !textOverflowChars, 'text-[1.0vw] lg:text-xs': textOverflowChars, 'cursor-default': !submittable, 'border border-red-100 bg-red-100 cursor-pointer': submittable, 'border border-red-100': !isActive && submittable, 'bg-opacity-80': !isActive && !isValueSet && submittable, 'field-area-active outline-red-500 outline-dashed outline-2 z-10': isActive && submittable, 'bg-opacity-40': (isActive || isValueSet) && submittable }"
   >
     <div
-      v-if="!isActive && !isValueSet && field.type !== 'checkbox' && submittable && !area.option_uuid"
+      v-if="(!withFieldPlaceholder || !field.name || field.type === 'cells') && !isActive && !isValueSet && field.type !== 'checkbox' && submittable && !area.option_uuid"
       class="absolute top-0 bottom-0 right-0 left-0 items-center justify-center h-full w-full"
     >
       <span
@@ -41,7 +41,8 @@
     <div
       v-if="isActive"
       ref="scrollToElem"
-      class="absolute -top-20"
+      class="absolute"
+      :style="{ top: scrollPadding }"
     />
     <img
       v-if="field.type === 'image' && image"
@@ -53,18 +54,44 @@
       class="object-contain mx-auto"
       :src="stamp.url"
     >
-    <img
+    <div
       v-else-if="field.type === 'signature' && signature"
-      class="object-contain mx-auto"
+      class="flex flex-col justify-between h-full overflow-hidden"
-      :src="signature.url"
     >
+      <div
+        class="flex-grow flex overflow-hidden"
+        style="min-height: 50%"
+      >
+        <img
+          class="object-contain mx-auto"
+          :src="signature.url"
+        >
+      </div>
+      <div
+        v-if="withSignatureId"
+        class="w-full mt-1 text-[1vw] lg:text-[0.55rem] lg:leading-[0.65rem]"
+      >
+        <div class="truncate uppercase">
+          ID: {{ signature.uuid }}
+        </div>
+        <div>
+          {{ t('reason') }}: {{ values[field.preferences?.reason_field_uuid] || t('digitally_signed_by') }} {{ submitter.name }}
+          <template v-if="submitter.email">
+            &lt;{{ submitter.email }}&gt;
+          </template>
+        </div>
+        <div>
+          {{ new Date(signature.created_at).toLocaleString(undefined, { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric', timeZoneName: 'short' }) }}
+        </div>
+      </div>
+    </div>
     <img
       v-else-if="field.type === 'initials' && initials"
       class="object-contain mx-auto"
       :src="initials.url"
     >
     <div
-      v-else-if="field.type === 'file' || field.type === 'payment'"
+      v-else-if="(field.type === 'file' || field.type === 'payment') && attachments.length"
       class="px-0.5 flex flex-col justify-center"
     >
       <a
@@ -74,7 +101,7 @@
         :href="attachment.url"
       >
         <IconPaperclip
-          class="inline w-[1.5vw] h-[1.5vw] lg:w-4 lg:h-4"
+          class="inline w-[1.6vw] h-[1.6vw] lg:w-4 lg:h-4"
         />
         {{ attachment.filename }}
       </a>
@@ -157,16 +184,26 @@
       ref="textContainer"
       dir="auto"
       class="flex items-center px-0.5 w-full"
+      :class="alignClasses[field.preferences?.align]"
     >
-      <span v-if="Array.isArray(modelValue)">
+      <span
+        v-if="field && field.name && withFieldPlaceholder && !modelValue && modelValue !== 0"
+        class="whitespace-pre-wrap text-gray-400"
+        :class="{ 'w-full': field.preferences?.align }"
+      >{{ field.name }}</span>
+      <span v-else-if="Array.isArray(modelValue)">
         {{ modelValue.join(', ') }}
       </span>
       <span v-else-if="field.type === 'date'">
         {{ formattedDate }}
       </span>
+      <span v-else-if="field.type === 'number'">
+        {{ formatNumber(modelValue, field.preferences?.format) }}
+      </span>
       <span
         v-else
         class="whitespace-pre-wrap"
+        :class="{ 'w-full': field.preferences?.align }"
       >{{ modelValue }}</span>
     </div>
   </div>
@@ -187,11 +224,30 @@ export default {
       type: Object,
       required: true
     },
+    submitter: {
+      type: Object,
+      required: true
+    },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     isValueSet: {
       type: Boolean,
       required: false,
       default: false
     },
+    scrollPadding: {
+      type: String,
+      required: false,
+      default: '-80px'
+    },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     submittable: {
       type: Boolean,
       required: false,
@@ -202,6 +258,11 @@ export default {
       required: false,
       default: ''
     },
+    values: {
+      type: Object,
+      required: false,
+      default: () => ({})
+    },
     isActive: {
       type: Boolean,
       required: false,
@@ -253,6 +314,13 @@ export default {
         phone: this.t('phone')
       }
     },
+    alignClasses () {
+      return {
+        center: 'text-center',
+        left: 'text-left',
+        right: 'text-right'
+      }
+    },
     option () {
       return this.field.options.find((o) => o.uuid === this.area.option_uuid)
     },
@@ -328,27 +396,35 @@ export default {
     computedStyle () {
       const { x, y, w, h } = this.area
 
-      return {
+      const style = {
         top: y * 100 + '%',
         left: x * 100 + '%',
         width: w * 100 + '%',
         height: h * 100 + '%'
       }
+
+      if (this.field.preferences?.font_size) {
+        style.fontSize = this.field.preferences.font_size + 'pt'
+      }
+
+      return style
     }
   },
   watch: {
     modelValue () {
-      if (this.field.type === 'text' && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > this.modelValue.length)) {
+      this.$nextTick(() => {
-        this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? this.modelValue.length : 0
+        if (['date', 'text', 'number'].includes(this.field.type) && this.$refs.textContainer && (this.textOverflowChars === 0 || (this.textOverflowChars - 4) > `${this.modelValue}`.length)) {
-      }
+          this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? `${this.modelValue || (this.withFieldPlaceholder ? this.field.name : '')}`.length : 0
+        }
+      })
     }
   },
   mounted () {
-    if (this.field.type === 'text' && this.$refs.textContainer) {
+    this.$nextTick(() => {
-      this.$nextTick(() => {
+      if (['date', 'text', 'number'].includes(this.field.type) && this.$refs.textContainer) {
-        this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? this.modelValue.length : 0
+        this.textOverflowChars = this.$refs.textContainer.scrollHeight > this.$refs.textContainer.clientHeight ? `${this.modelValue || (this.withFieldPlaceholder ? this.field.name : '')}`.length : 0
-      })
+      }
-    }
+    })
   },
   methods: {
     optionValue (option) {
@@ -362,6 +438,17 @@ export default {
         }
       }
     },
+    formatNumber (number, format) {
+      if (format === 'comma') {
+        return new Intl.NumberFormat('en-US').format(number)
+      } else if (format === 'dot') {
+        return new Intl.NumberFormat('de-DE').format(number)
+      } else if (format === 'space') {
+        return new Intl.NumberFormat('fr-FR').format(number)
+      } else {
+        return number
+      }
+    },
     formatDate (date, format) {
       const monthFormats = {
         M: 'numeric',
@@ -377,6 +464,7 @@ export default {
 
       const yearFormats = {
         YYYY: 'numeric',
+        YYY: 'numeric',
         YY: '2-digit'
       }
 

app/javascript/submission_form/areas.vue

@@ -1,6 +1,6 @@
 <template>
   <template
-    v-for="step in steps"
+    v-for="(step, stepIndex) in steps"
     :key="step[0].uuid"
   >
     <template
@@ -18,15 +18,20 @@
           <FieldArea
             :ref="setAreaRef"
             v-model="values[field.uuid]"
+            :values="values"
             :field="field"
             :area="area"
             :submittable="true"
             :field-index="fieldIndex"
+            :scroll-padding="scrollPadding"
+            :submitter="submitter"
+            :with-field-placeholder="withFieldPlaceholder"
+            :with-signature-id="withSignatureId"
             :is-active="currentStep === step"
-            :with-label="withLabel"
+            :with-label="withLabel && !withFieldPlaceholder"
             :is-value-set="step.some((f) => f.uuid in values)"
             :attachments-index="attachmentsIndex"
-            @click="$emit('focus-step', step)"
+            @click="$emit('focus-step', stepIndex)"
           />
         </Teleport>
       </template>
@@ -48,11 +53,30 @@ export default {
       required: false,
       default: () => []
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    submitter: {
+      type: Object,
+      required: true
+    },
     values: {
       type: Object,
       required: false,
       default: () => ({})
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    scrollPadding: {
+      type: String,
+      required: false,
+      default: '-80px'
+    },
     attachmentsIndex: {
       type: Object,
       required: false,
@@ -63,6 +87,11 @@ export default {
       required: false,
       default: true
     },
+    scrollEl: {
+      type: Object,
+      required: false,
+      default: null
+    },
     currentStep: {
       type: Array,
       required: false,
@@ -97,7 +126,12 @@ export default {
         if (container.style.overflow === 'hidden') {
           this.scrollInContainer(areaRef.$el)
         } else {
-          areaRef.$refs.scrollToElem.scrollIntoView({ behavior: 'smooth', block: 'start' })
+          const targetRect = areaRef.$refs.scrollToElem.getBoundingClientRect()
+          const root = this.$root.$el?.parentNode?.classList?.contains('ds') ? this.$root.$el : document.body
+          const rootRect = root.getBoundingClientRect()
+          const scrollEl = this.scrollEl || window
+
+          scrollEl.scrollTo({ top: targetRect.top - rootRect.top, behavior: 'smooth' })
         }
 
         return true
@@ -116,7 +150,7 @@ export default {
 
       const targetTopRelativeToBox = targetRect.top - boxRect.top
 
-      scrollbox.scrollTop = targetTopRelativeToBox - container.offsetHeight + formContainer.offsetHeight + target.offsetHeight + padding
+      scrollbox.scrollTo({ top: targetTopRelativeToBox - container.offsetHeight + formContainer.offsetHeight + target.offsetHeight + padding, behavior: 'smooth' })
     },
     setAreaRef (el) {
       if (el) {

app/javascript/submission_form/attachment_step.vue

@@ -41,11 +41,18 @@
         :name="`values[${field.uuid}][]`"
       >
     </template>
+    <div
+      v-if="field.description && !modelValue.length"
+      dir="auto"
+      class="mb-3 px-1"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <FileDropzone
       :message="`${t('upload')} ${field.name || t('files')}${field.required ? '' : ` (${t('optional')})`}`"
       :submitter-slug="submitterSlug"
-      :is-direct-upload="isDirectUpload"
       :multiple="true"
+      :dry-run="dryRun"
       @upload="onUpload"
     />
   </div>
@@ -53,12 +60,14 @@
 
 <script>
 import FileDropzone from './dropzone'
+import MarkdownContent from './markdown_content'
 import { IconPaperclip, IconTrashX } from '@tabler/icons-vue'
 
 export default {
   name: 'AttachmentStep',
   components: {
     FileDropzone,
+    MarkdownContent,
     IconPaperclip,
     IconTrashX
   },
@@ -72,16 +81,16 @@ export default {
       type: String,
       required: true
     },
+    dryRun: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     attachmentsIndex: {
       type: Object,
       required: false,
       default: () => ({})
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     modelValue: {
       type: Array,
       required: false,

app/javascript/submission_form/completed.vue

@@ -3,20 +3,29 @@
     class="mx-auto max-w-md flex flex-col"
     dir="auto"
   >
-    <p class="font-medium text-2xl flex items-center space-x-1.5 mx-auto">
+    <div class="font-medium text-2xl flex items-center space-x-1.5 mx-auto">
       <IconCircleCheck
         class="inline text-green-600"
         :width="30"
         :height="30"
       />
       <span>
-        {{ t('form_has_been_completed') }}
+        {{ completedMessage.title || t('form_has_been_completed') }}
       </span>
-    </p>
+    </div>
+    <div
+      v-if="completedMessage.body"
+      class="mt-2"
+    >
+      <MarkdownContent
+        :string="completedMessage.body"
+      />
+    </div>
     <div class="space-y-3 mt-5">
       <a
         v-if="completedButton.url"
-        :href="completedButton.url"
+        :href="sanitizeHref(completedButton.url)"
+        rel="noopener noreferrer nofollow"
         class="white-button flex items-center w-full"
       >
         <span>
@@ -91,10 +100,12 @@
 
 <script>
 import { IconCircleCheck, IconBrandGithub, IconMail, IconDownload, IconInnerShadowTop, IconLogin } from '@tabler/icons-vue'
+import MarkdownContent from './markdown_content'
 
 export default {
   name: 'FormCompleted',
   components: {
+    MarkdownContent,
     IconCircleCheck,
     IconInnerShadowTop,
     IconBrandGithub,
@@ -142,6 +153,11 @@ export default {
       type: Object,
       required: false,
       default: () => ({})
+    },
+    completedMessage: {
+      type: Object,
+      required: false,
+      default: () => ({})
     }
   },
   data () {
@@ -165,6 +181,10 @@ export default {
         spread: 140
       })
     }
+
+    if (window.decline_button) {
+      window.decline_button.setAttribute('disabled', 'true')
+    }
   },
   methods: {
     sendCopyToEmail () {
@@ -181,13 +201,18 @@ export default {
     download () {
       this.isDownloading = true
 
-      fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then((response) => response.json()).then((urls) => {
+      fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then(async (response) => {
-        const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
+        if (response.ok) {
+          const urls = await response.json()
+          const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
 
-        if (isSafariIos && urls.length > 1) {
+          if (isSafariIos && urls.length > 1) {
-          this.downloadSafariIos(urls)
+            this.downloadSafariIos(urls)
+          } else {
+            this.downloadUrls(urls)
+          }
         } else {
-          this.downloadUrls(urls)
+          alert('Failed to download files')
         }
       })
     },
@@ -211,9 +236,14 @@ export default {
       fileRequests.reduce(
         (prevPromise, request) => prevPromise.then(() => request()),
         Promise.resolve()
-      )
+      ).finally(() => {
-
+        this.isDownloading = false
-      this.isDownloading = false
+      })
+    },
+    sanitizeHref (href) {
+      if (href && href.trim().match(/^((?:https?:\/\/)|\/)/)) {
+        return href.replace(/javascript:/g, '')
+      }
     },
     downloadSafariIos (urls) {
       const fileRequests = urls.map((url) => {

app/javascript/submission_form/crop_canvas.js

@@ -1,4 +1,4 @@
-function cropCanvasAndExportToPNG (canvas) {
+function cropCanvasAndExportToPNG (canvas, { errorOnTooSmall } = { errorOnTooSmall: false }) {
   const ctx = canvas.getContext('2d')
 
   const width = canvas.width
@@ -33,6 +33,10 @@ function cropCanvasAndExportToPNG (canvas) {
   croppedCanvas.height = croppedHeight
   const croppedCtx = croppedCanvas.getContext('2d')
 
+  if (errorOnTooSmall && (croppedWidth < 20 || croppedHeight < 20)) {
+    return Promise.reject(new Error('Image too small'))
+  }
+
   croppedCtx.drawImage(canvas, leftmost, topmost, croppedWidth, croppedHeight, 0, 0, croppedWidth, croppedHeight)
 
   return new Promise((resolve, reject) => {

app/javascript/submission_form/date_step.vue

@@ -1,20 +1,39 @@
 <template>
   <div dir="auto">
-    <div class="flex justify-between items-center w-full mb-2">
+    <div
+      class="flex justify-between items-center w-full"
+      :class="{ 'mb-2': !field.description }"
+    >
       <label
         :for="field.uuid"
         class="label text-2xl"
-      >{{ field.name && showFieldNames ? field.name : t('date') }}
+      >
-        <template v-if="!field.required">({{ t('optional') }})</template>
+        <MarkdownContent
+          v-if="field.title"
+          :string="field.title"
+        />
+        <template v-else>
+          {{ field.name && showFieldNames ? field.name : t('date') }}
+          <template v-if="!field.required">
+            ({{ t('optional') }})
+          </template>
+        </template>
       </label>
       <button
         class="btn btn-outline btn-sm !normal-case font-normal"
-        @click.prevent="setCurrentDate"
+        @click.prevent="[setCurrentDate(), $emit('focus')]"
       >
         <IconCalendarCheck :width="16" />
         {{ t('set_today') }}
       </button>
     </div>
+    <div
+      v-if="field.description"
+      class="mb-3 px-1"
+      dir="auto"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <AppearsOn :field="field" />
     <div class="text-center">
       <input
@@ -24,6 +43,7 @@
         :required="field.required"
         type="date"
         :name="`values[${field.uuid}]`"
+        @keydown.enter="onEnter"
         @focus="$emit('focus')"
       >
     </div>
@@ -33,11 +53,13 @@
 <script>
 import { IconCalendarCheck } from '@tabler/icons-vue'
 import AppearsOn from './appears_on'
+import MarkdownContent from './markdown_content'
 
 export default {
   name: 'DateStep',
   components: {
     IconCalendarCheck,
+    MarkdownContent,
     AppearsOn
   },
   inject: ['t'],
@@ -57,7 +79,7 @@ export default {
       default: ''
     }
   },
-  emits: ['update:model-value', 'focus'],
+  emits: ['update:model-value', 'focus', 'submit'],
   computed: {
     value: {
       set (value) {
@@ -69,6 +91,13 @@ export default {
     }
   },
   methods: {
+    onEnter (e) {
+      if (this.modelValue) {
+        e.preventDefault()
+
+        this.$emit('submit')
+      }
+    },
     setCurrentDate () {
       const inputEl = this.$refs.input
 

app/javascript/submission_form/dropzone.vue

@@ -65,16 +65,16 @@ export default {
       type: String,
       required: true
     },
+    dryRun: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     accept: {
       type: String,
       required: false,
       default: '*/*'
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     multiple: {
       type: Boolean,
       required: false,
@@ -92,11 +92,6 @@ export default {
       return 'el' + Math.random().toString(32).split('.')[1]
     }
   },
-  mounted () {
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-  },
   methods: {
     onDropFiles (e) {
       this.uploadFiles(e.dataTransfer.files)
@@ -113,55 +108,28 @@ export default {
     async uploadFiles (files) {
       this.isLoading = true
 
-      if (this.isDirectUpload) {
+      return await Promise.all(
-        const { DirectUpload } = await import('@rails/activestorage')
+        Array.from(files).map(async (file) => {
+          const formData = new FormData()
 
-        const blobs = await Promise.all(
+          if (this.dryRun) {
-          Array.from(files).map(async (file) => {
+            return new Promise((resolve) => {
-            const upload = new DirectUpload(
+              const reader = new FileReader()
-              file,
-              '/direct_uploads',
-              this.$refs.input
-            )
 
-            return new Promise((resolve, reject) => {
+              reader.readAsDataURL(file)
-              upload.create((error, blob) => {
-                if (error) {
-                  console.error(error)
 
-                  return reject(error)
+              reader.onloadend = () => {
-                } else {
+                resolve({
-                  return resolve(blob)
+                  url: reader.result,
-                }
+                  uuid: Math.random().toString(),
-              })
+                  filename: file.name
-            }).catch((error) => {
+                })
-              console.error(error)
+              }
             })
-          })
+          } else {
-        )
+            if (file.type === 'image/bmp') {
-
+              file = await this.convertBmpToPng(file)
-        return await Promise.all(
+            }
-          blobs.map((blob) => {
-            return fetch(this.baseUrl + '/api/attachments', {
-              method: 'POST',
-              body: JSON.stringify({
-                name: 'attachments',
-                blob_signed_id: blob.signed_id,
-                submitter_slug: this.submitterSlug
-              }),
-              headers: { 'Content-Type': 'application/json' }
-            }).then(resp => resp.json()).then((data) => {
-              return data
-            })
-          })).then((result) => {
-          this.$emit('upload', result)
-        }).finally(() => {
-          this.isLoading = false
-        })
-      } else {
-        return await Promise.all(
-          Array.from(files).map((file) => {
-            const formData = new FormData()
 
             formData.append('file', file)
             formData.append('submitter_slug', this.submitterSlug)
@@ -173,12 +141,38 @@ export default {
             }).then(resp => resp.json()).then((data) => {
               return data
             })
-          })).then((result) => {
+          }
-          this.$emit('upload', result)
+        })).then((result) => {
-        }).finally(() => {
+        this.$emit('upload', result)
-          this.isLoading = false
+      }).finally(() => {
-        })
+        this.isLoading = false
-      }
+      })
+    },
+    convertBmpToPng (bmpFile) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+
+        reader.onload = function (event) {
+          const img = new Image()
+
+          img.onload = function () {
+            const canvas = document.createElement('canvas')
+            const ctx = canvas.getContext('2d')
+
+            canvas.width = img.width
+            canvas.height = img.height
+            ctx.drawImage(img, 0, 0)
+            canvas.toBlob(function (blob) {
+              const newFile = new File([blob], bmpFile.name.replace(/\.\w+$/, '.png'), { type: 'image/png' })
+              resolve(newFile)
+            }, 'image/png')
+          }
+
+          img.src = event.target.result
+        }
+        reader.onerror = reject
+        reader.readAsDataURL(bmpFile)
+      })
     }
   }
 }

app/javascript/submission_form/form.vue

@@ -3,10 +3,15 @@
     ref="areas"
     :steps="stepFields"
     :values="values"
+    :with-field-placeholder="withFieldPlaceholder"
+    :submitter="submitter"
+    :scroll-el="scrollEl"
+    :with-signature-id="withSignatureId"
     :attachments-index="attachmentsIndex"
     :with-label="!isAnonymousChecboxes && showFieldNames"
     :current-step="currentStepFields"
-    @focus-step="[saveStep(), goToStep($event, false, true), currentField.type !== 'checkbox' ? isFormVisible = true : '']"
+    :scroll-padding="scrollPadding"
+    @focus-step="[saveStep(), currentField.type !== 'checkbox' ? isFormVisible = true : '', goToStep($event, false, true)]"
   />
   <FormulaFieldAreas
     v-if="formulaFields.length"
@@ -16,10 +21,20 @@
   <button
     v-if="!isFormVisible"
     id="expand_form_button"
-    class="btn btn-neutral flex text-white absolute rounded-none border-x-0 md:border md:rounded-full bottom-0 w-full md:mb-4 text-base"
+    class="btn btn-neutral flex text-white absolute bottom-0 w-full mb-3"
+    style="width: 96%; margin-left: 2%"
     @click.prevent="[isFormVisible = true, scrollIntoField(currentField)]"
   >
-    {{ t('submit_form') }}
+    <template v-if="['initials', 'signature'].includes(currentField.type)">
+      <IconWritingSign stroke-width="1.5" />
+      {{ t('sign_now') }}
+    </template>
+    <template v-else-if="alwaysMinimize">
+      {{ t('next') }}
+    </template>
+    <template v-else>
+      {{ t('submit_form') }}
+    </template>
     <IconArrowsDiagonal
       class="absolute right-0 mr-4"
       :width="20"
@@ -91,21 +106,37 @@
             v-model="values[currentField.uuid]"
             :show-field-names="showFieldNames"
             :field="currentField"
+            @submit="submitStep"
             @focus="scrollIntoField(currentField)"
           />
           <div v-else-if="currentField.type === 'select'">
             <label
-              v-if="showFieldNames && currentField.name"
+              v-if="showFieldNames && (currentField.name || currentField.title)"
               :for="currentField.uuid"
               dir="auto"
-              class="label text-2xl mb-2"
+              class="label text-2xl"
-            >{{ currentField.name }}
+              :class="{ 'mb-2': !currentField.description }"
-              <template v-if="!currentField.required">({{ t('optional') }})</template>
+            >
+              <MarkdownContent
+                v-if="currentField.title"
+                :string="currentField.title"
+              />
+              <template v-else>
+                {{ currentField.name }}
+                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </template>
             </label>
             <div
               v-else
               class="py-1"
             />
+            <div
+              v-if="currentField.description"
+              dir="auto"
+              class="mb-3 px-1"
+            >
+              <MarkdownContent :string="currentField.description" />
+            </div>
             <AppearsOn :field="currentField" />
             <select
               :id="currentField.uuid"
@@ -134,13 +165,28 @@
           </div>
           <div v-else-if="currentField.type === 'radio'">
             <label
-              v-if="showFieldNames && currentField.name"
+              v-if="showFieldNames && (currentField.name || currentField.title)"
               :for="currentField.uuid"
               dir="auto"
-              class="label text-2xl mb-2"
+              class="label text-2xl"
-            >{{ currentField.name }}
+              :class="{ 'mb-2': !currentField.description }"
-              <template v-if="!currentField.required">({{ t('optional') }})</template>
+            >
+              <MarkdownContent
+                v-if="currentField.title"
+                :string="currentField.title"
+              />
+              <template v-else>
+                {{ currentField.name }}
+                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </template>
             </label>
+            <div
+              v-if="currentField.description"
+              dir="auto"
+              class="mb-3 px-1"
+            >
+              <MarkdownContent :string="currentField.description" />
+            </div>
             <div class="flex w-full max-h-44 overflow-y-auto">
               <div
                 v-if="!showFieldNames || (currentField.options.every((e) => !e.value) && currentField.options.length > 4)"
@@ -172,6 +218,7 @@
                       :name="`values[${currentField.uuid}]`"
                       :value="option.value || `${t('option')} ${index + 1}`"
                       :required="currentField.required"
+                      @click="scrollIntoField(currentField)"
                     >
                     <span class="text-xl">
                       {{ option.value || `${t('option')} ${index + 1}` }}
@@ -191,66 +238,77 @@
           />
           <div
             v-else-if="currentField.type === 'checkbox'"
-            class="flex w-full max-h-44 overflow-y-auto"
           >
-            <input
-              type="hidden"
-              name="cast_boolean"
-              value="true"
-            >
             <div
-              class="space-y-3.5 mx-auto"
+              v-if="currentField.description"
+              dir="auto"
+              class="mb-3 px-1"
             >
-              <template v-if="isAnonymousChecboxes || !showFieldNames">
+              <MarkdownContent :string="currentField.description" />
-                <span class="text-xl">
+            </div>
-                  {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
+            <div
-                </span>
+              class="flex w-full max-h-44 overflow-y-auto"
-                <input
+            >
-                  v-for="field in currentStepFields"
+              <input
-                  :key="field.uuid"
+                type="hidden"
-                  type="hidden"
+                name="cast_boolean"
-                  :name="`values[${field.uuid}]`"
+                value="true"
-                  :value="!!values[field.uuid]"
+              >
-                >
+              <div
-              </template>
+                class="space-y-3.5 mx-auto"
-              <template v-else>
+              >
-                <div
+                <template v-if="isAnonymousChecboxes || !showFieldNames">
-                  v-for="(field, index) in currentStepFields"
+                  <span class="text-xl">
-                  :key="field.uuid"
+                    {{ t('complete_hightlighted_checkboxes_and_click') }} <span class="font-semibold">{{ stepFields.length === currentStep + 1 ? t('submit') : t('next') }}</span>.
-                >
+                  </span>
-                  <label
+                  <input
-                    :for="field.uuid"
+                    v-for="field in currentStepFields"
-                    class="flex items-center space-x-3"
+                    :key="field.uuid"
+                    type="hidden"
+                    :name="`values[${field.uuid}]`"
+                    :value="!!values[field.uuid]"
                   >
-                    <input
+                </template>
-                      type="hidden"
+                <template v-else>
-                      :name="`values[${field.uuid}]`"
+                  <div
-                      :value="!!values[field.uuid]"
+                    v-for="(field, index) in currentStepFields"
+                    :key="field.uuid"
+                  >
+                    <label
+                      :for="field.uuid"
+                      class="flex items-center space-x-3"
                     >
-                    <input
+                      <input
-                      :id="field.uuid"
+                        type="hidden"
-                      type="checkbox"
+                        :name="`values[${field.uuid}]`"
-                      class="base-checkbox !h-7 !w-7"
+                        :value="!!values[field.uuid]"
-                      :oninvalid="`this.setCustomValidity('${t('please_check_the_box_to_continue')}')`"
+                      >
-                      :onchange="`this.setCustomValidity(validity.valueMissing ? '${t('please_check_the_box_to_continue')}' : '');`"
+                      <input
-                      :required="field.required"
+                        :id="field.uuid"
-                      :checked="!!values[field.uuid]"
+                        type="checkbox"
-                      @click="[scrollIntoField(field), values[field.uuid] = !values[field.uuid]]"
+                        class="base-checkbox !h-7 !w-7"
-                    >
+                        :oninvalid="`this.setCustomValidity('${t('please_check_the_box_to_continue')}')`"
-                    <span
+                        :onchange="`this.setCustomValidity(validity.valueMissing ? '${t('please_check_the_box_to_continue')}' : '');`"
-                      v-if="field.title"
+                        :required="field.required"
-                      class="text-xl"
+                        :checked="!!values[field.uuid]"
-                      v-html="field.title"
+                        @click="[scrollIntoField(field), values[field.uuid] = !values[field.uuid]]"
-                    />
+                      >
-                    <span
+                      <span
-                      v-else
+                        v-if="field.title"
-                      class="text-xl"
+                        class="text-xl"
-                    >
+                      >
-                      {{ field.name || field.type + ' ' + (index + 1) }}
+                        <MarkdownContent :string="field.title" />
-                    </span>
+                      </span>
-                  </label>
+                      <span
-                </div>
+                        v-else
-              </template>
+                        class="text-xl"
+                      >
+                        {{ field.name || field.type + ' ' + (index + 1) }}
+                      </span>
+                    </label>
+                  </div>
+                </template>
+              </div>
             </div>
           </div>
           <ImageStep
@@ -258,7 +316,7 @@
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
             :field="currentField"
-            :is-direct-upload="isDirectUpload"
+            :dry-run="dryRun"
             :attachments-index="attachmentsIndex"
             :submitter-slug="submitterSlug"
             :show-field-names="showFieldNames"
@@ -269,13 +327,20 @@
             ref="currentStep"
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
+            :reason="values[currentField.preferences?.reason_field_uuid]"
             :field="currentField"
-            :previous-value="previousSignatureValueFor(currentField)"
+            :previous-value="previousSignatureValueFor(currentField) || previousSignatureValue"
-            :is-direct-upload="isDirectUpload"
             :with-typed-signature="withTypedSignature"
+            :remember-signature="rememberSignature"
             :attachments-index="attachmentsIndex"
-            :submitter-slug="submitterSlug"
+            :require-signing-reason="requireSigningReason"
+            :button-text="buttonText"
+            :dry-run="dryRun"
+            :with-disclosure="withDisclosure"
+            :with-qr-button="withQrButton"
+            :submitter="submitter"
             :show-field-names="showFieldNames"
+            @update:reason="values[currentField.preferences?.reason_field_uuid] = $event"
             @attached="attachments.push($event)"
             @start="scrollIntoField(currentField)"
             @minimize="isFormVisible = false"
@@ -286,8 +351,8 @@
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
             :field="currentField"
+            :dry-run="dryRun"
             :previous-value="previousInitialsValue"
-            :is-direct-upload="isDirectUpload"
             :attachments-index="attachmentsIndex"
             :show-field-names="showFieldNames"
             :submitter-slug="submitterSlug"
@@ -300,7 +365,7 @@
             v-else-if="currentField.type === 'file'"
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
-            :is-direct-upload="isDirectUpload"
+            :dry-run="dryRun"
             :field="currentField"
             :attachments-index="attachmentsIndex"
             :submitter-slug="submitterSlug"
@@ -312,7 +377,9 @@
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
             :field="currentField"
+            :locale="language?.toLowerCase() || browserLanguage"
             :show-field-names="showFieldNames"
+            :verified-value="phoneVerifiedValues[currentField.uuid]"
             :default-value="submitter.phone"
             :submitter-slug="submitterSlug"
             @focus="scrollIntoField(currentField)"
@@ -325,6 +392,7 @@
             v-model="values[currentField.uuid]"
             :field="currentField"
             :submitter-slug="submitterSlug"
+            :values="values"
             @attached="attachments.push($event)"
             @focus="scrollIntoField(currentField)"
             @submit="submitStep"
@@ -332,7 +400,7 @@
         </div>
         <div
           v-if="currentField.type !== 'payment' || submittedValues[currentField.uuid]"
-          class="mt-6 md:mt-8"
+          :class="currentField.type === 'signature' ? 'mt-2' : 'mt-6 md:mt-8'"
         >
           <button
             id="submit_form_button"
@@ -346,11 +414,8 @@
                 v-if="isSubmitting"
                 class="mr-1 animate-spin"
               />
-              <span v-if="stepFields.length === currentStep + 1">
+              <span>
-                {{ t('submit') }}
+                {{ buttonText }}
-              </span>
-              <span v-else>
-                {{ t('next') }}
               </span><span
                 v-if="isSubmitting"
                 class="w-6 flex justify-start mr-1"
@@ -370,8 +435,9 @@
         :is-demo="isDemo"
         :attribution="attribution"
         :completed-button="completedRedirectUrl ? {} : completedButton"
+        :completed-message="completedRedirectUrl ? {} : completedMessage"
         :with-send-copy-button="withSendCopyButton && !completedRedirectUrl"
-        :with-download-button="withDownloadButton && !completedRedirectUrl"
+        :with-download-button="withDownloadButton && !completedRedirectUrl && !dryRun"
         :with-confetti="withConfetti"
         :can-send-email="canSendEmail && !!submitter.email"
         :submitter-slug="submitterSlug"
@@ -387,7 +453,7 @@
             href="#"
             class="inline border border-base-300 h-3 w-3 rounded-full mx-1 mt-1"
             :class="{ 'bg-base-300': index === currentStep, 'bg-base-content': (index < currentStep && stepFields[index].every((f) => !f.required || ![null, undefined, ''].includes(values[f.uuid]))) || isCompleted, 'bg-white': index > currentStep }"
-            @click.prevent="isCompleted ? '' : [saveStep(), goToStep(step, true)]"
+            @click.prevent="isCompleted ? '' : [saveStep(), goToStep(index, true)]"
           />
         </div>
       </div>
@@ -412,18 +478,23 @@ import PaymentStep from './payment_step'
 import TextStep from './text_step'
 import NumberStep from './number_step'
 import DateStep from './date_step'
+import MarkdownContent from './markdown_content'
 import FormCompleted from './completed'
-import { IconInnerShadowTop, IconArrowsDiagonal, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
+import { IconInnerShadowTop, IconArrowsDiagonal, IconWritingSign, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import AppearsOn from './appears_on'
 import i18n from './i18n'
 
 const isEmpty = (obj) => {
   if (obj == null) return true
 
-  if (Array.isArray(obj) || typeof obj === 'string') {
+  if (Array.isArray(obj)) {
     return obj.length === 0
   }
 
+  if (typeof obj === 'string') {
+    return obj.trim().length === 0
+  }
+
   if (typeof obj === 'object') {
     return Object.keys(obj).length === 0
   }
@@ -442,6 +513,7 @@ export default {
     ImageStep,
     SignatureStep,
     AppearsOn,
+    IconWritingSign,
     AttachmentStep,
     InitialsStep,
     MultiSelectStep,
@@ -452,6 +524,7 @@ export default {
     NumberStep,
     FormulaFieldAreas,
     PhoneStep,
+    MarkdownContent,
     PaymentStep,
     IconArrowsDiagonalMinimize2,
     FormCompleted
@@ -469,6 +542,21 @@ export default {
       type: Object,
       required: true
     },
+    withSignatureId: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    scrollPadding: {
+      type: String,
+      required: false,
+      default: '-80px'
+    },
+    requireSigningReason: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     canSendEmail: {
       type: Boolean,
       required: false,
@@ -479,6 +567,16 @@ export default {
       required: false,
       default: () => []
     },
+    withFieldPlaceholder: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    scrollEl: {
+      type: Object,
+      required: false,
+      default: null
+    },
     onComplete: {
       type: Function,
       required: false,
@@ -487,6 +585,26 @@ export default {
       }
     },
     expand: {
+      type: Boolean,
+      required: false,
+      default: null
+    },
+    rememberSignature: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    minimize: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    withDisclosure: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    reuseSignature: {
       type: Boolean,
       required: false,
       default: true
@@ -496,11 +614,21 @@ export default {
       required: false,
       default: false
     },
+    autoscrollFields: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     showFieldNames: {
       type: Boolean,
       required: false,
       default: true
     },
+    withQrButton: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     withTypedSignature: {
       type: Boolean,
       required: false,
@@ -526,10 +654,10 @@ export default {
       required: false,
       default: ''
     },
-    isDirectUpload: {
+    previousSignatureValue: {
-      type: Boolean,
+      type: String,
       required: false,
-      default: false
+      default: ''
     },
     allowToSkip: {
       type: Boolean,
@@ -546,6 +674,11 @@ export default {
       required: false,
       default: false
     },
+    dryRun: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     attribution: {
       type: Boolean,
       required: false,
@@ -561,6 +694,11 @@ export default {
       required: false,
       default: () => ({})
     },
+    authenticityToken: {
+      type: String,
+      required: false,
+      default: ''
+    },
     i18n: {
       type: Object,
       required: false,
@@ -585,22 +723,43 @@ export default {
       type: Object,
       required: false,
       default: () => ({})
+    },
+    completedMessage: {
+      type: Object,
+      required: false,
+      default: () => ({})
     }
   },
   data () {
     return {
       isCompleted: false,
-      isFormVisible: this.expand,
+      isFormVisible: this.expand !== false,
       showFillAllRequiredFields: false,
       currentStep: 0,
+      enableScrollIntoField: true,
+      phoneVerifiedValues: {},
+      orientation: screen?.orientation?.type,
       isSubmitting: false,
       submittedValues: {},
       recalculateButtonDisabledKey: ''
     }
   },
   computed: {
+    isMobile () {
+      return /android|iphone|ipad/i.test(navigator.userAgent)
+    },
+    buttonText () {
+      if (this.alwaysMinimize || this.stepFields.length === this.currentStep + 1) {
+        return this.t('submit')
+      } else {
+        return this.t('next')
+      }
+    },
+    alwaysMinimize () {
+      return this.minimize || (this.orientation?.includes('landscape') && this.isMobile && parseInt(window.innerHeight) < 550)
+    },
     currentStepFields () {
-      return this.stepFields[this.currentStep]
+      return this.stepFields[this.currentStep] || []
     },
     browserLanguage () {
       return (navigator.language || navigator.userLanguage || 'en').split('-')[0]
@@ -608,16 +767,24 @@ export default {
     queryParams () {
       return new URLSearchParams(window.location.search)
     },
-    authenticityToken () {
-      return document.querySelector('meta[name="csrf-token"]')?.content
-    },
     submitterSlug () {
       return this.submitter.slug
     },
-    previousInitialsValue () {
+    fieldsUuidIndex () {
-      const initialsField = [...this.fields].reverse().find((field) => field.type === 'initials' && !!this.values[field.uuid])
+      return this.fields.reduce((acc, f) => {
+        acc[f.uuid] = f
 
-      return this.values[initialsField?.uuid]
+        return acc
+      }, {})
+    },
+    previousInitialsValue () {
+      if (this.reuseSignature !== false) {
+        const initialsField = [...this.fields].reverse().find((field) => field.type === 'initials' && !!this.values[field.uuid])
+
+        return this.values[initialsField?.uuid]
+      } else {
+        return null
+      }
     },
     isAnonymousChecboxes () {
       return this.currentField.type === 'checkbox' && this.currentStepFields.every((e) => !e.name && !e.required) && this.currentStepFields.length > 4
@@ -639,17 +806,19 @@ export default {
       return this.fields.filter((f) => !f.readonly).reduce((acc, f) => {
         const prevStep = acc[acc.length - 1]
 
-        if (f.type === 'checkbox' && Array.isArray(prevStep) && prevStep[0].type === 'checkbox') {
+        if (this.checkFieldConditions(f)) {
-          prevStep.push(f)
+          if (f.type === 'checkbox' && Array.isArray(prevStep) && prevStep[0].type === 'checkbox' && !f.description) {
-        } else {
+            prevStep.push(f)
-          acc.push([f])
+          } else {
+            acc.push([f])
+          }
         }
 
         return acc
       }, [])
     },
     formulaFields () {
-      return this.fields.filter((f) => f.preferences?.formula)
+      return this.fields.filter((f) => f.preferences?.formula && f.type !== 'payment')
     },
     attachmentsIndex () {
       return this.attachments.reduce((acc, a) => {
@@ -665,11 +834,21 @@ export default {
   watch: {
     expand (value) {
       this.isFormVisible = value
+    },
+    currentStepFields (value) {
+      if (isEmpty(value) && this.currentStep > 0) {
+        this.currentStep -= 1
+      }
     }
   },
+  beforeUnmount () {
+    screen?.orientation?.removeEventListener('change', this.onOrientationChange)
+  },
   mounted () {
     this.submittedValues = JSON.parse(JSON.stringify(this.values))
 
+    screen?.orientation.addEventListener('change', this.onOrientationChange)
+
     this.fields.forEach((field) => {
       if (field.default_value && !field.readonly) {
         this.values[field.uuid] ||= field.default_value
@@ -699,6 +878,14 @@ export default {
       this.currentStep = Math.min(...indexesList)
     }
 
+    if (document.body?.clientWidth >= 768 && this.expand !== true && ['signature', 'initials', 'file', 'image'].includes(this.currentField?.type)) {
+      this.isFormVisible = false
+    }
+
+    if (this.alwaysMinimize) {
+      this.isFormVisible = false
+    }
+
     if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {
       this.$nextTick(() => {
         const root = this.$root.$el.parentNode.getRootNode()
@@ -716,18 +903,61 @@ export default {
     this.$nextTick(() => {
       this.recalculateButtonDisabledKey = Math.random()
 
-      Promise.all([
+      if (!this.dryRun) {
-        this.maybeTrackEmailClick(),
+        Promise.all([
-        this.maybeTrackSmsClick()
+          this.maybeTrackEmailClick(),
-      ]).finally(() => {
+          this.maybeTrackSmsClick()
-        this.trackViewForm()
+        ]).finally(() => {
-      })
+          this.trackViewForm()
+        })
+      }
     })
   },
   methods: {
     t (key) {
       return this.i18n[key] || i18n[this.language?.toLowerCase()]?.[key] || i18n[this.browserLanguage]?.[key] || i18n.en[key] || key
     },
+    onOrientationChange (event) {
+      this.orientation = event.target.type
+    },
+    checkFieldConditions (field) {
+      if (field.conditions?.length) {
+        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)) {
+            return false
+          }
+
+          if (['empty', 'unchecked'].includes(c.action)) {
+            return acc && isEmpty(this.values[c.field_uuid])
+          } else if (['not_empty', 'checked'].includes(c.action)) {
+            return acc && !isEmpty(this.values[c.field_uuid])
+          } else if (['equal', 'contains'].includes(c.action)) {
+            const option = field.options.find((o) => o.uuid === c.value)
+            const values = [this.values[c.field_uuid]].flat()
+
+            return acc && values.includes(this.optionValue(option, field.options.indexOf(option)))
+          } else if (['not_equal', 'does_not_contain'].includes(c.action)) {
+            const option = field.options.find((o) => o.uuid === c.value)
+            const values = [this.values[c.field_uuid]].flat()
+
+            return acc && !values.includes(this.optionValue(option, field.options.indexOf(option)))
+          } else {
+            return acc
+          }
+        }, true)
+      } else {
+        return true
+      }
+    },
+    optionValue (option, index) {
+      if (option.value) {
+        return option.value
+      } else {
+        return `${this.t('option')} ${index + 1}`
+      }
+    },
     maybeTrackEmailClick () {
       const { queryParams } = this
 
@@ -788,34 +1018,49 @@ export default {
       })
     },
     previousSignatureValueFor (field) {
-      const signatureField = [...this.fields].reverse().find((f) =>
+      if (this.reuseSignature !== false) {
-        f.type === 'signature' && field.preferences?.format === f.preferences?.format && !!this.values[f.uuid]
+        const signatureField = [...this.fields].reverse().find((f) =>
-      )
+          f.type === 'signature' && field.preferences?.format === f.preferences?.format && !!this.values[f.uuid]
+        )
 
-      return this.values[signatureField?.uuid]
+        return this.values[signatureField?.uuid]
+      } else {
+        return null
+      }
     },
-    goToStep (step, scrollToArea = false, clickUpload = false) {
+    goToStep (stepIndex, scrollToArea = false, clickUpload = false) {
-      this.currentStep = this.stepFields.indexOf(step)
+      this.currentStep = stepIndex
       this.showFillAllRequiredFields = false
 
       this.$nextTick(() => {
         this.recalculateButtonDisabledKey = Math.random()
 
-        if (scrollToArea) {
+        if (!this.isCompleted) {
-          this.scrollIntoField(step[0])
+          if (scrollToArea) {
-        }
+            this.scrollIntoField(this.currentField)
+          }
 
-        this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus()
+          this.enableScrollIntoField = false
+          this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus()
+          this.enableScrollIntoField = true
 
-        if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) {
+          if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) {
-          this.$refs.form.querySelector('input[type="file"]')?.click()
+            this.$refs.form.querySelector('input[type="file"]')?.click()
+          }
         }
       })
     },
     saveStep (formData) {
       const currentFieldUuids = this.currentStepFields.map((f) => f.uuid)
+      const currentFieldType = this.currentField.type
 
-      if (this.isCompleted) {
+      if (this.dryRun) {
+        currentFieldUuids.forEach((fieldUuid) => {
+          this.submittedValues[fieldUuid] = this.values[fieldUuid]
+        })
+
+        return Promise.resolve({})
+      } else if (this.isCompleted) {
         return Promise.resolve({})
       } else {
         return fetch(this.baseUrl + this.submitPath, {
@@ -825,6 +1070,10 @@ export default {
           if (response.status === 200) {
             currentFieldUuids.forEach((fieldUuid) => {
               this.submittedValues[fieldUuid] = this.values[fieldUuid]
+
+              if (currentFieldType === 'phone') {
+                this.phoneVerifiedValues[fieldUuid] = this.values[fieldUuid]
+              }
             })
           }
 
@@ -833,7 +1082,9 @@ export default {
       }
     },
     scrollIntoField (field) {
-      return this.$refs.areas.scrollIntoField(field)
+      if (this.enableScrollIntoField) {
+        return this.$refs.areas.scrollIntoField(field)
+      }
     },
     scrollIntoArea (area) {
       return this.$refs.areas.scrollIntoArea(area)
@@ -863,11 +1114,21 @@ export default {
           formData.append('completed', 'true')
         }
 
-        await this.saveStep(formData).then(async (response) => {
+        let saveStepRequest
+
+        if (!isLastStep && this.phoneVerifiedValues[this.currentField.uuid] && this.phoneVerifiedValues[this.currentField.uuid] === this.values[this.currentField.uuid]) {
+          saveStepRequest = Promise.resolve({})
+        } else {
+          saveStepRequest = this.saveStep(formData)
+        }
+
+        await saveStepRequest.then(async (response) => {
           if (response.status === 422 || response.status === 500) {
             const data = await response.json()
 
-            alert(data.error || 'Value is invalid')
+            const i18nError = data.error ? this.t(data.error.replace(/\s+/g, '_').toLowerCase()) : ''
+
+            alert(i18nError !== data.error ? i18nError : (data.error || this.t('value_is_invalid')))
 
             return Promise.reject(new Error(data.error))
           }
@@ -879,7 +1140,11 @@ export default {
           const nextStep = (isLastStep && emptyRequiredField) || this.stepFields[this.currentStep + 1]
 
           if (nextStep) {
-            this.goToStep(nextStep, true)
+            if (this.alwaysMinimize) {
+              this.isFormVisible = false
+            }
+
+            this.goToStep(this.stepFields.indexOf(nextStep), this.autoscrollFields)
 
             if (emptyRequiredField === nextStep) {
               this.showFillAllRequiredFields = true
@@ -903,7 +1168,11 @@ export default {
           this.isSubmitting = false
         })
       }).catch(error => {
-        console.log(error)
+        if (error?.message === 'Image too small') {
+          alert('Signature is too small - please redraw.')
+        } else {
+          console.log(error)
+        }
       }).finally(() => {
         this.isSubmitting = false
       })

app/javascript/submission_form/i18n.js

@@ -1,12 +1,32 @@
 const en = {
   text: 'Text',
+  by_clicking_you_agree_to_the: 'By clicking "{button}", you agree to the',
+  electronic_signature_disclosure: 'Electronic Signature Disclosure',
+  esignature_disclosure: 'eSignature Disclosure',
   signature: 'Signature',
   initials: 'Initials',
+  drawn_signature_on_a_touchscreen_device: 'Drawn signature on a touchscreen device',
+  approved: 'Approved',
+  reviewed: 'Reviewed',
+  other: 'Other',
+  authored_by_me: 'Authored by me',
+  approved_by: 'Approved by',
+  reviewed_by: 'Reviewed by',
+  authored_by: 'Authored by',
+  select_a_reason: 'Select a reason',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan the QR code with the camera app to open the form on mobile and draw your signature',
   date: 'Date',
   number: 'Number',
+  value_is_invalid: 'Value is invalid',
+  verification_code_is_invalid: 'Verification code is invalid',
+  already_paid: 'Already paid',
   image: 'Image',
+  pay: 'Pay',
   take_photo: 'Take photo',
+  number_phone_is_invalid: '{number} phone is invalid',
   file: 'File',
+  digitally_signed_by: 'Digitally signed by',
+  reason: 'Reason',
   select: 'Select',
   checkbox: 'Checkbox',
   multiple: 'Multiple',
@@ -17,13 +37,14 @@ const en = {
   payment: 'Payment',
   phone: 'Phone',
   submit_form: 'Submit Form',
+  sign_now: 'Sign Now',
   type_here_: 'Type here...',
   optional: 'optional',
   option: 'Option',
   appears_on: 'Appears on',
   page: 'Page',
   select_your_option: 'Select your option',
-  complete_hightlighted_checkboxes_and_click: 'Complete hightlighted checkboxes and click',
+  complete_hightlighted_checkboxes_and_click: 'Complete highlighted checkboxes and click',
   submit: 'submit',
   next: 'next',
   click_to_upload: 'Click to upload',
@@ -41,7 +62,7 @@ const en = {
   please_check_the_box_to_continue: 'Please check the box to continue',
   open_source_documents_software: 'open source documents software',
   verified_phone_number: 'Verify Phone Number',
-  use_international_format: 'Use internatioanl format: +1xxx',
+  use_international_format: 'Use international format: +1xxx',
   six_digits_code: '6-digit code',
   change_phone_number: 'Change phone number',
   sending: 'Sending...',
@@ -64,9 +85,28 @@ const en = {
 }
 
 const es = {
+  approved: 'Aprobado',
+  reviewed: 'Revisado',
+  other: 'Otro',
+  authored_by_me: 'Escrito por mí',
+  approved_by: 'Aprobado por',
+  reviewed_by: 'Revisado por',
+  authored_by: 'Escrito por',
+  select_a_reason: 'Selecciona una razón',
+  value_is_invalid: 'El valor no es válido',
+  verification_code_is_invalid: 'El código de verificación no es válido',
+  drawn_signature_on_a_touchscreen_device: 'Firma dibujada en un dispositivo con pantalla táctil',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Escanea el código QR con la aplicación de la cámara para abrir el formulario en el móvil y dibujar tu firma',
+  by_clicking_you_agree_to_the: 'Al hacer clic en "{button}", usted acepta el',
+  electronic_signature_disclosure: 'Divulgación de Firma Electrónica',
+  esignature_disclosure: 'Divulgación de eFirma',
+  already_paid: 'Ya pagado',
   minimize: 'Minimizar',
   text: 'Texto',
   signature: 'Firma',
+  pay: 'Pagar',
+  digitally_signed_by: 'Firmado digitalmente por',
+  reason: 'Razón',
   initials: 'Iniciales',
   date: 'Fecha',
   number: 'Número',
@@ -74,6 +114,7 @@ const es = {
   file: 'Archivo',
   select: 'Seleccionar',
   checkbox: 'Casilla',
+  number_phone_is_invalid: '{number} teléfono es inválido',
   multiple: 'Múltiple',
   radio: 'Radio',
   cells: 'Celdas',
@@ -82,6 +123,7 @@ const es = {
   phone: 'Teléfono',
   take_photo: 'Tomar foto',
   submit_form: 'Enviar Formulario',
+  sign_now: 'Firmar ahora',
   type_here_: 'Escribe aquí...',
   optional: 'opcional',
   appears_on: 'Aparece en',
@@ -128,13 +170,32 @@ const es = {
 }
 
 const it = {
+  approved: 'Approvato',
+  reviewed: 'Revisionato',
+  other: 'Altro',
+  authored_by_me: 'Creato da me',
+  approved_by: 'Approvato da',
+  reviewed_by: 'Revisionato da',
+  authored_by: 'Creato da',
+  select_a_reason: 'Seleziona una ragione',
+  value_is_invalid: 'Il valore non è valido',
+  verification_code_is_invalid: 'Il codice di verifica non è valido',
+  drawn_signature_on_a_touchscreen_device: 'Firma disegnata su un dispositivo con schermo tattile',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scansiona il codice QR con l\'app della fotocamera per aprire il modulo sul cellulare e disegnare la tua firma',
+  by_clicking_you_agree_to_the: 'Cliccando su "{button}", accetti il',
+  electronic_signature_disclosure: 'Divulgazione della Firma Elettronica',
+  esignature_disclosure: 'Divulgazione della eFirma',
   minimize: 'Minimizza',
+  already_paid: 'Pagato',
   text: 'Testo',
   signature: 'Firma',
+  digitally_signed_by: 'Firmato digitalmente da',
+  reason: 'Motivo',
   initials: 'Iniziali',
   date: 'Data',
   number: 'Numero',
   image: 'Immagine',
+  pay: 'Pagamento',
   file: 'File',
   select: 'Seleziona',
   checkbox: 'Casella di controllo',
@@ -143,8 +204,10 @@ const it = {
   cells: 'Celle',
   stamp: 'Timbro',
   payment: 'Pagamento',
+  number_phone_is_invalid: '{number} telefono non è valido',
   phone: 'Telefono',
   submit_form: 'Invia Modulo',
+  sign_now: 'Firma ora',
   type_here_: 'Digita qui...',
   optional: 'opzionale',
   appears_on: 'Compare su',
@@ -192,13 +255,32 @@ const it = {
 }
 
 const de = {
+  approved: 'Genehmigt',
+  reviewed: 'Überprüft',
+  other: 'Andere',
+  authored_by_me: 'Von mir verfasst',
+  approved_by: 'Genehmigt von',
+  reviewed_by: 'Überprüft von',
+  authored_by: 'Verfasst von',
+  select_a_reason: 'Grund auswählen',
+  value_is_invalid: 'Wert ist ungültig',
+  verification_code_is_invalid: 'Bestätigungscode ist ungültig',
+  drawn_signature_on_a_touchscreen_device: 'Gezeichnete Unterschrift auf einem Touchscreen-Gerät',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scannen Sie den QR-Code mit der Kamera-App, um das Formular auf dem Handy zu öffnen und Ihre Unterschrift zu zeichnen',
+  by_clicking_you_agree_to_the: 'Durch Klicken auf "{button}" stimmen Sie zu, dass Sie die',
+  electronic_signature_disclosure: 'Elektronische Unterschriftenoffenlegung',
+  esignature_disclosure: 'eSignatur Offenlegung',
+  already_paid: 'Bereits bezahlt',
   minimize: 'Minimieren',
   text: 'Text',
   signature: 'Unterschrift',
+  digitally_signed_by: 'Digital unterschrieben von',
+  reason: 'Grund',
   initials: 'Initialen',
   date: 'Datum',
   number: 'Nummer',
   image: 'Bild',
+  pay: 'Bezahlen',
   file: 'Datei',
   select: 'Auswählen',
   checkbox: 'Checkbox',
@@ -207,8 +289,10 @@ const de = {
   cells: 'Zellen',
   stamp: 'Stempel',
   payment: 'Zahlung',
+  number_phone_is_invalid: '{number} Telefonnummer ist ungültig',
   phone: 'Telefon',
   submit_form: 'Formular absenden',
+  sign_now: 'Jetzt unterschreiben',
   type_here_: 'Hier eingeben...',
   optional: 'optional',
   appears_on: 'Erscheint auf',
@@ -256,10 +340,29 @@ const de = {
 }
 
 const fr = {
+  approved: 'Approuvé',
+  reviewed: 'Révisé',
+  other: 'Autre',
+  authored_by_me: 'Rédigé par moi',
+  approved_by: 'Approuvé par',
+  reviewed_by: 'Révisé par',
+  authored_by: 'Rédigé par',
+  select_a_reason: 'Sélectionnez une raison',
+  value_is_invalid: 'La valeur est invalide',
+  verification_code_is_invalid: 'Le code de vérification est invalide',
+  drawn_signature_on_a_touchscreen_device: 'Signature dessinée sur un appareil à écran tactile',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scannez le code QR avec l\'application de l\'appareil photo pour ouvrir le formulaire sur mobile et dessiner votre signature',
+  by_clicking_you_agree_to_the: 'En cliquant sur "{button}", vous acceptez la',
+  electronic_signature_disclosure: 'Divulgation de Signature Électronique',
+  esignature_disclosure: 'Divulgation de la eSignature',
   minimize: 'Réduire',
   text: 'Texte',
+  already_paid: 'Déjà payé',
   signature: 'Signature',
   initials: 'Initiales',
+  digitally_signed_by: 'Signé numériquement par',
+  reason: 'Raison',
+  pay: 'Payer',
   date: 'Date',
   number: 'Numéro',
   image: 'Image',
@@ -271,8 +374,10 @@ const fr = {
   cells: 'Cellules',
   stamp: 'Tampon',
   payment: 'Paiement',
+  number_phone_is_invalid: '{number} téléphone est invalide',
   phone: 'Téléphone',
   submit_form: 'Envoyer le Formulaire',
+  sign_now: 'Signer maintenant',
   type_here_: 'Tapez ici...',
   optional: 'facultatif',
   appears_on: 'Apparaît sur',
@@ -320,14 +425,33 @@ const fr = {
 }
 
 const pl = {
+  approved: 'Zaakceptowany',
+  reviewed: 'Przejrzany',
+  other: 'Inny',
+  authored_by_me: 'Napisane przeze mnie',
+  approved_by: 'Zaakceptowany przez',
+  reviewed_by: 'Przejrzany przez',
+  authored_by: 'Napisane przez',
+  select_a_reason: 'Wybierz powód',
+  value_is_invalid: 'Wartość jest nieprawidłowa',
+  verification_code_is_invalid: 'Kod weryfikacyjny jest nieprawidłowy',
+  drawn_signature_on_a_touchscreen_device: 'Podpis odręczny na urządzeniu z ekranem dotykowym',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Zeskanuj kod QR za pomocą aplikacji aparatu, aby otworzyć formularz na telefonie i narysować swój podpis',
+  by_clicking_you_agree_to_the: 'Klikając na "{button}", zgadzasz się na',
+  electronic_signature_disclosure: 'Ujawnienie Elektronicznej Sygnatury',
+  esignature_disclosure: 'Ujawnienie ePodpisu',
   minimize: 'Zminimalizuj',
   text: 'Tekst',
+  already_paid: 'Już zapłacono',
+  digitally_signed_by: 'Podpisano cyfrowo przez',
+  reason: 'Powód',
   signature: 'Podpis',
   initials: 'Inicjały',
   date: 'Data',
   number: 'Numer',
   image: 'Obraz',
   file: 'Plik',
+  pay: 'Zapłać',
   select: 'Wybierz',
   checkbox: 'Pole wyboru',
   multiple: 'Wielokrotne',
@@ -335,8 +459,10 @@ const pl = {
   cells: 'Komórki',
   stamp: 'Pieczątka',
   payment: 'Płatność',
+  number_phone_is_invalid: '{number} telefon jest nieprawidłowy',
   phone: 'Telefon',
   submit_form: 'Wyślij Formularz',
+  sign_now: 'Podpisz teraz',
   type_here_: 'Wpisz tutaj...',
   optional: 'opcjonalny',
   appears_on: 'Pojawia się na',
@@ -384,13 +510,32 @@ const pl = {
 }
 
 const uk = {
+  approved: 'Затверджено',
+  reviewed: 'Переглянуто',
+  other: 'Інше',
+  authored_by_me: 'Авторство моє',
+  approved_by: 'Затверджено',
+  reviewed_by: 'Переглянуто',
+  authored_by: 'Автор',
+  select_a_reason: 'Виберіть причину',
+  value_is_invalid: 'Значення є неправильним',
+  verification_code_is_invalid: 'Код підтвердження є неправильним',
+  drawn_signature_on_a_touchscreen_device: 'Підпис на сенсорному пристрої',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Скануйте QR-код за допомогою програми камери, щоб відкрити форму на мобільному пристрої та намалювати свій підпис',
+  by_clicking_you_agree_to_the: 'Натиснувши на "{button}", ви погоджуєтеся з',
+  electronic_signature_disclosure: 'Розголошення Електронного Підпису',
+  esignature_disclosure: 'Розголошення еПідпису',
   minimize: 'Зменшити',
   text: 'Текст',
+  already_paid: 'Вже оплачено',
   signature: 'Підпис',
+  digitally_signed_by: 'Підписано в електронному вигляді',
+  reason: 'Причина',
   initials: 'Ініціали',
   date: 'Дата',
   number: 'Число',
   image: 'Зображення',
+  pay: 'Оплатити',
   file: 'Файл',
   select: 'Вибрати',
   checkbox: 'Прапорець',
@@ -399,8 +544,10 @@ const uk = {
   cells: 'Клітинки',
   stamp: 'Штамп',
   payment: 'Платіж',
+  number_phone_is_invalid: '{number} телефон недійсний',
   phone: 'Телефон',
   submit_form: 'Надіслати Форму',
+  sign_now: 'Підписати зараз',
   type_here_: 'Введіть тут',
   optional: 'необов’язково',
   appears_on: "З'являється на",
@@ -448,13 +595,32 @@ const uk = {
 }
 
 const cs = {
+  approved: 'Schváleno',
+  reviewed: 'Zkontrolováno',
+  other: 'Jiné',
+  authored_by_me: 'Autorem jsem já',
+  approved_by: 'Schváleno kým',
+  reviewed_by: 'Zkontrolováno kým',
+  authored_by: 'Autorem',
+  select_a_reason: 'Vyberte důvod',
+  value_is_invalid: 'Hodnota je neplatná',
+  verification_code_is_invalid: 'Ověřovací kód je neplatný',
+  drawn_signature_on_a_touchscreen_device: 'Namalovaný podpis na dotykovém zařízení',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Naskenujte QR kód pomocí aplikace fotoaparátu, abyste otevřeli formulář na mobilním zařízení a nakreslili svůj podpis',
+  by_clicking_you_agree_to_the: 'Kliknutím na "{button}" souhlasíte s',
+  electronic_signature_disclosure: 'Zveřejněním Elektronického Podpisu',
+  esignature_disclosure: 'Zveřejnění ePodpisu',
+  already_paid: 'Už zaplaceno',
   minimize: 'Minimalizovat',
   text: 'Text',
   signature: 'Podpis',
   initials: 'Iniciály',
   date: 'Datum',
   number: 'Číslo',
+  digitally_signed_by: 'Digitálně podepsáno',
+  reason: 'Důvod',
   image: 'Obrázek',
+  pay: 'Zaplatit',
   file: 'Soubor',
   select: 'Vybrat',
   checkbox: 'Zaškrtávací políčko',
@@ -464,7 +630,9 @@ const cs = {
   stamp: 'Razítko',
   payment: 'Platba',
   phone: 'Telefon',
+  number_phone_is_invalid: '{number} telefon je neplatný',
   submit_form: 'Odeslat formulář',
+  sign_now: 'Podepsat nyní',
   type_here_: 'Zadejte zde',
   optional: 'volitelné',
   appears_on: 'Zobrazuje se na',
@@ -512,13 +680,32 @@ const cs = {
 }
 
 const pt = {
+  approved: 'Aprovado',
+  reviewed: 'Revisado',
+  other: 'Outro',
+  authored_by_me: 'Autorizado por mim',
+  approved_by: 'Aprovado por',
+  reviewed_by: 'Revisado por',
+  authored_by: 'Autorizado por',
+  select_a_reason: 'Selecione um motivo',
+  value_is_invalid: 'Valor é inválido',
+  verification_code_is_invalid: 'Código de verificação é inválido',
+  drawn_signature_on_a_touchscreen_device: 'Assinatura desenhada em um dispositivo com tela sensível ao toque',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Escaneie o código QR com o aplicativo da câmera para abrir o formulário no celular e desenhar sua assinatura',
+  by_clicking_you_agree_to_the: 'Ao clicar em "{button}", você concorda com o',
+  electronic_signature_disclosure: 'Divulgação de Assinatura Eletrônica',
+  esignature_disclosure: 'Divulgação da eAssinatura',
+  already_paid: 'Já pago',
   minimize: 'Minimizar',
   text: 'Texto',
   signature: 'Assinatura',
   initials: 'Iniciais',
+  digitally_signed_by: 'Assinado digitalmente por',
+  reason: 'Razão',
   date: 'Data',
   number: 'Número',
   image: 'Imagem',
+  pay: 'Pagar',
   file: 'Arquivo',
   select: 'Selecionar',
   checkbox: 'Caixa',
@@ -527,8 +714,10 @@ const pt = {
   cells: 'Células',
   stamp: 'Carimbo',
   payment: 'Pagamento',
+  number_phone_is_invalid: '{number} telefone é inválido',
   phone: 'Telefone',
   submit_form: 'Enviar Formulário',
+  sign_now: 'Assinar agora',
   type_here_: 'Digite aqui',
   optional: 'opcional',
   appears_on: 'Aparece em',
@@ -576,14 +765,33 @@ const pt = {
 }
 
 const he = {
+  approved: 'מאושר',
+  reviewed: 'נסקר',
+  other: 'אחר',
+  authored_by_me: 'נכתב על ידי',
+  approved_by: 'אושר על ידי',
+  reviewed_by: 'נסקר על ידי',
+  authored_by: 'נכתב על ידי',
+  select_a_reason: 'בחר סיבה',
+  value_is_invalid: 'ערך לא תקין',
+  verification_code_is_invalid: 'קוד האימות אינו תקין',
+  drawn_signature_on_a_touchscreen_device: 'חתימה שנוצרה במכשיר עם מסך מגע',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'סרוק את קוד ה-QR באמצעות אפליקציית המצלמה כדי לפתוח את הטופס במובייל ולצייר את החתימה שלך',
+  by_clicking_you_agree_to_the: 'על ידי לחיצה על "{button}", אתה מסכים ל',
+  electronic_signature_disclosure: 'חשיפת חתימה אלקטרונית',
+  esignature_disclosure: 'חשיפת ה-eחתימה',
   minimize: 'לקטן',
   text: 'טקסט',
+  already_paid: 'כבר שולם',
   signature: 'חתימה',
   initials: 'ראשי תיבות',
   date: 'תאריך',
+  digitally_signed_by: 'חתום דיגיטלית על ידי',
+  reason: 'סיבה',
   number: 'מספר',
   image: 'תמונה',
   file: 'קובץ',
+  pay: 'תשלום',
   select: 'בחר',
   checkbox: 'תיק בחירה',
   multiple: 'רב ערכים',
@@ -592,7 +800,9 @@ const he = {
   stamp: 'חותמת',
   payment: 'תשלום',
   phone: 'טלפון',
+  number_phone_is_invalid: '{number} טלפון אינו חוקי',
   submit_form: 'שלח טופס',
+  sign_now: 'חתום כעת',
   type_here_: 'הקלד כאן',
   optional: 'אופציונלי',
   option: 'אפשרות',
@@ -641,9 +851,27 @@ const he = {
 }
 
 const nl = {
+  approved: 'Goedgekeurd',
+  reviewed: 'Beoordeeld',
+  other: 'Anders',
+  authored_by_me: 'Door mij geschreven',
+  approved_by: 'Goedgekeurd door',
+  reviewed_by: 'Beoordeeld door',
+  authored_by: 'Geschreven door',
+  select_a_reason: 'Selecteer een reden',
+  value_is_invalid: 'Waarde is ongeldig',
+  verification_code_is_invalid: 'Verificatiecode is ongeldig',
+  drawn_signature_on_a_touchscreen_device: 'Getekende handtekening op een apparaat met een touchscreen',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan de QR-code met de camera-app om het formulier op mobiel te openen en uw handtekening te tekenen',
+  by_clicking_you_agree_to_the: 'Door op "{button}" te klikken, gaat u akkoord met de',
+  electronic_signature_disclosure: 'Openbaarmaking van Elektronische Handtekening',
+  esignature_disclosure: 'Openbaarmaking van eHandtekening',
   minimize: 'Minimaliseren',
   text: 'Tekst',
+  already_paid: 'Al betaald',
   signature: 'Handtekening',
+  digitally_signed_by: 'Digitaal ondertekend door',
+  reason: 'Reden',
   initials: 'Initialen',
   date: 'Datum',
   number: 'Nummer',
@@ -653,12 +881,15 @@ const nl = {
   select: 'Selecteer',
   checkbox: 'Aankruisvakje',
   multiple: 'Meerdere',
+  pay: 'Betaal',
   radio: 'Radio',
   cells: 'Cellen',
   stamp: 'Stempel',
   payment: 'Betaling',
   phone: 'Telefoon',
+  number_phone_is_invalid: '{number} telefoon is ongeldig',
   submit_form: 'Formulier verzenden',
+  sign_now: 'Nu ondertekenen',
   type_here_: 'Typ hier...',
   optional: 'Optioneel',
   option: 'Optie',
@@ -706,13 +937,31 @@ const nl = {
 }
 
 const ar = {
+  approved: 'موافق عليه',
+  reviewed: 'تمت مراجعته',
+  other: 'آخر',
+  authored_by_me: 'مؤلف بواسطتي',
+  approved_by: 'موافق عليه من قبل',
+  reviewed_by: 'مراجع من قبل',
+  authored_by: 'مؤلف من قبل',
+  select_a_reason: 'اختر سببًا',
+  value_is_invalid: 'القيمة غير صالحة',
+  verification_code_is_invalid: 'رمز التحقق غير صالح',
+  drawn_signature_on_a_touchscreen_device: 'توقيع مرسوم على جهاز بشاشة تعمل باللمس',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'امسح رمز الاستجابة السريعة باستخدام تطبيق الكاميرا لفتح النموذج على الهاتف المحمول ورسم توقيعك',
+  by_clicking_you_agree_to_the: 'بالنقر فوق "{button}"، أنت توافق على',
+  electronic_signature_disclosure: 'كشف التوقيع الإلكتروني',
+  esignature_disclosure: 'كشف التوقيع الإلكتروني',
   text: 'نص',
   signature: 'توقيع',
   initials: 'الاختصارات',
   date: 'تاريخ',
   number: 'رقم',
+  digitally_signed_by: 'تم التوقيع رقميًا بواسطة',
+  reason: 'السبب',
   image: 'صورة',
   take_photo: 'التقاط صورة',
+  pay: 'دفع',
   file: 'ملف',
   select: 'اختيار',
   checkbox: 'خانة اختيار',
@@ -723,7 +972,9 @@ const ar = {
   minimize: 'تصغير',
   payment: 'الدفع',
   phone: 'هاتف',
+  number_phone_is_invalid: '{number} هاتف غير صالح',
   submit_form: 'إرسال النموذج',
+  sign_now: 'وقع الآن',
   type_here_: 'اكتب هنا',
   optional: 'اختياري',
   option: 'خيار',
@@ -770,6 +1021,90 @@ const ar = {
   files: 'الملفات'
 }
 
-const i18n = { en, es, it, de, fr, pl, uk, cs, pt, he, nl, ar }
+const ko = {
+  approved: '승인됨',
+  reviewed: '검토됨',
+  other: '기타',
+  authored_by_me: '내가 작성한',
+  approved_by: '승인자',
+  reviewed_by: '검토자',
+  authored_by: '작성자',
+  select_a_reason: '이유 선택',
+  drawn_signature_on_a_touchscreen_device: '터치스크린 장치에서 그린 서명',
+  scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: '카메라 앱으로 QR 코드를 스캔하여 모바일에서 양식을 열고 서명을 그리세요',
+  by_clicking_you_agree_to_the: '"{button}"를 클릭함으로써, 다음에 동의하게 됩니다',
+  electronic_signature_disclosure: '전자 서명 공개',
+  esignature_disclosure: '전자 서명 공개',
+  already_paid: '이미 지불됨',
+  text: '텍스트',
+  signature: '서명',
+  initials: '이니셜',
+  date: '날짜',
+  digitally_signed_by: '디지털 서명이 완료되었습니다',
+  reason: '이유',
+  number: '숫자',
+  pay: '급여',
+  image: '이미지',
+  take_photo: '사진 찍기',
+  file: '파일',
+  select: '선택',
+  checkbox: '체크박스',
+  multiple: '다중',
+  radio: '라디오',
+  cells: '셀',
+  stamp: '스탬프',
+  minimize: '최소화',
+  payment: '결제',
+  phone: '전화',
+  number_phone_is_invalid: '{number} 전화번호가 유효하지 않습니다',
+  submit_form: '양식 제출',
+  sign_now: '지금 서명',
+  type_here_: '여기에 입력...',
+  optional: '선택 사항',
+  option: '옵션',
+  appears_on: '다음에 나타납니다',
+  page: '페이지',
+  select_your_option: '옵션 선택',
+  complete_hightlighted_checkboxes_and_click: '강조된 체크박스를 완료하고 클릭',
+  submit: '제출',
+  next: '다음',
+  click_to_upload: '업로드하려면 클릭',
+  or_drag_and_drop_files: '또는 파일을 드래그하여 놓으십시오',
+  send_copy_via_email: '이메일로 사본 보내기',
+  download: '다운로드',
+  clear: '지우기',
+  redraw: '다시 그리기',
+  draw_initials: '이니셜 그리기',
+  type_signature_here: '여기에 서명 입력',
+  type_initial_here: '여기에 이니셜 입력',
+  form_has_been_completed: '양식이 완료되었습니다!',
+  create_a_free_account: '무료 계정 생성',
+  signed_with: '다음으로 서명:',
+  please_check_the_box_to_continue: '계속하려면 확인란을 선택하십시오',
+  open_source_documents_software: '오픈 소스 문서 소프트웨어',
+  verified_phone_number: '전화번호 확인됨',
+  use_international_format: '국제 포맷 사용: +1xxx',
+  six_digits_code: '6자리 코드',
+  change_phone_number: '전화번호 변경',
+  sending: '전송 중...',
+  resend_code: '코드 다시 보내기',
+  verification_code_has_been_resent: '인증 코드가 SMS로 다시 전송되었습니다',
+  please_fill_all_required_fields: '필수 필드를 모두 입력하십시오',
+  set_today: '오늘 날짜로 설정',
+  toggle_multiline_text: '다중 텍스트 전환',
+  draw_signature: '서명 그리기',
+  type_initial: '이니셜 입력',
+  draw: '그리기',
+  type: '입력',
+  type_text: '텍스트 입력',
+  email_has_been_sent: '이메일이 전송되었습니다',
+  processing: '처리 중',
+  pay_with_strip: '스트라이프로 결제',
+  reupload: '다시 업로드',
+  upload: '업로드',
+  files: '파일'
+}
+
+const i18n = { en, es, it, de, fr, pl, uk, cs, pt, he, nl, ar, ko }
 
 export default i18n

app/javascript/submission_form/image_step.vue

@@ -24,13 +24,21 @@
       :name="`values[${field.uuid}]`"
     >
   </div>
-  <div>
+  <div
+    v-if="!modelValue"
+  >
+    <div
+      v-if="field.description"
+      dir="auto"
+      class="mb-3 px-1"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <FileDropzone
-      v-if="!modelValue"
       :message="`${t('upload')} ${field.name || t('image')}${field.required ? '' : ` (${t('optional')})`}`"
       :submitter-slug="submitterSlug"
+      :dry-run="dryRun"
       :accept="'image/*'"
-      :is-direct-upload="isDirectUpload"
       @upload="onImageUpload"
     />
   </div>
@@ -39,12 +47,14 @@
 <script>
 import FileDropzone from './dropzone'
 import { IconReload } from '@tabler/icons-vue'
+import MarkdownContent from './markdown_content'
 
 export default {
   name: 'ImageStep',
   components: {
     FileDropzone,
-    IconReload
+    IconReload,
+    MarkdownContent
   },
   inject: ['t'],
   props: {
@@ -52,16 +62,16 @@ export default {
       type: Object,
       required: true
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     showFieldNames: {
       type: Boolean,
       required: false,
       default: true
     },
+    dryRun: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     submitterSlug: {
       type: String,
       required: true

app/javascript/submission_form/initials_step.vue

@@ -1,9 +1,20 @@
 <template>
   <div dir="auto">
-    <div class="flex justify-between items-center w-full mb-2">
+    <div
+      class="flex justify-between items-center w-full"
+      :class="{ 'mb-2': !field.description }"
+    >
       <label
         class="label text-2xl"
-      >{{ showFieldNames && field.name ? field.name : t('initials') }}</label>
+      >
+        <MarkdownContent
+          v-if="field.title"
+          :string="field.title"
+        />
+        <template v-else>
+          {{ showFieldNames && field.name ? field.name : t('initials') }}
+        </template>
+      </label>
       <div class="space-x-2 flex">
         <span
           v-if="isDrawInitials"
@@ -39,6 +50,26 @@
             </span>
           </a>
         </span>
+        <span
+          class="tooltip"
+          :data-tip="t('click_to_upload')"
+        >
+          <label
+            class="btn btn-outline btn-sm font-medium inline-flex flex-nowrap"
+          >
+            <IconUpload :width="16" />
+            <input
+              :key="uploadImageInputKey"
+              type="file"
+              hidden
+              accept="image/*"
+              @change="drawImage"
+            >
+            <span class="hidden sm:inline">
+              {{ t('upload') }}
+            </span>
+          </label>
+        </span>
         <a
           v-if="modelValue || computedPreviousValue"
           href="#"
@@ -70,6 +101,13 @@
         </a>
       </div>
     </div>
+    <div
+      v-if="field.description"
+      dir="auto"
+      class="mb-3 px-1"
+    >
+      <MarkdownContent :string="field.description" />
+    </div>
     <AppearsOn :field="field" />
     <input
       :value="modelValue || computedPreviousValue"
@@ -79,7 +117,7 @@
     <img
       v-if="modelValue || computedPreviousValue"
       :src="attachmentsIndex[modelValue || computedPreviousValue].url"
-      class="mx-auto bg-white border border-base-300 rounded max-h-72"
+      class="mx-auto bg-white border border-base-300 rounded max-h-44"
     >
     <canvas
       v-show="!modelValue && !computedPreviousValue"
@@ -102,19 +140,23 @@
 
 <script>
 import { cropCanvasAndExportToPNG } from './crop_canvas'
-import { IconReload, IconTextSize, IconSignature, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
+import { IconReload, IconTextSize, IconUpload, IconSignature, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
 import SignaturePad from 'signature_pad'
 import AppearsOn from './appears_on'
+import MarkdownContent from './markdown_content'
+import SignatureStep from './signature_step'
 
 const scale = 3
 
 export default {
   name: 'InitialsStep',
   components: {
+    IconUpload,
     AppearsOn,
     IconReload,
     IconTextSize,
     IconSignature,
+    MarkdownContent,
     IconArrowsDiagonalMinimize2
   },
   inject: ['baseUrl', 't'],
@@ -123,6 +165,11 @@ export default {
       type: Object,
       required: true
     },
+    dryRun: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     submitterSlug: {
       type: String,
       required: true
@@ -132,11 +179,6 @@ export default {
       required: false,
       default: true
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     attachmentsIndex: {
       type: Object,
       required: false,
@@ -158,7 +200,8 @@ export default {
     return {
       isInitialsStarted: !!this.previousValue,
       isUsePreviousValue: true,
-      isDrawInitials: false
+      isDrawInitials: false,
+      uploadImageInputKey: Math.random().toString()
     }
   },
   computed: {
@@ -174,18 +217,12 @@ export default {
     this.$nextTick(() => {
       if (this.$refs.canvas) {
         this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth * scale
-        this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 3) * scale
+        this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 4.5) * scale
 
         this.$refs.canvas.getContext('2d').scale(scale, scale)
       }
-
-      this.$refs.textInput?.focus()
     })
 
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-
     if (this.$refs.canvas) {
       this.pad = new SignaturePad(this.$refs.canvas)
 
@@ -199,7 +236,7 @@ export default {
         entries.forEach(entry => {
           if (entry.isIntersecting) {
             this.$refs.canvas.width = this.$refs.canvas.parentNode.clientWidth * scale
-            this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 3) * scale
+            this.$refs.canvas.height = (this.$refs.canvas.parentNode.clientWidth / 4.5) * scale
 
             this.$refs.canvas.getContext('2d').scale(scale, scale)
 
@@ -215,6 +252,15 @@ export default {
     this.intersectionObserver?.disconnect()
   },
   methods: {
+    drawOnCanvas: SignatureStep.methods.drawOnCanvas,
+    drawImage (event) {
+      this.remove()
+      this.isInitialsStarted = true
+
+      this.drawOnCanvas(event.target.files[0], this.$refs.canvas)
+
+      this.uploadImageInputKey = Math.random().toString()
+    },
     remove () {
       this.$emit('update:model-value', '')
 
@@ -237,13 +283,28 @@ export default {
       const context = canvas.getContext('2d')
 
       const fontFamily = 'Arial'
-      const fontSize = '44px'
+      const initialFontSize = 50
       const fontStyle = 'italic'
       const fontWeight = ''
 
-      context.font = fontStyle + ' ' + fontWeight + ' ' + fontSize + ' ' + fontFamily
+      const setFontSize = (size) => {
-      context.textAlign = 'center'
+        context.font = `${fontStyle} ${fontWeight} ${size}px ${fontFamily}`
+      }
 
+      const adjustFontSizeToFit = (text, maxWidth, initialSize) => {
+        let size = initialSize
+
+        setFontSize(size)
+
+        while (context.measureText(text).width > maxWidth && size > 1) {
+          size -= 1
+          setFontSize(size)
+        }
+      }
+
+      adjustFontSizeToFit(e.target.value, canvas.width / scale, initialFontSize)
+
+      context.textAlign = 'center'
       context.clearRect(0, 0, canvas.width / scale, canvas.height / scale)
       context.fillText(e.target.value, canvas.width / 2 / scale, canvas.height / 2 / scale + 11)
     },
@@ -273,28 +334,19 @@ export default {
         cropCanvasAndExportToPNG(this.$refs.canvas).then(async (blob) => {
           const file = new File([blob], 'initials.png', { type: 'image/png' })
 
-          if (this.isDirectUpload) {
+          if (this.dryRun) {
-            const { DirectUpload } = await import('@rails/activestorage')
+            const reader = new FileReader()
 
-            new DirectUpload(
+            reader.readAsDataURL(file)
-              file,
-              '/direct_uploads'
-            ).create((_error, data) => {
-              fetch(this.baseUrl + '/api/attachments', {
-                method: 'POST',
-                body: JSON.stringify({
-                  submitter_slug: this.submitterSlug,
-                  blob_signed_id: data.signed_id,
-                  name: 'attachments'
-                }),
-                headers: { 'Content-Type': 'application/json' }
-              }).then((resp) => resp.json()).then((attachment) => {
-                this.$emit('update:model-value', attachment.uuid)
-                this.$emit('attached', attachment)
 
-                return resolve(attachment)
+            reader.onloadend = () => {
-              })
+              const attachment = { url: reader.result, uuid: Math.random().toString() }
-            })
+
+              this.$emit('attached', attachment)
+              this.$emit('update:model-value', attachment.uuid)
+
+              resolve(attachment)
+            }
           } else {
             const formData = new FormData()
 

app/javascript/submission_form/markdown_content.vue

@@ -0,0 +1,85 @@
+<template>
+  <span>
+    <template
+      v-for="(item, index) in items"
+      :key="index"
+    >
+      <a
+        v-if="item.startsWith('<a') && item.endsWith('</a>')"
+        :href="sanitizeHref(extractAttr(item, 'href'))"
+        rel="noopener noreferrer nofollow"
+        :class="extractAttr(item, 'class') || 'link'"
+        target="_blank"
+      >
+        {{ extractText(item) }}
+      </a>
+      <b
+        v-else-if="item.startsWith('<b>') || item.startsWith('<strong>')"
+      >
+        {{ extractText(item) }}
+      </b>
+      <i
+        v-else-if="item.startsWith('<i>') || item.startsWith('<em>')"
+      >
+        {{ extractText(item) }}
+      </i>
+      <br
+        v-else-if="item === '<br>' || item === '\n'"
+      >
+      <template
+        v-else
+      >
+        {{ item }}
+      </template>
+    </template>
+  </span>
+</template>
+
+<script>
+import snarkdown from 'snarkdown'
+
+const htmlSplitRegexp = /(<a.+?<\/a>|<i>.+?<\/i>|<b>.+?<\/b>|<em>.+?<\/em>|<strong>.+?<\/strong>|<br>)/
+
+export default {
+  name: 'MarkdownContent',
+  props: {
+    string: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  computed: {
+    items () {
+      const linkParts = this.string.split(/(https?:\/\/[^\s)]+)/g)
+
+      const text = linkParts.map((part, index) => {
+        if (part.match(/^https?:\/\//) && !linkParts[index - 1]?.match(/\(\s*$/) && !linkParts[index + 1]?.match(/^\s*\)/)) {
+          return `[${part}](${part})`
+        } else {
+          return part
+        }
+      }).join('')
+
+      return snarkdown(text.replace(/\n/g, '<br>')).split(htmlSplitRegexp)
+    }
+  },
+  methods: {
+    sanitizeHref (href) {
+      if (href && href.trim().match(/^((?:https?:\/\/)|\/)/)) {
+        return href.replace(/javascript:/g, '')
+      }
+    },
+    extractAttr (text, attr) {
+      if (text.includes(attr)) {
+        return text.split(attr).pop().split('"')[1]
+      }
+    },
+    extractText (text) {
+      if (text) {
+        return text.match(/>(.+?)</)?.[1]
+      }
+    }
+  }
+}
+</script>

app/javascript/submission_form/multi_select_step.vue

@@ -1,10 +1,23 @@
 <template>
   <label
-    v-if="showFieldNames && field.name"
+    v-if="showFieldNames && (field.name || field.title)"
     :for="field.uuid"
     dir="auto"
-    class="label text-2xl mb-2"
+    class="label text-2xl"
-  >{{ field.name }}</label>
+    :class="{ 'mb-2': !field.description }"
+  ><MarkdownContent
+     v-if="field.title"
+     :string="field.title"
+   />
+    <template v-else>{{ field.name }}</template>
+  </label>
+  <div
+    v-if="field.description"
+    dir="auto"
+    class="mb-3 px-1"
+  >
+    <MarkdownContent :string="field.description" />
+  </div>
   <div class="flex w-full max-h-44 overflow-y-auto">
     <input
       v-if="modelValue.length === 0"
@@ -32,6 +45,7 @@
         <label
           :for="option.uuid"
           class="flex items-center space-x-3"
+          @click="scrollIntoField(field)"
         >
           <input
             :id="option.uuid"
@@ -53,8 +67,13 @@
 </template>
 
 <script>
+import MarkdownContent from './markdown_content'
+
 export default {
   name: 'MultiSelectStep',
+  components: {
+    MarkdownContent
+  },
   inject: ['t', 'scrollIntoField'],
   props: {
     field: {