refactor: go to /sessions/<sessionId> route on session click

This commit is contained in:
Haileyesus
2026-04-08 11:20:15 +03:00
parent 4765deede0
commit b62373f9b0
4 changed files with 24 additions and 25 deletions

View File

@@ -66,7 +66,7 @@ function WorkspaceTabRoute() {
tab: string;
}>();
if (!workspaceId) {
if (!workspaceId && !sessionId) {
return <Navigate to="/" replace />;
}
@@ -74,7 +74,7 @@ function WorkspaceTabRoute() {
return <Navigate to="../chat" replace />;
}
const decodedWorkspaceId = decodeURIComponent(workspaceId);
const decodedWorkspaceId = workspaceId ? decodeURIComponent(workspaceId) : null;
const decodedSessionId = sessionId ? decodeURIComponent(sessionId) : null;
const decodedTab = tab ? decodeURIComponent(tab) : 'chat';
@@ -83,7 +83,10 @@ function WorkspaceTabRoute() {
<div className="rounded-xl border border-border/70 bg-card/30 p-5">
<h2 className="text-lg font-semibold">{decodedTab} view</h2>
<p className="mt-2 text-sm text-muted-foreground">
Workspace: <span className="font-medium text-foreground">{decodedWorkspaceId}</span>
Workspace:{' '}
<span className="font-medium text-foreground">
{decodedWorkspaceId || 'none (session-level route)'}
</span>
</p>
<p className="mt-1 text-sm text-muted-foreground">
Session:{' '}
@@ -102,20 +105,20 @@ const router = createBrowserRouter(
path: '/',
element: <RootLayout />,
children: [
{ index: true, element: <NoWorkspaceRoute /> },
{ index: true, element: <NoWorkspaceRoute /> }, // TODO: Show empty state component loader here.
{
path: 'workspaces/:workspaceId',
element: <WorkspaceLayout />,
children: [
{ index: true, element: <Navigate to="chat" replace /> },
{ path: ':tab', element: <WorkspaceTabRoute /> },
{
path: 'sessions/:sessionId',
children: [
{ index: true, element: <Navigate to="chat" replace /> },
{ path: ':tab', element: <WorkspaceTabRoute /> },
],
},
],
},
{
path: 'sessions/:sessionId',
children: [
{ index: true, element: <Navigate to="chat" replace /> },
{ path: ':tab', element: <WorkspaceTabRoute /> },
],
},
],

View File

@@ -111,22 +111,20 @@ export function MainHeading() {
return () => observer.disconnect();
}, [isMobile, updateScrollState]);
if (!workspaceId) {
if (!workspaceId && !sessionId) {
return null;
}
const handleTabSelect = (nextTab: AppTab) => {
// Preserve workspace/session context while switching only the active tab path segment.
const encodedWorkspaceId = encodeURIComponent(decodedWorkspaceId);
// Preserve route context while switching only the active tab path segment.
const encodedTab = encodeURIComponent(nextTab);
if (decodedSessionId) {
navigate(
`/workspaces/${encodedWorkspaceId}/sessions/${encodeURIComponent(decodedSessionId)}/${encodedTab}`,
);
navigate(`/sessions/${encodeURIComponent(decodedSessionId)}/${encodedTab}`);
return;
}
const encodedWorkspaceId = encodeURIComponent(decodedWorkspaceId);
navigate(`/workspaces/${encodedWorkspaceId}/${encodedTab}`);
};
@@ -158,7 +156,7 @@ export function MainHeading() {
{title}
</h2>
<div className="truncate text-[11px] leading-tight text-muted-foreground">
{decodedWorkspaceId}
{decodedWorkspaceId || t('mainContent.newSession')}
</div>
</div>
</div>

View File

@@ -89,21 +89,19 @@ export function MobileNav() {
}, [moreOpen]);
const navigateToTab = (nextTab: AppTab) => {
if (!workspaceId) {
if (!workspaceId && !sessionId) {
return;
}
const encodedWorkspaceId = encodeURIComponent(decodeValue(workspaceId));
const encodedTab = encodeURIComponent(nextTab);
const decodedSessionId = decodeValue(sessionId);
if (decodedSessionId) {
navigate(
`/workspaces/${encodedWorkspaceId}/sessions/${encodeURIComponent(decodedSessionId)}/${encodedTab}`,
);
navigate(`/sessions/${encodeURIComponent(decodedSessionId)}/${encodedTab}`);
return;
}
const encodedWorkspaceId = encodeURIComponent(decodeValue(workspaceId));
navigate(`/workspaces/${encodedWorkspaceId}/${encodedTab}`);
};

View File

@@ -23,7 +23,7 @@ import {
splitWorkspacesByStarred,
} from '@/components/refactored/sidebar/utils/workspaceTransforms';
const SESSION_ROUTE_PATTERN = /^\/workspaces\/[^/]+\/sessions\/([^/]+)(?:\/[^/]+)?$/;
const SESSION_ROUTE_PATTERN = /^\/sessions\/([^/]+)(?:\/[^/]+)?$/;
const extractSessionIdFromPathname = (pathname: string): string | null => {
const sessionMatch = pathname.match(SESSION_ROUTE_PATTERN);
@@ -120,7 +120,7 @@ export const useWorkspaces = () => {
}
navigate(
`/workspaces/${encodeURIComponent(matchedWorkspace.workspaceId)}/sessions/${encodeURIComponent(sessionId)}`,
`/sessions/${encodeURIComponent(sessionId)}`,
);
},
[navigate, workspaces],