Files
kandev/apps/web/app/settings/layout.tsx
T
José Almeida e626d33a7c fix(web): make toggle-sidebar shortcut work on every route (#1283)
* fix(web): make toggle-sidebar shortcut work on every route

TOGGLE_SIDEBAR (Cmd/Ctrl+B) was handled only inside useEditorKeybinds,
mounted just by the dockview desktop layout, so it was dead on Kanban,
the task list, Office, Settings, etc. Lift it to a global app-root
listener (useAppShortcuts, mounted in GlobalCommands) that honors user
overrides via getShortcut and keeps the isEditableTarget guard, and drop
the now-duplicate branch from useEditorKeybinds. Adds a hook unit test
and a Playwright e2e covering Kanban, Settings, and the dockview session.

* fix(web): hydrate userSettings into the root store on settings routes

Each StateProvider creates its own store; the settings/general page mounts
a nested one that the root-mounted GlobalCommands/AppSidebar can't see. The
settings layout hydrated the root store but omitted userSettings, so
override-driven global shortcuts (TOGGLE_SIDEBAR, Quick Chat) were dead on
every /settings route. Hydrate userSettings there too, matching the
kanban/tasks/office/github routes.

* test(web): cover the macOS Cmd path; note the settings-layout catch trade-off

Address review feedback: add a metaKey (Cmd) variant to the useAppShortcuts
test so both ctrlOrCmd branches are exercised, and document that the settings
layout's outer catch intentionally drops userSettings overrides in the
already-degraded error path.
2026-06-06 23:09:12 +01:00

100 lines
3.6 KiB
TypeScript

import { SettingsLayoutClient } from "@/components/settings/settings-layout-client";
import { StateHydrator } from "@/components/state-hydrator";
import {
fetchUserSettings,
listAgentDiscovery,
listAgents,
listAvailableAgents,
listExecutors,
listWorkspaces,
} from "@/lib/api";
import { mapUserSettingsResponse } from "@/lib/ssr/user-settings";
import { toAgentProfileOption } from "@/lib/state/slices/settings/types";
export default function SettingsLayout({ children }: { children: React.ReactNode }) {
return <SettingsLayoutServer>{children}</SettingsLayoutServer>;
}
async function SettingsLayoutServer({ children }: { children: React.ReactNode }) {
let initialState = {};
try {
// Fetch discovery + available agents alongside the DB-backed list so a
// hard refresh of /settings/agents/[name] (where no profile exists yet)
// can still render the agent from the discovered set.
const [workspaces, executors, agents, discovery, available, userSettingsResponse] =
await Promise.all([
listWorkspaces({ cache: "no-store" }),
listExecutors({ cache: "no-store" }),
listAgents({ cache: "no-store" }),
listAgentDiscovery({ cache: "no-store" }),
listAvailableAgents({ cache: "no-store" }),
fetchUserSettings({ cache: "no-store" }).catch(() => null),
]);
// Hydrate userSettings into the ROOT store so app-global, override-driven
// shortcuts (TOGGLE_SIDEBAR, Quick Chat) work on settings routes too. The
// settings/general page mounts its own nested store for editing; that store
// is invisible to the root-mounted GlobalCommands/useAppShortcuts.
const mappedUserSettings = mapUserSettingsResponse(userSettingsResponse);
initialState = {
workspaces: {
items: workspaces.workspaces.map((workspace) => ({
id: workspace.id,
name: workspace.name,
default_executor_id: workspace.default_executor_id ?? null,
default_environment_id: workspace.default_environment_id ?? null,
default_agent_profile_id: workspace.default_agent_profile_id ?? null,
default_config_agent_profile_id: workspace.default_config_agent_profile_id ?? null,
})),
activeId: workspaces.workspaces[0]?.id ?? null,
},
executors: {
items: executors.executors,
},
agentProfiles: {
items: agents.agents.flatMap((agent) =>
agent.profiles.map((profile) => toAgentProfileOption(agent, profile)),
),
},
settingsAgents: {
items: agents.agents,
},
agentDiscovery: {
items: discovery.agents,
loading: false,
loaded: true,
},
availableAgents: {
items: available.agents,
tools: available.tools ?? [],
loading: false,
loaded: true,
},
settingsData: {
executorsLoaded: true,
agentsLoaded: true,
},
...(mappedUserSettings.loaded
? {
userSettings: {
...mappedUserSettings,
workspaceId: workspaces.workspaces[0]?.id ?? null,
},
}
: {}),
};
} catch {
// If any non-settings fetch (workspaces, executors, agents, …) throws, we
// render with empty initial state — losing the userSettings overrides too.
// That's acceptable: the page is already degraded (no executors/agents), so
// override-driven shortcuts being inactive until client hydration is fine.
initialState = {};
}
return (
<>
<StateHydrator initialState={initialState} />
<SettingsLayoutClient>{children}</SettingsLayoutClient>
</>
);
}