76c88e5855
## 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>
251 lines
10 KiB
TypeScript
251 lines
10 KiB
TypeScript
import { useEffect, useMemo, useState } from "react";
|
|
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
import { Shield, ShieldCheck } from "lucide-react";
|
|
import { accessApi } from "@/api/access";
|
|
import { ApiError } from "@/api/client";
|
|
import { Button } from "@/components/ui/button";
|
|
import { Checkbox } from "@/components/ui/checkbox";
|
|
import { useBreadcrumbs } from "@/context/BreadcrumbContext";
|
|
import { useCompany } from "@/context/CompanyContext";
|
|
import { useToast } from "@/context/ToastContext";
|
|
import { queryKeys } from "@/lib/queryKeys";
|
|
|
|
export function InstanceAccess() {
|
|
const { companies } = useCompany();
|
|
const { setBreadcrumbs } = useBreadcrumbs();
|
|
const { pushToast } = useToast();
|
|
const queryClient = useQueryClient();
|
|
const [search, setSearch] = useState("");
|
|
const [selectedUserId, setSelectedUserId] = useState<string | null>(null);
|
|
const [selectedCompanyIds, setSelectedCompanyIds] = useState<Set<string>>(new Set());
|
|
|
|
useEffect(() => {
|
|
setBreadcrumbs([
|
|
{ label: "Settings", href: "/company/settings" },
|
|
{ label: "Instance settings", href: "/company/settings/instance/general" },
|
|
{ label: "Access" },
|
|
]);
|
|
}, [setBreadcrumbs]);
|
|
|
|
const usersQuery = useQuery({
|
|
queryKey: queryKeys.access.adminUsers(search),
|
|
queryFn: () => accessApi.searchAdminUsers(search),
|
|
});
|
|
|
|
const selectedUser = useMemo(
|
|
() => usersQuery.data?.find((user) => user.id === selectedUserId) ?? null,
|
|
[selectedUserId, usersQuery.data],
|
|
);
|
|
|
|
const userAccessQuery = useQuery({
|
|
queryKey: queryKeys.access.userCompanyAccess(selectedUserId ?? ""),
|
|
queryFn: () => accessApi.getUserCompanyAccess(selectedUserId!),
|
|
enabled: !!selectedUserId,
|
|
});
|
|
|
|
useEffect(() => {
|
|
if (!selectedUserId && usersQuery.data?.[0]) {
|
|
setSelectedUserId(usersQuery.data[0].id);
|
|
}
|
|
}, [selectedUserId, usersQuery.data]);
|
|
|
|
useEffect(() => {
|
|
if (!userAccessQuery.data) return;
|
|
setSelectedCompanyIds(
|
|
new Set(
|
|
userAccessQuery.data.companyAccess
|
|
.filter((membership) => membership.status === "active")
|
|
.map((membership) => membership.companyId),
|
|
),
|
|
);
|
|
}, [userAccessQuery.data]);
|
|
|
|
const updateCompanyAccessMutation = useMutation({
|
|
mutationFn: () => accessApi.setUserCompanyAccess(selectedUserId!, [...selectedCompanyIds]),
|
|
onSuccess: async () => {
|
|
await queryClient.invalidateQueries({ queryKey: queryKeys.access.userCompanyAccess(selectedUserId!) });
|
|
await queryClient.invalidateQueries({ queryKey: queryKeys.access.adminUsers(search) });
|
|
pushToast({ title: "Company access updated", tone: "success" });
|
|
},
|
|
});
|
|
|
|
const setAdminMutation = useMutation({
|
|
mutationFn: async (makeAdmin: boolean) => {
|
|
if (!selectedUserId) throw new Error("No user selected");
|
|
if (makeAdmin) return accessApi.promoteInstanceAdmin(selectedUserId);
|
|
return accessApi.demoteInstanceAdmin(selectedUserId);
|
|
},
|
|
onSuccess: async () => {
|
|
await queryClient.invalidateQueries({ queryKey: queryKeys.access.adminUsers(search) });
|
|
if (selectedUserId) {
|
|
await queryClient.invalidateQueries({ queryKey: queryKeys.access.userCompanyAccess(selectedUserId) });
|
|
}
|
|
pushToast({ title: "Instance role updated", tone: "success" });
|
|
},
|
|
});
|
|
|
|
if (usersQuery.isLoading) {
|
|
return <div className="text-sm text-muted-foreground">Loading instance users…</div>;
|
|
}
|
|
|
|
if (usersQuery.error) {
|
|
const message =
|
|
usersQuery.error instanceof ApiError && usersQuery.error.status === 403
|
|
? "Instance admin access is required to manage users."
|
|
: usersQuery.error instanceof Error
|
|
? usersQuery.error.message
|
|
: "Failed to load users.";
|
|
return <div className="text-sm text-destructive">{message}</div>;
|
|
}
|
|
|
|
return (
|
|
<div className="max-w-6xl space-y-6">
|
|
<div className="space-y-3">
|
|
<div className="flex items-center gap-2">
|
|
<Shield className="h-5 w-5 text-muted-foreground" />
|
|
<h1 className="text-lg font-semibold">Instance Access</h1>
|
|
</div>
|
|
<p className="max-w-3xl text-sm text-muted-foreground">
|
|
Search users, manage instance-admin status, and control which companies they can access.
|
|
</p>
|
|
</div>
|
|
|
|
<div className="grid gap-6 lg:grid-cols-[320px_minmax(0,1fr)]">
|
|
<section className="space-y-4 rounded-xl border border-border bg-card p-4">
|
|
<label className="block space-y-2 text-sm">
|
|
<span className="font-medium">Search users</span>
|
|
<input
|
|
className="w-full rounded-md border border-border bg-background px-3 py-2"
|
|
value={search}
|
|
onChange={(event) => setSearch(event.target.value)}
|
|
placeholder="Search by name or email"
|
|
/>
|
|
</label>
|
|
<div className="space-y-2">
|
|
{(usersQuery.data ?? []).map((user) => (
|
|
<button
|
|
key={user.id}
|
|
type="button"
|
|
onClick={() => setSelectedUserId(user.id)}
|
|
className={`w-full rounded-lg border px-3 py-3 text-left transition-colors ${
|
|
user.id === selectedUserId
|
|
? "border-foreground bg-accent"
|
|
: "border-border hover:bg-accent/40"
|
|
}`}
|
|
>
|
|
<div className="flex items-center justify-between gap-2">
|
|
<div className="min-w-0">
|
|
<div className="truncate font-medium">{user.name || user.email || user.id}</div>
|
|
<div className="truncate text-sm text-muted-foreground">{user.email || user.id}</div>
|
|
</div>
|
|
{user.isInstanceAdmin ? (
|
|
<ShieldCheck className="h-4 w-4 text-emerald-600" />
|
|
) : null}
|
|
</div>
|
|
<div className="mt-2 text-xs text-muted-foreground">
|
|
{user.activeCompanyMembershipCount} active company memberships
|
|
</div>
|
|
</button>
|
|
))}
|
|
</div>
|
|
</section>
|
|
|
|
<section className="space-y-4 rounded-xl border border-border bg-card p-5">
|
|
{!selectedUserId ? (
|
|
<div className="text-sm text-muted-foreground">Select a user to inspect instance access.</div>
|
|
) : userAccessQuery.isLoading ? (
|
|
<div className="text-sm text-muted-foreground">Loading user access…</div>
|
|
) : userAccessQuery.error ? (
|
|
<div className="text-sm text-destructive">
|
|
{userAccessQuery.error instanceof Error ? userAccessQuery.error.message : "Failed to load user access."}
|
|
</div>
|
|
) : (
|
|
<>
|
|
<div className="flex flex-wrap items-start justify-between gap-4">
|
|
<div>
|
|
<div className="text-lg font-semibold">
|
|
{selectedUser?.name || selectedUser?.email || selectedUserId}
|
|
</div>
|
|
<div className="text-sm text-muted-foreground">
|
|
{selectedUser?.email || selectedUserId}
|
|
</div>
|
|
</div>
|
|
<Button
|
|
variant={selectedUser?.isInstanceAdmin ? "outline" : "default"}
|
|
onClick={() => setAdminMutation.mutate(!(selectedUser?.isInstanceAdmin ?? false))}
|
|
disabled={setAdminMutation.isPending}
|
|
>
|
|
{selectedUser?.isInstanceAdmin ? "Remove instance admin" : "Promote to instance admin"}
|
|
</Button>
|
|
</div>
|
|
|
|
<div className="space-y-3">
|
|
<div>
|
|
<h2 className="text-sm font-semibold">Company access</h2>
|
|
<p className="text-sm text-muted-foreground">
|
|
Toggle company membership for this user. New access defaults to an active operator membership.
|
|
</p>
|
|
</div>
|
|
<div className="grid gap-3 md:grid-cols-2">
|
|
{companies.map((company) => (
|
|
<label
|
|
key={company.id}
|
|
className="flex items-start gap-3 rounded-lg border border-border px-3 py-3"
|
|
>
|
|
<Checkbox
|
|
checked={selectedCompanyIds.has(company.id)}
|
|
onCheckedChange={(checked) => {
|
|
setSelectedCompanyIds((current) => {
|
|
const next = new Set(current);
|
|
if (checked) next.add(company.id);
|
|
else next.delete(company.id);
|
|
return next;
|
|
});
|
|
}}
|
|
/>
|
|
<span className="space-y-1">
|
|
<span className="block text-sm font-medium">{company.name}</span>
|
|
<span className="block text-xs text-muted-foreground">{company.issuePrefix}</span>
|
|
</span>
|
|
</label>
|
|
))}
|
|
</div>
|
|
<div className="flex justify-end">
|
|
<Button
|
|
onClick={() => updateCompanyAccessMutation.mutate()}
|
|
disabled={updateCompanyAccessMutation.isPending}
|
|
>
|
|
{updateCompanyAccessMutation.isPending ? "Saving…" : "Save company access"}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="space-y-2">
|
|
<h2 className="text-sm font-semibold">Current memberships</h2>
|
|
<div className="space-y-2">
|
|
{(userAccessQuery.data?.companyAccess ?? []).map((membership) => (
|
|
<div
|
|
key={membership.id}
|
|
className="flex items-center justify-between rounded-lg border border-border px-3 py-2 text-sm"
|
|
>
|
|
<div>
|
|
<div className="font-medium">{membership.companyName || membership.companyId}</div>
|
|
<div className="text-muted-foreground">
|
|
{membership.membershipRole || "unset"} • {membership.status}
|
|
</div>
|
|
</div>
|
|
<div className="text-xs text-muted-foreground">
|
|
{new Date(membership.updatedAt).toLocaleDateString()}
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</div>
|
|
</>
|
|
)}
|
|
</section>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|