chore: handle 5xx errors with special message as well

jamiebrynes7 · Jan 3, 2025 · 65cbed6 · 65cbed6
1 parent 82dca5b
commit 65cbed6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/plugin/src/data/index.ts b/plugin/src/data/index.ts
@@ -12,7 +12,8 @@ export enum QueryErrorKind {
   BadRequest = 0,
   Unauthorized = 1,
   Forbidden = 2,
-  Unknown = 3,
+  ServerError = 3,
+  Unknown = 4,
 }
 
 export type SubscriptionResult =
@@ -225,16 +226,14 @@ class Subscription {
         kind: QueryErrorKind.Unknown,
       };
       if (error instanceof TodoistApiError) {
-        switch (error.statusCode) {
-          case 400:
-            result.kind = QueryErrorKind.BadRequest;
-            break;
-          case 401:
-            result.kind = QueryErrorKind.Unauthorized;
-            break;
-          case 403:
-            result.kind = QueryErrorKind.Forbidden;
-            break;
+        if (error.statusCode === 400) {
+          result.kind = QueryErrorKind.BadRequest;
+        } else if (error.statusCode === 401) {
+          result.kind = QueryErrorKind.Unauthorized;
+        } else if (error.statusCode === 403) {
+          result.kind = QueryErrorKind.Forbidden;
+        } else if (error.statusCode > 500) {
+          result.kind = QueryErrorKind.ServerError;
         }
       }
 

diff --git a/plugin/src/i18n/langs/en.ts b/plugin/src/i18n/langs/en.ts
@@ -155,6 +155,8 @@ export const en: Translations = {
           "The Todoist API has rejected the request. Please check the filter to ensure it is valid.",
         unauthorized:
           "The Todoist API request is missing or has the incorrect credentials. Please check the API token in the settings.",
+        serverError:
+          "The Todoist API has returned an error. Please check Todoist's status page: https://status.todoist.net/ and try again later.",
         unknown:
           "Unknown error occurred. Please check the Console in the Developer Tools window for more information",
       },

diff --git a/plugin/src/i18n/translation.ts b/plugin/src/i18n/translation.ts
@@ -145,6 +145,7 @@ export type Translations = {
         header: string;
         badRequest: string;
         unauthorized: string;
+        serverError: string;
         unknown: string;
       };
       parsingError: {

diff --git a/plugin/src/ui/query/displays/ErrorDisplay.tsx b/plugin/src/ui/query/displays/ErrorDisplay.tsx
@@ -12,7 +12,10 @@ const getErrorMessage = (
     case QueryErrorKind.BadRequest:
       return i18n.badRequest;
     case QueryErrorKind.Unauthorized:
+    case QueryErrorKind.Forbidden:
       return i18n.unauthorized;
+    case QueryErrorKind.ServerError:
+      return i18n.serverError;
     default:
       return i18n.unknown;
   }