#1285 refactor:API errors not localized

components/account/ManageSessions.tsx

@@ -9,6 +9,7 @@ import { Session } from '@prisma/client';
 import { WithLoadingAndError } from '@/components/shared';
 import ConfirmationDialog from '@/components/shared/ConfirmationDialog';
 import { Table } from '@/components/shared/table/Table';
+import { ApiResponse } from 'types';
 
 type NextAuthSession = Session & { isCurrent: boolean };
 
@@ -35,8 +36,8 @@ const ManageSessions = () => {
       });
 
       if (!response.ok) {
-        const json = await response.json();
-        throw new Error(json.error.message);
+        const json = (await response.json()) as ApiResponse;
+        toast.error(t(json?.error?.message || 'Something went wrong'));
       }
 
       toast.success(t('session-removed'));
@@ -45,7 +46,7 @@ const ManageSessions = () => {
         window.location.reload();
       }
     } catch (error: any) {
-      toast.error(error.message);
+      toast.error(t(error?.message));
     } finally {
       mutate();
       setSessionToDelete(null);

components/account/UpdateEmail.tsx

@@ -39,7 +39,7 @@ const UpdateEmail = ({ user, allowEmailChange }: UpdateEmailProps) => {
 
       if (!response.ok) {
         const json = (await response.json()) as ApiResponse;
-        toast.error(json.error.message);
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }
 

components/account/UpdateName.tsx

@@ -38,7 +38,7 @@ const UpdateName = ({ user }: { user: Partial<User> }) => {
 
       if (!response.ok) {
         const json = (await response.json()) as ApiResponse;
-        toast.error(json.error.message);
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }
 

components/account/UpdatePassword.tsx

@@ -32,10 +32,9 @@ const UpdatePassword = () => {
         body: JSON.stringify(values),
       });
 
-      const json = await response.json();
-
       if (!response.ok) {
-        toast.error(json.error.message);
+        const json = await response.json();
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }
 

components/account/UploadAvatar.tsx

@@ -44,12 +44,12 @@ const UploadAvatar = ({ user }: { user: Partial<User> }) => {
 
   const onAvatarUpload = (file: File) => {
     if (file.size / 1024 / 1024 > 2) {
-      toast.error('File size too big (max 2MB)');
+      toast.error(t('file-size-too-big'));
       return;
     }
 
     if (file.type !== 'image/png' && file.type !== 'image/jpeg') {
-      toast.error('File type not supported (.png or .jpg only)');
+      toast.error(t('file-type-not-supported'));
       return;
     }
 
@@ -76,7 +76,7 @@ const UploadAvatar = ({ user }: { user: Partial<User> }) => {
 
     if (!response.ok) {
       const json = (await response.json()) as ApiResponse;
-      toast.error(json.error.message);
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

components/apiKey/APIKeys.tsx

@@ -40,7 +40,7 @@ const APIKeys = ({ team }: APIKeysProps) => {
 
     if (!response.ok) {
       const { error } = (await response.json()) as ApiResponse;
-      toast.error(error.message);
+      toast.error(t(error?.message || 'Something went wrong'));
       return;
     }
 

components/apiKey/NewAPIKey.tsx

@@ -76,7 +76,7 @@ const CreateAPIKeyForm = ({
       }>;
 
       if (error) {
-        toast.error(error.message);
+        toast.error(t(error?.message || 'Something went wrong'));
         return;
       }
 

components/auth/Join.tsx

@@ -66,7 +66,7 @@ const Join = ({ recaptchaSiteKey }: JoinProps) => {
       recaptchaRef.current?.reset();
 
       if (!response.ok) {
-        toast.error(json.error.message);
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }
 

components/auth/JoinWithInvitation.tsx

@@ -80,12 +80,11 @@ const JoinWithInvitation = ({
         }),
       });
 
-      const json = (await response.json()) as ApiResponse;
-
       recaptchaRef.current?.reset();
 
       if (!response.ok) {
-        toast.error(json.error.message);
+        const json = (await response.json()) as ApiResponse;
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }
 

components/auth/ResetPassword.tsx

@@ -49,12 +49,11 @@ const ResetPassword = () => {
         }),
       });
 
-      const json = (await response.json()) as ApiResponse;
-
       setSubmitting(false);
 
       if (!response.ok) {
-        toast.error(json.error.message);
+        const json = (await response.json()) as ApiResponse;
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }
 

components/billing/LinkToPortal.tsx

@@ -32,7 +32,7 @@ const LinkToPortal = ({ team }: LinkToPortalProps) => {
     const result = (await response.json()) as ApiResponse<{ url: string }>;
 
     if (!response.ok) {
-      toast.error(result.error.message);
+      toast.error(t(result?.error?.message || 'Something went wrong'));
       return;
     }
 

components/invitation/AcceptInvitation.tsx

@@ -27,7 +27,7 @@ const AcceptInvitation = ({ invitation }: AcceptInvitationProps) => {
 
     if (!response.ok) {
       const result = (await response.json()) as ApiResponse;
-      toast.error(result.error.message);
+      toast.error(t(result?.error?.message || 'Something went wrong'));
       return;
     }
 

components/invitation/InviteViaEmail.tsx

@@ -45,7 +45,7 @@ const InviteViaEmail = ({ setVisible, team }: InviteViaEmailProps) => {
 
       if (!response.ok) {
         const result = (await response.json()) as ApiResponse;
-        toast.error(result.error.message);
+        toast.error(t(result?.error?.message || 'Something went wrong'));
         return;
       }
 

components/invitation/InviteViaLink.tsx

@@ -63,7 +63,7 @@ const InviteViaLink = ({ team }: InviteViaLinkProps) => {
 
       if (!response.ok) {
         const result = (await response.json()) as ApiResponse;
-        toast.error(result.error.message);
+        toast.error(t(result?.error?.message || 'Something went wrong'));
         return;
       }
 
@@ -85,7 +85,7 @@ const InviteViaLink = ({ team }: InviteViaLinkProps) => {
 
     if (!response.ok) {
       const result = (await response.json()) as ApiResponse;
-      toast.error(result.error.message);
+      toast.error(t(result?.error?.message || 'Something went wrong'));
       return;
     }
 

components/invitation/PendingInvitations.tsx

@@ -47,10 +47,9 @@ const PendingInvitations = ({ team }: { team: Team }) => {
       }
     );
 
-    const json = (await response.json()) as ApiResponse<unknown>;
-
     if (!response.ok) {
-      toast.error(json.error.message);
+      const json = (await response.json()) as ApiResponse<unknown>;
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

components/team/CreateTeam.tsx

@@ -39,7 +39,7 @@ const CreateTeam = ({ visible, setVisible }: CreateTeamProps) => {
       const json = (await response.json()) as ApiResponse<Team>;
 
       if (!response.ok) {
-        toast.error(json.error.message);
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }
 

components/team/Members.tsx

@@ -56,10 +56,9 @@ const Members = ({ team }: { team: Team }) => {
       }
     );
 
-    const json = (await response.json()) as ApiResponse;
-
     if (!response.ok) {
-      toast.error(json.error.message);
+      const json = (await response.json()) as ApiResponse;
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

components/team/RemoveTeam.tsx

@@ -33,7 +33,7 @@ const RemoveTeam = ({ team, allowDelete }: RemoveTeamProps) => {
 
     if (!response.ok) {
       const json = (await response.json()) as ApiResponse;
-      toast.error(json.error.message);
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

components/team/Teams.tsx

@@ -36,10 +36,9 @@ const Teams = () => {
       headers: defaultHeaders,
     });
 
-    const json = (await response.json()) as ApiResponse;
-
     if (!response.ok) {
-      toast.error(json.error.message);
+      const json = (await response.json()) as ApiResponse;
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

components/team/UpdateMemberRole.tsx

@@ -23,10 +23,9 @@ const UpdateMemberRole = ({ team, member }: UpdateMemberRoleProps) => {
       }),
     });
 
-    const json = (await response.json()) as ApiResponse;
-
     if (!response.ok) {
-      toast.error(json.error.message);
+      const json = (await response.json()) as ApiResponse;
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

components/webhook/CreateWebhook.tsx

@@ -32,10 +32,9 @@ const CreateWebhook = ({
       body: JSON.stringify(values),
     });
 
-    const json = (await response.json()) as ApiResponse<Team>;
-
     if (!response.ok) {
-      toast.error(json.error.message);
+      const json = (await response.json()) as ApiResponse<Team>;
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

components/webhook/EditWebhook.tsx

@@ -49,10 +49,9 @@ const EditWebhook = ({
       }
     );
 
-    const json = (await response.json()) as ApiResponse;
-
     if (!response.ok) {
-      toast.error(json.error.message);
+      const json = (await response.json()) as ApiResponse;
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

components/webhook/Webhooks.tsx

@@ -46,10 +46,9 @@ const Webhooks = ({ team }: { team: Team }) => {
       }
     );
 
-    const json = (await response.json()) as ApiResponse;
-
     if (!response.ok) {
-      toast.error(json.error.message);
+      const json = (await response.json()) as ApiResponse;
+      toast.error(t(json?.error?.message || 'Something went wrong'));
       return;
     }
 

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   db:
     image: postgres
-    restart: always
+    # restart: always
     environment:
       POSTGRES_PASSWORD: admin
       POSTGRES_USER: admin

lib/jackson/dsync/hosted.ts

@@ -4,6 +4,7 @@ import env from '@/lib/env';
 import { options } from '../config';
 import { ApiError } from '@/lib/errors';
 import type { JacksonDsync } from './utils';
+import type { ApiResponse } from 'types';
 
 export class JacksonHosted implements JacksonDsync {
   private dsyncUrl = `${env.jackson.url}/api/v1/dsync`;
@@ -30,7 +31,7 @@ export class JacksonHosted implements JacksonDsync {
       }),
     });
 
-    const { data, error } = await response.json();
+    const { data, error } = (await response.json()) as ApiResponse;
 
     if (!response.ok) {
       throw new ApiError(response.status, error.message);
@@ -49,7 +50,7 @@ export class JacksonHosted implements JacksonDsync {
       ...options,
     });
 
-    const { data, error } = await response.json();
+    const { data, error } = (await response.json()) as ApiResponse;
 
     if (!response.ok) {
       throw new ApiError(response.status, error.message);
@@ -65,7 +66,7 @@ export class JacksonHosted implements JacksonDsync {
       body: JSON.stringify(params),
     });
 
-    const { data, error } = await response.json();
+    const { data, error } = (await response.json()) as ApiResponse;
 
     if (!response.ok) {
       throw new ApiError(response.status, error.message);
@@ -80,7 +81,7 @@ export class JacksonHosted implements JacksonDsync {
       method: 'DELETE',
     });
 
-    const { data, error } = await response.json();
+    const { data, error } = (await response.json()) as ApiResponse;
 
     if (!response.ok) {
       throw new ApiError(response.status, error.message);
@@ -94,7 +95,7 @@ export class JacksonHosted implements JacksonDsync {
       ...options,
     });
 
-    const { data, error } = await response.json();
+    const { data, error } = (await response.json()) as ApiResponse;
 
     if (!response.ok) {
       throw new ApiError(response.status, error.message);

locales/en/common.json

@@ -246,5 +246,8 @@
   "internal-server-error": "Internal Server Error !",
   "unable-to-find": "We're unable to find out what's happening! We suggest you to",
   "try-again-later": "or visit here later.",
-  "multiple-sso-teams": "User belongs to multiple teams with SSO enabled. Please enter your team slug to get started."
+  "multiple-sso-teams": "User belongs to multiple teams with SSO enabled. Please enter your team slug to get started.",
+  "Something went wrong": "Something went wrong",
+  "file-size-too-big": "File size too big (max 2MB)",
+  "file-type-not-supported": "File type not supported (.png or .jpg only)"
 }

pages/auth/forgot-password.tsx

@@ -43,13 +43,12 @@ const ForgotPassword: NextPageWithLayout<
         }),
       });
 
-      const json = (await response.json()) as ApiResponse;
-
       formik.resetForm();
       recaptchaRef.current?.reset();
 
       if (!response.ok) {
-        toast.error(json.error.message);
+        const json = (await response.json()) as ApiResponse;
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }
 

pages/auth/resend-email-token.tsx

@@ -49,10 +49,9 @@ const VerifyAccount: NextPageWithLayout<
         body: JSON.stringify(values),
       });
 
-      const json = (await response.json()) as ApiResponse;
-
       if (!response.ok) {
-        toast.error(json.error.message);
+        const json = (await response.json()) as ApiResponse;
+        toast.error(t(json?.error?.message || 'Something went wrong'));
         return;
       }