refactor: improve AlbumPeople component to categorize known and unknown individuals

- Introduced useMemo to separate known and unknown people based on their names.
- Enhanced rendering logic to display known and unknown people distinctly.
- Updated UI elements for better layout and usability, including search input and person rendering.
- Adjusted padding and spacing for a more consistent design across the component.
This commit is contained in:
Varun Raj committed 2025-07-27 10:56:54 +05:30
1 parent e8b1076603
commit 8dab4ced5b
6 files changed
+66 -50

No files matched your search

+58 -42
View File
@@ -47,6 +47,13 @@ export default function AlbumPeople({ album, onSelect, readOnly }: AlbumPeoplePr
return people.filter((person) => person.name.toLowerCase().includes(searchQuery.toLowerCase()))
}, [people, searchQuery])
const { knownPeople, unknownPeople } = useMemo(() => {
return {
knownPeople: people.filter((person) => person.name),
unknownPeople: people.filter((person) => !person.name)
}
}, [people])
const fetchPeople = async () => {
return getAlbumPeople(album.id).then((people) => {
setPeople(people)
@@ -102,8 +109,46 @@ export default function AlbumPeople({ album, onSelect, readOnly }: AlbumPeoplePr
return <div>{errorMessage}</div>
}
const renderPerson = (person: IAlbumPerson) => (
<div
className={cn(
'flex items-center gap-2 cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-700 rounded-md p-1',
selectedPerson?.id === person.id ? "bg-gray-300 dark:bg-gray-700" : ""
)}
key={person.id}
onClick={() => {
if (selectionMode) {
handleBulkSelect(person.id)
} else {
onSelect(person.id)
}
}}
>
{selectionMode && (
<Checkbox
id={person.id + "_checkbox"}
checked={selectedPeople.includes(person.id)}
onCheckedChange={() => handleBulkSelect(person.id)}
/>
)}
<LazyImage
role="button"
className={
cn("cursor-pointer h-8 w-8 min-w-8 rounded-full",
)
}
src={PERSON_THUBNAIL_PATH(person.id)} alt={person.name} />
<div className='flex flex-col'>
<p className='text-sm'>{person.name || "No Name"}</p>
<p className={
cn("text-xs text-gray-500 dark:text-gray-400")
}>{person.numberOfPhotos} photos</p>
</div>
</div>
)
return (
<div className="overflow-y-auto min-w-[200px] sticky top-0 py-4 max-h-[calc(100vh-60px)] min-h-[calc(100vh-60px)] border-r border-gray-200 dark:border-zinc-800 flex flex-col gap-2 px-2">
<div className="overflow-y-auto min-w-[200px] sticky top-0 py-2 max-h-[calc(100vh-60px)] min-h-[calc(100vh-60px)] border-r border-gray-200 dark:border-zinc-800 flex flex-col gap-2 px-2">
<Input
placeholder="Search"
className="w-full"
@@ -111,7 +156,7 @@ export default function AlbumPeople({ album, onSelect, readOnly }: AlbumPeoplePr
onChange={(e) => setSearchQuery(e.target.value)}
/>
{selectedPerson && (
<div className='flex flex-col gap-2 bg-white dark:bg-zinc-900 p-2 rounded-md'>
<div className='flex flex-col gap-2 bg-white dark:bg-zinc-900 py-2 rounded-md'>
<div className='flex items-center gap-2'>
<Image
src={PERSON_THUBNAIL_PATH(selectedPerson.id)}
@@ -155,9 +200,10 @@ export default function AlbumPeople({ album, onSelect, readOnly }: AlbumPeoplePr
</div>
)}
<div className='flex flex-col gap-1 flex-1 overflow-y-auto'>
<div className="flex items-center gap-2 justify-between">
<p className="text-sm font-medium">People</p>
<p className="text-sm font-medium">Known People</p>
{!readOnly && (
<>
{!selectedPerson && (
@@ -178,45 +224,15 @@ export default function AlbumPeople({ album, onSelect, readOnly }: AlbumPeoplePr
</>
)}
</div>
<div className="flex flex-col overflow-x-hidden gap-2">
{filteredPeople.map((person) => (
<div
className={cn(
'flex items-center gap-2 cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-700 rounded-md p-1',
selectedPerson?.id === person.id ? "bg-gray-300 dark:bg-gray-700" : ""
)}
key={person.id}
onClick={() => {
if (selectionMode) {
handleBulkSelect(person.id)
} else {
onSelect(person.id)
}
}}
>
{selectionMode && (
<Checkbox
id={person.id + "_checkbox"}
checked={selectedPeople.includes(person.id)}
onCheckedChange={() => handleBulkSelect(person.id)}
/>
)}
<LazyImage
role="button"
className={
cn("cursor-pointer h-10 w-10 min-w-10 rounded-full border-2",
!!person.name ? "border-green-500" : "border-gray-500",
)
}
src={PERSON_THUBNAIL_PATH(person.id)} alt={person.name} />
<div className='flex flex-col'>
<p>{person.name || "No Name"}</p>
<p className={
cn("text-xs text-gray-500 dark:text-gray-400")
}>{person.numberOfPhotos} photos</p>
</div>
</div>
))}
<div className="flex flex-col gap-1">
{knownPeople.map(renderPerson)}
</div>
{unknownPeople.length > 0 && (
<div className='flex flex-col gap-1'>
<p className='text-sm font-medium'>Unknown People</p>
{unknownPeople.map(renderPerson)}
</div>
)}
</div>
</div>
)
@@ -51,7 +51,7 @@ export default function PotentialAlbumsDates() {
}, [filters, minAssets]);
return (
<div className="min-w-[200px] py-4 max-h-[calc(100vh-60px)] min-h-[calc(100vh-60px)] border-r border-gray-200 dark:border-zinc-800 flex flex-col gap-2 px-1">
<div className="min-w-[200px] py-2 max-h-[calc(100vh-60px)] min-h-[calc(100vh-60px)] border-r border-gray-200 dark:border-zinc-800 flex flex-col gap-2 px-1">
<div className="flex justify-between items-center gap-2">
<Select
value={filters.sortBy}
@@ -75,7 +75,7 @@ export default function MissingLocationDates({ groupBy }: IMissingLocationDatesP
}, [filters]);
return (
<div className="min-w-[200px] max-w-[200px] sticky top-0 py-4 max-h-[calc(100vh-60px)] min-h-[calc(100vh-60px)] border-r border-gray-200 dark:border-zinc-800 flex flex-col gap-2 px-2">
<div className="min-w-[200px] max-w-[200px] sticky top-0 py-2 max-h-[calc(100vh-60px)] min-h-[calc(100vh-60px)] border-r border-gray-200 dark:border-zinc-800 flex flex-col gap-2 px-2">
<div className="flex justify-between items-center gap-2">
{groupBy === "album" ? (
<p className="text-sm text-gray-500 dark:text-zinc-400">Asset Count</p>
+1 -1
View File
@@ -48,7 +48,7 @@ export default function Header({ leftComponent, rightComponent, title }: IProps)
</Head>
)}
<header key="header" className={
clsx("sticky z-10 top-0 w-full flex h-14 items-center gap-4 border-b bg-white dark:bg-black px-4 lg:h-[60px] lg:px-6")
clsx("sticky z-10 top-0 w-full flex h-12 items-center gap-4 border-b bg-white dark:bg-black px-4 lg:px-6")
}>
<Sheet>
<SheetTrigger asChild>
+4 -4
View File
@@ -18,14 +18,14 @@ export default function Sidebar() {
return (
<div className="hidden border-r bg-muted/40 md:block max-h-screen min-h-screen">
<div className="flex h-full max-h-screen flex-col gap-2">
<div className="flex h-14 items-center justify-between border-b px-2 lg:h-[60px] lg:px-2">
<div className="flex h-12 items-center justify-between border-b px-2 lg:px-2">
<Link href="/" className="flex items-center gap-1 font-semibold">
<img
src="/favicon.png"
width={32}
height={32}
width={26}
height={26}
alt="Immich Power Tools"
className="w-8 h-8"
className="w-6 h-6"
/>
<span className="">Immich Power Tools</span>
</Link>
+1 -1
View File
@@ -95,7 +95,7 @@ export default function PersonPage() {
}
/>
<div className="flex divide-y">
<div className="overflow-y-auto sticky top-0 min-w-[200px] py-4 max-h-[calc(100vh-60px)] min-h-[calc(100vh-60px)] dark:bg-zinc-900 bg-gray-200 flex flex-col gap-2 px-2">
<div className="overflow-y-auto sticky top-0 min-w-[200px] py-2 max-h-[calc(100vh-60px)] min-h-[calc(100vh-60px)] dark:bg-zinc-900 bg-gray-200 flex flex-col gap-2 px-2">
<ul className="flex flex-col gap-1">
<li>
<Link href={{