Merge pull request #265 from Ashuza11/task-07-misleading-toast-message

BirushaNdegeya · web-flow · commit df8169435a34 · 2025-12-17T11:35:39.000+02:00
Task 07: Fix misleading toast message for no data
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/helpers/fetchdata.js b/src/helpers/fetchdata.js
@@ -7,14 +7,14 @@ const axiosInstance = axios.create({
     },
 });
 
-const fetchMostVisitedArticlesData = async ({ country, access, year, month, day }) => {
+const fetchMostVisitedArticlesData = async ({ country, access, year, month, day, t }) => {
     try {
         const formattedMonth = month.padStart(2, '0');
         const formattedDay = day.padStart(2, '0');
         const apiUrl = `https://wikimedia.org/api/rest_v1/metrics/pageviews/top-per-country/${country}/${access}/${year}/${formattedMonth}/${formattedDay}`;
         return await axiosInstance.get(apiUrl);
     } catch (error) {
-        toast.error('Aucune donnée trouvée pour les paramètres passées', {
+        toast.info(t('common.noResultsForFilters'), {
             autoClose: 5000,
             position: 'bottom-center',
             hideProgressBar: true,
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
@@ -38,7 +38,8 @@
     "exportToJSON": "Export to JSON",
     "permanentLink": "Permanent Link",
     "linkCopied": "Link copied to clipboard!",
-    "requestTimeout": "Request timed out. Please try again."
+    "requestTimeout": "Request timed out. Please try again.",
+    "noResultsForFilters": "No results found for the selected filters."
   },
   "article": {
     "description": "Description",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
@@ -38,7 +38,8 @@
     "exportToJSON": "Exportar a JSON",
     "permanentLink": "Enlace permanente",
     "linkCopied": "¡Enlace copiado al portapapeles!",
-    "requestTimeout": "La solicitud ha expirado. Por favor, inténtelo de nuevo."
+    "requestTimeout": "La solicitud ha expirado. Por favor, inténtelo de nuevo.",
+    "noResultsForFilters": "Ningún resultado encontrado para los filtros seleccionados."
   },
   "article": {
     "description": "Descripción",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
@@ -38,7 +38,8 @@
     "exportToJSON": "Exporter en JSON",
     "permanentLink": "Lien permanent",
     "linkCopied": "Lien copié dans le presse-papiers !",
-    "requestTimeout": "La requête a expiré. Veuillez réessayer."
+    "requestTimeout": "La requête a expiré. Veuillez réessayer.",
+    "noResultsForFilters": "Aucun résultat trouvé pour les filtres sélectionnés."
   },
   "article": {
     "description": "Description",
diff --git a/src/i18n/locales/sw.json b/src/i18n/locales/sw.json
@@ -38,7 +38,8 @@
     "exportToJSON": "Hamisha kwa JSON",
     "permanentLink": "Kiungo cha kudumu",
     "linkCopied": "Kiungo kimekiliwa kwenye clipboard!",
-    "requestTimeout": "Ombi limeisha. Tafadhali jaribu tena."
+    "requestTimeout": "Ombi limeisha. Tafadhali jaribu tena.",
+    "noResultsForFilters": "Hakuna matokeo yaliyopatikana kwa vichungi vilivyochaguliwa."
   },
   "article": {
     "description": "Maelezo",
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
@@ -45,7 +45,7 @@ function App() {
             setLoading(true);
 
             try {
-                const response = await fetchArticles(formData);
+                const response = await fetchArticles({ ...formData, t });
 
                 if (response && response.data && response.data.items && response.data.items.length > 0) {
                     const trueArticles = await getTrueArticles(
