fix(web): preserve office workspace mode in task routes (#1738)

This commit is contained in:
Carlos Florêncio
2026-07-16 21:45:20 +01:00
committed by GitHub
parent 3c869b7bad
commit a8d016e1dd
2 changed files with 87 additions and 11 deletions
@@ -0,0 +1,85 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import type { AppState } from "@/lib/state/store";
import type { Task } from "@/lib/types/http";
const mocks = vi.hoisted(() => ({
fetchTask: vi.fn(),
fetchTaskSession: vi.fn(),
fetchUserSettings: vi.fn(),
fetchWorkflowSnapshot: vi.fn(),
listAgents: vi.fn(),
listRepositories: vi.fn(),
listTaskSessionMessages: vi.fn(),
listTaskSessions: vi.fn(),
listWorkflows: vi.fn(),
listWorkspaces: vi.fn(),
}));
vi.mock("@/lib/api", () => ({
fetchTask: mocks.fetchTask,
fetchTaskSession: mocks.fetchTaskSession,
fetchUserSettings: mocks.fetchUserSettings,
fetchWorkflowSnapshot: mocks.fetchWorkflowSnapshot,
listAgents: mocks.listAgents,
listRepositories: mocks.listRepositories,
listTaskSessionMessages: mocks.listTaskSessionMessages,
listTaskSessions: mocks.listTaskSessions,
listWorkflows: mocks.listWorkflows,
listWorkspaces: mocks.listWorkspaces,
}));
vi.mock("@/lib/api/domains/session-api", () => ({
listSessionTurns: vi.fn(),
}));
vi.mock("@/lib/api/domains/user-shell-api", () => ({
fetchTerminals: vi.fn(),
}));
import { fetchSessionDataForTask } from "./session-page-state";
const NOW = "2026-07-16T12:00:00Z";
describe("fetchSessionDataForTask workspace hydration", () => {
beforeEach(() => {
vi.clearAllMocks();
mocks.fetchTask.mockResolvedValue({
id: "task-1",
workspace_id: "workspace-office",
workflow_id: "",
workflow_step_id: "",
position: 0,
title: "Office task",
description: "",
state: "TODO",
priority: 0,
created_at: NOW,
updated_at: NOW,
} as unknown as Task);
mocks.listTaskSessions.mockResolvedValue({ sessions: [] });
mocks.listAgents.mockResolvedValue({ agents: [] });
mocks.listRepositories.mockResolvedValue({ repositories: [] });
mocks.listWorkflows.mockResolvedValue({ workflows: [] });
mocks.fetchUserSettings.mockResolvedValue(null);
mocks.listWorkspaces.mockResolvedValue({
workspaces: [
{
id: "workspace-office",
name: "Office",
owner_id: "",
office_workflow_id: "workflow-office",
created_at: NOW,
updated_at: NOW,
},
],
});
});
it("preserves the Office workflow ID in task-route state", async () => {
const result = await fetchSessionDataForTask("task-1");
const initialState = result.initialState as unknown as Partial<AppState>;
expect(initialState.workspaces?.items[0]?.office_workflow_id).toBe("workflow-office");
});
});
+2 -11
View File
@@ -25,6 +25,7 @@ import { mapUserSettingsResponse } from "@/lib/ssr/user-settings";
import { prepareResultToSessionState } from "@/lib/state/slices/session-runtime/prepare-result";
import type { SessionPrepareState } from "@/lib/state/slices/session-runtime/types";
import type { AppState } from "@/lib/state/store";
import { mapWorkspaceItem } from "@/lib/routing/route-bootstrap";
function buildWorktreeState(allSessions: TaskSession[]) {
const sessionsWithWorktrees = allSessions.filter((s) => s.worktree_id);
@@ -100,17 +101,7 @@ function buildResourceState(p: BuildSessionPageStateParams) {
const scripts = repository?.scripts ?? [];
return {
workspaces: {
items: workspaces.map((w) => ({
id: w.id,
name: w.name,
description: w.description ?? null,
owner_id: w.owner_id,
default_executor_id: w.default_executor_id ?? null,
default_environment_id: w.default_environment_id ?? null,
default_agent_profile_id: w.default_agent_profile_id ?? null,
created_at: w.created_at,
updated_at: w.updated_at,
})),
items: workspaces.map(mapWorkspaceItem),
activeId: task.workspace_id,
},
// Don't write activeId — null means "All Workflows"; task context lives in kanban.workflowId.