diff --git a/src/components/workflows/config/ActionConfig.tsx b/src/components/workflows/config/ActionConfig.tsx index cc15cb0..55e4ddc 100644 --- a/src/components/workflows/config/ActionConfig.tsx +++ b/src/components/workflows/config/ActionConfig.tsx @@ -25,7 +25,9 @@ function AlbumPicker({ value, onChange }: { value: string | undefined; onChange: useEffect(() => { setLoading(true); - listAlbums() + // Shared albums are included so this action can add assets to albums the + // user has editor (upload) access to, not just ones they own. + listAlbums({ includeShared: true }) .then((data) => { setAlbums(data); if (value) { @@ -36,6 +38,25 @@ function AlbumPicker({ value, onChange }: { value: string | undefined; onChange: .finally(() => setLoading(false)); }, []); + const ownedAlbums = albums.filter((a) => a.myRole !== "editor"); + const sharedAlbums = albums.filter((a) => a.myRole === "editor"); + + const renderItem = (album: IAlbum) => ( + { + setSelectedAlbum(album); + onChange(album.id, album.albumName); + setOpen(false); + }} + className="flex items-center gap-2" + > + {album.albumName} + + + ); + return ( @@ -52,23 +73,16 @@ function AlbumPicker({ value, onChange }: { value: string | undefined; onChange: {loading ? "Loading..." : "No albums found."} - - {albums.map((album) => ( - { - setSelectedAlbum(album); - onChange(album.id, album.albumName); - setOpen(false); - }} - className="flex items-center gap-2" - > - {album.albumName} - - - ))} - + {ownedAlbums.length > 0 && ( + + {ownedAlbums.map(renderItem)} + + )} + {sharedAlbums.length > 0 && ( + + {sharedAlbums.map(renderItem)} + + )} diff --git a/src/handlers/api/album.handler.ts b/src/handlers/api/album.handler.ts index 944d2f5..6f8ded5 100644 --- a/src/handlers/api/album.handler.ts +++ b/src/handlers/api/album.handler.ts @@ -60,7 +60,7 @@ export const listPotentialTripAssets = async ( return API.get(LIST_POTENTIAL_ALBUMS_ASSETS_PATH, params).then((assets) => assets.map(cleanUpAsset)); } -export const listAlbums = async (filters?: { sortBy?: string, sortOrder?: string }) => { +export const listAlbums = async (filters?: { sortBy?: string, sortOrder?: string, includeShared?: boolean }) => { return API.get(LIST_ALBUMS_PATH, filters); } export const getAlbumInfo = async (id: string) => { diff --git a/src/pages/api/albums/list.ts b/src/pages/api/albums/list.ts index 275b375..50f5d6d 100644 --- a/src/pages/api/albums/list.ts +++ b/src/pages/api/albums/list.ts @@ -4,7 +4,7 @@ import { db } from "@/config/db"; import { getCurrentUser } from "@/handlers/serverUtils/user.utils"; import { NextApiResponse } from "next"; import { albums } from "@/schema/albums.schema"; -import { count, desc, eq, min, max, sql, and, sum, isNotNull } from "drizzle-orm"; +import { count, desc, eq, inArray, min, max, sql, and, sum, isNotNull } from "drizzle-orm"; import { assets } from "@/schema/assets.schema"; import { albumsAssetsAssets } from "@/schema/albumAssetsAssets.schema"; import { albumUsers } from "@/schema/albumUsers.schema"; @@ -50,7 +50,10 @@ export default async function handler( if (!currentUser) { return res.status(401).json({ error: "Unauthorized" }); } - const { sortBy = 'lastPhotoDate', sortOrder = 'desc' } = req.query as { sortBy: string, sortOrder: string }; + const { sortBy = 'lastPhotoDate', sortOrder = 'desc', includeShared } = req.query as { sortBy: string, sortOrder: string, includeShared?: string }; + // Shared albums grant "editor" role to collaborators, which is enough to + // add/upload assets. "viewer" (read-only shares) is deliberately excluded. + const roles = includeShared === 'true' ? ["owner", "editor"] : ["owner"]; const dbAlbums = await db.select({ id: albums.id, @@ -65,12 +68,13 @@ export default async function handler( order: albums.order, isActivityEnabled: albums.isActivityEnabled, ownerId: albumUsers.userId, + myRole: albumUsers.role, description: albums.description, lastModifiedAssetTimestamp: max(exif.dateTimeOriginal), faceCount: count(sql`DISTINCT ${assetFaces.personId}`), // Ensure unique personId }) .from(albums) - .innerJoin(albumUsers, and(eq(albums.id, albumUsers.albumId), eq(albumUsers.role, "owner"))) + .innerJoin(albumUsers, and(eq(albums.id, albumUsers.albumId), inArray(albumUsers.role, roles))) .leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumId)) .leftJoin(assets, and( eq(albumsAssetsAssets.assetId, assets.id), diff --git a/src/types/album.d.ts b/src/types/album.d.ts index 5ca8201..56b7638 100644 --- a/src/types/album.d.ts +++ b/src/types/album.d.ts @@ -6,6 +6,8 @@ export interface IAlbum { updatedAt: Date; id: string; ownerId: string; + /** Current user's role on this album ("owner" | "editor" | "viewer"), when returned by an endpoint that includes shared albums. */ + myRole?: string; owner?: IAlbumOwner; albumUsers?: any[]; shared?: boolean;