From 2aa7f2b2ff82355a68491db4ad0dec10045d7dd6 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Fri, 29 Jul 2022 14:41:41 +0100
Subject: [PATCH 1/2] Add Is in filter for options type

---
 packages/frontend-core/src/utils/lucene.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js
index 72ccdc9fea..f0df19608a 100644
--- a/packages/frontend-core/src/utils/lucene.js
+++ b/packages/frontend-core/src/utils/lucene.js
@@ -30,7 +30,7 @@ export const getValidOperatorsForType = type => {
   } else if (type === "number") {
     return numOps
   } else if (type === "options") {
-    return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty]
+    return [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
   } else if (type === "array") {
     return [Op.Contains, Op.NotContains, Op.Empty, Op.NotEmpty, Op.ContainsAny]
   } else if (type === "boolean") {

From fb3351e99bf03c6d97279e149b1686e6d605bade Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Fri, 29 Jul 2022 16:09:53 +0100
Subject: [PATCH 2/2] Add multiselect for options is in

---
 packages/bbui/src/Form/Multiselect.svelte                       | 2 +-
 .../design/settings/controls/FilterEditor/FilterDrawer.svelte   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte
index 7bcf22aa06..67e6f61054 100644
--- a/packages/bbui/src/Form/Multiselect.svelte
+++ b/packages/bbui/src/Form/Multiselect.svelte
@@ -27,7 +27,7 @@
     {error}
     {disabled}
     {readonly}
-    {value}
+    value={Array.isArray(value) ? value : [value]}
     {options}
     {placeholder}
     {sort}
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
index d99c0f43b8..4eab5d4f4b 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -140,7 +140,7 @@
               />
             {:else if ["string", "longform", "number", "formula"].includes(filter.type)}
               <Input disabled={filter.noValue} bind:value={filter.value} />
-            {:else if filter.type === "array"}
+            {:else if filter.type === "array" || (filter.type === "options" && filter.operator === "oneOf")}
               <Multiselect
                 disabled={filter.noValue}
                 options={getFieldOptions(filter.field)}