From d4b0ef7d4757e9ed5c37d241a31d278b6897e950 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 27 Aug 2024 15:42:01 +0200
Subject: [PATCH 1/6] Feature flagging backend

---
 packages/backend-core/src/features/index.ts | 1 +
 packages/server/src/db/linkedRows/index.ts  | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts
index e0bd29b1bc..1ae194ea0b 100644
--- a/packages/backend-core/src/features/index.ts
+++ b/packages/backend-core/src/features/index.ts
@@ -267,4 +267,5 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
 // default values set correctly and their types flow through the system.
 export const flags = new FlagSet({
   DEFAULT_VALUES: Flag.boolean(false),
+  ENRICHED_RELATIONSHIPS: Flag.boolean(false),
 })
diff --git a/packages/server/src/db/linkedRows/index.ts b/packages/server/src/db/linkedRows/index.ts
index 2394d00d0e..fa5808a28c 100644
--- a/packages/server/src/db/linkedRows/index.ts
+++ b/packages/server/src/db/linkedRows/index.ts
@@ -11,7 +11,7 @@ import { USER_METDATA_PREFIX } from "../utils"
 import partition from "lodash/partition"
 import { getGlobalUsersFromMetadata } from "../../utilities/global"
 import { processFormulas } from "../../utilities/rowProcessor"
