Merge pull request #1448 from cozy/upload-queue-errors

cozy · Apr 24, 2020 · 3b13cf5 · 3b13cf5
2 parents a2623e4 + 7a3b91d
commit 3b13cf5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/react/UploadQueue/Readme.md b/react/UploadQueue/Readme.md
@@ -20,6 +20,18 @@ const data = {
   queue: [{
     file: { name: 'Photo.jpg', type: 'file' },
     status: 'created'
+  }, {
+    file: { name: 'Photo - conflict error.jpg', type: 'file' },
+    status: 'conflict'
+  }, {
+    file: { name: 'Photo - quota error.jpg', type: 'file' },
+    status: 'quota'
+  }, {
+    file: { name: 'Photo - network error.jpg', type: 'file' },
+    status: 'network'
+  }, {
+    file: { name: 'Photo - generic failure error.jpg', type: 'file' },
+    status: 'failed'
   }, {
     file: { name: 'File with a very long name - really long - 2020/04/16.txt', type: 'file' },
     progress: {

diff --git a/react/UploadQueue/index.jsx b/react/UploadQueue/index.jsx
@@ -33,7 +33,7 @@ const CONFLICT = 'conflict'
 const QUOTA = 'quota'
 const NETWORK = 'network'
 const DONE_STATUSES = [CREATED, UPDATED]
-const ERROR_STATUSES = [CONFLICT, NETWORK, QUOTA]
+const ERROR_STATUSES = [CONFLICT, NETWORK, QUOTA, FAILED]
 
 export const uploadStatus = {
   CANCEL,
@@ -119,7 +119,7 @@ const Item = translate()(
       statusIcon = (
         <Icon className="u-ml-half" icon="check" color={palette['emerald']} />
       )
-    } else {
+    } else if (statusToUse === PENDING) {
       statusIcon = <Pending />
     }