mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-27 02:44:50 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - Operators manage both company-scoped configuration and instance-level runtime/admin settings from the board UI > - Instance settings previously lived as their own top-level sidebar area, separate from the company settings context operators already use > - That split made settings navigation feel heavier and made instance configuration less discoverable from the settings tab > - This pull request moves instance settings under company settings while preserving the existing instance settings routes and plugin/admin surfaces > - The benefit is a smaller primary sidebar and a more coherent settings hierarchy for operators ## Linked Issues or Issue Description - Refs #338 - Internal: PAP-10491, PAP-10538 ## What Changed - Moved instance settings navigation under the company settings area. - Added route helpers and sidebar entries for nested instance settings paths. - Updated plugin/admin settings routes to use the company settings instance scope. - Preserved legacy instance-settings bookmarks through compatibility redirects that keep the active company prefix. - Updated focused UI and plugin tests for the new navigation shape. - Stabilized the process-loss retry test that was failing the serialized server shard in CI. - Rebased the branch onto current `paperclipai/paperclip` `master` and pushed the current head. ## Verification - `pnpm exec vitest run ui/src/components/CompanySettingsSidebar.test.tsx ui/src/components/access/CompanySettingsNav.test.tsx ui/src/lib/instance-settings.test.ts ui/src/components/InstanceSidebar.test.tsx ui/src/components/Layout.test.tsx ui/src/components/SidebarAccountMenu.test.tsx ui/src/pages/PluginPage.test.tsx ui/src/plugins/bridge.test.ts packages/shared/src/validators/plugin.test.ts` - `pnpm exec vitest run ui/src/lib/instance-settings.test.ts ui/src/components/CompanySettingsSidebar.test.tsx ui/src/components/access/CompanySettingsNav.test.tsx ui/src/components/Layout.test.tsx ui/src/plugins/bridge.test.ts` - `pnpm exec vitest run server/src/__tests__/heartbeat-process-recovery.test.ts -t "queues exactly one retry when the recorded local pid is dead"` - `pnpm test:run:serialized -- --shard-index 0 --shard-count 4` - GitHub PR checks are green on head `fe7b0955169dcae55cbe10889c1876a70ab0b80c`, including `verify`, `General tests (server)`, all serialized server shards, build, e2e, policy, security checks, and Greptile. - Confirmed the PR diff does not include `pnpm-lock.yaml` or `.github/workflows` changes. ## Risks - Medium UI/navigation risk: instance settings links are intentionally moving under company settings, so stale external bookmarks to legacy paths rely on the compatibility routing in this branch. - Low test-only risk from the CI stabilization commit: it makes the recovery assertion select the actual retry run by `retryOfRunId` instead of whichever non-original run appears first. - No database migrations. - No dependency lockfile or workflow changes. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex coding agent based on GPT-5, with shell/tool execution in a local repository worktree. Exact context window was not exposed by the runtime. ## 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 run tests locally and they pass - [x] I have added or updated tests where applicable - [ ] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
287 lines
8.8 KiB
TypeScript
287 lines
8.8 KiB
TypeScript
// @vitest-environment jsdom
|
|
|
|
import type { ReactNode } from "react";
|
|
import { createRoot } from "react-dom/client";
|
|
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import type { PluginRecord } from "@paperclipai/shared";
|
|
|
|
const mockPluginsApi = vi.hoisted(() => ({
|
|
list: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("@/api/plugins", () => ({
|
|
pluginsApi: mockPluginsApi,
|
|
}));
|
|
|
|
vi.mock("@/lib/router", () => ({
|
|
NavLink: ({
|
|
children,
|
|
to,
|
|
className,
|
|
}: {
|
|
children: ReactNode | ((arg: { isActive: boolean }) => ReactNode);
|
|
to: string;
|
|
state?: unknown;
|
|
end?: boolean;
|
|
onClick?: () => void;
|
|
className?: string | ((arg: { isActive: boolean }) => string);
|
|
}) => {
|
|
const resolvedClass =
|
|
typeof className === "function" ? className({ isActive: false }) : className;
|
|
const content = typeof children === "function" ? children({ isActive: false }) : children;
|
|
return (
|
|
<a href={to} className={resolvedClass}>
|
|
{content}
|
|
</a>
|
|
);
|
|
},
|
|
}));
|
|
|
|
vi.mock("../context/SidebarContext", () => ({
|
|
useSidebar: () => ({ isMobile: false, setSidebarOpen: vi.fn() }),
|
|
}));
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
|
|
|
|
import { InstanceSidebar } from "./InstanceSidebar";
|
|
|
|
async function act(callback: () => void | Promise<void>) {
|
|
await callback();
|
|
await Promise.resolve();
|
|
await new Promise((resolve) => window.setTimeout(resolve, 0));
|
|
}
|
|
|
|
function makePlugin(overrides: Partial<PluginRecord> & { manifestJson: PluginRecord["manifestJson"] }): PluginRecord {
|
|
return {
|
|
id: overrides.id ?? "plugin-id",
|
|
pluginKey: overrides.pluginKey ?? "plugin-key",
|
|
packageName: overrides.packageName ?? "@scope/pkg",
|
|
version: overrides.version ?? "1.0.0",
|
|
apiVersion: overrides.apiVersion ?? 1,
|
|
categories: overrides.categories ?? [],
|
|
manifestJson: overrides.manifestJson,
|
|
status: overrides.status ?? "ready",
|
|
installOrder: overrides.installOrder ?? 0,
|
|
packagePath: overrides.packagePath ?? null,
|
|
lastError: overrides.lastError ?? null,
|
|
installedAt: overrides.installedAt ?? new Date(0),
|
|
updatedAt: overrides.updatedAt ?? new Date(0),
|
|
};
|
|
}
|
|
|
|
async function flushReact() {
|
|
await act(async () => {
|
|
await Promise.resolve();
|
|
await new Promise((resolve) => window.setTimeout(resolve, 0));
|
|
});
|
|
}
|
|
|
|
async function findPluginLinks(container: HTMLElement, expectedCount: number) {
|
|
await act(async () => {
|
|
await vi.waitFor(() => {
|
|
expect(container.querySelectorAll('a[href^="/company/settings/instance/plugins/"]')).toHaveLength(expectedCount);
|
|
});
|
|
});
|
|
return Array.from(container.querySelectorAll<HTMLAnchorElement>('a[href^="/company/settings/instance/plugins/"]'));
|
|
}
|
|
|
|
function renderSidebar(container: HTMLElement) {
|
|
const queryClient = new QueryClient({
|
|
defaultOptions: { queries: { retry: false, gcTime: 0 } },
|
|
});
|
|
const root = createRoot(container);
|
|
act(() => {
|
|
root.render(
|
|
<QueryClientProvider client={queryClient}>
|
|
<InstanceSidebar />
|
|
</QueryClientProvider>,
|
|
);
|
|
});
|
|
return { root, queryClient };
|
|
}
|
|
|
|
describe("InstanceSidebar", () => {
|
|
let container: HTMLDivElement;
|
|
let root: ReturnType<typeof createRoot> | null;
|
|
let queryClient: QueryClient | null;
|
|
|
|
beforeEach(() => {
|
|
container = document.createElement("div");
|
|
document.body.appendChild(container);
|
|
root = null;
|
|
queryClient = null;
|
|
mockPluginsApi.list.mockReset();
|
|
});
|
|
|
|
afterEach(async () => {
|
|
if (root) {
|
|
const currentRoot = root;
|
|
await act(async () => {
|
|
currentRoot.unmount();
|
|
});
|
|
}
|
|
queryClient?.clear();
|
|
container.remove();
|
|
document.body.innerHTML = "";
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it("filters out sandbox-provider-only plugins from the sidebar", async () => {
|
|
const sandboxPlugin = makePlugin({
|
|
id: "e2b",
|
|
packageName: "@paperclipai/plugin-e2b",
|
|
manifestJson: {
|
|
id: "e2b",
|
|
name: "E2B Sandbox Provider",
|
|
displayName: "E2B Sandbox Provider",
|
|
version: "1.0.0",
|
|
apiVersion: 1,
|
|
environmentDrivers: [
|
|
{
|
|
driverKey: "e2b",
|
|
kind: "sandbox_provider",
|
|
displayName: "E2B",
|
|
configSchema: { type: "object" },
|
|
},
|
|
],
|
|
} as unknown as PluginRecord["manifestJson"],
|
|
});
|
|
const regularPlugin = makePlugin({
|
|
id: "linear",
|
|
packageName: "@paperclipai/plugin-linear",
|
|
manifestJson: {
|
|
id: "linear",
|
|
name: "Linear",
|
|
displayName: "Linear",
|
|
version: "1.0.0",
|
|
apiVersion: 1,
|
|
} as unknown as PluginRecord["manifestJson"],
|
|
});
|
|
mockPluginsApi.list.mockResolvedValue([sandboxPlugin, regularPlugin]);
|
|
|
|
const rendered = renderSidebar(container);
|
|
root = rendered.root;
|
|
queryClient = rendered.queryClient;
|
|
await flushReact();
|
|
|
|
const pluginLinks = await findPluginLinks(container, 1);
|
|
expect(pluginLinks[0]?.getAttribute("href")).toBe("/company/settings/instance/plugins/linear");
|
|
expect(pluginLinks[0]?.textContent).toBe("Linear");
|
|
});
|
|
|
|
it("keeps plugins that mix sandbox-provider with other contributions", async () => {
|
|
const hybridPlugin = makePlugin({
|
|
id: "hybrid",
|
|
packageName: "@example/plugin-hybrid",
|
|
manifestJson: {
|
|
id: "hybrid",
|
|
name: "Hybrid",
|
|
displayName: "Hybrid",
|
|
version: "1.0.0",
|
|
apiVersion: 1,
|
|
environmentDrivers: [
|
|
{
|
|
driverKey: "sb",
|
|
kind: "sandbox_provider",
|
|
displayName: "SB",
|
|
configSchema: { type: "object" },
|
|
},
|
|
{
|
|
driverKey: "env",
|
|
kind: "environment_driver",
|
|
displayName: "Env",
|
|
configSchema: { type: "object" },
|
|
},
|
|
],
|
|
} as unknown as PluginRecord["manifestJson"],
|
|
});
|
|
mockPluginsApi.list.mockResolvedValue([hybridPlugin]);
|
|
|
|
const rendered = renderSidebar(container);
|
|
root = rendered.root;
|
|
queryClient = rendered.queryClient;
|
|
await flushReact();
|
|
|
|
const pluginLinks = await findPluginLinks(container, 1);
|
|
expect(pluginLinks[0]?.getAttribute("href")).toBe("/company/settings/instance/plugins/hybrid");
|
|
});
|
|
|
|
it("renders the indented plugin list between the Plugins and Adapters rows", async () => {
|
|
mockPluginsApi.list.mockResolvedValue([
|
|
makePlugin({
|
|
id: "linear",
|
|
packageName: "@paperclipai/plugin-linear",
|
|
manifestJson: {
|
|
id: "linear",
|
|
name: "Linear",
|
|
displayName: "Linear",
|
|
version: "1.0.0",
|
|
apiVersion: 1,
|
|
} as unknown as PluginRecord["manifestJson"],
|
|
}),
|
|
]);
|
|
|
|
const rendered = renderSidebar(container);
|
|
root = rendered.root;
|
|
queryClient = rendered.queryClient;
|
|
await flushReact();
|
|
await findPluginLinks(container, 1);
|
|
|
|
await vi.waitFor(() => {
|
|
const links = Array.from(
|
|
container.querySelectorAll<HTMLAnchorElement>('a[href^="/company/settings/instance/"]'),
|
|
);
|
|
expect(links.some((a) => a.getAttribute("href") === "/company/settings/instance/plugins/linear")).toBe(true);
|
|
});
|
|
|
|
const topLevelLinks = Array.from(container.querySelectorAll<HTMLAnchorElement>('a[href^="/company/settings/instance/"]'));
|
|
const hrefs = topLevelLinks.map((a) => a.getAttribute("href"));
|
|
|
|
const pluginsIndex = hrefs.indexOf("/company/settings/instance/plugins");
|
|
const adaptersIndex = hrefs.indexOf("/company/settings/instance/adapters");
|
|
const linearIndex = hrefs.indexOf("/company/settings/instance/plugins/linear");
|
|
|
|
expect(pluginsIndex).toBeGreaterThanOrEqual(0);
|
|
expect(adaptersIndex).toBeGreaterThan(pluginsIndex);
|
|
expect(linearIndex).toBeGreaterThan(pluginsIndex);
|
|
expect(linearIndex).toBeLessThan(adaptersIndex);
|
|
});
|
|
|
|
it("does not render the indented group when every plugin is filtered out", async () => {
|
|
mockPluginsApi.list.mockResolvedValue([
|
|
makePlugin({
|
|
id: "e2b",
|
|
packageName: "@paperclipai/plugin-e2b",
|
|
manifestJson: {
|
|
id: "e2b",
|
|
name: "E2B",
|
|
displayName: "E2B",
|
|
version: "1.0.0",
|
|
apiVersion: 1,
|
|
environmentDrivers: [
|
|
{
|
|
driverKey: "e2b",
|
|
kind: "sandbox_provider",
|
|
displayName: "E2B",
|
|
configSchema: { type: "object" },
|
|
},
|
|
],
|
|
} as unknown as PluginRecord["manifestJson"],
|
|
}),
|
|
]);
|
|
|
|
const rendered = renderSidebar(container);
|
|
root = rendered.root;
|
|
queryClient = rendered.queryClient;
|
|
await flushReact();
|
|
|
|
await vi.waitFor(() => {
|
|
expect(mockPluginsApi.list).toHaveBeenCalled();
|
|
});
|
|
const pluginLinks = Array.from(container.querySelectorAll('a[href^="/company/settings/instance/plugins/"]'));
|
|
expect(pluginLinks).toHaveLength(0);
|
|
});
|
|
});
|