From 2c1aae970582c4c1463191fd2813a9d6db406032 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 19 Jul 2023 22:57:54 +0200
Subject: [PATCH] Use full id

---
 .../[application]/data/view/v2/[id]/index.svelte    |  2 +-
 packages/frontend-core/src/fetch/ViewV2Fetch.js     | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[id]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v2/[id]/index.svelte
index 774f7181f1..ef5f4e45ec 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[id]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/v2/[id]/index.svelte
@@ -9,7 +9,7 @@
 <div class="wrapper">
   <Grid
     {API}
-    tableId={{ tableId: selectedView?.tableId, viewId: selectedView?.id }}
+    tableId={selectedView?.id}
     datasourceType="viewV2"
     showAvatars={false}
     showControls={false}
diff --git a/packages/frontend-core/src/fetch/ViewV2Fetch.js b/packages/frontend-core/src/fetch/ViewV2Fetch.js
index fb801d8e2d..1976eb0bd5 100644
--- a/packages/frontend-core/src/fetch/ViewV2Fetch.js
+++ b/packages/frontend-core/src/fetch/ViewV2Fetch.js
@@ -1,3 +1,5 @@
+import { get } from "svelte/store"
+import { views as viewsStore } from "stores/backend"
 import DataFetch from "./DataFetch.js"
 
 export default class ViewV2Fetch extends DataFetch {
@@ -7,9 +9,9 @@ export default class ViewV2Fetch extends DataFetch {
 
   async getDefinition(datasource) {
     try {
-      const result = await this.API.fetchTableDefinition(
-        datasource.tableId.tableId
-      )
+      const views = get(viewsStore).list
+      const { tableId } = views.find(v => v.id === datasource.tableId)
+      const result = await this.API.fetchTableDefinition(tableId)
       return result
     } catch (error) {
       this.store.update(state => ({
@@ -23,10 +25,7 @@ export default class ViewV2Fetch extends DataFetch {
   async getData() {
     const { datasource } = this.options
     try {
-      const res = await this.API.viewV2.fetch(
-        datasource.tableId.tableId,
-        datasource.tableId.viewId
-      )
+      const res = await this.API.viewV2.fetch(datasource.tableId)
       return { rows: res?.rows || [] }
     } catch (error) {
       return { rows: [] }