From 6bbdf0e4744e2a42283eeeb36d2c4cd0e9d0f2bc Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 18 Apr 2024 17:04:26 +0100
Subject: [PATCH 01/18] Bindings support for views and table row searches

---
 .../buttons/TableFilterButton.svelte          | 71 ++++++++++++-------
 .../controls/FilterEditor/FilterDrawer.svelte |  1 +
 .../controls/FilterEditor/FilterUsers.svelte  | 21 +++---
 .../server/src/api/controllers/row/index.ts   | 15 +++-
 .../src/api/controllers/row/utils/utils.ts    | 41 ++++++++++-
 .../server/src/api/controllers/row/views.ts   | 14 +++-
 6 files changed, 122 insertions(+), 41 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
index 91456da655..26b6624160 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
@@ -1,7 +1,9 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { ActionButton, Modal, ModalContent } from "@budibase/bbui"
+  import { ActionButton, Drawer, Button } from "@budibase/bbui"
   import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte"
+  import { getUserBindings } from "dataBinding"
+  import { makePropSafe } from "@budibase/string-templates"
 
   export let schema
   export let filters
@@ -10,7 +12,7 @@
 
   const dispatch = createEventDispatcher()
 
-  let modal
+  let drawer
 
   $: tempValue = filters || []
   $: schemaFields = Object.entries(schema || {}).map(
@@ -22,37 +24,52 @@
 
   $: text = getText(filters)
   $: selected = tempValue.filter(x => !x.onEmptyFilter)?.length > 0
-
+  $: bindings = [
+    {
+      type: "context",
+      runtimeBinding: `${makePropSafe("now")}`,
+      readableBinding: `Date`,
+      category: "Date",
+      icon: "Date",
+      display: {
+        name: "Server date",
+      },
+    },
+    ...getUserBindings(true),
+  ]
   const getText = filters => {
     const count = filters?.filter(filter => filter.field)?.length
     return count ? `Filter (${count})` : "Filter"
   }
 </script>
 
-<ActionButton icon="Filter" quiet {disabled} on:click={modal.show} {selected}>
+<ActionButton icon="Filter" quiet {disabled} on:click={drawer.show} {selected}>
   {text}
 </ActionButton>
-<Modal bind:this={modal}>
-  <ModalContent
-    title="Filter"
-    confirmText="Save"
-    size="XL"
-    onConfirm={() => dispatch("change", tempValue)}
-  >
-    <div class="wrapper">
-      <FilterDrawer
-        allowBindings={false}
-        {filters}
-        {schemaFields}
-        datasource={{ type: "table", tableId }}
-        on:change={e => (tempValue = e.detail)}
-      />
-    </div>
-  </ModalContent>
-</Modal>
 
-<style>
-  .wrapper :global(.main) {
-    padding: 0;
-  }
-</style>
+<Drawer
+  bind:this={drawer}
+  title="Filtering"
+  on:drawerHide
+  on:drawerShow
+  forceModal
+>
+  <Button
+    cta
+    slot="buttons"
+    on:click={() => {
+      dispatch("change", tempValue)
+      drawer.hide()
+    }}
+  >
+    Save
+  </Button>
+  <FilterDrawer
+    slot="body"
+    {filters}
+    {schemaFields}
+    datasource={{ type: "table", tableId }}
+    on:change={e => (tempValue = e.detail)}
+    {bindings}
+  />
+</Drawer>
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 7f1ee8010d..74c081cd5b 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
@@ -304,6 +304,7 @@
                     OperatorOptions.ContainsAny.value,
                   ].includes(filter.operator)}
                   disabled={filter.noValue}
+                  type={filter.valueType}
                 />
               {:else}
                 <DrawerBindableInput disabled />
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
index 88383ba170..4613b8c40f 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterUsers.svelte
@@ -1,7 +1,6 @@
 <script>
   import { Select, Multiselect } from "@budibase/bbui"
   import { fetchData } from "@budibase/frontend-core"
-
   import { API } from "api"
 
   export let value = null
@@ -23,12 +22,14 @@
   $: component = multiselect ? Multiselect : Select
 </script>
 
-<svelte:component
-  this={component}
-  bind:value
-  autocomplete
-  {options}
-  getOptionLabel={option => option.email}
-  getOptionValue={option => option._id}
-  {disabled}
-/>
+<div class="user-control">
+  <svelte:component
+    this={component}
+    bind:value
+    autocomplete
+    {options}
+    getOptionLabel={option => option.email}
+    getOptionValue={option => option._id}
+    {disabled}
+  />
+</div>
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index c3d1f2cb47..7f99105ea4 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -2,7 +2,7 @@ import stream from "stream"
 import archiver from "archiver"
 
 import { quotas } from "@budibase/pro"
-import { objectStore } from "@budibase/backend-core"
+import { objectStore, context } from "@budibase/backend-core"
 import * as internal from "./internal"
 import * as external from "./external"
 import { isExternalTableID } from "../../../integrations/utils"
