From 5829de9ee4cdd16ebf1e84c28cdd63b51e7d636b Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Wed, 15 May 2024 11:42:51 +0300 Subject: [PATCH] adjust required fields alert --- app/javascript/template_builder/builder.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue index 96a93137..08746a1b 100644 --- a/app/javascript/template_builder/builder.vue +++ b/app/javascript/template_builder/builder.vue @@ -1116,7 +1116,13 @@ export default { if (!this.isAllRequiredFieldsAdded) { e.preventDefault() - return alert(this.t('add_all_required_fields_to_continue')) + const fields = this.defaultRequiredFields?.filter((f) => { + return !this.template.fields?.some((field) => field.name === f.name) + }) + + if (fields?.length) { + return alert(this.t('add_all_required_fields_to_continue') + ': ' + fields.map((f) => f.name).join(', ')) + } } if (!this.template.fields.length) { @@ -1127,7 +1133,13 @@ export default { }, onSaveClick () { if (!this.isAllRequiredFieldsAdded) { - return alert(this.t('add_all_required_fields_to_continue')) + const fields = this.defaultRequiredFields?.filter((f) => { + return !this.template.fields?.some((field) => field.name === f.name) + }) + + if (fields?.length) { + return alert(this.t('add_all_required_fields_to_continue') + ': ' + fields.map((f) => f.name).join(', ')) + } } if (this.template.fields.length) {