Merge pull request #12002 from Budibase/fix/users-column-search-mapping

Fix/users column search mapping

packages/server/src/sdk/app/rows/search/tests/utils.spec.ts

@@ -20,7 +20,21 @@ const tableWithUserCol: Table = {
   },
 }
 
-describe("searchInputMapping", () => {
+const tableWithUsersCol: Table = {
+  _id: tableId,
+  name: "table",
+  schema: {
+    user: {
+      name: "user",
+      type: FieldType.BB_REFERENCE,
+      subtype: FieldTypeSubtypes.BB_REFERENCE.USERS,
+    },
+  },
+}
+
+describe.each([tableWithUserCol, tableWithUsersCol])(
+  "searchInputMapping",
+  col => {
     const globalUserId = dbCore.generateGlobalUserID()
     const userMedataId = dbCore.generateUserMetadataID(globalUserId)
 
@@ -33,7 +47,7 @@ describe("searchInputMapping", () => {
           },
         },
       }
-    const output = searchInputMapping(tableWithUserCol, params)
+      const output = searchInputMapping(col, params)
       expect(output.query.equal!["1:user"]).toBe(globalUserId)
     })
 
@@ -46,7 +60,7 @@ describe("searchInputMapping", () => {
           },
         },
       }
-    const output = searchInputMapping(tableWithUserCol, params)
+      const output = searchInputMapping(col, params)
       expect(output.query.oneOf!["1:user"]).toStrictEqual([
         globalUserId,
         globalUserId,
@@ -63,7 +77,7 @@ describe("searchInputMapping", () => {
           },
         },
       }
-    const output = searchInputMapping(tableWithUserCol, params)
+      const output = searchInputMapping(col, params)
       expect(output.query.equal!["1:user"]).toBe(email)
     })
 
@@ -71,7 +85,8 @@ describe("searchInputMapping", () => {
       const params: any = {
         tableId,
       }
-    const output = searchInputMapping(tableWithUserCol, params)
+      const output = searchInputMapping(col, params)
       expect(output.query).toBeUndefined()
     })
-})
+  }
+)

packages/server/src/sdk/app/rows/search/utils.ts

@@ -5,8 +5,10 @@ import {
   Table,
   DocumentType,
   SEPARATOR,
+  FieldSubtype,
 } from "@budibase/types"
 import { db as dbCore } from "@budibase/backend-core"
+import { utils } from "@budibase/shared-core"
 
 function findColumnInQueries(
   column: string,
@@ -66,8 +68,14 @@ export function searchInputMapping(table: Table, options: SearchParams) {
   for (let [key, column] of Object.entries(table.schema)) {
     switch (column.type) {
       case FieldType.BB_REFERENCE:
-        if (column.subtype === FieldTypeSubtypes.BB_REFERENCE.USER) {
+        const subtype = column.subtype as FieldSubtype
+        switch (subtype) {
+          case FieldSubtype.USER:
+          case FieldSubtype.USERS:
             userColumnMapping(key, options)
+            break
+          default:
+            utils.unreachable(subtype)
         }
         break
     }