From 75977ff8df277663c2a774629f34715f1ac76745 Mon Sep 17 00:00:00 2001
From: kanza shahid <kanzashahid18@gmail.com>
Date: Sat, 12 Sep 2026 00:20:17 +0500
Subject: [PATCH] Fix table layout routing

---
 .../table-[table]/+layout.svelte               | 18 ++++++++++++++----
 .../table-[table]/+layout.ts                   | 17 +++++++++++++----
 .../database-[database]/table-[table]/+page.ts | 16 ++++++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
index 57e32165ba..c5a475a6ff 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -165,7 +165,8 @@
                 }
             },
             icon: IconPlus,
-            group: 'rows'
+            group: 'rows',
+            disabled: !table || !$canWriteTables
         },
         {
             label: 'Create column',
@@ -175,7 +176,7 @@
             },
             icon: IconPlus,
             group: 'columns',
-            disabled: !$canWriteTables
+            disabled: !table || !$canWriteTables
         },
         {
             label: 'Go to rows',
@@ -257,7 +258,7 @@
             },
             icon: IconPlus,
             group: 'indexes',
-            disabled: !$canWriteTables
+            disabled: !table || !$canWriteTables
         }
     ]);
 
@@ -385,7 +386,16 @@
     <title>{table?.name ?? 'Table'} - Appwrite</title>
 </svelte:head>
 
-<slot />
+{#if table}
+    <slot />
+{:else}
+    <Layout.Stack alignItems="center" justifyContent="center" style="min-height: 400px;">
+        <Typography.Title size="m">Table deleted or not found</Typography.Title>
+        <Typography.Text>
+            The table you're looking for no longer exists or could not be found.
+        </Typography.Text>
+    </Layout.Stack>
+{/if}
 
 <SideSheet
     closeOnBlur={false}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
index 021c3c00a5..745eb238a8 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
@@ -3,6 +3,7 @@ import type { LayoutLoad } from './$types';
 import { Dependencies } from '$lib/constants';
 import { Breadcrumbs, toDatabaseType, useDatabaseSdk } from '$database/(entity)';
 import { guardResourceBlock } from '$lib/helpers/project';
+import { AppwriteException } from '@appwrite.io/console';
 
 export const load: LayoutLoad = async ({ params, depends, parent }) => {
     const { database, project } = await parent();
@@ -15,10 +16,18 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
         toDatabaseType(database.type)
     );
 
-    const table = await databaseSdk.getEntity({
-        databaseId: params.database,
-        entityId: params.table
-    });
+    let table = null;
+
+    try {
+        table = await databaseSdk.getEntity({
+            databaseId: params.database,
+            entityId: params.table
+        });
+    } catch (e) {
+        if (!(e instanceof AppwriteException) || e.code !== 404) {
+            throw e;
+        }
+    }
 
     return {
         table,
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
index a584f612b3..419efc4811 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
@@ -7,6 +7,22 @@ import { buildGridQueries, extractSortFromQueries, loadGridRows } from '$databas
 
 export const load: PageLoad = async ({ params, depends, url, route, parent }) => {
     const { table } = await parent();
+
+    if (!table) {
+        return {
+            offset: 0,
+            limit: SPREADSHEET_PAGE_LIMIT,
+            view: View.Grid,
+            query: '',
+            currentSort: { column: null, direction: 'default' },
+            parsedQueries: new Map(),
+            rows: {
+                total: 0,
+                rows: []
+            }
+        };
+    }
+
     depends(Dependencies.ROWS);
 
     const page = getPage(url);