feat: handle fetch error

CHANGELOG.md

@@ -3,11 +3,15 @@ Tidarr notable changes.
 
 [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) format.
 
+## 📦 0.1.14
+### 🐛 Fixed
+* [Front] Show "No results" message instead of loader when tidal fetch fail
+
 ## 📦 0.1.13
 ### 🖍 Changed
 * [API] Gotify notification title shows content type instead of "album"
 ### 🐛 Fixed
-* [API] Fix missing `ffmpeg-python` pip package (#57)
+* [Chore] Fix missing `ffmpeg-python` pip package (#57)
 
 ## 📦 0.1.12
 ### 🚀 Added

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidarr-api",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "private": true,
   "devDependencies": {
     "@eslint/js": "^9.15.0",

app/src/hooks/useAlbum.tsx

@@ -25,9 +25,9 @@ export const useAlbum = (id: string | undefined): AlbumContextType => {
       TidalModuleResponseType<{ item: TrackType }>
     >(`${TIDAL_API_LISTEN_URL}/pages/album?albumId=${id}`);
 
-    setAlbum(data_album.rows[0].modules[0].album);
+    setAlbum(data_album?.rows[0].modules[0].album);
 
-    const data_tracks = data_album.rows[1].modules[0].pagedList.items.map(
+    const data_tracks = data_album?.rows[1].modules[0].pagedList.items.map(
       (track) => track.item,
     );
 

app/src/hooks/usePlaylist.tsx

@@ -40,11 +40,13 @@ export const usePlaylist = (id: string | undefined): PlaylistContextType => {
       }`,
     );
 
-    setTracks([
-      ...(tracks || ([] as TrackType[])),
-      ...data_tracks.items.map((playlist) => playlist.item),
-    ]);
-    setTotal(data_tracks.totalNumberOfItems);
+    if (data_tracks) {
+      setTracks([
+        ...(tracks || ([] as TrackType[])),
+        ...data_tracks.items.map((playlist) => playlist.item),
+      ]);
+      setTotal(data_tracks.totalNumberOfItems);
+    }
     setLoading(false);
   }
 

app/src/provider/ArtistProvider.tsx

@@ -33,7 +33,6 @@ const ArtistContext = React.createContext<ArtistContextType>(
 
 export function ArtistProvider({ children }: { children: ReactNode }) {
   const [loading, setLoading] = useState<boolean>(false);
-
   const [artistPagerLoading, setArtistPagerLoading] = useState<number>();
   const [artistResults, setArtistResults] = useState<ArtistResultsType>(
     {} as ArtistResultsType,
@@ -46,7 +45,7 @@ export function ArtistProvider({ children }: { children: ReactNode }) {
       `${TIDAL_API_LISTEN_URL}/pages/artist?artistId=${id}`,
     );
 
-    if (data_artist?.rows?.length > 0) {
+    if (data_artist && data_artist?.rows?.length > 0) {
       const album_block = data_artist?.rows
         .filter(
           (row) =>
@@ -79,7 +78,7 @@ export function ArtistProvider({ children }: { children: ReactNode }) {
       }`,
     );
 
-    if (data_artist_page?.items?.length > 0) {
+    if (data_artist_page && data_artist_page?.items?.length > 0) {
       const clone: TidalModuleListType<AlbumType>[] = [
         ...(artistResults?.blocks || []),
       ];

app/src/provider/SearchProvider.tsx

@@ -100,7 +100,7 @@ export function SearchProvider({ children }: { children: ReactNode }) {
       },
     };
 
-    setSearchResults(data);
+    setSearchResults(data as TidalResponseType);
   }
 
   async function directDownload(url: string) {

app/src/utils/fetch.ts

@@ -3,7 +3,7 @@ const jsonMimeType = "application/json";
 export async function fetchTidal<T>(
   url: string,
   options: RequestInit = {},
-): Promise<T> {
+): Promise<T | undefined> {
   const TOKEN = window._env_.REACT_APP_TIDAL_SEARCH_TOKEN;
   const COUNTRY = window._env_.REACT_APP_TIDAL_COUNTRY_CODE;
 
@@ -28,18 +28,4 @@ export async function fetchTidal<T>(
   if (response?.ok) {
     return await response.json();
   }
-
-  // error
-
-  if (500 <= response?.status) {
-    throw new Error("An error occured");
-  }
-  if (403 === response?.status) {
-    throw new Error("Authorization error");
-  }
-  if (404 === response?.status) {
-    throw new Error("Not found");
-  }
-
-  throw new Error();
 }

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidarr-testing",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "",
   "main": "index.js",
   "keywords": [],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tidarr-main",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "private": true,
   "devDependencies": {
     "concurrently": "^8.2.2"