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();
|
loadingBar.current?.continuousStart();
|
||||||
try {
|
try {
|
||||||
const fileIds = getSelectedFileIds(selected);
|
const fileIds = getSelectedFileIds(selected);
|
||||||
await deleteFiles(fileIds, clearSelection, syncWithRemote);
|
await deleteFiles(fileIds);
|
||||||
setDeleted([...deleted, ...fileIds]);
|
setDeleted([...deleted, ...fileIds]);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
loadingBar.current.complete();
|
|
||||||
switch (e.status?.toString()) {
|
switch (e.status?.toString()) {
|
||||||
case ServerErrorCodes.FORBIDDEN:
|
case ServerErrorCodes.FORBIDDEN:
|
||||||
setDialogMessage({
|
setDialogMessage({
|
||||||
|
@ -375,8 +374,6 @@ export default function Gallery() {
|
||||||
close: { variant: 'danger' },
|
close: { variant: 'danger' },
|
||||||
content: constants.NOT_FILE_OWNER,
|
content: constants.NOT_FILE_OWNER,
|
||||||
});
|
});
|
||||||
loadingBar.current.complete();
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
setDialogMessage({
|
setDialogMessage({
|
||||||
title: constants.ERROR,
|
title: constants.ERROR,
|
||||||
|
@ -384,6 +381,10 @@ export default function Gallery() {
|
||||||
close: { variant: 'danger' },
|
close: { variant: 'danger' },
|
||||||
content: constants.UNKNOWN_ERROR,
|
content: constants.UNKNOWN_ERROR,
|
||||||
});
|
});
|
||||||
|
} finally {
|
||||||
|
clearSelection();
|
||||||
|
syncWithRemote();
|
||||||
|
loadingBar.current.complete();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -231,11 +231,7 @@ const removeDeletedCollectionFiles = async (
|
||||||
return files;
|
return files;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const deleteFiles = async (
|
export const deleteFiles = async (filesToDelete: number[]) => {
|
||||||
filesToDelete: number[],
|
|
||||||
clearSelection: Function,
|
|
||||||
syncWithRemote: Function
|
|
||||||
) => {
|
|
||||||
try {
|
try {
|
||||||
const token = getToken();
|
const token = getToken();
|
||||||
if (!token) {
|
if (!token) {
|
||||||
|
@ -249,8 +245,6 @@ export const deleteFiles = async (
|
||||||
'X-Auth-Token': token,
|
'X-Auth-Token': token,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
clearSelection();
|
|
||||||
syncWithRemote();
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logError(e, 'delete failed');
|
logError(e, 'delete failed');
|
||||||
throw e;
|
throw e;
|
||||||
|
|
Loading…
Reference in a new issue