@@ -198,8 +198,21 @@ export async function destroy(ctx: UserCtx<DeleteRowRequest>) {
 export async function search(ctx: Ctx<SearchRowRequest, SearchRowResponse>) {
   const tableId = utils.getTableId(ctx)
 
+  // Current user context for bindable search
+  const { _id, _rev, firstName, lastName, email, status, roleId } = ctx.user
+
+  await context.ensureSnippetContext()
+
+  const enrichedQuery = await utils.enrichSearchContext(
+    { ...ctx.request.body.query },
+    {
+      user: { _id, _rev, firstName, lastName, email, status, roleId },
+    }
+  )
+
   const searchParams: RowSearchParams = {
     ...ctx.request.body,
+    query: enrichedQuery,
     tableId,
   }
 
diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts
index f387a468cf..503f139783 100644
--- a/packages/server/src/api/controllers/row/utils/utils.ts
+++ b/packages/server/src/api/controllers/row/utils/utils.ts
@@ -7,6 +7,8 @@ import {
   FieldType,
   RelationshipsJson,
   Row,
+  SearchRowRequest,
+  SearchRowResponse,
   Table,
   UserCtx,
 } from "@budibase/types"
@@ -22,7 +24,7 @@ import {
   getInternalRowId,
 } from "./basic"
 import sdk from "../../../../sdk"
-
+import { processStringSync } from "@budibase/string-templates"
 import validateJs from "validate.js"
 
 validateJs.extend(validateJs.validators.datetime, {
@@ -187,3 +189,40 @@ export async function sqlOutputProcessing(
 export function isUserMetadataTable(tableId: string) {
   return tableId === InternalTables.USER_METADATA
 }
+
+export async function enrichSearchContext(
+  fields: Record<string, any>,
+  inputs = {},
+  helpers = true
+): Promise<Record<string, any>> {
+  const enrichedQuery: Record<string, any> = {}
+  if (!fields || !inputs) {
+    return enrichedQuery
+  }
+  const parameters = { ...inputs }
+  // enrich the fields with dynamic parameters
+  for (let key of Object.keys(fields)) {
+    if (fields[key] == null) {
+      continue
+    }
+    if (typeof fields[key] === "object") {
+      // enrich nested fields object
+      enrichedQuery[key] = await enrichSearchContext(
+        fields[key],
+        parameters,
+        helpers
+      )
+    } else if (typeof fields[key] === "string") {
+      // enrich string value as normal
+      enrichedQuery[key] = processStringSync(fields[key], parameters, {
+        noEscaping: true,
+        noHelpers: !helpers,
+        escapeNewlines: true,
+      })
+    } else {
+      enrichedQuery[key] = fields[key]
+    }
+  }
+
+  return enrichedQuery
+}
diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts
index 2644446d82..18953ebe88 100644
--- a/packages/server/src/api/controllers/row/views.ts
+++ b/packages/server/src/api/controllers/row/views.ts
@@ -9,7 +9,8 @@ import {
 } from "@budibase/types"
 import { dataFilters } from "@budibase/shared-core"
 import sdk from "../../../sdk"
-import { db } from "@budibase/backend-core"
+import { db, context } from "@budibase/backend-core"
+import { enrichSearchContext, userSearchFromContext } from "./utils"
 
 export async function searchView(
   ctx: UserCtx<SearchViewRowRequest, SearchRowResponse>
@@ -56,10 +57,19 @@ export async function searchView(
     })
   }
 
+  // Current user search context.
+  const { _id, _rev, firstName, lastName, email, status, roleId } = ctx.user
+
+  await context.ensureSnippetContext()
+
+  const enrichedQuery = await enrichSearchContext(query, {
+    user: { _id, _rev, firstName, lastName, email, status, roleId },
+  })
+
   const searchOptions: RequiredKeys<SearchViewRowRequest> &
     RequiredKeys<Pick<RowSearchParams, "tableId" | "query" | "fields">> = {
     tableId: view.tableId,
-    query,
+    query: enrichedQuery,
     fields: viewFields,
     ...getSortOptions(body, view),
     limit: body.limit,

From bdf15b21b1f62cea09a3c03d5e0b8c7fc9260d66 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 19 Apr 2024 11:49:20 +0100
Subject: [PATCH 02/18] Fixes for filter drawer padding

---
 .../buttons/TableFilterButton.svelte          | 19 ++++++++++---------
 .../src/components/FilterBuilder.svelte       |  1 -
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
index 0fc3fd505e..140cac1533 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { ActionButton, Drawer, Button } from "@budibase/bbui"
+  import { ActionButton, Drawer, DrawerContent, Button } from "@budibase/bbui"
   import FilterBuilder from "components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
   import { getUserBindings } from "dataBinding"
   import { makePropSafe } from "@budibase/string-templates"
@@ -64,12 +64,13 @@
   >
     Save
   </Button>
-  <FilterBuilder
-    slot="body"
-    {filters}
-    {schemaFields}
-    datasource={{ type: "table", tableId }}
-    on:change={e => (tempValue = e.detail)}
-    {bindings}
-  />
+  <DrawerContent slot="body">
+    <FilterBuilder
+      {filters}
+      {schemaFields}
+      datasource={{ type: "table", tableId }}
+      on:change={e => (tempValue = e.detail)}
+      {bindings}
+    />
+  </DrawerContent>
 </Drawer>
diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte
index 104821aa0f..48d66bac64 100644
--- a/packages/frontend-core/src/components/FilterBuilder.svelte
+++ b/packages/frontend-core/src/components/FilterBuilder.svelte
@@ -321,7 +321,6 @@
   .container {
     width: 100%;
     max-width: 1000px;
-    margin: 0 auto;
   }
   .fields {
     display: grid;

From 203acc0efdd1df43e2d5f05e523c81d86213b4ba Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 23 Apr 2024 12:40:57 +0100
Subject: [PATCH 03/18] Fix for regression in api initialisation

---
 packages/frontend-core/src/components/FilterUsers.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/FilterUsers.svelte b/packages/frontend-core/src/components/FilterUsers.svelte
index 4613b8c40f..489426df1e 100644
--- a/packages/frontend-core/src/components/FilterUsers.svelte
+++ b/packages/frontend-core/src/components/FilterUsers.svelte
@@ -1,7 +1,9 @@
 <script>
   import { Select, Multiselect } from "@budibase/bbui"
   import { fetchData } from "@budibase/frontend-core"
-  import { API } from "api"
+  import { createAPIClient } from "../api"
+
+  export let API = createAPIClient()
 
   export let value = null
   export let disabled

From 87913230033b355f424da4b93859ecacdaefbd4a Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 23 Apr 2024 14:30:34 +0100
Subject: [PATCH 04/18] Remove unused flag

---
 .../backend/DataTable/buttons/TableFilterButton.svelte          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
index 140cac1533..decf77069f 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
@@ -35,7 +35,7 @@
         name: "Server date",
       },
     },
-    ...getUserBindings(true),
+    ...getUserBindings(),
   ]
   const getText = filters => {
     const count = filters?.filter(filter => filter.field)?.length

From d609100cd7a4aa480459b05efb6aad5039ab4236 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 23 Apr 2024 15:36:38 +0100
Subject: [PATCH 05/18] Lint

---
 packages/server/src/api/controllers/row/utils/utils.ts | 2 --
 packages/server/src/api/controllers/row/views.ts       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts
index 8aa30a86ee..7eb4901ded 100644
--- a/packages/server/src/api/controllers/row/utils/utils.ts
+++ b/packages/server/src/api/controllers/row/utils/utils.ts
@@ -7,8 +7,6 @@ import {
   FieldType,
   RelationshipsJson,
   Row,
-  SearchRowRequest,
-  SearchRowResponse,
   Table,
   UserCtx,
 } from "@budibase/types"
diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts
index 18953ebe88..59db99c223 100644
--- a/packages/server/src/api/controllers/row/views.ts
+++ b/packages/server/src/api/controllers/row/views.ts
@@ -10,7 +10,7 @@ import {
 import { dataFilters } from "@budibase/shared-core"
 import sdk from "../../../sdk"
 import { db, context } from "@budibase/backend-core"
-import { enrichSearchContext, userSearchFromContext } from "./utils"
+import { enrichSearchContext } from "./utils"
 
 export async function searchView(
   ctx: UserCtx<SearchViewRowRequest, SearchRowResponse>

From 8ab2ca41d5d5a0d0aefabeec0c6f062699c7ab06 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Wed, 24 Apr 2024 09:54:10 +0100
Subject: [PATCH 06/18] Added array parsing for search query config

---
 .../src/api/controllers/row/utils/utils.ts    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts
index 7eb4901ded..962756ff87 100644
--- a/packages/server/src/api/controllers/row/utils/utils.ts
+++ b/packages/server/src/api/controllers/row/utils/utils.ts
@@ -190,6 +190,23 @@ export function isUserMetadataTable(tableId: string) {
   return tableId === InternalTables.USER_METADATA
 }
 
+export async function enrichArrayContext(
+  fields: any[],
+  inputs = {},
+  helpers = true
+): Promise<any[]> {
+  const map: Record<string, any> = {}
+  for (let index in fields) {
+    map[index] = fields[index]
+  }
+  const output = await enrichSearchContext(map, inputs, helpers)
+  const outputArray: any[] = []
+  for (let [key, value] of Object.entries(output)) {
+    outputArray[parseInt(key)] = value
+  }
+  return outputArray
+}
+
 export async function enrichSearchContext(
   fields: Record<string, any>,
   inputs = {},
@@ -200,6 +217,11 @@ export async function enrichSearchContext(
     return enrichedQuery
   }
   const parameters = { ...inputs }
+
+  if (Array.isArray(fields)) {
+    return enrichArrayContext(fields, inputs, helpers)
+  }
+
   // enrich the fields with dynamic parameters
   for (let key of Object.keys(fields)) {
     if (fields[key] == null) {

From e8f15058a160411cb4140e422d5baa497d73ee1a Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 26 Apr 2024 16:03:32 +0100
Subject: [PATCH 07/18] Merge commit

---
 .../src/api/routes/tests/search.spec.ts       | 168 +++++++++++++++++-
 1 file changed, 167 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts
index 698ea0c10b..0a38a173a5 100644
--- a/packages/server/src/api/routes/tests/search.spec.ts
+++ b/packages/server/src/api/routes/tests/search.spec.ts
@@ -1,10 +1,12 @@
 import { tableForDatasource } from "../../../tests/utilities/structures"
 import { DatabaseName, getDatasource } from "../../../integrations/tests/utils"
+import { db as dbCore } from "@budibase/backend-core"
 
 import * as setup from "./utilities"
 import {
   Datasource,
   EmptyFilterOption,
+  FieldTypeSubtypes,
   FieldType,
   RowSearchParams,
   SearchFilters,
@@ -12,8 +14,14 @@ import {
   SortType,
   Table,
   TableSchema,
+  User,
 } from "@budibase/types"
 import _ from "lodash"
+import tk from "timekeeper"
+import { encodeJSBinding } from "@budibase/string-templates"
+
+const serverTime = new Date("2024-05-06T00:00:00.000Z")
+tk.freeze(serverTime)
 
 jest.unmock("mssql")
 
@@ -33,11 +41,18 @@ describe.each([
   let datasource: Datasource | undefined
   let table: Table
 
+  const snippets = [
+    {
+      name: "WeeksAgo",
+      code: "return function (weeks) {\n  const currentTime = new Date();\n  currentTime.setDate(currentTime.getDate()-(7 * (weeks || 1)));\n  return currentTime.toISOString();\n}",
+    },
+  ]
+
   beforeAll(async () => {
     if (isSqs) {
       envCleanup = config.setEnv({ SQS_SEARCH_ENABLE: "true" })
     }
-    await config.init()
+    await config.init({ snippets })
     if (dsProvider) {
       datasource = await config.createDatasource({
         datasource: await dsProvider,
@@ -154,6 +169,157 @@ describe.each([
     return expectSearch({ query })
   }
 
+  // Ensure all bindings resolve and perform as expected
+  describe("bindings", () => {
+    let globalUsers: any = []
+    const future = new Date(serverTime.getTime())
+
+    future.setDate(future.getDate() + 30)
+
+    const rows = (currentUser: User) => {
+      const globalUserIds = globalUsers.map((user: any) => {
+        return user._id
+      })
+      return [
+        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+        { name: currentUser.firstName, appointment: future.toISOString() },
+        { name: "pivot", appointment: serverTime.toISOString() },
+        { name: "single user, session user", single_user: currentUser._id },
+        { name: "single user", single_user: globalUserIds[0] },
+        {
+          name: "multi user",
+          multi_user: globalUserIds,
+        },
+        {
+          name: "multi user with session user",
+          multi_user: [...globalUserIds, currentUser._id],
+        },
+      ]
+    }
+
+    beforeAll(async () => {
+      // Set up some global users
+      globalUsers = await Promise.all(
+        Array(2)
+          .fill(0)
+          .map(async () => {
+            const globalUser = await config.globalUser()
+            const userMedataId = globalUser._id
+              ? dbCore.generateUserMetadataID(globalUser._id)
+              : null
+            return {
+              _id: globalUser._id,
+              _meta: userMedataId,
+            }
+          })
+      )
+
+      await createTable({
+        name: { name: "name", type: FieldType.STRING },
+        appointment: { name: "appointment", type: FieldType.DATETIME },
+        single_user: {
+          name: "single_user",
+          type: FieldType.BB_REFERENCE,
+          subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+        },
+        multi_user: {
+          name: "multi_user",
+          type: FieldType.BB_REFERENCE,
+          subtype: FieldTypeSubtypes.BB_REFERENCE.USERS,
+        },
+      })
+      await createRows([...rows(config.getUser())])
+    })
+
+    // !! Current User is auto generated per run
+    it("should return all rows matching the session firstname", async () => {
+      await expectQuery({
+        equal: { name: "{{ [user].firstName }}" },
+      }).toContainExactly([
+        { name: config.getUser().firstName, appointment: future.toISOString() },
+      ])
+    })
+
+    it("should return all rows after search request datetime", async () => {
+      await expectQuery({
+        range: {
+          appointment: {
+            low: "{{ [now] }}",
+            high: "9999-00-00T00:00:00.000Z",
+          },
+        },
+      }).toContainExactly([
+        {
+          name: config.getUser().firstName,
+          appointment: future.toISOString(),
+        },
+        { name: "pivot", appointment: serverTime.toISOString() },
+      ])
+    })
+
+    it("should return all rows before search request datetime", async () => {
+      await expectQuery({
+        range: {
+          appointment: {
+            low: "0000-00-00T00:00:00.000Z",
+            high: "{{ [now] }}",
+          },
+        },
+      }).toContainExactly([
+        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+        { name: "pivot", appointment: serverTime.toISOString() },
+      ])
+    })
+
+    it("should parse the encoded js snippet. One week prior", async () => {
+      const jsBinding = "return snippets.WeeksAgo();"
+      const encodedBinding = encodeJSBinding(jsBinding)
+
+      await expectQuery({
+        range: {
+          appointment: {
+            low: "0000-00-00T00:00:00.000Z",
+            high: encodedBinding,
+          },
+        },
+      }).toContainExactly([
+        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+      ])
+    })
+
+    it("should parse the encoded js binding. 2 weeks prior", async () => {
+      const jsBinding =
+        "const currentTime = new Date()\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();"
+      const encodedBinding = encodeJSBinding(jsBinding)
+
+      await expectQuery({
+        range: {
+          appointment: {
+            low: "0000-00-00T00:00:00.000Z",
+            high: encodedBinding,
+          },
+        },
+      }).toContainExactly([
+        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+      ])
+    })
+
+    it("should match a single user row by the session user id", async () => {
+      await expectQuery({
+        equal: { single_user: "{{ [user]._id }}" },
+      }).toContainExactly([
+        {
+          name: "single user, session user",
+          single_user: [{ _id: config.getUser()._id }],
+        },
+      ])
+    })
+  })
+
   describe("strings", () => {
     beforeAll(async () => {
       await createTable({

From f2cb90735b01b18df8a047d05598367daf9e638f Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 2 May 2024 09:24:05 +0100
Subject: [PATCH 08/18] Merge commit

---
 .../src/api/routes/tests/search.spec.ts       | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts
index b46ce51943..de2b52445f 100644
--- a/packages/server/src/api/routes/tests/search.spec.ts
+++ b/packages/server/src/api/routes/tests/search.spec.ts
@@ -7,7 +7,7 @@ import {
   AutoFieldSubType,
   Datasource,
   EmptyFilterOption,
-  FieldTypeSubtypes,
+  BBReferenceFieldSubType,
   FieldType,
   RowSearchParams,
   SearchFilters,
@@ -176,12 +176,13 @@ describe.each([
   // Ensure all bindings resolve and perform as expected
   describe("bindings", () => {
     let globalUsers: any = []
-    const future = new Date(serverTime.getTime())
+    let globalUserIds: any = []
 
+    const future = new Date(serverTime.getTime())
     future.setDate(future.getDate() + 30)
 
     const rows = (currentUser: User) => {
-      const globalUserIds = globalUsers.map((user: any) => {
+      globalUserIds = globalUsers.map((user: any) => {
         return user._id
       })
       return [
@@ -225,19 +226,19 @@ describe.each([
         single_user: {
           name: "single_user",
           type: FieldType.BB_REFERENCE,
-          subtype: FieldTypeSubtypes.BB_REFERENCE.USER,
+          subtype: BBReferenceFieldSubType.USER,
         },
         multi_user: {
           name: "multi_user",
           type: FieldType.BB_REFERENCE,
-          subtype: FieldTypeSubtypes.BB_REFERENCE.USERS,
+          subtype: BBReferenceFieldSubType.USERS,
         },
       })
       await createRows([...rows(config.getUser())])
     })
 
     // !! Current User is auto generated per run
-    it("should return all rows matching the session firstname", async () => {
+    it("should return all rows matching the session user firstname", async () => {
       await expectQuery({
         equal: { name: "{{ [user].firstName }}" },
       }).toContainExactly([
@@ -245,7 +246,7 @@ describe.each([
       ])
     })
 
-    it("should return all rows after search request datetime", async () => {
+    it("should parse the date binding and return all rows after the resolved value", async () => {
       await expectQuery({
         range: {
           appointment: {
@@ -262,7 +263,7 @@ describe.each([
       ])
     })
 
-    it("should return all rows before search request datetime", async () => {
+    it("should parse the date binding and return all rows before the resolved value", async () => {
       await expectQuery({
         range: {
           appointment: {
@@ -322,6 +323,33 @@ describe.each([
         },
       ])
     })
+
+    it("should match the session user id in a multi user field", async () => {
+      await expectQuery({
+        contains: { multi_user: ["{{ [user]._id }}"] },
+      }).toContainExactly([
+        {
+          name: "multi user with session user",
+          multi_user: [{ _id: config.getUser()._id }],
+        },
+      ])
+    })
+
+    it("should match the session user id in a multi user field", async () => {
+      await expectQuery({
+        notContains: { multi_user: ["{{ [user]._id }}"] },
+        notEmpty: { multi_user: true },
+      }).toContainExactly([
+        {
+          name: "multi user",
+          multi_user: globalUsers.map((user: any) => {
+            return {
+              _id: user._id,
+            }
+          }),
+        },
+      ])
+    })
   })
 
   describe("strings", () => {

From 5e7d1169f7039ae66250a555b259807b390e74ed Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 2 May 2024 16:26:09 +0100
Subject: [PATCH 09/18] Minor refactor to accomodate testing with snippets.
 More test cases for multiple binding types

---
 .../backend-core/src/context/mainContext.ts   |  2 +-
 .../src/components/FilterBuilder.svelte       |  1 -
 .../server/src/api/controllers/row/index.ts   |  5 +-
 .../server/src/api/controllers/row/views.ts   |  5 +-
 .../src/api/routes/tests/search.spec.ts       | 67 ++++++++++++++-----
 .../sdk/app/applications/tests/sync.spec.ts   |  2 +-
 packages/server/src/sdk/users/utils.ts        | 10 +++
 .../src/tests/utilities/TestConfiguration.ts  | 37 ++++++++--
 8 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts
index 6cea7efeba..9d4cc9096d 100644
--- a/packages/backend-core/src/context/mainContext.ts
+++ b/packages/backend-core/src/context/mainContext.ts
@@ -292,7 +292,7 @@ export async function ensureSnippetContext() {
   // Otherwise get snippets for this app and update context
   let snippets: Snippet[] | undefined
   const db = getAppDB()
-  if (db && !env.isTest()) {
+  if (db) {
     const app = await db.get<App>(DocumentType.APP_METADATA)
     snippets = app.snippets
   }
diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte
index e18e93e072..39106bc983 100644
--- a/packages/frontend-core/src/components/FilterBuilder.svelte
+++ b/packages/frontend-core/src/components/FilterBuilder.svelte
@@ -325,7 +325,6 @@
 <style>
   .container {
     width: 100%;
-    max-width: 1000px;
   }
   .fields {
     display: grid;
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 7f99105ea4..0e7a314f3e 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -198,15 +198,12 @@ export async function destroy(ctx: UserCtx<DeleteRowRequest>) {
 export async function search(ctx: Ctx<SearchRowRequest, SearchRowResponse>) {
   const tableId = utils.getTableId(ctx)
 
-  // Current user context for bindable search
-  const { _id, _rev, firstName, lastName, email, status, roleId } = ctx.user
-
   await context.ensureSnippetContext()
 
   const enrichedQuery = await utils.enrichSearchContext(
     { ...ctx.request.body.query },
     {
-      user: { _id, _rev, firstName, lastName, email, status, roleId },
+      user: sdk.users.getUserContextBindings(ctx.user),
     }
   )
 
diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts
index 59db99c223..e9e86ee733 100644
--- a/packages/server/src/api/controllers/row/views.ts
+++ b/packages/server/src/api/controllers/row/views.ts
@@ -57,13 +57,10 @@ export async function searchView(
     })
   }
 
-  // Current user search context.
-  const { _id, _rev, firstName, lastName, email, status, roleId } = ctx.user
-
   await context.ensureSnippetContext()
 
   const enrichedQuery = await enrichSearchContext(query, {
-    user: { _id, _rev, firstName, lastName, email, status, roleId },
+    user: sdk.users.getUserContextBindings(ctx.user),
   })
 
   const searchOptions: RequiredKeys<SearchViewRowRequest> &
diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts
index a68a9021f5..7a335a6650 100644
--- a/packages/server/src/api/routes/tests/search.spec.ts
+++ b/packages/server/src/api/routes/tests/search.spec.ts
@@ -174,29 +174,28 @@ describe.each([
   // Ensure all bindings resolve and perform as expected
   describe("bindings", () => {
     let globalUsers: any = []
-    let globalUserIds: any = []
 
     const future = new Date(serverTime.getTime())
     future.setDate(future.getDate() + 30)
 
     const rows = (currentUser: User) => {
-      globalUserIds = globalUsers.map((user: any) => {
-        return user._id
-      })
       return [
         { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
         { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
         { name: currentUser.firstName, appointment: future.toISOString() },
-        { name: "pivot", appointment: serverTime.toISOString() },
-        { name: "single user, session user", single_user: currentUser._id },
-        { name: "single user", single_user: globalUserIds[0] },
+        { name: "serverDate", appointment: serverTime.toISOString() },
+        {
+          name: "single user, session user",
+          single_user: JSON.stringify([currentUser]),
+        },
+        { name: "single user", single_user: JSON.stringify([globalUsers[0]]) },
         {
           name: "multi user",
-          multi_user: globalUserIds,
+          multi_user: JSON.stringify(globalUsers),
         },
         {
           name: "multi user with session user",
-          multi_user: [...globalUserIds, currentUser._id],
+          multi_user: JSON.stringify([...globalUsers, currentUser]),
         },
       ]
     }
@@ -257,7 +256,7 @@ describe.each([
           name: config.getUser().firstName,
           appointment: future.toISOString(),
         },
-        { name: "pivot", appointment: serverTime.toISOString() },
+        { name: "serverDate", appointment: serverTime.toISOString() },
       ])
     })
 
@@ -272,11 +271,11 @@ describe.each([
       }).toContainExactly([
         { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
         { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-        { name: "pivot", appointment: serverTime.toISOString() },
+        { name: "serverDate", appointment: serverTime.toISOString() },
       ])
     })
 
-    it("should parse the encoded js snippet. One week prior", async () => {
+    it("should parse the encoded js snippet. Return rows with appointments up to 1 week in the past", async () => {
       const jsBinding = "return snippets.WeeksAgo();"
       const encodedBinding = encodeJSBinding(jsBinding)
 
@@ -293,7 +292,7 @@ describe.each([
       ])
     })
 
-    it("should parse the encoded js binding. 2 weeks prior", async () => {
+    it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => {
       const jsBinding =
         "const currentTime = new Date()\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();"
       const encodedBinding = encodeJSBinding(jsBinding)
@@ -333,7 +332,7 @@ describe.each([
       ])
     })
 
-    it("should match the session user id in a multi user field", async () => {
+    it("should not match the session user id in a multi user field", async () => {
       await expectQuery({
         notContains: { multi_user: ["{{ [user]._id }}"] },
         notEmpty: { multi_user: true },
@@ -341,13 +340,47 @@ describe.each([
         {
           name: "multi user",
           multi_user: globalUsers.map((user: any) => {
-            return {
-              _id: user._id,
-            }
+            return { _id: user._id }
           }),
         },
       ])
     })
+
+    it("should match the session user id and a user table row id using helpers, user binding and a static user id.", async () => {
+      await expectQuery({
+        oneOf: {
+          single_user: [
+            "{{ default [user]._id '_empty_' }}",
+            globalUsers[0]._id,
+          ],
+        },
+      }).toContainExactly([
+        {
+          name: "single user, session user",
+          single_user: [{ _id: config.getUser()._id }],
+        },
+        {
+          name: "single user",
+          single_user: [{ _id: globalUsers[0]._id }],
+        },
+      ])
+    })
+
+    it("should resolve 'default' helper to '_empty_' when binding resolves to nothing", async () => {
+      await expectQuery({
+        oneOf: {
+          single_user: [
+            "{{ default [user]._idx '_empty_' }}",
+            globalUsers[0]._id,
+          ],
+        },
+      }).toContainExactly([
+        {
+          name: "single user",
+          single_user: [{ _id: globalUsers[0]._id }],
+        },
+      ])
+    })
   })
 
   describe("strings", () => {
diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts
index 69ff2bfaf3..d0bde2e973 100644
--- a/packages/server/src/sdk/app/applications/tests/sync.spec.ts
+++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts
@@ -36,7 +36,7 @@ function waitForUpdate(opts: { group?: boolean }) {
 }
 
 beforeAll(async () => {
-  await config.init("syncApp")
+  await config.init({ appName: "syncApp" })
 })
 
 async function createUser(email: string, roles: UserRoles, builder?: boolean) {
diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts
index 9632ac29d8..38424c245c 100644
--- a/packages/server/src/sdk/users/utils.ts
+++ b/packages/server/src/sdk/users/utils.ts
@@ -12,6 +12,7 @@ import {
   UserMetadata,
   Database,
   ContextUserMetadata,
+  UserCtx,
 } from "@budibase/types"
 
 export function combineMetadataAndUser(
@@ -124,3 +125,12 @@ export async function syncGlobalUsers() {
     await db.bulkDocs(toWrite)
   }
 }
+
+export function getUserContextBindings(user: ContextUser) {
+  if (!user) {
+    return {}
+  }
+  // Current user context for bindable search
+  const { _id, _rev, firstName, lastName, email, status, roleId } = user
+  return { _id, _rev, firstName, lastName, email, status, roleId }
+}
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index 42f173a1f0..20fdcdfed7 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -81,6 +81,12 @@ mocks.licenses.useUnlimited()
 
 dbInit()
 
+export interface CreateAppRequest {
+  appName: string
+  url?: string
+  snippets?: any[]
+}
+
 export interface TableToBuild extends Omit<Table, "sourceId" | "sourceType"> {
   sourceId?: string
   sourceType?: TableSourceType
@@ -218,11 +224,14 @@ export default class TestConfiguration {
   // SETUP /  TEARDOWN
 
   // use a new id as the name to avoid name collisions
-  async init(appName = newid()) {
+  async init(opts = {}) {
     if (!this.started) {
       await startup()
     }
-    return this.newTenant(appName)
+    return this.newTenant({
+      appName: newid(),
+      ...opts,
+    })
   }
 
   end() {
@@ -542,14 +551,14 @@ export default class TestConfiguration {
     return this.tenantId
   }
 
-  async newTenant(appName = newid()): Promise<App> {
+  async newTenant(opts: {}): Promise<App> {
     this.csrfToken = generator.hash()
 
     this.tenantId = structures.tenant.id()
     this.user = await this.globalUser()
     this.userMetadataId = generateUserMetadataID(this.user._id!)
 
-    return this.createApp(appName)
+    return this.createApp({ appName: newid(), ...opts })
   }
 
   doInTenant<T>(task: () => T) {
@@ -579,9 +588,9 @@ export default class TestConfiguration {
   }
 
   // APP
-  async createApp(appName: string, url?: string): Promise<App> {
-    // create dev app
-    // clear any old app
+  async createApp(opts: CreateAppRequest): Promise<App> {
+    const { appName, url, snippets } = opts
+
     this.appId = undefined
     this.app = await context.doInTenant(
       this.tenantId!,
@@ -592,6 +601,20 @@ export default class TestConfiguration {
         })) as App
     )
     this.appId = this.app.appId
+
+    if (snippets) {
+      this.app = await this._req(
+        appController.update,
+        {
+          ...this.app,
+          snippets,
+        },
+        {
+          appId: this.appId,
+        }
+      )
+    }
+
     return await context.doInAppContext(this.app.appId!, async () => {
       // create production app
       this.prodApp = await this.publish()

From a743028662c1f2becbfff3064dec546c32820ea3 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 2 May 2024 16:32:07 +0100
Subject: [PATCH 10/18] Lint

---
 packages/server/src/sdk/users/utils.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts
index 38424c245c..0194e900fe 100644
--- a/packages/server/src/sdk/users/utils.ts
+++ b/packages/server/src/sdk/users/utils.ts
@@ -12,7 +12,6 @@ import {
   UserMetadata,
   Database,
   ContextUserMetadata,
-  UserCtx,
 } from "@budibase/types"
 
 export function combineMetadataAndUser(

From 56fd28eb54e2cd283d46bbeb18736d27886fb0b3 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 2 May 2024 16:45:25 +0100
Subject: [PATCH 11/18] Test fixes

---
 packages/server/src/api/routes/public/tests/compare.spec.ts     | 2 +-
 .../server/src/migrations/functions/tests/tableSettings.spec.ts | 2 +-
 .../src/migrations/functions/usageQuotas/tests/syncApps.spec.ts | 2 +-
 .../src/migrations/functions/usageQuotas/tests/syncRows.spec.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/api/routes/public/tests/compare.spec.ts b/packages/server/src/api/routes/public/tests/compare.spec.ts
index ccf248f360..29d9767b85 100644
--- a/packages/server/src/api/routes/public/tests/compare.spec.ts
+++ b/packages/server/src/api/routes/public/tests/compare.spec.ts
@@ -68,7 +68,7 @@ describe("check the applications endpoints", () => {
 
 describe("check the tables endpoints", () => {
   it("should allow retrieving tables through search", async () => {
-    await config.createApp("new app 1")
+    await config.createApp({ appName: "new app 1" })
     table = await config.upsertTable()
     const res = await makeRequest("post", "/tables/search")
     expect(res).toSatisfyApiSpec()
diff --git a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts
index 8d28a43322..84e26c80f3 100644
--- a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts
+++ b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts
@@ -11,7 +11,7 @@ describe("run", () => {
 
   beforeAll(async () => {
     await config.init()
-    app = await config.createApp("testApp")
+    app = await config.createApp({ appName: "testApp" })
     screen = await config.createScreen()
   })
 
diff --git a/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts b/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts
index 1d4d4d0f71..3b6d7b66b2 100644
--- a/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts
+++ b/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts
@@ -22,7 +22,7 @@ describe("syncApps", () => {
       expect(usageDoc.usageQuota.apps).toEqual(3)
 
       // create an extra app to test the migration
-      await config.createApp("quota-test")
+      await config.createApp({ appName: "quota-test" })
 
       // migrate
       await syncApps.run()
diff --git a/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts b/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts
index 730278683c..cc3daa465f 100644
--- a/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts
+++ b/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts
@@ -29,7 +29,7 @@ describe("syncRows", () => {
         await config.createRow()
       })
       // app 2
-      const app2 = await config.createApp("second-app")
+      const app2 = await config.createApp({ appName: "second-app" })
       await context.doInAppContext(app2.appId, async () => {
         await config.createTable()
         await config.createRow()

From 16e3e1b7599b7eb5897cc8f84ea58d0ef3638455 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 2 May 2024 17:09:47 +0100
Subject: [PATCH 12/18] Run test matrix without sqs

---
 .../src/api/routes/tests/search.spec.ts       | 391 +++++++++---------
 1 file changed, 199 insertions(+), 192 deletions(-)

diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts
index 7a335a6650..9def617a7d 100644
--- a/packages/server/src/api/routes/tests/search.spec.ts
+++ b/packages/server/src/api/routes/tests/search.spec.ts
@@ -172,216 +172,223 @@ describe.each([
   }
 
   // Ensure all bindings resolve and perform as expected
-  describe("bindings", () => {
-    let globalUsers: any = []
+  !isSqs &&
+    describe("bindings", () => {
+      let globalUsers: any = []
 
-    const future = new Date(serverTime.getTime())
-    future.setDate(future.getDate() + 30)
+      const future = new Date(serverTime.getTime())
+      future.setDate(future.getDate() + 30)
 
-    const rows = (currentUser: User) => {
-      return [
-        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-        { name: currentUser.firstName, appointment: future.toISOString() },
-        { name: "serverDate", appointment: serverTime.toISOString() },
-        {
-          name: "single user, session user",
-          single_user: JSON.stringify([currentUser]),
-        },
-        { name: "single user", single_user: JSON.stringify([globalUsers[0]]) },
-        {
-          name: "multi user",
-          multi_user: JSON.stringify(globalUsers),
-        },
-        {
-          name: "multi user with session user",
-          multi_user: JSON.stringify([...globalUsers, currentUser]),
-        },
-      ]
-    }
+      const rows = (currentUser: User) => {
+        return [
+          { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+          { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+          { name: currentUser.firstName, appointment: future.toISOString() },
+          { name: "serverDate", appointment: serverTime.toISOString() },
+          {
+            name: "single user, session user",
+            single_user: JSON.stringify([currentUser]),
+          },
+          {
+            name: "single user",
+            single_user: JSON.stringify([globalUsers[0]]),
+          },
+          {
+            name: "multi user",
+            multi_user: JSON.stringify(globalUsers),
+          },
+          {
+            name: "multi user with session user",
+            multi_user: JSON.stringify([...globalUsers, currentUser]),
+          },
+        ]
+      }
 
-    beforeAll(async () => {
-      // Set up some global users
-      globalUsers = await Promise.all(
-        Array(2)
-          .fill(0)
-          .map(async () => {
-            const globalUser = await config.globalUser()
-            const userMedataId = globalUser._id
-              ? dbCore.generateUserMetadataID(globalUser._id)
-              : null
-            return {
-              _id: globalUser._id,
-              _meta: userMedataId,
-            }
-          })
-      )
+      beforeAll(async () => {
+        // Set up some global users
+        globalUsers = await Promise.all(
+          Array(2)
+            .fill(0)
+            .map(async () => {
+              const globalUser = await config.globalUser()
+              const userMedataId = globalUser._id
+                ? dbCore.generateUserMetadataID(globalUser._id)
+                : null
+              return {
+                _id: globalUser._id,
+                _meta: userMedataId,
+              }
+            })
+        )
 
-      await createTable({
-        name: { name: "name", type: FieldType.STRING },
-        appointment: { name: "appointment", type: FieldType.DATETIME },
-        single_user: {
-          name: "single_user",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USER,
-        },
-        multi_user: {
-          name: "multi_user",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USERS,
-        },
+        await createTable({
+          name: { name: "name", type: FieldType.STRING },
+          appointment: { name: "appointment", type: FieldType.DATETIME },
+          single_user: {
+            name: "single_user",
+            type: FieldType.BB_REFERENCE,
+            subtype: BBReferenceFieldSubType.USER,
+          },
+          multi_user: {
+            name: "multi_user",
+            type: FieldType.BB_REFERENCE,
+            subtype: BBReferenceFieldSubType.USERS,
+          },
+        })
+        await createRows([...rows(config.getUser())])
       })
-      await createRows([...rows(config.getUser())])
-    })
 
-    // !! Current User is auto generated per run
-    it("should return all rows matching the session user firstname", async () => {
-      await expectQuery({
-        equal: { name: "{{ [user].firstName }}" },
-      }).toContainExactly([
-        { name: config.getUser().firstName, appointment: future.toISOString() },
-      ])
-    })
-
-    it("should parse the date binding and return all rows after the resolved value", async () => {
-      await expectQuery({
-        range: {
-          appointment: {
-            low: "{{ [now] }}",
-            high: "9999-00-00T00:00:00.000Z",
+      // !! Current User is auto generated per run
+      it("should return all rows matching the session user firstname", async () => {
+        await expectQuery({
+          equal: { name: "{{ [user].firstName }}" },
+        }).toContainExactly([
+          {
+            name: config.getUser().firstName,
+            appointment: future.toISOString(),
           },
-        },
-      }).toContainExactly([
-        {
-          name: config.getUser().firstName,
-          appointment: future.toISOString(),
-        },
-        { name: "serverDate", appointment: serverTime.toISOString() },
-      ])
-    })
+        ])
+      })
 
-    it("should parse the date binding and return all rows before the resolved value", async () => {
-      await expectQuery({
-        range: {
-          appointment: {
-            low: "0000-00-00T00:00:00.000Z",
-            high: "{{ [now] }}",
+      it("should parse the date binding and return all rows after the resolved value", async () => {
+        await expectQuery({
+          range: {
+            appointment: {
+              low: "{{ [now] }}",
+              high: "9999-00-00T00:00:00.000Z",
+            },
           },
-        },
-      }).toContainExactly([
-        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-        { name: "serverDate", appointment: serverTime.toISOString() },
-      ])
-    })
-
-    it("should parse the encoded js snippet. Return rows with appointments up to 1 week in the past", async () => {
-      const jsBinding = "return snippets.WeeksAgo();"
-      const encodedBinding = encodeJSBinding(jsBinding)
-
-      await expectQuery({
-        range: {
-          appointment: {
-            low: "0000-00-00T00:00:00.000Z",
-            high: encodedBinding,
+        }).toContainExactly([
+          {
+            name: config.getUser().firstName,
+            appointment: future.toISOString(),
           },
-        },
-      }).toContainExactly([
-        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-      ])
-    })
+          { name: "serverDate", appointment: serverTime.toISOString() },
+        ])
+      })
 
-    it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => {
-      const jsBinding =
-        "const currentTime = new Date()\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();"
-      const encodedBinding = encodeJSBinding(jsBinding)
-
-      await expectQuery({
-        range: {
-          appointment: {
-            low: "0000-00-00T00:00:00.000Z",
-            high: encodedBinding,
+      it("should parse the date binding and return all rows before the resolved value", async () => {
+        await expectQuery({
+          range: {
+            appointment: {
+              low: "0000-00-00T00:00:00.000Z",
+              high: "{{ [now] }}",
+            },
           },
-        },
-      }).toContainExactly([
-        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-      ])
-    })
+        }).toContainExactly([
+          { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+          { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+          { name: "serverDate", appointment: serverTime.toISOString() },
+        ])
+      })
 
-    it("should match a single user row by the session user id", async () => {
-      await expectQuery({
-        equal: { single_user: "{{ [user]._id }}" },
-      }).toContainExactly([
-        {
-          name: "single user, session user",
-          single_user: [{ _id: config.getUser()._id }],
-        },
-      ])
-    })
+      it("should parse the encoded js snippet. Return rows with appointments up to 1 week in the past", async () => {
+        const jsBinding = "return snippets.WeeksAgo();"
+        const encodedBinding = encodeJSBinding(jsBinding)
 
-    it("should match the session user id in a multi user field", async () => {
-      await expectQuery({
-        contains: { multi_user: ["{{ [user]._id }}"] },
-      }).toContainExactly([
-        {
-          name: "multi user with session user",
-          multi_user: [{ _id: config.getUser()._id }],
-        },
-      ])
-    })
+        await expectQuery({
+          range: {
+            appointment: {
+              low: "0000-00-00T00:00:00.000Z",
+              high: encodedBinding,
+            },
+          },
+        }).toContainExactly([
+          { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+          { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+        ])
+      })
 
-    it("should not match the session user id in a multi user field", async () => {
-      await expectQuery({
-        notContains: { multi_user: ["{{ [user]._id }}"] },
-        notEmpty: { multi_user: true },
-      }).toContainExactly([
-        {
-          name: "multi user",
-          multi_user: globalUsers.map((user: any) => {
-            return { _id: user._id }
-          }),
-        },
-      ])
-    })
+      it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => {
+        const jsBinding =
+          "const currentTime = new Date()\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();"
+        const encodedBinding = encodeJSBinding(jsBinding)
 
-    it("should match the session user id and a user table row id using helpers, user binding and a static user id.", async () => {
-      await expectQuery({
-        oneOf: {
-          single_user: [
-            "{{ default [user]._id '_empty_' }}",
-            globalUsers[0]._id,
-          ],
-        },
-      }).toContainExactly([
-        {
-          name: "single user, session user",
-          single_user: [{ _id: config.getUser()._id }],
-        },
-        {
-          name: "single user",
-          single_user: [{ _id: globalUsers[0]._id }],
-        },
-      ])
-    })
+        await expectQuery({
+          range: {
+            appointment: {
+              low: "0000-00-00T00:00:00.000Z",
+              high: encodedBinding,
+            },
+          },
+        }).toContainExactly([
+          { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+          { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+        ])
+      })
 
-    it("should resolve 'default' helper to '_empty_' when binding resolves to nothing", async () => {
-      await expectQuery({
-        oneOf: {
-          single_user: [
-            "{{ default [user]._idx '_empty_' }}",
-            globalUsers[0]._id,
-          ],
-        },
-      }).toContainExactly([
-        {
-          name: "single user",
-          single_user: [{ _id: globalUsers[0]._id }],
-        },
-      ])
+      it("should match a single user row by the session user id", async () => {
+        await expectQuery({
+          equal: { single_user: "{{ [user]._id }}" },
+        }).toContainExactly([
+          {
+            name: "single user, session user",
+            single_user: [{ _id: config.getUser()._id }],
+          },
+        ])
+      })
+
+      it("should match the session user id in a multi user field", async () => {
+        await expectQuery({
+          contains: { multi_user: ["{{ [user]._id }}"] },
+        }).toContainExactly([
+          {
+            name: "multi user with session user",
+            multi_user: [{ _id: config.getUser()._id }],
+          },
+        ])
+      })
+
+      it("should not match the session user id in a multi user field", async () => {
+        await expectQuery({
+          notContains: { multi_user: ["{{ [user]._id }}"] },
+          notEmpty: { multi_user: true },
+        }).toContainExactly([
+          {
+            name: "multi user",
+            multi_user: globalUsers.map((user: any) => {
+              return { _id: user._id }
+            }),
+          },
+        ])
+      })
+
+      it("should match the session user id and a user table row id using helpers, user binding and a static user id.", async () => {
+        await expectQuery({
+          oneOf: {
+            single_user: [
+              "{{ default [user]._id '_empty_' }}",
+              globalUsers[0]._id,
+            ],
+          },
+        }).toContainExactly([
+          {
+            name: "single user, session user",
+            single_user: [{ _id: config.getUser()._id }],
+          },
+          {
+            name: "single user",
+            single_user: [{ _id: globalUsers[0]._id }],
+          },
+        ])
+      })
+
+      it("should resolve 'default' helper to '_empty_' when binding resolves to nothing", async () => {
+        await expectQuery({
+          oneOf: {
+            single_user: [
+              "{{ default [user]._idx '_empty_' }}",
+              globalUsers[0]._id,
+            ],
+          },
+        }).toContainExactly([
+          {
+            name: "single user",
+            single_user: [{ _id: globalUsers[0]._id }],
+          },
+        ])
+      })
     })
-  })
 
   describe("strings", () => {
     beforeAll(async () => {

From 407dacaf8c1b1192db8e018279515ed8868c2024 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 2 May 2024 17:34:04 +0100
Subject: [PATCH 13/18] Fix for app url test config

---
 packages/server/src/migrations/functions/tests/appUrls.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/migrations/functions/tests/appUrls.spec.js b/packages/server/src/migrations/functions/tests/appUrls.spec.js
index 7a2f324552..3d48515068 100644
--- a/packages/server/src/migrations/functions/tests/appUrls.spec.js
+++ b/packages/server/src/migrations/functions/tests/appUrls.spec.js
@@ -13,7 +13,7 @@ describe("run", () => {
   afterAll(config.end)
 
   it("runs successfully", async () => {
-    const app = await config.createApp("testApp")
+    const app = await config.createApp({ appName: "testApp" })
     const metadata = await dbCore.doWithDB(app.appId, async db => {
       const metadataDoc = await db.get(dbCore.DocumentType.APP_METADATA)
       delete metadataDoc.url

From 3823ffa4fdc7ca3766a18be48a74c805241e1425 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 2 May 2024 17:59:55 +0100
Subject: [PATCH 14/18] Ensure snippet context is disabled by default in test.
 Add override for search

---
 packages/backend-core/src/context/mainContext.ts | 4 ++--
 packages/server/src/api/controllers/row/index.ts | 2 +-
 packages/server/src/api/controllers/row/views.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts
index 9d4cc9096d..4beb02c9c7 100644
--- a/packages/backend-core/src/context/mainContext.ts
+++ b/packages/backend-core/src/context/mainContext.ts
@@ -281,7 +281,7 @@ export function doInScimContext(task: any) {
   return newContext(updates, task)
 }
 
-export async function ensureSnippetContext() {
+export async function ensureSnippetContext(enabled = !env.isTest()) {
   const ctx = getCurrentContext()
 
   // If we've already added snippets to context, continue
@@ -292,7 +292,7 @@ export async function ensureSnippetContext() {
   // Otherwise get snippets for this app and update context
   let snippets: Snippet[] | undefined
   const db = getAppDB()
-  if (db) {
+  if (db && enabled) {
     const app = await db.get<App>(DocumentType.APP_METADATA)
     snippets = app.snippets
   }
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 0e7a314f3e..8bc73e599a 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -198,7 +198,7 @@ export async function destroy(ctx: UserCtx<DeleteRowRequest>) {
 export async function search(ctx: Ctx<SearchRowRequest, SearchRowResponse>) {
   const tableId = utils.getTableId(ctx)
 
-  await context.ensureSnippetContext()
+  await context.ensureSnippetContext(true)
 
   const enrichedQuery = await utils.enrichSearchContext(
     { ...ctx.request.body.query },
diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts
index e9e86ee733..5237ca712a 100644
--- a/packages/server/src/api/controllers/row/views.ts
+++ b/packages/server/src/api/controllers/row/views.ts
@@ -57,7 +57,7 @@ export async function searchView(
     })
   }
 
-  await context.ensureSnippetContext()
+  await context.ensureSnippetContext(true)
 
   const enrichedQuery = await enrichSearchContext(query, {
     user: sdk.users.getUserContextBindings(ctx.user),

From 4e5025bdabd6bb1637e3b4ea9ab612d1583967c1 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 3 May 2024 17:33:56 +0100
Subject: [PATCH 15/18] Merge commit

---
 packages/server/src/api/routes/tests/search.spec.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts
index 9def617a7d..0c16abcadc 100644
--- a/packages/server/src/api/routes/tests/search.spec.ts
+++ b/packages/server/src/api/routes/tests/search.spec.ts
@@ -54,7 +54,14 @@ describe.each([
     if (isSqs) {
       envCleanup = config.setEnv({ SQS_SEARCH_ENABLE: "true" })
     }
-    await config.init({ snippets })
+    await config.init()
+
+    if (config.app?.appId) {
+      config.app = await config.api.application.update(config.app?.appId, {
+        snippets,
+      })
+    }
+
     if (dsProvider) {
       datasource = await config.createDatasource({
         datasource: await dsProvider,

From 04588711e211238dc1e9a27aa4736e81b3606dbd Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 7 May 2024 09:13:43 +0100
Subject: [PATCH 16/18] Refactored out config changes and now excluding on the
 affected SQS/Multiuser tests

---
 .../api/routes/public/tests/compare.spec.ts   |   2 +-
 .../src/api/routes/tests/search.spec.ts       | 361 +++++++++---------
 .../functions/tests/appUrls.spec.js           |   2 +-
 .../functions/tests/tableSettings.spec.ts     |   2 +-
 .../usageQuotas/tests/syncApps.spec.ts        |   2 +-
 .../usageQuotas/tests/syncRows.spec.ts        |   2 +-
 .../src/tests/utilities/TestConfiguration.ts  |  28 +-
 7 files changed, 193 insertions(+), 206 deletions(-)

diff --git a/packages/server/src/api/routes/public/tests/compare.spec.ts b/packages/server/src/api/routes/public/tests/compare.spec.ts
index 29d9767b85..ccf248f360 100644
--- a/packages/server/src/api/routes/public/tests/compare.spec.ts
+++ b/packages/server/src/api/routes/public/tests/compare.spec.ts
@@ -68,7 +68,7 @@ describe("check the applications endpoints", () => {
 
 describe("check the tables endpoints", () => {
   it("should allow retrieving tables through search", async () => {
-    await config.createApp({ appName: "new app 1" })
+    await config.createApp("new app 1")
     table = await config.upsertTable()
     const res = await makeRequest("post", "/tables/search")
     expect(res).toSatisfyApiSpec()
diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts
index 45bc4aa6d4..27c07d85be 100644
--- a/packages/server/src/api/routes/tests/search.spec.ts
+++ b/packages/server/src/api/routes/tests/search.spec.ts
@@ -179,173 +179,178 @@ describe.each([
   }
 
   // Ensure all bindings resolve and perform as expected
-  !isSqs &&
-    describe("bindings", () => {
-      let globalUsers: any = []
+  describe("bindings", () => {
+    let globalUsers: any = []
 
-      const future = new Date(serverTime.getTime())
-      future.setDate(future.getDate() + 30)
+    const future = new Date(serverTime.getTime())
+    future.setDate(future.getDate() + 30)
 
-      const rows = (currentUser: User) => {
-        return [
-          { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-          { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-          { name: currentUser.firstName, appointment: future.toISOString() },
-          { name: "serverDate", appointment: serverTime.toISOString() },
-          {
-            name: "single user, session user",
-            single_user: JSON.stringify([currentUser]),
-          },
-          {
-            name: "single user",
-            single_user: JSON.stringify([globalUsers[0]]),
-          },
-          {
-            name: "multi user",
-            multi_user: JSON.stringify(globalUsers),
-          },
-          {
-            name: "multi user with session user",
-            multi_user: JSON.stringify([...globalUsers, currentUser]),
-          },
-        ]
-      }
+    const rows = (currentUser: User) => {
+      return [
+        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+        { name: currentUser.firstName, appointment: future.toISOString() },
+        { name: "serverDate", appointment: serverTime.toISOString() },
+        {
+          name: "single user, session user",
+          single_user: JSON.stringify([currentUser]),
+        },
+        {
+          name: "single user",
+          single_user: JSON.stringify([globalUsers[0]]),
+        },
+        {
+          name: "multi user",
+          multi_user: JSON.stringify(globalUsers),
+        },
+        {
+          name: "multi user with session user",
+          multi_user: JSON.stringify([...globalUsers, currentUser]),
+        },
+      ]
+    }
 
-      beforeAll(async () => {
-        // Set up some global users
-        globalUsers = await Promise.all(
-          Array(2)
-            .fill(0)
-            .map(async () => {
-              const globalUser = await config.globalUser()
-              const userMedataId = globalUser._id
-                ? dbCore.generateUserMetadataID(globalUser._id)
-                : null
-              return {
-                _id: globalUser._id,
-                _meta: userMedataId,
-              }
-            })
-        )
+    beforeAll(async () => {
+      // Set up some global users
+      globalUsers = await Promise.all(
+        Array(2)
+          .fill(0)
+          .map(async () => {
+            const globalUser = await config.globalUser()
+            const userMedataId = globalUser._id
+              ? dbCore.generateUserMetadataID(globalUser._id)
+              : null
+            return {
+              _id: globalUser._id,
+              _meta: userMedataId,
+            }
+          })
+      )
 
-        await createTable({
-          name: { name: "name", type: FieldType.STRING },
-          appointment: { name: "appointment", type: FieldType.DATETIME },
-          single_user: {
-            name: "single_user",
-            type: FieldType.BB_REFERENCE,
-            subtype: BBReferenceFieldSubType.USER,
-          },
-          multi_user: {
-            name: "multi_user",
-            type: FieldType.BB_REFERENCE,
-            subtype: BBReferenceFieldSubType.USERS,
-          },
-        })
-        await createRows([...rows(config.getUser())])
+      await createTable({
+        name: { name: "name", type: FieldType.STRING },
+        appointment: { name: "appointment", type: FieldType.DATETIME },
+        single_user: {
+          name: "single_user",
+          type: FieldType.BB_REFERENCE,
+          subtype: BBReferenceFieldSubType.USER,
+        },
+        multi_user: {
+          name: "multi_user",
+          type: FieldType.BB_REFERENCE,
+          subtype: BBReferenceFieldSubType.USERS,
+        },
       })
+      await createRows([...rows(config.getUser())])
+    })
 
-      // !! Current User is auto generated per run
-      it("should return all rows matching the session user firstname", async () => {
-        await expectQuery({
-          equal: { name: "{{ [user].firstName }}" },
-        }).toContainExactly([
-          {
-            name: config.getUser().firstName,
-            appointment: future.toISOString(),
+    // !! Current User is auto generated per run
+    it("should return all rows matching the session user firstname", async () => {
+      await expectQuery({
+        equal: { name: "{{ [user].firstName }}" },
+      }).toContainExactly([
+        {
+          name: config.getUser().firstName,
+          appointment: future.toISOString(),
+        },
+      ])
+    })
+
+    it("should parse the date binding and return all rows after the resolved value", async () => {
+      await expectQuery({
+        range: {
+          appointment: {
+            low: "{{ [now] }}",
+            high: "9999-00-00T00:00:00.000Z",
           },
-        ])
-      })
+        },
+      }).toContainExactly([
+        {
+          name: config.getUser().firstName,
+          appointment: future.toISOString(),
+        },
+        { name: "serverDate", appointment: serverTime.toISOString() },
+      ])
+    })
 
-      it("should parse the date binding and return all rows after the resolved value", async () => {
-        await expectQuery({
-          range: {
-            appointment: {
-              low: "{{ [now] }}",
-              high: "9999-00-00T00:00:00.000Z",
-            },
+    it("should parse the date binding and return all rows before the resolved value", async () => {
+      await expectQuery({
+        range: {
+          appointment: {
+            low: "0000-00-00T00:00:00.000Z",
+            high: "{{ [now] }}",
           },
-        }).toContainExactly([
-          {
-            name: config.getUser().firstName,
-            appointment: future.toISOString(),
+        },
+      }).toContainExactly([
+        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+        { name: "serverDate", appointment: serverTime.toISOString() },
+      ])
+    })
+
+    it("should parse the encoded js snippet. Return rows with appointments up to 1 week in the past", async () => {
+      const jsBinding = "return snippets.WeeksAgo();"
+      const encodedBinding = encodeJSBinding(jsBinding)
+
+      await expectQuery({
+        range: {
+          appointment: {
+            low: "0000-00-00T00:00:00.000Z",
+            high: encodedBinding,
           },
-          { name: "serverDate", appointment: serverTime.toISOString() },
-        ])
-      })
+        },
+      }).toContainExactly([
+        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+      ])
+    })
 
-      it("should parse the date binding and return all rows before the resolved value", async () => {
-        await expectQuery({
-          range: {
-            appointment: {
-              low: "0000-00-00T00:00:00.000Z",
-              high: "{{ [now] }}",
-            },
+    it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => {
+      const jsBinding =
+        "const currentTime = new Date()\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();"
+      const encodedBinding = encodeJSBinding(jsBinding)
+
+      await expectQuery({
+        range: {
+          appointment: {
+            low: "0000-00-00T00:00:00.000Z",
+            high: encodedBinding,
           },
-        }).toContainExactly([
-          { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-          { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-          { name: "serverDate", appointment: serverTime.toISOString() },
-        ])
-      })
+        },
+      }).toContainExactly([
+        { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+        { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+      ])
+    })
 
-      it("should parse the encoded js snippet. Return rows with appointments up to 1 week in the past", async () => {
-        const jsBinding = "return snippets.WeeksAgo();"
-        const encodedBinding = encodeJSBinding(jsBinding)
-
-        await expectQuery({
-          range: {
-            appointment: {
-              low: "0000-00-00T00:00:00.000Z",
-              high: encodedBinding,
-            },
-          },
-        }).toContainExactly([
-          { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-          { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-        ])
-      })
-
-      it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => {
-        const jsBinding =
-          "const currentTime = new Date()\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();"
-        const encodedBinding = encodeJSBinding(jsBinding)
-
-        await expectQuery({
-          range: {
-            appointment: {
-              low: "0000-00-00T00:00:00.000Z",
-              high: encodedBinding,
-            },
-          },
-        }).toContainExactly([
-          { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-          { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-        ])
-      })
-
-      it("should match a single user row by the session user id", async () => {
-        await expectQuery({
-          equal: { single_user: "{{ [user]._id }}" },
-        }).toContainExactly([
-          {
-            name: "single user, session user",
-            single_user: [{ _id: config.getUser()._id }],
-          },
-        ])
-      })
+    it("should match a single user row by the session user id", async () => {
+      await expectQuery({
+        equal: { single_user: "{{ [user]._id }}" },
+      }).toContainExactly([
+        {
+          name: "single user, session user",
+          single_user: [{ _id: config.getUser()._id }],
+        },
+      ])
+    })
 
+    !isSqs &&
       it("should match the session user id in a multi user field", async () => {
+        const allUsers = [...globalUsers, config.getUser()].map((user: any) => {
+          return { _id: user._id }
+        })
+
         await expectQuery({
           contains: { multi_user: ["{{ [user]._id }}"] },
         }).toContainExactly([
           {
             name: "multi user with session user",
-            multi_user: [{ _id: config.getUser()._id }],
+            multi_user: allUsers,
           },
         ])
       })
 
+    !isSqs &&
       it("should not match the session user id in a multi user field", async () => {
         await expectQuery({
           notContains: { multi_user: ["{{ [user]._id }}"] },
@@ -360,43 +365,43 @@ describe.each([
         ])
       })
 
-      it("should match the session user id and a user table row id using helpers, user binding and a static user id.", async () => {
-        await expectQuery({
-          oneOf: {
-            single_user: [
-              "{{ default [user]._id '_empty_' }}",
-              globalUsers[0]._id,
-            ],
-          },
-        }).toContainExactly([
-          {
-            name: "single user, session user",
-            single_user: [{ _id: config.getUser()._id }],
-          },
-          {
-            name: "single user",
-            single_user: [{ _id: globalUsers[0]._id }],
-          },
-        ])
-      })
-
-      it("should resolve 'default' helper to '_empty_' when binding resolves to nothing", async () => {
-        await expectQuery({
-          oneOf: {
-            single_user: [
-              "{{ default [user]._idx '_empty_' }}",
-              globalUsers[0]._id,
-            ],
-          },
-        }).toContainExactly([
-          {
-            name: "single user",
-            single_user: [{ _id: globalUsers[0]._id }],
-          },
-        ])
-      })
+    it("should match the session user id and a user table row id using helpers, user binding and a static user id.", async () => {
+      await expectQuery({
+        oneOf: {
+          single_user: [
+            "{{ default [user]._id '_empty_' }}",
+            globalUsers[0]._id,
+          ],
+        },
+      }).toContainExactly([
+        {
+          name: "single user, session user",
+          single_user: [{ _id: config.getUser()._id }],
+        },
+        {
+          name: "single user",
+          single_user: [{ _id: globalUsers[0]._id }],
+        },
+      ])
     })
 
+    it("should resolve 'default' helper to '_empty_' when binding resolves to nothing", async () => {
+      await expectQuery({
+        oneOf: {
+          single_user: [
+            "{{ default [user]._idx '_empty_' }}",
+            globalUsers[0]._id,
+          ],
+        },
+      }).toContainExactly([
+        {
+          name: "single user",
+          single_user: [{ _id: globalUsers[0]._id }],
+        },
+      ])
+    })
+  })
+
   describe.each([FieldType.STRING, FieldType.LONGFORM])("%s", () => {
     beforeAll(async () => {
       await createTable({
diff --git a/packages/server/src/migrations/functions/tests/appUrls.spec.js b/packages/server/src/migrations/functions/tests/appUrls.spec.js
index 3d48515068..7a2f324552 100644
--- a/packages/server/src/migrations/functions/tests/appUrls.spec.js
+++ b/packages/server/src/migrations/functions/tests/appUrls.spec.js
@@ -13,7 +13,7 @@ describe("run", () => {
   afterAll(config.end)
 
   it("runs successfully", async () => {
-    const app = await config.createApp({ appName: "testApp" })
+    const app = await config.createApp("testApp")
     const metadata = await dbCore.doWithDB(app.appId, async db => {
       const metadataDoc = await db.get(dbCore.DocumentType.APP_METADATA)
       delete metadataDoc.url
diff --git a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts
index 84e26c80f3..8d28a43322 100644
--- a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts
+++ b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts
@@ -11,7 +11,7 @@ describe("run", () => {
 
   beforeAll(async () => {
     await config.init()
-    app = await config.createApp({ appName: "testApp" })
+    app = await config.createApp("testApp")
     screen = await config.createScreen()
   })
 
diff --git a/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts b/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts
index 3b6d7b66b2..1d4d4d0f71 100644
--- a/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts
+++ b/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts
@@ -22,7 +22,7 @@ describe("syncApps", () => {
       expect(usageDoc.usageQuota.apps).toEqual(3)
 
       // create an extra app to test the migration
-      await config.createApp({ appName: "quota-test" })
+      await config.createApp("quota-test")
 
       // migrate
       await syncApps.run()
diff --git a/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts b/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts
index cc3daa465f..730278683c 100644
--- a/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts
+++ b/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts
@@ -29,7 +29,7 @@ describe("syncRows", () => {
         await config.createRow()
       })
       // app 2
-      const app2 = await config.createApp({ appName: "second-app" })
+      const app2 = await config.createApp("second-app")
       await context.doInAppContext(app2.appId, async () => {
         await config.createTable()
         await config.createRow()
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index 20fdcdfed7..58dbecd197 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -224,14 +224,11 @@ export default class TestConfiguration {
   // SETUP /  TEARDOWN
 
   // use a new id as the name to avoid name collisions
-  async init(opts = {}) {
+  async init(appName = newid()) {
     if (!this.started) {
       await startup()
     }
-    return this.newTenant({
-      appName: newid(),
-      ...opts,
-    })
+    return this.newTenant(appName)
   }
 
   end() {
@@ -551,14 +548,14 @@ export default class TestConfiguration {
     return this.tenantId
   }
 
-  async newTenant(opts: {}): Promise<App> {
+  async newTenant(appName = newid()): Promise<App> {
     this.csrfToken = generator.hash()
 
     this.tenantId = structures.tenant.id()
     this.user = await this.globalUser()
     this.userMetadataId = generateUserMetadataID(this.user._id!)
 
-    return this.createApp({ appName: newid(), ...opts })
+    return this.createApp(appName)
   }
 
   doInTenant<T>(task: () => T) {
@@ -588,9 +585,7 @@ export default class TestConfiguration {
   }
 
   // APP
-  async createApp(opts: CreateAppRequest): Promise<App> {
-    const { appName, url, snippets } = opts
-
+  async createApp(appName: string, url?: string): Promise<App> {
     this.appId = undefined
     this.app = await context.doInTenant(
       this.tenantId!,
@@ -602,19 +597,6 @@ export default class TestConfiguration {
     )
     this.appId = this.app.appId
 
-    if (snippets) {
-      this.app = await this._req(
-        appController.update,
-        {
-          ...this.app,
-          snippets,
-        },
-        {
-          appId: this.appId,
-        }
-      )
-    }
-
     return await context.doInAppContext(this.app.appId!, async () => {
       // create production app
       this.prodApp = await this.publish()

From 39233c66f8f6da5618a58b3809e4e2bc9baeb272 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 7 May 2024 09:46:04 +0100
Subject: [PATCH 17/18] Remove leftover from config refactor

---
 packages/server/src/sdk/app/applications/tests/sync.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts
index d0bde2e973..69ff2bfaf3 100644
--- a/packages/server/src/sdk/app/applications/tests/sync.spec.ts
+++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts
@@ -36,7 +36,7 @@ function waitForUpdate(opts: { group?: boolean }) {
 }
 
 beforeAll(async () => {
-  await config.init({ appName: "syncApp" })
+  await config.init("syncApp")
 })
 
 async function createUser(email: string, roles: UserRoles, builder?: boolean) {

From b52d1921ecaaf70be1fbbdc150f77d66a8fe983c Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 9 May 2024 11:29:43 +0100
Subject: [PATCH 18/18] Fix for empty state tests. Ensure null isnt scrubbed
 when enriched

---
 packages/server/src/api/controllers/row/utils/utils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts
index 1b847a1371..c2d62e0204 100644
--- a/packages/server/src/api/controllers/row/utils/utils.ts
+++ b/packages/server/src/api/controllers/row/utils/utils.ts
@@ -240,6 +240,7 @@ export async function enrichSearchContext(
   // enrich the fields with dynamic parameters
   for (let key of Object.keys(fields)) {
     if (fields[key] == null) {
+      enrichedQuery[key] = null
       continue
     }
     if (typeof fields[key] === "object") {