fix: display proper messages and remove uneeded toasts

khaledsAlshibani · khaledsAlshibani · commit cc022ff3dc70 · 2025-05-11T18:00:16.000+03:00
diff --git a/src/app/(app)/categories/[categoryId]/page.tsx b/src/app/(app)/categories/[categoryId]/page.tsx
@@ -10,6 +10,7 @@ import { fetchThreads } from '@/services/thread/threadService';
 import { Hash } from 'lucide-react';
 import { fetchCategories } from '@/services/thread/categoryService';
 import { useAuthLoading } from '@/hooks';
+import RetryAgain from '@/components/OnlyApp/RetryAgain';
 
 export default function CategoryDiscussionsPage() {
   const { isAuthLoadingOrRedirecting } = useAuthLoading();
@@ -67,7 +68,7 @@ export default function CategoryDiscussionsPage() {
   }
 
   if (error) {
-    return <ErrorAlert message={error} />;
+    return <RetryAgainerror={error} handleRetry={() => window.location.reload()} />;
   }
 
   return (
diff --git a/src/app/(app)/discussions/new/page.tsx b/src/app/(app)/discussions/new/page.tsx
@@ -139,7 +139,7 @@ export default function NewDiscussionPage() {
 
   if (error && !isSubmitting) {
     return (
-      <RetryAgain 
+      <RetryAgain
       error={error}
         handleRetry={() => window.location.reload()}
       />
diff --git a/src/app/(app)/profile-settings/page.tsx b/src/app/(app)/profile-settings/page.tsx
@@ -19,6 +19,7 @@ import { AuthMethod } from '@/utils/api/signup/validateSignupForm';
 import Image from 'next/image';
 import { useAuth, useAuthRedirect } from '@/hooks';
 import { isSuperAdminByRole } from '@/utils/role';
+import RetryAgain from '@/components/OnlyApp/RetryAgain';
 
 export default function ProfilePage() {
   const router = useRouter();
@@ -54,11 +55,9 @@ export default function ProfilePage() {
           });
         } else {
           setError(result.error?.message || RESPONSE_MESSAGES.profile.DEFAULT);
-          toast.error(result.error?.message || RESPONSE_MESSAGES.profile.DEFAULT);
         }
       } catch {
         setError(RESPONSE_MESSAGES.profile.DEFAULT);
-        toast.error(RESPONSE_MESSAGES.profile.DEFAULT);
       } finally {
         setIsLoadingProfile(false);
       }
@@ -85,7 +84,6 @@ export default function ProfilePage() {
       const validationErrors = validateProfileForm(formData);
       if (Object.keys(validationErrors).length > 0) {
         setError(Object.values(validationErrors)[0]);
-        toast.error(Object.values(validationErrors)[0]);
         setIsSubmitting(false);
         return;
       }
@@ -200,19 +198,13 @@ export default function ProfilePage() {
 
   if (error && !isSubmitting) {
     return (
-      <div className="space-y-4">
-        <ErrorAlert message={error} />
-        <Button
-          onClick={() => {
-            window.location.reload();
-            router.refresh();
-          }}
-          variant="outline"
-          color="secondary"
-        >
-          تحديث حالة الحساب
-        </Button>
-      </div>
+      <RetryAgain
+        error={error} 
+        handleRetry={() => {
+          window.location.reload();
+          router.refresh();
+        }} 
+      />
     );
   }
 
diff --git a/src/components/AdminsListing.tsx b/src/components/AdminsListing.tsx
@@ -3,7 +3,6 @@
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import LoadingSpinner from "@/components/LoadingSpinner";
-import ErrorAlert from "./Form/ErrorAlert";
 import Button from "./Button";
 import SearchField from "./OnlyApp/SearchField";
 import Divider from "./Divider";
@@ -14,6 +13,7 @@ import { Admin } from "@/types";
 import { adminService } from "@/services/admin/adminService";
 import RESPONSE_MESSAGES from "@/utils/constants/RESPONSE_MESSAGES";
 import ItemNotFound from '@/components/OnlyApp/NotFound/ItemNotFound';
+import RetryAgain from "./OnlyApp/RetryAgain";
 
 export default function AdminsListing() {
   const [isLoading, setIsLoading] = useState(true);
@@ -92,17 +92,10 @@ export default function AdminsListing() {
 
   if (error) {
     return (
-      <div className="space-y-4">
-        <ErrorAlert message={error} />
-        <Button
-          onClick={handleRetry}
-          variant="outline"
-          icon={<RefreshCw className="w-4" />}
-          color="secondary"
-        >
-          إعادة المحاولة
-        </Button>
-      </div>
+      <RetryAgain
+        error={error} 
+        handleRetry={handleRetry}
+      />
     );
   }
 
diff --git a/src/components/OnlyApp/CategoriesListing.tsx b/src/components/OnlyApp/CategoriesListing.tsx
@@ -9,8 +9,9 @@ import Input from "../Input";
 import { updateCategory, deleteCategory } from "@/services/admin/categoryService";
 import { toast } from "react-hot-toast";
 import ConfirmModal from "../Modal/ConfirmModal";
-import ErrorAlert from "../Form/ErrorAlert";
 import Link from 'next/link';
+import RetryAgain from "./RetryAgain";
+import ItemNotFound from "./NotFound/ItemNotFound";
 
 interface CategoriesListingProps {
   allowManagement?: boolean;
@@ -20,6 +21,7 @@ interface CategoriesListingProps {
   maxChars?: number;
   error?: string;
 }
+
 function CategoriesListing({ 
   allowManagement = false,
   categories,
@@ -99,9 +101,9 @@ function CategoriesListing({
           <LoadingSpinner size="sm" color="primary" />
         </div>
       ) : error ? (
-        error && <ErrorAlert message={error} />
+        <RetryAgain error={error} handleRetry={() => window.location.reload()} />
       ) : categories.length === 0 ? (
-        <p className="text-sm text-gray-500 px-3 py-2">لا توجد تصنيفات متاحة</p>
+        <ItemNotFound description="لا توجد تصنيفات متاحة" />
       ) : (
         categories.map((category) => (
           <div
diff --git a/src/components/OnlyApp/ThreadListing/ThreadListing.tsx b/src/components/OnlyApp/ThreadListing/ThreadListing.tsx
@@ -5,14 +5,12 @@ import ThreadListingHeader from "./ThreadListingHeader";
 import { useState, useEffect, useCallback } from "react";
 import toast from "react-hot-toast";
 import { Thread } from "@/types";
-import ErrorAlert from "@/components/Form/ErrorAlert";
-import { RefreshCw } from "lucide-react";
 import LoadingSpinner from "@/components/LoadingSpinner";
-import Button from "@/components/Button";
 import { useInfiniteScroll } from "@/hooks";
 import { deleteThread, fetchThreads } from "@/services/thread/threadService";
 import { userService } from "@/services/userService";
 import { ApiSuccess } from "@/types";
+import RetryAgain from "../RetryAgain";
 
 interface ThreadListingProps {
   emptyMessage?: string;
@@ -81,7 +79,6 @@ const ThreadListing = ({
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : 'حدث خطأ أثناء تحميل المناقشات';
       setError(errorMessage);
-      toast.error(errorMessage);
     } finally {
       if (isInitialLoad) {
         setIsLoading(false);
@@ -135,7 +132,6 @@ const ThreadListing = ({
       setPage((prev) => prev + 1);
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : 'حدث خطأ أثناء تحميل المزيد من المناقشات';
-      toast.error(errorMessage);
     } finally {
       setIsFetchingMore(false);
     }
@@ -184,17 +180,10 @@ const ThreadListing = ({
 
   if (error) {
     return (
-      <div className="space-y-4">
-        <ErrorAlert message={error} />
-        <Button
-          onClick={handleRetry}
-          variant="outline"
-          icon={<RefreshCw className="w-4" />}
-          color="secondary"
-        >
-          إعادة المحاولة
-        </Button>
-      </div>
+      <RetryAgain
+        error={error}
+        handleRetry={handleRetry}
+      />
     );
   }
 
diff --git a/src/components/OnlyApp/pages/DiscussionPageContent.tsx b/src/components/OnlyApp/pages/DiscussionPageContent.tsx
@@ -8,15 +8,15 @@ import Button from "@/components/Button";
 import { useState, ChangeEvent, useEffect, useCallback } from "react";
 import { Thread } from "@/types";
 import { toast } from "react-hot-toast";
-import ErrorAlert from "@/components/Form/ErrorAlert";
 import LoadingSpinner from "@/components/LoadingSpinner";
 import CommentListing from "@/components/OnlyApp/Comment/CommentListing";
-import { RefreshCw } from "lucide-react";
 import RESPONSE_MESSAGES from "@/utils/constants/RESPONSE_MESSAGES";
 import ItemNotFound from "../NotFound/ItemNotFound";
 import { useAuth, useInfiniteScroll } from "@/hooks";
 import { deleteThread, fetchThreadById, fetchThreads } from "@/services/thread/threadService";
 import { createComment } from "@/services/thread/commentService";
+import { logger } from "@/utils/logger";
+import RetryAgain from "../RetryAgain";
 
 function DiscussionPageContent({ discussionId }: { discussionId: string }) {
   const router = useRouter();
@@ -52,12 +52,10 @@ function DiscussionPageContent({ discussionId }: { discussionId: string }) {
         setThread(threadData);
       } else {
         setError(threadResult.error.message || 'حدث خطأ أثناء تحميل المناقشة');
-        toast.error(threadResult.error.message || 'حدث خطأ أثناء تحميل المناقشة');
       }
     } catch {
       const errorMessage = 'حدث خطأ أثناء تحميل المناقشة';
       setError(errorMessage);
-      toast.error(errorMessage);
     } finally {
       setIsLoading(false);
     }
@@ -82,7 +80,7 @@ function DiscussionPageContent({ discussionId }: { discussionId: string }) {
         setPage(2);
       }
     } catch {
-      toast.error("حدث خطأ أثناء تحميل المناقشات المشابهة");
+      logger().error("حدث خطأ أثناء تحميل المناقشات المشابهة");
     } finally {
       setIsLoadingSimilar(false);
     }
@@ -107,7 +105,6 @@ function DiscussionPageContent({ discussionId }: { discussionId: string }) {
       }
     } catch (err) {
       console.error("Error loading more threads:", err);
-      toast.error("حدث خطأ أثناء تحميل المزيد من المناقشات");
     } finally {
       setIsLoadingSimilar(false);
     }
@@ -194,9 +191,7 @@ function DiscussionPageContent({ discussionId }: { discussionId: string }) {
     const result = await fetchThreadById(thread.thread_id);
     if (result.success) {
       setThread(result.data);
-    } else {
-      toast.error(result.error.message || RESPONSE_MESSAGES.thread.DEFAULT);
-    }    
+    }   
   };
 
   useEffect(() => {
@@ -215,17 +210,10 @@ function DiscussionPageContent({ discussionId }: { discussionId: string }) {
 
   if (error) {
     return (
-      <div className="space-y-4">
-        <ErrorAlert message={error} />
-        <Button
-          onClick={loadThread}
-          variant="outline"
-          icon={<RefreshCw className="w-4" />}
-          color="secondary"
-        >
-          إعادة المحاولة
-        </Button>
-      </div>
+      <RetryAgain
+        error={error} 
+        handleRetry={loadThread}
+      />
     );
   }
 
diff --git a/src/components/StudentsListing.tsx b/src/components/StudentsListing.tsx
@@ -3,16 +3,16 @@
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import LoadingSpinner from "@/components/LoadingSpinner";
-import ErrorAlert from "./Form/ErrorAlert";
 import Button from "./Button";
 import SearchField from "./OnlyApp/SearchField";
 import Select from "./Select";
 import Divider from "./Divider";
 import UsersBadge from "./OnlyApp/Badge/UsersBadge";
 import UserCardItem from "./OnlyApp/UserCardItem";
-import { ArrowUpDown, RefreshCw } from "lucide-react";
+import { ArrowUpDown } from "lucide-react";
 import { Student, ApprovalStatus } from "@/types";
 import { fetchStudents, approveStudent, rejectStudent } from "@/services/admin/studentService";
+import RetryAgain from "./OnlyApp/RetryAgain";
 
 const StudentsListing = () => {
   const [isLoading, setIsLoading] = useState(true);
@@ -46,7 +46,6 @@ const StudentsListing = () => {
 
       const errorMessage = err instanceof Error ? err.message : 'حدث خطأ أثناء تحميل الطلاب';
       setError(`${errorMessage}. يرجى المحاولة مرة أخرى.`);
-      toast.error(errorMessage);
     } finally {
       setIsLoading(false);
       setIsFiltering(false);
@@ -188,15 +187,10 @@ const StudentsListing = () => {
 
       {error ? (
         <div className="space-y-4">
-          <ErrorAlert message={error} />
-          <Button
-            onClick={handleRetry}
-            variant="outline"
-            icon={<RefreshCw className="w-4" />}
-            color="secondary"
-          >
-            إعادة المحاولة
-          </Button>
+          <RetryAgain
+            error={error} 
+            handleRetry={handleRetry}
+          />
         </div>
       ) : isLoading || isFiltering ? (
         <div className="min-h-[200px] flex items-center justify-center">

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import { fetchThreads } from '@/services/thread/threadService';`
`10`	`10`	`import { Hash } from 'lucide-react';`
`11`	`11`	`import { fetchCategories } from '@/services/thread/categoryService';`
`12`	`12`	`import { useAuthLoading } from '@/hooks';`
	`13`	`+import RetryAgain from '@/components/OnlyApp/RetryAgain';`
`13`	`14`
`14`	`15`	`export default function CategoryDiscussionsPage() {`
`15`	`16`	`const { isAuthLoadingOrRedirecting } = useAuthLoading();`
`@@ -67,7 +68,7 @@ export default function CategoryDiscussionsPage() {`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`if (error) {`
`70`		`- return <ErrorAlert message={error} />;`
	`71`	`+ return <RetryAgainerror={error} handleRetry={() => window.location.reload()} />;`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`return (`