From 1ab618c2ef2ddb31ebb9cacc825353eee5997939 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Thu, 26 Aug 2021 14:22:52 +0100
Subject: [PATCH] fix indexing of arrays

---
 .../PropertyControls/FilterEditor/FilterDrawer.svelte  | 10 +---------
 .../server/src/api/controllers/row/internalSearch.js   |  5 +----
 packages/server/src/db/views/staticViews.js            |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
index 836f19a000..669ebe458b 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@@ -133,20 +133,12 @@
               />
             {:else if ["string", "longform", "number"].includes(filter.type)}
               <Input disabled={filter.noValue} bind:value={filter.value} />
-            {:else if filter.type === "options"}
+            {:else if filter.type === "options" || "array"}
               <Combobox
                 disabled={filter.noValue}
                 options={getFieldOptions(filter.field)}
                 bind:value={filter.value}
               />
-            {:else if filter.type === "array"}
-              <Multiselect
-                disabled={filter.noValue}
-                options={getFieldOptions(filter.field)}
-                bind:value={filter.value}
-                getOptionLabel={x => x}
-                getOptionValue={x => x}
-              />
             {:else if filter.type === "boolean"}
               <Combobox
                 disabled={filter.noValue}
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index 9b7cb71453..12a2252b99 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -229,10 +229,7 @@ class QueryBuilder {
         if (!value) {
           return null
         }
-        return `${key}.${value}:${builder.preprocess(
-          value,
-          allPreProcessingOpts
-        )}`
+        return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
       })
     }
 
diff --git a/packages/server/src/db/views/staticViews.js b/packages/server/src/db/views/staticViews.js
index b04fa45374..764b8f03c8 100644
--- a/packages/server/src/db/views/staticViews.js
+++ b/packages/server/src/db/views/staticViews.js
@@ -102,7 +102,7 @@ exports.createAllSearchIndex = async appId => {
           if (Array.isArray(input[key])) {
             for (let val in input[key]) {
               // eslint-disable-next-line no-undef
-              index(`${idxKey}.${input[key][val]}`, input[key][val], {
+              index(`${idxKey}`, input[key][val], {
                 store: true,
               })
             }