beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

dont filter out non user or file copies

Browse source
This commit is contained in:
Abhinav 2023-01-02 16:36:46 +05:30
parent 5d59f48b33
commit 68121482ff
4 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/pages/gallery/Navbar.tsx
View file

@ -1,7 +1,6 @@
import React from 'react';
import NavbarBase from 'components/Navbar/base';
import SidebarToggler from 'components/Navbar/SidebarToggler';
import { getNonTrashedUniqueUserFiles } from 'utils/file';
import SearchBar from 'components/Search/SearchBar';
import { Collection } from 'types/collection';
import { EnteFile } from 'types/file';
@ -36,7 +35,7 @@ export function GalleryNavbar({
isInSearchMode={isInSearchMode}
setIsInSearchMode={setIsInSearchMode}
collections={collections}
files={getNonTrashedUniqueUserFiles(files)}
files={files}
setActiveCollection={setActiveCollection}
updateSearch={updateSearch}
/>

4
src/pages/gallery/index.tsx
View file

@ -42,7 +42,7 @@ import PhotoFrame from 'components/PhotoFrame';
import {
changeFilesVisibility,
downloadFiles,
getNonTrashedUniqueUserFiles,
getNonTrashedFiles,
getSelectedFiles,
mergeMetadata,
sortFiles,
@ -615,7 +615,7 @@ export default function Gallery() {
openUploader={openUploader}
isInSearchMode={isInSearchMode}
collections={collections}
files={getNonTrashedUniqueUserFiles(files)}
files={getNonTrashedFiles(files)}
setActiveCollection={setActiveCollection}
updateSearch={updateSearch}
/>

3
src/services/searchService.ts
View file

@ -17,6 +17,7 @@ import {
} from 'types/search';
import { FILE_TYPE } from 'constants/file';
import { getFormattedDate, isInsideBox, isSameDayAnyYear } from 'utils/search';
import { getUniqueFiles } from 'utils/file';
const ENDPOINT = getEndpoint();
@ -114,7 +115,7 @@ function searchCollection(
}
function searchFiles(searchPhrase: string, files: EnteFile[]) {
return files
return getUniqueFiles(files)
.map((file) => ({
title: file.metadata.title,
id: file.id,

11
src/utils/file/index.ts
View file

@ -497,14 +497,9 @@ export function getUniqueFiles(files: EnteFile[]) {
}
});
}
export function getNonTrashedUniqueUserFiles(files: EnteFile[]) {
const user: User = getData(LS_KEYS.USER) ?? {};
return getUniqueFiles(
files.filter(
(file) =>
(typeof file.isTrashed === 'undefined' || !file.isTrashed) &&
(!user.id || file.ownerID === user.id)
)
export function getNonTrashedFiles(files: EnteFile[]) {
return files.filter(
(file) => typeof file.isTrashed === 'undefined' || !file.isTrashed
);
}