Skip to content

The VS Code of video editing, built for agents.

TypeScript

Enhance project navigation with return state management

konstantin-paulusac7f6aa24748
diff --git a/apps/web/src/components/dashboard/home-view.tsx b/apps/web/src/components/dashboard/home-view.tsx
index 26230d8f..7cef19af 100644
--- a/apps/web/src/components/dashboard/home-view.tsx
+++ b/apps/web/src/components/dashboard/home-view.tsx
@@ -39,7 +39,7 @@ import {
startChat,
type Attachment,
} from "@/agent-chat";
-import { projectRoute } from "@/hooks/use-project-route";
+import { projectRoute, useReturnHere } from "@/hooks/use-project-route";
import { track } from "@/lib/analytics";
import { generateProjectName } from "@/lib/db";
import {
@@ -98,6 +98,7 @@ const PROMPT_MAX_HEIGHT_PX = 200;
export function DashboardHomeView() {
const navigate = useNavigate();
+ const returnHere = useReturnHere();
const [prompt, setPrompt] = createSignal("");
const [target, setTarget] = createSignal<PromptTarget>({ kind: "new" });
@@ -209,7 +210,7 @@ export function DashboardHomeView() {
setAttachments([]);
setTarget({ kind: "new" });
refetchProjects();
- navigate(projectRoute(projectKey(project)));
+ navigate(projectRoute(projectKey(project)), { state: returnHere() });
} catch (e) {
toast.error("Could not open the project", {
description: (e as Error).message,
@@ -259,7 +260,7 @@ export function DashboardHomeView() {
const found = await openProjectFromList(project);
if (!found) return;
track("project_opened");
- navigate(projectRoute(projectKey(found)));
+ navigate(projectRoute(projectKey(found)), { state: returnHere() });
};
const handleCreateProject = async () => {
diff --git a/apps/web/src/components/dashboard/projects-view.tsx b/apps/web/src/components/dashboard/projects-view.tsx
index 66d26e26..8841cf78 100644
--- a/apps/web/src/components/dashboard/projects-view.tsx
+++ b/apps/web/src/components/dashboard/projects-view.tsx
@@ -27,7 +27,7 @@ import { DashboardProjectCard } from "./project-card";
import { parseTimestamp } from "./utils";
import { DashboardSearchPanel } from "./search-bar";
import { DashboardProjectsFolderBar } from "./projects-folder-bar";
-import { projectRoute } from "@/hooks/use-project-route";
+import { projectRoute, useReturnHere } from "@/hooks/use-project-route";
import { Icon } from "../ui/icon";
import { track } from "@/lib/analytics";
import {
@@ -41,6 +41,7 @@ import type { ProjectSortOption } from "./types";
export function DashboardProjectsView() {
const navigate = useNavigate();
+ const returnHere = useReturnHere();
const [search, setSearch] = createSignal("");
const [sort, setSort] = createSignal<ProjectSortOption>("last-viewed");
const [projects, { refetch: refetchProjects }] = createResource(projectsRevision, () => listProjects());
@@ -83,7 +84,7 @@ export function DashboardProjectsView() {
const found = await openProjectFromList(project);
if (!found) return;
track('project_opened');
- navigate(projectRoute(projectKey(found)));
+ navigate(projectRoute(projectKey(found)), { state: returnHere() });
};
const handleDeleted = (project: ProjectInfo) => {
diff --git a/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx b/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx
index 24ebd839..aa23c190 100644
--- a/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx
+++ b/apps/web/src/components/sidebar-left/project-menu/file-menu.tsx
@@ -12,7 +12,7 @@ import {
DropdownMenuSubTrigger,
DropdownMenuGroup,
} from "@/components/ui/dropdown-menu";
-import { useNavigate } from "@solidjs/router";
+import { useLocation, useNavigate } from "@solidjs/router";
import { For, Show, createMemo } from "solid-js";
import { toast } from "somoto";
import { forgetProjectBundle, generateProjectName } from "@/lib/db";
@@ -32,6 +32,7 @@ import type { Entity } from "koota";
export function FileMenu() {
const navigate = useNavigate();
+ const location = useLocation();
const project = useProject();
const library = useLibrary();
@@ -39,7 +40,7 @@ export function FileMenu() {
try {
if (!(await ensureProjectsRoot())) return;
const created = await createProject(generateProjectName());
- navigate(projectRoute(created.id));
+ navigate(projectRoute(created.id), { state: location.state });
} catch (e) {
toast.error("Failed to create project", {
description: (e as Error).message,
@@ -50,7 +51,7 @@ export function FileMenu() {
const handleDuplicateProject = async () => {
try {
const copy = await duplicateProject(project.dir());
- navigate(projectRoute(copy.id));
+ navigate(projectRoute(copy.id), { state: location.state });
} catch (e) {
toast.error("Failed to duplicate project", { description: (e as Error).message });
}
diff --git a/apps/web/src/components/sidebar-left/project-menu/index.tsx b/apps/web/src/components/sidebar-left/project-menu/index.tsx
index 2a758282..716c3692 100644
--- a/apps/web/src/components/sidebar-left/project-menu/index.tsx
+++ b/apps/web/src/components/sidebar-left/project-menu/index.tsx
@@ -16,12 +16,12 @@ import {
DropdownMenuTrigger,
DropdownMenuGroup,
} from "@/components/ui/dropdown-menu";
-import { useNavigate } from "@solidjs/router";
+import { useLocation, useNavigate } from "@solidjs/router";
import { Show, onCleanup, onMount } from "solid-js";
import { isInputTarget } from "@/utils";
import { useEditorApi } from "@/dapi";
import { downloadDesktopApp } from "@/lib/desktop-app";
-import { dashboardRoute } from "@/pages/dashboard";
+import type { ProjectRouteState } from "@/hooks/use-project-route";
import { FileMenu } from "./file-menu";
import { EditMenu } from "./edit-menu";
import { ViewMenu } from "./view-menu";
@@ -31,11 +31,12 @@ import { HelpMenu } from "./help-menu";
export function ProjectMenu() {
const navigate = useNavigate();
+ const location = useLocation<ProjectRouteState>();
const { isDesktop } = useEditorApi();
const handleOpenDashboard = () => {
(document.activeElement as HTMLElement)?.blur?.();
- navigate(dashboardRoute());
+ navigate(location.state?.returnTo ?? "/");
};
const handleOpenAccount = () => {
diff --git a/apps/web/src/hooks/use-project-route.ts b/apps/web/src/hooks/use-project-route.ts
index 4d61af25..1d0c90c1 100644
--- a/apps/web/src/hooks/use-project-route.ts
+++ b/apps/web/src/hooks/use-project-route.ts
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { useParams } from "@solidjs/router";
+import { useLocation, useParams } from "@solidjs/router";
import { createMemo } from 'solid-js';
/**
@@ -12,6 +12,18 @@ import { createMemo } from 'solid-js';
*/
export const projectRoute = (id: string): string => `/projects/${encodeURIComponent(id)}`;
+/** Route state of the editor: where leaving it goes back to. */
+export type ProjectRouteState = { returnTo?: string };
+
+/**
+ * State for a navigation into the editor from the current page, so that
+ * leaving the editor lands back here (the dashboard view it was opened from).
+ */
+export function useReturnHere() {
+ const location = useLocation();
+ return (): ProjectRouteState => ({ returnTo: location.pathname + location.search });
+}
+
/**
* The `/projects/*ref` segment: a project id, or a folder name for links made
* before ids existed. `resolveProject` in @/projects decides which it is; the
diff --git a/apps/web/src/pages/dashboard.tsx b/apps/web/src/pages/dashboard.tsx
index 369bf06d..5a84c957 100644
--- a/apps/web/src/pages/dashboard.tsx
+++ b/apps/web/src/pages/dashboard.tsx
@@ -64,9 +64,6 @@ function isSettingsView(view: DashboardView): boolean {
return SETTINGS_VIEWS.includes(view);
}
-let lastView: DashboardView = "home";
-export const dashboardRoute = (): string => (lastView === "home" ? "/" : `/?dashboard=${lastView}`);
-
export function DashboardPage() {
const [params, setParams] = useSearchParams();
const isFullscreen = useFullscreenState();
@@ -105,8 +102,6 @@ export function DashboardPage() {
const [settingsNavOpen, setSettingsNavOpen] = createSignal(isSettingsView(view()));
createEffect(() => {
- lastView = view();
-
if (isSettingsView(view())) {
setSettingsNavOpen(true);
}
diff --git a/apps/web/src/pages/project.tsx b/apps/web/src/pages/project.tsx
index f0ff44ca..cd760649 100644
--- a/apps/web/src/pages/project.tsx
+++ b/apps/web/src/pages/project.tsx
@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import { Show, createEffect, createMemo, createResource } from 'solid-js';
-import { Navigate, useNavigate } from '@solidjs/router';
+import { Navigate, useLocation, useNavigate } from '@solidjs/router';
import { EditorPage } from './editor';
import { LayoutProvider } from "@/context/layout";
import { PromptInputProvider } from "@/context/prompt-input";
@@ -19,6 +19,7 @@ import { EngineProvider } from '@/engine';
export function ProjectPage() {
const ref = useProjectRef();
const navigate = useNavigate();
+ const location = useLocation();
// The ref the project was found for. Rewriting the URL to the id below
// changes the ref without changing the project, so the lookup is held on
@@ -41,7 +42,7 @@ export function ProjectPage() {
const id = project()?.id;
if (!id) return;
resolvedId = id;
- if (id !== ref()) navigate(projectRoute(id), { replace: true });
+ if (id !== ref()) navigate(projectRoute(id), { replace: true, state: location.state });
});
return (