From 4bf421c5c3ceeddf2ad2515d5f5b319471d061df Mon Sep 17 00:00:00 2001
From: Alaister Young <alaister@users.noreply.github.com>
Date: Tue, 16 Jan 2024 23:06:22 +1100
Subject: [PATCH] fix: entity types query keepPreviousData (#20476)

---
 .../Database/Indexes/CreateIndexSidePanel.tsx   | 17 +++++++----------
 .../interfaces/TableGridEditor/EmptyState.tsx   | 17 ++++++-----------
 .../TableEditorLayout/TableEditorMenu.tsx       |  2 +-
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/apps/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx b/apps/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
index 705f0a09159..c1af6223d8e 100644
--- a/apps/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
+++ b/apps/studio/components/interfaces/Database/Indexes/CreateIndexSidePanel.tsx
@@ -36,16 +36,13 @@ const CreateIndexSidePanel = ({ visible, onClose }: CreateIndexSidePanelProps) =
     projectRef: project?.ref,
     connectionString: project?.connectionString,
   })
-  const { data: entities } = useEntityTypesQuery(
-    {
-      schema: selectedSchema,
-      sort: 'alphabetical',
-      search: undefined,
-      projectRef: project?.ref,
-      connectionString: project?.connectionString,
-    },
-    { keepPreviousData: true }
-  )
+  const { data: entities } = useEntityTypesQuery({
+    schema: selectedSchema,
+    sort: 'alphabetical',
+    search: undefined,
+    projectRef: project?.ref,
+    connectionString: project?.connectionString,
+  })
   const {
     data: tableColumns,
     isLoading: isLoadingTableColumns,
diff --git a/apps/studio/components/interfaces/TableGridEditor/EmptyState.tsx b/apps/studio/components/interfaces/TableGridEditor/EmptyState.tsx
index 6b17abbc366..65ae1b051d8 100644
--- a/apps/studio/components/interfaces/TableGridEditor/EmptyState.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/EmptyState.tsx
@@ -21,17 +21,12 @@ const EmptyState = ({}: EmptyStateProps) => {
   )
 
   const { project } = useProjectContext()
-  const { data } = useEntityTypesQuery(
-    {
-      projectRef: project?.ref,
-      connectionString: project?.connectionString,
-      schema: snap.selectedSchemaName,
-      sort,
-    },
-    {
-      keepPreviousData: true,
-    }
-  )
+  const { data } = useEntityTypesQuery({
+    projectRef: project?.ref,
+    connectionString: project?.connectionString,
+    schema: snap.selectedSchemaName,
+    sort,
+  })
 
   const totalCount = data?.pages?.[0].data.count ?? 0
 
diff --git a/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx b/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
index ba9dd5dfc7d..c371007a0a3 100644
--- a/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
+++ b/apps/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
@@ -70,7 +70,7 @@ const TableEditorMenu = () => {
       sort,
     },
     {
-      keepPreviousData: true,
+      keepPreviousData: Boolean(searchText),
     }
   )