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>
275 lines
11 KiB
TypeScript
275 lines
11 KiB
TypeScript
import { useEffect, useId, useRef, useState } from "react";
|
|
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
import { Camera, LoaderCircle, Save, Trash2, UserRoundPen } from "lucide-react";
|
|
import type { AuthSession, CurrentUserProfile, UpdateCurrentUserProfile } from "@paperclipai/shared";
|
|
import { authApi } from "@/api/auth";
|
|
import { assetsApi } from "@/api/assets";
|
|
import { useBreadcrumbs } from "../context/BreadcrumbContext";
|
|
import { useCompany } from "../context/CompanyContext";
|
|
import { queryKeys } from "../lib/queryKeys";
|
|
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
|
|
import { Button } from "@/components/ui/button";
|
|
import { Input } from "@/components/ui/input";
|
|
import { Label } from "@/components/ui/label";
|
|
|
|
function deriveInitials(name: string) {
|
|
const parts = name.trim().split(/\s+/).filter(Boolean);
|
|
if (parts.length >= 2) return `${parts[0]?.[0] ?? ""}${parts[parts.length - 1]?.[0] ?? ""}`.toUpperCase();
|
|
return name.slice(0, 2).toUpperCase();
|
|
}
|
|
|
|
export function ProfileSettings() {
|
|
const { setBreadcrumbs } = useBreadcrumbs();
|
|
const { selectedCompanyId, selectedCompany } = useCompany();
|
|
const queryClient = useQueryClient();
|
|
const avatarInputId = useId();
|
|
const avatarInputRef = useRef<HTMLInputElement | null>(null);
|
|
const [name, setName] = useState("");
|
|
const [image, setImage] = useState("");
|
|
const [actionError, setActionError] = useState<string | null>(null);
|
|
const sessionQuery = useQuery({
|
|
queryKey: queryKeys.auth.session,
|
|
queryFn: () => authApi.getSession(),
|
|
retry: false,
|
|
});
|
|
|
|
useEffect(() => {
|
|
setBreadcrumbs([
|
|
{ label: "Settings", href: "/company/settings" },
|
|
{ label: "Instance settings", href: "/company/settings/instance/general" },
|
|
{ label: "Profile" },
|
|
]);
|
|
}, [setBreadcrumbs]);
|
|
|
|
useEffect(() => {
|
|
const session = sessionQuery.data;
|
|
if (!session) return;
|
|
setName(session.user.name ?? "");
|
|
setImage(session.user.image ?? "");
|
|
}, [sessionQuery.data]);
|
|
|
|
function syncSessionProfile(profile: CurrentUserProfile) {
|
|
queryClient.setQueryData<AuthSession | null>(queryKeys.auth.session, (current) => {
|
|
if (!current) return current;
|
|
return {
|
|
...current,
|
|
user: {
|
|
...current.user,
|
|
...profile,
|
|
},
|
|
};
|
|
});
|
|
}
|
|
|
|
async function persistProfile(input: UpdateCurrentUserProfile) {
|
|
const profile = await authApi.updateProfile(input);
|
|
syncSessionProfile(profile);
|
|
return profile;
|
|
}
|
|
|
|
function resolveProfileName() {
|
|
return name.trim() || sessionQuery.data?.user.name || "Board";
|
|
}
|
|
|
|
const updateMutation = useMutation({
|
|
mutationFn: (input: UpdateCurrentUserProfile) => persistProfile(input),
|
|
onSuccess: (profile) => {
|
|
setActionError(null);
|
|
setName(profile.name ?? "");
|
|
setImage(profile.image ?? "");
|
|
},
|
|
onError: (error) => {
|
|
setActionError(error instanceof Error ? error.message : "Failed to update profile.");
|
|
},
|
|
});
|
|
|
|
const uploadAvatarMutation = useMutation({
|
|
mutationFn: async (file: File) => {
|
|
if (!selectedCompanyId) {
|
|
throw new Error("Select a company before uploading a profile avatar.");
|
|
}
|
|
|
|
const asset = await assetsApi.uploadImage(
|
|
selectedCompanyId,
|
|
file,
|
|
`profiles/${sessionQuery.data?.user.id ?? "board-user"}`,
|
|
);
|
|
return persistProfile({ name: resolveProfileName(), image: asset.contentPath });
|
|
},
|
|
onSuccess: (profile) => {
|
|
setActionError(null);
|
|
setName(profile.name ?? "");
|
|
setImage(profile.image ?? "");
|
|
},
|
|
onError: (error) => {
|
|
setActionError(error instanceof Error ? error.message : "Failed to upload avatar.");
|
|
},
|
|
});
|
|
|
|
const removeAvatarMutation = useMutation({
|
|
mutationFn: () => persistProfile({ name: resolveProfileName(), image: null }),
|
|
onSuccess: (profile) => {
|
|
setActionError(null);
|
|
setName(profile.name ?? "");
|
|
setImage(profile.image ?? "");
|
|
},
|
|
onError: (error) => {
|
|
setActionError(error instanceof Error ? error.message : "Failed to remove avatar.");
|
|
},
|
|
});
|
|
|
|
if (sessionQuery.isLoading) {
|
|
return <div className="text-sm text-muted-foreground">Loading profile...</div>;
|
|
}
|
|
|
|
if (sessionQuery.error || !sessionQuery.data) {
|
|
return (
|
|
<div className="text-sm text-destructive">
|
|
{sessionQuery.error instanceof Error ? sessionQuery.error.message : "Failed to load profile."}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
const currentName = name.trim() || sessionQuery.data.user.name || "Board";
|
|
const currentImage = image.trim() || null;
|
|
const initials = deriveInitials(currentName);
|
|
const isSavingProfile = updateMutation.isPending || uploadAvatarMutation.isPending || removeAvatarMutation.isPending;
|
|
const uploadHint = selectedCompany
|
|
? `Stored in Paperclip file storage for ${selectedCompany.name}.`
|
|
: "Select a company to upload an avatar into Paperclip storage.";
|
|
|
|
return (
|
|
<div className="max-w-4xl space-y-6">
|
|
<div className="space-y-2">
|
|
<div className="flex items-center gap-2">
|
|
<UserRoundPen className="h-5 w-5 text-muted-foreground" />
|
|
<h1 className="text-lg font-semibold">Profile</h1>
|
|
</div>
|
|
<p className="text-sm text-muted-foreground">
|
|
Control how your account appears in the sidebar and other board surfaces.
|
|
</p>
|
|
</div>
|
|
|
|
{actionError ? (
|
|
<div className="rounded-md border border-destructive/40 bg-destructive/5 px-3 py-2 text-sm text-destructive">
|
|
{actionError}
|
|
</div>
|
|
) : null}
|
|
|
|
<section className="space-y-8">
|
|
<div className="relative overflow-hidden rounded-[28px] border border-border/70 bg-card shadow-sm">
|
|
<div className="absolute inset-x-0 top-0 h-32 bg-[linear-gradient(135deg,hsl(var(--primary))_0%,hsl(var(--accent))_58%,color-mix(in_oklab,hsl(var(--background))_76%,white_24%)_100%)]" />
|
|
<div className="absolute inset-0 bg-[radial-gradient(circle_at_top_right,rgba(255,255,255,0.22),transparent_34%),radial-gradient(circle_at_bottom_left,rgba(255,255,255,0.08),transparent_36%)]" />
|
|
<div className="relative p-6 pt-10">
|
|
<div className="flex flex-wrap items-end gap-5 rounded-[24px] border border-border/70 bg-background/92 p-5 shadow-[0_18px_44px_-28px_rgba(0,0,0,0.45)] backdrop-blur-sm">
|
|
<div className="space-y-3">
|
|
<label
|
|
htmlFor={avatarInputId}
|
|
className="group relative block cursor-pointer rounded-full focus-within:outline-none focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2 focus-within:ring-offset-background"
|
|
>
|
|
<input
|
|
ref={avatarInputRef}
|
|
id={avatarInputId}
|
|
type="file"
|
|
accept="image/*"
|
|
className="sr-only"
|
|
disabled={!selectedCompanyId || isSavingProfile}
|
|
onChange={(event) => {
|
|
const file = event.target.files?.[0];
|
|
if (!file) return;
|
|
uploadAvatarMutation.mutate(file);
|
|
event.target.value = "";
|
|
}}
|
|
/>
|
|
<span className="absolute inset-0 z-10 rounded-full bg-black/0 transition-colors group-hover:bg-black/14 group-focus-within:bg-black/14" />
|
|
<span className="absolute bottom-1 right-1 z-20 flex size-9 items-center justify-center rounded-full border border-background bg-primary text-primary-foreground shadow-sm">
|
|
{uploadAvatarMutation.isPending ? <LoaderCircle className="size-4 animate-spin" /> : <Camera className="size-4" />}
|
|
</span>
|
|
<Avatar size="lg" className="data-[size=lg]:size-24 ring-4 ring-background shadow-xl">
|
|
{currentImage ? <AvatarImage src={currentImage} alt={currentName} /> : null}
|
|
<AvatarFallback>{initials}</AvatarFallback>
|
|
</Avatar>
|
|
</label>
|
|
<div className="flex flex-wrap items-center gap-2">
|
|
<Button
|
|
type="button"
|
|
variant="secondary"
|
|
onClick={() => avatarInputRef.current?.click()}
|
|
disabled={!selectedCompanyId || isSavingProfile}
|
|
>
|
|
{uploadAvatarMutation.isPending ? <LoaderCircle className="size-4 animate-spin" /> : <Camera className="size-4" />}
|
|
{currentImage ? "Change photo" : "Upload photo"}
|
|
</Button>
|
|
{currentImage ? (
|
|
<Button
|
|
type="button"
|
|
variant="outline"
|
|
onClick={() => removeAvatarMutation.mutate()}
|
|
disabled={isSavingProfile}
|
|
>
|
|
{removeAvatarMutation.isPending ? <LoaderCircle className="size-4 animate-spin" /> : <Trash2 className="size-4" />}
|
|
Remove
|
|
</Button>
|
|
) : null}
|
|
</div>
|
|
</div>
|
|
|
|
<div className="min-w-0 flex-1 space-y-2 pb-1">
|
|
<div>
|
|
<h2 className="truncate text-2xl font-semibold text-foreground">{currentName}</h2>
|
|
<p className="truncate text-sm text-muted-foreground">{sessionQuery.data.user.email ?? "No email"}</p>
|
|
</div>
|
|
<p className="max-w-2xl text-sm leading-6 text-muted-foreground">
|
|
Click the avatar to upload a new image. {uploadHint}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<form
|
|
className="grid gap-6 md:grid-cols-2"
|
|
onSubmit={(event) => {
|
|
event.preventDefault();
|
|
updateMutation.mutate({ name: resolveProfileName(), image: image.trim() || null });
|
|
}}
|
|
>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="profile-name">Display name</Label>
|
|
<Input
|
|
id="profile-name"
|
|
value={name}
|
|
onChange={(event) => setName(event.target.value)}
|
|
maxLength={120}
|
|
placeholder="Board"
|
|
/>
|
|
<p className="text-xs text-muted-foreground">
|
|
Shown in the sidebar account footer and comment author surfaces.
|
|
</p>
|
|
</div>
|
|
|
|
<div className="space-y-2">
|
|
<Label htmlFor="profile-email">Email</Label>
|
|
<Input
|
|
id="profile-email"
|
|
value={sessionQuery.data.user.email ?? ""}
|
|
readOnly
|
|
disabled
|
|
/>
|
|
<p className="text-xs text-muted-foreground">
|
|
Email is managed by your auth session and is read-only here.
|
|
</p>
|
|
</div>
|
|
|
|
<div className="md:col-span-2 flex justify-end">
|
|
<Button type="submit" disabled={isSavingProfile || !name.trim()}>
|
|
{updateMutation.isPending ? <LoaderCircle className="size-4 animate-spin" /> : <Save className="size-4" />}
|
|
{updateMutation.isPending ? "Saving..." : "Save profile"}
|
|
</Button>
|
|
</div>
|
|
</form>
|
|
</section>
|
|
</div>
|
|
);
|
|
}
|