From f29344e91f6abdb7d30feac94d4388d3a3ef1e95 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Tue, 1 Jun 2021 23:34:16 +0200
Subject: [PATCH] web/admin: improve error handling for non-rest_framework
 errors

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 web/src/elements/forms/Form.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/web/src/elements/forms/Form.ts b/web/src/elements/forms/Form.ts
index d28dd5751..931978041 100644
--- a/web/src/elements/forms/Form.ts
+++ b/web/src/elements/forms/Form.ts
@@ -145,7 +145,10 @@ export class Form<T> extends LitElement {
                 })
             );
             return r;
-        }).catch((ex: Response) => {
+        }).catch((ex: Response | Error) => {
+            if (ex instanceof Error) {
+                throw ex;
+            }
             if (ex.status > 399 && ex.status < 500) {
                 return ex.json().then((errorMessage: ValidationError) => {
                     if (!errorMessage) return errorMessage;
@@ -169,6 +172,14 @@ export class Form<T> extends LitElement {
                 });
             }
             throw ex;
+        }).catch((ex: Error) => {
+            // error is local or not from rest_framework
+            showMessage({
+                message: ex.toString(),
+                level: MessageLevel.error,
+            });
+            // rethrow the error so the form doesn't close
+            throw ex;
         });
     }