From 5ae13652fe70ce8403242dacd179c391acf44b63 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 12 Jun 2020 00:34:11 +0200 Subject: [PATCH] feat(catalog/swr): simplify the code significantly. now we are talking. this library is the nutz --- .../components/CatalogPage/CatalogPage.tsx | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx index 50f8622aff..2c929c6867 100644 --- a/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx +++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.tsx @@ -61,21 +61,15 @@ const useStyles = makeStyles(theme => ({ export const CatalogPage: FC<{}> = () => { const catalogApi = useApi(catalogApiRef); - const { - starredEntities, - toggleStarredEntity, - isStarredEntity, - } = useStarredEntities(); + const { toggleStarredEntity, isStarredEntity } = useStarredEntities(); + const [selectedFilter, setSelectedFilter] = useState( defaultFilter, ); - const { data: entities, error, revalidate } = useStaleWhileRevalidate( - ['catalog', entityFilters[selectedFilter.id]], - async (_, filter) => { - return await catalogApi.getEntities(); - }, - { compare: () => false }, + const { data: entities, error } = useStaleWhileRevalidate( + ['catalog/all', entityFilters[selectedFilter.id]], + async () => catalogApi.getEntities(), ); const data = @@ -83,12 +77,6 @@ export const CatalogPage: FC<{}> = () => { entityFilters[selectedFilter.id](e, { isStarred: isStarredEntity(e) }), ) ?? []; - const revalidator = starredEntities.size || {}; - - useEffect(() => { - revalidate(); - }, [revalidate, revalidator]); - const onFilterSelected = useCallback( selected => setSelectedFilter(selected), [],