MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5290 from Upgreydd/Do_not_validate_if_multi-select_options_length_is_0 

Do not validate if multi-select options length is 0
This commit is contained in:
Martin McKeaveney 2022-04-21 14:29:44 +01:00 committed by GitHub
parent 389221a58e cfbb9bfcaa
commit 701cc93866
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
View File

@ -34,10 +34,10 @@
$: label = meta.name ? capitalise(meta.name) : "" $: label = meta.name ? capitalise(meta.name) : ""
const timeStamp = resolveTimeStamp(value) const timeStamp = resolveTimeStamp(value)
const isTimeStamp = timeStamp ? true : false const isTimeStamp = !!timeStamp
</script> </script>
{#if type === "options"} {#if type === "options" && meta.constraints.inclusion.length !== 0}
<Select <Select
{label} {label}
data-cy="{meta.name}-select" data-cy="{meta.name}-select"
@ -51,7 +51,7 @@
<Dropzone {label} bind:value /> <Dropzone {label} bind:value />
{:else if type === "boolean"} {:else if type === "boolean"}
<Toggle text={label} bind:value data-cy="{meta.name}-input" /> <Toggle text={label} bind:value data-cy="{meta.name}-input" />
{:else if type === "array"} {:else if type === "array" && meta.constraints.inclusion.length !== 0}
<Multiselect bind:value {label} options={meta.constraints.inclusion} /> <Multiselect bind:value {label} options={meta.constraints.inclusion} />
{:else if type === "link"} {:else if type === "link"}
<LinkedRowSelector bind:linkedRows={value} schema={meta} /> <LinkedRowSelector bind:linkedRows={value} schema={meta} />

5
packages/server/src/api/controllers/row/utils.js
View File

@ -65,7 +65,10 @@ exports.validate = async ({ tableId, row, table }) => {
if (type === FieldTypes.ARRAY && row[fieldName]) { if (type === FieldTypes.ARRAY && row[fieldName]) {
if (row[fieldName].length) { if (row[fieldName].length) {
row[fieldName].map(val => { row[fieldName].map(val => {
if (!constraints.inclusion.includes(val)) { if (
!constraints.inclusion.includes(val) &&
constraints.inclusion.length !== 0
) {
errors[fieldName] = "Field not in list" errors[fieldName] = "Field not in list"
} }
}) })