From 808dd0f2e75b4f2dd67461b425eb27377a8dde27 Mon Sep 17 00:00:00 2001
From: Jonathan Summers-Muir <MildTomato@users.noreply.github.com>
Date: Thu, 24 Apr 2025 00:07:46 +0800
Subject: [PATCH] more stuff for alaister

---
 .../grid/hooks/useSafeTableEditorSnapshot.ts  |  2 ++
 .../project/[ref]/database/tables/index.tsx   | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/apps/studio/components/grid/hooks/useSafeTableEditorSnapshot.ts b/apps/studio/components/grid/hooks/useSafeTableEditorSnapshot.ts
index c536c8a236b..e2d01323fe3 100644
--- a/apps/studio/components/grid/hooks/useSafeTableEditorSnapshot.ts
+++ b/apps/studio/components/grid/hooks/useSafeTableEditorSnapshot.ts
@@ -26,6 +26,8 @@ export function useSafeTableEditorSnapshot(): Partial<TableEditorTableState> {
   let snap: TableEditorTableState | undefined | null = undefined
   let errorOccurred = false
 
+  // To do - @Alaister to look at..
+
   try {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     snap = useTableEditorTableStateSnapshot()
diff --git a/apps/studio/pages/project/[ref]/database/tables/index.tsx b/apps/studio/pages/project/[ref]/database/tables/index.tsx
index 63bd66e40fe..6d32c4fd0ae 100644
--- a/apps/studio/pages/project/[ref]/database/tables/index.tsx
+++ b/apps/studio/pages/project/[ref]/database/tables/index.tsx
@@ -1,7 +1,5 @@
 import type { PostgresTable } from '@supabase/postgres-meta'
-import { useParams } from 'common'
-import { useState } from 'react'
-import { ENTITY_TYPE } from 'data/entity-types/entity-type-constants'
+import { useMemo, useState } from 'react'
 
 import { TableList } from 'components/interfaces/Database'
 import { SidePanelEditor } from 'components/interfaces/TableGridEditor'
@@ -10,16 +8,22 @@ import DatabaseLayout from 'components/layouts/DatabaseLayout/DatabaseLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import { ScaffoldContainer, ScaffoldSection } from 'components/layouts/Scaffold'
 import { FormHeader } from 'components/ui/Forms/FormHeader'
-import { Entity } from 'data/table-editor/table-editor-types'
 import { useTableEditorStateSnapshot } from 'state/table-editor'
-import { TableEditorTableStateContextProvider } from 'state/table-editor-table'
 import type { NextPageWithLayout } from 'types'
+import { TableEditorTableStateContextProvider } from 'state/table-editor-table'
+import { useParams } from 'common'
+import { parseSupaTable } from 'components/grid/SupabaseGrid.utils'
 
 const DatabaseTables: NextPageWithLayout = () => {
+  const { ref: projectRef } = useParams()
   const snap = useTableEditorStateSnapshot()
-  const { ref: projectRef = '' } = useParams()
   const [selectedTableToEdit, setSelectedTableToEdit] = useState<PostgresTable>()
 
+  // to do - @alaister - this is a temporary solution to get the table editor to work
+  const parsedTable = useMemo(() => {
+    return parseSupaTable(selectedTableToEdit)
+  }, [selectedTableToEdit])
+
   return (
     <>
       <ScaffoldContainer>
@@ -45,19 +49,18 @@ const DatabaseTables: NextPageWithLayout = () => {
         </ScaffoldSection>
       </ScaffoldContainer>
 
-      {selectedTableToEdit && (
+      {selectedTableToEdit && projectRef && (
         <TableEditorTableStateContextProvider
+          key={`table-editor-table-${selectedTableToEdit.id}`}
           projectRef={projectRef}
-          table={{
-            ...selectedTableToEdit,
-            entity_type: ENTITY_TYPE.TABLE,
-            relationships: selectedTableToEdit.relationships || [],
-          }}
+          table={parsedTable}
           editable={true}
         >
           <DeleteConfirmationDialogs selectedTable={selectedTableToEdit} />
+          <DeleteConfirmationDialogs selectedTable={selectedTableToEdit} />
         </TableEditorTableStateContextProvider>
       )}
+
       <SidePanelEditor includeColumns selectedTable={selectedTableToEdit} />
     </>
   )