From ee830d0e8504fb244eb3375a8249fae8fd1abb12 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 27 Aug 2021 08:05:22 +0100
Subject: [PATCH] refactor of multi-option filtering and validation

---
 .../ValidationEditor/ValidationDrawer.svelte  | 18 +++++-----
 packages/builder/src/helpers/lucene.js        |  6 ++--
 .../src/api/controllers/row/internalSearch.js | 34 -------------------
 .../src/forms/MultiFieldSelect.svelte         |  8 ++---
 .../src/forms/validation.js                   | 21 +-----------
 5 files changed, 16 insertions(+), 71 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
index 073ad18795..8ab9d61e36 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
@@ -15,7 +15,6 @@
   import { getSchemaForDatasource } from "builderStore/dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
-  import Multiselect from "../../../../../../../bbui/src/Form/Core/Multiselect.svelte"
 
   export let rules = []
   export let bindings = []
@@ -59,11 +58,11 @@
       value: "notRegex",
     },
     Contains: {
-      label: "Must contain one",
+      label: "Must contain",
       value: "contains",
     },
     NotContains: {
-      label: "Must not contain ",
+      label: "Must not contain",
       value: "notContains",
     },
   }
@@ -98,8 +97,8 @@
     ["attachment"]: [Constraints.Required],
     ["link"]: [
       Constraints.Required,
-      Constraints.ContainsRowID,
-      Constraints.NotContainsRowID,
+      Constraints.Contains,
+      Constraints.NotContains,
       Constraints.MinLength,
       Constraints.MaxLength,
     ],
@@ -283,7 +282,7 @@
                     disabled={rule.constraint === "required"}
                     on:change={e => (rule.value = e.detail)}
                   />
-                {:else if ["maxLength", "minLength", "regex", "notRegex"].includes(rule.constraint)}
+                {:else if rule.type !== "array" && ["maxLength", "minLength", "regex", "notRegex", "contains", "notContains"].includes(rule.constraint)}
                   <!-- Certain constraints always need string values-->
                   <Input
                     bind:value={rule.value}
@@ -297,15 +296,14 @@
                       bind:value={rule.value}
                       placeholder="Constraint value"
                     />
-                  {:else if rule.type === "array" && ["contains", "notContains"].includes(rule.constraint)}
-                    <Multiselect
+                  {:else if rule.type === "array"}
+                    <Select
                       disabled={rule.constraint === "required"}
                       options={dataSourceSchema.schema[field].constraints
                         .inclusion}
                       getOptionLabel={x => x}
                       getOptionValue={x => x}
-                      on:change={e => (rule.value = e.detail)}
-                      bind:value={rule.value}
+                      value={rule.value}
                     />
                   {:else if rule.type === "boolean"}
                     <Select
diff --git a/packages/builder/src/helpers/lucene.js b/packages/builder/src/helpers/lucene.js
index 556edf92a8..18692359e4 100644
--- a/packages/builder/src/helpers/lucene.js
+++ b/packages/builder/src/helpers/lucene.js
@@ -32,11 +32,11 @@ export const OperatorOptions = {
     label: "Less than",
   },
   Contains: {
-    value: "contains",
+    value: "equal",
     label: "Contains",
   },
   NotContains: {
-    value: "notContains",
+    value: "notEqual",
     label: "Does Not Contain",
   },
 }
@@ -64,7 +64,7 @@ export const getValidOperatorsForType = type => {
   } else if (type === "options") {
     return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
   } else if (type === "array") {
-    return [Op.Contains, Op.NotContains]
+    return [Op.Contains, Op.NotContains, Op.Empty, Op.NotEmpty]
   } else if (type === "boolean") {
     return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
   } else if (type === "longform") {
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index 12a2252b99..793454e601 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -17,8 +17,6 @@ class QueryBuilder {
       notEqual: {},
       empty: {},
       notEmpty: {},
-      contains: {},
-      notContains: {},
       ...base,
     }
     this.limit = 50
@@ -106,16 +104,6 @@ class QueryBuilder {
     return this
   }
 
-  addContains(key, value) {
-    this.query.contains[key] = value
-    return this
-  }
-
-  addNotContains(key, value) {
-    this.query.notContains[key] = value
-    return this
-  }
-
   /**
    * Preprocesses a value before going into a lucene search.
    * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -223,28 +211,6 @@ class QueryBuilder {
     if (this.query.notEmpty) {
       build(this.query.notEmpty, key => `${key}:["" TO *]`)
     }
-
-    if (this.query.contains) {
-      build(this.query.contains, (key, value) => {
-        if (!value) {
-          return null
-        }
-        return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
-      })
-    }
-
-    if (this.query.notContains) {
-      build(this.query.notContains, (key, value) => {
-        if (!value) {
-          return null
-        }
-        return `!${key}.${value}:${builder.preprocess(
-          value,
-          allPreProcessingOpts
-        )}`
-      })
-    }
-
     return query
   }
 
diff --git a/packages/standard-components/src/forms/MultiFieldSelect.svelte b/packages/standard-components/src/forms/MultiFieldSelect.svelte
index ad53fbd2be..cecc569b6f 100644
--- a/packages/standard-components/src/forms/MultiFieldSelect.svelte
+++ b/packages/standard-components/src/forms/MultiFieldSelect.svelte
@@ -43,12 +43,12 @@
 >
   {#if fieldState}
     <CoreMultiselect
-      value={$fieldState.value}
-      error={$fieldState.error}
+      value={fieldState.value || []}
+      error={fieldState.error}
       getOptionLabel={flatOptions ? x => x : x => x.label}
       getOptionValue={flatOptions ? x => x : x => x.value}
-      id={$fieldState.fieldId}
-      disabled={$fieldState.disabled}
+      id={fieldState.fieldId}
+      disabled={fieldState.disabled}
       on:change={e => fieldApi.setValue(e.detail)}
       {placeholder}
       {options}
diff --git a/packages/standard-components/src/forms/validation.js b/packages/standard-components/src/forms/validation.js
index 2e3b9390fb..deb228c4c0 100644
--- a/packages/standard-components/src/forms/validation.js
+++ b/packages/standard-components/src/forms/validation.js
@@ -76,19 +76,6 @@ export const createValidatorFromConstraints = (
       })
     }
 
-    if (
-      schemaConstraints.type === "array" &&
-      exists(schemaConstraints.inclusion)
-    ) {
-      const options = schemaConstraints.inclusion || []
-      rules.push({
-        type: "array",
-        constraint: "inclusion",
-        value: options,
-        error: "Invalid value",
-      })
-    }
-
     // Date constraint
     if (exists(schemaConstraints.datetime?.earliest)) {
       const limit = schemaConstraints.datetime.earliest
@@ -262,9 +249,7 @@ const maxValueHandler = (value, rule) => {
 
 // Evaluates an inclusion constraint
 const inclusionHandler = (value, rule) => {
-  return value == null || rule.type == "array"
-    ? rule.value.map(val => val === value)
-    : rule.value.includes(value)
+  return value == null || rule.value.includes(value)
 }
 
 // Evaluates an equal constraint
@@ -295,10 +280,6 @@ const notRegexHandler = (value, rule) => {
 
 // Evaluates a contains constraint
 const containsHandler = (value, rule) => {
-  if (rule.type == "array") {
-    const expectedValue = parseType(rule.value, "array")
-    return value && value.some(val => expectedValue.includes(val))
-  }
   const expectedValue = parseType(rule.value, "string")
   return value && value.includes(expectedValue)
 }