From 5128bd44d8ab57a619ab19116fc44841066b791c Mon Sep 17 00:00:00 2001 From: Isaac Wise Date: Sun, 11 Feb 2024 02:02:14 -0600 Subject: [PATCH] keep edit buttons visible --- pages/collections/[id].tsx | 110 +++++++++++++++++----------------- pages/links/index.tsx | 118 ++++++++++++++++++------------------- 2 files changed, 110 insertions(+), 118 deletions(-) diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index e4deaef..81398d7 100644 --- a/pages/collections/[id].tsx +++ b/pages/collections/[id].tsx @@ -121,8 +121,7 @@ export default function Index() { const bulkDeleteLinks = async () => { const load = toast.loading( - `Deleting ${selectedLinks.length} Link${ - selectedLinks.length > 1 ? "s" : "" + `Deleting ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" }...` ); @@ -134,8 +133,7 @@ export default function Index() { response.ok && toast.success( - `Deleted ${selectedLinks.length} Link${ - selectedLinks.length > 1 ? "s" : "" + `Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" }!` ); }; @@ -145,9 +143,8 @@ export default function Index() {
{activeCollection && ( @@ -319,11 +316,10 @@ export default function Index() { setEditMode(!editMode); setSelectedLinks([]); }} - className={`btn btn-square btn-sm btn-ghost ${ - editMode - ? "bg-primary/20 hover:bg-primary/20" - : "hover:bg-neutral/20" - }`} + className={`btn btn-square btn-sm btn-ghost ${editMode + ? "bg-primary/20 hover:bg-primary/20" + : "hover:bg-neutral/20" + }`} >
@@ -333,53 +329,53 @@ export default function Index() { - {editMode && ( -
- {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) && ( - - )} - {selectedLinks.length > 0 && - (permissions === true || permissions?.canDelete) && ( - - )} +
+ {links.length > 0 && editMode && ( +
+ handleSelectAll()} + checked={ + selectedLinks.length === links.length && links.length > 0 + } + /> + {selectedLinks.length > 0 ? ( + + {selectedLinks.length}{" "} + {selectedLinks.length === 1 ? "link" : "links"} selected + + ) : ( + Nothing selected + )}
+ )} +
+ {(permissions === true || permissions?.canUpdate) && ( + + )} + {(permissions === true || permissions?.canDelete) && ( + + )}
- )} +
{links.some((e) => e.collectionId === Number(router.query.id)) ? ( link.collectionId as number) + links.map((link) => link.collectionId as number) ); useLinks({ sort: sortBy }); @@ -43,8 +43,7 @@ export default function Links() { const bulkDeleteLinks = async () => { const load = toast.loading( - `Deleting ${selectedLinks.length} Link${ - selectedLinks.length > 1 ? "s" : "" + `Deleting ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" }...` ); @@ -56,8 +55,7 @@ export default function Links() { response.ok && toast.success( - `Deleted ${selectedLinks.length} Link${ - selectedLinks.length > 1 ? "s" : "" + `Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" }!` ); }; @@ -71,6 +69,7 @@ export default function Links() { // @ts-ignore const LinkComponent = linkView[viewMode]; + console.log(collectivePermissions) return (
@@ -89,11 +88,10 @@ export default function Links() { setEditMode(!editMode); setSelectedLinks([]); }} - className={`btn btn-square btn-sm btn-ghost ${ - editMode - ? "bg-primary/20 hover:bg-primary/20" - : "hover:bg-neutral/20" - }`} + className={`btn btn-square btn-sm btn-ghost ${editMode + ? "bg-primary/20 hover:bg-primary/20" + : "hover:bg-neutral/20" + }`} >
@@ -103,57 +101,55 @@ export default function Links() {
- {editMode && ( -
- {links.length > 0 && ( -
- handleSelectAll()} - checked={ - selectedLinks.length === links.length && links.length > 0 - } - /> - {selectedLinks.length > 0 ? ( - - {selectedLinks.length}{" "} - {selectedLinks.length === 1 ? "link" : "links"} selected - - ) : ( - Nothing selected - )} -
- )} -
- {selectedLinks.length > 0 && - (collectivePermissions === true || - collectivePermissions?.canUpdate) && ( - - )} - {selectedLinks.length > 0 && - (collectivePermissions === true || - collectivePermissions?.canDelete) && ( - - )} +
+ {links.length > 0 && editMode && ( +
+ handleSelectAll()} + checked={ + selectedLinks.length === links.length && links.length > 0 + } + /> + {selectedLinks.length > 0 ? ( + + {selectedLinks.length}{" "} + {selectedLinks.length === 1 ? "link" : "links"} selected + + ) : ( + Nothing selected + )}
+ )} +
+ {(collectivePermissions === true || + collectivePermissions?.canUpdate) && ( + + )} + {(collectivePermissions === true || + collectivePermissions?.canDelete) && ( + + )}
- )} +
{links[0] ? (