Merge remote-tracking branch 'origin/dev' into feature/map-centers-ui-adjustments

swoocn · swoocn · commit 6389773c9375 · 2024-10-17T22:18:54.000-04:00
diff --git a/messages/en-GB.json b/messages/en-GB.json
@@ -71,7 +71,6 @@
       "SELLER_DETAILS_LABEL": "Seller Details",
       "SELLER_ADDRESS_POSITION_LABEL": "Seller Address or Position",
       "LEAVE_A_REVIEW_MESSAGE": "Leave a Review",
-      "FACE_SELECTION_REVIEW_MESSAGE": "Select the face which shows how you feel about the above seller",
       "ADDITIONAL_COMMENTS_PLACEHOLDER": "Enter additional comments here",
       "FEEDBACK_PHOTO_UPLOAD_LABEL": "Feedback photo upload",
       "REVIEWS_SUMMARY_LABEL": "Reviews Summary",
diff --git a/messages/es.json b/messages/es.json
@@ -71,7 +71,6 @@
       "SELLER_DETAILS_LABEL": "Detalles del Vendedor",
       "SELLER_ADDRESS_POSITION_LABEL": "Dirección o Posición del Vendedor",
       "LEAVE_A_REVIEW_MESSAGE": "Dejar una Reseña",
-      "FACE_SELECTION_REVIEW_MESSAGE": "Selecciona la cara que muestra cómo te sientes sobre el vendedor anterior",
       "ADDITIONAL_COMMENTS_PLACEHOLDER": "Introduce comentarios adicionales aquí",
       "FEEDBACK_PHOTO_UPLOAD_LABEL": "Subir foto de retroalimentación",
       "REVIEWS_SUMMARY_LABEL": "Resumen de Reseñas",
diff --git a/messages/ewe-BJ.json b/messages/ewe-BJ.json
@@ -71,7 +71,6 @@
       "SELLER_DETAILS_LABEL": "Nàƒé Wòkpɔ̃nɔ ƒé Nunya",
       "SELLER_ADDRESS_POSITION_LABEL": "Nàƒé Wòkpɔ̃nɔ ƒé Adrεs kple Nudɔla",
       "LEAVE_A_REVIEW_MESSAGE": "Nà tsɔ asi kple wɔ gɔmesese",
-      "FACE_SELECTION_REVIEW_MESSAGE": "Dzi le vavaŋuto ɖe ŋutɔ le wo ɖe wo dzidzakpɔtɔviwo dziwo",
       "ADDITIONAL_COMMENTS_PLACEHOLDER": "Xɔ le vavaŋuto ŋutɔ kple kple",
       "FEEDBACK_PHOTO_UPLOAD_LABEL": "Photo na vovɔ",
       "REVIEWS_SUMMARY_LABEL": "Sɔlɔɖe ɖe do",
diff --git a/messages/hau-NG.json b/messages/hau-NG.json
@@ -71,7 +71,6 @@
       "SELLER_DETAILS_LABEL": "Bayanin Mai Sayarwa",
       "SELLER_ADDRESS_POSITION_LABEL": "Adireshin Ko Matsayin Mai Sayarwa",
       "LEAVE_A_REVIEW_MESSAGE": "Bar Saƙon Bita",
-      "FACE_SELECTION_REVIEW_MESSAGE": "Zaɓi fuskar da ke nuna yadda kuke ji game da mai siyarwa da ke sama",
       "ADDITIONAL_COMMENTS_PLACEHOLDER": "Shigar da karin sharhi a nan",
       "FEEDBACK_PHOTO_UPLOAD_LABEL": "Loda Hoto Martani",
       "REVIEWS_SUMMARY_LABEL": "Takaitaccen Bayanin Sake Dubawa",
diff --git a/messages/ko.json b/messages/ko.json
@@ -71,7 +71,6 @@
       "SELLER_DETAILS_LABEL": "판매자 세부 정보",
       "SELLER_ADDRESS_POSITION_LABEL": "판매자 주소 또는 위치",
       "LEAVE_A_REVIEW_MESSAGE": "리뷰 남기기",
-      "FACE_SELECTION_REVIEW_MESSAGE": "위 판매자에 대한 느낌을 나타내는 얼굴을 선택하세요",
       "ADDITIONAL_COMMENTS_PLACEHOLDER": "추가 의견을 입력하세요",
       "FEEDBACK_PHOTO_UPLOAD_LABEL": "피드백 사진 업로드",
       "REVIEWS_SUMMARY_LABEL": "리뷰 요약",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "leaflet-geosearch": "^3.11.1",
     "loglevel": "^1.9.1",
     "next": "^14.2.4",
