remove direct upload

app/javascript/application.js

@@ -100,8 +100,7 @@ window.customElements.define('template-builder', class extends HTMLElement {
       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)

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/form.js

@@ -11,7 +11,6 @@ window.customElements.define('submission-form', class extends HTMLElement {
     this.app = createApp(Form, {
       submitter: JSON.parse(this.dataset.submitter),
       canSendEmail: this.dataset.canSendEmail === 'true',
-      isDirectUpload: this.dataset.isDirectUpload === 'true',
       goToLast: this.dataset.goToLast === 'true',
       isDemo: this.dataset.isDemo === 'true',
       attribution: this.dataset.attribution !== 'false',

app/javascript/submission_form/attachment_step.vue

@@ -51,7 +51,6 @@
     <FileDropzone
       :message="`${t('upload')} ${field.name || t('files')}${field.required ? '' : ` (${t('optional')})`}`"
       :submitter-slug="submitterSlug"
-      :is-direct-upload="isDirectUpload"
       :multiple="true"
       @upload="onUpload"
     />
@@ -86,11 +85,6 @@ export default {
       required: false,
       default: () => ({})
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     modelValue: {
       type: Array,
       required: false,

app/javascript/submission_form/dropzone.vue

@@ -70,11 +70,6 @@ export default {
       required: false,
       default: '*/*'
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     multiple: {
       type: Boolean,
       required: false,
@@ -92,11 +87,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,72 +103,25 @@ 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((file) => {
+          const formData = new FormData()
 
-        const blobs = await Promise.all(
+          formData.append('file', file)
-          Array.from(files).map(async (file) => {
+          formData.append('submitter_slug', this.submitterSlug)
-            const upload = new DirectUpload(
+          formData.append('name', 'attachments')
-              file,
-              '/direct_uploads',
-              this.$refs.input
-            )
 
-            return new Promise((resolve, reject) => {
+          return fetch(this.baseUrl + '/api/attachments', {
-              upload.create((error, blob) => {
+            method: 'POST',
-                if (error) {
+            body: formData
-                  console.error(error)
+          }).then(resp => resp.json()).then((data) => {
-
+            return data
-                  return reject(error)
-                } else {
-                  return resolve(blob)
-                }
-              })
-            }).catch((error) => {
-              console.error(error)
-            })
           })
-        )
+        })).then((result) => {
-
+        this.$emit('upload', result)
-        return await Promise.all(
+      }).finally(() => {
-          blobs.map((blob) => {
+        this.isLoading = false
-            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)
-            formData.append('name', 'attachments')
-
-            return fetch(this.baseUrl + '/api/attachments', {
-              method: 'POST',
-              body: formData
-            }).then(resp => resp.json()).then((data) => {
-              return data
-            })
-          })).then((result) => {
-          this.$emit('upload', result)
-        }).finally(() => {
-          this.isLoading = false
-        })
-      }
     }
   }
 }

app/javascript/submission_form/form.vue

@@ -306,7 +306,6 @@
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
             :field="currentField"
-            :is-direct-upload="isDirectUpload"
             :attachments-index="attachmentsIndex"
             :submitter-slug="submitterSlug"
             :show-field-names="showFieldNames"
@@ -319,7 +318,6 @@
             v-model="values[currentField.uuid]"
             :field="currentField"
             :previous-value="previousSignatureValueFor(currentField)"
-            :is-direct-upload="isDirectUpload"
             :with-typed-signature="withTypedSignature"
             :attachments-index="attachmentsIndex"
             :submitter-slug="submitterSlug"
@@ -335,7 +333,6 @@
             v-model="values[currentField.uuid]"
             :field="currentField"
             :previous-value="previousInitialsValue"
-            :is-direct-upload="isDirectUpload"
             :attachments-index="attachmentsIndex"
             :show-field-names="showFieldNames"
             :submitter-slug="submitterSlug"
@@ -348,7 +345,6 @@
             v-else-if="currentField.type === 'file'"
             :key="currentField.uuid"
             v-model="values[currentField.uuid]"
-            :is-direct-upload="isDirectUpload"
             :field="currentField"
             :attachments-index="attachmentsIndex"
             :submitter-slug="submitterSlug"
@@ -578,11 +574,6 @@ export default {
       required: false,
       default: ''
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
     allowToSkip: {
       type: Boolean,
       required: false,

app/javascript/submission_form/image_step.vue

@@ -38,7 +38,6 @@
       :message="`${t('upload')} ${field.name || t('image')}${field.required ? '' : ` (${t('optional')})`}`"
       :submitter-slug="submitterSlug"
       :accept="'image/*'"
-      :is-direct-upload="isDirectUpload"
       @upload="onImageUpload"
     />
   </div>
@@ -62,11 +61,6 @@ export default {
       type: Object,
       required: true
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     showFieldNames: {
       type: Boolean,
       required: false,

app/javascript/submission_form/initials_step.vue

@@ -152,11 +152,6 @@ export default {
       required: false,
       default: true
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     attachmentsIndex: {
       type: Object,
       required: false,
@@ -202,10 +197,6 @@ export default {
       this.$refs.textInput?.focus()
     })
 
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-
     if (this.$refs.canvas) {
       this.pad = new SignaturePad(this.$refs.canvas)
 
@@ -293,45 +284,21 @@ export default {
         cropCanvasAndExportToPNG(this.$refs.canvas).then(async (blob) => {
           const file = new File([blob], 'initials.png', { type: 'image/png' })
 
-          if (this.isDirectUpload) {
+          const formData = new FormData()
-            const { DirectUpload } = await import('@rails/activestorage')
 
-            new DirectUpload(
+          formData.append('file', file)
-              file,
+          formData.append('submitter_slug', this.submitterSlug)
-              '/direct_uploads'
+          formData.append('name', 'attachments')
-            ).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)
+          return fetch(this.baseUrl + '/api/attachments', {
-              })
+            method: 'POST',
-            })
+            body: formData
-          } else {
+          }).then((resp) => resp.json()).then((attachment) => {
-            const formData = new FormData()
+            this.$emit('attached', attachment)
+            this.$emit('update:model-value', attachment.uuid)
 
-            formData.append('file', file)
+            return resolve(attachment)
-            formData.append('submitter_slug', this.submitterSlug)
+          })
-            formData.append('name', 'attachments')
-
-            return fetch(this.baseUrl + '/api/attachments', {
-              method: 'POST',
-              body: formData
-            }).then((resp) => resp.json()).then((attachment) => {
-              this.$emit('attached', attachment)
-              this.$emit('update:model-value', attachment.uuid)
-
-              return resolve(attachment)
-            })
-          }
         })
       })
     }

app/javascript/submission_form/signature_step.vue

@@ -176,11 +176,6 @@ export default {
       required: false,
       default: true
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     withTypedSignature: {
       type: Boolean,
       required: false,
@@ -230,10 +225,6 @@ export default {
       }
     })
 
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-
     if (this.$refs.canvas) {
       this.pad = new SignaturePad(this.$refs.canvas)
 
@@ -390,45 +381,21 @@ export default {
         cropCanvasAndExportToPNG(this.$refs.canvas, { errorOnTooSmall: true }).then(async (blob) => {
           const file = new File([blob], 'signature.png', { type: 'image/png' })
 
-          if (this.isDirectUpload) {
+          const formData = new FormData()
-            const { DirectUpload } = await import('@rails/activestorage')
 
-            new DirectUpload(
+          formData.append('file', file)
-              file,
+          formData.append('submitter_slug', this.submitterSlug)
-              '/direct_uploads'
+          formData.append('name', 'attachments')
-            ).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)
+          return fetch(this.baseUrl + '/api/attachments', {
-              })
+            method: 'POST',
-            })
+            body: formData
-          } else {
+          }).then((resp) => resp.json()).then((attachment) => {
-            const formData = new FormData()
+            this.$emit('attached', attachment)
+            this.$emit('update:model-value', attachment.uuid)
 
-            formData.append('file', file)
+            return resolve(attachment)
-            formData.append('submitter_slug', this.submitterSlug)
+          })
-            formData.append('name', 'attachments')
-
-            return fetch(this.baseUrl + '/api/attachments', {
-              method: 'POST',
-              body: formData
-            }).then((resp) => resp.json()).then((attachment) => {
-              this.$emit('attached', attachment)
-              this.$emit('update:model-value', attachment.uuid)
-
-              return resolve(attachment)
-            })
-          }
         }).catch((error) => {
           return reject(error)
         })

app/javascript/template_builder/builder.vue

@@ -115,7 +115,6 @@
           :with-replace-button="withUploadButton"
           :editable="editable"
           :template="template"
-          :is-direct-upload="isDirectUpload"
           @scroll-to="scrollIntoDocument(item)"
           @remove="onDocumentRemove"
           @replace="onDocumentReplace"
@@ -131,7 +130,6 @@
             v-if="sortedDocuments.length && editable && withUploadButton"
             :accept-file-types="acceptFileTypes"
             :template-id="template.id"
-            :is-direct-upload="isDirectUpload"
             @success="updateFromUpload"
           />
         </div>
@@ -148,7 +146,6 @@
             v-if="!sortedDocuments.length && withUploadButton"
             :template-id="template.id"
             :accept-file-types="acceptFileTypes"
-            :is-direct-upload="isDirectUpload"
             @success="updateFromUpload"
           />
           <template v-else>
@@ -180,7 +177,6 @@
                 :with-replace-button="withUploadButton"
                 :document="document"
                 :template="template"
-                :is-direct-upload="isDirectUpload"
                 class="pb-2 mb-2 border-b border-base-300 border-dashed"
                 @remove="onDocumentRemove"
                 @replace="onDocumentReplace"
@@ -196,7 +192,6 @@
               <Upload
                 v-if="withUploadButton"
                 :template-id="template.id"
-                :is-direct-upload="isDirectUpload"
                 :accept-file-types="acceptFileTypes"
                 @success="updateFromUpload"
               />
@@ -345,11 +340,6 @@ export default {
       type: Object,
       required: true
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
     i18n: {
       type: Object,
       required: false,

app/javascript/template_builder/controls.vue

@@ -8,7 +8,6 @@
     />
     <ReplaceButton
       v-if="withReplaceButton"
-      :is-direct-upload="isDirectUpload"
       :template-id="template.id"
       @click.stop
       @success="$emit('replace', { replaceSchemaItem: item, ...$event })"
@@ -63,11 +62,6 @@ export default {
       type: Object,
       required: true
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     withReplaceButton: {
       type: Boolean,
       required: true,
@@ -80,11 +74,6 @@ export default {
     }
   },
   emits: ['change', 'remove', 'up', 'down', 'replace'],
-  mounted () {
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-  },
   methods: {
     upload: Upload.methods.upload,
     onUpdateName (value) {

app/javascript/template_builder/dropzone.vue

@@ -71,11 +71,6 @@ export default {
       type: String,
       required: false,
       default: 'image/*, application/pdf'
-    },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
     }
   },
   emits: ['success'],
@@ -101,11 +96,6 @@ export default {
       }
     }
   },
-  mounted () {
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-  },
   methods: {
     upload: Upload.methods.upload,
     onDropFiles (e) {

app/javascript/template_builder/preview.vue

@@ -20,7 +20,6 @@
           <div class="">
             <ReplaceButton
               v-if="withReplaceButton"
-              :is-direct-upload="isDirectUpload"
               :template-id="template.id"
               :accept-file-types="acceptFileTypes"
               class="opacity-0 group-hover:opacity-100"
@@ -115,11 +114,6 @@ export default {
       required: true,
       default: true
     },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
-    },
     withArrows: {
       type: Boolean,
       required: false,
@@ -132,11 +126,6 @@ export default {
       return [...this.document.preview_images].sort((a, b) => parseInt(a.filename) - parseInt(b.filename))[0]
     }
   },
-  mounted () {
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-  },
   methods: {
     upload: Upload.methods.upload,
     onUpdateName (value) {

app/javascript/template_builder/replace.vue

@@ -36,11 +36,6 @@ export default {
       type: String,
       required: false,
       default: 'image/*, application/pdf'
-    },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
     }
   },
   emits: ['success'],
@@ -64,11 +59,6 @@ export default {
       }
     }
   },
-  mounted () {
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-  },
   methods: {
     upload: Upload.methods.upload
   }

app/javascript/template_builder/upload.vue

@@ -60,11 +60,6 @@ export default {
       type: String,
       required: false,
       default: 'image/*, application/pdf'
-    },
-    isDirectUpload: {
-      type: Boolean,
-      required: true,
-      default: false
     }
   },
   emits: ['success'],
@@ -79,112 +74,43 @@ export default {
       return 'el' + Math.random().toString(32).split('.')[1]
     }
   },
-  mounted () {
-    if (this.isDirectUpload) {
-      import('@rails/activestorage')
-    }
-  },
   methods: {
     async upload () {
       this.isLoading = true
 
-      if (this.isDirectUpload) {
+      this.baseFetch(`/templates/${this.templateId}/documents`, {
-        const { DirectUpload } = await import('@rails/activestorage')
+        method: 'POST',
+        body: new FormData(this.$refs.form)
+      }).then((resp) => {
+        if (resp.ok) {
+          resp.json().then((data) => {
+            this.$emit('success', data)
+            this.$refs.input.value = ''
+          })
+        } else if (resp.status === 422) {
+          resp.json().then((data) => {
+            if (data.error === 'PDF encrypted') {
+              const formData = new FormData(this.$refs.form)
 
-        const blobs = await Promise.all(
+              formData.append('password', prompt('Enter PDF password'))
-          Array.from(this.$refs.input.files).map(async (file) => {
-            const upload = new DirectUpload(
-              file,
-              '/direct_uploads',
-              this.$refs.input
-            )
 
-            return new Promise((resolve, reject) => {
+              this.baseFetch(`/templates/${this.templateId}/documents`, {
-              upload.create((error, blob) => {
+                method: 'POST',
-                if (error) {
+                body: formData
-                  console.error(error)
+              }).then(async (resp) => {
-
+                if (resp.ok) {
-                  return reject(error)
+                  this.$emit('success', await resp.json())
+                  this.$refs.input.value = ''
                 } else {
-                  return resolve(blob)
+                  alert('Wrong password')
                 }
               })
-            }).catch((error) => {
+            }
-              console.error(error)
-            })
           })
-        ).finally(() => {
+        }
-          this.isLoading = false
+      }).finally(() => {
-        })
+        this.isLoading = false
-
+      })
-        this.isProcessing = true
-
-        this.baseFetch(`/templates/${this.templateId}/documents`, {
-          method: 'POST',
-          body: JSON.stringify({ blobs }),
-          headers: { 'Content-Type': 'application/json' }
-        }).then((resp) => {
-          if (resp.ok) {
-            resp.json().then((data) => {
-              this.$emit('success', data)
-              this.$refs.input.value = ''
-            })
-          } else if (resp.status === 422) {
-            resp.json().then((data) => {
-              if (data.error === 'PDF encrypted') {
-                this.baseFetch(`/templates/${this.templateId}/documents`, {
-                  method: 'POST',
-                  body: JSON.stringify({ blobs, password: prompt('Enter PDF password') }),
-                  headers: { 'Content-Type': 'application/json' }
-                }).then(async (resp) => {
-                  if (resp.ok) {
-                    this.$emit('success', await resp.json())
-                    this.$refs.input.value = ''
-                  } else {
-                    alert('Wrong password')
-                  }
-                })
-              }
-            })
-          }
-        }).finally(() => {
-          this.isProcessing = false
-        })
-      } else {
-        this.baseFetch(`/templates/${this.templateId}/documents`, {
-          method: 'POST',
-          body: new FormData(this.$refs.form)
-        }).then((resp) => {
-          if (resp.ok) {
-            resp.json().then((data) => {
-              this.$emit('success', data)
-              this.$refs.input.value = ''
-            })
-          } else if (resp.status === 422) {
-            resp.json().then((data) => {
-              if (data.error === 'PDF encrypted') {
-                const formData = new FormData(this.$refs.form)
-
-                formData.append('password', prompt('Enter PDF password'))
-
-                this.baseFetch(`/templates/${this.templateId}/documents`, {
-                  method: 'POST',
-                  body: formData
-                }).then(async (resp) => {
-                  if (resp.ok) {
-                    this.$emit('success', await resp.json())
-                    this.$refs.input.value = ''
-                  } else {
-                    alert('Wrong password')
-                  }
-                })
-              }
-            })
-          }
-        }).finally(() => {
-          this.isLoading = false
-        })
-      }
     }
   }
 }

app/views/esign_settings/show.html.erb

@@ -15,7 +15,7 @@
             Analyzing...
           </div>
         <% end %>
-        <file-dropzone data-is-direct-upload="false" data-name="verify_attachments" data-submit-on-upload="true" class="w-full">
+        <file-dropzone data-name="verify_attachments" data-submit-on-upload="true" class="w-full">
           <label for="file" class="w-full block h-32 relative bg-base-200 hover:bg-base-200/70 rounded-md border border-base-content border-dashed">
             <div class="absolute top-0 right-0 left-0 bottom-0 flex items-center justify-center">
               <div class="flex flex-col items-center">

app/views/submit_form/_submission_form.html.erb

@@ -1,4 +1,4 @@
 <% data_attachments = attachments_index.values.select { |e| e.record_id == submitter.id }.to_json(only: %i[uuid], methods: %i[url filename content_type]) %>
 <% data_fields = (submitter.submission.template_fields || submitter.submission.template.fields).select { |f| f['submitter_uuid'] == submitter.uuid }.to_json %>
 <% configs = Submitters::FormConfigs.call(submitter) %>
-<submission-form data-is-demo="<%= Docuseal.demo? %>" data-with-confetti="<%= configs[:with_confetti] %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'] %>" data-completed-message="<%= configs[:completed_message].to_json %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.opened_at? %>" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.account_id)) %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>"></submission-form>
+<submission-form data-is-demo="<%= Docuseal.demo? %>" data-with-confetti="<%= configs[:with_confetti] %>" data-completed-redirect-url="<%= submitter.preferences['completed_redirect_url'] %>" data-completed-message="<%= configs[:completed_message].to_json %>" data-completed-button="<%= configs[:completed_button].to_json %>" data-go-to-last="<%= submitter.opened_at? %>" data-submitter="<%= submitter.to_json(only: %i[uuid slug name phone email]) %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.account_id)) %>" data-attachments="<%= data_attachments %>" data-fields="<%= data_fields %>" data-values="<%= submitter.values.to_json %>" data-with-typed-signature="<%= configs[:with_typed_signature] %>"></submission-form>

app/views/templates/edit.html.erb

@@ -1 +1 @@
-<template-builder class="grid" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-template="<%= @template_data %>"></template-builder>
+<template-builder class="grid" data-template="<%= @template_data %>"></template-builder>

app/views/templates_preview/show.html.erb

@@ -1 +1 @@
-<template-builder class="grid" data-editable="false" data-is-direct-upload="<%= Docuseal.active_storage_public? %>" data-template="<%= @template_data %>"></template-builder>
+<template-builder class="grid" data-editable="false" data-template="<%= @template_data %>"></template-builder>

app/views/user_signatures/edit.html.erb

@@ -26,7 +26,7 @@
   </div>
   <div id="upload" class="hidden mt-3">
     <%= form_for @user_config, url: user_signature_path, method: :put, data: { turbo_frame: :_top }, html: { autocomplete: :off, enctype: 'multipart/form-data' } do |f| %>
-      <file-dropzone data-is-direct-upload="false" data-submit-on-upload="true" class="w-full">
+      <file-dropzone data-submit-on-upload="true" class="w-full">
         <label for="file" class="w-full block h-32 relative bg-base-200 hover:bg-base-200/70 rounded-md border border-base-content border-dashed">
           <div class="absolute top-0 right-0 left-0 bottom-0 flex items-center justify-center">
             <div class="flex flex-col items-center">

lib/templates/create_attachments.rb

@@ -43,11 +43,7 @@ module Templates
     end
 
     def find_or_create_blobs(params)
-      blobs = params[:blobs]&.map do |attrs|
+      params[:files].map do |file|
-        ActiveStorage::Blob.find_signed(attrs[:signed_id])
-      end
-
-      blobs || params[:files].map do |file|
         data = file.read
 
         if file.content_type == PDF_CONTENT_TYPE

package.json

@@ -9,7 +9,6 @@
     "@github/catalyst": "^2.0.0-beta",
     "@hotwired/turbo": "https://github.com/docusealco/turbo#main",
     "@hotwired/turbo-rails": "^7.3.0",
-    "@rails/activestorage": "^7.0.0",
     "@tabler/icons-vue": "^2.47.0",
     "autocompleter": "^9.1.0",
     "autoprefixer": "^10.4.14",

yarn.lock

@@ -1125,13 +1125,6 @@
   resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41"
   integrity sha512-tz4oM+Zn9CYsvtyicsa/AwzKZKL+ITHWkhiu7x+xF77clh2b4Rm+s6xnOgY/sGDWoFWZmtKsE95hxBPkgQQNnQ==
 
-"@rails/activestorage@^7.0.0":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.0.5.tgz#0e8fe255a422e5cb9f4e673e02fca845f32a50c1"
-  integrity sha512-lTOlsVsjz1OYDFRD2SKNH9j2TOA/LTrrIPgRSKyyD3CvJnD1bc65PQt/z6qB1hGqYmtUiklns+SjVWb9xYEqaA==
-  dependencies:
-    spark-md5 "^3.0.1"
-
 "@sinclair/typebox@^0.25.16":
   version "0.25.24"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
@@ -4982,11 +4975,6 @@ source-map@^0.6.0, source-map@^0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-spark-md5@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
-  integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
-
 spdy-transport@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"