Merge pull request #261 from map-of-pi/reviews-reload

Approved (1).

Author: swoocn

src/app/[locale]/seller/reviews/[id]/page.tsx

@@ -10,27 +10,13 @@ import { OutlineBtn } from '@/components/shared/Forms/Buttons/Buttons';
 import EmojiPicker from '@/components/shared/Review/emojipicker';
 import ToggleCollapse from '@/components/shared/Seller/ToggleCollapse';
 import Skeleton from '@/components/skeleton/skeleton';
-import { IReviewOutput } from '@/constants/types';
+import { IReviewOutput, ReviewInt } from '@/constants/types';
 import SearchIcon from '@mui/icons-material/Search';
 import { FormControl, TextField } from '@mui/material';
 import { fetchReviews } from '@/services/reviewsApi';
 import { resolveDate } from '@/utils/date';
 import logger from '../../../../../../logger.config.mjs';
 
-interface ReviewInt {
-  heading: string;
-  date: string;
-  time: string;
-  giver: string;
-  receiver: string;
-  reviewId: string;
-  receiverId: string;
-  giverId: string;
-  reaction: string;
-  unicode: string;
-  image: string;
-}
-
 function SellerReviews({
   params,
   searchParams,
@@ -85,7 +71,7 @@ function SellerReviews({
 
   useEffect(() => {
     const fetchSellerReviews = async () => {
-      setLoading(true);
+      setError(null);
       try {
         logger.info(`Fetching reviews for seller ID: ${userId}`);
         const data = await fetchReviews(userId);
@@ -105,16 +91,17 @@ function SellerReviews({
         setError('Error fetching reviews. Please try again later.');
       } finally {
         setLoading(false);
-        setReload(false)
+        setReload(false);
       }
     };
 
     fetchSellerReviews();
-  }, [userId, currentUser]);
+  }, [userId, currentUser, reload]);
 
   // Handle search logic
   const handleSearch = async () => {
     setReload(true);
+    setError(null);
     try {
       logger.info(`Searching reviews for seller ID: ${userId} with query: ${searchBarValue}`);
       const data = await fetchReviews(userId, searchBarValue);
@@ -149,7 +136,7 @@ function SellerReviews({
 
   return (
     <>
-      {error && <div className="error">{error}</div>}
+      {error && <div className="error text-center text-red-400">{error}</div>}
       <div className="px-4 py-[20px] text-[#333333] sm:max-w-[520px] w-full m-auto gap-5">
         <h1 className="text-[#333333] text-lg font-semibold md:font-bold md:text-2xl mb-1">
           {t('SCREEN.REVIEWS.REVIEWS_HEADER')}

src/app/[locale]/seller/reviews/feedback/[id]/page.tsx

@@ -8,7 +8,7 @@ import { FaChevronLeft, FaChevronRight } from 'react-icons/fa6';
 import ConfirmDialog from '@/components/shared/confirm';
 import EmojiPicker from '@/components/shared/Review/emojipicker';
 import Skeleton from '@/components/skeleton/skeleton';
-import { IReviewOutput } from '@/constants/types';
+import { IReviewOutput, ReviewInt } from '@/constants/types';
 import { fetchSingleReview } from '@/services/reviewsApi';
 import { resolveDate } from '@/utils/date';
 import { resolveRating } from '../../util/ratingUtils';
@@ -24,20 +24,6 @@ interface ReplyToReviewPageProps {
   };
 }
 
-interface ReviewInt {
-  heading: string;
-  date: string;
-  time: string;
-  giver: string;
-  receiver: string;
-  reviewId: string;
-  receiverId: string;
-  giverId: string;
-  reaction: string;
-  unicode: string;
-  image: string;
-}
-
 export default function ReplyToReviewPage({ params, searchParams }: ReplyToReviewPageProps) {
   const t = useTranslations();
   const router = useRouter();
@@ -51,9 +37,7 @@ export default function ReplyToReviewPage({ params, searchParams }: ReplyToRevie
   const [currentIndex, setCurrentIndex] = useState<number>(0);
   const [loading, setLoading] = useState<boolean>(true);
   const [error, setError] = useState<string | null>(null);
-  const [direction, setDirection] = useState('');
-  const [reload, setReload] = useState<boolean>(false);
-  const { currentUser, autoLoginUser } = useContext(AppContext);
+  const { currentUser, autoLoginUser, reload, setReload } = useContext(AppContext);
 
   const processReviews = (data: IReviewOutput[]): ReviewInt[] => {
     return data.map((feedback) => {
@@ -83,10 +67,9 @@ export default function ReplyToReviewPage({ params, searchParams }: ReplyToRevie
     }
 
     const getReviewData = async () => {
-      setLoading(true);
       try {
         logger.info(`Fetching review data for review ID: ${reviewId}`);
-        setReload(false)
+        setError(null);
         const data = await fetchSingleReview(reviewId);
 
         if (data.review) {
@@ -104,6 +87,7 @@ export default function ReplyToReviewPage({ params, searchParams }: ReplyToRevie
         setError('Error fetching review. Please try again later.');
       } finally {
         setLoading(false);
+        setReload(false);
       }
     };
 
@@ -113,14 +97,12 @@ export default function ReplyToReviewPage({ params, searchParams }: ReplyToRevie
   // Scroll functions
   const prevSlide = () => {
     if (reviews.length > 1 && currentIndex > 0) {
-      setDirection('left'); // Swipe to the left
       setCurrentIndex((prevIndex) => prevIndex - 1);
     }
   };
 
   const nextSlide = () => {
     if (reviews.length > 1 && currentIndex < reviews.length - 1) {
-      setDirection('right'); // Swipe to the right
       setCurrentIndex((prevIndex) => prevIndex + 1);
     }
   };

src/constants/types.ts

@@ -36,7 +36,6 @@ export interface ISeller {
   order_online_enabled_pref: boolean;
 }
 
-
 export interface IReviewFeedback {
   _id: string;
   review_receiver_id: string;
@@ -48,6 +47,20 @@ export interface IReviewFeedback {
   review_date: string;
 }
 
+export interface ReviewInt {
+  heading: string;
+  date: string;
+  time: string;
+  giver: string;
+  receiver: string;
+  reviewId: string;
+  receiverId: string;
+  giverId: string;
+  reaction: string;
+  unicode: string;
+  image: string;
+}
+
 // Select specific fields from IUserSettings
 export type PartialUserSettings = Pick<IUserSettings, 'user_name' | 'email' | 'phone_number' | 'findme' | 'trust_meter_rating'>;