forked from farhoodlabs/paperclip
9aea3e3d35
## Thinking Path > - Paperclip orchestrates AI-agent companies through company-scoped issues, projects, agents, and board-visible workflows. > - The board sidebar and project list are the daily navigation surface for that control plane. > - Users need to keep all projects and agents accessible while hiding resources they have intentionally left from their own sidebar. > - That requires user-scoped resource membership state backed by company-scoped API and database contracts. > - The branch also needed to preserve HTTP worktree login sessions and keep the project list easier to scan after membership grouping. > - This pull request adds resource membership controls, sidebar leave actions, grouped/sortable project listings, and focused tests. > - The benefit is a cleaner personal workspace view without weakening company-scoped access to the underlying project or agent detail pages. ## What Changed - Added `project_memberships` and `agent_memberships` tables with API/shared/server contracts for current-user join/leave state. - Renumbered the membership migration to `0090_resource_memberships` after rebasing onto current `master`, and made it idempotent for anyone who had applied the old branch-local `0087` migration. - Added project and agent sidebar leave actions, plus list filtering that waits for membership state before hiding resources. - Added grouped project listing, project sorting controls, and reserved row subtitle height for cleaner scanning. - Fixed HTTP auth cookie security handling so HTTP worktree sessions can persist. - Updated focused server and UI tests for the new membership, sidebar, project list, and auth behavior. ## Verification - `pnpm exec vitest run server/src/__tests__/better-auth.test.ts server/src/__tests__/resource-memberships-routes.test.ts ui/src/pages/Projects.test.tsx ui/src/components/SidebarProjects.test.tsx ui/src/components/SidebarAgents.test.tsx ui/src/components/MembershipAction.test.tsx ui/src/components/EntityRow.test.tsx` - Confirmed the branch is rebased on current `origin/master`. - Confirmed the PR diff does not include `pnpm-lock.yaml` or `.github/workflows` changes. ## Risks - Migration safety: low to medium. The migration now uses `IF NOT EXISTS` / guarded constraints and is numbered after current master migrations, but it should still get CI coverage against fresh databases. - UI behavior: low. Left resources are hidden from sidebar only after membership state loads; direct detail access remains available. - Auth behavior: low. Cookie security is relaxed only for HTTP/private local-style origins where secure cookies would prevent login persistence. > 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 GPT-5 Codex coding agent, tool-enabled shell/git workflow, context window not exposed by 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 run tests locally and they pass - [x] I have added or updated tests where applicable - [x] 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] I will address all Greptile and reviewer comments before requesting merge Screenshot note: no browser screenshots were captured in this heartbeat; the UI changes are covered by focused component tests above. --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
441 lines
15 KiB
TypeScript
441 lines
15 KiB
TypeScript
import { useCallback, useEffect, useMemo, useState } from "react";
|
|
import { NavLink, useLocation } from "@/lib/router";
|
|
import { useQuery } from "@tanstack/react-query";
|
|
import { FolderOpen, Loader2, LogOut, MoreHorizontal, Plus } from "lucide-react";
|
|
import {
|
|
DndContext,
|
|
MouseSensor,
|
|
closestCenter,
|
|
type DragEndEvent,
|
|
useSensor,
|
|
useSensors,
|
|
} from "@dnd-kit/core";
|
|
import { SortableContext, arrayMove, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
|
|
import { CSS } from "@dnd-kit/utilities";
|
|
import { useCompany } from "../context/CompanyContext";
|
|
import { useDialogActions } from "../context/DialogContext";
|
|
import { useSidebar } from "../context/SidebarContext";
|
|
import { authApi } from "../api/auth";
|
|
import { projectsApi } from "../api/projects";
|
|
import { SIDEBAR_SCROLL_RESET_STATE } from "../lib/navigation-scroll";
|
|
import { queryKeys } from "../lib/queryKeys";
|
|
import { cn, projectRouteRef } from "../lib/utils";
|
|
import { useProjectOrder } from "../hooks/useProjectOrder";
|
|
import { resourceMembershipState, useResourceMembershipMutation, useResourceMemberships } from "../hooks/useResourceMemberships";
|
|
import { BudgetSidebarMarker } from "./BudgetSidebarMarker";
|
|
import { SidebarSection, type SidebarSectionRadioChoice } from "./SidebarSection";
|
|
import { Button } from "@/components/ui/button";
|
|
import {
|
|
DropdownMenu,
|
|
DropdownMenuContent,
|
|
DropdownMenuItem,
|
|
DropdownMenuTrigger,
|
|
} from "@/components/ui/dropdown-menu";
|
|
import { PluginSlotMount, usePluginSlots } from "@/plugins/slots";
|
|
import {
|
|
getProjectSortModeStorageKey,
|
|
PROJECT_SORT_MODE_UPDATED_EVENT,
|
|
readProjectSortMode,
|
|
type ProjectSortModeUpdatedDetail,
|
|
type ProjectSidebarSortMode,
|
|
writeProjectSortMode,
|
|
} from "../lib/project-order";
|
|
import type { Project } from "@paperclipai/shared";
|
|
|
|
type ProjectSidebarSlot = ReturnType<typeof usePluginSlots>["slots"][number];
|
|
|
|
const PROJECT_SORT_CHOICES: SidebarSectionRadioChoice[] = [
|
|
{ value: "top", label: "Top" },
|
|
{ value: "alphabetical", label: "Alphabetical" },
|
|
{ value: "recent", label: "Recent" },
|
|
];
|
|
const REORDER_POINTER_MEDIA = "(hover: hover) and (pointer: fine)";
|
|
|
|
type ProjectItemProps = {
|
|
activeProjectRef: string | null;
|
|
companyId: string | null;
|
|
companyPrefix: string | null;
|
|
isMobile: boolean;
|
|
project: Project;
|
|
projectSidebarSlots: ProjectSidebarSlot[];
|
|
setSidebarOpen: (open: boolean) => void;
|
|
onLeaveProject: (project: Project) => void;
|
|
leaving?: boolean;
|
|
isDragging?: boolean;
|
|
};
|
|
|
|
function projectTimestamp(project: Project): number {
|
|
const updated = new Date(project.updatedAt).getTime();
|
|
if (Number.isFinite(updated)) return updated;
|
|
const created = new Date(project.createdAt).getTime();
|
|
return Number.isFinite(created) ? created : 0;
|
|
}
|
|
|
|
function sortProjects(projects: Project[], sortMode: ProjectSidebarSortMode): Project[] {
|
|
if (sortMode === "top") return projects;
|
|
const sorted = [...projects];
|
|
if (sortMode === "alphabetical") {
|
|
sorted.sort((left, right) => left.name.localeCompare(right.name, undefined, { sensitivity: "base" }));
|
|
return sorted;
|
|
}
|
|
sorted.sort((left, right) => {
|
|
const timeDiff = projectTimestamp(right) - projectTimestamp(left);
|
|
return timeDiff !== 0 ? timeDiff : left.name.localeCompare(right.name, undefined, { sensitivity: "base" });
|
|
});
|
|
return sorted;
|
|
}
|
|
|
|
function hasFineReorderPointer() {
|
|
if (typeof window === "undefined" || typeof window.matchMedia !== "function") return true;
|
|
return window.matchMedia(REORDER_POINTER_MEDIA).matches;
|
|
}
|
|
|
|
function useFineReorderPointer() {
|
|
const [matches, setMatches] = useState(hasFineReorderPointer);
|
|
|
|
useEffect(() => {
|
|
if (typeof window === "undefined" || typeof window.matchMedia !== "function") return;
|
|
const query = window.matchMedia(REORDER_POINTER_MEDIA);
|
|
const onChange = (event: MediaQueryListEvent) => setMatches(event.matches);
|
|
setMatches(query.matches);
|
|
query.addEventListener("change", onChange);
|
|
return () => query.removeEventListener("change", onChange);
|
|
}, []);
|
|
|
|
return matches;
|
|
}
|
|
|
|
function ProjectItem({
|
|
activeProjectRef,
|
|
companyId,
|
|
companyPrefix,
|
|
isMobile,
|
|
project,
|
|
projectSidebarSlots,
|
|
setSidebarOpen,
|
|
onLeaveProject,
|
|
leaving = false,
|
|
isDragging = false,
|
|
}: ProjectItemProps) {
|
|
const routeRef = projectRouteRef(project);
|
|
|
|
return (
|
|
<div className="flex flex-col gap-0.5">
|
|
<div className="group/project relative flex items-center">
|
|
<NavLink
|
|
to={`/projects/${routeRef}/issues`}
|
|
state={SIDEBAR_SCROLL_RESET_STATE}
|
|
onClick={(e) => {
|
|
if (isDragging) {
|
|
e.preventDefault();
|
|
return;
|
|
}
|
|
if (isMobile) setSidebarOpen(false);
|
|
}}
|
|
className={cn(
|
|
"flex min-w-0 flex-1 items-center gap-2.5 px-3 py-1.5 pr-8 pointer-coarse:py-1 text-[13px] font-medium transition-colors",
|
|
activeProjectRef === routeRef || activeProjectRef === project.id
|
|
? "bg-accent text-foreground"
|
|
: "text-foreground/80 hover:bg-accent/50 hover:text-foreground",
|
|
)}
|
|
>
|
|
<span
|
|
className="shrink-0 h-3.5 w-3.5 rounded-sm"
|
|
style={{ backgroundColor: project.color ?? "#6366f1" }}
|
|
/>
|
|
<span className="flex-1 truncate">{project.name}</span>
|
|
{project.pauseReason === "budget" ? <BudgetSidebarMarker title="Project paused by budget" /> : null}
|
|
</NavLink>
|
|
|
|
<DropdownMenu>
|
|
<DropdownMenuTrigger asChild>
|
|
<Button
|
|
variant="ghost"
|
|
size="icon-xs"
|
|
className={cn(
|
|
"absolute right-1 top-1/2 h-6 w-6 -translate-y-1/2 transition-opacity data-[state=open]:pointer-events-auto data-[state=open]:opacity-100",
|
|
isMobile
|
|
? "opacity-100"
|
|
: "pointer-events-none opacity-0 group-hover/project:pointer-events-auto group-hover/project:opacity-100 group-focus-within/project:pointer-events-auto group-focus-within/project:opacity-100",
|
|
)}
|
|
aria-label={`Open actions for ${project.name}`}
|
|
>
|
|
<MoreHorizontal className="h-3.5 w-3.5" />
|
|
</Button>
|
|
</DropdownMenuTrigger>
|
|
<DropdownMenuContent align="end" className="w-44">
|
|
<DropdownMenuItem
|
|
onClick={() => {
|
|
if (leaving) return;
|
|
onLeaveProject(project);
|
|
}}
|
|
disabled={leaving}
|
|
>
|
|
{leaving ? <Loader2 className="size-4 motion-safe:animate-spin" /> : <LogOut className="size-4" />}
|
|
<span>{leaving ? "Leaving..." : "Leave project"}</span>
|
|
</DropdownMenuItem>
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
</div>
|
|
{projectSidebarSlots.length > 0 && (
|
|
<div className="ml-5 flex flex-col gap-0.5">
|
|
{projectSidebarSlots.map((slot) => (
|
|
<PluginSlotMount
|
|
key={`${project.id}:${slot.pluginKey}:${slot.id}`}
|
|
slot={slot}
|
|
context={{
|
|
companyId,
|
|
companyPrefix,
|
|
projectId: project.id,
|
|
projectRef: routeRef,
|
|
entityId: project.id,
|
|
entityType: "project",
|
|
}}
|
|
missingBehavior="placeholder"
|
|
/>
|
|
))}
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function SortableProjectItem(props: ProjectItemProps) {
|
|
const {
|
|
attributes,
|
|
listeners,
|
|
setNodeRef,
|
|
transform,
|
|
transition,
|
|
isDragging,
|
|
} = useSortable({ id: props.project.id });
|
|
|
|
return (
|
|
<div
|
|
ref={setNodeRef}
|
|
style={{
|
|
transform: CSS.Transform.toString(transform),
|
|
transition,
|
|
zIndex: isDragging ? 10 : undefined,
|
|
}}
|
|
className={cn(isDragging && "opacity-80")}
|
|
{...attributes}
|
|
{...listeners}
|
|
>
|
|
<ProjectItem {...props} isDragging={isDragging} />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export function SidebarProjects() {
|
|
const [open, setOpen] = useState(true);
|
|
const { selectedCompany, selectedCompanyId } = useCompany();
|
|
const { openNewProject } = useDialogActions();
|
|
const { isMobile, setSidebarOpen } = useSidebar();
|
|
const fineReorderPointer = useFineReorderPointer();
|
|
const location = useLocation();
|
|
|
|
const { data: projects } = useQuery({
|
|
queryKey: queryKeys.projects.list(selectedCompanyId!),
|
|
queryFn: () => projectsApi.list(selectedCompanyId!),
|
|
enabled: !!selectedCompanyId,
|
|
});
|
|
const membershipsQuery = useResourceMemberships(selectedCompanyId);
|
|
const membershipMutation = useResourceMembershipMutation(selectedCompanyId);
|
|
const { data: session } = useQuery({
|
|
queryKey: queryKeys.auth.session,
|
|
queryFn: () => authApi.getSession(),
|
|
});
|
|
const { slots: projectSidebarSlots } = usePluginSlots({
|
|
slotTypes: ["projectSidebarItem"],
|
|
entityType: "project",
|
|
companyId: selectedCompanyId,
|
|
enabled: !!selectedCompanyId,
|
|
});
|
|
|
|
const currentUserId = session?.user?.id ?? session?.session?.userId ?? null;
|
|
const sortModeStorageKey = useMemo(() => {
|
|
if (!selectedCompanyId) return null;
|
|
return getProjectSortModeStorageKey(selectedCompanyId, currentUserId);
|
|
}, [currentUserId, selectedCompanyId]);
|
|
const [sortMode, setSortMode] = useState<ProjectSidebarSortMode>(() => {
|
|
if (!sortModeStorageKey) return "top";
|
|
return readProjectSortMode(sortModeStorageKey);
|
|
});
|
|
|
|
const visibleProjects = useMemo(
|
|
() => (projects ?? []).filter((project: Project) => {
|
|
if (project.archivedAt) return false;
|
|
if (!membershipsQuery.isSuccess) return true;
|
|
return resourceMembershipState(membershipsQuery.data, "project", project.id) !== "left";
|
|
}),
|
|
[membershipsQuery.data, membershipsQuery.isSuccess, projects],
|
|
);
|
|
const { orderedProjects, persistOrder } = useProjectOrder({
|
|
projects: visibleProjects,
|
|
companyId: selectedCompanyId,
|
|
userId: currentUserId,
|
|
});
|
|
const sortedProjects = useMemo(
|
|
() => sortProjects(orderedProjects, sortMode),
|
|
[orderedProjects, sortMode],
|
|
);
|
|
const isTopMode = sortMode === "top";
|
|
const canReorderProjects = isTopMode && !isMobile && fineReorderPointer;
|
|
|
|
const projectMatch = location.pathname.match(/^\/(?:[^/]+\/)?projects\/([^/]+)/);
|
|
const activeProjectRef = projectMatch?.[1] ?? null;
|
|
const sensors = useSensors(
|
|
// Project reordering is intentionally desktop-only; touch should remain tap/scroll behavior.
|
|
useSensor(MouseSensor, {
|
|
activationConstraint: { distance: 8 },
|
|
}),
|
|
);
|
|
|
|
useEffect(() => {
|
|
if (!sortModeStorageKey) {
|
|
setSortMode("top");
|
|
return;
|
|
}
|
|
setSortMode(readProjectSortMode(sortModeStorageKey));
|
|
}, [sortModeStorageKey]);
|
|
|
|
useEffect(() => {
|
|
if (!sortModeStorageKey) return;
|
|
|
|
const onStorage = (event: StorageEvent) => {
|
|
if (event.key !== sortModeStorageKey) return;
|
|
setSortMode(readProjectSortMode(sortModeStorageKey));
|
|
};
|
|
const onCustomEvent = (event: Event) => {
|
|
const detail = (event as CustomEvent<ProjectSortModeUpdatedDetail>).detail;
|
|
if (!detail || detail.storageKey !== sortModeStorageKey) return;
|
|
setSortMode(detail.sortMode);
|
|
};
|
|
|
|
window.addEventListener("storage", onStorage);
|
|
window.addEventListener(PROJECT_SORT_MODE_UPDATED_EVENT, onCustomEvent);
|
|
return () => {
|
|
window.removeEventListener("storage", onStorage);
|
|
window.removeEventListener(PROJECT_SORT_MODE_UPDATED_EVENT, onCustomEvent);
|
|
};
|
|
}, [sortModeStorageKey]);
|
|
|
|
const persistSortMode = useCallback(
|
|
(value: string) => {
|
|
const nextSortMode: ProjectSidebarSortMode =
|
|
value === "alphabetical" || value === "recent" ? value : "top";
|
|
setSortMode(nextSortMode);
|
|
if (sortModeStorageKey) {
|
|
writeProjectSortMode(sortModeStorageKey, nextSortMode);
|
|
}
|
|
},
|
|
[sortModeStorageKey],
|
|
);
|
|
|
|
const handleDragEnd = useCallback(
|
|
(event: DragEndEvent) => {
|
|
if (!isTopMode) return;
|
|
const { active, over } = event;
|
|
if (!over || active.id === over.id) return;
|
|
|
|
const ids = orderedProjects.map((project) => project.id);
|
|
const oldIndex = ids.indexOf(active.id as string);
|
|
const newIndex = ids.indexOf(over.id as string);
|
|
if (oldIndex === -1 || newIndex === -1) return;
|
|
|
|
persistOrder(arrayMove(ids, oldIndex, newIndex));
|
|
},
|
|
[isTopMode, orderedProjects, persistOrder],
|
|
);
|
|
|
|
const leaveProject = useCallback(
|
|
(project: Project) => membershipMutation.mutate({
|
|
resourceType: "project",
|
|
resourceId: project.id,
|
|
resourceName: project.name,
|
|
state: "left",
|
|
}),
|
|
[membershipMutation],
|
|
);
|
|
const projectLeaving = useCallback(
|
|
(project: Project) =>
|
|
membershipMutation.isPending &&
|
|
membershipMutation.variables?.resourceType === "project" &&
|
|
membershipMutation.variables.resourceId === project.id,
|
|
[membershipMutation.isPending, membershipMutation.variables],
|
|
);
|
|
|
|
const renderProject = (project: Project) => (
|
|
<ProjectItem
|
|
key={project.id}
|
|
activeProjectRef={activeProjectRef}
|
|
companyId={selectedCompanyId}
|
|
companyPrefix={selectedCompany?.issuePrefix ?? null}
|
|
isMobile={isMobile}
|
|
project={project}
|
|
projectSidebarSlots={projectSidebarSlots}
|
|
setSidebarOpen={setSidebarOpen}
|
|
onLeaveProject={leaveProject}
|
|
leaving={projectLeaving(project)}
|
|
/>
|
|
);
|
|
|
|
return (
|
|
<SidebarSection
|
|
label="Projects"
|
|
collapsible={{ open, onOpenChange: setOpen }}
|
|
headerAction={{
|
|
ariaLabel: "New project",
|
|
icon: Plus,
|
|
onClick: openNewProject,
|
|
}}
|
|
menu={{
|
|
ariaLabel: "Projects section actions",
|
|
actions: [
|
|
{ type: "item", label: "Browse projects", icon: FolderOpen, href: "/projects" },
|
|
{ type: "separator" },
|
|
],
|
|
radioLabel: "Project sort",
|
|
radioChoices: PROJECT_SORT_CHOICES,
|
|
radioValue: sortMode,
|
|
onRadioValueChange: persistSortMode,
|
|
}}
|
|
>
|
|
{canReorderProjects ? (
|
|
<DndContext
|
|
sensors={sensors}
|
|
collisionDetection={closestCenter}
|
|
onDragEnd={handleDragEnd}
|
|
>
|
|
<SortableContext
|
|
items={orderedProjects.map((project) => project.id)}
|
|
strategy={verticalListSortingStrategy}
|
|
>
|
|
<div className="flex flex-col gap-0.5">
|
|
{orderedProjects.map((project: Project) => (
|
|
<SortableProjectItem
|
|
key={project.id}
|
|
activeProjectRef={activeProjectRef}
|
|
companyId={selectedCompanyId}
|
|
companyPrefix={selectedCompany?.issuePrefix ?? null}
|
|
isMobile={isMobile}
|
|
project={project}
|
|
projectSidebarSlots={projectSidebarSlots}
|
|
setSidebarOpen={setSidebarOpen}
|
|
onLeaveProject={leaveProject}
|
|
leaving={projectLeaving(project)}
|
|
/>
|
|
))}
|
|
</div>
|
|
</SortableContext>
|
|
</DndContext>
|
|
) : (
|
|
<div className="flex flex-col gap-0.5">
|
|
{sortedProjects.map((project: Project) => renderProject(project))}
|
|
</div>
|
|
)}
|
|
</SidebarSection>
|
|
);
|
|
}
|