From 62a834dec9440672e9ecf6fcaa0609499bb4bd0a Mon Sep 17 00:00:00 2001
From: Surat Das <surat.das@gmail.com>
Date: Tue, 8 Mar 2022 21:57:50 -0800
Subject: [PATCH] Fix for #346 - Download does not download all images.

---
 src/components/TestRunList/BulkOperation.tsx |  4 +-
 src/services/testRun.service.ts              | 45 +++++++++-----------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/components/TestRunList/BulkOperation.tsx b/src/components/TestRunList/BulkOperation.tsx
index ae69626f..3bd6e459 100644
--- a/src/components/TestRunList/BulkOperation.tsx
+++ b/src/components/TestRunList/BulkOperation.tsx
@@ -125,13 +125,13 @@ export const BulkOperation: React.FunctionComponent = () => {
     }
     if (downloadDialogOpen) {
       let urlsToDownload: { download: string, filename: string }[] = [];
-      ids.forEach((id, index) => {
+      ids.forEach((id) => {
         testRunService.getDetails(id.toString())
           .then(
             (e) => {
               urlsToDownload.push({ "download": "static/imageUploads/" + e.imageName, "filename": e.name });
               //Call getFile function only when all images names are pushed into the array.
-              if (index === ids.length - 1) {
+              if (urlsToDownload.length === ids.length) {
                 testRunService.getFiles(urlsToDownload);
               }
             });
diff --git a/src/services/testRun.service.ts b/src/services/testRun.service.ts
index 072c1cfb..00cc3a3a 100644
--- a/src/services/testRun.service.ts
+++ b/src/services/testRun.service.ts
@@ -23,33 +23,28 @@ async function getFiles(urls: { download: string, filename: string }[]): Promise
 
   // Reference : https://www.c-sharpcorner.com/article/download-multiple-file-as-zip-file-using-angular/
   const zip = new JSZip();
-  urls.forEach((element, index) => {
-    fetch(element.download)
-      .then((res) => res.blob())
-      .then((blob) => zip.file(element.filename, blob))
-      .then(() => {
-        if (index === urls.length - 1) {
-          zip.generateAsync({ type: 'blob' })
-            .then((content) => {
-              if (content) {
-                FileSaver.saveAs(content, 'vrt-test-run.zip');
-              }
-            });
-        }
-      });
-
-    // Downloads multiple images as individual files, kept it here for reference
-    // Reference : https://github.com/robertdiers/js-multi-file-download/blob/master/src/main/resources/static/index.html
-    /*
-    urls.forEach(function (e) {
-      fetch(e.download)
-        .then(res => res.blob()) // Gets the response and returns it as a blob
-        .then(blob => {
-          FileSaver.saveAs(blob, e.filename);
-        });
+  for (const eachUrl of urls) {
+    const response = await fetch(eachUrl.download);
+    const blob = await response.blob();
+    zip.file(eachUrl.filename, blob);
+  }
+  await zip.generateAsync({ type: 'blob' })
+    .then((content) => {
+      if (content) {
+        FileSaver.saveAs(content, 'vrt-test-run.zip');
+      }
     });
-    */
+  // Downloads multiple images as individual files, kept it here for reference
+  // Reference : https://github.com/robertdiers/js-multi-file-download/blob/master/src/main/resources/static/index.html
+  /*
+  urls.forEach(function (e) {
+    fetch(e.download)
+      .then(res => res.blob()) // Gets the response and returns it as a blob
+      .then(blob => {
+        FileSaver.saveAs(blob, e.filename);
+      });
   });
+  */
 }
 
 async function getDetails(id: string): Promise<TestRun> {