Merge pull request #1885 from DISSINET/1879-add-new-connection-to-ser…

…ver-lost-error-toast 1879 add new connection to server lost error toast
DISSINET · Nov 3, 2023 · f4d422b · f4d422b
2 parents 1d728df + d9812b8
commit f4d422b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/client/src/api.tsx b/packages/client/src/api.tsx
@@ -183,7 +183,9 @@ class Api {
       message: "",
     };
 
-    if (responseData && typeof responseData === "object") {
+    if (responseData instanceof AxiosError && (responseData as AxiosError).code === AxiosError.ERR_NETWORK) {
+      out.error = errors.NetworkError.name
+    } else if (responseData && (responseData as any).response && (responseData as any).response.data) {
       out.error = (responseData as Record<string, string>).error;
       out.message = (responseData as Record<string, string>).message;
     }
@@ -193,7 +195,7 @@ class Api {
 
   showErrorToast(err: any) {
     const hydratedError = errors.getErrorByCode(
-      this.responseToError(err.response?.data)
+      this.responseToError(err)
     );
 
     toast.error(

diff --git a/packages/shared/types/errors.ts b/packages/shared/types/errors.ts
@@ -335,6 +335,12 @@ class UnknownError extends CustomError {
   public static message = "Mysterious";
 }
 
+class NetworkError extends CustomError {
+  public static code = 500;
+  public static title = "Connection to server lost";
+  public static message = "Please check your network connection. Otherwise contact the administrator.";
+}
+
 const allErrors: Record<string, any> = {
   InvalidDeleteError,
   UnauthorizedError,
@@ -359,6 +365,7 @@ const allErrors: Record<string, any> = {
   EmailError,
   RelationDoesNotExist,
   DocumentDoesNotExist,
+  NetworkError,
 };
 
 export interface IErrorSignature {
@@ -369,7 +376,7 @@ export interface IErrorSignature {
 export function getErrorByCode(errSig: IErrorSignature): CustomError {
   return allErrors[errSig.error]
     ? new allErrors[errSig.error](errSig.message)
-    : new UnknownError(errSig.message || "Something bad happened");
+    : new UnknownError(errSig.message || "Unknown error occured")
 }
 
 export {
@@ -396,4 +403,5 @@ export {
   EmailError,
   RelationDoesNotExist,
   DocumentDoesNotExist,
+  NetworkError
 };