dont filter out non user or file copies
This commit is contained in:
parent
5d59f48b33
commit
68121482ff
|
@ -1,7 +1,6 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import NavbarBase from 'components/Navbar/base';
|
import NavbarBase from 'components/Navbar/base';
|
||||||
import SidebarToggler from 'components/Navbar/SidebarToggler';
|
import SidebarToggler from 'components/Navbar/SidebarToggler';
|
||||||
import { getNonTrashedUniqueUserFiles } from 'utils/file';
|
|
||||||
import SearchBar from 'components/Search/SearchBar';
|
import SearchBar from 'components/Search/SearchBar';
|
||||||
import { Collection } from 'types/collection';
|
import { Collection } from 'types/collection';
|
||||||
import { EnteFile } from 'types/file';
|
import { EnteFile } from 'types/file';
|
||||||
|
@ -36,7 +35,7 @@ export function GalleryNavbar({
|
||||||
isInSearchMode={isInSearchMode}
|
isInSearchMode={isInSearchMode}
|
||||||
setIsInSearchMode={setIsInSearchMode}
|
setIsInSearchMode={setIsInSearchMode}
|
||||||
collections={collections}
|
collections={collections}
|
||||||
files={getNonTrashedUniqueUserFiles(files)}
|
files={files}
|
||||||
setActiveCollection={setActiveCollection}
|
setActiveCollection={setActiveCollection}
|
||||||
updateSearch={updateSearch}
|
updateSearch={updateSearch}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -42,7 +42,7 @@ import PhotoFrame from 'components/PhotoFrame';
|
||||||
import {
|
import {
|
||||||
changeFilesVisibility,
|
changeFilesVisibility,
|
||||||
downloadFiles,
|
downloadFiles,
|
||||||
getNonTrashedUniqueUserFiles,
|
getNonTrashedFiles,
|
||||||
getSelectedFiles,
|
getSelectedFiles,
|
||||||
mergeMetadata,
|
mergeMetadata,
|
||||||
sortFiles,
|
sortFiles,
|
||||||
|
@ -615,7 +615,7 @@ export default function Gallery() {
|
||||||
openUploader={openUploader}
|
openUploader={openUploader}
|
||||||
isInSearchMode={isInSearchMode}
|
isInSearchMode={isInSearchMode}
|
||||||
collections={collections}
|
collections={collections}
|
||||||
files={getNonTrashedUniqueUserFiles(files)}
|
files={getNonTrashedFiles(files)}
|
||||||
setActiveCollection={setActiveCollection}
|
setActiveCollection={setActiveCollection}
|
||||||
updateSearch={updateSearch}
|
updateSearch={updateSearch}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -17,6 +17,7 @@ import {
|
||||||
} from 'types/search';
|
} from 'types/search';
|
||||||
import { FILE_TYPE } from 'constants/file';
|
import { FILE_TYPE } from 'constants/file';
|
||||||
import { getFormattedDate, isInsideBox, isSameDayAnyYear } from 'utils/search';
|
import { getFormattedDate, isInsideBox, isSameDayAnyYear } from 'utils/search';
|
||||||
|
import { getUniqueFiles } from 'utils/file';
|
||||||
|
|
||||||
const ENDPOINT = getEndpoint();
|
const ENDPOINT = getEndpoint();
|
||||||
|
|
||||||
|
@ -114,7 +115,7 @@ function searchCollection(
|
||||||
}
|
}
|
||||||
|
|
||||||
function searchFiles(searchPhrase: string, files: EnteFile[]) {
|
function searchFiles(searchPhrase: string, files: EnteFile[]) {
|
||||||
return files
|
return getUniqueFiles(files)
|
||||||
.map((file) => ({
|
.map((file) => ({
|
||||||
title: file.metadata.title,
|
title: file.metadata.title,
|
||||||
id: file.id,
|
id: file.id,
|
||||||
|
|
|
@ -497,14 +497,9 @@ export function getUniqueFiles(files: EnteFile[]) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
export function getNonTrashedUniqueUserFiles(files: EnteFile[]) {
|
export function getNonTrashedFiles(files: EnteFile[]) {
|
||||||
const user: User = getData(LS_KEYS.USER) ?? {};
|
return files.filter(
|
||||||
return getUniqueFiles(
|
(file) => typeof file.isTrashed === 'undefined' || !file.isTrashed
|
||||||
files.filter(
|
|
||||||
(file) =>
|
|
||||||
(typeof file.isTrashed === 'undefined' || !file.isTrashed) &&
|
|
||||||
(!user.id || file.ownerID === user.id)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue