From 0a82438beb871264af868dbb0ffb07a53bfbae91 Mon Sep 17 00:00:00 2001 From: jeffvli Date: Fri, 6 Jan 2023 03:33:11 -0800 Subject: [PATCH] Set 1 minute cache time on manual query fetches --- .../components/album-artist-list-content.tsx | 46 +++++++++++-------- .../components/album-artist-list-header.tsx | 46 +++++++++++-------- .../playlist-detail-song-list-content.tsx | 25 +++++----- .../playlist-detail-song-list-header.tsx | 25 +++++----- .../components/playlist-list-content.tsx | 23 ++++++---- .../components/playlist-list-header.tsx | 23 ++++++---- .../songs/components/song-list-content.tsx | 23 ++++++---- .../songs/components/song-list-header.tsx | 23 ++++++---- 8 files changed, 132 insertions(+), 102 deletions(-) diff --git a/src/renderer/features/artists/components/album-artist-list-content.tsx b/src/renderer/features/artists/components/album-artist-list-content.tsx index 3914f48f..1a6ef0fa 100644 --- a/src/renderer/features/artists/components/album-artist-list-content.tsx +++ b/src/renderer/features/artists/components/album-artist-list-content.tsx @@ -103,16 +103,19 @@ export const AlbumArtistListContent = ({ gridRef, tableRef }: AlbumArtistListCon ...page.filter, }); - const albumArtistsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getAlbumArtistList({ - query: { - limit, - startIndex, - ...page.filter, - }, - server, - signal, - }), + const albumArtistsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getAlbumArtistList({ + query: { + limit, + startIndex, + ...page.filter, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); const albums = api.normalize.albumArtistList(albumArtistsRes, server); @@ -192,16 +195,19 @@ export const AlbumArtistListContent = ({ gridRef, tableRef }: AlbumArtistListCon ...page.filter, }); - const albumArtistsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getAlbumArtistList({ - query: { - limit, - startIndex, - ...page.filter, - }, - server, - signal, - }), + const albumArtistsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getAlbumArtistList({ + query: { + limit, + startIndex, + ...page.filter, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); return api.normalize.albumArtistList(albumArtistsRes, server); diff --git a/src/renderer/features/artists/components/album-artist-list-header.tsx b/src/renderer/features/artists/components/album-artist-list-header.tsx index e014d473..b89a6c4b 100644 --- a/src/renderer/features/artists/components/album-artist-list-header.tsx +++ b/src/renderer/features/artists/components/album-artist-list-header.tsx @@ -123,16 +123,19 @@ export const AlbumArtistListHeader = ({ gridRef, tableRef }: AlbumArtistListHead ...filters, }); - const albums = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getAlbumArtistList({ - query: { - limit, - startIndex, - ...filters, - }, - server, - signal, - }), + const albums = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getAlbumArtistList({ + query: { + limit, + startIndex, + ...filters, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); return api.normalize.albumArtistList(albums, server); @@ -157,16 +160,19 @@ export const AlbumArtistListHeader = ({ gridRef, tableRef }: AlbumArtistListHead ...filters, }); - const albumArtistsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getAlbumArtistList({ - query: { - limit, - startIndex, - ...filters, - }, - server, - signal, - }), + const albumArtistsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getAlbumArtistList({ + query: { + limit, + startIndex, + ...filters, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); const albumArtists = api.normalize.albumArtistList(albumArtistsRes, server); diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx index 1855190f..8f6e1cb6 100644 --- a/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx +++ b/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx @@ -103,17 +103,20 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten ...filters, }); - const songsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getPlaylistSongList({ - query: { - id: playlistId, - limit, - startIndex, - ...filters, - }, - server, - signal, - }), + const songsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getPlaylistSongList({ + query: { + id: playlistId, + limit, + startIndex, + ...filters, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); const songs = api.normalize.songList(songsRes, server); diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx index ed39ded0..7b34e08b 100644 --- a/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx +++ b/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx @@ -138,17 +138,20 @@ export const PlaylistDetailSongListHeader = ({ ...filters, }); - const songsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getPlaylistSongList({ - query: { - id: playlistId, - limit, - startIndex, - ...filters, - }, - server, - signal, - }), + const songsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getPlaylistSongList({ + query: { + id: playlistId, + limit, + startIndex, + ...filters, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); const songs = api.normalize.songList(songsRes, server); diff --git a/src/renderer/features/playlists/components/playlist-list-content.tsx b/src/renderer/features/playlists/components/playlist-list-content.tsx index 10d9a269..27e821fd 100644 --- a/src/renderer/features/playlists/components/playlist-list-content.tsx +++ b/src/renderer/features/playlists/components/playlist-list-content.tsx @@ -85,16 +85,19 @@ export const PlaylistListContent = ({ tableRef }: PlaylistListContentProps) => { ...page.filter, }); - const playlistsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getPlaylistList({ - query: { - limit, - startIndex, - ...page.filter, - }, - server, - signal, - }), + const playlistsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getPlaylistList({ + query: { + limit, + startIndex, + ...page.filter, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); const playlists = api.normalize.playlistList(playlistsRes, server); diff --git a/src/renderer/features/playlists/components/playlist-list-header.tsx b/src/renderer/features/playlists/components/playlist-list-header.tsx index c65f0bf4..bd25f0dd 100644 --- a/src/renderer/features/playlists/components/playlist-list-header.tsx +++ b/src/renderer/features/playlists/components/playlist-list-header.tsx @@ -88,16 +88,19 @@ export const PlaylistListHeader = ({ tableRef }: PlaylistListHeaderProps) => { ...pageFilters, }); - const playlistsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getPlaylistList({ - query: { - limit, - startIndex, - ...pageFilters, - }, - server, - signal, - }), + const playlistsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getPlaylistList({ + query: { + limit, + startIndex, + ...pageFilters, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); const playlists = api.normalize.playlistList(playlistsRes, server); diff --git a/src/renderer/features/songs/components/song-list-content.tsx b/src/renderer/features/songs/components/song-list-content.tsx index 4d33cd62..62b15045 100644 --- a/src/renderer/features/songs/components/song-list-content.tsx +++ b/src/renderer/features/songs/components/song-list-content.tsx @@ -86,16 +86,19 @@ export const SongListContent = ({ tableRef }: SongListContentProps) => { ...page.filter, }); - const songsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getSongList({ - query: { - limit, - startIndex, - ...page.filter, - }, - server, - signal, - }), + const songsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getSongList({ + query: { + limit, + startIndex, + ...page.filter, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); const songs = api.normalize.songList(songsRes, server); diff --git a/src/renderer/features/songs/components/song-list-header.tsx b/src/renderer/features/songs/components/song-list-header.tsx index 4e0b71c2..1d6dd824 100644 --- a/src/renderer/features/songs/components/song-list-header.tsx +++ b/src/renderer/features/songs/components/song-list-header.tsx @@ -118,16 +118,19 @@ export const SongListHeader = ({ tableRef }: SongListHeaderProps) => { ...pageFilters, }); - const songsRes = await queryClient.fetchQuery(queryKey, async ({ signal }) => - api.controller.getSongList({ - query: { - limit, - startIndex, - ...pageFilters, - }, - server, - signal, - }), + const songsRes = await queryClient.fetchQuery( + queryKey, + async ({ signal }) => + api.controller.getSongList({ + query: { + limit, + startIndex, + ...pageFilters, + }, + server, + signal, + }), + { cacheTime: 1000 * 60 * 1 }, ); const songs = api.normalize.songList(songsRes, server);