diff --git a/src/components/albums/info/AlbumPeople.tsx b/src/components/albums/info/AlbumPeople.tsx index 4981c04..e37386f 100644 --- a/src/components/albums/info/AlbumPeople.tsx +++ b/src/components/albums/info/AlbumPeople.tsx @@ -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
{errorMessage}
} + const renderPerson = (person: IAlbumPerson) => ( +
{ + if (selectionMode) { + handleBulkSelect(person.id) + } else { + onSelect(person.id) + } + }} + > + {selectionMode && ( + handleBulkSelect(person.id)} + /> + )} + +
+

{person.name || "No Name"}

+

{person.numberOfPhotos} photos

+
+
+ ) + return ( -
+
setSearchQuery(e.target.value)} /> {selectedPerson && ( -
+
)} +
-

People

+

Known People

{!readOnly && ( <> {!selectedPerson && ( @@ -178,45 +224,15 @@ export default function AlbumPeople({ album, onSelect, readOnly }: AlbumPeoplePr )}
-
- {filteredPeople.map((person) => ( -
{ - if (selectionMode) { - handleBulkSelect(person.id) - } else { - onSelect(person.id) - } - }} - > - {selectionMode && ( - handleBulkSelect(person.id)} - /> - )} - -
-

{person.name || "No Name"}

-

{person.numberOfPhotos} photos

-
-
- ))} +
+ {knownPeople.map(renderPerson)} +
+ {unknownPeople.length > 0 && ( +
+

Unknown People

+ {unknownPeople.map(renderPerson)} +
+ )}
) diff --git a/src/components/albums/potential-albums/PotentialAlbumsDates.tsx b/src/components/albums/potential-albums/PotentialAlbumsDates.tsx index 984e030..a2fd261 100644 --- a/src/components/albums/potential-albums/PotentialAlbumsDates.tsx +++ b/src/components/albums/potential-albums/PotentialAlbumsDates.tsx @@ -51,7 +51,7 @@ export default function PotentialAlbumsDates() { }, [filters, minAssets]); return ( -
+