Merge pull request #556 from ente-io/fix-not-all-dupes-shown

add isDeduplication property to avoid hiding archived files
This commit is contained in:
Abhinav Kumar 2022-05-23 13:17:06 +05:30 committed by GitHub
commit a463a37456
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

View file

@ -63,6 +63,7 @@ interface Props {
activeCollection: number;
isSharedCollection?: boolean;
enableDownload?: boolean;
isDeduplicating?: boolean;
}
type SourceURL = {
@ -87,6 +88,7 @@ const PhotoFrame = ({
activeCollection,
isSharedCollection,
enableDownload,
isDeduplicating,
}: Props) => {
const [open, setOpen] = useState(false);
const [currentIndex, setCurrentIndex] = useState<number>(0);
@ -202,6 +204,7 @@ const PhotoFrame = ({
return false;
}
if (
!isDeduplicating &&
activeCollection === ALL_SECTION &&
(IsArchived(item) ||
archivedCollections?.has(item.collectionID))

View file

@ -181,6 +181,7 @@ export default function Deduplicate() {
setSelected={setSelected}
selected={selected}
activeCollection={ALL_SECTION}
isDeduplicating
/>
<DeduplicateOptions
setDialogMessage={setDialogMessage}