Skip to content

fix v2 sidebar nav-away on workspace delete #3771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saddlepaddle merged 1 commit into from
Apr 26, 2026
+11 −5
Merged

fix v2 sidebar nav-away on workspace delete #3771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions ...nents/DashboardSidebar/hooks/useNavigateAwayFromWorkspace/useNavigateAwayFromWorkspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useNavigate, useParams } from "@tanstack/react-router";
import { useMatchRoute, useNavigate } from "@tanstack/react-router";
import { navigateToV2Workspace } from "renderer/routes/_authenticated/_dashboard/utils/workspace-navigation";
import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
import { getFlattenedV2WorkspaceIds } from "../../utils/getFlattenedV2WorkspaceIds";
Expand All @@ -11,13 +11,19 @@ import { getFlattenedV2WorkspaceIds } from "../../utils/getFlattenedV2WorkspaceI
*/
export function useNavigateAwayFromWorkspace() {
const navigate = useNavigate();
const params = useParams({ strict: false });
const matchRoute = useMatchRoute();
const collections = useCollections();

return (workspaceId: string) => {
if (params.workspaceId !== workspaceId) return;
const ids = getFlattenedV2WorkspaceIds(collections);
const next = ids.find((id) => id !== workspaceId);
const isViewingWorkspace = !!matchRoute({
to: "/v2-workspace/$workspaceId",
params: { workspaceId },
fuzzy: true,
});
if (!isViewingWorkspace) return;
const next = getFlattenedV2WorkspaceIds(collections).find(
(id) => id !== workspaceId,
);
if (next) {
void navigateToV2Workspace(next, navigate);
} else {
Expand Down
Loading