diff --git a/app/javascript/elements/turbo_modal.js b/app/javascript/elements/turbo_modal.js index 010beea07..810a69fc7 100644 --- a/app/javascript/elements/turbo_modal.js +++ b/app/javascript/elements/turbo_modal.js @@ -13,7 +13,7 @@ export default actionable(class extends HTMLElement { document.body.classList.remove('overflow-hidden') document.removeEventListener('keyup', this.onEscKey) - document.removeEventListener('turbo:submit-end', this.handleSubmit) + document.removeEventListener('turbo:submit-end', this.onSubmit) document.removeEventListener('turbo:before-cache', this.close) } diff --git a/app/javascript/submission_form/area.vue b/app/javascript/submission_form/area.vue index 44960a8c7..a282649ca 100644 --- a/app/javascript/submission_form/area.vue +++ b/app/javascript/submission_form/area.vue @@ -21,7 +21,7 @@
{{ field.name || fieldNames[field.type] }} @@ -146,6 +146,11 @@ export default { required: false, default: false }, + withLabel: { + type: Boolean, + required: false, + default: true + }, fieldIndex: { type: Number, required: false, diff --git a/app/javascript/submission_form/areas.vue b/app/javascript/submission_form/areas.vue index 170040633..2cbc8fe42 100644 --- a/app/javascript/submission_form/areas.vue +++ b/app/javascript/submission_form/areas.vue @@ -22,6 +22,7 @@ :submittable="true" :field-index="fieldIndex" :is-active="currentStep === step" + :with-label="withLabel" :is-value-set="step.some((f) => f.uuid in values)" :attachments-index="attachmentsIndex" @click="$emit('focus-step', step)" @@ -56,6 +57,11 @@ export default { required: false, default: () => ({}) }, + withLabel: { + type: Boolean, + required: false, + default: true + }, currentStep: { type: Array, required: false, diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue index 4a27d62b2..9ac4eb02b 100644 --- a/app/javascript/submission_form/form.vue +++ b/app/javascript/submission_form/form.vue @@ -4,6 +4,7 @@ :steps="stepFields" :values="values" :attachments-index="attachmentsIndex" + :with-label="!isAnonymousChecboxes" :current-step="currentStepFields" @focus-step="[saveStep(), goToStep($event, false, true), currentField.type !== 'checkbox' ? isFormVisible = true : '']" /> @@ -182,7 +183,7 @@ />
-
-
!e.name) && this.currentStepFields.length > 4 + }, isButtonDisabled () { return this.isSubmitting || (this.currentField.required && ['image', 'file'].includes(this.currentField.type) && !this.values[this.currentField.uuid]?.length) ||