Handle opened table

jdeniau · Mar 5, 2024 · 793c4bf · 793c4bf
1 parent ee8f125
commit 793c4bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/configuration/type.ts b/src/configuration/type.ts
@@ -9,7 +9,7 @@ export type Configuration = {
 export type ConnectionAppState = {
   isActive: boolean; // TODO not handled yet
   activeDatabase: string;
-  openedTable: string; // TODO not handled yet
+  openedTable: string;
 };
 
 export type EncryptedConnectionObject = {

diff --git a/src/renderer/routes/connections.$connectionName.tsx b/src/renderer/routes/connections.$connectionName.tsx
@@ -41,13 +41,15 @@ export async function loader({ params, request }: RouteParams) {
 
   const configuration = await window.config.getConfiguration();
 
-  const configDatabase =
-    configuration.connections[connectionName]?.appState?.activeDatabase;
+  const { activeDatabase: configDatabase, openedTable } =
+    configuration.connections[connectionName]?.appState || {};
 
   const activeDatabase = configDatabase || databaseList[0].Database;
 
   // redirect to the current database if we are not on a "database" page
-  const expectedUrl = `/connections/${connectionName}/${activeDatabase}`;
+  const expectedUrl = `/connections/${connectionName}/${activeDatabase}${
+    openedTable ? `/${openedTable}` : ''
+  }`;
 
   if (!request.url.endsWith(expectedUrl)) {
     return redirect(expectedUrl);