From 23099cff00b2bc3343cc7e83c4920d465f08b985 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Wed, 21 Sep 2022 20:42:04 -0400
Subject: added error message for file upload errors before parsing.

---
 src/client/documents/Documents.ts       |  2 +-
 src/server/ApiManagers/UploadManager.ts | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 4f652b6e4..029c3033d 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -1864,7 +1864,7 @@ export namespace DocUtils {
             const {
                 source: { name, type },
                 result,
-            } = upfiles.lastElement();
+            } = upfiles.lastElement() ?? { source: { name: '', type: '' }, result: { message: 'upload failed' } };
             if ((result as any).message) {
                 if (overwriteDoc) {
                     overwriteDoc.isLoading = false;
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 0b6e18743..5077bced2 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -60,6 +60,18 @@ export default class UploadManager extends ApiManager {
                 return new Promise<void>(resolve => {
                     form.parse(req, async (_err, _fields, files) => {
                         const results: Upload.FileResponse[] = [];
+                        if (_err.message) {
+                            results.push({
+                                source: {
+                                    size: 0,
+                                    path: 'none',
+                                    name: 'none',
+                                    type: 'none',
+                                    toJSON: () => ({ name: 'none', path: '' }),
+                                },
+                                result: { name: 'failed upload', message: `${_err.message}` },
+                            });
+                        }
                         for (const key in files) {
                             const f = files[key];
                             if (!Array.isArray(f)) {
-- 
cgit v1.2.3-70-g09d2