From 15f90121a1142b1e5d65d452d6a7488a8d626340 Mon Sep 17 00:00:00 2001 From: Varun Date: Tue, 7 Apr 2026 23:12:34 +0530 Subject: [PATCH] feat: redesign import-shared page and support password-protected links Redesign import-shared with sticky import bar, dense gallery grid, progress bar, and cleaner landing state. Add password-protected shared link support - detects 401 "Password required" from Immich and shows a password input. Also reduce asset grid spacing and replace "Open in Immich" text with a link icon. --- src/components/shared/AssetGrid.tsx | 6 +- src/handlers/api/import-shared.handler.ts | 4 +- src/pages/api/import-shared.ts | 27 +- src/pages/assets/import-shared.tsx | 880 ++++++++++++---------- 4 files changed, 493 insertions(+), 424 deletions(-) diff --git a/src/components/shared/AssetGrid.tsx b/src/components/shared/AssetGrid.tsx index f80ba87..ddcc6fd 100644 --- a/src/components/shared/AssetGrid.tsx +++ b/src/components/shared/AssetGrid.tsx @@ -301,6 +301,8 @@ const AssetGrid = forwardRef(({ assets, isInternal photos={images} targetRowHeight={150} rowConstraints={{ singleRowMaxHeight: 300 }} + spacing={2} + padding={0} onClick={({ index, event, photo }) => handleClick(index, photo, event)} render={{ image: renderImage, @@ -309,10 +311,10 @@ const AssetGrid = forwardRef(({ assets, isInternal href={exImmichUrl + "/photos/" + photo.id} target="_blank" rel="noopener noreferrer" - className="absolute bottom-1 left-1 bg-black/60 text-yellow-300 text-xs px-2 py-0.5 rounded" + className="absolute bottom-1 left-1 bg-black/60 p-1 rounded" onClick={(e) => e.stopPropagation()} > - Open in Immich + ), }} diff --git a/src/handlers/api/import-shared.handler.ts b/src/handlers/api/import-shared.handler.ts index e6fee34..9983f67 100644 --- a/src/handlers/api/import-shared.handler.ts +++ b/src/handlers/api/import-shared.handler.ts @@ -1,6 +1,6 @@ import { IMPORT_SHARED_PATH } from "@/config/routes"; import API from "@/lib/api"; -export const importShared = async (link: string) => { - return API.post(IMPORT_SHARED_PATH, { link }); +export const importShared = async (link: string, password?: string) => { + return API.post(IMPORT_SHARED_PATH, { link, password: password || undefined }); }; diff --git a/src/pages/api/import-shared.ts b/src/pages/api/import-shared.ts index d333125..831d02e 100644 --- a/src/pages/api/import-shared.ts +++ b/src/pages/api/import-shared.ts @@ -134,6 +134,18 @@ const fetchJson = async (url: string) => { headers: { accept: "application/json" }, }); if (!response.ok) { + let errorBody: { message?: string } = {}; + try { errorBody = await response.json(); } catch { /* ignore */ } + if (response.status === 401 && errorBody.message === "Password required") { + const err = new Error("PASSWORD_REQUIRED"); + (err as any).code = "PASSWORD_REQUIRED"; + throw err; + } + if (response.status === 401 && errorBody.message === "Invalid password") { + const err = new Error("Invalid password for this shared link."); + (err as any).code = "INVALID_PASSWORD"; + throw err; + } throw new Error(`Request failed for ${url} (status ${response.status})`); } return (await response.json()) as T; @@ -147,6 +159,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) const payload = typeof req.body === "string" ? JSON.parse(req.body) : req.body; const link = payload?.link; + const password = payload?.password; if (!link || typeof link !== "string") { return respondWithError(res, 400, "A shared album link is required"); @@ -157,9 +170,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) return respondWithError(res, 400, "Invalid Immich share link"); } + const authQuery = password + ? `key=${parsed.key}&password=${encodeURIComponent(password)}` + : `key=${parsed.key}`; + try { const sharedLink = await fetchJson( - `${parsed.origin}/api/shared-links/me?key=${parsed.key}` + `${parsed.origin}/api/shared-links/me?${authQuery}` ); const albumId = sharedLink.album?.id; @@ -167,7 +184,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) if (albumId) { const album = await fetchJson( - `${parsed.origin}/api/albums/${albumId}?key=${parsed.key}&withoutAssets=false` + `${parsed.origin}/api/albums/${albumId}?${authQuery}&withoutAssets=false` ); const assets = (album.assets || []).map((asset) => ({ @@ -216,6 +233,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) return res.status(200).json(responseBody); } catch (error: any) { + if (error?.code === "PASSWORD_REQUIRED") { + return res.status(401).json({ error: "PASSWORD_REQUIRED" }); + } + if (error?.code === "INVALID_PASSWORD") { + return res.status(401).json({ error: error.message }); + } console.error("Import shared error", error); return respondWithError(res, 500, error?.message ?? "Failed to import shared album"); } diff --git a/src/pages/assets/import-shared.tsx b/src/pages/assets/import-shared.tsx index 95289c2..3fb6054 100644 --- a/src/pages/assets/import-shared.tsx +++ b/src/pages/assets/import-shared.tsx @@ -1,6 +1,23 @@ import React, { FormEvent, useEffect, useRef, useState } from "react"; import { useQuery } from "@tanstack/react-query"; -import { Calendar, Loader2, Images, User, Clock, CheckCircle2, XCircle, Clock3 } from "lucide-react"; +import { + Calendar, + Loader2, + Images, + User, + Clock, + CheckCircle2, + XCircle, + Clock3, + Link2, + Download, + Tag, + ArrowLeft, + FolderPlus, + Folder, + FolderMinus, + AlertTriangle, +} from "lucide-react"; import PageLayout from "@/components/layouts/PageLayout"; import Header from "@/components/shared/Header"; import { Button } from "@/components/ui/button"; @@ -27,7 +44,6 @@ import { createImportJob, getImportJob, listImportJobs } from "@/handlers/api/im import ImportJobDetailDialog from "@/components/import/ImportJobDetailDialog"; import { validatePermissions } from "@/handlers/api/validate-permissions.handler"; import { IAlbum } from "@/types/album"; -import { AlertTriangle } from "lucide-react"; interface IAlbumContributorCount { userId: string; @@ -84,24 +100,16 @@ interface IImportSharedResponse { } const formatDate = (value?: string | null) => { - if (!value) { - return "—"; - } + if (!value) return "—"; const date = new Date(value); - if (Number.isNaN(date.getTime())) { - return value; - } + if (Number.isNaN(date.getTime())) return value; return date.toLocaleString(); }; const formatDateOnly = (value?: string | null) => { - if (!value) { - return "—"; - } + if (!value) return "—"; const date = new Date(value); - if (Number.isNaN(date.getTime())) { - return value; - } + if (Number.isNaN(date.getTime())) return value; return date.toLocaleDateString(undefined, { year: "numeric", month: "short", @@ -109,38 +117,8 @@ const formatDateOnly = (value?: string | null) => { }); }; -const InfoRow = ({ label, value }: { label: string; value: React.ReactNode }) => ( -
-

{label}

-

{value ?? "—"}

-
-); - -const formatContributors = (counts?: IAlbumContributorCount[]) => { - if (!counts || counts.length === 0) { - return "—"; - } - return counts.map((entry) => `${entry.assetCount} assets`).join(", "); -}; - -const formatPermissions = (link?: IImportSharedResponse["sharedLink"]) => { - if (!link) { - return "View only"; - } - const labels: string[] = []; - if (link.allowDownload) { - labels.push("Download"); - } - if (link.allowUpload) { - labels.push("Upload"); - } - return labels.length ? labels.join(" / ") : "View only"; -}; - const formatFileSize = (bytes?: number | null) => { - if (!bytes || bytes <= 0) { - return null; - } + if (!bytes || bytes <= 0) return null; const units = ["B", "KB", "MB", "GB", "TB"]; let size = bytes; let unit = 0; @@ -153,6 +131,8 @@ const formatFileSize = (bytes?: number | null) => { export default function ImportSharedPage() { const [shareLink, setShareLink] = useState(""); + const [shareLinkPassword, setShareLinkPassword] = useState(""); + const [needsPassword, setNeedsPassword] = useState(false); const [submittedLink, setSubmittedLink] = useState(null); const [sharedData, setSharedData] = useState(null); const [loading, setLoading] = useState(false); @@ -185,7 +165,6 @@ export default function ImportSharedPage() { staleTime: 30 * 1000, }); - const albumNameRef = useRef(albumNameInput); useEffect(() => { @@ -266,17 +245,38 @@ export default function ImportSharedPage() { return () => clearInterval(interval); }, [activeJobId]); - const handleSubmit = async (event: FormEvent) => { - event.preventDefault(); - setError(null); + const resetState = () => { setSharedData(null); + setShareLink(""); + setShareLinkPassword(""); + setNeedsPassword(false); setSubmittedLink(null); + setError(null); + setActiveVideoAsset(null); + setActiveImageAsset(null); + setPreviewLoading(false); setUploadBanner(null); setImportAllLoading(false); setAlbumImportMode("album"); setAlbumNameInput(""); setSelectedAssetIds(new Set()); setSelectedAlbumId(null); + }; + + const handleSubmit = async (event: FormEvent) => { + event.preventDefault(); + setError(null); + + if (!needsPassword) { + setSharedData(null); + setSubmittedLink(null); + setUploadBanner(null); + setImportAllLoading(false); + setAlbumImportMode("album"); + setAlbumNameInput(""); + setSelectedAssetIds(new Set()); + setSelectedAlbumId(null); + } if (!shareLink.trim()) { setError("Please paste a shared album link."); @@ -285,15 +285,25 @@ export default function ImportSharedPage() { setLoading(true); try { - const payload: IImportSharedResponse = await importShared(shareLink); + const payload: IImportSharedResponse = await importShared( + shareLink, + needsPassword ? shareLinkPassword : undefined + ); setSharedData(payload); setSubmittedLink(payload.link); setUploadBanner(null); setImportAllLoading(false); setAlbumImportMode("album"); + setNeedsPassword(false); + setShareLinkPassword(""); } catch (err: any) { - const message = err.message ?? "Unexpected error"; - setError(message); + const errorCode = err?.error ?? err?.message ?? "Unexpected error"; + if (errorCode === "PASSWORD_REQUIRED") { + setNeedsPassword(true); + setError(null); + } else { + setError(err?.message ?? err?.error ?? "Unexpected error"); + } } finally { setLoading(false); } @@ -305,56 +315,42 @@ export default function ImportSharedPage() { albumDetails?.assets.filter((asset) => asset.type === "IMAGE" || asset.type === "VIDEO").length ?? 0; const buildThumbnailUrl = (asset: IImportSharedAsset) => { - if (!sharedData) { - return null; - } + if (!sharedData) return null; const params = new URLSearchParams({ assetId: asset.id, origin: sharedData.origin, key: sharedData.key, size: "thumbnail", }); - if (asset.thumbhash) { - params.set("thumbhash", asset.thumbhash); - } + if (asset.thumbhash) params.set("thumbhash", asset.thumbhash); return `/api/import-shared/thumbnail?${params.toString()}`; }; const buildVideoPlaybackUrl = (asset: IImportSharedAsset) => { - if (!sharedData) { - return null; - } + if (!sharedData) return null; const params = new URLSearchParams({ assetId: asset.id, origin: sharedData.origin, key: sharedData.key, }); - if (asset.thumbhash) { - params.set("thumbhash", asset.thumbhash); - } + if (asset.thumbhash) params.set("thumbhash", asset.thumbhash); return `/api/import-shared/video?${params.toString()}`; }; const buildPreviewUrl = (asset: IImportSharedAsset) => { - if (!sharedData) { - return null; - } + if (!sharedData) return null; const params = new URLSearchParams({ assetId: asset.id, origin: sharedData.origin, key: sharedData.key, size: "preview", }); - if (asset.thumbhash) { - params.set("thumbhash", asset.thumbhash); - } + if (asset.thumbhash) params.set("thumbhash", asset.thumbhash); return `/api/import-shared/thumbnail?${params.toString()}`; }; const handleImportAll = async (options: { createAlbum: boolean; albumName?: string; addToAlbumId?: string }) => { - if (!sharedData || !albumDetails) { - return; - } + if (!sharedData || !albumDetails) return; let uploadableAssets = albumDetails.assets.filter( (asset) => asset.type === "IMAGE" || asset.type === "VIDEO" ); @@ -399,132 +395,119 @@ export default function ImportSharedPage() { }); setActiveJobId(job.jobId); setJobProgress({ uploaded: 0, skipped: 0, failed: 0, total: uploadableAssets.length }); - // importAllLoading stays true — cleared when polling detects completion } catch (err: any) { setUploadBanner({ type: "error", message: err.message ?? "Failed to start import" }); setImportAllLoading(false); } }; + const progressPercent = jobProgress + ? Math.round(((jobProgress.uploaded + jobProgress.skipped + jobProgress.failed) / Math.max(jobProgress.total, 1)) * 100) + : 0; + + const toggleAssetSelection = (assetId: string) => { + const newSelection = new Set(selectedAssetIds); + if (newSelection.has(assetId)) { + newSelection.delete(assetId); + } else { + newSelection.add(assetId); + } + setSelectedAssetIds(newSelection); + }; + + const selectAll = () => { + if (!albumDetails) return; + const allImportable = albumDetails.assets + .filter((a) => a.type === "IMAGE" || a.type === "VIDEO") + .map((a) => a.id); + setSelectedAssetIds(new Set(allImportable)); + }; + + const isAllSelected = selectedAssetIds.size === importableAssetCount && importableAssetCount > 0; + return ( - +
{ - setSharedData(null); - setShareLink(""); - setSubmittedLink(null); - setError(null); - setActiveVideoAsset(null); - setActiveImageAsset(null); - setPreviewLoading(false); - setUploadBanner(null); - setImportAllLoading(false); - setAlbumImportMode("album"); - setAlbumNameInput(""); - setSelectedAssetIds(new Set()); - setSelectedAlbumId(null); - }}> - ← Back + ) : ( - "Import shared" + "Import Shared" ) } - rightComponent={ - sharedData && albumDetails ? ( -
- {selectedAssetIds.size > 0 && ( - - )} - -
- ) : null - } /> -
-
- {permissions?.canUpload === false && ( -
- - Your API key does not have permission to upload assets. Import will not work until this is fixed. -
- )} - {!sharedData && ( - - - Import a shared album - - Paste the shared public link for the album you want to import. - - - -
-
- - setShareLink(event.target.value)} - placeholder="https://demo.immich.app/share/" - type="url" - required - /> -
-
- -
-
- {error && ( -
- {error} -
- )} -
-
- )} - {!sharedData && importHistory?.jobs && importHistory.jobs.length > 0 && ( - - - Previous imports - - -
+ {/* ── Landing state ── */} + {!sharedData && ( +
+
+ {permissions?.canUpload === false && ( +
+ + Your API key does not have upload permission. Import will not work. +
+ )} + +
+

Import a shared album

+

+ Paste a public shared link from another Immich instance to import its assets into yours. +

+
+ +
+
+
+ + { + setShareLink(e.target.value); + if (needsPassword) { + setNeedsPassword(false); + setShareLinkPassword(""); + } + }} + placeholder="https://demo.immich.app/share/..." + type="url" + required + className="pl-9" + /> +
+ +
+ {needsPassword && ( +
+ setShareLinkPassword(e.target.value)} + placeholder="Enter shared link password" + type="password" + autoFocus + className="max-w-xs" + /> + This shared link is password-protected +
+ )} +
+ + {error && ( +
+ {error} +
+ )} + + {importHistory?.jobs && importHistory.jobs.length > 0 && ( +
+

+ Previous imports +

+
{importHistory.jobs.map((job) => { let jobImportData: Record = {}; try { jobImportData = JSON.parse(job.importData); } catch { /* ignore */ } @@ -535,13 +518,13 @@ export default function ImportSharedPage() { ) : job.status === "failed" ? ( ) : ( - + ); return (
setDetailJobId(job.id)} > {statusIcon} @@ -550,108 +533,259 @@ export default function ImportSharedPage() { {albumName || job.url}

- {job.uploadedCount} uploaded - {job.skippedCount > 0 && `, ${job.skippedCount} skipped`} - {job.failedCount > 0 && `, ${job.failedCount} failed`} - {" · "} - {formatDate(job.createdAt)} + {job.uploadedCount} imported + {job.skippedCount > 0 && ` · ${job.skippedCount} skipped`} + {job.failedCount > 0 && ` · ${job.failedCount} failed`}

- - {job.status} + + {formatDateOnly(job.createdAt)}
); })}
- - - )} +
+ )} +
+
+ )} - {sharedLinkDetails && sharedData && albumDetails && ( - - {/* Album identity */} - - {albumDetails.albumName} -
- - - {albumDetails.assetCount} assets + {/* ── Album detail + gallery view ── */} + {sharedData && albumDetails && sharedLinkDetails && ( + <> +
+ {/* Upload banner */} + {uploadBanner && ( +
+ {uploadBanner.type === "success" ? ( + + ) : ( + + )} + {uploadBanner.message} +
+ )} + + {permissions?.canUpload === false && ( +
+ + Your API key does not have upload permission. +
+ )} + + {/* Album header */} +
+

{albumDetails.albumName}

+ {albumDetails.description && ( +

{albumDetails.description}

+ )} +
+ + + {albumDetails.assetCount} assets + + {albumDetails.owner?.name && ( + + + {albumDetails.owner.name} - {albumDetails.owner?.name && ( - - - {albumDetails.owner.name} - - )} - {albumDetails.startDate && ( - - - {formatDateOnly(albumDetails.startDate)} - {albumDetails.endDate && albumDetails.endDate !== albumDetails.startDate && ( - <> → {formatDateOnly(albumDetails.endDate)} - )} - - )} - {sharedLinkDetails.expiresAt && ( - - - Expires {formatDate(sharedLinkDetails.expiresAt)} - - )} + )} + {albumDetails.startDate && ( + + + {formatDateOnly(albumDetails.startDate)} + {albumDetails.endDate && albumDetails.endDate !== albumDetails.startDate && ( + <> — {formatDateOnly(albumDetails.endDate)} + )} + + )} + {sharedLinkDetails.expiresAt && ( + + + Expires {formatDate(sharedLinkDetails.expiresAt)} + + )} +
+
+ + {/* Selection bar */} +
+ + {selectedAssetIds.size > 0 && ( + + {selectedAssetIds.size} of {importableAssetCount} selected + + )} +
+ + {/* Gallery grid */} +
+ {albumDetails.assets.length === 0 && ( +
+ This album has no assets.
- + )} + {albumDetails.assets.map((asset) => { + const formattedSize = formatFileSize(asset.fileSizeInByte); + const thumbnailUrl = buildThumbnailUrl(asset); + const isVideoAsset = asset.type === "VIDEO"; + const isSelected = selectedAssetIds.has(asset.id); - {/* Divider */} -
+ return ( +
{ + if (isVideoAsset) { + setActiveImageAsset(null); + setActiveVideoAsset(asset); + setPreviewLoading(false); + } else { + setActiveVideoAsset(null); + setPreviewLoading(true); + setActiveImageAsset(asset); + } + }} + > + {/* Thumbnail */} + {thumbnailUrl ? ( + {asset.originalFileName} + ) : ( +
+ No preview +
+ )} - {/* Destination */} - -
- -
- {(["album", "existing-album", "no-album"] as const).map((mode, i) => ( - - ))} + {/* Checkbox overlay */} +
{ + e.stopPropagation(); + toggleAssetSelection(asset.id); + }} + > + +
+ + {/* Video play indicator */} + {isVideoAsset && ( +
+
+ + + +
+
+ )} + + {/* Bottom info overlay */} +
+

+ {asset.originalFileName} +

+
+ + {/* Type + size badges */} + {(isVideoAsset || formattedSize) && ( +
+ {formattedSize && ( + + {formattedSize} + + )} +
+ )}
+ ); + })} +
+
+ + {/* ── Sticky import bar ── */} +
+ {/* Progress bar */} + {importAllLoading && jobProgress && ( +
+
+
+ )} + +
+
+ {/* Import mode toggle */} +
+ {([ + { mode: "album" as const, icon: FolderPlus, label: "New album" }, + { mode: "existing-album" as const, icon: Folder, label: "Existing" }, + { mode: "no-album" as const, icon: FolderMinus, label: "No album" }, + ]).map(({ mode, icon: Icon, label }) => ( + + ))}
+ {/* Album name input */} {albumImportMode === "album" && ( setAlbumNameInput(e.target.value)} placeholder="Album name" disabled={importAllLoading} + className="h-8 max-w-[200px] text-sm" /> )} + {/* Existing album select */} {albumImportMode === "existing-album" && ( )} -
+ {/* Tag checkbox */} +
setTagAssets(!!checked)} disabled={importAllLoading} + className="h-3.5 w-3.5" /> -
+ {/* Spacer */} +
+ + {/* Progress text */} {importAllLoading && jobProgress && ( -
- -

- {jobProgress.uploaded + jobProgress.skipped} / {jobProgress.total} processed - {jobProgress.failed > 0 && ( - · {jobProgress.failed} failed - )} -

-
+ + {jobProgress.uploaded + jobProgress.skipped + jobProgress.failed}/{jobProgress.total} + {jobProgress.failed > 0 && ( + ({jobProgress.failed} failed) + )} + )} - - - )} - {albumDetails && sharedData && ( - - - Gallery - - - {uploadBanner && ( -
0 && !importAllLoading && ( +
+ Clear ({selectedAssetIds.size}) + )} - {albumDetails.description && ( -

{albumDetails.description}

- )} -
- {albumDetails.assets.length === 0 && ( -
- This album has no assets yet. -
- )} - {albumDetails.assets.map((asset) => { - const formattedSize = formatFileSize(asset.fileSizeInByte); - const thumbnailUrl = buildThumbnailUrl(asset); - const isVideoAsset = asset.type === "VIDEO"; - const isInteractive = true; - const ariaLabel = isVideoAsset - ? `Play video ${asset.originalFileName}` - : `View photo ${asset.originalFileName}`; - const isSelected = selectedAssetIds.has(asset.id); - return ( -
{ - if (isVideoAsset) { - setActiveImageAsset(null); - setActiveVideoAsset(asset); - setPreviewLoading(false); - } else { - setActiveVideoAsset(null); - setPreviewLoading(true); - setActiveImageAsset(asset); - } - }} - role={isInteractive ? "button" : undefined} - tabIndex={isInteractive ? 0 : undefined} - aria-label={ariaLabel} - onKeyDown={(event) => { - if (!isInteractive) { - return; - } - if (event.key === "Enter" || event.key === " ") { - event.preventDefault(); - if (isVideoAsset) { - setActiveImageAsset(null); - setActiveVideoAsset(asset); - setPreviewLoading(false); - } else { - setActiveVideoAsset(null); - setPreviewLoading(true); - setActiveImageAsset(asset); - } - } - }} - > -
-
e.stopPropagation()}> - { - const newSelection = new Set(selectedAssetIds); - if (newSelection.has(asset.id)) { - newSelection.delete(asset.id); - } else { - newSelection.add(asset.id); - } - setSelectedAssetIds(newSelection); - }} - className="bg-white/80 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground" - /> -
- {thumbnailUrl ? ( - {`Thumbnail - ) : ( -
- No preview -
- )} - {isVideoAsset && ( -
-
- ▶ Play -
-
- )} -
- - {asset.type} - - {formattedSize && ( - - {formattedSize} - - )} -
-
-
-

- {asset.originalFileName} -

-

Captured {formatDate(asset.fileCreatedAt || asset.localDateTime)}

- {asset.location && ( -

{asset.location}

- )} - {asset.description && ( -

{asset.description}

- )} -
-
- ); - })} -
-
-
- )} -
-
+ {/* Import button */} + + + + + + )} + + {/* ── Video preview dialog ── */} { - if (!open) { - setActiveVideoAsset(null); - } - }} + onOpenChange={(open) => { if (!open) setActiveVideoAsset(null); }} > {activeVideoAsset && ( @@ -861,6 +901,8 @@ export default function ImportSharedPage() { )} + + {/* ── Image preview dialog ── */} { @@ -896,6 +938,8 @@ export default function ImportSharedPage() { )} + + {/* ── Job detail dialog ── */} setDetailJobId(null)} /> );