From ebdeedc2ec29aacf48d2ba1856eb67bb66404438 Mon Sep 17 00:00:00 2001 From: Isaac Wise Date: Sat, 10 Feb 2024 16:45:25 -0600 Subject: [PATCH] Don't show select all if there are no links & fix public view --- components/LinkViews/LinkCard.tsx | 2 +- components/LinkViews/LinkList.tsx | 2 +- pages/collections/[id].tsx | 29 +++++++++++++++-------------- pages/tags/[id].tsx | 6 +++--- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/components/LinkViews/LinkCard.tsx b/components/LinkViews/LinkCard.tsx index 8ebcd52..374d8a5 100644 --- a/components/LinkViews/LinkCard.tsx +++ b/components/LinkViews/LinkCard.tsx @@ -68,7 +68,7 @@ export default function LinkCard({ const ref = useRef(null); const isVisible = useOnScreen(ref); - const permissions = usePermissions(collection.id as number); + const permissions = usePermissions(collection?.id as number); useEffect(() => { let interval: any; diff --git a/components/LinkViews/LinkList.tsx b/components/LinkViews/LinkList.tsx index fd5d7d3..00586eb 100644 --- a/components/LinkViews/LinkList.tsx +++ b/components/LinkViews/LinkList.tsx @@ -62,7 +62,7 @@ export default function LinkCardCompact({ ); }, [collections, links]); - const permissions = usePermissions(collection.id as number); + const permissions = usePermissions(collection?.id as number); const [showInfo, setShowInfo] = useState(false); diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index eb4a1aa..cdfc78d 100644 --- a/pages/collections/[id].tsx +++ b/pages/collections/[id].tsx @@ -43,7 +43,6 @@ export default function Index() { useState(); const permissions = usePermissions(activeCollection?.id as number); - console.log(permissions) useLinks({ collectionId: Number(router.query.id), sort: sortBy }); @@ -307,19 +306,21 @@ export default function Index() {
-
- handleSelectAll()} - checked={selectedLinks.length === links.length && links.length > 0} - /> - {selectedLinks.length > 0 && ( - - {selectedLinks.length} {selectedLinks.length === 1 ? 'link' : 'links'} selected - - )} -
+ {links.length > 0 && ( +
+ handleSelectAll()} + checked={selectedLinks.length === links.length && links.length > 0} + /> + {selectedLinks.length > 0 && ( + + {selectedLinks.length} {selectedLinks.length === 1 ? 'link' : 'links'} selected + + )} +
+ )}
{selectedLinks.length > 0 && (permissions === true || permissions?.canUpdate) &&