From 90be29452b18aaa7938ca3b71cfecae3b7c41cad Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 2 Feb 2023 17:58:35 +0000 Subject: [PATCH 1/2] Removed extra forward slash in qr reader field type. --- .../design/settings/controls/FormFieldSelect.svelte | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte index a02ea41099..5f364277ed 100644 --- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte @@ -25,16 +25,21 @@ const getOptions = (schema, type) => { let entries = Object.entries(schema ?? {}) let types = [] - if (type === "field/options" || type === "field/barcode/qr") { + if (type === "field/options") { // allow options to be used on both options and string fields types = [type, "field/string"] } else { types = [type] } - types = types.map(type => type.slice(type.indexOf("/") + 1)) + types = types.map(type => { + let fieldTypeRaw = type.slice(type.indexOf("/") + 1) + let fieldTypeParsed = fieldTypeRaw.replace("/", "") + return fieldTypeParsed + }) entries = entries.filter(entry => types.includes(entry[1].type)) + return entries.map(entry => entry[0]) } From 8e78b075fd4ee08dcd7d999e451ae6902b850863 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 3 Feb 2023 10:22:36 +0000 Subject: [PATCH 2/2] Feedback updates. Backed out parsing and simply renamed the field config property --- .../src/components/design/settings/componentSettings.js | 2 +- .../design/settings/controls/FormFieldSelect.svelte | 6 +----- packages/client/manifest.json | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js index f9f4295c17..65a21f368d 100644 --- a/packages/builder/src/components/design/settings/componentSettings.js +++ b/packages/builder/src/components/design/settings/componentSettings.js @@ -56,7 +56,7 @@ const componentMap = { "field/link": FormFieldSelect, "field/array": FormFieldSelect, "field/json": FormFieldSelect, - "field/barcode/qr": FormFieldSelect, + "field/barcodeqr": FormFieldSelect, // Some validation types are the same as others, so not all types are // explicitly listed here. e.g. options uses string validation "validation/string": ValidationEditor, diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte index 5f364277ed..806abc4e92 100644 --- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte @@ -32,11 +32,7 @@ types = [type] } - types = types.map(type => { - let fieldTypeRaw = type.slice(type.indexOf("/") + 1) - let fieldTypeParsed = fieldTypeRaw.replace("/", "") - return fieldTypeParsed - }) + types = types.map(type => type.slice(type.indexOf("/") + 1)) entries = entries.filter(entry => types.includes(entry[1].type)) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index d1898a82c1..e24fa3a68a 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -3241,7 +3241,7 @@ }, "settings": [ { - "type": "field/barcode/qr", + "type": "field/barcodeqr", "label": "Field", "key": "field", "required": true