-    "next-intl": "^3.19.1",
+    "next-intl": "^3.21.1",
     "next-logger": "^4.0.0",
     "next-themes": "^0.3.0",
     "ngx-logger": "^5.0.12",
diff --git a/src/app/[locale]/seller/registration/page.tsx b/src/app/[locale]/seller/registration/page.tsx
@@ -401,7 +401,7 @@ const SellerRegistrationForm = () => {
                 })}
               </p>
               { !isSaveEnabled ? (
-                <Link href={dbSeller ? `/seller/reviews/${dbSeller.seller_id}` : '#'}>
+                <Link href={dbSeller ? `/seller/reviews/${dbSeller.seller_id}?user_name=${currentUser?.pi_username}` : '#'}>
                   <OutlineBtn
                     disabled={!currentUser}
                     label={t('SHARED.CHECK_REVIEWS')}
@@ -410,7 +410,7 @@ const SellerRegistrationForm = () => {
                   <OutlineBtn
                     disabled={!currentUser}
                     label={t('SHARED.CHECK_REVIEWS')}
-                    onClick={()=>handleNavigation(dbSeller ? `/seller/reviews/${dbSeller.seller_id}` : '#')}
+                    onClick={()=>handleNavigation(dbSeller ? `/seller/reviews/${dbSeller.seller_id}?user_name=${currentUser?.pi_username}` : '#')}
                   /> )
               }
             </div>
diff --git a/src/app/[locale]/seller/reviews/[id]/page.tsx b/src/app/[locale]/seller/reviews/[id]/page.tsx
@@ -39,7 +39,7 @@ function SellerReviews({
   searchParams: any;
 }) {
   const t = useTranslations();
-  const userName = searchParams.seller_name;
+  const userName = searchParams.user_name;
   const userId = params.id;
 
   const [giverReviews, setGiverReviews] = useState<ReviewInt[] | null>(null);
@@ -157,18 +157,19 @@ function SellerReviews({
 
         {/* Search area */}
         <div className='flex gap-3 items-center justify-items-center py-3'>
-          <span>{t('SHARED.PIONEER_LABEL')}</span>
+        <span>{t('SHARED.PIONEER_LABEL')}</span>
           <FormControl className="flex-grow mr-2">
             <TextField
               id="search-input"
               type="text"
               variant="outlined"
               color="success"
               className="bg-none hover:bg-gray-100 w-full rounded-lg"
-              label={t('SHARED.SEARCH_REVIEWS')}
+              placeholder={userName}
               value={searchBarValue}
               onChange={handleSearchBarChange}
               ref={inputRef}
+              autoCorrect="off"
             />
           </FormControl>
           <button
diff --git a/src/app/[locale]/seller/reviews/feedback/[id]/page.tsx b/src/app/[locale]/seller/reviews/feedback/[id]/page.tsx
@@ -52,7 +52,7 @@ export default function ReplyToReviewPage({ params, searchParams }: ReplyToRevie
   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 processReviews = (data: IReviewOutput[]): ReviewInt[] => {
@@ -86,6 +86,7 @@ export default function ReplyToReviewPage({ params, searchParams }: ReplyToRevie
       setLoading(true);
       try {
         logger.info(`Fetching review data for review ID: ${reviewId}`);
+        setReload(false)
         const data = await fetchSingleReview(reviewId);
 
         if (data.review) {
@@ -107,7 +108,7 @@ export default function ReplyToReviewPage({ params, searchParams }: ReplyToRevie
     };
 
     getReviewData();
-  }, [reviewId, currentUser, reviews.length]);
+  }, [reviewId, currentUser, reload]);
 
   // Scroll functions
   const prevSlide = () => {
@@ -213,6 +214,7 @@ export default function ReplyToReviewPage({ params, searchParams }: ReplyToRevie
             setIsSaveEnabled={setIsSaveEnabled}
             replyToReviewId={reviews[currentIndex]?.reviewId}
             currentUser={currentUser}
+            setReload={setReload}
           />
         </div>
       )}
diff --git a/src/app/[locale]/seller/sale-items/[id]/page.tsx b/src/app/[locale]/seller/sale-items/[id]/page.tsx
@@ -150,7 +150,7 @@ export default function BuyFromSellerForm({ params }: { params: { id: string } }
             <p className="text-sm">
               {t('SCREEN.BUY_FROM_SELLER.REVIEWS_SCORE_MESSAGE', {seller_review_rating: sellerShopInfo.average_rating.$numberDecimal})}
             </p>
-            <Link href={`/seller/reviews/${sellerId}?buyer=true&seller_name=${sellerShopInfo.name}`}>
+            <Link href={`/seller/reviews/${sellerId}?buyer=true&user_name=${sellerInfo?.pi_username}`}>
             <OutlineBtn label={t('SHARED.CHECK_REVIEWS')} />
             </Link>
           </div>
diff --git a/src/components/shared/Review/TrustMeter.tsx b/src/components/shared/Review/TrustMeter.tsx
@@ -6,7 +6,7 @@ type TrustMeterProps = {
   hideLabel?: boolean;
 };
 
-const TrustMeter: React.FC<TrustMeterProps> = ({ ratings, hideLabel}) => {
+const TrustMeter: React.FC<TrustMeterProps> = ({ ratings, hideLabel }) => {
   const [ratingImage, setRatingImage] = useState<string>('')
 
   useEffect(() => {
@@ -16,21 +16,21 @@ const TrustMeter: React.FC<TrustMeterProps> = ({ ratings, hideLabel}) => {
       setRatingImage(`/images/shared/review_ratings/trust-o-meter_0${ratings}.PNG`);
     } else {
       setRatingImage(`/images/shared/review_ratings/trust-o-meter_${ratings}.PNG`);
-    }       
+    }
   }, [ratings]);
 
   return (
     <div className='w-full flex items-center mb-3'>
-      <h3 className={`font-bold text-sm text-nowrap pe-2 ${hideLabel? 'hidden': 'block'}`}>Trust-o-meter</h3>
+      <h3 className={`font-bold text-sm text-nowrap pe-2 ${hideLabel ? 'hidden' : 'block'}`}></h3>
       <div className='flex-1'>
-        <div className="flex w-full">          
+        <div className="flex w-full">
           <Image 
             src={ratingImage} 
-            alt='100% ratings' 
+            alt='Trust-o-meter rating' 
             width={400} 
             height={3}
             className="w-full max-w-xs md:max-w-md lg:max-w-lg"
-          />          
+          />
         </div>
       </div>
     </div>
diff --git a/src/components/shared/Review/emojipicker.tsx b/src/components/shared/Review/emojipicker.tsx
@@ -119,6 +119,7 @@ export default function EmojiPicker(props: any) {
           const newReview = await createReview(formDataToSend);
           if (newReview) {
             toast.success(t('SHARED.REACTION_RATING.VALIDATION.SUCCESSFUL_REVIEW_SUBMISSION'));
+            props.setReload(true)
             logger.info('Review submitted successfully');
           }
           resetReview();
@@ -152,7 +153,7 @@ export default function EmojiPicker(props: any) {
   const emojiBtnClass = 'rounded-md w-full outline outline-[0.5px] flex justify-center items-center cursor-pointer p-1'
   return (
     <div className="mb-3">
-        <p>{t('Select face which shows how you feel about your interactions with this pioneer')}</p>
+        <p>{t('SCREEN.REPLY_TO_REVIEW.FACE_SELECTION_REVIEW_MESSAGE')}</p>
       <div className='flex sm:overflow-hidden overflow-auto gap-3 w-full text-center justify-center my-2'>
         <div className='bg-[#DF2C2C33] flex-grow-[0.5] rounded-md p-2'>
           <p className='text-red-700 mb-2'>{t('SHARED.REACTION_RATING.UNSAFE')}</p>
@@ -194,7 +195,7 @@ export default function EmojiPicker(props: any) {
         <TextArea placeholder={t('SCREEN.BUY_FROM_SELLER.ADDITIONAL_COMMENTS_PLACEHOLDER')} 
         value={comments} 
         onChange={handleCommentsChange} 
-        maxLength={100}
+        maxLength={250}
         />
       </div>
       <div className="mb-2">
diff --git a/src/components/shared/map/Map.tsx b/src/components/shared/map/Map.tsx
diff --git a/src/components/shared/map/MapMarkerPopup.tsx b/src/components/shared/map/MapMarkerPopup.tsx
diff --git a/src/components/shared/sidebar/sidebar.tsx b/src/components/shared/sidebar/sidebar.tsx