-import { context } from "@budibase/backend-core"
+import { context, features } from "@budibase/backend-core"
 import {
   ContextUser,
   FieldType,
@@ -272,7 +272,9 @@ export async function squashLinksToPrimaryDisplay(
         const obj: any = { _id: link._id }
         obj.primaryDisplay = getPrimaryDisplayValue(link, linkedTable)
 
-        const allowRelationshipSchemas = true // TODO
+        const allowRelationshipSchemas = await features.flags.isEnabled(
+          "ENRICHED_RELATIONSHIPS"
+        )
         if (schema.schema && allowRelationshipSchemas) {
           for (const relField of Object.entries(schema.schema)
             .filter(([_, field]) => field.visible !== false)

From 5f40737e9ceac0adc2865e5fa1e1d13722a5b913 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 27 Aug 2024 16:15:25 +0200
Subject: [PATCH 2/6] Use enums

---
 packages/backend-core/src/features/index.ts | 4 ++--
 packages/server/src/db/linkedRows/index.ts  | 3 ++-
 packages/types/src/sdk/featureFlag.ts       | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts
index 1ae194ea0b..5fa73ebabe 100644
--- a/packages/backend-core/src/features/index.ts
+++ b/packages/backend-core/src/features/index.ts
@@ -1,7 +1,7 @@
 import env from "../environment"
 import * as context from "../context"
 import { PostHog, PostHogOptions } from "posthog-node"
-import { IdentityType, UserCtx } from "@budibase/types"
+import { FeatureFlag, IdentityType, UserCtx } from "@budibase/types"
 import tracer from "dd-trace"
 
 let posthog: PostHog | undefined
@@ -267,5 +267,5 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
 // default values set correctly and their types flow through the system.
 export const flags = new FlagSet({
   DEFAULT_VALUES: Flag.boolean(false),
-  ENRICHED_RELATIONSHIPS: Flag.boolean(false),
+  [FeatureFlag.ENRICHED_RELATIONSHIPS]: Flag.boolean(false),
 })
diff --git a/packages/server/src/db/linkedRows/index.ts b/packages/server/src/db/linkedRows/index.ts
index fa5808a28c..3881060d68 100644
--- a/packages/server/src/db/linkedRows/index.ts
+++ b/packages/server/src/db/linkedRows/index.ts
@@ -14,6 +14,7 @@ import { processFormulas } from "../../utilities/rowProcessor"
 import { context, features } from "@budibase/backend-core"
 import {
   ContextUser,
+  FeatureFlag,
   FieldType,
   LinkDocumentValue,
   Row,
@@ -273,7 +274,7 @@ export async function squashLinksToPrimaryDisplay(
         obj.primaryDisplay = getPrimaryDisplayValue(link, linkedTable)
 
         const allowRelationshipSchemas = await features.flags.isEnabled(
-          "ENRICHED_RELATIONSHIPS"
+          FeatureFlag.ENRICHED_RELATIONSHIPS
         )
         if (schema.schema && allowRelationshipSchemas) {
           for (const relField of Object.entries(schema.schema)
diff --git a/packages/types/src/sdk/featureFlag.ts b/packages/types/src/sdk/featureFlag.ts
index 257b4ee576..3d96b63c64 100644
--- a/packages/types/src/sdk/featureFlag.ts
+++ b/packages/types/src/sdk/featureFlag.ts
@@ -1,6 +1,7 @@
 export enum FeatureFlag {
   PER_CREATOR_PER_USER_PRICE = "PER_CREATOR_PER_USER_PRICE",
   PER_CREATOR_PER_USER_PRICE_ALERT = "PER_CREATOR_PER_USER_PRICE_ALERT",
+  ENRICHED_RELATIONSHIPS = "ENRICHED_RELATIONSHIPS",
 }
 
 export interface TenantFeatureFlags {

From 8a2bc639ea6549b571d73c6f9565fe1a4ecdeed3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 27 Aug 2024 16:21:32 +0200
Subject: [PATCH 3/6] Flag checks on frontend

---
 .../components/backend/DataTable/TableDataTable.svelte |  5 ++++-
 .../backend/DataTable/ViewV2DataTable.svelte           |  3 +++
 .../grid/controls/ColumnsSettingContent.svelte         | 10 +++++-----
 .../src/components/grid/layout/Grid.svelte             |  2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index 525421f996..ba3b37f812 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -1,6 +1,6 @@
 <script>
   import { datasources, tables, integrations, appStore } from "stores/builder"
-  import { themeStore, admin } from "stores/portal"
+  import { themeStore, admin, licensing } from "stores/portal"
   import EditRolesButton from "./buttons/EditRolesButton.svelte"
   import { TableNames } from "constants"
   import { Grid } from "@budibase/frontend-core"
@@ -18,6 +18,8 @@
   import GridEditColumnModal from "components/backend/DataTable/modals/grid/GridEditColumnModal.svelte"
   import GridUsersTableButton from "components/backend/DataTable/modals/grid/GridUsersTableButton.svelte"
   import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import { isEnabled } from "helpers/featureFlags"
+  import { FeatureFlag } from "@budibase/types"
 
   const userSchemaOverrides = {
     firstName: { displayName: "First name", disabled: true },
@@ -66,6 +68,7 @@
     canDeleteRows={!isUsersTable}
     canEditRows={!isUsersTable || !$appStore.features.disableUserMetadata}
     canEditColumns={!isUsersTable || !$appStore.features.disableUserMetadata}
+    canSetRelationshipSchemas={isEnabled(FeatureFlag.ENRICHED_RELATIONSHIPS)}
     schemaOverrides={isUsersTable ? userSchemaOverrides : null}
     showAvatars={false}
     on:updatedatasource={handleGridTableUpdate}
diff --git a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
index 646b764a2c..b56c5f6568 100644
--- a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
@@ -6,6 +6,8 @@
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
   import GridFilterButton from "components/backend/DataTable/buttons/grid/GridFilterButton.svelte"
   import GridManageAccessButton from "components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
+  import { isEnabled } from "helpers/featureFlags"
+  import { FeatureFlag } from "@budibase/types"
 
   $: id = $viewsV2.selected?.id
   $: datasource = {
@@ -29,6 +31,7 @@
     on:updatedatasource={handleGridViewUpdate}
     isCloud={$admin.cloud}
     allowViewReadonlyColumns={$licensing.isViewReadonlyColumnsEnabled}
+    canSetRelationshipSchemas={isEnabled(FeatureFlag.ENRICHED_RELATIONSHIPS)}
   >
     <svelte:fragment slot="filter">
       <GridFilterButton />
diff --git a/packages/frontend-core/src/components/grid/controls/ColumnsSettingContent.svelte b/packages/frontend-core/src/components/grid/controls/ColumnsSettingContent.svelte
index cb2ffb1c28..b8f2ac4456 100644
--- a/packages/frontend-core/src/components/grid/controls/ColumnsSettingContent.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ColumnsSettingContent.svelte
@@ -12,7 +12,9 @@
   export let columns
   export let fromRelationshipField
 
-  const { datasource, dispatch, cache } = getContext("grid")
+  const { datasource, dispatch, cache, config } = getContext("grid")
+
+  $: canSetRelationshipSchemas = $config.canSetRelationshipSchemas
 
   let relationshipPanelAnchor
   let relationshipFieldName
@@ -30,8 +32,6 @@
     {}
   )
 
-  $: allowRelationshipSchemas = true // TODO
-
   $: displayColumns = columns.map(c => {
     const isRequired =
       c.primaryDisplay || helpers.schema.isRequired(c.schema.constraints)
@@ -196,7 +196,7 @@
           value={columnToPermissionOptions(column)}
           options={column.options}
         />
-        {#if allowRelationshipSchemas && column.schema.type === FieldType.LINK && columnToPermissionOptions(column) !== FieldPermissions.HIDDEN}
+        {#if canSetRelationshipSchemas && column.schema.type === FieldType.LINK && columnToPermissionOptions(column) !== FieldPermissions.HIDDEN}
           <div class="relationship-columns">
             <ActionButton
               on:click={e => {
@@ -214,7 +214,7 @@
   </div>
 </div>
 
-{#if allowRelationshipSchemas}
+{#if canSetRelationshipSchemas}
   <Popover
     on:close={() => (relationshipFieldName = null)}
     open={relationshipFieldName}
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 04a11da812..f24ff0ae10 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -43,6 +43,7 @@
   export let canDeleteRows = true
   export let canEditColumns = true
   export let canSaveSchema = true
+  export let canSetRelationshipSchemas = false
   export let stripeRows = false
   export let quiet = false
   export let collaboration = true
@@ -99,6 +100,7 @@
     canDeleteRows,
     canEditColumns,
     canSaveSchema,
+    canSetRelationshipSchemas,
     stripeRows,
     quiet,
     collaboration,

From c5310849219cf29d4e679d1f29f021ebf4a54f2e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 27 Aug 2024 16:27:50 +0200
Subject: [PATCH 4/6] Lint

---
 .../src/components/backend/DataTable/TableDataTable.svelte      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index ba3b37f812..b927a31d0b 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -1,6 +1,6 @@
 <script>
   import { datasources, tables, integrations, appStore } from "stores/builder"
-  import { themeStore, admin, licensing } from "stores/portal"
+  import { themeStore, admin } from "stores/portal"
   import EditRolesButton from "./buttons/EditRolesButton.svelte"
   import { TableNames } from "constants"
   import { Grid } from "@budibase/frontend-core"

From 1594fcc8c4126c86569e00f232dad40c503c1b59 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 27 Aug 2024 16:56:47 +0200
Subject: [PATCH 5/6] Test with flags

---
 .../server/src/api/routes/tests/row.spec.ts   | 85 +++++++++++++++++--
 1 file changed, 77 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index ca9ef134cb..3dabe45f8e 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -40,6 +40,7 @@ import {
   TableSchema,
   JsonFieldSubType,
   RowExportFormat,
+  FeatureFlag,
 } from "@budibase/types"
 import { generator, mocks } from "@budibase/backend-core/tests"
 import _, { merge } from "lodash"
@@ -95,7 +96,12 @@ describe.each([
   let envCleanup: (() => void) | undefined
 
   beforeAll(async () => {
-    await withCoreEnv({ SQS_SEARCH_ENABLE: "true" }, () => config.init())
+    await withCoreEnv(
+      {
+        SQS_SEARCH_ENABLE: "true",
+      },
+      () => config.init()
+    )
     if (isSqs) {
       envCleanup = setCoreEnv({
         SQS_SEARCH_ENABLE: "true",
@@ -2558,7 +2564,7 @@ describe.each([
         tableId = table._id!
       })
 
-      it.each([
+      const testScenarios: [string, (row: Row) => Promise<Row> | Row][] = [
         ["get row", (row: Row) => config.api.row.get(tableId, row._id!)],
         [
           "fetch",
@@ -2591,8 +2597,75 @@ describe.each([
           },
         ],
         ["from original saved row", (row: Row) => row],
-      ])(
+      ]
+
+      it.each(testScenarios)(
         "can retrieve rows with populated relationships (via %s)",
+        async (__, retrieveDelegate) => {
+          const otherRows = _.sampleSize(auxData, 5)
+          await withCoreEnv(
+            {
+              TENANT_FEATURE_FLAGS: `*:${FeatureFlag.ENRICHED_RELATIONSHIPS}`,
+            },
+            async () => {
+              const row = await config.api.row.save(tableId, {
+                title: generator.word(),
+                relWithNoSchema: [otherRows[0]],
+                relWithEmptySchema: [otherRows[1]],
+                relWithFullSchema: [otherRows[2]],
+                relWithHalfSchema: [otherRows[3]],
+                relWithIllegalSchema: [otherRows[4]],
+              })
+
+              const retrieved = await retrieveDelegate(row)
+
+              expect(retrieved).toEqual(
+                expect.objectContaining({
+                  title: row.title,
+                  relWithNoSchema: [
+                    {
+                      _id: otherRows[0]._id,
+                      primaryDisplay: otherRows[0].name,
+                    },
+                  ],
+                  relWithEmptySchema: [
+                    {
+                      _id: otherRows[1]._id,
+                      primaryDisplay: otherRows[1].name,
+                    },
+                  ],
+                  relWithFullSchema: [
+                    {
+                      _id: otherRows[2]._id,
+                      primaryDisplay: otherRows[2].name,
+                      name: otherRows[2].name,
+                      age: otherRows[2].age,
+                      id: otherRows[2].id,
+                    },
+                  ],
+                  relWithHalfSchema: [
+                    {
+                      _id: otherRows[3]._id,
+                      primaryDisplay: otherRows[3].name,
+                      name: otherRows[3].name,
+                    },
+                  ],
+                  relWithIllegalSchema: [
+                    {
+                      _id: otherRows[4]._id,
+                      primaryDisplay: otherRows[4].name,
+                      name: otherRows[4].name,
+                    },
+                  ],
+                })
+              )
+            }
+          )
+        }
+      )
+
+      it.each(testScenarios)(
+        "does not enrich relationships when not enabled (via %s)",
         async (__, retrieveDelegate) => {
           const otherRows = _.sampleSize(auxData, 5)
 
@@ -2606,6 +2679,7 @@ describe.each([
           })
 
           const retrieved = await retrieveDelegate(row)
+
           expect(retrieved).toEqual(
             expect.objectContaining({
               title: row.title,
@@ -2625,23 +2699,18 @@ describe.each([
                 {
                   _id: otherRows[2]._id,
                   primaryDisplay: otherRows[2].name,
-                  name: otherRows[2].name,
-                  age: otherRows[2].age,
-                  id: otherRows[2].id,
                 },
               ],
               relWithHalfSchema: [
                 {
                   _id: otherRows[3]._id,
                   primaryDisplay: otherRows[3].name,
-                  name: otherRows[3].name,
                 },
               ],
               relWithIllegalSchema: [
                 {
                   _id: otherRows[4]._id,
                   primaryDisplay: otherRows[4].name,
-                  name: otherRows[4].name,
                 },
               ],
             })

From 935aa521ff7fc1adfa7fe89a367ec085e1e88cdf Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 27 Aug 2024 17:02:19 +0200
Subject: [PATCH 6/6] Cleanup

---
 .../server/src/api/routes/tests/row.spec.ts   | 141 ++++++++++--------
 1 file changed, 76 insertions(+), 65 deletions(-)

diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 3dabe45f8e..ca61918cad 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -2442,7 +2442,13 @@ describe.each([
 
       let auxData: Row[] = []
 
+      let flagCleanup: (() => void) | undefined
+
       beforeAll(async () => {
+        flagCleanup = setCoreEnv({
+          TENANT_FEATURE_FLAGS: `*:${FeatureFlag.ENRICHED_RELATIONSHIPS}`,
+        })
+
         const aux2Table = await config.api.table.save(saveTableRequest())
         const aux2Data = await config.api.row.save(aux2Table._id!, {})
 
@@ -2564,6 +2570,10 @@ describe.each([
         tableId = table._id!
       })
 
+      afterAll(() => {
+        flagCleanup?.()
+      })
+
       const testScenarios: [string, (row: Row) => Promise<Row> | Row][] = [
         ["get row", (row: Row) => config.api.row.get(tableId, row._id!)],
         [
@@ -2601,71 +2611,6 @@ describe.each([
 
       it.each(testScenarios)(
         "can retrieve rows with populated relationships (via %s)",
-        async (__, retrieveDelegate) => {
-          const otherRows = _.sampleSize(auxData, 5)
-          await withCoreEnv(
-            {
-              TENANT_FEATURE_FLAGS: `*:${FeatureFlag.ENRICHED_RELATIONSHIPS}`,
-            },
-            async () => {
-              const row = await config.api.row.save(tableId, {
-                title: generator.word(),
-                relWithNoSchema: [otherRows[0]],
-                relWithEmptySchema: [otherRows[1]],
-                relWithFullSchema: [otherRows[2]],
-                relWithHalfSchema: [otherRows[3]],
-                relWithIllegalSchema: [otherRows[4]],
-              })
-
-              const retrieved = await retrieveDelegate(row)
-
-              expect(retrieved).toEqual(
-                expect.objectContaining({
-                  title: row.title,
-                  relWithNoSchema: [
-                    {
-                      _id: otherRows[0]._id,
-                      primaryDisplay: otherRows[0].name,
-                    },
-                  ],
-                  relWithEmptySchema: [
-                    {
-                      _id: otherRows[1]._id,
-                      primaryDisplay: otherRows[1].name,
-                    },
-                  ],
-                  relWithFullSchema: [
-                    {
-                      _id: otherRows[2]._id,
-                      primaryDisplay: otherRows[2].name,
-                      name: otherRows[2].name,
-                      age: otherRows[2].age,
-                      id: otherRows[2].id,
-                    },
-                  ],
-                  relWithHalfSchema: [
-                    {
-                      _id: otherRows[3]._id,
-                      primaryDisplay: otherRows[3].name,
-                      name: otherRows[3].name,
-                    },
-                  ],
-                  relWithIllegalSchema: [
-                    {
-                      _id: otherRows[4]._id,
-                      primaryDisplay: otherRows[4].name,
-                      name: otherRows[4].name,
-                    },
-                  ],
-                })
-              )
-            }
-          )
-        }
-      )
-
-      it.each(testScenarios)(
-        "does not enrich relationships when not enabled (via %s)",
         async (__, retrieveDelegate) => {
           const otherRows = _.sampleSize(auxData, 5)
 
@@ -2699,24 +2644,90 @@ describe.each([
                 {
                   _id: otherRows[2]._id,
                   primaryDisplay: otherRows[2].name,
+                  name: otherRows[2].name,
+                  age: otherRows[2].age,
+                  id: otherRows[2].id,
                 },
               ],
               relWithHalfSchema: [
                 {
                   _id: otherRows[3]._id,
                   primaryDisplay: otherRows[3].name,
+                  name: otherRows[3].name,
                 },
               ],
               relWithIllegalSchema: [
                 {
                   _id: otherRows[4]._id,
                   primaryDisplay: otherRows[4].name,
+                  name: otherRows[4].name,
                 },
               ],
             })
           )
         }
       )
+
+      it.each(testScenarios)(
+        "does not enrich relationships when not enabled (via %s)",
+        async (__, retrieveDelegate) => {
+          await withCoreEnv(
+            {
+              TENANT_FEATURE_FLAGS: ``,
+            },
+            async () => {
+              const otherRows = _.sampleSize(auxData, 5)
+
+              const row = await config.api.row.save(tableId, {
+                title: generator.word(),
+                relWithNoSchema: [otherRows[0]],
+                relWithEmptySchema: [otherRows[1]],
+                relWithFullSchema: [otherRows[2]],
+                relWithHalfSchema: [otherRows[3]],
+                relWithIllegalSchema: [otherRows[4]],
+              })
+
+              const retrieved = await retrieveDelegate(row)
+
+              expect(retrieved).toEqual(
+                expect.objectContaining({
+                  title: row.title,
+                  relWithNoSchema: [
+                    {
+                      _id: otherRows[0]._id,
+                      primaryDisplay: otherRows[0].name,
+                    },
+                  ],
+                  relWithEmptySchema: [
+                    {
+                      _id: otherRows[1]._id,
+                      primaryDisplay: otherRows[1].name,
+                    },
+                  ],
+                  relWithFullSchema: [
+                    {
+                      _id: otherRows[2]._id,
+                      primaryDisplay: otherRows[2].name,
+                    },
+                  ],
+                  relWithHalfSchema: [
+                    {
+                      _id: otherRows[3]._id,
+                      primaryDisplay: otherRows[3].name,
+                    },
+                  ],
+                  relWithIllegalSchema: [
+                    {
+                      _id: otherRows[4]._id,
+                      primaryDisplay: otherRows[4].name,
+                    },
+                  ],
+                })
+              )
+            }
+          )
+        }
+      )
     })
 
   describe("Formula fields", () => {