From 3ceb294f2bea51aaaec08689127674de4bd50cae Mon Sep 17 00:00:00 2001 From: jeffvli Date: Tue, 26 Oct 2021 09:22:09 -0700 Subject: [PATCH] Remove unused refetches --- src/components/dashboard/Dashboard.tsx | 12 +++------ src/components/library/AlbumList.tsx | 31 ++++++++++-------------- src/components/library/AlbumView.tsx | 7 ++---- src/components/library/ArtistList.tsx | 1 - src/components/library/FolderList.tsx | 8 +----- src/components/player/NowPlayingView.tsx | 26 +++++++++----------- src/components/playlist/PlaylistView.tsx | 6 ++--- src/components/shared/ContextMenu.tsx | 4 +-- src/components/starred/StarredView.tsx | 9 ++----- 9 files changed, 36 insertions(+), 68 deletions(-) diff --git a/src/components/dashboard/Dashboard.tsx b/src/components/dashboard/Dashboard.tsx index 9234741..4680849 100644 --- a/src/components/dashboard/Dashboard.tsx +++ b/src/components/dashboard/Dashboard.tsx @@ -28,26 +28,22 @@ const Dashboard = () => { const { isLoading: isLoadingRecent, data: recentAlbums }: any = useQuery( ['recentAlbums', musicFolder], - () => getAlbums({ type: 'recent', size: 20, musicFolderId: musicFolder }, 250), - { refetchOnWindowFocus: false } + () => getAlbums({ type: 'recent', size: 20, musicFolderId: musicFolder }, 250) ); const { isLoading: isLoadingNewest, data: newestAlbums }: any = useQuery( ['newestAlbums', musicFolder], - () => getAlbums({ type: 'newest', size: 20, musicFolderId: musicFolder }, 250), - { refetchOnWindowFocus: false } + () => getAlbums({ type: 'newest', size: 20, musicFolderId: musicFolder }, 250) ); const { isLoading: isLoadingRandom, data: randomAlbums }: any = useQuery( ['randomAlbums', musicFolder], - () => getAlbums({ type: 'random', size: 20, musicFolderId: musicFolder }, 250), - { refetchOnWindowFocus: false } + () => getAlbums({ type: 'random', size: 20, musicFolderId: musicFolder }, 250) ); const { isLoading: isLoadingFrequent, data: frequentAlbums }: any = useQuery( ['frequentAlbums', musicFolder], - () => getAlbums({ type: 'frequent', size: 20, musicFolderId: musicFolder }, 250), - { refetchOnWindowFocus: false } + () => getAlbums({ type: 'frequent', size: 20, musicFolderId: musicFolder }, 250) ); const handleFavorite = async (rowData: any) => { diff --git a/src/components/library/AlbumList.tsx b/src/components/library/AlbumList.tsx index 17ed927..eca1c82 100644 --- a/src/components/library/AlbumList.tsx +++ b/src/components/library/AlbumList.tsx @@ -65,28 +65,23 @@ const AlbumList = () => { musicFolderId: musicFolder, }), { - refetchOnWindowFocus: false, cacheTime: 3600000, // Stay in cache for 1 hour staleTime: Infinity, // Only allow manual refresh } ); - const { data: genres }: any = useQuery( - ['genreList'], - async () => { - const res = await getGenres(); - return res.map((genre: any) => { - if (genre.albumCount !== 0) { - return { - label: `${genre.value} (${genre.albumCount})`, - value: genre.value, - role: 'Genre', - }; - } - return null; - }); - }, - { refetchOnWindowFocus: false } - ); + const { data: genres }: any = useQuery(['genreList'], async () => { + const res = await getGenres(); + return res.map((genre: any) => { + if (genre.albumCount !== 0) { + return { + label: `${genre.value} (${genre.albumCount})`, + value: genre.value, + role: 'Genre', + }; + } + return null; + }); + }); const [searchQuery, setSearchQuery] = useState(''); const filteredData = useSearchQuery(searchQuery, albums, ['name', 'artist', 'genre', 'year']); diff --git a/src/components/library/AlbumView.tsx b/src/components/library/AlbumView.tsx index 2cbdc20..660ce87 100644 --- a/src/components/library/AlbumView.tsx +++ b/src/components/library/AlbumView.tsx @@ -42,7 +42,6 @@ interface AlbumParams { const AlbumView = ({ ...rest }: any) => { const dispatch = useAppDispatch(); - const multiSelect = useAppSelector((state) => state.multiSelect); const playQueue = useAppSelector((state) => state.playQueue); const misc = useAppSelector((state) => state.misc); const history = useHistory(); @@ -51,10 +50,8 @@ const AlbumView = ({ ...rest }: any) => { const { id } = useParams(); const albumId = rest.id ? rest.id : id; - const { isLoading, isError, data, error }: any = useQuery( - ['album', albumId], - () => getAlbum(albumId), - { refetchOnWindowFocus: multiSelect.selected.length < 1 } + const { isLoading, isError, data, error }: any = useQuery(['album', albumId], () => + getAlbum(albumId) ); const [searchQuery, setSearchQuery] = useState(''); const filteredData = useSearchQuery(searchQuery, data?.song, [ diff --git a/src/components/library/ArtistList.tsx b/src/components/library/ArtistList.tsx index 0dd41ae..66befa6 100644 --- a/src/components/library/ArtistList.tsx +++ b/src/components/library/ArtistList.tsx @@ -40,7 +40,6 @@ const ArtistList = () => { ['artistList', musicFolder], () => getArtists({ musicFolderId: musicFolder }), { - refetchOnWindowFocus: false, cacheTime: 3600000, // Stay in cache for 1 hour staleTime: Infinity, // Only allow manual refresh } diff --git a/src/components/library/FolderList.tsx b/src/components/library/FolderList.tsx index 097bdcd..713fda3 100644 --- a/src/components/library/FolderList.tsx +++ b/src/components/library/FolderList.tsx @@ -40,19 +40,13 @@ const FolderList = () => { const { isLoading, isError, data: indexData, error }: any = useQuery( ['indexes', musicFolder], - () => getIndexes({ musicFolderId: musicFolder }), - { - refetchOnReconnect: false, - refetchOnWindowFocus: false, - } + () => getIndexes({ musicFolderId: musicFolder }) ); const { isLoading: isLoadingFolderData, data: folderData }: any = useQuery( ['folder', folder.currentViewedFolder], () => getMusicDirectory({ id: folder.currentViewedFolder }), { enabled: folder.currentViewedFolder !== '', - refetchOnReconnect: false, - refetchOnWindowFocus: false, } ); diff --git a/src/components/player/NowPlayingView.tsx b/src/components/player/NowPlayingView.tsx index 0113497..da85a99 100644 --- a/src/components/player/NowPlayingView.tsx +++ b/src/components/player/NowPlayingView.tsx @@ -71,21 +71,17 @@ const NowPlayingView = () => { 'path', ]); - const { data: genres }: any = useQuery( - ['genreList'], - async () => { - const res = await getGenres(); - const genresOrderedBySongCount = _.orderBy(res, 'songCount', 'desc'); - return genresOrderedBySongCount.map((genre: any) => { - return { - label: `${genre.value} (${genre.songCount})`, - value: genre.value, - role: 'Genre', - }; - }); - }, - { refetchOnWindowFocus: false } - ); + const { data: genres }: any = useQuery(['genreList'], async () => { + const res = await getGenres(); + const genresOrderedBySongCount = _.orderBy(res, 'songCount', 'desc'); + return genresOrderedBySongCount.map((genre: any) => { + return { + label: `${genre.value} (${genre.songCount})`, + value: genre.value, + role: 'Genre', + }; + }); + }); useHotkeys( 'del', diff --git a/src/components/playlist/PlaylistView.tsx b/src/components/playlist/PlaylistView.tsx index d35103d..7d6aeb3 100644 --- a/src/components/playlist/PlaylistView.tsx +++ b/src/components/playlist/PlaylistView.tsx @@ -84,10 +84,8 @@ const PlaylistView = ({ ...rest }) => { const editTriggerRef = useRef(); const { id } = useParams(); const playlistId = rest.id ? rest.id : id; - const { isLoading, isError, data, error }: any = useQuery( - ['playlist', playlistId], - () => getPlaylist(playlistId), - { refetchOnWindowFocus: false } + const { isLoading, isError, data, error }: any = useQuery(['playlist', playlistId], () => + getPlaylist(playlistId) ); const [editName, setEditName] = useState(''); const [editDescription, setEditDescription] = useState(''); diff --git a/src/components/shared/ContextMenu.tsx b/src/components/shared/ContextMenu.tsx index 18618dd..7ead5be 100644 --- a/src/components/shared/ContextMenu.tsx +++ b/src/components/shared/ContextMenu.tsx @@ -109,9 +109,7 @@ export const GlobalContextMenu = () => { const [newPlaylistName, setNewPlaylistName] = useState(''); const [indexToMoveTo, setIndexToMoveTo] = useState(0); - const { data: playlists }: any = useQuery(['playlists', 'name'], () => getPlaylists('name'), { - refetchOnWindowFocus: false, - }); + const { data: playlists }: any = useQuery(['playlists', 'name'], () => getPlaylists('name')); const handlePlay = async () => { dispatch(setContextMenu({ show: false })); diff --git a/src/components/starred/StarredView.tsx b/src/components/starred/StarredView.tsx index 6d9a0db..717106e 100644 --- a/src/components/starred/StarredView.tsx +++ b/src/components/starred/StarredView.tsx @@ -26,7 +26,6 @@ const StarredView = () => { const history = useHistory(); const dispatch = useAppDispatch(); const queryClient = useQueryClient(); - const multiSelect = useAppSelector((state) => state.multiSelect); const folder = useAppSelector((state) => state.folder); const favorite = useAppSelector((state) => state.favorite); const config = useAppSelector((state) => state.config); @@ -39,12 +38,8 @@ const StarredView = () => { } }, [folder]); - const { isLoading, isError, data, error }: any = useQuery( - ['starred', musicFolder], - () => getStarred({ musicFolderId: musicFolder }), - { - refetchOnWindowFocus: multiSelect.selected.length < 1, - } + const { isLoading, isError, data, error }: any = useQuery(['starred', musicFolder], () => + getStarred({ musicFolderId: musicFolder }) ); const [searchQuery, setSearchQuery] = useState(''); const filteredData = useSearchQuery(