Merge pull request #15017 from Budibase/chore/clean-ENRICHED_RELATIONSHIPS-flag

Clean enriched relationships flag

packages/backend-core/src/features/features.ts

@@ -269,7 +269,6 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
 export const flags = new FlagSet({
   [FeatureFlag.DEFAULT_VALUES]: Flag.boolean(true),
   [FeatureFlag.AUTOMATION_BRANCHING]: Flag.boolean(true),
-  [FeatureFlag.ENRICHED_RELATIONSHIPS]: Flag.boolean(true),
   [FeatureFlag.AI_CUSTOM_CONFIGS]: Flag.boolean(true),
   [FeatureFlag.BUDIBASE_AI]: Flag.boolean(true),
 })

packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte

@@ -11,7 +11,6 @@
   export let disabledPermissions = []
   export let columns
   export let fromRelationshipField
-  export let canSetRelationshipSchemas
 
   const { datasource, dispatch } = getContext("grid")
 
@@ -129,6 +128,8 @@
     }
   })
 
+  $: hasLinkColumns = columns.some(c => c.schema.type === FieldType.LINK)
+
   async function toggleColumn(column, permission) {
     const visible = permission !== FieldPermissions.HIDDEN
     const readonly = permission === FieldPermissions.READONLY
@@ -184,7 +185,7 @@
           value={columnToPermissionOptions(column)}
           options={column.options}
         />
-        {#if canSetRelationshipSchemas && column.schema.type === FieldType.LINK && columnToPermissionOptions(column) !== FieldPermissions.HIDDEN}
+        {#if column.schema.type === FieldType.LINK && columnToPermissionOptions(column) !== FieldPermissions.HIDDEN}
           <div class="relationship-columns">
             <ActionButton
               on:click={e => {
@@ -203,7 +204,7 @@
   </div>
 </div>
 
-{#if canSetRelationshipSchemas}
+{#if hasLinkColumns}
   <Popover
     on:close={() => (relationshipFieldName = null)}
     open={relationshipFieldName}

packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte

@@ -10,8 +10,6 @@
   import { getContext } from "svelte"
   import { ActionButton } from "@budibase/bbui"
   import ColumnsSettingContent from "./ColumnsSettingContent.svelte"
-  import { isEnabled } from "helpers/featureFlags"
-  import { FeatureFlag } from "@budibase/types"
   import DetailPopover from "components/common/DetailPopover.svelte"
 
   const { tableColumns, datasource } = getContext("grid")
@@ -46,9 +44,5 @@
       {text}
     </ActionButton>
   </svelte:fragment>
-  <ColumnsSettingContent
+  <ColumnsSettingContent columns={$tableColumns} {permissions} />
-    columns={$tableColumns}
-    canSetRelationshipSchemas={isEnabled(FeatureFlag.ENRICHED_RELATIONSHIPS)}
-    {permissions}
-  />
 </DetailPopover>

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

@@ -9,13 +9,7 @@ import {
 import tk from "timekeeper"
 import emitter from "../../../../src/events"
 import { outputProcessing } from "../../../utilities/rowProcessor"
-import {
+import { context, InternalTable, tenancy, utils } from "@budibase/backend-core"
-  context,
-  InternalTable,
-  tenancy,
-  features,
-  utils,
-} from "@budibase/backend-core"
 import { quotas } from "@budibase/pro"
 import {
   AIOperationEnum,
@@ -2864,13 +2858,7 @@ describe.each([
 
       let auxData: Row[] = []
 
-      let flagCleanup: (() => void) | undefined
-
       beforeAll(async () => {
-        flagCleanup = features.testutils.setFeatureFlags("*", {
-          ENRICHED_RELATIONSHIPS: true,
-        })
-
         const aux2Table = await config.api.table.save(saveTableRequest())
         const aux2Data = await config.api.row.save(aux2Table._id!, {})
 
@@ -3017,10 +3005,6 @@ describe.each([
         viewId = view.id
       })
 
-      afterAll(() => {
-        flagCleanup?.()
-      })
-
       const testScenarios: [string, (row: Row) => Promise<Row> | Row][] = [
         ["get row", (row: Row) => config.api.row.get(viewId, row._id!)],
         [
@@ -3093,68 +3077,6 @@ describe.each([
         }
       )
 
-      it.each(testScenarios)(
-        "does not enrich relationships when not enabled (via %s)",
-        async (__, retrieveDelegate) => {
-          await features.testutils.withFeatureFlags(
-            "*",
-            {
-              ENRICHED_RELATIONSHIPS: false,
-            },
-            async () => {
-              const otherRows = _.sampleSize(auxData, 5)
-
-              const row = await config.api.row.save(viewId, {
-                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,
-                    },
-                  ],
-                })
-              )
-            }
-          )
-        }
-      )
-
       it.each([
         [
           "from table fetch",

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

@@ -40,7 +40,7 @@ import { generator, mocks } from "@budibase/backend-core/tests"
 import { DatabaseName, getDatasource } from "../../../integrations/tests/utils"
 import merge from "lodash/merge"
 import { quotas } from "@budibase/pro"
-import { db, roles, features, context } from "@budibase/backend-core"
+import { db, roles, context } from "@budibase/backend-core"
 
 describe.each([
   ["sqs", undefined],
@@ -3265,17 +3265,6 @@ describe.each([
       })
 
       describe("foreign relationship columns", () => {
-        let envCleanup: () => void
-        beforeAll(() => {
-          envCleanup = features.testutils.setFeatureFlags("*", {
-            ENRICHED_RELATIONSHIPS: true,
-          })
-        })
-
-        afterAll(() => {
-          envCleanup?.()
-        })
-
         const createMainTable = async (
           links: {
             name: string

packages/server/src/db/linkedRows/index.ts

@@ -14,11 +14,10 @@ import {
   coreOutputProcessing,
   processFormulas,
 } from "../../utilities/rowProcessor"
-import { context, features } from "@budibase/backend-core"
+import { context } from "@budibase/backend-core"
 import {
   ContextUser,
   EventType,
-  FeatureFlag,
   FieldType,
   LinkDocumentValue,
   Row,
@@ -251,19 +250,13 @@ export async function squashLinks<T = Row[] | Row>(
   source: Table | ViewV2,
   enriched: T
 ): Promise<T> {
-  const allowRelationshipSchemas = await features.flags.isEnabled(
-    FeatureFlag.ENRICHED_RELATIONSHIPS
-  )
-
   let viewSchema: ViewV2Schema = {}
   if (sdk.views.isView(source)) {
     if (helpers.views.isCalculationView(source)) {
       return enriched
     }
 
-    if (allowRelationshipSchemas) {
+    viewSchema = source.schema || {}
-      viewSchema = source.schema || {}
-    }
   }
 
   let table: Table

packages/types/src/sdk/featureFlag.ts

@@ -4,7 +4,7 @@ export enum FeatureFlag {
   AUTOMATION_BRANCHING = "AUTOMATION_BRANCHING",
   AI_CUSTOM_CONFIGS = "AI_CUSTOM_CONFIGS",
   DEFAULT_VALUES = "DEFAULT_VALUES",
-  ENRICHED_RELATIONSHIPS = "ENRICHED_RELATIONSHIPS",
+
   BUDIBASE_AI = "BUDIBASE_AI",
 }