Refactor error handling utilities
- Replace `showError` with a more versatile `showToast` utility. - Add specific toast functions (`showErrorToast`, `showSuccessToast`, etc.) for better message handling. - Remove `showError.ts` and migrate logic to `showToast.ts` for cleaner structure. - Update `ErrorBoundary` and `useErrorHandler` to use the new `showToast` functions.
This commit is contained in:
@@ -25,6 +25,7 @@ import {NewCustomerModal} from "@/components/customers/modal/NewCustomerModal";
|
|||||||
import {Customer} from "@/services/customers/entities/customer";
|
import {Customer} from "@/services/customers/entities/customer";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import {useErrorHandler} from "@/components/error-boundary";
|
import {useErrorHandler} from "@/components/error-boundary";
|
||||||
|
import {showError, showInfoToast} from "@/lib/ui/showToast";
|
||||||
|
|
||||||
export default function CustomersPage() {
|
export default function CustomersPage() {
|
||||||
const [customers, setCustomers] = useState<Customer[]>([]);
|
const [customers, setCustomers] = useState<Customer[]>([]);
|
||||||
@@ -39,14 +40,17 @@ export default function CustomersPage() {
|
|||||||
fetch('/api/customers')
|
fetch('/api/customers')
|
||||||
.then(async (response) => {
|
.then(async (response) => {
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
|
showError("Failed to fetch customers data")
|
||||||
throw new Error(`Failed to fetch customers: ${response.statusText}`);
|
throw new Error(`Failed to fetch customers: ${response.statusText}`);
|
||||||
}
|
}
|
||||||
return response.json();
|
return response.json();
|
||||||
})
|
})
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
|
showInfoToast("Customers data loaded")
|
||||||
setCustomers(data);
|
setCustomers(data);
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
|
showError("Failed to fetch customers data (1)")
|
||||||
handleError(error);
|
handleError(error);
|
||||||
setCustomers([]);
|
setCustomers([]);
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { showError } from "@/lib/ui/showError";
|
|
||||||
import {Button} from "@/components/ui/button";
|
import {Button} from "@/components/ui/button";
|
||||||
import {
|
import {
|
||||||
Dialog,
|
Dialog,
|
||||||
@@ -50,9 +49,6 @@ export class ErrorBoundary extends React.Component<
|
|||||||
error,
|
error,
|
||||||
errorInfo,
|
errorInfo,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Show error toast
|
|
||||||
showError(error);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
handleReset = () => {
|
handleReset = () => {
|
||||||
@@ -96,7 +92,8 @@ interface ErrorDialogProps {
|
|||||||
|
|
||||||
function ErrorDialog({error, onReset, open}: ErrorDialogProps) {
|
function ErrorDialog({error, onReset, open}: ErrorDialogProps) {
|
||||||
return (
|
return (
|
||||||
<Dialog open={open} onOpenChange={() => {}}>
|
<Dialog open={open} onOpenChange={() => {
|
||||||
|
}}>
|
||||||
<DialogContent className="sm:max-w-md">
|
<DialogContent className="sm:max-w-md">
|
||||||
<DialogHeader>
|
<DialogHeader>
|
||||||
<DialogTitle>Ein Fehler ist aufgetreten</DialogTitle>
|
<DialogTitle>Ein Fehler ist aufgetreten</DialogTitle>
|
||||||
@@ -128,10 +125,7 @@ function ErrorDialog({ error, onReset, open }: ErrorDialogProps) {
|
|||||||
|
|
||||||
// Hook for handling async errors
|
// Hook for handling async errors
|
||||||
export function useErrorHandler() {
|
export function useErrorHandler() {
|
||||||
const handleError = React.useCallback((error: unknown) => {
|
return React.useCallback((error: unknown) => {
|
||||||
console.error("Async error caught:", error);
|
console.error("Async error caught:", error);
|
||||||
showError(error);
|
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return handleError;
|
|
||||||
}
|
}
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
// lib/ui/showError.ts
|
|
||||||
import {toast} from "sonner";
|
|
||||||
|
|
||||||
export function showError(error: unknown, fallback = "Ein unbekannter Fehler ist aufgetreten") {
|
|
||||||
let message: string;
|
|
||||||
|
|
||||||
if (error instanceof Error) {
|
|
||||||
message = error.message;
|
|
||||||
} else if (typeof error === "string") {
|
|
||||||
message = error;
|
|
||||||
} else {
|
|
||||||
message = fallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
toast.error(message);
|
|
||||||
}
|
|
||||||
71
internal_frontend/lib/ui/showToast.ts
Normal file
71
internal_frontend/lib/ui/showToast.ts
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
// lib/ui/showToast.ts
|
||||||
|
import { toast } from "sonner";
|
||||||
|
|
||||||
|
// Generic toast function
|
||||||
|
export function showToast(message: string, type: 'success' | 'error' | 'info' | 'warning' = 'info') {
|
||||||
|
const options = {
|
||||||
|
dismissible: true,
|
||||||
|
closeButton: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
switch (type) {
|
||||||
|
case 'success':
|
||||||
|
toast.success(message, options);
|
||||||
|
break;
|
||||||
|
case 'error':
|
||||||
|
toast.error(message, options);
|
||||||
|
break;
|
||||||
|
case 'info':
|
||||||
|
toast.info(message, options);
|
||||||
|
break;
|
||||||
|
case 'warning':
|
||||||
|
toast.warning(message, options);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
toast(message, options);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Specific toast functions with appropriate error handling
|
||||||
|
export function showErrorToast(error: unknown, fallback = "Ein unbekannter Fehler ist aufgetreten") {
|
||||||
|
let message: string;
|
||||||
|
|
||||||
|
if (error instanceof Error) {
|
||||||
|
message = error.message;
|
||||||
|
} else if (typeof error === "string") {
|
||||||
|
message = error;
|
||||||
|
} else {
|
||||||
|
message = fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
toast.error(message, {
|
||||||
|
dismissible: true,
|
||||||
|
closeButton: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function showSuccessToast(message: string) {
|
||||||
|
toast.success(message, {
|
||||||
|
dismissible: true,
|
||||||
|
closeButton: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function showInfoToast(message: string) {
|
||||||
|
toast.info(message, {
|
||||||
|
dismissible: true,
|
||||||
|
closeButton: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function showWarningToast(message: string) {
|
||||||
|
toast.warning(message, {
|
||||||
|
dismissible: true,
|
||||||
|
closeButton: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Backward compatibility - keep the original showError function
|
||||||
|
export function showError(error: unknown, fallback = "Ein unbekannter Fehler ist aufgetreten") {
|
||||||
|
showErrorToast(error, fallback);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user