From 0a289f508e1ca8dcf0e276f79b60d6dd9fbe3b74 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 20 Nov 2023 13:41:48 +0100
Subject: [PATCH] Undo store usage

---
 .../DatasourceNavigator.svelte                |  2 +-
 .../DatasourceNavigator/datasourceUtils.js    | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 826f499263..8ff8ba0ea2 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -31,7 +31,7 @@
     $datasources,
     $params,
     $isActive,
-    $tables.selected?._id,
+    $tables,
     $queries,
     $views,
     $viewsV2,
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
index 0feeb8525a..543fa1f204 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
@@ -1,3 +1,5 @@
+import { TableNames } from "constants"
+
 const showDatasourceOpen = ({
   selected,
   containsSelected,
@@ -26,7 +28,7 @@ const containsActiveEntity = (
   datasource,
   params,
   isActive,
-  selectedTableId,
+  tables,
   queries,
   views,
   viewsV2
@@ -69,7 +71,8 @@ const containsActiveEntity = (
 
   // Check for a matching table
   if (params.tableId) {
-    return options.find(x => x._id === selectedTableId) != null
+    const selectedTable = tables.selected?._id
+    return options.find(x => x._id === selectedTable) != null
   }
 
   // Check for a matching view
@@ -90,7 +93,7 @@ export const enrichDatasources = (
   datasources,
   params,
   isActive,
-  selectedTableId,
+  tables,
   queries,
   views,
   viewsV2,
@@ -110,19 +113,18 @@ export const enrichDatasources = (
       datasource,
       params,
       isActive,
-      selectedTableId,
+      tables,
       queries,
       views,
       viewsV2
     )
 
-    const entities = Array.isArray(datasource.entities)
-      ? datasource.entities
-      : Object.values(datasource.entities || {})
-    const dsTables = entities.filter(
+    const dsTables = tables.list.filter(
       table =>
-        !searchTerm ||
-        table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1
+        table.sourceId === datasource._id &&
+        table._id !== TableNames.USERS &&
+        (!searchTerm ||
+          table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1)
     )
     const dsQueries = queries.list.filter(
       query =>