refactor deleteFileHelper and delete API
This commit is contained in:
parent
ea6a2165e2
commit
a26722d8de
|
@ -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();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue