renderer: store: fix search hang when result is empty

optional chaining! nullish coalescing! yay!
Rocket1184 · Oct 11, 2021 · f21a9c7 · f21a9c7
1 parent 149b6b5
commit f21a9c7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/renderer/store/actions.js b/src/renderer/store/actions.js
@@ -258,44 +258,44 @@ export async function search({ state, commit }, { keyword, type, limit = 20, off
         switch (type) {
             case 'song':
                 const { songCount, songs } = resp.result;
-                result.total = songCount || songs.length || 0;
+                result.total = songCount ?? songs?.length ?? 0;
                 if (result.total > 0) {
                     const source = { name: 'search', id: state.ui.search.keyword };
                     result.items = songs.map(i => new Track(i, { source }));
                 }
                 break;
             case 'artist':
                 const { artistCount, artists } = resp.result;
-                result.total = artistCount || artists.length || 0;
+                result.total = artistCount ?? artists?.length ?? 0;
                 if (result.total > 0) {
                     result.items = artists;
                 }
                 break;
             case 'album':
                 const { albumCount, albums } = resp.result;
                 // sometimes, albumCount is `0` but album.length != 0
-                result.total = albumCount || albums.length || 0;
+                result.total = albumCount ?? albums?.length ?? 0;
                 if (result.total > 0) {
                     result.items = albums;
                 }
                 break;
             case 'playlist':
                 const { playlistCount, playlists } = resp.result;
-                result.total = playlistCount || playlists.length || 0;
+                result.total = playlistCount ?? playlists?.length ?? 0;
                 if (result.total > 0) {
                     result.items = playlists;
                 }
                 break;
             case 'video':
                 const { videoCount, videos } = resp.result;
-                result.total = videoCount || videos.length || 0;
+                result.total = videoCount ?? videos?.length ?? 0;
                 if (result.total > 0) {
                     result.items = videos.map(v => new Video(v));
                 }
                 break;
             case 'user':
                 const { userprofileCount, userprofiles } = resp.result;
-                result.total = userprofileCount || userprofiles.length || 0;
+                result.total = userprofileCount ?? userprofiles?.length ?? 0;
                 if (result.total > 0) {
                     result.items = userprofiles;
                 }