Misc PR adjustments; add language translation; cleanup.

swoocn · swoocn · commit ee6cfe655d79 · 2024-10-19T22:51:31.000-04:00
diff --git a/messages/en-GB.json b/messages/en-GB.json
@@ -86,7 +86,11 @@
       "REVIEWS_HEADER": "Reviews",
       "GIVE_REVIEW_SECTION_HEADER": "Give review to this pioneer",
       "REVIEWS_GIVEN_SECTION_HEADER": "Reviews given by this pioneer",
-      "REVIEWS_RECEIVED_SECTION_HEADER": "Reviews received by this pioneer"
+      "REVIEWS_RECEIVED_SECTION_HEADER": "Reviews received by this pioneer",
+      "VALIDATION": {
+        "NO_REVIEWS_FOUND": "No reviews found for Pioneer {search_value}",
+        "NO_PIONEER_FOUND": "Pioneer {search_value} not found"  
+      }
     },
     "CHECK_REVIEWS_FEEDBACK": {
       "CHECK_REVIEWS_NO_FEEDBACK_HEADER": "No reviews for {seller_id}",
diff --git a/messages/en.json b/messages/en.json
@@ -87,7 +87,11 @@
       "REVIEWS_HEADER": "Reviews",
       "GIVE_REVIEW_SECTION_HEADER": "Give review to this pioneer",
       "REVIEWS_GIVEN_SECTION_HEADER": "Reviews given by this pioneer",
-      "REVIEWS_RECEIVED_SECTION_HEADER": "Reviews received by this pioneer"
+      "REVIEWS_RECEIVED_SECTION_HEADER": "Reviews received by this pioneer",
+      "VALIDATION": {
+        "NO_REVIEWS_FOUND": "No reviews found for Pioneer {search_value}",
+        "NO_PIONEER_FOUND": "Pioneer {search_value} not found"  
+      }
     },
     "CHECK_REVIEWS_FEEDBACK": {
       "CHECK_REVIEWS_NO_FEEDBACK_HEADER": "No reviews for {seller_id}",
diff --git a/messages/es.json b/messages/es.json
@@ -86,7 +86,11 @@
       "REVIEWS_HEADER": "Reseñas",
       "GIVE_REVIEW_SECTION_HEADER": "Dar una reseña a este pionero",
       "REVIEWS_GIVEN_SECTION_HEADER": "Reseñas dadas por este pionero",
-      "REVIEWS_RECEIVED_SECTION_HEADER": "Reseñas recibidas por este pionero"
+      "REVIEWS_RECEIVED_SECTION_HEADER": "Reseñas recibidas por este pionero",
+      "VALIDATION": {
+        "NO_REVIEWS_FOUND": "No se encontraron reseñas para el Pionero {search_value}",
+        "NO_PIONEER_FOUND": "Pionero {search_value} no encontrado"
+      }
     },
     "CHECK_REVIEWS_FEEDBACK": {
       "CHECK_REVIEWS_NO_FEEDBACK_HEADER": "No hay reseñas para {seller_id}",
diff --git a/messages/ewe-BJ.json b/messages/ewe-BJ.json
@@ -86,7 +86,11 @@
       "REVIEWS_HEADER": "Nenyíawo",
       "GIVE_REVIEW_SECTION_HEADER": "No wo review kplii ame siaa",
       "REVIEWS_GIVEN_SECTION_HEADER": "Reviewwo kplii ame siaa",
-      "REVIEWS_RECEIVED_SECTION_HEADER": "Reviewwo yi le ame siaa"
+      "REVIEWS_RECEIVED_SECTION_HEADER": "Reviewwo yi le ame siaa",
+      "VALIDATION": {
+        "NO_REVIEWS_FOUND": "Mèɖu nú ŋutɔ wòàdzra Pioné {search_value}",
+        "NO_PIONEER_FOUND": "Pioné {search_value} wòɖu nɔ anyi"
+      }
     },
     "CHECK_REVIEWS_FEEDBACK": {
       "CHECK_REVIEWS_NO_FEEDBACK_HEADER": "Mèkpɔ dzudzɔkpɔkpɔ ƒe {seller_id} o",
diff --git a/messages/hau-NG.json b/messages/hau-NG.json
@@ -86,7 +86,11 @@
       "REVIEWS_HEADER": "Bita",
       "GIVE_REVIEW_SECTION_HEADER": "Ba wa wannan jagora sharhi",
       "REVIEWS_GIVEN_SECTION_HEADER": "Sharhi da aka ba wannan jagora",
-      "REVIEWS_RECEIVED_SECTION_HEADER": "Sharhi da wannan jagora ya samu"
+      "REVIEWS_RECEIVED_SECTION_HEADER": "Sharhi da wannan jagora ya samu",
+      "VALIDATION": {
+        "NO_REVIEWS_FOUND": "Ba a sami bita ga Mai-tushen {search_value} ba",
+        "NO_PIONEER_FOUND": "Ba a sami Mai-tushen {search_value} ba"
+      }
     },
     "CHECK_REVIEWS_FEEDBACK": {
       "CHECK_REVIEWS_NO_FEEDBACK_HEADER": "Babu bita don {seller_id}",
diff --git a/messages/ko.json b/messages/ko.json
@@ -86,7 +86,11 @@
       "REVIEWS_HEADER": "리뷰",
       "GIVE_REVIEW_SECTION_HEADER": "이 개척자에게 리뷰 남기기",
       "REVIEWS_GIVEN_SECTION_HEADER": "이 개척자가 남긴 리뷰",
-      "REVIEWS_RECEIVED_SECTION_HEADER": "이 개척자가 받은 리뷰"
+      "REVIEWS_RECEIVED_SECTION_HEADER": "이 개척자가 받은 리뷰",
+      "VALIDATION": {
+        "NO_REVIEWS_FOUND": "개척자 {search_value}에 대한 리뷰를 찾을 수 없습니다",
+        "NO_PIONEER_FOUND": "개척자 {search_value}를 찾을 수 없습니다"
+      }
     },
     "CHECK_REVIEWS_FEEDBACK": {
       "CHECK_REVIEWS_NO_FEEDBACK_HEADER": "{seller_id}에 대한 리뷰가 없습니다",
diff --git a/src/app/[locale]/seller/reviews/[id]/page.tsx b/src/app/[locale]/seller/reviews/[id]/page.tsx
@@ -4,7 +4,7 @@ import { useTranslations } from 'next-intl';
 import Image from 'next/image';
 import Link from 'next/link';
 import { useEffect, useState, useRef, useContext } from 'react';
-import { AppContext } from '../../../../../../context/AppContextProvider';
+import { toast } from 'react-toastify';
 import { resolveRating } from '../util/ratingUtils';
 import { OutlineBtn } from '@/components/shared/Forms/Buttons/Buttons';
 import EmojiPicker from '@/components/shared/Review/emojipicker';
@@ -15,8 +15,8 @@ import SearchIcon from '@mui/icons-material/Search';
 import { FormControl, TextField } from '@mui/material';
 import { fetchReviews } from '@/services/reviewsApi';
 import { resolveDate } from '@/utils/date';
+import { AppContext } from '../../../../../../context/AppContextProvider';
 import logger from '../../../../../../logger.config.mjs';
-import { toast } from 'react-toastify';
 
 function SellerReviews({
   params,
@@ -61,41 +61,39 @@ function SellerReviews({
       })
       .filter((review): review is ReviewInt => review !== null);
 
-    // Separate into giver and receiver reviews
-    return reviews
+    return reviews;
   };
 
   const fetchUserReviews = async () => {
-    // setLoading(true);
     setError(null);
     try {
-      logger.info(`Fetching reviews for seller ID: ${userId}`);
+      logger.info(`Fetching reviews for userID: ${userId}`);
       const data = await fetchReviews(userId);
 
       if (data) {
-        if (data.givenReviews.length>0) {
-          logger.info(`Fetched ${data.givenReviews.length} reviews given by user ID: ${userId}`);
+        if (data.givenReviews.length > 0) {
+          logger.info(`Fetched ${data.givenReviews.length} reviews given by userID: ${userId}`);
           setGiverReviews(processReviews(data.givenReviews));
           setToUser(userId);
         } else {
-          logger.warn(`No given reviews found for user ID: ${userId}`);
+          logger.warn(`No given reviews found for userID: ${userId}`);
           setGiverReviews([]);
         }
 
-        if (data.receivedReviews.length>0){
-          logger.info(`Fetched ${data.receivedReviews.length} reviews received by user ID: ${userId}`);
+        if (data.receivedReviews.length > 0) {
+          logger.info(`Fetched ${data.receivedReviews.length} reviews received by userID: ${userId}`);
           setReceiverReviews(processReviews(data.receivedReviews));
         } else {
-          logger.warn(`No received reviews found for user ID: ${userId}`);
+          logger.warn(`No received reviews found for userID: ${userId}`);
           setReceiverReviews([]);
         }          
       } else {
-        logger.warn(`No reviews found for user ID: ${userId}`);
+        logger.warn(`No reviews found for userID: ${userId}`);
         setGiverReviews([]);
         setReceiverReviews([]);
       }
     } catch (error) {
-      logger.error(`Error fetching reviews for seller ID: ${userId}`, { error });
+      logger.error(`Error fetching reviews for userID: ${userId}`, { error });
       setError('Error fetching reviews. Please try again later.');
     } finally {
       setLoading(false);
@@ -112,37 +110,36 @@ function SellerReviews({
     setReload(true);
     setError(null);
     try {
-      logger.info(`Searching reviews for user ID: ${userId} with query: ${searchBarValue}`);
+      logger.info(`Searching reviews for userID: ${userId} with query: ${searchBarValue}`);
       const data = await fetchReviews(userId, searchBarValue);
 
       if (data) {
-        if (data.givenReviews.length>0) {
-          logger.info(`Found ${data.givenReviews.length} reviews given by user: ${searchBarValue}`);
+        if (data.givenReviews.length > 0) {
+          logger.info(`Found ${data.givenReviews.length} reviews given by Pioneer: ${searchBarValue}`);
           setGiverReviews(processReviews(data.givenReviews));
           setToUser(data.givenReviews[0].review_giver_id);
         } else {
-          logger.warn(`No given reviews found for user: ${searchBarValue}`);
+          logger.warn(`No given reviews found for Pioneer: ${searchBarValue}`);
           setGiverReviews([]);
         }
-        if (data.receivedReviews.length>0) {
-          logger.info(`Found ${data.receivedReviews.length} reviews received by user: ${searchBarValue}`);
+        if (data.receivedReviews.length > 0) {
+          logger.info(`Found ${data.receivedReviews.length} reviews received by Pioneer: ${searchBarValue}`);
           setReceiverReviews(processReviews(data.receivedReviews));
           setToUser(data.givenReviews[0].review_receiver_id);
         } else {
-          logger.warn(`No given reviews found for user:  ${searchBarValue}`);
+          logger.warn(`No given reviews found for Pioneer: ${searchBarValue}`);
           setReceiverReviews([]);
         }
         
       } else {
-        toast.error(`No reviews found for Pioneer with username ${searchBarValue}`);
-        logger.warn(`No reviews found for user: ${searchBarValue}`);
+        toast.error(t('SCREEN.REVIEWS.VALIDATION.NO_REVIEWS_FOUND', { search_value: searchBarValue }));
+        logger.warn(`No reviews found for Pioneer: ${searchBarValue}`);
         setGiverReviews([]);
         setReceiverReviews([]);
       }
     } catch (error) {
-      logger.error(`Pioneer with username ${searchBarValue} not found on map-of-pi`, { error });
-      return toast.error(`Pioneer with username ${searchBarValue} not found on map-of-pi`);
-      
+      logger.error(`Pioneer ${searchBarValue} not found`, { error });
+      return toast.error(t('SCREEN.REVIEWS.VALIDATION.NO_PIONEER_FOUND', { search_value: searchBarValue }));
     } finally {
       setReload(false);
     }
@@ -212,35 +209,35 @@ function SellerReviews({
                     <p className="text-md break-words">{review.heading}</p>
                   </div>
 
-                    {/* Right content */}
-                    <div className="flex flex-col items-end space-y-2">
-                      <div className="text-[#828282] text-sm text-right whitespace-nowrap">
-                        <p>{review.date}</p>
-                        <p>{review.time}</p>
-                      </div>
-                      <div className="flex gap-2 items-center">
-                        <Image
-                          src={review.image}
-                          alt="emoji image"
-                          width={50}
-                          height={50}
-                          className="object-cover rounded-md"
-                        />
-                        <p className="text-xl max-w-[50px]" title={review.reaction}>
-                          {review.unicode}
-                        </p>
-                      </div>
-                      <div className="flex justify-between items-center">
-                        <Link href={`/seller/reviews/feedback/${review.reviewId}?user_name=${review.giver}`}>
-                          <OutlineBtn label={t('SHARED.REPLY')} />
-                        </Link>
-                      </div>
+                  {/* Right content */}
+                  <div className="flex flex-col items-end space-y-2">
+                    <div className="text-[#828282] text-sm text-right whitespace-nowrap">
+                      <p>{review.date}</p>
+                      <p>{review.time}</p>
+                    </div>
+                    <div className="flex gap-2 items-center">
+                      <Image
+                        src={review.image}
+                        alt="emoji image"
+                        width={50}
+                        height={50}
+                        className="object-cover rounded-md"
+                      />
+                      <p className="text-xl max-w-[50px]" title={review.reaction}>
+                        {review.unicode}
+                      </p>
+                    </div>
+                    <div className="flex justify-between items-center">
+                      <Link href={`/seller/reviews/feedback/${review.reviewId}?user_name=${review.giver}`}>
+                        <OutlineBtn label={t('SHARED.REPLY')} />
+                      </Link>
                     </div>
                   </div>
                 </div>
-                ))
-            }
-          </ToggleCollapse>
+              </div>
+            ))
+          }
+        </ToggleCollapse>
  
         <ToggleCollapse header={t('SCREEN.REVIEWS.REVIEWS_RECEIVED_SECTION_HEADER')} open={true}>
         {reload
