diff --git a/app/controllers/template_documents_controller.rb b/app/controllers/template_documents_controller.rb index cfca1297..b29a18f6 100644 --- a/app/controllers/template_documents_controller.rb +++ b/app/controllers/template_documents_controller.rb @@ -3,6 +3,12 @@ class TemplateDocumentsController < ApplicationController load_and_authorize_resource :template + FILES_TTL = 5.minutes + + def index + render json: @template.schema_documents.map { |d| ActiveStorage::Blob.proxy_url(d.blob, expires_at: FILES_TTL.from_now.to_i) } + end + def create if params[:blobs].blank? && params[:files].blank? return render json: { error: I18n.t('file_is_missing') }, status: :unprocessable_content diff --git a/app/controllers/templates_debug_controller.rb b/app/controllers/templates_debug_controller.rb index edaedff0..4ff31835 100644 --- a/app/controllers/templates_debug_controller.rb +++ b/app/controllers/templates_debug_controller.rb @@ -17,7 +17,7 @@ class TemplatesDebugController < ApplicationController fields = Templates::FindAcroFields.call(pdf, attachment, data) end - fields = Templates::DetectFields.call(StringIO.new(data), attachment:) if fields.blank? + fields, = Templates::DetectFields.call(StringIO.new(data), attachment:) if fields.blank? attachment.metadata['pdf'] ||= {} attachment.metadata['pdf']['fields'] = fields diff --git a/app/javascript/application.js b/app/javascript/application.js index 9b17172b..b839039d 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -167,6 +167,7 @@ safeRegisterElement('template-builder', class extends HTMLElement { withConditions: this.dataset.withConditions === 'true', withGoogleDrive: this.dataset.withGoogleDrive === 'true', withReplaceAndCloneUpload: true, + withDownload: true, currencies: (this.dataset.currencies || '').split(',').filter(Boolean), acceptFileTypes: this.dataset.acceptFileTypes, showTourStartForm: this.dataset.showTourStartForm === 'true' diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue index bcf376ac..76826eb5 100644 --- a/app/javascript/template_builder/builder.vue +++ b/app/javascript/template_builder/builder.vue @@ -175,7 +175,10 @@ {{ t('save') }} -
+
@@ -457,6 +484,7 @@ :show-tour-start-form="showTourStartForm" @add-field="addField" @set-draw="[drawField = $event.field, drawOption = $event.option]" + @select-submitter="selectedSubmitter = $event" @set-draw-type="[drawFieldType = $event, showDrawField = true]" @set-drag="dragField = $event" @set-drag-placeholder="$refs.dragPlaceholder.dragPlaceholder = $event" @@ -511,7 +539,7 @@ import DocumentPreview from './preview' import DocumentControls from './controls' import MobileFields from './mobile_fields' import FieldSubmitter from './field_submitter' -import { IconPlus, IconUsersPlus, IconDeviceFloppy, IconChevronDown, IconEye, IconWritingSign, IconInnerShadowTop, IconInfoCircle, IconAdjustments } from '@tabler/icons-vue' +import { IconPlus, IconUsersPlus, IconDeviceFloppy, IconChevronDown, IconEye, IconWritingSign, IconInnerShadowTop, IconInfoCircle, IconAdjustments, IconDownload } from '@tabler/icons-vue' import { v4 } from 'uuid' import { ref, computed, toRaw } from 'vue' import * as i18n from './i18n' @@ -537,6 +565,7 @@ export default { Contenteditable, IconUsersPlus, IconChevronDown, + IconDownload, IconAdjustments, IconEye, IconDeviceFloppy @@ -584,6 +613,11 @@ export default { required: false, default: null }, + withDownload: { + type: Boolean, + required: false, + default: false + }, backgroundColor: { type: String, required: false, @@ -805,6 +839,7 @@ export default { return { documentRefs: [], isBreakpointLg: false, + isDownloading: false, isLoadingBlankPage: false, isSaving: false, selectedSubmitter: null, @@ -963,6 +998,75 @@ export default { }, methods: { toRaw, + download () { + this.isDownloading = true + + this.baseFetch(`/templates/${this.template.id}/documents`).then(async (response) => { + if (response.ok) { + const urls = await response.json() + const isMobileSafariIos = 'ontouchstart' in window && navigator.maxTouchPoints > 0 && /AppleWebKit/i.test(navigator.userAgent) + const isSafariIos = isMobileSafariIos || /iPhone|iPad|iPod/i.test(navigator.userAgent) + + if (isSafariIos && urls.length > 1) { + this.downloadSafariIos(urls) + } else { + this.downloadUrls(urls) + } + } else { + alert(this.t('failed_to_download_files')) + } + }) + }, + downloadUrls (urls) { + const fileRequests = urls.map((url) => { + return () => { + return fetch(url).then(async (resp) => { + const blobUrl = URL.createObjectURL(await resp.blob()) + const link = document.createElement('a') + + link.href = blobUrl + link.setAttribute('download', decodeURI(url.split('/').pop())) + + link.click() + + URL.revokeObjectURL(blobUrl) + }) + } + }) + + fileRequests.reduce( + (prevPromise, request) => prevPromise.then(() => request()), + Promise.resolve() + ).finally(() => { + this.isDownloading = false + }) + }, + downloadSafariIos (urls) { + const fileRequests = urls.map((url) => { + return fetch(url).then(async (resp) => { + const blob = await resp.blob() + const blobUrl = URL.createObjectURL(blob.slice(0, blob.size, 'application/octet-stream')) + const link = document.createElement('a') + + link.href = blobUrl + link.setAttribute('download', decodeURI(url.split('/').pop())) + + return link + }) + }) + + Promise.all(fileRequests).then((links) => { + links.forEach((link, index) => { + setTimeout(() => { + link.click() + + URL.revokeObjectURL(link.href) + }, index * 50) + }) + }).finally(() => { + this.isDownloading = false + }) + }, onDragover (e) { if (this.$refs.dragPlaceholder?.dragPlaceholder) { this.$refs.dragPlaceholder.isMask = e.target.id === 'mask' diff --git a/app/javascript/template_builder/fields.vue b/app/javascript/template_builder/fields.vue index 87209a3f..2c8b10c8 100644 --- a/app/javascript/template_builder/fields.vue +++ b/app/javascript/template_builder/fields.vue @@ -222,7 +222,16 @@ width="22" class="animate-spin" /> -