diff --git a/Dockerfile b/Dockerfile index 3d296004..f6412c78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ ENV OPENSSL_CONF=/etc/openssl_legacy.cnf WORKDIR /app -RUN apk add --no-cache sqlite-dev libpq-dev mariadb-dev vips-dev yaml-dev redis libheif vips-heif gcompat ttf-freefont onnxruntime && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf +RUN apk add --no-cache sqlite-dev libpq-dev vips-dev yaml-dev redis libheif vips-heif gcompat ttf-freefont onnxruntime && mkdir /fonts && rm /usr/share/fonts/freefont/FreeSans.otf RUN addgroup -g 2000 docuseal && adduser -u 2000 -G docuseal -s /bin/sh -D -h /home/docuseal docuseal @@ -69,7 +69,7 @@ activate = 1' >> /etc/openssl_legacy.cnf COPY --chown=docuseal:docuseal ./Gemfile ./Gemfile.lock ./ -RUN apk add --no-cache build-base && bundle install && apk del --no-cache 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 && ln -sf /usr/lib/libonnxruntime.so.1 $(ruby -e "print Dir[Gem::Specification.find_by_name('onnxruntime').gem_dir + '/vendor/*.so'].first") +RUN apk add --no-cache build-base git && bundle install && apk del --no-cache build-base git && 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 && ln -sf /usr/lib/libonnxruntime.so.1 $(ruby -e "print Dir[Gem::Specification.find_by_name('onnxruntime').gem_dir + '/vendor/*.so'].first") COPY --chown=docuseal:docuseal ./bin ./bin COPY --chown=docuseal:docuseal ./app ./app diff --git a/Gemfile b/Gemfile index 650cde01..61c84807 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,6 @@ gem 'hexapdf' gem 'image_processing' gem 'jwt', require: false gem 'lograge' -gem 'mysql2', require: false gem 'numo-narray-alt', require: false gem 'oj' gem 'onnxruntime', require: false @@ -45,6 +44,7 @@ gem 'shakapacker' gem 'sidekiq' gem 'sqlite3', require: false gem 'strip_attributes' +gem 'trilogy', github: 'trilogy-libraries/trilogy', glob: 'contrib/ruby/*.gemspec', require: false gem 'turbo-rails' gem 'twitter_cldr', require: false gem 'tzinfo-data' diff --git a/Gemfile.lock b/Gemfile.lock index e4419ff0..7ad54e84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/trilogy-libraries/trilogy.git + revision: 3963d490459df7a2b5bedb42424c3285f25eab22 + glob: contrib/ruby/*.gemspec + specs: + trilogy (2.10.0) + bigdecimal + GEM remote: https://rubygems.org/ specs: @@ -318,8 +326,6 @@ GEM prism (~> 1.5) msgpack (1.8.0) multi_json (1.19.1) - mysql2 (0.5.7) - bigdecimal net-http (0.9.1) uri (>= 0.11.1) net-imap (0.6.2) @@ -644,7 +650,6 @@ DEPENDENCIES jwt letter_opener_web lograge - mysql2 numo-narray-alt oj onnxruntime @@ -673,6 +678,7 @@ DEPENDENCIES simplecov sqlite3 strip_attributes + trilogy! turbo-rails twitter_cldr tzinfo-data diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb index 93c2190f..22af24d9 100644 --- a/app/controllers/api/submissions_controller.rb +++ b/app/controllers/api/submissions_controller.rb @@ -188,7 +188,7 @@ module Api message: %i[subject body], submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role, :completed, :phone, :application_key, :external_id, :reply_to, :go_to_last, - :require_phone_2fa, :require_email_2fa, :order, :invite_by, + :require_phone_2fa, :require_email_2fa, :order, :index, :invite_by, { metadata: {}, values: {}, roles: [], readonly_fields: [], message: %i[subject body], fields: [:name, :uuid, :default_value, :value, :title, :description, :readonly, :required, :validation_pattern, :invalid_message, diff --git a/app/javascript/draw.js b/app/javascript/draw.js index 2a0a917c..3b95b5ea 100644 --- a/app/javascript/draw.js +++ b/app/javascript/draw.js @@ -89,7 +89,7 @@ window.customElements.define('draw-signature', class extends HTMLElement { } redrawCanvas (oldWidth, oldHeight) { - if (this.pad && !this.pad.isEmpty()) { + if (this.pad && !this.pad.isEmpty() && oldWidth > 0 && oldHeight > 0) { const sx = this.canvas.width / oldWidth const sy = this.canvas.height / oldHeight diff --git a/app/javascript/elements/field_condition.js b/app/javascript/elements/field_condition.js index 609d9955..b99a8bb3 100644 --- a/app/javascript/elements/field_condition.js +++ b/app/javascript/elements/field_condition.js @@ -64,6 +64,22 @@ export default class extends HTMLElement { if (action === 'empty' || action === 'unchecked') return this.isEmpty(actual) if (action === 'not_empty' || action === 'checked') return !this.isEmpty(actual) + if (['equal', 'not_equal', 'greater_than', 'less_than'].includes(action) && this.sourceEl?.getAttribute('type') === 'number') { + if (this.isEmpty(actual) || this.isEmpty(expected)) return false + + const actualNumber = parseFloat(actual) + const expectedNumber = parseFloat(expected) + + if (Number.isNaN(actualNumber) || Number.isNaN(expectedNumber)) return false + + if (action === 'equal') return Math.abs(actualNumber - expectedNumber) < Number.EPSILON + if (action === 'not_equal') return Math.abs(actualNumber - expectedNumber) > Number.EPSILON + if (action === 'greater_than') return actualNumber > expectedNumber + if (action === 'less_than') return actualNumber < expectedNumber + + return false + } + if (action === 'equal') { const list = Array.isArray(actual) ? actual : [actual] return list.filter((v) => v !== null && v !== undefined).map(String).includes(String(expected)) diff --git a/app/javascript/elements/signature_form.js b/app/javascript/elements/signature_form.js index b7ce43e5..5fc9af48 100644 --- a/app/javascript/elements/signature_form.js +++ b/app/javascript/elements/signature_form.js @@ -80,7 +80,7 @@ export default targetable(class extends HTMLElement { } redrawCanvas (oldWidth, oldHeight) { - if (this.pad && !this.pad.isEmpty()) { + if (this.pad && !this.pad.isEmpty() && oldWidth > 0 && oldHeight > 0) { const sx = this.canvas.width / oldWidth const sy = this.canvas.height / oldHeight diff --git a/app/javascript/submission_form/area.vue b/app/javascript/submission_form/area.vue index 30a0255e..affd57a6 100644 --- a/app/javascript/submission_form/area.vue +++ b/app/javascript/submission_form/area.vue @@ -182,8 +182,8 @@
{ if (item.conditions?.length) { if (item.conditions.every((c) => this.fieldsUuidIndex[c.field_uuid])) { - acc[item.attachment_uuid] = this.checkFieldConditions(item) + acc[item.attachment_uuid] = this.checkFieldConditions(item, cache) } else { acc[item.attachment_uuid] = true } @@ -996,7 +1001,9 @@ export default { }, previousInitialsValue () { if (this.reuseSignature !== false) { - const initialsField = [...this.fields].reverse().find((field) => field.type === 'initials' && !!this.values[field.uuid]) + const initialsField = this.fields.findLast + ? this.fields.findLast((field) => field.type === 'initials' && !!this.values[field.uuid]) + : [...this.fields].reverse().find((field) => field.type === 'initials' && !!this.values[field.uuid]) return this.values[initialsField?.uuid] } else { @@ -1023,7 +1030,9 @@ export default { return this.readonlyFields.filter((f) => f.conditions?.length) }, readonlyFields () { - return this.fields.filter((f) => f.readonly && this.checkFieldConditions(f) && this.checkFieldDocumentsConditions(f)) + const cache = {} + + return this.fields.filter((f) => f.readonly && this.checkFieldConditions(f, cache) && this.checkFieldDocumentsConditions(f)) }, stepFields () { const verificationFields = [] @@ -1078,10 +1087,12 @@ export default { sortedFields.push(verificationFields.pop()) } + const cache = {} + return sortedFields.reduce((acc, f) => { const prevStep = acc[acc.length - 1] - if (this.checkFieldConditions(f) && this.checkFieldDocumentsConditions(f)) { + if (this.checkFieldConditions(f, cache) && this.checkFieldDocumentsConditions(f)) { if (f.type === 'checkbox' && Array.isArray(prevStep) && prevStep[0].type === 'checkbox' && !f.description) { prevStep.push(f) } else { @@ -1093,7 +1104,9 @@ export default { }, []) }, formulaFields () { - return this.fields.filter((f) => f.preferences?.formula && f.type !== 'payment' && this.checkFieldConditions(f) && this.checkFieldDocumentsConditions(f)) + const cache = {} + + return this.fields.filter((f) => f.preferences?.formula && f.type !== 'payment' && this.checkFieldConditions(f, cache) && this.checkFieldDocumentsConditions(f)) }, attachmentsIndex () { return this.attachments.reduce((acc, a) => { @@ -1155,7 +1168,9 @@ export default { this.currentStep = Math.max(stepIndex, 0) } else if (this.goToLast) { const requiredEmptyStepIndex = this.stepFields.indexOf(this.stepFields.find((fields) => fields.some((f) => f.required && !this.submittedValues[f.uuid]))) - const lastFilledStepIndex = this.stepFields.indexOf([...this.stepFields].reverse().find((fields) => fields.some((f) => !!this.submittedValues[f.uuid]))) + 1 + const lastFilledStepIndex = this.stepFields.indexOf(this.stepFields.findLast + ? this.stepFields.findLast((fields) => fields.some((f) => !!this.submittedValues[f.uuid])) + : [...this.stepFields].reverse().find((fields) => fields.some((f) => !!this.submittedValues[f.uuid]))) + 1 const indexesList = [this.stepFields.length - 1] @@ -1223,27 +1238,33 @@ export default { return true } }, - checkFieldConditions (field) { + checkFieldConditions (field, cache = {}) { + if (cache[field.uuid] !== undefined) { + return cache[field.uuid] + } + + cache[field.uuid] = true + if (field.conditions?.length) { const result = field.conditions.reduce((acc, cond) => { if (cond.operation === 'or') { - acc.push(acc.pop() || this.checkFieldCondition(cond)) + acc.push(acc.pop() || this.checkFieldCondition(cond, cache)) } else { - acc.push(this.checkFieldCondition(cond)) + acc.push(this.checkFieldCondition(cond, cache)) } return acc }, []) - return !result.includes(false) - } else { - return true + cache[field.uuid] = !result.includes(false) } + + return cache[field.uuid] }, - checkFieldCondition (condition) { + checkFieldCondition (condition, cache = {}) { const field = this.fieldsUuidIndex[condition.field_uuid] - if (['not_empty', 'checked', 'equal', 'contains'].includes(condition.action) && field && !this.checkFieldConditions(field)) { + if (['not_empty', 'checked', 'equal', 'contains', 'greater_than', 'less_than'].includes(condition.action) && field && !this.checkFieldConditions(field, cache)) { return false } @@ -1253,6 +1274,22 @@ export default { return isEmpty(this.values[condition.field_uuid] ?? defaultValue) } else if (['not_empty', 'checked'].includes(condition.action)) { return !isEmpty(this.values[condition.field_uuid] ?? defaultValue) + } else if (field?.type === 'number' && ['equal', 'not_equal', 'greater_than', 'less_than'].includes(condition.action)) { + const value = this.values[condition.field_uuid] ?? defaultValue + + if (isEmpty(value) || isEmpty(condition.value)) return false + + const actual = parseFloat(value) + const expected = parseFloat(condition.value) + + if (Number.isNaN(actual) || Number.isNaN(expected)) return false + + if (condition.action === 'equal') return Math.abs(actual - expected) < Number.EPSILON + if (condition.action === 'not_equal') return Math.abs(actual - expected) > Number.EPSILON + if (condition.action === 'greater_than') return actual > expected + if (condition.action === 'less_than') return actual < expected + + return false } else if (['equal', 'contains'].includes(condition.action) && field) { if (field.options) { const option = field.options.find((o) => o.uuid === condition.value) @@ -1353,9 +1390,9 @@ export default { }, previousSignatureValueFor (field) { if (this.reuseSignature !== false) { - const signatureField = [...this.fields].reverse().find((f) => - f.type === 'signature' && field.preferences?.format === f.preferences?.format && !!this.values[f.uuid] - ) + const signatureField = this.fields.findLast + ? this.fields.findLast((f) => f.type === 'signature' && field.preferences?.format === f.preferences?.format && !!this.values[f.uuid]) + : [...this.fields].reverse().find((f) => f.type === 'signature' && field.preferences?.format === f.preferences?.format && !!this.values[f.uuid]) return this.values[signatureField?.uuid] } else { diff --git a/app/javascript/submission_form/kba_step.vue b/app/javascript/submission_form/kba_step.vue index 15958ad3..03c7431a 100644 --- a/app/javascript/submission_form/kba_step.vue +++ b/app/javascript/submission_form/kba_step.vue @@ -497,10 +497,10 @@ export default { body: JSON.stringify(payload) }) - if (!resp.ok) throw new Error('Failed to start KBA') - const data = await resp.json() + if (!resp.ok) throw new Error(data.error || 'Failed to start KBA') + if (data.result && data.result.action === 'FAIL') { if (data.result.detail === 'NO MATCH') { throw new Error('Unfortunately, we were unable to start Knowledge Based Authentication with the details provided. Please review and confirm that all your personal details are correct.') @@ -555,7 +555,11 @@ export default { const data = await resp.json() if (data.result?.action !== 'PASS') { - this.error = 'Knowledge Based Authentication Failed - make sure you provide correct answers for the Knowledge Based authentication.' + if (data.result?.issues?.length) { + this.error = `Knowledge Based Authentication Failed - make sure you provide correct details for the Knowledge Based authentication: ${data.result.issues.join(', ')}` + } else { + this.error = 'Knowledge Based Authentication Failed - make sure you provide correct answers for the Knowledge Based authentication.' + } throw new Error('Knowledge Based Authentication Failed') } diff --git a/app/javascript/submission_form/signature_step.vue b/app/javascript/submission_form/signature_step.vue index d7cb86fb..91937ec9 100644 --- a/app/javascript/submission_form/signature_step.vue +++ b/app/javascript/submission_form/signature_step.vue @@ -127,6 +127,12 @@ type="hidden" :name="`values[${field.uuid}]`" > + 0 && oldHeight > 0) { const sx = canvas.width / oldWidth const sy = canvas.height / oldHeight @@ -731,6 +747,13 @@ export default { }, async submit () { if (this.modelValue || this.computedPreviousValue) { + if (this.touchAttachmentUuid && this.computedPreviousValue === this.touchAttachmentUuid && !Object.values(this.values).includes(this.touchAttachmentUuid)) { + this.isTouchAttachment = true + this.$emit('touch-attachment', this.touchAttachmentUuid) + } else { + this.isTouchAttachment = false + } + if (this.computedPreviousValue) { this.$emit('update:model-value', this.computedPreviousValue) } diff --git a/app/javascript/submission_form/verification_step.vue b/app/javascript/submission_form/verification_step.vue index 1f711c5e..29b3b590 100644 --- a/app/javascript/submission_form/verification_step.vue +++ b/app/javascript/submission_form/verification_step.vue @@ -119,6 +119,7 @@ export default { docId: this.eidEasyData.doc_id, language: this.locale, countryCode: this.countryCode, + sandbox: ['demo.docuseal.tech'].includes(location.host), enabledMethods: { signature: this.eidEasyData.available_methods }, diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue index 7f87edbe..e071e9ee 100644 --- a/app/javascript/template_builder/area.vue +++ b/app/javascript/template_builder/area.vue @@ -134,6 +134,7 @@ @focusout="maybeBlurSettings" > +
+ The dots menu is retired in favor of the field context menu. Right-click the field to access field settings. Double-click the field to set a default value. +
@@ -252,7 +259,8 @@
@@ -346,6 +355,7 @@ :editable="editable && !defaultField" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="save" @close="isShowFontModal = false" /> @@ -357,6 +367,7 @@ :item="field" :build-default-name="buildDefaultName" :default-field="defaultField" + @save="save" @close="isShowConditionsModal = false" /> @@ -369,6 +380,7 @@ :editable="editable && !defaultField" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="save" @close="isShowDescriptionModal = false" /> @@ -401,7 +413,7 @@ export default { FieldSubmitter, IconX }, - inject: ['template', 'save', 't', 'isInlineSize', 'selectedAreasRef', 'isCmdKeyRef'], + inject: ['template', 'save', 't', 'isInlineSize', 'selectedAreasRef', 'isCmdKeyRef', 'getFieldTypeIndex'], props: { area: { type: Object, @@ -467,6 +479,11 @@ export default { required: false, default: null }, + isMobile: { + type: Boolean, + required: false, + default: false + }, isSelectMode: { type: Boolean, required: false, @@ -579,7 +596,7 @@ export default { return this.$el.getRootNode().querySelector('#docuseal_modal_container') }, defaultName () { - return this.buildDefaultName(this.field, this.template.fields) + return this.buildDefaultName(this.field) }, fontClasses () { if (!this.field.preferences) { diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue index b0f9e9cd..34953da1 100644 --- a/app/javascript/template_builder/builder.vue +++ b/app/javascript/template_builder/builder.vue @@ -374,6 +374,7 @@ :draw-field-type="drawFieldType" :draw-custom-field="drawCustomField" :editable="editable" + :is-mobile="isMobile" :base-url="baseUrl" :with-fields-detection="withFieldsDetection" @draw="[onDraw($event), withSelectedFieldType ? '' : drawFieldType = '', drawCustomField = null, showDrawField = false]" @@ -382,9 +383,9 @@ @paste-field="pasteField" @copy-field="copyField" @add-custom-field="addCustomField" + @set-draw="[drawField = $event.field, drawOption = $event.option]" @copy-selected-areas="copySelectedAreas" @delete-selected-areas="deleteSelectedAreas" - @align-selected-areas="alignSelectedAreas" @autodetect-fields="detectFieldsForPage" /> this.fieldsDragFieldRef), customDragFieldRef: computed(() => this.customDragFieldRef), isSelectModeRef: computed(() => this.isSelectModeRef), - isCmdKeyRef: computed(() => this.isCmdKeyRef) + isCmdKeyRef: computed(() => this.isCmdKeyRef), + getFieldTypeIndex: this.getFieldTypeIndex } }, props: { @@ -989,6 +991,18 @@ export default { return areas }, + fieldTypeIndexMap () { + const map = {} + const typeCounters = {} + + this.template.fields.forEach((f) => { + typeCounters[f.type] ||= 0 + map[f.uuid] = typeCounters[f.type] + typeCounters[f.type]++ + }) + + return map + }, isAllRequiredFieldsAdded () { return !this.defaultRequiredFields?.some((f) => { return !this.template.fields?.some((field) => field.name === f.name) @@ -1085,6 +1099,9 @@ export default { addCustomField (field) { return this.$refs.fields.addCustomField(field) }, + getFieldTypeIndex (field) { + return this.fieldTypeIndexMap[field.uuid] + }, addCustomFieldWithoutDraw () { const customField = this.drawCustomField @@ -1160,27 +1177,6 @@ export default { this.debouncedSave() }, - alignSelectedAreas (direction) { - const areas = this.selectedAreasRef.value - - let targetValue - - if (direction === 'left') { - targetValue = Math.min(...areas.map(a => a.x)) - areas.forEach((area) => { area.x = targetValue }) - } else if (direction === 'right') { - targetValue = Math.max(...areas.map(a => a.x + a.w)) - areas.forEach((area) => { area.x = targetValue - area.w }) - } else if (direction === 'top') { - targetValue = Math.min(...areas.map(a => a.y)) - areas.forEach((area) => { area.y = targetValue }) - } else if (direction === 'bottom') { - targetValue = Math.max(...areas.map(a => a.y + a.h)) - areas.forEach((area) => { area.y = targetValue - area.h }) - } - - this.save() - }, download () { this.isDownloading = true @@ -2065,7 +2061,9 @@ export default { } if (type === 'checkbox' && !this.drawFieldType && (this.template.fields[this.template.fields.length - 1]?.type === 'checkbox' || area.w)) { - const previousField = [...this.template.fields].reverse().find((f) => f.type === type) + const previousField = this.template.fields.findLast + ? this.template.fields.findLast((f) => f.type === type) + : [...this.template.fields].reverse().find((f) => f.type === type) const previousArea = previousField?.areas?.[previousField.areas.length - 1] if (previousArea || area.w) { @@ -2329,7 +2327,9 @@ export default { assignDropAreaSize (fieldArea, field, area) { const fieldType = field.type || 'text' - const previousField = [...this.template.fields].reverse().find((f) => f.type === fieldType) + const previousField = this.template.fields.findLast + ? this.template.fields.findLast((f) => f.type === fieldType) + : [...this.template.fields].reverse().find((f) => f.type === fieldType) let baseArea diff --git a/app/javascript/template_builder/conditions_modal.vue b/app/javascript/template_builder/conditions_modal.vue index 81e54407..d8219ff6 100644 --- a/app/javascript/template_builder/conditions_modal.vue +++ b/app/javascript/template_builder/conditions_modal.vue @@ -9,7 +9,7 @@
- {{ t('condition') }} - {{ (defaultField ? (defaultField.title || item.title || item.name) : item.name) || buildDefaultName(item, template.fields) }} + {{ t('condition') }} - {{ (defaultField ? (defaultField.title || item.title || item.name) : item.name) || buildDefaultName(item) }} - {{ f.name || buildDefaultName(f, template.fields) }} + {{ f.name || buildDefaultName(f) }} +
export default { name: 'ConditionModal', - inject: ['t', 'save', 'template', 'withConditions'], + inject: ['t', 'template', 'withConditions'], props: { item: { type: Object, @@ -169,18 +179,13 @@ export default { type: Function, required: true }, - withClickSaveEvent: { - type: Boolean, - required: false, - default: false - }, excludeFieldUuids: { type: Array, required: false, default: () => [] } }, - emits: ['close', 'click-save'], + emits: ['close', 'save'], data () { return { conditions: this.item.conditions?.[0] ? JSON.parse(JSON.stringify(this.item.conditions)) : [{}] @@ -227,6 +232,8 @@ export default { actions.push('equal', 'not_equal') } else if (['multiple'].includes(field.type)) { actions.push('contains', 'does_not_contain') + } else if (field.type === 'number') { + actions.push('not_empty', 'empty', 'equal', 'not_equal', 'greater_than', 'less_than') } else { actions.push('not_empty', 'empty') } @@ -244,12 +251,7 @@ export default { delete this.item.conditions } - if (this.withClickSaveEvent) { - this.$emit('click-save') - } else { - this.save() - } - + this.$emit('save') this.$emit('close') } } diff --git a/app/javascript/template_builder/contenteditable.vue b/app/javascript/template_builder/contenteditable.vue index 1ee20ddb..c17724fb 100644 --- a/app/javascript/template_builder/contenteditable.vue +++ b/app/javascript/template_builder/contenteditable.vue @@ -179,8 +179,11 @@ export default { }, onBlur (e) { setTimeout(() => { - this.value = this.$refs.contenteditable.innerText.trim() || this.modelValue - this.$emit('update:model-value', this.value) + if (this.$refs.contenteditable) { + this.value = this.$refs.contenteditable.innerText.trim() || this.modelValue + this.$emit('update:model-value', this.value) + } + this.$emit('blur', e) this.isEditable = false diff --git a/app/javascript/template_builder/context_menu.vue b/app/javascript/template_builder/context_menu.vue deleted file mode 100644 index 4ad6972b..00000000 --- a/app/javascript/template_builder/context_menu.vue +++ /dev/null @@ -1,546 +0,0 @@ - - - diff --git a/app/javascript/template_builder/custom_field.vue b/app/javascript/template_builder/custom_field.vue index ee60ca3e..21317261 100644 --- a/app/javascript/template_builder/custom_field.vue +++ b/app/javascript/template_builder/custom_field.vue @@ -125,6 +125,7 @@ :field="field" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="$emit('save')" @close="isShowFormulaModal = false" /> @@ -136,6 +137,7 @@ :field="field" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="$emit('save')" @close="isShowFontModal = false" /> @@ -147,6 +149,7 @@ :field="field" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="$emit('save')" @close="isShowDescriptionModal = false" /> diff --git a/app/javascript/template_builder/description_modal.vue b/app/javascript/template_builder/description_modal.vue index 946d961e..b387733f 100644 --- a/app/javascript/template_builder/description_modal.vue +++ b/app/javascript/template_builder/description_modal.vue @@ -9,7 +9,7 @@
- {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field, template.fields) }} + {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field) }} export default { name: 'DescriptionModal', - inject: ['t', 'save', 'template'], + inject: ['t', 'template'], props: { field: { type: Object, @@ -88,7 +88,7 @@ export default { required: true } }, - emits: ['close'], + emits: ['close', 'save'], data () { return { description: this.field.description, @@ -103,7 +103,7 @@ export default { this.field.description = this.description this.field.title = this.title - this.save() + this.$emit('save') this.$emit('close') }, resizeTextarea () { diff --git a/app/javascript/template_builder/document.vue b/app/javascript/template_builder/document.vue index 040f6edb..83b2c486 100644 --- a/app/javascript/template_builder/document.vue +++ b/app/javascript/template_builder/document.vue @@ -13,6 +13,7 @@ :with-signature-id="withSignatureId" :with-prefillable="withPrefillable" :is-drag="isDrag" + :is-mobile="isMobile" :with-field-placeholder="withFieldPlaceholder" :default-fields="defaultFields" :drag-field-placeholder="dragFieldPlaceholder" @@ -30,9 +31,9 @@ @copy-field="$emit('copy-field', $event)" @paste-field="$emit('paste-field', { ...$event, attachment_uuid: document.uuid })" @add-custom-field="$emit('add-custom-field', $event)" + @set-draw="$emit('set-draw', $event)" @copy-selected-areas="$emit('copy-selected-areas')" @delete-selected-areas="$emit('delete-selected-areas')" - @align-selected-areas="$emit('align-selected-areas', $event)" @autodetect-fields="$emit('autodetect-fields', $event)" @scroll-to="scrollToArea" @draw="$emit('draw', { area: {...$event.area, attachment_uuid: document.uuid }, isTooSmall: $event.isTooSmall })" @@ -98,6 +99,11 @@ export default { required: false, default: () => [] }, + isMobile: { + type: Boolean, + required: false, + default: false + }, allowDraw: { type: Boolean, required: false, @@ -138,7 +144,7 @@ export default { default: false } }, - emits: ['draw', 'drop-field', 'remove-area', 'paste-field', 'copy-field', 'copy-selected-areas', 'delete-selected-areas', 'align-selected-areas', 'autodetect-fields', 'add-custom-field'], + emits: ['draw', 'drop-field', 'remove-area', 'paste-field', 'copy-field', 'copy-selected-areas', 'delete-selected-areas', 'autodetect-fields', 'add-custom-field', 'set-draw'], data () { return { pageRefs: [] @@ -180,7 +186,15 @@ export default { methods: { scrollToArea (area) { this.$nextTick(() => { - this.pageRefs[area.page].areaRefs.find((e) => e.area === area).$el.scrollIntoView({ behavior: 'smooth', block: 'center' }) + const pageRef = this.pageRefs[area.page] + + if (pageRef && pageRef.areaRefs) { + const areaRef = pageRef.areaRefs.find((e) => e.area === area) + + if (areaRef && areaRef.$el) { + areaRef.$el.scrollIntoView({ behavior: 'smooth', block: 'center' }) + } + } }) }, setPageRefs (el) { diff --git a/app/javascript/template_builder/field.vue b/app/javascript/template_builder/field.vue index a6804499..d7e04166 100644 --- a/app/javascript/template_builder/field.vue +++ b/app/javascript/template_builder/field.vue @@ -269,6 +269,7 @@ :editable="editable && !defaultField" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="$emit('save')" @close="isShowFormulaModal = false" /> @@ -281,6 +282,7 @@ :editable="editable && !defaultField" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="$emit('save')" @close="isShowFontModal = false" /> @@ -292,6 +294,7 @@ :item="field" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="$emit('save')" @close="isShowConditionsModal = false" /> @@ -304,6 +307,7 @@ :editable="editable && !defaultField" :default-field="defaultField" :build-default-name="buildDefaultName" + @save="$emit('save')" @close="isShowDescriptionModal = false" /> @@ -340,7 +344,7 @@ export default { IconMathFunction, FieldType }, - inject: ['template', 'backgroundColor', 'selectedAreasRef', 't', 'locale'], + inject: ['template', 'backgroundColor', 'selectedAreasRef', 't', 'locale', 'getFieldTypeIndex'], props: { field: { type: Object, @@ -412,7 +416,7 @@ export default { return this.$el.getRootNode().querySelector('#docuseal_modal_container') }, defaultName () { - return this.buildDefaultName(this.field, this.template.fields) + return this.buildDefaultName(this.field) }, areas () { return this.field.areas || [] @@ -432,7 +436,7 @@ export default { this.$emit('save') }, - buildDefaultName (field, fields) { + buildDefaultName (field) { if (field.type === 'payment' && field.preferences?.price && !field.preferences?.formula) { const { price, currency } = field.preferences || {} @@ -443,7 +447,7 @@ export default { return `${this.fieldNames[field.type]} ${formattedPrice}` } else { - const typeIndex = fields.filter((f) => f.type === field.type).indexOf(field) + const typeIndex = this.getFieldTypeIndex(field) if (field.type === 'heading' || field.type === 'strikethrough') { return `${this.fieldNames[field.type]} ${typeIndex + 1}` diff --git a/app/javascript/template_builder/field_context_menu.vue b/app/javascript/template_builder/field_context_menu.vue new file mode 100644 index 00000000..26384fa7 --- /dev/null +++ b/app/javascript/template_builder/field_context_menu.vue @@ -0,0 +1,1003 @@ + + + diff --git a/app/javascript/template_builder/field_context_modal.vue b/app/javascript/template_builder/field_context_modal.vue new file mode 100644 index 00000000..7132cc6d --- /dev/null +++ b/app/javascript/template_builder/field_context_modal.vue @@ -0,0 +1,49 @@ + + + diff --git a/app/javascript/template_builder/field_context_submenu.vue b/app/javascript/template_builder/field_context_submenu.vue new file mode 100644 index 00000000..fee5960d --- /dev/null +++ b/app/javascript/template_builder/field_context_submenu.vue @@ -0,0 +1,147 @@ + + + diff --git a/app/javascript/template_builder/field_settings.vue b/app/javascript/template_builder/field_settings.vue index 032f6a62..debf72f8 100644 --- a/app/javascript/template_builder/field_settings.vue +++ b/app/javascript/template_builder/field_settings.vue @@ -10,7 +10,7 @@ @change="[field.preferences ||= {}, field.preferences.method = $event.target.value, $emit('save')]" >
-
- - -
    • - {{ t('font') }} - {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field, template.fields) }} + {{ t('font') }} - {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field) }} - {{ field.default_value || field.name || buildDefaultName(field, template.fields) }} + {{ field.default_value || field.name || buildDefaultName(field) }}
    @@ -196,7 +196,7 @@ export default { components: { IconChevronDown }, - inject: ['t', 'save', 'template'], + inject: ['t', 'template'], props: { field: { type: Object, @@ -212,17 +212,12 @@ export default { required: false, default: true }, - withClickSaveEvent: { - type: Boolean, - required: false, - default: false - }, buildDefaultName: { type: Function, required: true } }, - emits: ['close', 'click-save'], + emits: ['close', 'save'], data () { return { preferences: {} @@ -262,6 +257,7 @@ export default { colors () { return [ { label: '⬛', value: 'black' }, + { label: '⬜', value: 'white' }, { label: '🟦', value: 'blue' }, { label: '🟥', value: 'red' } ] @@ -276,6 +272,7 @@ export default { 'items-center': !this.preferences.valign || this.preferences.valign === 'center', 'items-start': this.preferences.valign === 'top', 'items-end': this.preferences.valign === 'bottom', + 'bg-black': this.preferences.color === 'white', 'font-bold': ['bold_italic', 'bold'].includes(this.preferences.font_type), italic: ['bold_italic', 'italic'].includes(this.preferences.font_type) } @@ -327,12 +324,7 @@ export default { Object.assign(this.field.preferences, this.preferences) - if (this.withClickSaveEvent) { - this.$emit('click-save') - } else { - this.save() - } - + this.$emit('save') this.$emit('close') } } diff --git a/app/javascript/template_builder/formula_modal.vue b/app/javascript/template_builder/formula_modal.vue index 837ff7a4..a731519b 100644 --- a/app/javascript/template_builder/formula_modal.vue +++ b/app/javascript/template_builder/formula_modal.vue @@ -9,7 +9,7 @@
    - {{ t('formula') }} - {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field, template.fields) }} + {{ t('formula') }} - {{ (defaultField ? (defaultField.title || field.title || field.name) : field.name) || buildDefaultName(field) }} - {{ f.name || buildDefaultName(f, template.fields) }} + {{ f.name || buildDefaultName(f) }}
    @@ -131,7 +131,7 @@ export default { IconCodePlus, IconMathFunction }, - inject: ['t', 'save', 'template', 'withFormula'], + inject: ['t', 'template', 'withFormula'], props: { field: { type: Object, @@ -152,7 +152,7 @@ export default { required: true } }, - emits: ['close'], + emits: ['close', 'save'], data () { return { formula: '' @@ -181,7 +181,7 @@ export default { const foundField = this.fields.find((f) => f.uuid === uuid) if (foundField) { - return `{{${foundField.name || this.buildDefaultName(foundField, this.template.fields)}}}` + return `{{${foundField.name || this.buildDefaultName(foundField)}}}` } else { return '{{FIELD NOT FOUND}}' } @@ -190,7 +190,7 @@ export default { normalizeFormula (text) { return text.replace(/{{(.*?)}}/g, (match, name) => { const foundField = this.fields.find((f) => { - return (f.name || this.buildDefaultName(f, this.template.fields)).trim() === name.trim() + return (f.name || this.buildDefaultName(f)).trim() === name.trim() }) if (foundField) { @@ -212,11 +212,14 @@ export default { } else { this.field.preferences.formula = normalizedFormula - if (this.field.type !== 'payment') { + if (this.field.type === 'payment') { + delete this.field.preferences.price + delete this.field.preferences.payment_link_id + } else { this.field.readonly = !!normalizedFormula } - this.save() + this.$emit('save') this.$emit('close') } diff --git a/app/javascript/template_builder/i18n.js b/app/javascript/template_builder/i18n.js index 8f60bb5e..aea33d4b 100644 --- a/app/javascript/template_builder/i18n.js +++ b/app/javascript/template_builder/i18n.js @@ -1,6 +1,7 @@ const en = { + fixed: 'Fixed', default: 'Default', - save_as_custom_field: 'Save as Custom Field', + save_as_custom_field: 'Save as custom field', kba: 'KBA', analyzing_: 'Analyzing...', download: 'Download', @@ -31,6 +32,9 @@ const en = { field_not_found: 'Field not found', clear: 'Clear', align: 'Align', + resize: 'Resize', + width: 'Width', + height: 'Height', add_all_required_fields_to_continue: 'Add all required fields to continue', uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Uploaded PDF contains form fields. Keep or remove them?', keep: 'Keep', @@ -48,6 +52,8 @@ const en = { type_value: 'Type value', equal: 'Equal', not_equal: 'Not equal', + greater_than: 'Greater than', + less_than: 'Less than', contains: 'Contains', does_not_contain: 'Does not contain', not_empty: 'Not empty', @@ -91,8 +97,9 @@ const en = { format: 'Format', read_only: 'Read-only', page: 'Page', - draw_new_area: 'Draw New Area', - copy_to_all_pages: 'Copy to All Pages', + draw_new_area: 'Draw new area', + copy_to_all_pages: 'Copy to all pages', + more: 'More', add_option: 'Add option', option: 'Option', options: 'Options', @@ -173,6 +180,9 @@ const en = { numbers_only: 'Numbers only', letters_only: 'Letters only', regexp_validation: 'Regexp validation', + custom_validation: 'Custom Validation', + length_validation: 'Length Validation', + number_range: 'Number Range', enter_pdf_password: 'Enter PDF password', wrong_password: 'Wrong password', currency: 'Currency', @@ -202,6 +212,7 @@ const en = { } const es = { + fixed: 'Fijo', default: 'Predeterminado', save_as_custom_field: 'Guardar como personalizado', kba: 'KBA', @@ -235,6 +246,9 @@ const es = { clear: 'Borrar', type_value: 'Escriba valor', align: 'Alinear', + resize: 'Redimensionar', + width: 'Ancho', + height: 'Alto', add_all_required_fields_to_continue: 'Agregar todos los campos requeridos para continuar', uploaded_pdf_contains_form_fields_keep_or_remove_them: 'El PDF cargado tiene campos. ¿Mantenerlos o eliminarlos?', keep: 'Mantener', @@ -252,6 +266,8 @@ const es = { price: 'Precio', equal: 'Igual', not_equal: 'No es igual', + greater_than: 'Mayor que', + less_than: 'Menor que', contains: 'Contiene', does_not_contain: 'No contiene', not_empty: 'No vacío', @@ -292,6 +308,7 @@ const es = { page: 'Página', draw_new_area: 'Dibujar nueva área', copy_to_all_pages: 'Copiar a todas las páginas', + more: 'Más', add_option: 'Agregar opción', option: 'Opción', options: 'Opciones', @@ -376,6 +393,9 @@ const es = { numbers_only: 'Solo números', letters_only: 'Solo letras', regexp_validation: 'Validación de expresión regular', + custom_validation: 'Validación Personalizada', + length_validation: 'Validación de Longitud', + number_range: 'Rango de Números', enter_pdf_password: 'Ingrese la contraseña del PDF', wrong_password: 'Contraseña incorrecta', currency: 'Moneda', @@ -405,6 +425,7 @@ const es = { } const it = { + fixed: 'Fisso', default: 'Predefinito', save_as_custom_field: 'Salva come personalizzato', kba: 'KBA', @@ -437,6 +458,9 @@ const it = { field_not_found: 'Campo non trovato', clear: 'Cancella', align: 'Allinea', + resize: 'Ridimensiona', + width: 'Larghezza', + height: 'Altezza', add_all_required_fields_to_continue: 'Aggiungi tutti i campi obbligatori per continuare', uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Il PDF caricato contiene campi del modulo. Mantenerli o rimuoverli?', keep: 'Mantieni', @@ -454,6 +478,8 @@ const it = { type_value: 'Inserisci valore', equal: 'Uguale', not_equal: 'Non uguale', + greater_than: 'Maggiore di', + less_than: 'Minore di', contains: 'Contiene', does_not_contain: 'Non contiene', not_empty: 'Non vuoto', @@ -499,6 +525,7 @@ const it = { page: 'Pagina', draw_new_area: 'Disegna nuova area', copy_to_all_pages: 'Copia in tutte le pagine', + more: 'Altro', add_option: 'Aggiungi opzione', option: 'Opzione', options: 'Opzioni', @@ -579,6 +606,9 @@ const it = { numbers_only: 'Solo numeri', letters_only: 'Solo lettere', regexp_validation: 'Validazione regexp', + custom_validation: 'Validazione Personalizzata', + length_validation: 'Validazione Lunghezza', + number_range: 'Intervallo Numerico', enter_pdf_password: 'Inserisci password PDF', wrong_password: 'Password errata', currency: 'Valuta', @@ -608,6 +638,7 @@ const it = { } const pt = { + fixed: 'Fixo', default: 'Padrão', save_as_custom_field: 'Salvar como personalizado', kba: 'KBA', @@ -644,6 +675,9 @@ const pt = { uploaded_pdf_contains_form_fields_keep_or_remove_them: 'O PDF carregado contém campos. Manter ou removê-los?', keep: 'Manter', align: 'Alinhar', + resize: 'Redimensionar', + width: 'Largura', + height: 'Altura', left: 'Esquerda', heading: 'Cabeçalho', validation: 'Validação', @@ -658,6 +692,8 @@ const pt = { price: 'Preço', equal: 'Igual', not_equal: 'Não é igual', + greater_than: 'Maior que', + less_than: 'Menor que', contains: 'Contém', does_not_contain: 'Não contém', not_empty: 'Não vazio', @@ -698,6 +734,7 @@ const pt = { page: 'Página', draw_new_area: 'Desenhar nova área', copy_to_all_pages: 'Copiar para todas as páginas', + more: 'Mais', add_option: 'Adicionar opção', option: 'Opção', options: 'Opções', @@ -782,6 +819,9 @@ const pt = { numbers_only: 'Somente números', letters_only: 'Somente letras', regexp_validation: 'Validação de expressão regular', + custom_validation: 'Validação Personalizada', + length_validation: 'Validação de Comprimento', + number_range: 'Intervalo de Números', enter_pdf_password: 'Digite a senha do PDF', wrong_password: 'Senha incorreta', currency: 'Moeda', @@ -811,6 +851,7 @@ const pt = { } const fr = { + fixed: 'Fixe', default: 'Par défaut', save_as_custom_field: 'Enregistrer comme personnalisé', kba: 'KBA', @@ -843,6 +884,9 @@ const fr = { field_not_found: 'Champ introuvable', clear: 'Effacer', align: 'Aligner', + resize: 'Redimensionner', + width: 'Largeur', + height: 'Hauteur', add_all_required_fields_to_continue: 'Ajoutez tous les champs obligatoires pour continuer', uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Le PDF téléversé contient des champs de formulaire. Les conserver ou les supprimer ?', keep: 'Conserver', @@ -860,6 +904,8 @@ const fr = { type_value: 'Saisir une valeur', equal: 'Égal', not_equal: 'Différent', + greater_than: 'Supérieur à', + less_than: 'Inférieur à', contains: 'Contient', does_not_contain: 'Ne contient pas', not_empty: 'Non vide', @@ -905,6 +951,7 @@ const fr = { page: 'Page', draw_new_area: 'Dessiner une zone', copy_to_all_pages: 'Copier sur toutes les pages', + more: 'Plus', add_option: 'Ajouter une option', option: 'Option', options: 'Options', @@ -985,6 +1032,9 @@ const fr = { numbers_only: 'Chiffres uniquement', letters_only: 'Lettres uniquement', regexp_validation: 'Validation par expression régulière', + custom_validation: 'Validation Personnalisée', + length_validation: 'Validation de Longueur', + number_range: 'Plage de Nombres', enter_pdf_password: 'Saisir le mot de passe du PDF', wrong_password: 'Mot de passe incorrect', currency: 'Devise', @@ -1014,6 +1064,7 @@ const fr = { } const de = { + fixed: 'Fest', default: 'Standard', save_as_custom_field: 'Als benutzerdefiniert speichern', kba: 'KBA', @@ -1046,6 +1097,9 @@ const de = { field_not_found: 'Feld nicht gefunden', clear: 'Leeren', align: 'Ausrichten', + resize: 'Größe ändern', + width: 'Breite', + height: 'Höhe', add_all_required_fields_to_continue: 'Fügen Sie alle erforderlichen Felder hinzu, um fortzufahren', uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Das hochgeladene PDF enthält Formularfelder. Beibehalten oder entfernen?', keep: 'Beibehalten', @@ -1063,6 +1117,8 @@ const de = { type_value: 'Wert eingeben', equal: 'Gleich', not_equal: 'Ungleich', + greater_than: 'Größer als', + less_than: 'Kleiner als', contains: 'Enthält', does_not_contain: 'Enthält nicht', not_empty: 'Nicht leer', @@ -1108,6 +1164,7 @@ const de = { page: 'Seite', draw_new_area: 'Bereich zeichnen', copy_to_all_pages: 'Auf alle Seiten kopieren', + more: 'Mehr', add_option: 'Option hinzufügen', option: 'Option', options: 'Optionen', @@ -1188,6 +1245,9 @@ const de = { numbers_only: 'Nur Zahlen', letters_only: 'Nur Buchstaben', regexp_validation: 'RegExp-Validierung', + custom_validation: 'Benutzerdefinierte Validierung', + length_validation: 'Längenvalidierung', + number_range: 'Zahlenbereich', enter_pdf_password: 'PDF-Passwort eingeben', wrong_password: 'Falsches Passwort', currency: 'Währung', @@ -1217,6 +1277,7 @@ const de = { } const nl = { + fixed: 'Vast', default: 'Standaard', save_as_custom_field: 'Opslaan als aangepast', kba: 'KBA', @@ -1249,6 +1310,9 @@ const nl = { field_not_found: 'Veld niet gevonden', clear: 'Wissen', align: 'Uitlijnen', + resize: 'Formaat wijzigen', + width: 'Breedte', + height: 'Hoogte', add_all_required_fields_to_continue: 'Voeg alle vereiste velden toe om door te gaan', uploaded_pdf_contains_form_fields_keep_or_remove_them: 'Geüploade PDF bevat formuliervelden. Behouden of verwijderen?', keep: 'Behouden', @@ -1266,6 +1330,8 @@ const nl = { type_value: 'Typ waarde', equal: 'Gelijk aan', not_equal: 'Niet gelijk aan', + greater_than: 'Groter dan', + less_than: 'Kleiner dan', contains: 'Bevat', does_not_contain: 'Bevat niet', not_empty: 'Niet leeg', @@ -1311,6 +1377,7 @@ const nl = { page: 'Pagina', draw_new_area: 'Nieuw gebied tekenen', copy_to_all_pages: 'Kopieer naar alle pag.', + more: 'Meer', add_option: 'Optie toevoegen', option: 'Optie', options: 'Opties', @@ -1391,6 +1458,9 @@ const nl = { numbers_only: 'Alleen cijfers', letters_only: 'Alleen letters', regexp_validation: 'Regex validatie', + custom_validation: 'Aangepaste Validatie', + length_validation: 'Lengte Validatie', + number_range: 'Getalbereik', enter_pdf_password: 'Voer PDF-wachtwoord in', wrong_password: 'Onjuist wachtwoord', currency: 'Valuta', diff --git a/app/javascript/template_builder/page.vue b/app/javascript/template_builder/page.vue index fcd60617..550658c4 100644 --- a/app/javascript/template_builder/page.vue +++ b/app/javascript/template_builder/page.vue @@ -29,7 +29,7 @@ :is-drag="isDrag" @move="onSelectionBoxMove" @contextmenu="openSelectionContextMenu" - @close-context-menu="closeSelectionContextMenu" + @close-context-menu="closeContextMenu" /> - - +
    import FieldArea from './area' -import ContextMenu from './context_menu' +import FieldContextMenu from './field_context_menu' +import SelectionContextMenu from './selection_context_menu' +import PageContextMenu from './page_context_menu' import SelectionBox from './selection_box' export default { name: 'TemplatePage', components: { FieldArea, - ContextMenu, + FieldContextMenu, + SelectionContextMenu, + PageContextMenu, SelectionBox }, - inject: ['fieldTypes', 'defaultDrawFieldType', 'fieldsDragFieldRef', 'customDragFieldRef', 'assignDropAreaSize', 'selectedAreasRef', 'template', 'isSelectModeRef'], + inject: ['fieldTypes', 'defaultDrawFieldType', 'fieldsDragFieldRef', 'customDragFieldRef', 'assignDropAreaSize', 'selectedAreasRef', 'template', 'isSelectModeRef', 'save'], props: { image: { type: Object, @@ -140,6 +155,11 @@ export default { required: false, default: null }, + isMobile: { + type: Boolean, + required: false, + default: false + }, withSignatureId: { type: Boolean, required: false, @@ -228,7 +248,7 @@ export default { default: false } }, - emits: ['draw', 'drop-field', 'remove-area', 'copy-field', 'paste-field', 'scroll-to', 'copy-selected-areas', 'delete-selected-areas', 'align-selected-areas', 'autodetect-fields', 'add-custom-field'], + emits: ['draw', 'drop-field', 'remove-area', 'copy-field', 'paste-field', 'scroll-to', 'copy-selected-areas', 'delete-selected-areas', 'autodetect-fields', 'add-custom-field', 'set-draw'], data () { return { areaRefs: [], @@ -236,8 +256,7 @@ export default { resizeDirection: null, newAreas: [], contextMenu: null, - selectionRect: null, - selectionContextMenu: null + selectionRect: null } }, computed: { @@ -305,11 +324,6 @@ export default { return 'text' } }, - isMobile () { - const isMobileSafariIos = 'ontouchstart' in window && navigator.maxTouchPoints > 0 && /AppleWebKit/i.test(navigator.userAgent) - - return isMobileSafariIos || /android|iphone|ipad/i.test(navigator.userAgent) - }, resizeDirectionClasses () { return { nwse: 'cursor-nwse-resize', @@ -399,29 +413,32 @@ export default { } }, openSelectionContextMenu (event) { + if (!this.editable) { + return + } + + event.preventDefault() + event.stopPropagation() + const rect = this.$el.getBoundingClientRect() - this.selectionContextMenu = { + this.contextMenu = { x: event.clientX, y: event.clientY, relativeX: (event.clientX - rect.left) / rect.width, - relativeY: (event.clientY - rect.top) / rect.height + relativeY: (event.clientY - rect.top) / rect.height, + areas: this.selectedAreasRef.value } }, - closeSelectionContextMenu () { - this.selectionContextMenu = null - }, handleSelectionCopy () { this.$emit('copy-selected-areas') - this.closeSelectionContextMenu() + + this.closeContextMenu() }, handleSelectionDelete () { this.$emit('delete-selected-areas') - this.closeSelectionContextMenu() - }, - handleSelectionAlign (direction) { - this.$emit('align-selected-areas', direction) - this.closeSelectionContextMenu() + + this.closeContextMenu() }, closeContextMenu () { this.contextMenu = null diff --git a/app/javascript/template_builder/page_context_menu.vue b/app/javascript/template_builder/page_context_menu.vue new file mode 100644 index 00000000..3cec3c65 --- /dev/null +++ b/app/javascript/template_builder/page_context_menu.vue @@ -0,0 +1,159 @@ + + + diff --git a/app/javascript/template_builder/preview.vue b/app/javascript/template_builder/preview.vue index ff7864fd..025ad692 100644 --- a/app/javascript/template_builder/preview.vue +++ b/app/javascript/template_builder/preview.vue @@ -119,6 +119,7 @@ @@ -145,7 +146,7 @@ export default { GoogleDriveDocumentSettings, IconSortDescending2 }, - inject: ['t'], + inject: ['t', 'getFieldTypeIndex'], props: { item: { type: Object, diff --git a/app/javascript/template_builder/selection_context_menu.vue b/app/javascript/template_builder/selection_context_menu.vue new file mode 100644 index 00000000..4649e011 --- /dev/null +++ b/app/javascript/template_builder/selection_context_menu.vue @@ -0,0 +1,348 @@ + + + diff --git a/app/javascript/template_builder/upload.vue b/app/javascript/template_builder/upload.vue index 5f4faa57..813ce12e 100644 --- a/app/javascript/template_builder/upload.vue +++ b/app/javascript/template_builder/upload.vue @@ -290,7 +290,11 @@ export default { if (resp.ok) { resp.json().then((data) => { this.$emit('success', data) - this.$refs.input.value = '' + + if (this.$refs.input) { + this.$refs.input.value = '' + } + this.isLoading = false }) } else if (resp.status === 422) { diff --git a/app/jobs/process_submitter_completion_job.rb b/app/jobs/process_submitter_completion_job.rb index 0976b3bf..135c0c38 100644 --- a/app/jobs/process_submitter_completion_job.rb +++ b/app/jobs/process_submitter_completion_job.rb @@ -164,11 +164,13 @@ class ProcessSubmitterCompletionJob next_submitter_items = if submission.template_submitters.any? { |s| s['order'] } submitter_groups = - submission.template_submitters.group_by.with_index { |s, index| s['order'] || index } + submission.template_submitters + .group_by.with_index { |s, index| s['order'] || index } + .sort_by(&:first).pluck(1) - current_group_index = submitter_groups.find { |_, group| group.any? { |s| s['uuid'] == submitter.uuid } }&.first + current_group_index = submitter_groups.index { |group| group.any? { |s| s['uuid'] == submitter.uuid } } - if submitter_groups[current_group_index + 1] && + if current_group_index && submitter_groups[current_group_index + 1] && submitters_index.values_at(*submitter_groups[current_group_index].pluck('uuid')) .compact.all?(&:completed_at?) submitter_groups[current_group_index + 1] diff --git a/app/views/email_smtp_settings/index.html.erb b/app/views/email_smtp_settings/index.html.erb index 76733144..7e556a47 100644 --- a/app/views/email_smtp_settings/index.html.erb +++ b/app/views/email_smtp_settings/index.html.erb @@ -39,7 +39,7 @@
    <%= ff.label :security_label, 'SMTP Security', class: 'label' %>
    - <% [%w[Auto none], %w[SSL ssl], %w[TLS tls], %w[Noverify noverify]].each do |(label, val)| %> + <% [%w[STARTTLS none], %w[TLS tls], %w[SSL ssl], %w[Noverify noverify]].each do |(label, val)| %> <%= ff.label :security, value: val, for: "#{val}_radio", class: 'label' do %> <%= ff.radio_button :security, val, checked: (value['security'].blank? && val == 'none') || value['security'] == val, id: "#{val}_radio", class: 'base-radio mr-2' %> <%= label %> diff --git a/app/views/submissions/_value.html.erb b/app/views/submissions/_value.html.erb index d9939fc7..a0b3205d 100644 --- a/app/views/submissions/_value.html.erb +++ b/app/views/submissions/_value.html.erb @@ -60,7 +60,7 @@ <% end %> <% elsif field['type'] == 'cells' && area['cell_w'].to_f > 0.0 %> <% cell_width = area['cell_w'] / area['w'] * 100 %> -
    +
    <% (0..(area['w'] / area['cell_w']).ceil).each do |index| %> <% if value[index] %>
    <%= value[index] %>
    diff --git a/config/database.yml b/config/database.yml index 20921d2d..cedeaa09 100644 --- a/config/database.yml +++ b/config/database.yml @@ -30,9 +30,8 @@ production: <% elsif ENV['DATABASE_URL'].match?(/\Apostgres/) %> <<: *default url: <%= ENV['DATABASE_URL'] %> -<% elsif ENV['DATABASE_URL'].match?(/\Amysql/) %> - adapter: mysql2 +<% elsif ENV['DATABASE_URL'].match?(/\Amysql|\Atrilogy/) %> encoding: utf8mb4 pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15).to_i + ENV.fetch('SIDEKIQ_THREADS', 5).to_i %> - url: <%= ENV['DATABASE_URL'] %> + url: <%= ENV['DATABASE_URL'].sub(/\Amysql2?/, 'trilogy') %> <% end %> diff --git a/config/environments/production.rb b/config/environments/production.rb index eb0760c9..8ead5001 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -85,6 +85,7 @@ Rails.application.configure do domain: ENV.fetch('SMTP_DOMAIN', nil), user_name: ENV.fetch('SMTP_USERNAME', nil), password: ENV.fetch('SMTP_PASSWORD', nil), + openssl_verify_mode: ENV['SMTP_SSL_VERIFY'] == 'false' ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER, authentication: ENV.fetch('SMTP_PASSWORD', nil).present? ? ENV.fetch('SMTP_AUTHENTICATION', 'plain') : nil, enable_starttls: ENV['SMTP_ENABLE_STARTTLS'] != 'false' }.compact diff --git a/lib/action_mailer_configs_interceptor.rb b/lib/action_mailer_configs_interceptor.rb index 3f09abfa..5b2ad19b 100644 --- a/lib/action_mailer_configs_interceptor.rb +++ b/lib/action_mailer_configs_interceptor.rb @@ -47,6 +47,9 @@ module ActionMailerConfigsInterceptor is_tls = value['security'] == 'tls' || (value['security'].blank? && value['port'].to_s == '465') is_ssl = value['security'] == 'ssl' + is_noverify = value['security'] == 'noverify' + + enable_starttls = is_noverify ? :enable_starttls_auto : :enable_starttls { user_name: value['username'], @@ -54,9 +57,9 @@ module ActionMailerConfigsInterceptor address: value['host'], port: value['port'], domain: value['domain'], - openssl_verify_mode: value['security'] == 'noverify' ? OpenSSL::SSL::VERIFY_NONE : nil, + openssl_verify_mode: is_noverify ? OpenSSL::SSL::VERIFY_NONE : nil, authentication: value['password'].present? ? value.fetch('authentication', 'plain') : nil, - enable_starttls: !is_tls && !is_ssl, + enable_starttls => !is_tls && !is_ssl, open_timeout: OPEN_TIMEOUT, read_timeout: READ_TIMEOUT, ssl: is_ssl, diff --git a/lib/normalize_client_ip_middleware.rb b/lib/normalize_client_ip_middleware.rb index 41be3377..5e382856 100644 --- a/lib/normalize_client_ip_middleware.rb +++ b/lib/normalize_client_ip_middleware.rb @@ -6,9 +6,16 @@ class NormalizeClientIpMiddleware end def call(env) - if env['HTTP_CLIENT_IP'].present? && env['HTTP_X_CLIENT_IP'].present? && - env['HTTP_CLIENT_IP'].starts_with?("#{env['HTTP_X_CLIENT_IP']}:") - env['HTTP_CLIENT_IP'] = env['HTTP_X_CLIENT_IP'] + if env['HTTP_CLIENT_IP'].present? + if env['HTTP_X_CLIENT_IP'].present? && + env['HTTP_CLIENT_IP'].starts_with?("#{env['HTTP_X_CLIENT_IP']}:") + env['HTTP_CLIENT_IP'] = env['HTTP_X_CLIENT_IP'] + end + + if env['HTTP_X_FORWARDED_FOR'].present? && + env['HTTP_X_FORWARDED_FOR'].sub(/:\d+\z/, '') == env['HTTP_CLIENT_IP'] + env['HTTP_X_FORWARDED_FOR'] = env['HTTP_CLIENT_IP'] + end end @app.call(env) diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb index cd2076d8..b1e318cf 100644 --- a/lib/submissions/create_from_submitters.rb +++ b/lib/submissions/create_from_submitters.rb @@ -61,7 +61,8 @@ module Submissions submission.template_submitters << template_submitter - is_order_sent = submitters_order == 'random' || (template_submitter['order'] || index).zero? + is_order_sent = submitters_order == 'random' || + (template_submitter['order'] || submitter_attrs[:index] || index).zero? build_submitter(submission:, attrs: submitter_attrs, uuid:, is_order_sent:, user:, params:, @@ -308,7 +309,7 @@ module Submissions uuid = attrs[:uuid].presence uuid ||= submitters.find { |e| e['name'].to_s.casecmp(attrs[:role].to_s).zero? }&.dig('uuid') - uuid || submitters[index]&.dig('uuid') + uuid || submitters[attrs[:index] || index]&.dig('uuid') end def build_submitter(submission:, attrs:, uuid:, is_order_sent:, user:, preferences:, params:) diff --git a/lib/submissions/ensure_result_generated.rb b/lib/submissions/ensure_result_generated.rb index 39f4ef2f..468b54cf 100644 --- a/lib/submissions/ensure_result_generated.rb +++ b/lib/submissions/ensure_result_generated.rb @@ -19,7 +19,7 @@ module Submissions total_wait_time ||= 0 key = ['result_attachments', submitter.id].join(':') - return submitter.documents.reset if ApplicationRecord.uncached { LockEvent.exists?(key:, event_name: :complete) } + return submitter.documents.reload if ApplicationRecord.uncached { LockEvent.exists?(key:, event_name: :complete) } events = ApplicationRecord.uncached { LockEvent.where(key:).order(:id).to_a } @@ -32,6 +32,8 @@ module Submissions LockEvent.create!(key:, event_name: :complete) + submitter.documents.reset + documents end rescue ActiveRecord::RecordNotUnique @@ -60,7 +62,7 @@ module Submissions LockEvent.where(key: ['result_attachments', submitter.id].join(':')).order(:id).last end - break submitter.documents.reset if last_event.event_name.in?(%w[complete fail]) + break submitter.documents.reload if last_event.event_name.in?(%w[complete fail]) raise WaitForCompleteTimeout if total_wait_time > CHECK_COMPLETE_TIMEOUT end diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb index 47293728..72eeb9f1 100644 --- a/lib/submissions/generate_result_attachments.rb +++ b/lib/submissions/generate_result_attachments.rb @@ -200,7 +200,9 @@ module Submissions def fill_submitter_fields(submitter, account, pdfs_index, with_signature_id:, is_flatten:, with_headings: nil, with_submitter_timezone: false, with_signature_id_reason: true, with_file_links: nil) - cell_layouter = HexaPDF::Layout::TextLayouter.new(text_valign: :center, text_align: :center) + cell_layouters = Hash.new do |hash, valign| + hash[valign] = HexaPDF::Layout::TextLayouter.new(text_valign: valign.to_sym, text_align: :center) + end attachments_data_cache = {} @@ -550,6 +552,8 @@ module Submissions ) when ->(type) { type == 'cells' && !area['cell_w'].to_f.zero? } cell_width = area['cell_w'] * width + cell_valign = field.dig('preferences', 'valign').to_s.presence || 'center' + cell_layouter = cell_layouters[cell_valign] if (mask = field.dig('preferences', 'mask').presence) value = TextUtils.mask_value(value, mask) @@ -790,10 +794,10 @@ module Submissions def build_pdfs_index(submission, submitter: nil, flatten: true) latest_submitter = find_last_submitter(submission, submitter:) - Submissions::EnsureResultGenerated.call(latest_submitter) if latest_submitter + documents = Submissions::EnsureResultGenerated.call(latest_submitter) if latest_submitter + documents ||= submission.schema_documents - documents = latest_submitter&.documents&.preload(:blob).to_a.presence - documents ||= submission.schema_documents.preload(:blob) + ActiveRecord::Associations::Preloader.new(records: documents, associations: [:blob]).call attachment_uuids = Submissions.filtered_conditions_schema(submission).pluck('attachment_uuid') attachments_index = documents.index_by { |a| a.metadata['original_uuid'] || a.uuid } diff --git a/lib/submissions/normalize_param_utils.rb b/lib/submissions/normalize_param_utils.rb index 02b7e6a7..0e459063 100644 --- a/lib/submissions/normalize_param_utils.rb +++ b/lib/submissions/normalize_param_utils.rb @@ -10,7 +10,8 @@ module Submissions Array.wrap(submissions_params).each do |submission| submission[:submitters].each_with_index do |submitter, index| - _, new_attachments, new_fields = normalize_submitter_params!(submitter, template, index, add_fields:) + _, new_attachments, new_fields = + normalize_submitter_params!(submitter, template, submitter[:index] || index, add_fields:) attachments.push(*new_attachments) fields.push(*new_fields) diff --git a/lib/submissions/serialize_for_api.rb b/lib/submissions/serialize_for_api.rb index 0366ebc5..4569e9bb 100644 --- a/lib/submissions/serialize_for_api.rb +++ b/lib/submissions/serialize_for_api.rb @@ -14,6 +14,7 @@ module Submissions module_function + # rubocop:disable Metrics def call(submission, submitters = nil, params = {}, with_events: true, with_documents: true, with_values: true, expires_at: Accounts.link_expires_at(Account.new(id: submission.account_id))) submitters ||= submission.submitters.preload(documents_attachments: :blob, attachments_attachments: :blob) @@ -32,6 +33,10 @@ module Submissions json['submission_events'] = Submitters::SerializeForApi.serialize_events(submission.submission_events) end + if params[:include].to_s.include?('fields') + json['fields'] = submission.template_fields || submission.template&.fields + end + if submitters.all?(&:completed_at?) last_submitter = submitters.max_by(&:completed_at) @@ -57,6 +62,7 @@ module Submissions json end + # rubocop:enable Metrics def build_status(submission, submitters) if submitters.any?(&:declined_at?) diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb index 0c327acf..dc370791 100644 --- a/lib/submitters/submit_values.rb +++ b/lib/submitters/submit_values.rb @@ -48,6 +48,10 @@ module Submitters maybe_set_signature_reason!(values, submitter, params) validate_values!(values, submitter, params, request) + if (touch_attachment_uuid = params[:touch_attachment_uuid].presence) + ActiveStorage::Attachment.where(uuid: touch_attachment_uuid, record: submitter).touch_all(:created_at) + end + SubmissionEvents.create_with_tracking_data(submitter, 'complete_form', request) if params[:completed] == 'true' submitter.save! @@ -317,17 +321,33 @@ module Submitters end.exclude?(false) end + # rubocop:disable Metrics def check_field_condition(condition, submitter_values, fields_uuid_index) value = submitter_values[condition['field_uuid']] + field = fields_uuid_index[condition['field_uuid']] case condition['action'] when 'empty', 'unchecked' value.blank? when 'not_empty', 'checked' value.present? - when 'equal', 'contains' - field = fields_uuid_index[condition['field_uuid']] + when ->(action) { action == 'equal' && field&.dig('type') == 'number' } + return false if value.blank? || condition['value'].blank? + + (value.to_f - condition['value'].to_f).abs < Float::EPSILON + when ->(action) { action == 'not_equal' && field&.dig('type') == 'number' } + return false if value.blank? || condition['value'].blank? + (value.to_f - condition['value'].to_f).abs > Float::EPSILON + when 'greater_than' + return false if field.nil? || value.blank? || condition['value'].blank? + + value.to_f > condition['value'].to_f + when 'less_than' + return false if field.nil? || value.blank? || condition['value'].blank? + + value.to_f < condition['value'].to_f + when 'equal', 'contains' return true unless field values = Array.wrap(value) @@ -340,8 +360,6 @@ module Submitters values.include?(option['value'].presence || "#{I18n.t('option')} #{field['options'].index(option) + 1}") when 'not_equal', 'does_not_contain' - field = fields_uuid_index[condition['field_uuid']] - return true unless field return false unless field['options'] @@ -356,6 +374,7 @@ module Submitters true end end + # rubocop:enable Metrics def replace_default_variables(value, attrs, submission, with_time: false) return value if value.in?([true, false]) || value.is_a?(Numeric) || value.is_a?(Array)