From af22eb30a60da04b39dc44834974a3bfcc06ac68 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 7 Jan 2025 10:14:18 +0100
Subject: [PATCH] Type relationship fetch

---
 packages/client/src/utils/schema.js           |  2 +-
 .../src/fetch/RelationshipFetch.js            | 20 --------
 .../src/fetch/RelationshipFetch.ts            | 50 +++++++++++++++++++
 packages/frontend-core/src/fetch/index.ts     |  2 +-
 4 files changed, 52 insertions(+), 22 deletions(-)
 delete mode 100644 packages/frontend-core/src/fetch/RelationshipFetch.js
 create mode 100644 packages/frontend-core/src/fetch/RelationshipFetch.ts

diff --git a/packages/client/src/utils/schema.js b/packages/client/src/utils/schema.js
index 2b5dae0acf..87859f1ef8 100644
--- a/packages/client/src/utils/schema.js
+++ b/packages/client/src/utils/schema.js
@@ -2,7 +2,7 @@ import { API } from "api"
 import TableFetch from "@budibase/frontend-core/src/fetch/TableFetch"
 import ViewFetch from "@budibase/frontend-core/src/fetch/ViewFetch"
 import QueryFetch from "@budibase/frontend-core/src/fetch/QueryFetch.js"
-import RelationshipFetch from "@budibase/frontend-core/src/fetch/RelationshipFetch.js"
+import RelationshipFetch from "@budibase/frontend-core/src/fetch/RelationshipFetch"
 import NestedProviderFetch from "@budibase/frontend-core/src/fetch/NestedProviderFetch.js"
 import FieldFetch from "@budibase/frontend-core/src/fetch/FieldFetch"
 import JSONArrayFetch from "@budibase/frontend-core/src/fetch/JSONArrayFetch.js"
diff --git a/packages/frontend-core/src/fetch/RelationshipFetch.js b/packages/frontend-core/src/fetch/RelationshipFetch.js
deleted file mode 100644
index 61f0207558..0000000000
--- a/packages/frontend-core/src/fetch/RelationshipFetch.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import DataFetch from "./DataFetch"
-
-export default class RelationshipFetch extends DataFetch {
-  async getData() {
-    const { datasource } = this.options
-    if (!datasource?.rowId || !datasource?.rowTableId) {
-      return { rows: [] }
-    }
-    try {
-      const res = await this.API.fetchRelationshipData(
-        datasource.rowTableId,
-        datasource.rowId,
-        datasource.fieldName
-      )
-      return { rows: res }
-    } catch (error) {
-      return { rows: [] }
-    }
-  }
-}
diff --git a/packages/frontend-core/src/fetch/RelationshipFetch.ts b/packages/frontend-core/src/fetch/RelationshipFetch.ts
new file mode 100644
index 0000000000..ab50285b4b
--- /dev/null
+++ b/packages/frontend-core/src/fetch/RelationshipFetch.ts
@@ -0,0 +1,50 @@
+import { Table } from "@budibase/types"
+import DataFetch from "./DataFetch"
+
+interface RelationshipDatasource {
+  tableId: string
+  rowId: string
+  rowTableId: string
+  fieldName: string
+}
+
+export default class RelationshipFetch extends DataFetch<
+  RelationshipDatasource,
+  Table
+> {
+  getSchema(_datasource: any, definition: any) {
+    return definition?.schema
+  }
+
+  async getDefinition(datasource: RelationshipDatasource) {
+    if (!datasource?.tableId) {
+      return null
+    }
+    try {
+      return await this.API.fetchTableDefinition(datasource.tableId)
+    } catch (error: any) {
+      this.store.update(state => ({
+        ...state,
+        error,
+      }))
+      return null
+    }
+  }
+
+  async getData() {
+    const { datasource } = this.options
+    if (!datasource?.rowId || !datasource?.rowTableId) {
+      return { rows: [] }
+    }
+    try {
+      const res = await this.API.fetchRelationshipData(
+        datasource.rowTableId,
+        datasource.rowId,
+        datasource.fieldName
+      )
+      return { rows: res }
+    } catch (error) {
+      return { rows: [] }
+    }
+  }
+}
diff --git a/packages/frontend-core/src/fetch/index.ts b/packages/frontend-core/src/fetch/index.ts
index 502b2d3162..0fbda7a414 100644
--- a/packages/frontend-core/src/fetch/index.ts
+++ b/packages/frontend-core/src/fetch/index.ts
@@ -2,7 +2,7 @@ import TableFetch from "./TableFetch.js"
 import ViewFetch from "./ViewFetch.js"
 import ViewV2Fetch from "./ViewV2Fetch.js"
 import QueryFetch from "./QueryFetch.js"
-import RelationshipFetch from "./RelationshipFetch.js"
+import RelationshipFetch from "./RelationshipFetch"
 import NestedProviderFetch from "./NestedProviderFetch.js"
 import FieldFetch from "./FieldFetch"
 import JSONArrayFetch from "./JSONArrayFetch.js"