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

refactor deleteFileHelper and delete API

Browse source
This commit is contained in:
abhinav-grd 2021-09-21 16:09:04 +05:30
parent ea6a2165e2
commit a26722d8de
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -363,10 +363,9 @@ export default function Gallery() {
loadingBar.current?.continuousStart();
try {
const fileIds = getSelectedFileIds(selected);
await deleteFiles(fileIds, clearSelection, syncWithRemote);
await deleteFiles(fileIds);
setDeleted([...deleted, ...fileIds]);
} catch (e) {
loadingBar.current.complete();
switch (e.status?.toString()) {
case ServerErrorCodes.FORBIDDEN:
setDialogMessage({
@ -375,8 +374,6 @@ export default function Gallery() {
close: { variant: 'danger' },
content: constants.NOT_FILE_OWNER,
});
loadingBar.current.complete();
return;
}
setDialogMessage({
title: constants.ERROR,
@ -384,6 +381,10 @@ export default function Gallery() {
close: { variant: 'danger' },
content: constants.UNKNOWN_ERROR,
});
} finally {
clearSelection();
syncWithRemote();
loadingBar.current.complete();
}
};

8
src/services/fileService.ts
View file

@ -231,11 +231,7 @@ const removeDeletedCollectionFiles = async (
return files;
};
export const deleteFiles = async (
filesToDelete: number[],
clearSelection: Function,
syncWithRemote: Function
) => {
export const deleteFiles = async (filesToDelete: number[]) => {
try {
const token = getToken();
if (!token) {
@ -249,8 +245,6 @@ export const deleteFiles = async (
'X-Auth-Token': token,
}
);
clearSelection();
syncWithRemote();
} catch (e) {
logError(e, 'delete failed');
throw e;