mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-20 15:09:57 +02:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - Archiving a company hides it from the sidebar switcher, but remembered last-visited paths, browser history, bookmarks, and restored tabs keep depositing users onto its URLs long after archiving > - Since the selection ping-pong fix (#11300) those arrivals render, but the user is stranded inside a workspace the sidebar refuses to show — and unarchiving had no UI anywhere, so the only way back was a hand-typed settings URL > - This pull request bounces cold arrivals at archived company URLs to an active company (with a toast naming why), lets deliberate visits stick, and adds an Unarchive action to the companies list > - The benefit is that stale URLs stop stranding users in retired workspaces, and archived companies become restorable from the one page that still lists them ## Linked Issues or Issue Description Follow-up to #11300. No existing issue for the remaining gap; description follows the enhancement template: **What happened?** After #11300, opening an archived company's URL (stale tab, history, bookmark, remembered path) renders that company's pages — but the sidebar switcher does not list it, so the user is stranded in a workspace they retired, and every stale URL pulls them back in. Separately, unarchiving a company has no UI: the archive button lives in company settings, which becomes unreachable through normal navigation once the company is archived. **Expected behavior** Arriving cold at an archived company's URL lands the user in an active workspace, with a toast explaining the redirect. Explicitly choosing the archived company (from the companies list) still works, so its pages remain reachable. Archived companies can be restored from the companies list. **Steps to reproduce** 1. Create two companies; archive one. 2. Open `/{archivedPrefix}/dashboard` directly — before: renders the archived workspace with no sidebar presence; after: bounces to the active company's dashboard with a toast. 3. On the companies list, open the archived company's row menu — before: no restore action anywhere; after: Unarchive. ## What Changed - `ui/src/lib/company-selection.ts`: `resolveArchivedCompanyBounce` — pure policy: bounce when the URL names an archived company that is not the current selection and an active company exists; prefer the currently selected active company as the destination. - `ui/src/components/Layout.tsx`: the route-sync effect applies the bounce (toast + selection + `replace` navigation) before syncing selection from the route. - `ui/src/pages/Companies.tsx`: Unarchive action (`PATCH status: "active"`) in the row menu for archived companies. - Tests: unit cases for the bounce policy; the e2e now drives all three behaviors (direct-load bounce with toast, re-arrival bounce, deliberate visit sticks) on top of the existing crash regression. ## Verification - `pnpm vitest run src/lib/company-selection.test.ts src/context/CompanyContext.test.tsx src/pages/Companies.test.tsx` in `ui/` — 20 tests pass. - `npx playwright test --config tests/e2e/playwright.config.ts archived-company-url` — passes, covering bounce, toast, and deliberate-visit paths. - `pnpm typecheck` in `ui/` — clean. ## Risks Low risk. The bounce only fires for archived-company URLs when the archived company is not already selected and an active company exists; all-archived instances render as before. Deliberate selection from the companies list is unaffected (selection equals the matched company, so no bounce). Unarchive reuses the existing `PATCH /api/companies/:id` status transition the server already supports. ## Model Used - Claude (Anthropic), Claude Fable 5 (`claude-fable-5`), via Claude Code CLI with extended thinking and tool use (code search, edit, test execution, Playwright e2e). ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge
1046 lines
32 KiB
TypeScript
1046 lines
32 KiB
TypeScript
// @vitest-environment jsdom
|
|
|
|
import { createRoot } from "react-dom/client";
|
|
import { flushSync } from "react-dom";
|
|
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { Layout } from "./Layout";
|
|
|
|
const mockHealthApi = vi.hoisted(() => ({
|
|
get: vi.fn(),
|
|
}));
|
|
|
|
const mockInstanceSettingsApi = vi.hoisted(() => ({
|
|
getGeneral: vi.fn(),
|
|
getExperimental: vi.fn(),
|
|
}));
|
|
|
|
const mockNavigate = vi.hoisted(() => vi.fn());
|
|
const mockSetSelectedCompanyId = vi.hoisted(() => vi.fn());
|
|
const mockSetSidebarOpen = vi.hoisted(() => vi.fn());
|
|
const mockSetForceCollapsed = vi.hoisted(() => vi.fn());
|
|
const mockCompanyState = vi.hoisted(() => ({
|
|
companies: [{ id: "company-1", issuePrefix: "PAP", name: "Paperclip" }],
|
|
selectedCompany: { id: "company-1", issuePrefix: "PAP", name: "Paperclip" },
|
|
selectedCompanyId: "company-1",
|
|
}));
|
|
const mockPluginSlots = vi.hoisted(() => ({
|
|
slots: [] as Array<Record<string, unknown>>,
|
|
}));
|
|
const mockUsePluginSlots = vi.hoisted(() => vi.fn());
|
|
const mockPluginSlotContexts = vi.hoisted(() => [] as Array<Record<string, unknown>>);
|
|
const mockSetPeeking = vi.hoisted(() => vi.fn());
|
|
const mockSidebarState = vi.hoisted(() => ({
|
|
sidebarOpen: true,
|
|
isMobile: false,
|
|
collapsed: false,
|
|
peeking: false,
|
|
}));
|
|
let currentPathname = "/PAP/dashboard";
|
|
|
|
vi.mock("@/lib/router", () => ({
|
|
Outlet: () => <div>Outlet content</div>,
|
|
useLocation: () => ({ pathname: currentPathname, search: "", hash: "", state: null }),
|
|
useNavigate: () => mockNavigate,
|
|
useNavigationType: () => "PUSH",
|
|
useParams: () => {
|
|
const [firstSegment, secondSegment] = currentPathname.split("/").filter(Boolean);
|
|
return {
|
|
companyPrefix: firstSegment ?? "PAP",
|
|
pluginRoutePath: secondSegment,
|
|
};
|
|
},
|
|
}));
|
|
|
|
vi.mock("./Sidebar", () => ({
|
|
Sidebar: () => <div>Main company nav</div>,
|
|
}));
|
|
|
|
vi.mock("./CompanySettingsSidebar", () => ({
|
|
CompanySettingsSidebar: () => <div>Company settings sidebar</div>,
|
|
}));
|
|
|
|
vi.mock("./AppsSidebar", () => ({
|
|
AppsSidebar: () => <div>Apps sidebar</div>,
|
|
}));
|
|
|
|
vi.mock("./AppConnectionSidebar", () => ({
|
|
AppDetailSidebar: (props: { kind: "connection"; connectionId: string } | { kind: "application"; applicationId: string }) => (
|
|
<div>
|
|
{props.kind === "connection"
|
|
? `App detail sidebar connection ${props.connectionId}`
|
|
: `App detail sidebar application ${props.applicationId}`}
|
|
</div>
|
|
),
|
|
}));
|
|
|
|
vi.mock("./BreadcrumbBar", () => ({
|
|
BreadcrumbBar: () => <div>Breadcrumbs</div>,
|
|
}));
|
|
|
|
vi.mock("./PropertiesPanel", () => ({
|
|
PropertiesPanel: () => null,
|
|
}));
|
|
|
|
vi.mock("./CommandPalette", () => ({
|
|
CommandPalette: () => null,
|
|
}));
|
|
|
|
vi.mock("./NewIssueDialog", () => ({
|
|
NewIssueDialog: () => null,
|
|
}));
|
|
|
|
vi.mock("./NewProjectDialog", () => ({
|
|
NewProjectDialog: () => null,
|
|
}));
|
|
|
|
vi.mock("./NewGoalDialog", () => ({
|
|
NewGoalDialog: () => null,
|
|
}));
|
|
|
|
vi.mock("./NewAgentDialog", () => ({
|
|
NewAgentDialog: () => null,
|
|
}));
|
|
|
|
vi.mock("./KeyboardShortcutsCheatsheet", () => ({
|
|
KeyboardShortcutsCheatsheet: () => null,
|
|
}));
|
|
|
|
vi.mock("./ToastViewport", () => ({
|
|
ToastViewport: () => null,
|
|
}));
|
|
|
|
vi.mock("./MobileBottomNav", () => ({
|
|
MobileBottomNav: () => null,
|
|
}));
|
|
|
|
vi.mock("./WorktreeBanner", () => ({
|
|
WorktreeBanner: () => null,
|
|
}));
|
|
|
|
vi.mock("./DevRestartBanner", () => ({
|
|
DevRestartBanner: () => null,
|
|
}));
|
|
|
|
vi.mock("./SidebarAccountMenu", () => ({
|
|
SidebarAccountMenu: () => <div>Account menu</div>,
|
|
}));
|
|
|
|
vi.mock("../plugins/slots", async () => {
|
|
const actual = await vi.importActual<typeof import("../plugins/slots")>("../plugins/slots");
|
|
return {
|
|
resolveRouteSidebarSlot: actual.resolveRouteSidebarSlot,
|
|
usePluginSlots: (params: Record<string, unknown>) => {
|
|
mockUsePluginSlots(params);
|
|
return {
|
|
slots: mockPluginSlots.slots,
|
|
isLoading: false,
|
|
errorMessage: null,
|
|
};
|
|
},
|
|
PluginSlotMount: ({
|
|
slot,
|
|
context,
|
|
className,
|
|
}: {
|
|
slot: { displayName: string };
|
|
context: Record<string, unknown>;
|
|
className?: string;
|
|
}) => {
|
|
mockPluginSlotContexts.push(context);
|
|
return <div data-plugin-slot-class={className}>Plugin route sidebar: {slot.displayName}</div>;
|
|
},
|
|
};
|
|
});
|
|
|
|
vi.mock("../context/DialogContext", () => ({
|
|
useDialog: () => ({
|
|
openNewIssue: vi.fn(),
|
|
openOnboarding: vi.fn(),
|
|
}),
|
|
useDialogActions: () => ({
|
|
openNewIssue: vi.fn(),
|
|
openOnboarding: vi.fn(),
|
|
}),
|
|
}));
|
|
|
|
vi.mock("../context/PanelContext", () => ({
|
|
usePanel: () => ({
|
|
togglePanelVisible: vi.fn(),
|
|
}),
|
|
}));
|
|
|
|
vi.mock("../context/CompanyContext", () => ({
|
|
useCompany: () => ({
|
|
companies: mockCompanyState.companies,
|
|
loading: false,
|
|
selectedCompany: mockCompanyState.selectedCompany,
|
|
selectedCompanyId: mockCompanyState.selectedCompanyId,
|
|
selectionSource: "manual",
|
|
setSelectedCompanyId: mockSetSelectedCompanyId,
|
|
}),
|
|
}));
|
|
|
|
vi.mock("../context/SidebarContext", () => ({
|
|
useSidebar: () => ({
|
|
sidebarOpen: mockSidebarState.sidebarOpen,
|
|
setSidebarOpen: mockSetSidebarOpen,
|
|
toggleSidebar: vi.fn(),
|
|
toggleCollapsed: vi.fn(),
|
|
collapsed: mockSidebarState.collapsed,
|
|
collapseLocked: false,
|
|
peeking: mockSidebarState.peeking,
|
|
setPeeking: mockSetPeeking,
|
|
isMobile: mockSidebarState.isMobile,
|
|
forceCollapsed: false,
|
|
setForceCollapsed: mockSetForceCollapsed,
|
|
routeRequestsCollapsed: false,
|
|
setRouteRequestsCollapsed: vi.fn(),
|
|
}),
|
|
}));
|
|
|
|
vi.mock("../hooks/useKeyboardShortcuts", () => ({
|
|
useKeyboardShortcuts: () => undefined,
|
|
}));
|
|
|
|
vi.mock("../hooks/useCompanyPageMemory", () => ({
|
|
useCompanyPageMemory: () => undefined,
|
|
}));
|
|
|
|
vi.mock("../api/health", () => ({
|
|
healthApi: mockHealthApi,
|
|
}));
|
|
|
|
vi.mock("../api/instanceSettings", () => ({
|
|
instanceSettingsApi: mockInstanceSettingsApi,
|
|
}));
|
|
|
|
vi.mock("../lib/company-selection", () => ({
|
|
shouldSyncCompanySelectionFromRoute: () => false,
|
|
// No bounce in the shared harness: these tests exercise layout chrome, not
|
|
// archived-company routing (covered by company-selection unit tests and the
|
|
// archived-company-url e2e).
|
|
resolveArchivedCompanyBounce: () => null,
|
|
}));
|
|
|
|
vi.mock("../lib/main-content-focus", () => ({
|
|
scheduleMainContentFocus: () => () => undefined,
|
|
}));
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
|
|
|
|
async function act(callback: () => void | Promise<void>) {
|
|
let result: void | Promise<void> = undefined;
|
|
flushSync(() => {
|
|
result = callback();
|
|
});
|
|
await result;
|
|
}
|
|
|
|
async function flushReact() {
|
|
await act(async () => {
|
|
await Promise.resolve();
|
|
await new Promise((resolve) => window.setTimeout(resolve, 0));
|
|
});
|
|
}
|
|
|
|
describe("Layout", () => {
|
|
let container: HTMLDivElement;
|
|
|
|
beforeEach(() => {
|
|
container = document.createElement("div");
|
|
document.body.appendChild(container);
|
|
currentPathname = "/PAP/dashboard";
|
|
mockCompanyState.companies = [{ id: "company-1", issuePrefix: "PAP", name: "Paperclip" }];
|
|
mockCompanyState.selectedCompany = { id: "company-1", issuePrefix: "PAP", name: "Paperclip" };
|
|
mockCompanyState.selectedCompanyId = "company-1";
|
|
mockHealthApi.get.mockResolvedValue({
|
|
status: "ok",
|
|
deploymentMode: "authenticated",
|
|
deploymentExposure: "private",
|
|
version: "1.2.3",
|
|
});
|
|
mockInstanceSettingsApi.getGeneral.mockResolvedValue({
|
|
keyboardShortcuts: false,
|
|
});
|
|
mockInstanceSettingsApi.getExperimental.mockResolvedValue({ enableApps: true });
|
|
mockPluginSlots.slots = [];
|
|
mockPluginSlotContexts.length = 0;
|
|
mockSidebarState.sidebarOpen = true;
|
|
mockSidebarState.isMobile = false;
|
|
mockSidebarState.collapsed = false;
|
|
mockSidebarState.peeking = false;
|
|
mockSetPeeking.mockClear();
|
|
});
|
|
|
|
afterEach(() => {
|
|
container.remove();
|
|
document.body.innerHTML = "";
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it("does not render the deployment explainer in the shared layout", async () => {
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(mockHealthApi.get).toHaveBeenCalled();
|
|
expect(container.textContent).toContain("Breadcrumbs");
|
|
expect(container.textContent).toContain("Outlet content");
|
|
expect(container.textContent).not.toContain("Company rail");
|
|
expect(container.textContent).not.toContain("Authenticated private");
|
|
expect(container.textContent).not.toContain(
|
|
"Sign-in is required and this instance is intended for private-network access.",
|
|
);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("collapses atomically when the pointer is still over the sidebar (no re-peek) — PAP-10676", async () => {
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
|
|
|
|
const renderLayout = async () => {
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
};
|
|
|
|
// The SidebarShell overlay panel carries the peek mouse handlers.
|
|
const panel = () =>
|
|
[...container.querySelectorAll<HTMLElement>("div")].find(
|
|
(el) => el.className.includes("inset-y-0") && el.className.includes("overflow-hidden"),
|
|
);
|
|
const hover = (el: HTMLElement) => {
|
|
// React derives onMouseEnter from a mouseover crossing in from outside.
|
|
el.dispatchEvent(new MouseEvent("mouseover", { bubbles: true, relatedTarget: document.body }));
|
|
};
|
|
|
|
// Expanded, then hover the panel so the pointer is registered as inside.
|
|
await renderLayout();
|
|
const expandedPanel = panel();
|
|
expect(expandedPanel).toBeTruthy();
|
|
await act(async () => { hover(expandedPanel!); });
|
|
|
|
// Collapse while the pointer is still over the panel.
|
|
mockSidebarState.collapsed = true;
|
|
await renderLayout();
|
|
// The peek is cancelled atomically on collapse.
|
|
expect(mockSetPeeking).toHaveBeenCalledWith(false);
|
|
|
|
// A lingering/spurious hover while collapsed must NOT re-open the peek.
|
|
mockSetPeeking.mockClear();
|
|
const railPanel = panel();
|
|
await act(async () => { hover(railPanel!); });
|
|
await act(async () => { await new Promise((r) => setTimeout(r, 80)); });
|
|
expect(mockSetPeeking).not.toHaveBeenCalledWith(true);
|
|
|
|
await act(async () => { root.unmount(); });
|
|
});
|
|
|
|
it("opens the peek when hovering a collapsed rail (positive control for the hover sim)", async () => {
|
|
mockSidebarState.collapsed = true;
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
|
|
const panel = [...container.querySelectorAll<HTMLElement>("div")].find(
|
|
(el) => el.className.includes("inset-y-0") && el.className.includes("overflow-hidden"),
|
|
);
|
|
expect(panel).toBeTruthy();
|
|
await act(async () => {
|
|
panel!.dispatchEvent(new MouseEvent("mouseover", { bubbles: true, relatedTarget: document.body }));
|
|
});
|
|
await act(async () => { await new Promise((r) => setTimeout(r, 80)); });
|
|
// A normal collapsed-rail hover (not just-collapsed) opens the peek.
|
|
expect(mockSetPeeking).toHaveBeenCalledWith(true);
|
|
|
|
await act(async () => { root.unmount(); });
|
|
});
|
|
|
|
it("keeps the app sidebar and shows the settings sidebar in the secondary pane on settings routes", async () => {
|
|
currentPathname = "/PAP/company/settings/access";
|
|
mockPluginSlots.slots = [
|
|
{
|
|
type: "page",
|
|
id: "company-page",
|
|
displayName: "Company Page",
|
|
exportName: "CompanyPage",
|
|
routePath: "company",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "fake-plugin",
|
|
pluginDisplayName: "Fake Plugin",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
{
|
|
type: "routeSidebar",
|
|
id: "company-sidebar",
|
|
displayName: "Company Route Sidebar",
|
|
exportName: "CompanySidebar",
|
|
routePath: "company",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "fake-plugin",
|
|
pluginDisplayName: "Fake Plugin",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
];
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
// Takeover model (PAP-10695): the app sidebar is kept (collapsed to its
|
|
// rail) AND the settings sidebar renders in the secondary pane.
|
|
expect(container.textContent).toContain("Company settings sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("Company rail");
|
|
expect(container.textContent).not.toContain("Instance sidebar");
|
|
expect(container.textContent).not.toContain("Plugin route sidebar");
|
|
// The route asks the host to collapse the app sidebar to its rail.
|
|
expect(mockSetForceCollapsed).toHaveBeenCalledWith(true);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("renders a mobile company settings selector on company settings routes", async () => {
|
|
currentPathname = "/PAP/company/settings/secrets";
|
|
mockSidebarState.isMobile = true;
|
|
mockSidebarState.sidebarOpen = false;
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
const selector = container.querySelector("select");
|
|
expect(selector).not.toBeNull();
|
|
expect(selector?.value).toBe("secrets");
|
|
const selectorText = selector?.textContent?.toLowerCase() ?? "";
|
|
expect(selectorText).toContain("general");
|
|
expect(selectorText).toContain("export");
|
|
expect(selectorText).toContain("import");
|
|
expect(selectorText).toContain("members");
|
|
expect(selectorText).toContain("invites");
|
|
expect(selectorText).toContain("secrets");
|
|
expect(selectorText).toContain("instance general");
|
|
expect(selectorText).toContain("instance environments");
|
|
expect(selectorText).toContain("instance plugins");
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("renders the company settings sidebar on instance settings routes", async () => {
|
|
currentPathname = "/PAP/company/settings/instance/general";
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Company settings sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("Company rail");
|
|
expect(container.textContent).not.toContain("Plugin route sidebar");
|
|
expect(mockSetForceCollapsed).toHaveBeenCalledWith(true);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("keeps the app sidebar and shows the Apps sidebar in the secondary pane on legacy tools routes", async () => {
|
|
currentPathname = "/PAP/tools/runtime";
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Apps sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("Company settings sidebar");
|
|
expect(mockSetForceCollapsed).toHaveBeenCalledWith(true);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("does not mount the Apps secondary sidebar while experimental apps are disabled", async () => {
|
|
currentPathname = "/PAP/apps";
|
|
mockInstanceSettingsApi.getExperimental.mockResolvedValue({ enableApps: false });
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).not.toContain("Apps sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(mockSetForceCollapsed).toHaveBeenCalledWith(false);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("keeps the Apps sidebar on the M8 advanced-setup tabs", async () => {
|
|
currentPathname = "/PAP/apps/advanced/run-your-own";
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Apps sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("keeps the Apps sidebar on legacy developer tabs behind the Advanced door", async () => {
|
|
currentPathname = "/PAP/apps/advanced/runtime";
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Apps sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
// Reserved Apps subroutes are not connection ids. They must keep the
|
|
// top-level Apps sidebar, never mount a detail sidebar for a phantom app.
|
|
it.each(["browse", "connections", "review"])("keeps the Apps sidebar on the %s surface", async (route) => {
|
|
currentPathname = `/PAP/apps/${route}`;
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Apps sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("App detail sidebar");
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("keeps the Apps sidebar on the gateways list and detail routes", async () => {
|
|
for (const pathname of ["/PAP/apps/gateways", "/PAP/apps/gateways/gw-1/overview"]) {
|
|
currentPathname = pathname;
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Apps sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("App detail sidebar");
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
}
|
|
});
|
|
|
|
it("uses the app connection sidebar on app detail routes", async () => {
|
|
currentPathname = "/PAP/apps/conn-1/permissions";
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("App detail sidebar connection conn-1");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("Apps sidebar");
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("uses the app detail sidebar on not-connected app routes", async () => {
|
|
currentPathname = "/PAP/apps/app/app-1/permissions";
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("App detail sidebar application app-1");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("Apps sidebar");
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("forces the app sidebar rail only for the Skills Store route", async () => {
|
|
async function renderAt(pathname: string) {
|
|
currentPathname = pathname;
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
return root;
|
|
}
|
|
|
|
let root = await renderAt("/PAP/skills/studio");
|
|
expect(mockSetForceCollapsed).toHaveBeenCalledWith(true);
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
|
|
mockSetForceCollapsed.mockClear();
|
|
container.innerHTML = "";
|
|
|
|
root = await renderAt("/PAP/agents/briefing-analyst/skills");
|
|
expect(mockSetForceCollapsed).not.toHaveBeenCalledWith(true);
|
|
expect(mockSetForceCollapsed).toHaveBeenCalledWith(false);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("renders a route-scoped plugin sidebar for a matching plugin page route", async () => {
|
|
currentPathname = "/PAP/wiki";
|
|
mockPluginSlots.slots = [
|
|
{
|
|
type: "page",
|
|
id: "wiki-page",
|
|
displayName: "Wiki Page",
|
|
exportName: "WikiPage",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "wiki-plugin",
|
|
pluginDisplayName: "Wiki Plugin",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
{
|
|
type: "routeSidebar",
|
|
id: "wiki-route-sidebar",
|
|
displayName: "Wiki Sidebar",
|
|
exportName: "WikiSidebar",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "wiki-plugin",
|
|
pluginDisplayName: "Wiki Plugin",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
];
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
// Takeover model (PAP-10695): the app sidebar coexists with the plugin's
|
|
// route sidebar, which renders in the secondary pane.
|
|
expect(container.textContent).toContain("Plugin route sidebar: Wiki Sidebar");
|
|
expect(container.querySelector("[data-plugin-slot-class='h-full w-full']")).not.toBeNull();
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("Company settings sidebar");
|
|
expect(container.textContent).not.toContain("Instance sidebar");
|
|
expect(mockSetForceCollapsed).toHaveBeenCalledWith(true);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("keeps the route-scoped plugin sidebar on nested plugin page routes", async () => {
|
|
currentPathname = "/PAP/wiki/page/templates";
|
|
mockPluginSlots.slots = [
|
|
{
|
|
type: "page",
|
|
id: "wiki-page",
|
|
displayName: "Wiki Page",
|
|
exportName: "WikiPage",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "wiki-plugin",
|
|
pluginDisplayName: "Wiki Plugin",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
{
|
|
type: "routeSidebar",
|
|
id: "wiki-route-sidebar",
|
|
displayName: "Wiki Sidebar",
|
|
exportName: "WikiSidebar",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "wiki-plugin",
|
|
pluginDisplayName: "Wiki Plugin",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
];
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(mockUsePluginSlots).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
companyId: "company-1",
|
|
enabled: true,
|
|
}),
|
|
);
|
|
expect(container.textContent).toContain("Plugin route sidebar: Wiki Sidebar");
|
|
expect(container.textContent).toContain("Main company nav");
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("uses the route company context for plugin route sidebars on the first render", async () => {
|
|
currentPathname = "/ALT/wiki";
|
|
mockCompanyState.companies = [
|
|
{ id: "company-1", issuePrefix: "PAP", name: "Paperclip" },
|
|
{ id: "company-2", issuePrefix: "ALT", name: "Alternate" },
|
|
];
|
|
mockCompanyState.selectedCompany = { id: "company-1", issuePrefix: "PAP", name: "Paperclip" };
|
|
mockCompanyState.selectedCompanyId = "company-1";
|
|
mockPluginSlots.slots = [
|
|
{
|
|
type: "page",
|
|
id: "wiki-page",
|
|
displayName: "Wiki Page",
|
|
exportName: "WikiPage",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "wiki-plugin",
|
|
pluginDisplayName: "Wiki Plugin",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
{
|
|
type: "routeSidebar",
|
|
id: "wiki-route-sidebar",
|
|
displayName: "Wiki Sidebar",
|
|
exportName: "WikiSidebar",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "wiki-plugin",
|
|
pluginDisplayName: "Wiki Plugin",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
];
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(mockUsePluginSlots).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
companyId: "company-2",
|
|
enabled: true,
|
|
}),
|
|
);
|
|
expect(mockPluginSlotContexts).toContainEqual({
|
|
companyId: "company-2",
|
|
companyPrefix: "ALT",
|
|
});
|
|
expect(mockPluginSlotContexts).not.toContainEqual({
|
|
companyId: "company-1",
|
|
companyPrefix: "PAP",
|
|
});
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("keeps the normal company sidebar when a plugin page route is ambiguous", async () => {
|
|
currentPathname = "/PAP/wiki";
|
|
mockPluginSlots.slots = [
|
|
{
|
|
type: "page",
|
|
id: "wiki-page-a",
|
|
displayName: "Wiki Page A",
|
|
exportName: "WikiPageA",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "wiki-plugin-a",
|
|
pluginDisplayName: "Wiki Plugin A",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
{
|
|
type: "page",
|
|
id: "wiki-page-b",
|
|
displayName: "Wiki Page B",
|
|
exportName: "WikiPageB",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-2",
|
|
pluginKey: "wiki-plugin-b",
|
|
pluginDisplayName: "Wiki Plugin B",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
{
|
|
type: "routeSidebar",
|
|
id: "wiki-route-sidebar",
|
|
displayName: "Wiki Sidebar",
|
|
exportName: "WikiSidebar",
|
|
routePath: "wiki",
|
|
pluginId: "plugin-1",
|
|
pluginKey: "wiki-plugin-a",
|
|
pluginDisplayName: "Wiki Plugin A",
|
|
pluginVersion: "1.0.0",
|
|
},
|
|
];
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Main company nav");
|
|
expect(container.textContent).not.toContain("Plugin route sidebar");
|
|
// No secondary pane, so the route must not force the sidebar collapsed.
|
|
expect(mockSetForceCollapsed).not.toHaveBeenCalledWith(true);
|
|
expect(mockSetForceCollapsed).toHaveBeenCalledWith(false);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
async function renderLayoutRoot(): Promise<{ root: ReturnType<typeof createRoot>; rootEl: HTMLElement }> {
|
|
const root = createRoot(container);
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false } },
|
|
});
|
|
await act(async () => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<Layout />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
await flushReact();
|
|
const rootEl = container.firstElementChild as HTMLElement;
|
|
return { root, rootEl };
|
|
}
|
|
|
|
it("clips horizontal overflow on the mobile layout root so the viewport can't scroll sideways", async () => {
|
|
mockSidebarState.isMobile = true;
|
|
mockSidebarState.sidebarOpen = false;
|
|
const { root, rootEl } = await renderLayoutRoot();
|
|
|
|
expect(rootEl.tagName).toBe("DIV");
|
|
expect(rootEl.className).toContain("bg-background");
|
|
// The mobile root must clip horizontal overflow to prevent a stray wide
|
|
// descendant from making the whole viewport scroll sideways. clip (not
|
|
// hidden) keeps overflow-y visible so body scroll keeps working.
|
|
expect(rootEl.classList.contains("overflow-x-clip")).toBe(true);
|
|
expect(rootEl.classList.contains("overflow-hidden")).toBe(false);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
|
|
it("clips overflow on the desktop layout root", async () => {
|
|
mockSidebarState.isMobile = false;
|
|
const { root, rootEl } = await renderLayoutRoot();
|
|
|
|
expect(rootEl.className).toContain("bg-background");
|
|
expect(rootEl.classList.contains("overflow-clip")).toBe(true);
|
|
|
|
await act(async () => {
|
|
root.unmount();
|
|
});
|
|
});
|
|
});
|