Merge pull request #15653 from Budibase/rewrite-relationship-field-types

Remove types

packages/client/src/components/app/forms/RelationshipField.svelte

@@ -1,12 +1,6 @@
 <script lang="ts">
   import { CoreSelect, CoreMultiselect } from "@budibase/bbui"
-  import {
+  import { FieldType, InternalTable } from "@budibase/types"
-    FieldType,
-    GroupUserDatasource,
-    InternalTable,
-    TableDatasource,
-    UserDatasource,
-  } 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
+    const datasource =
-    if (dsType === "table") {
+      datasourceType === "table"
-      datasource = {
+        ? {
-        type: "table",
+            type: datasourceType,
-        tableId: linkedTableId,
+            tableId: fieldSchema?.tableId!,
-      }
+          }
-    } else {
+        : {
-      datasource = {
+            type: datasourceType,
-        type: dsType,
+            tableId: InternalTable.USER_METADATA,
-        tableId: InternalTable.USER_METADATA,
+          }
-      }
-    }
     return fetchData({
       API,
       datasource,

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 {

packages/frontend-core/src/fetch/UserFetch.ts

@@ -9,8 +9,8 @@ import {
 } from "@budibase/types"
 
 interface UserFetchQuery {
-  appId: string
+  appId?: string
-  paginated: boolean
+  paginated?: boolean
 }
 
 interface UserDefinition {