From 54eeb73b66777a5b2371a331ada3f548f14ec5dc Mon Sep 17 00:00:00 2001 From: Varun Date: Mon, 6 Apr 2026 20:13:16 +0530 Subject: [PATCH] feat: hide and edit people option in the asset dialog Signed-off-by: Varun --- src/components/asset-info/AssetInfoPanel.tsx | 195 +++++++++++++++++-- src/components/shared/AssetGrid.tsx | 60 +++++- src/handlers/api/asset.handler.ts | 1 + src/pages/api/assets/[id]/detail.ts | 1 + 4 files changed, 233 insertions(+), 24 deletions(-) diff --git a/src/components/asset-info/AssetInfoPanel.tsx b/src/components/asset-info/AssetInfoPanel.tsx index e8dfaff..4f5b20a 100644 --- a/src/components/asset-info/AssetInfoPanel.tsx +++ b/src/components/asset-info/AssetInfoPanel.tsx @@ -8,9 +8,17 @@ import { Camera, Aperture, MapPin, + EyeOff, + ExternalLink, + Check, } from 'lucide-react' import API from '@/lib/api' import { PERSON_THUBNAIL_PATH } from '@/config/routes' +import { updatePerson } from '@/handlers/api/people.handler' +import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover' +import { Input } from '@/components/ui/input' +import { Button } from '@/components/ui/button' +import { toast } from '@/components/ui/use-toast' import L from 'leaflet' import 'leaflet/dist/leaflet.css' import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.css' @@ -47,7 +55,7 @@ export interface IAssetDetail { rating: number | null fps: number | null projectionType: string | null - people: { personId: string; personName: string; thumbnailPath: string }[] + people: { personId: string; personName: string; thumbnailPath: string; isHidden: boolean }[] } interface AssetInfoPanelProps { @@ -66,6 +74,113 @@ function formatExposureTime(exposure: string): string { return `1/${Math.round(1 / val)} s` } +interface PersonChipProps { + person: { personId: string; personName: string; thumbnailPath: string } + exImmichUrl: string + isHidden: boolean + onUpdate: (updated: { personId: string; personName?: string; hidden?: boolean }) => void +} + +function PersonChip({ person: p, exImmichUrl, isHidden: hidden, onUpdate }: PersonChipProps) { + const [name, setName] = useState(p.personName) + const [saving, setSaving] = useState(false) + const [open, setOpen] = useState(false) + + const handleRename = async () => { + if (name === p.personName) { setOpen(false); return } + setSaving(true) + try { + await updatePerson(p.personId, { name }) + onUpdate({ personId: p.personId, personName: name }) + toast({ title: "Updated", description: `Renamed to "${name}"` }) + setOpen(false) + } catch { + toast({ title: "Error", description: "Failed to rename", variant: "destructive" }) + } finally { + setSaving(false) + } + } + + const handleHide = async () => { + setSaving(true) + try { + await updatePerson(p.personId, { isHidden: true }) + onUpdate({ personId: p.personId, hidden: true }) + toast({ title: "Hidden", description: `"${p.personName || 'Unknown'}" hidden` }) + setOpen(false) + } catch { + toast({ title: "Error", description: "Failed to hide person", variant: "destructive" }) + } finally { + setSaving(false) + } + } + + return ( + + + + + +
+
+ {p.personName} + {p.personName || 'Unknown'} +
+
+ setName(e.target.value)} + placeholder="Name" + className="h-8 text-sm" + onKeyDown={(e) => { if (e.key === 'Enter') handleRename() }} + /> + +
+
+ + + Open in Immich + +
+
+
+
+ ) +} + function MiniMap({ latitude, longitude }: { latitude: number; longitude: number }) { const mapContainerRef = useRef(null) const mapRef = useRef(null) @@ -119,12 +234,19 @@ function MiniMap({ latitude, longitude }: { latitude: number; longitude: number export default function AssetInfoPanel({ assetId }: AssetInfoPanelProps) { const [detail, setDetail] = useState(null) const [loading, setLoading] = useState(true) + const [hiddenIds, setHiddenIds] = useState>(new Set()) const { exImmichUrl } = useConfig() useEffect(() => { setLoading(true) + setHiddenIds(new Set()) API.get(`/api/assets/${assetId}/detail`) - .then(setDetail) + .then((data) => { + setDetail(data) + if (data?.people) { + setHiddenIds(new Set(data.people.filter((p: any) => p.isHidden).map((p: any) => p.personId))) + } + }) .catch(() => setDetail(null)) .finally(() => setLoading(false)) }, [assetId]) @@ -180,23 +302,62 @@ export default function AssetInfoPanel({ assetId }: AssetInfoPanelProps) { {/* People */} {detail.people && detail.people.length > 0 && (
-

People

+
+

People

+
+ {detail.people.some((p) => !p.personName && !hiddenIds.has(p.personId)) && ( + + )} + {detail.people.some((p) => !hiddenIds.has(p.personId)) && ( + + )} +
+
{detail.people.map((p) => ( - - {p.personName} - {p.personName || 'Unknown'} - + { + if (updated.hidden) { + setHiddenIds((prev) => new Set(prev).add(updated.personId)) + } + if (updated.personName !== undefined) { + setDetail((prev) => { + if (!prev) return prev + return { ...prev, people: prev.people.map((pp) => pp.personId === updated.personId ? { ...pp, personName: updated.personName! } : pp) } + }) + } + }} /> ))}
diff --git a/src/components/shared/AssetGrid.tsx b/src/components/shared/AssetGrid.tsx index 5e8dd18..ceece21 100644 --- a/src/components/shared/AssetGrid.tsx +++ b/src/components/shared/AssetGrid.tsx @@ -11,6 +11,8 @@ import { usePhotoSelectionContext } from '@/contexts/PhotoSelectionContext'; import { useConfig } from '@/contexts/ConfigContext'; import dynamic from 'next/dynamic'; import { Heart, Info, Trash2, ExternalLink } from 'lucide-react'; +import { updateAssets } from '@/handlers/api/asset.handler'; +import { toast } from '@/components/ui/use-toast'; const AssetInfoPanel = dynamic(() => import('@/components/asset-info/AssetInfoPanel'), { ssr: false }); @@ -33,11 +35,54 @@ interface AssetGridRef { const AssetGrid = forwardRef(({ assets, isInternal = true, selectable = false, onSelectionChange, onDeleteAsset, onFavoriteAsset }, ref) => { const [index, setIndex] = useState(-1); const [lastSelectedIndex, setLastSelectedIndex] = useState(-1); - const [showInfoPanel, setShowInfoPanel] = useState(false); + const [showInfoPanel, setShowInfoPanel] = useState(() => { + if (typeof window !== 'undefined') { + return localStorage.getItem('assetInfoPanelOpen') === 'true' + } + return false + }); + const [favoriteIds, setFavoriteIds] = useState>(() => new Set(assets.filter(a => a.isFavorite).map(a => a.id))); const { exImmichUrl } = useConfig(); // Use context for selection state const { selectedIds, updateContext } = usePhotoSelectionContext(); + // Sync favoriteIds when assets change + useEffect(() => { + setFavoriteIds(new Set(assets.filter(a => a.isFavorite).map(a => a.id))); + }, [assets]); + + const handleToggleFavorite = useCallback(async (assetId: string) => { + const isFav = favoriteIds.has(assetId); + const newFav = !isFav; + // Optimistic update + setFavoriteIds(prev => { + const next = new Set(prev); + newFav ? next.add(assetId) : next.delete(assetId); + return next; + }); + try { + await updateAssets({ ids: [assetId], isFavorite: newFav }); + toast({ title: newFav ? "Added to favorites" : "Removed from favorites" }); + onFavoriteAsset?.(assetId, newFav); + } catch { + // Revert on failure + setFavoriteIds(prev => { + const next = new Set(prev); + isFav ? next.add(assetId) : next.delete(assetId); + return next; + }); + toast({ title: "Error", description: "Failed to update favorite", variant: "destructive" }); + } + }, [favoriteIds, onFavoriteAsset]); + + const toggleInfoPanel = useCallback(() => { + setShowInfoPanel((v) => { + const next = !v + localStorage.setItem('assetInfoPanelOpen', String(next)) + return next + }) + }, []); + const currentAsset = index >= 0 && index < assets.length ? assets[index] : null; useImperativeHandle(ref, () => ({ @@ -156,16 +201,17 @@ const AssetGrid = forwardRef(({ assets, isInternal const toolbarButtons = useMemo(() => { if (!currentAsset) return []; + const isFav = favoriteIds.has(currentAsset.id); return [ , , @@ -201,7 +247,7 @@ const AssetGrid = forwardRef(({ assets, isInternal , ] : []), ]; - }, [currentAsset, showInfoPanel, onDeleteAsset, onFavoriteAsset, handleOpenInImmich]); + }, [currentAsset, showInfoPanel, onDeleteAsset, onFavoriteAsset, handleOpenInImmich, favoriteIds, handleToggleFavorite]); return (
@@ -210,7 +256,7 @@ const AssetGrid = forwardRef(({ assets, isInternal plugins={[Download, Video]} open={index >= 0} index={index} - close={() => { setIndex(-1); setShowInfoPanel(false); }} + close={() => { setIndex(-1); }} on={{ view: ({ index }) => setIndex(index), }} diff --git a/src/handlers/api/asset.handler.ts b/src/handlers/api/asset.handler.ts index f6b6945..9cf09c7 100644 --- a/src/handlers/api/asset.handler.ts +++ b/src/handlers/api/asset.handler.ts @@ -55,6 +55,7 @@ export interface IUpdateAssetsParams { longitude?: number; dateTimeOriginal?: string; duplicateId?: string | null; + isFavorite?: boolean; } export const updateAssets = async (params: IUpdateAssetsParams) => { diff --git a/src/pages/api/assets/[id]/detail.ts b/src/pages/api/assets/[id]/detail.ts index 0b4859f..6fc8a06 100644 --- a/src/pages/api/assets/[id]/detail.ts +++ b/src/pages/api/assets/[id]/detail.ts @@ -76,6 +76,7 @@ export default async function handler( personId: person.id, personName: person.name, thumbnailPath: person.thumbnailPath, + isHidden: person.isHidden, }) .from(assetFaces) .innerJoin(person, eq(assetFaces.personId, person.id))