Merge pull request #119 from PranavBhatP/fix-issue-45

Fix issue #45 - Enhance error toast messages
This commit is contained in:
Mohamed Marrouchi 2024-10-02 16:37:59 +01:00 committed by GitHub
commit 90b06c448a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 53 additions and 42 deletions

View File

@ -34,8 +34,8 @@ export const CategoryDialog: FC<CategoryDialogProps> = ({
const { t } = useTranslate(); const { t } = useTranslate();
const { toast } = useToast(); const { toast } = useToast();
const { mutateAsync: createCategory } = useCreate(EntityType.CATEGORY, { const { mutateAsync: createCategory } = useCreate(EntityType.CATEGORY, {
onError: () => { onError: (error) => {
toast.error(t("message.internal_server_error")); toast.error(error);
}, },
onSuccess: () => { onSuccess: () => {
closeDialog(); closeDialog();

View File

@ -49,8 +49,8 @@ export const ContentTypeDialog: FC<ContentTypeDialogProps> = ({
const { mutateAsync: createContentType } = useCreate( const { mutateAsync: createContentType } = useCreate(
EntityType.CONTENT_TYPE, EntityType.CONTENT_TYPE,
{ {
onError: () => { onError: (error) => {
toast.error(t("message.internal_server_error")); toast.error(error);
}, },
onSuccess: () => { onSuccess: () => {
closeDialog(); closeDialog();

View File

@ -178,8 +178,8 @@ export const ContentDialog: FC<ContentDialogProps> = ({
createContent( createContent(
{ ...params, entity: contentType.id }, { ...params, entity: contentType.id },
{ {
onError: () => { onError: (error) => {
toast.error(t("message.internal_server_error")); toast.error(error);
}, },
onSuccess: () => { onSuccess: () => {
closeDialog(); closeDialog();

View File

@ -41,8 +41,8 @@ export const ContextVarDialog: FC<ContextVarDialogProps> = ({
const { t } = useTranslate(); const { t } = useTranslate();
const { toast } = useToast(); const { toast } = useToast();
const { mutateAsync: createContextVar } = useCreate(EntityType.CONTEXT_VAR, { const { mutateAsync: createContextVar } = useCreate(EntityType.CONTEXT_VAR, {
onError: () => { onError: (error) => {
toast.error(t("message.internal_server_error")); toast.error(error);
}, },
onSuccess() { onSuccess() {
closeDialog(); closeDialog();

View File

@ -33,8 +33,8 @@ export const RoleDialog: FC<RoleDialogProps> = ({
const { t } = useTranslate(); const { t } = useTranslate();
const { toast } = useToast(); const { toast } = useToast();
const { mutateAsync: createRole } = useCreate(EntityType.ROLE, { const { mutateAsync: createRole } = useCreate(EntityType.ROLE, {
onError: () => { onError: (error) => {
toast.error(t("message.internal_server_error")); toast.error(error);
}, },
onSuccess() { onSuccess() {
closeDialog(); closeDialog();

View File

@ -27,7 +27,6 @@ import { useHasPermission } from "@/hooks/useHasPermission";
import { useSearch } from "@/hooks/useSearch"; import { useSearch } from "@/hooks/useSearch";
import { useToast } from "@/hooks/useToast"; import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate"; import { useTranslate } from "@/hooks/useTranslate";
import { TTranslationKeys } from "@/i18n/i18n.types";
import { PageHeader } from "@/layout/content/PageHeader"; import { PageHeader } from "@/layout/content/PageHeader";
import { EntityType } from "@/services/types"; import { EntityType } from "@/services/types";
import { PermissionAction } from "@/types/permission.types"; import { PermissionAction } from "@/types/permission.types";
@ -58,12 +57,7 @@ export const Roles = () => {
); );
const { mutateAsync: deleteRole } = useDelete(EntityType.ROLE, { const { mutateAsync: deleteRole } = useDelete(EntityType.ROLE, {
onError: (error) => { onError: (error) => {
toast.error( toast.error(error);
t(
(error.message as TTranslationKeys) ||
"message.internal_server_error",
),
);
}, },
onSuccess() { onSuccess() {
deleteDialogCtl.closeDialog(); deleteDialogCtl.closeDialog();

View File

@ -55,8 +55,8 @@ export const Translations = () => {
}, },
); );
const { mutateAsync: deleteTranslation } = useDelete(EntityType.TRANSLATION, { const { mutateAsync: deleteTranslation } = useDelete(EntityType.TRANSLATION, {
onError: () => { onError: (error) => {
toast.error(t("message.internal_server_error")); toast.error(error);
}, },
onSuccess() { onSuccess() {
deleteDialogCtl.closeDialog(); deleteDialogCtl.closeDialog();

View File

@ -5,13 +5,14 @@
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file). * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/ */
import { import {
OptionsObject, OptionsObject,
enqueueSnackbar, enqueueSnackbar,
SnackbarProvider as ToastProvider, SnackbarProvider as ToastProvider,
} from "notistack"; } from "notistack";
import { useTranslation } from "react-i18next";
export { ToastProvider }; export { ToastProvider };
const TOAST_COMMON_STYLE = { const TOAST_COMMON_STYLE = {
@ -38,25 +39,39 @@ const TOAST_WARNING_STYLE = {
backgroundColor: "#fdf6ec", backgroundColor: "#fdf6ec",
}; };
export const useToast = () => ({ export const useToast = () => {
toast: { const { t } = useTranslation();
error: (message: string, options?: OptionsObject<"error">) =>
enqueueSnackbar(message, { const extractErrorMessage = (error: any) => {
variant: "error", if (error?.statusCode == 409) {
...options, return t("message.duplicate_error");
style: { ...TOAST_ERROR_STYLE, ...options?.style }, }
}),
success: (message: string, options?: OptionsObject<"success">) => return error?.message || t("message.internal_server_error");
enqueueSnackbar(message, { };
variant: "success",
...options, return {
style: { ...TOAST_SUCCESS_STYLE, ...options?.style }, toast: {
}), error: (error: any, options?: OptionsObject<"error">) => {
warning: (message: string, options?: OptionsObject<"warning">) => const errorMessage = extractErrorMessage(error);
enqueueSnackbar(message, { enqueueSnackbar(errorMessage, {
variant: "warning", variant: "error",
...options, ...options,
style: { ...TOAST_WARNING_STYLE, ...options?.style }, style: { ...TOAST_ERROR_STYLE, ...options?.style },
}), });
}, },
}); success: (message: string, options?: OptionsObject<"success">) =>
enqueueSnackbar(message, {
variant: "success",
...options,
style: { ...TOAST_SUCCESS_STYLE, ...options?.style },
}),
warning: (message: string, options?: OptionsObject<"warning">) =>
enqueueSnackbar(message, {
variant: "warning",
...options,
style: { ...TOAST_WARNING_STYLE, ...options?.style },
}),
},
};
};

View File

@ -1,5 +1,6 @@
{ {
"message": { "message": {
"duplicate_error": "Duplicate entry. Please choose a unique value.",
"bad_request": "400 BAD REQUEST", "bad_request": "400 BAD REQUEST",
"unable_to_process_request": "Unable to process request", "unable_to_process_request": "Unable to process request",
"not_found": "404 NOT FOUND", "not_found": "404 NOT FOUND",

View File

@ -1,5 +1,6 @@
{ {
"message": { "message": {
"duplicate_error" : "Entrée en double. Veuillez choisir une valeur unique.",
"bad_request": "400 MAUVAISE REQUÊTE", "bad_request": "400 MAUVAISE REQUÊTE",
"unable_to_process_request": "Impossible de traiter la requête", "unable_to_process_request": "Impossible de traiter la requête",
"not_found": "404 RESSOURCE INTROUVABLE", "not_found": "404 RESSOURCE INTROUVABLE",