From 88c73e212c4510ce41ad8c6557fa7d5c8f72d199 Mon Sep 17 00:00:00 2001 From: Mohamed Bassem Date: Mon, 17 Nov 2025 01:12:41 +0000 Subject: feat: Add collaborative lists (#2146) * feat: Add collaborative lists backend implementation This commit implements the core backend functionality for collaborative lists, allowing multiple users to share and interact with bookmark lists. Database changes: - Add listCollaborators table to track users with access to lists and their roles (viewer/editor) - Add addedBy field to bookmarksInLists to track who added bookmarks - Add relations for collaborative list functionality Access control updates: - Update List model to support role-based access (owner/editor/viewer) - Add methods to check and enforce permissions for list operations - Update Bookmark model to allow access through collaborative lists - Modify bookmark queries to include bookmarks from collaborative lists List collaboration features: - Add/remove/update collaborators - Get list of collaborators - Get lists shared with current user - Only manual lists can have collaborators tRPC procedures: - addCollaborator: Add a user as a collaborator to a list - removeCollaborator: Remove a collaborator from a list - updateCollaboratorRole: Change a collaborator's role - getCollaborators: Get all collaborators for a list - getSharedWithMe: Get all lists shared with the current user - cloneBookmark: Clone a bookmark to the current user's collection Implementation notes: - Editors can add/remove bookmarks from the list (must own the bookmark) - Viewers can only view bookmarks in the list - Only the list owner can manage collaborators and list metadata - Smart lists cannot have collaborators (only manual lists) - Users cannot edit bookmarks they don't own, even in shared lists * feat: Add collaborative lists frontend UI This commit implements the frontend user interface for collaborative lists, allowing users to view shared bookmarks and manage list collaborators. New pages: - /dashboard/shared: Shows bookmarks from lists shared with the user - Displays bookmarks from all collaborative lists - Uses SharedBookmarks component - Shows empty state when no lists are shared Navigation: - Added "Shared with you" link to sidebar with Users icon - Positioned after "Home" in main navigation - Available in both desktop and mobile sidebar Collaborator management: - ManageCollaboratorsModal component for managing list collaborators - Add collaborators by user ID with viewer/editor role - View current collaborators with their roles - Update collaborator roles inline - Remove collaborators - Shows empty state when no collaborators - Integrated into ListOptions dropdown menu - Accessible via "Manage Collaborators" menu item Components created: - SharedBookmarks.tsx: Server component fetching shared lists/bookmarks - ManageCollaboratorsModal.tsx: Client component with tRPC mutations - /dashboard/shared/page.tsx: Route for shared bookmarks page UI features: - Role selector for viewer/editor permissions - Real-time collaborator list updates - Toast notifications for success/error states - Loading states for async operations - Responsive design matching existing UI patterns Implementation notes: - Uses existing tRPC endpoints (getSharedWithMe, getCollaborators, etc.) - Follows established modal patterns from ShareListModal - Integrates seamlessly with existing list UI - Currently uses user ID for adding collaborators (email lookup TBD) * fix typecheck * add collaborator by email * add shared list in the sidebar * fix perm issue * hide UI components from non list owners * list leaving * fix shared bookmarks showing up in homepage * fix getBookmark access check * e2e tests * hide user specific fields from shared lists * simplify bookmark perm checks * disable editable fields in bookmark preview * hide lists if they don't have options * fix list ownership * fix highlights * move tests to trpc * fix alignment of leave list * make tag lists unclickable * allow editors to remove from list * add a badge for shared lists * remove bookmarks of user when they're removed from a list * fix tests * show owner in the manage collab modal * fix hasCollab * drop shared with you * i18n * beta badge * correctly invalidate caches on collab change * reduce unnecessary changes * Add ratelimits * stop manually removing bookmarks on remove * some fixes * fixes * remove unused function * improve tests --------- Co-authored-by: Claude --- packages/db/schema.ts | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'packages/db/schema.ts') diff --git a/packages/db/schema.ts b/packages/db/schema.ts index 5f523d21..0479bb52 100644 --- a/packages/db/schema.ts +++ b/packages/db/schema.ts @@ -411,6 +411,14 @@ export const bookmarksInLists = sqliteTable( addedAt: integer("addedAt", { mode: "timestamp" }).$defaultFn( () => new Date(), ), + // Tie the list's existence to the user's membership + // of this list. + listMembershipId: text("listMembershipId").references( + () => listCollaborators.id, + { + onDelete: "cascade", + }, + ), }, (tb) => [ primaryKey({ columns: [tb.bookmarkId, tb.listId] }), @@ -419,6 +427,32 @@ export const bookmarksInLists = sqliteTable( ], ); +export const listCollaborators = sqliteTable( + "listCollaborators", + { + id: text("id") + .notNull() + .primaryKey() + .$defaultFn(() => createId()), + listId: text("listId") + .notNull() + .references(() => bookmarkLists.id, { onDelete: "cascade" }), + userId: text("userId") + .notNull() + .references(() => users.id, { onDelete: "cascade" }), + role: text("role", { enum: ["viewer", "editor"] }).notNull(), + addedAt: createdAtField(), + addedBy: text("addedBy").references(() => users.id, { + onDelete: "set null", + }), + }, + (lc) => [ + unique().on(lc.listId, lc.userId), + index("listCollaborators_listId_idx").on(lc.listId), + index("listCollaborators_userId_idx").on(lc.userId), + ], +); + export const customPrompts = sqliteTable( "customPrompts", { @@ -698,6 +732,7 @@ export const userRelations = relations(users, ({ many, one }) => ({ invites: many(invites), subscription: one(subscriptions), importSessions: many(importSessions), + listCollaborations: many(listCollaborators), })); export const bookmarkRelations = relations(bookmarks, ({ many, one }) => ({ @@ -767,6 +802,7 @@ export const bookmarkListsRelations = relations( bookmarkLists, ({ one, many }) => ({ bookmarksInLists: many(bookmarksInLists), + collaborators: many(listCollaborators), user: one(users, { fields: [bookmarkLists.userId], references: [users.id], @@ -792,6 +828,24 @@ export const bookmarksInListsRelations = relations( }), ); +export const listCollaboratorsRelations = relations( + listCollaborators, + ({ one }) => ({ + list: one(bookmarkLists, { + fields: [listCollaborators.listId], + references: [bookmarkLists.id], + }), + user: one(users, { + fields: [listCollaborators.userId], + references: [users.id], + }), + addedByUser: one(users, { + fields: [listCollaborators.addedBy], + references: [users.id], + }), + }), +); + export const webhooksRelations = relations(webhooksTable, ({ one }) => ({ user: one(users, { fields: [webhooksTable.userId], -- cgit v1.2.3-70-g09d2