fix(upload): team feedback + try to fix e2e tests

bimdata · Apr 28, 2023 · e22b84d · e22b84d
1 parent 8a892e6
commit e22b84d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/src/utils/upload.js b/src/utils/upload.js
@@ -34,13 +34,10 @@ function createFileUploader(
         return;
       }
 
-      let request, resolve, reject;
+      let request;
       let count = 0;
 
       const uploadId = nextUploadId++;
-      const promise = new Promise(
-        (res, rej) => ((resolve = res), (reject = rej))
-      );
 
       const handleError = e => {
         if (count < retryCount) {
@@ -49,43 +46,37 @@ function createFileUploader(
           setTimeout(sendRequest, retryInterval);
         } else {
           onUploadError({ id: uploadId, error: e });
-          reject({ id: uploadId, error: e });
         }
       };
 
       const sendRequest = () => {
-        // Abort any previous request that is not terminated
-        if (request?.readyState < XMLHttpRequest.DONE) request?.abort();
-
         request = new XMLHttpRequest();
 
-        request.upload.addEventListener("loadstart", e => {
+        request.upload.addEventListener("loadstart", ({ loaded, total }) => {
           onUploadStart({
             id: uploadId,
-            bytesUploaded: e.loaded,
-            bytesTotal: e.total,
-            percentage: (e.loaded / e.total) * 100
+            bytesUploaded: loaded,
+            bytesTotal: total,
+            percentage: (loaded / total) * 100
           });
         });
-        request.upload.addEventListener("progress", e => {
+        request.upload.addEventListener("progress", ({ loaded, total }) => {
           onUploadProgress({
             id: uploadId,
-            bytesUploaded: e.loaded,
-            bytesTotal: e.total,
-            percentage: (e.loaded / e.total) * 100
+            bytesUploaded: loaded,
+            bytesTotal: total,
+            percentage: (loaded / total) * 100
           });
         });
         request.addEventListener("load", e => {
           if (request.status < 400) {
-            const data = {
+            onUploadComplete({
               id: uploadId,
               bytesUploaded: e.loaded,
               bytesTotal: e.total,
               percentage: (e.loaded / e.total) * 100,
               response: request.response
-            };
-            onUploadComplete(data);
-            resolve(data);
+            });
           } else {
             handleError(e);
           }
@@ -95,7 +86,6 @@ function createFileUploader(
         });
         request.upload.addEventListener("abort", e => {
           onUploadCancel(e);
-          reject(e);
         });
 
         request.open(method, url);
@@ -109,7 +99,6 @@ function createFileUploader(
 
       return {
         id: uploadId,
-        promise,
         request: () => request,
         cancel: () => request.abort()
       };

diff --git a/tests/e2e/specs/features/06_docimport.cy.js b/tests/e2e/specs/features/06_docimport.cy.js
@@ -79,7 +79,12 @@ describe("Documents import feature", () => {
 
     // Act
     cy.hook("btn-upload-file").click();
-    cy.get("body > input[type=file]").selectFile("@housePlan", { force: true });
+    cy.get("body > input[type=file]").selectFile(
+      { contents: "@housePlan", fileName: "house-plan.pdf" },
+      { force: true }
+    );
+    cy.intercept("**/dms-tree").as("getDmsTree");
+    cy.wait("@getDmsTree");
 
     // Assert
     cy.hook("files-table")
@@ -99,7 +104,10 @@ describe("Documents import feature", () => {
 
     // Act
     cy.hook("btn-upload-file").click();
-    cy.get("body > input[type=file]").selectFile("@housePlan", { force: true });
+    cy.get("body > input[type=file]").selectFile(
+      { contents: "@housePlan", fileName: "house-plan.pdf" },
+      { force: true }
+    );
 
     // Assert
     for (let i = 0; i < 4; i++) cy.wait("@uploadRequest");