@budibase/frontend-core 3.39.26 → 3.39.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.39.26",
+  "version": "3.39.28",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
@@ -23,5 +23,5 @@
   "devDependencies": {
     "vitest": "^4.1.0"
   },
-  "gitHead": "6d7fa46d35e6d68da050e76f4c1662adaf25a182"
+  "gitHead": "1ad76cd4e4a5dc308900e2a7db331e20a013f65c"
 }

package/src/utils/searchFields.js

@@ -8,7 +8,9 @@ export function getTableFields(tables, linkField) {
   const linkFields = getFields(tables, Object.values(table.schema), {
     allowLinks: false,
   })
-  return linkFields
+  // Expose the related row's _id so relationships can be filtered on the same
+  // value a relationship picker emits and a saved row stores.
+  return [{ name: "_id", type: "string" }, ...linkFields]
     .sort((a, b) => a.name.localeCompare(b.name))
     .map(field => ({
       ...field,

package/src/utils/searchFields.test.js

@@ -26,9 +26,15 @@ describe("search fields", () => {
   const tables = [baseTable, relatedTable]
 
   describe("getTableFields", () => {
-    it("excludes nested link fields when allowLinks is false", () => {
+    it("exposes the related _id and excludes nested link fields", () => {
       const fields = getTableFields(tables, baseTable.schema.rel)
-      expect(fields.map(field => field.name)).toEqual(["rel.title"])
+      expect(fields.map(field => field.name)).toEqual(["rel._id", "rel.title"])
+    })
+
+    it("exposes the related _id as a filterable string type", () => {
+      const fields = getTableFields(tables, baseTable.schema.rel)
+      const idField = fields.find(field => field.name === "rel._id")
+      expect(idField).toEqual({ name: "rel._id", type: "string" })
     })
 
     it("returns empty for non-sql related tables", () => {
@@ -58,9 +64,41 @@ describe("search fields", () => {
       })
       const names = fields.map(field => field.name)
       expect(names).toEqual(
-        expect.arrayContaining(["name", "rel", "rel.title"])
+        expect.arrayContaining(["name", "rel", "rel._id", "rel.title"])
+      )
+      expect(names).not.toContain("rel.otherLink")
+    })
+
+    it("drills relationships by default when allowLinks is omitted", () => {
+      const names = getFields(tables, Object.values(baseTable.schema)).map(
+        field => field.name
+      )
+      expect(names).toEqual(
+        expect.arrayContaining(["name", "rel", "rel._id", "rel.title"])
+      )
+    })
+
+    it("adds a distinct _id for each relationship", () => {
+      const authors = table("t6", { fullName: field("fullName", "string") })
+      const categories = table("t7", { code: field("code", "string") })
+      const posts = table("t8", {
+        name: field("name", "string"),
+        author: field("author", "link", { tableId: "t6" }),
+        category: field("category", "link", { tableId: "t7" }),
+      })
+      const names = getFields(
+        [posts, authors, categories],
+        Object.values(posts.schema),
+        { allowLinks: true }
+      ).map(field => field.name)
+      expect(names).toEqual(
+        expect.arrayContaining([
+          "author._id",
+          "author.fullName",
+          "category._id",
+          "category.code",
+        ])
       )
-      expect(names).not.toEqual(expect.arrayContaining(["rel.otherLink"]))
     })
 
     it("appends static formula fields even when allowLinks is false", () => {