Improve error message when requests to server fail (#556)

mtlynch · Feb 18, 2024 · 0da27ae · 0da27ae
1 parent 0f8dabd
commit 0da27ae
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/handlers/static/js/controllers/files.js b/handlers/static/js/controllers/files.js
@@ -22,7 +22,10 @@ function uploadFormData(url, formData, progressFn) {
       }
     });
     xhr.addEventListener("error", () => {
-      reject("Failed to communicate with server: " + xhr.statusText);
+      reject(
+        "Failed to communicate with server" +
+          (xhr.statusText ? `: ${xhr.statusText}` : ".")
+      );
     });
     xhr.send(formData);
   })
@@ -80,7 +83,8 @@ export async function editFile(id, filename, expiration, note) {
     .catch((error) => {
       if (error.message) {
         return Promise.reject(
-          "Failed to communicate with server: " + error.message
+          "Failed to communicate with server" +
+            (error.message ? `: ${error.message}` : ".")
         );
       }
       return Promise.reject(error);
@@ -103,7 +107,8 @@ export async function deleteFile(id) {
     .catch((error) => {
       if (error.message) {
         return Promise.reject(
-          "Failed to communicate with server: " + error.message
+          "Failed to communicate with server" +
+            (error.message ? `: ${error.message}` : ".")
         );
       }
       return Promise.reject(error);

diff --git a/handlers/static/js/controllers/guestLinks.js b/handlers/static/js/controllers/guestLinks.js
@@ -27,7 +27,8 @@ export async function guestLinkNew(
     .catch((error) => {
       if (error.message) {
         return Promise.reject(
-          "Failed to communicate with server: " + error.message
+          "Failed to communicate with server" +
+            (error.message ? `: ${error.message}` : ".")
         );
       }
       return Promise.reject(error);
@@ -50,7 +51,8 @@ export async function guestLinkDelete(id) {
     .catch((error) => {
       if (error.message) {
         return Promise.reject(
-          "Failed to communicate with server: " + error.message
+          "Failed to communicate with server" +
+            (error.message ? `: ${error.message}` : ".")
         );
       }
       return Promise.reject(error);

diff --git a/handlers/static/js/controllers/settings.js b/handlers/static/js/controllers/settings.js
@@ -17,7 +17,8 @@ export async function settingsPut(settings) {
     .catch((error) => {
       if (error.message) {
         return Promise.reject(
-          "Failed to communicate with server: " + error.message
+          "Failed to communicate with server" +
+            (error.message ? `: ${error.message}` : ".")
         );
       }
       return Promise.reject(error);