Merge remote-tracking branch 'origin/master' into feature/automation-row-ux-update

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.29.4",
+  "version": "2.29.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

packages/server/src/api/routes/tests/search.spec.ts

@@ -1938,6 +1938,17 @@ describe.each([
         ])
       })
 
+      it("successfully finds a row searching with a string", async () => {
+        await expectQuery({
+          // @ts-expect-error this test specifically goes against the type to
+          // test that we coerce the string to an array.
+          contains: { "1:users": user1._id },
+        }).toContainExactly([
+          { users: [{ _id: user1._id }] },
+          { users: [{ _id: user1._id }, { _id: user2._id }] },
+        ])
+      })
+
       it("fails to find nonexistent row", async () => {
         await expectQuery({ contains: { users: ["us_none"] } }).toFindNothing()
       })

packages/server/src/jsRunner/tests/jsRunner.spec.ts

@@ -91,8 +91,13 @@ describe("jsRunner (using isolated-vm)", () => {
     })
 
     it("handle test case 2", async () => {
+      const todayDate = new Date()
+      // add a year and a month
+      todayDate.setMonth(new Date().getMonth() + 1)
+      todayDate.setFullYear(todayDate.getFullYear() + 1)
       const context = {
         "Purchase Date": DATE,
+        today: todayDate.toISOString(),
       }
       const result = await processJS(
         `
@@ -100,7 +105,7 @@ describe("jsRunner (using isolated-vm)", () => {
         let purchaseyear = purchase.getFullYear();
         let purchasemonth = purchase.getMonth();
 
-        var today = new Date ();
+        var today = new Date($("today"));
         let todayyear = today.getFullYear();
         let todaymonth = today.getMonth();
 
@@ -113,7 +118,7 @@ describe("jsRunner (using isolated-vm)", () => {
         context
       )
       expect(result).toBeDefined()
-      expect(result).toBe(3)
+      expect(result).toBe(1)
     })
 
     it("should handle test case 3", async () => {

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

@@ -2,6 +2,7 @@ import {
   EmptyFilterOption,
   Row,
   RowSearchParams,
+  SearchFilterOperator,
   SearchFilters,
   SearchResponse,
   SortOrder,
@@ -65,11 +66,37 @@ export function removeEmptyFilters(filters: SearchFilters) {
   return filters
 }
 
+// The frontend can send single values for array fields sometimes, so to handle
+// this we convert them to arrays at the controller level so that nothing below
+// this has to worry about the non-array values.
+function fixupFilterArrays(filters: SearchFilters) {
+  const arrayFields = [
+    SearchFilterOperator.ONE_OF,
+    SearchFilterOperator.CONTAINS,
+    SearchFilterOperator.NOT_CONTAINS,
+    SearchFilterOperator.CONTAINS_ANY,
+  ]
+  for (const searchField of arrayFields) {
+    const field = filters[searchField]
+    if (field == null) {
+      continue
+    }
+
+    for (const key of Object.keys(field)) {
+      if (!Array.isArray(field[key])) {
+        field[key] = [field[key]]
+      }
+    }
+  }
+  return filters
+}
+
 export async function search(
   options: RowSearchParams
 ): Promise<SearchResponse<Row>> {
   const isExternalTable = isExternalTableID(options.tableId)
   options.query = removeEmptyFilters(options.query || {})
+  options.query = fixupFilterArrays(options.query)
   if (
     !dataFilters.hasFilters(options.query) &&
     options.query.onEmptyFilter === EmptyFilterOption.RETURN_NONE