@agent-native/dispatch 0.29.1 → 0.29.2

package/src/routes/pages/$appId.tsx

@@ -7,7 +7,7 @@ import {
   IconArrowUpRight,
   IconClockHour4,
 } from "@tabler/icons-react";
-import { useEffect, useMemo } from "react";
+import { useEffect, useMemo, useState } from "react";
 import {
   Link,
   Navigate,
@@ -24,6 +24,7 @@ import { Button } from "../../components/ui/button";
 import { Spinner } from "../../components/ui/spinner";
 import { resolveServerCatchAllTarget } from "../../lib/catch-all-target";
 import {
+  navigateToWorkspaceApp,
   workspaceAppHref,
   type WorkspaceAppSummary,
 } from "../../lib/workspace-apps";
@@ -111,12 +112,18 @@ export default function WorkspaceAppCatchAllRoute() {
   );
   const href = app ? workspaceAppHref(app) : null;
   const isSelfReference = appId === "dispatch";
+  const hasApp = app !== null;
+  const appIsPending = app?.status === "pending";
+  const [navigationFailed, setNavigationFailed] = useState(false);
 
   useEffect(() => {
     if (isSelfReference) return;
-    if (!app || app.status === "pending" || !href) return;
-    window.location.assign(href);
-  }, [app, href, isSelfReference]);
+    if (!hasApp || appIsPending || !href) {
+      setNavigationFailed(false);
+      return;
+    }
+    setNavigationFailed(!navigateToWorkspaceApp(href));
+  }, [appIsPending, hasApp, href, isSelfReference]);
 
   if (isSelfReference) {
     return <Navigate to={appPath("/overview")} replace />;
@@ -136,7 +143,23 @@ export default function WorkspaceAppCatchAllRoute() {
     );
   }
 
-  if ((isLoading && !app) || (app && app.status !== "pending" && href)) {
+  if (navigationFailed && href) {
+    return (
+      <DispatchShell
+        title={t("dispatch.pages.dataLoadFailed")}
+        description={t("dispatch.pages.pageNotFoundDescription")}
+      >
+        <ActionQueryError
+          onRetry={() => setNavigationFailed(!navigateToWorkspaceApp(href))}
+        />
+      </DispatchShell>
+    );
+  }
+
+  if (
+    (isLoading && !app) ||
+    (app && app.status !== "pending" && href && !navigationFailed)
+  ) {
     return (
       <div className="flex h-screen w-full items-center justify-center">
         <Spinner className="size-8" />

package/src/routes/pages/apps.$appId.spec.tsx

@@ -0,0 +1,66 @@
+// @vitest-environment happy-dom
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const routeState = vi.hoisted(() => ({
+  appId: "mail",
+  hostProps: null as {
+    appId?: string;
+    navigateToTopWindow?: (href: string) => boolean | void;
+  } | null,
+  navigateToWorkspaceApp: vi.fn(() => true),
+}));
+
+vi.mock("react-router", () => ({
+  useParams: () => ({ appId: routeState.appId }),
+}));
+
+vi.mock("../../components/workspace-app-host", () => ({
+  WorkspaceAppHost: (props: typeof routeState.hostProps) => {
+    routeState.hostProps = props;
+    return <div data-workspace-app-id={props?.appId} />;
+  },
+}));
+
+vi.mock("../../lib/workspace-apps", () => ({
+  navigateToWorkspaceApp: routeState.navigateToWorkspaceApp,
+}));
+
+import WorkspaceAppRoute from "./apps.$appId";
+
+describe("WorkspaceAppRoute", () => {
+  let container: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    routeState.appId = "mail";
+    routeState.hostProps = null;
+    routeState.navigateToWorkspaceApp.mockClear();
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+  });
+
+  afterEach(() => {
+    act(() => root.unmount());
+    container.remove();
+    vi.unstubAllGlobals();
+  });
+
+  it("passes the route app id and top-window helper to the workspace host", async () => {
+    await act(async () => {
+      root.render(<WorkspaceAppRoute />);
+    });
+
+    expect(routeState.hostProps?.appId).toBe("mail");
+    expect(routeState.hostProps?.navigateToTopWindow).toEqual(
+      expect.any(Function),
+    );
+
+    routeState.hostProps?.navigateToTopWindow?.("/mail");
+
+    expect(routeState.navigateToWorkspaceApp).toHaveBeenCalledWith("/mail");
+  });
+});

package/src/routes/pages/apps.$appId.tsx

@@ -1,6 +1,11 @@
 import { useParams } from "react-router";
 
 import { WorkspaceAppHost } from "../../components/workspace-app-host";
+import { navigateToWorkspaceApp } from "../../lib/workspace-apps";
+
+export function navigateWorkspaceAppFromRoute(href: string): boolean {
+  return navigateToWorkspaceApp(href);
+}
 
 export function meta() {
   return [{ title: "Workspace app - Dispatch" }];
@@ -8,5 +13,10 @@ export function meta() {
 
 export default function WorkspaceAppRoute() {
   const { appId } = useParams();
-  return <WorkspaceAppHost appId={appId} />;
+  return (
+    <WorkspaceAppHost
+      appId={appId}
+      navigateToTopWindow={navigateWorkspaceAppFromRoute}
+    />
+  );
 }