From a26722d8def5a278be9b82a73e31e447e6c36b9b Mon Sep 17 00:00:00 2001
From: abhinav-grd <abhinavk.grd@gmail.com>
Date: Tue, 21 Sep 2021 16:09:04 +0530
Subject: [PATCH] refactor deleteFileHelper and delete API

---
 src/pages/gallery/index.tsx | 9 +++++----
 src/services/fileService.ts | 8 +-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/pages/gallery/index.tsx b/src/pages/gallery/index.tsx
index 9a08865ff..b16ac8da8 100644
--- a/src/pages/gallery/index.tsx
+++ b/src/pages/gallery/index.tsx
@@ -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();
         }
     };
 
diff --git a/src/services/fileService.ts b/src/services/fileService.ts
index 98d1868dc..2c8fd7495 100644
--- a/src/services/fileService.ts
+++ b/src/services/fileService.ts
@@ -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;