From 15441a094160cc9be00001a0058ddde10907f919 Mon Sep 17 00:00:00 2001
From: Alice Gaudon <alice@gaudon.pro>
Date: Wed, 2 Mar 2022 11:10:58 +0100
Subject: [PATCH] feat(front/FileUpload): display errors and allow retrying or
 canceling the upload

---
 src/assets/views/components/FileUpload.svelte | 43 ++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/assets/views/components/FileUpload.svelte b/src/assets/views/components/FileUpload.svelte
index 499e3dc..24948c0 100644
--- a/src/assets/views/components/FileUpload.svelte
+++ b/src/assets/views/components/FileUpload.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import {onMount} from "svelte";
+    import Icon from "../utils/Icon.svelte"
 
     export let file: File;
     export let form: HTMLFormElement;
@@ -25,13 +26,14 @@
         inProgress = true;
         try {
             await new Promise<void>((resolve, reject) => {
-                initTrackers();
+                reset();
                 prepareXhrRequest(resolve, reject);
                 if (!xhr) throw new Error('Failed to initialize xhr');
                 sendXhrRequest(xhr);
             });
         } catch (e) {
-            onError(e);
+            error = e;
+            return onError(e);
         } finally {
             inProgress = false;
         }
@@ -39,12 +41,25 @@
         onEnd(file.name, finalUrl);
     }
 
-    function initTrackers() {
+    function retry() {
+        run().catch(onError);
+    }
+
+    function cancel() {
+        onEnd(file.name, null);
+    }
+
+    function reset() {
+        resetResult();
         initSpeedTracker();
         initProgressTracker();
         initErrorTracker();
     }
 
+    function resetResult() {
+        finalUrl = undefined;
+    }
+
     function initSpeedTracker() {
         xferSpeed = [];
         lastTransferTime = null;
@@ -83,7 +98,9 @@
                 if (response.status === 'error') {
                     if (response.messages) {
                         // TODO: display errors // applyFormMessages(this.form, response.messages);
-                        return reject(response.messages);
+                        const messages = response.messages;
+                        const formattedError = Object.keys(messages).map(field => `${field}: ${messages[field].name}, ${messages[field].message}`).join(';');
+                        return reject(formattedError);
                     }
                 } else if (response.url) {
                     finalUrl = response.url;
@@ -154,6 +171,11 @@
 		.name, .status {
 			text-align: center;
 		}
+
+        &.error {
+            color: var(--on-error);
+            background-color: var(--error);
+        }
 	}
 
 	.progress-bar {
@@ -185,8 +207,17 @@
 	}
 </style>
 
-<div class="file-upload">
+<div class="file-upload" class:error={!!error}>
     <div class="name">{file?.name}</div>
     <div class="progress-bar" style="--progress: {progress};"><span class="content">{progress}</span></div>
-    <div class="status">Uploading @ {speed}</div>
+    <div class="status">
+        {#if error}
+            Error: {error}
+
+            <button on:click={retry}><Icon name="repeat"/> Retry</button>
+            <button on:click={cancel}><Icon name="slash"/> Cancel</button>
+        {:else}
+            Uploading @ {speed}
+        {/if}
+    </div>
 </div>