From a7e17712a30acca56d54bcabe5dafdd326e5a99a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 3 Mar 2025 12:23:25 +0100
Subject: [PATCH] Remove types

---
 .../app/forms/RelationshipField.svelte        | 37 +++++++------------
 .../frontend-core/src/fetch/GroupUserFetch.ts |  2 +-
 packages/frontend-core/src/fetch/UserFetch.ts |  4 +-
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index 0226e7d7f3..c40041c7d6 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -1,12 +1,6 @@
 <script lang="ts">
   import { CoreSelect, CoreMultiselect } from "@budibase/bbui"
-  import {
-    FieldType,
-    GroupUserDatasource,
-    InternalTable,
-    TableDatasource,
-    UserDatasource,
-  } from "@budibase/types"
+  import { FieldType, InternalTable } from "@budibase/types"
   import { fetchData, Utils } from "@budibase/frontend-core"
   import { getContext } from "svelte"
   import Field from "./Field.svelte"
@@ -15,9 +9,6 @@
     RelationshipFieldMetadata,
     Row,
   } from "@budibase/types"
-  import TableFetch from "@budibase/frontend-core/src/fetch/TableFetch"
-  import UserFetch from "@budibase/frontend-core/src/fetch/UserFetch.js"
-  import GroupUserFetch from "@budibase/frontend-core/src/fetch/GroupUserFetch.js"
 
   export let field: string | undefined = undefined
   export let label: string | undefined = undefined
@@ -29,7 +20,7 @@
   export let defaultValue: string | string[] | undefined = undefined
   export let onChange: any
   export let filter: SearchFilter[]
-  export let datasourceType: "table" | "user" | "groupUser" = "table"
+  export let datasourceType: "table" | "user" = "table"
   export let primaryDisplay: string | undefined = undefined
   export let span: number | undefined = undefined
   export let helpText: string | undefined = undefined
@@ -114,22 +105,20 @@
     dsType: typeof datasourceType,
     filter: SearchFilter[],
     linkedTableId?: string
-  ): TableFetch | UserFetch | GroupUserFetch | undefined => {
+  ) => {
     if (!linkedTableId) {
       return undefined
     }
-    let datasource: TableDatasource | UserDatasource | GroupUserDatasource
-    if (dsType === "table") {
-      datasource = {
-        type: "table",
-        tableId: linkedTableId,
-      }
-    } else {
-      datasource = {
-        type: dsType,
-        tableId: InternalTable.USER_METADATA,
-      }
-    }
+    const datasource =
+      datasourceType === "table"
+        ? {
+            type: datasourceType,
+            tableId: fieldSchema?.tableId!,
+          }
+        : {
+            type: datasourceType,
+            tableId: InternalTable.USER_METADATA,
+          }
     return fetchData({
       API,
       datasource,
diff --git a/packages/frontend-core/src/fetch/GroupUserFetch.ts b/packages/frontend-core/src/fetch/GroupUserFetch.ts
index 5b07e9decb..ca28a4dfa1 100644
--- a/packages/frontend-core/src/fetch/GroupUserFetch.ts
+++ b/packages/frontend-core/src/fetch/GroupUserFetch.ts
@@ -4,7 +4,7 @@ import { GroupUserDatasource, InternalTable } from "@budibase/types"
 
 interface GroupUserQuery {
   groupId: string
-  emailSearch: string
+  emailSearch?: string
 }
 
 interface GroupUserDefinition {
diff --git a/packages/frontend-core/src/fetch/UserFetch.ts b/packages/frontend-core/src/fetch/UserFetch.ts
index e72ed8997d..995071b587 100644
--- a/packages/frontend-core/src/fetch/UserFetch.ts
+++ b/packages/frontend-core/src/fetch/UserFetch.ts
@@ -9,8 +9,8 @@ import {
 } from "@budibase/types"
 
 interface UserFetchQuery {
-  appId: string
-  paginated: boolean
+  appId?: string
+  paginated?: boolean
 }
 
 interface UserDefinition {