From 557c6c34f2075c921c0ee0bdc56da60fa029be40 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 19 Mar 2024 01:21:44 +0200 Subject: [PATCH] search default fields --- app/javascript/template_builder/area.vue | 2 +- app/javascript/template_builder/fields.vue | 88 ++++++++++++++++------ app/javascript/template_builder/i18n.js | 3 + 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue index 1452ef4e..cef69348 100644 --- a/app/javascript/template_builder/area.vue +++ b/app/javascript/template_builder/area.vue @@ -42,7 +42,7 @@ v-model="field.submitter_uuid" class="border-r" :compact="true" - :editable="editable && !defaultField" + :editable="editable && (!defaultField || defaultField.role !== submitter?.name)" :allow-add-new="!defaultSubmitters.length" :menu-classes="'dropdown-content bg-white menu menu-xs p-2 shadow rounded-box w-52 rounded-t-none -left-[1px] mt-[1px]'" :submitters="template.submitters" diff --git a/app/javascript/template_builder/fields.vue b/app/javascript/template_builder/fields.vue index 4b7034f0..b2bd2806 100644 --- a/app/javascript/template_builder/fields.vue +++ b/app/javascript/template_builder/fields.vue @@ -36,32 +36,63 @@

- +
-
-
- - - - {{ field.name }} - -
+
+ {{ t('field_not_found') }}
+ + {{ t('clear') }} +
- + +
15 + }, fieldIconsSorted () { if (this.fieldTypes.length) { return this.fieldTypes.reduce((acc, type) => { @@ -226,6 +265,13 @@ export default { return this.defaultFields.filter((f) => { return !this.submitterFields.find((field) => field.name === f.name) && (!f.role || f.role === this.selectedSubmitter.name) }) + }, + filteredSubmitterDefaultFields () { + if (this.defaultFieldsSearch) { + return this.submitterDefaultFields.filter((f) => f.name.toLowerCase().includes(this.defaultFieldsSearch.toLowerCase())) + } else { + return this.submitterDefaultFields + } } }, methods: { diff --git a/app/javascript/template_builder/i18n.js b/app/javascript/template_builder/i18n.js index 4b3d3b1b..bb9ef62a 100644 --- a/app/javascript/template_builder/i18n.js +++ b/app/javascript/template_builder/i18n.js @@ -1,4 +1,7 @@ const en = { + search_field: 'Search field', + field_not_found: 'Field not found', + clear: 'Clear', align: 'Align', left: 'Left', right: 'Right',