IO-760 Delete pictures in bulk & other minor fixes

components/screen-media-browser/screen-media-browser.component.jsx

@@ -2,7 +2,6 @@ import { Ionicons } from "@expo/vector-icons";
 import { AssetsSelector } from "expo-images-picker";
 import * as MediaLibrary from "expo-media-library";
 import _ from "lodash";
-import plimit from "p-limit";
 import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { StyleSheet, Text, View } from "react-native";
@@ -22,7 +21,7 @@ import CameraSelectJob from "../camera-select-job/camera-select-job.component";
 import UploadDeleteSwitch from "../upload-delete-switch/upload-delete-switch.component";
 import UploadProgress from "../upload-progress/upload-progress.component";
 
-const limit = plimit(2);
+//const limit = plimit(2);
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -52,50 +51,49 @@ export function ImageBrowserScreen({
   async function handleOnSuccess(uri, id) {
     console.log("Succesful upload!", uri);
     logImEXEvent("imexmobile_successful_upload");
-    if (deleteAfterUpload) {
-      try {
-        const result = await MediaLibrary.deleteAssetsAsync([id]);
-        console.log("Delete result :>> ", result);
-      } catch (error) {
-        console.log("Unable to delete picture.", error);
-      }
-    }
     setUploads((prevUploads) => _.omit(prevUploads, uri));
   }
 
   const onDone = async (data) => {
     logImEXEvent("imexmobile_upload_documents", { count: data.length });
-    const actions = [];
-    data.forEach(function (p) {
-      let filename;
-      //Appears to work for android.
-      //iOS provides the filename, android doe snot.
-      filename = p.filename || p.uri.split("/").pop();
-      actions.push(
-        limit(
-          handleUpload(
-            {
-              //iOS provides the file name. Android does not.
-              uri: p.uri,
-              filename,
-              onError: handleOnError,
-              onProgress: ({ percent }) => handleOnProgress(filename, percent),
-              onSuccess: () => handleOnSuccess(filename, p.id),
-            },
-            {
-              bodyshop: bodyshop,
-              jobId:
-                selectedCameraJobId !== "temp" ? selectedCameraJobId : null,
-              uploaded_by: currentUser.email,
-              photo: p,
-            }
-          )
-        )
-      );
-    });
-    await Promise.all(actions);
+    const ret = await Promise.all(
+      data.map(async (p) => {
+        let filename;
+        //Appears to work for android.
+        //iOS provides the filename, android doe snot.
+        filename = p.filename || p.uri.split("/").pop();
+        const result = await handleUpload(
+          {
+            //iOS provides the file name. Android does not.
+            uri: p.uri,
+            filename,
+            mediaId: p.id,
+            onError: handleOnError,
+            onProgress: ({ percent }) => handleOnProgress(filename, percent),
+            onSuccess: () => handleOnSuccess(filename, p.id),
+          },
+          {
+            bodyshop: bodyshop,
+            jobId: selectedCameraJobId !== "temp" ? selectedCameraJobId : null,
+            uploaded_by: currentUser.email,
+            photo: p,
+          }
+        );
+        return result;
+      })
+    );
+
+    if (deleteAfterUpload) {
+      try {
+        const result = await MediaLibrary.deleteAssetsAsync(
+          ret.map((r) => r.mediaId)
+        );
+        console.log("Delete result :>> ", result);
+      } catch (error) {
+        console.log("Unable to delete picture.", error);
+      }
+    }
     forceRerender();
-    //navigation.goBack();
   };
 
   return (