Fix/global search not showing request error (#310)

* Show error message in case search request failed In case of an error the message was showing "no mangas found" * [i18n::en] Sort keys alphabetically
Suwayomi · May 20, 2023 · a95937f · a95937f
1 parent 474e568
commit a95937f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
@@ -139,14 +139,14 @@
   },
   "download": {
     "queue": {
-      "label": {
-        "no_downloads": "No downloads"
-      },
       "error": {
         "label": {
           "failed_to_remove": "Could not remove download from queue."
         }
       },
+      "label": {
+        "no_downloads": "No downloads"
+      },
       "title": "Download Queue"
     },
     "state": {
@@ -280,10 +280,10 @@
           "title": "Badges"
         },
         "tab": {
-          "title": "Tabs",
           "label": {
             "show_number_of_items": "Show number of items"
-          }
+          },
+          "title": "Tabs"
         }
       },
       "sort": {
@@ -384,7 +384,8 @@
   "search": {
     "error": {
       "label": {
-        "failed_to_save_settings": "Could not save the default search settings to the server"
+        "failed_to_save_settings": "Could not save the default search settings to the server",
+        "source_search_failed": "Could not search source"
       }
     },
     "label": {
@@ -423,10 +424,10 @@
       "dark_theme": "Dark theme",
       "image_cache": "Use image cache",
       "image_cache_description": "Reduces the data consumption and improves the performance when a already requested image gets requested again",
+      "language_description": "Feel free to translate the project on",
       "manga_item_width": "Manga item width",
       "show_nsfw": "Show NSFW",
-      "show_nsfw_description": "Hide NSFW extensions and sources",
-      "language_description": "Feel free to translate the project on"
+      "show_nsfw_description": "Hide NSFW extensions and sources"
     },
     "server_address": {
       "dialog": {

diff --git a/src/screens/SearchAll.tsx b/src/screens/SearchAll.tsx
@@ -96,6 +96,7 @@ const SourceSearchPreview = ({
         size,
         setSize,
         isLoading,
+        error,
     } = requestManager.useSourceSearch(id, searchString ?? '', 1, { skipRequest });
     const mangas = !isLoading ? searchResult?.[0]?.mangaList ?? [] : [];
     const noMangasFound = !isLoading && !mangas.length;
@@ -108,6 +109,13 @@ const SourceSearchPreview = ({
         return null;
     }
 
+    let errorMessage: string | undefined;
+    if (error) {
+        errorMessage = t('search.error.label.source_search_failed');
+    } else if (noMangasFound) {
+        errorMessage = t('manga.error.label.no_mangas_found');
+    }
+
     return (
         <>
             <Card sx={{ margin: '10px' }}>
@@ -124,7 +132,7 @@ const SourceSearchPreview = ({
                 setLastPageNum={setSize}
                 horizontal
                 noFaces
-                message={noMangasFound ? t('manga.error.label.no_mangas_found') : undefined}
+                message={errorMessage}
                 inLibraryIndicator
             />
         </>