copyCalls as an array of Promises on return

TACC · Nov 21, 2024 · 71709a7 · 71709a7
1 parent 5fc9b50
commit 71709a7
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/client/src/hooks/datafiles/mutations/useCopy.ts b/client/src/hooks/datafiles/mutations/useCopy.ts
@@ -81,7 +81,7 @@ function useCopy() {
     });
 
   const { mutateAsync } = useMutation({ mutationFn: copyFileUtil });
-  const copy = async ({
+  const copy = ({
     srcApi,
     destApi,
     destSystem,
@@ -99,13 +99,13 @@ function useCopy() {
     const filteredSelected = selected
       .filter((f: any) => status[f.id] !== 'SUCCESS')
       .map((f: any) => ({ ...f, api: srcApi }));
-    const copyCalls = filteredSelected.map((file: any) => {
+    const copyCalls: Promise<any>[] = filteredSelected.map((file: any) => {
       // Copy File
       dispatch({
         type: 'DATA_FILES_SET_OPERATION_STATUS_BY_KEY',
         payload: { status: 'RUNNING', key: file.id, operation: 'copy' },
       });
-      mutateAsync(
+      return mutateAsync(
         {
           api: file.api,
           scheme: scheme,
@@ -135,20 +135,21 @@ function useCopy() {
       );
     });
     // Result
-    await Promise.all(copyCalls);
-    dispatch({
-      type: 'DATA_FILES_TOGGLE_MODAL',
-      payload: { operation: 'copy', props: {} },
-    });
-    dispatch({
-      type: 'ADD_TOAST',
-      payload: {
-        message: `${
-          copyCalls.length > 1 ? `${copyCalls.length} files` : 'File'
-        } copied to ${truncateMiddle(`${destPath}`, 20) || '/'}`,
-      },
+    Promise.all(copyCalls).then(() => {
+      dispatch({
+        type: 'DATA_FILES_TOGGLE_MODAL',
+        payload: { operation: 'copy', props: {} },
+      });
+      dispatch({
+        type: 'ADD_TOAST',
+        payload: {
+          message: `${
+            copyCalls.length > 1 ? `${copyCalls.length} files` : 'File'
+          } copied to ${truncateMiddle(`${destPath}`, 20) || '/'}`,
+        },
+      });
+      callback();
     });
-    callback();
   };
   return { copy, status, setStatus };
 }