@social-mail/social-mail-client 1.2.4 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/services/files/LocalFileService.tsx

@@ -31,7 +31,7 @@ export type UploadedFiles = CustomEvent<{ files: IUploadedFile[], extra: any}>;
 
     styled.css `
         display: inline-grid;
-        grid-template-rows: auto auto;
+        grid-template-rows: auto auto auto;
 
         & > [data-element=file-name] {
             grid-row: 1;
@@ -40,15 +40,20 @@ export type UploadedFiles = CustomEvent<{ files: IUploadedFile[], extra: any}>;
             text-overflow: ellipsis;
         }
 
-        & > [data-element=progress] {
+        & > progress {
             grid-row: 2;
             width: 100%;
         }
+        & > [data-element=error] {
+            grid-row: 3;
+            width: 100%;
+        }
 
     `.installGlobal("[data-attachment-file]");
 
 export interface IFileUpload {
     name: string;
+    error?: string;
     progress?: number;
     promise?: Promise<{ appFileID }>
 }
@@ -164,23 +169,38 @@ export default class LocalFileService extends TaskManager {
         const upload = {
             total: 0,
             tasks,
-            progress:0
+            progress:0,
+            error: "",
         };
         for (const file of files) {
             upload.total += file.size;
             const uploadFile: IFileUpload = {
                 name: file.name,
+                error: "",
                 progress: 0
             };
             uploadFile.promise = this.run(async () => {
-                uploadFile.progress = 0.01;
-
-                // we will check if file exists and has same sha256?
-
-                const r = await this.uploadFile(file, extra, ct, (n) => uploadFile.progress = n);
-                upload.progress += r.file.size;
-                setTimeout(() => tasks.remove(uploadFile), 500);
-                return r;
+                let lastError: string;
+                for(let i=0; i<3; i++) {
+                    try {
+                        uploadFile.progress = 0.01;
+
+                        // we will check if file exists and has same sha256?
+
+                        const r = await this.uploadFile(file, extra, ct, (n) => uploadFile.progress = n);
+                        upload.progress += r.file.size;
+                        setTimeout(() => tasks.remove(uploadFile), 500);
+                        upload.error = "";
+                        lastError = null;
+                        return r;
+                    } catch (error) {
+                        lastError = `${file.webkitRelativePath ?? ""}/${file.name} failed to upload.\n${error.stack ?? error}`;
+                        uploadFile.error = lastError;
+                    }
+                }
+                if (lastError) {
+                    upload.error += "\n" + lastError;
+                }
             });
             tasks.push(uploadFile);
         }
@@ -231,6 +251,10 @@ class FileUploadWindow extends PopupWindow {
                             min={0}
                             max={1}
                             value={Bind.source(file, (x) => x.source.progress)}/>
+                        <div
+                            data-element="error"
+                            data-color="red"
+                            text={Bind.source(file, (x) => x.source.error)}/>
                     </div>}
                 />
         </div>);