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

simplify getSelectedFiles and update hideFilesHelper with it

Browse source
This commit is contained in:
Abhinav 2023-05-18 11:28:08 +05:30
parent a92679a6f9
commit c61991170c
2 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/photos/src/pages/gallery/index.tsx
View file

@ -734,7 +734,8 @@ export default function Gallery() {
const hideFilesHelper = async () => {
startLoading();
try {
const selectedFiles = getSelectedFiles(selected, files, true);
// passing files here instead of filteredData because we want to move all files copies to hidden collection
const selectedFiles = getSelectedFiles(selected, files);
await moveToHiddenCollection(selectedFiles);
clearSelection();
} catch (e) {

22
apps/photos/src/utils/file/index.ts
View file

@ -147,28 +147,14 @@ function getSelectedFileIds(selectedFiles: SelectedState) {
filesIDs.push(Number(key));
}
}
return filesIDs;
return new Set(filesIDs);
}
export function getSelectedFiles(
selected: SelectedState,
files: EnteFile[],
includeAllCopies = false
files: EnteFile[]
): EnteFile[] {
const selectedFilesIDs = new Set(getSelectedFileIds(selected));
const foundFiles = new Set<number>();
const selectedFiles = files.filter((file) => {
if (selectedFilesIDs.has(file.id)) {
if (includeAllCopies) {
return true;
}
if (foundFiles.has(file.id)) {
return false;
}
foundFiles.add(file.id);
return true;
}
});
return selectedFiles;
const selectedFilesIDs = getSelectedFileIds(selected);
return files.filter((file) => selectedFilesIDs.has(file.id));
}
export function sortFiles(files: EnteFile[]) {