From 439c562002a9c4a3424d1246949985538cd0cc38 Mon Sep 17 00:00:00 2001 From: Isaac Wise Date: Thu, 22 Feb 2024 03:14:07 -0600 Subject: [PATCH 1/2] Fix deleting all links in a collection with bulk action --- pages/collections/[id].tsx | 22 +++++++++------------- pages/links/index.tsx | 17 +++++++---------- pages/links/pinned.tsx | 17 +++++++---------- pages/tags/[id].tsx | 26 +++++++++++--------------- 4 files changed, 34 insertions(+), 48 deletions(-) diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index 323e6e6..831e837 100644 --- a/pages/collections/[id].tsx +++ b/pages/collections/[id].tsx @@ -126,8 +126,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" : "" }...` ); @@ -139,8 +138,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" : "" }!` ); }; @@ -150,9 +148,8 @@ export default function Index() {
{activeCollection && ( @@ -327,11 +324,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" + }`} >
@@ -341,7 +337,7 @@ export default function Index() { - {editMode && ( + {(editMode && links.length > 0) && (
{links.length > 0 && (
diff --git a/pages/links/index.tsx b/pages/links/index.tsx index 3d99a9c..1b191ba 100644 --- a/pages/links/index.tsx +++ b/pages/links/index.tsx @@ -52,8 +52,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" : "" }...` ); @@ -65,8 +64,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" : "" }!` ); }; @@ -98,11 +96,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" + }`} >
@@ -112,7 +109,7 @@ export default function Links() {
- {editMode && ( + {(editMode && links.length > 0) && (
{links.length > 0 && (
diff --git a/pages/links/pinned.tsx b/pages/links/pinned.tsx index 4e8cc62..262aad5 100644 --- a/pages/links/pinned.tsx +++ b/pages/links/pinned.tsx @@ -50,8 +50,7 @@ export default function PinnedLinks() { const bulkDeleteLinks = async () => { const load = toast.loading( - `Deleting ${selectedLinks.length} Link${ - selectedLinks.length > 1 ? "s" : "" + `Deleting ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" }...` ); @@ -63,8 +62,7 @@ export default function PinnedLinks() { response.ok && toast.success( - `Deleted ${selectedLinks.length} Link${ - selectedLinks.length > 1 ? "s" : "" + `Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" }!` ); }; @@ -95,11 +93,10 @@ export default function PinnedLinks() { 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" + }`} >
@@ -109,7 +106,7 @@ export default function PinnedLinks() {
- {editMode && ( + {(editMode && links.length > 0) && (
{links.length > 0 && (
diff --git a/pages/tags/[id].tsx b/pages/tags/[id].tsx index 8924a3c..775dcc9 100644 --- a/pages/tags/[id].tsx +++ b/pages/tags/[id].tsx @@ -125,8 +125,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" : "" }...` ); @@ -138,8 +137,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" : "" }!` ); }; @@ -198,11 +196,10 @@ export default function Index() {

8 - ? "dropdown-end" - : "" - }`} + className={`dropdown dropdown-bottom font-normal ${activeTag?.name.length && activeTag?.name.length > 8 + ? "dropdown-end" + : "" + }`} >
@@ -266,7 +262,7 @@ export default function Index() {
- {editMode && ( + {(editMode && links.length > 0) && (
{links.length > 0 && (
From 5164f287d47bfc5726e21380ed6bfb44d79fbe80 Mon Sep 17 00:00:00 2001 From: Isaac Wise Date: Thu, 22 Feb 2024 03:15:14 -0600 Subject: [PATCH 2/2] format --- .../controllers/collections/postCollection.ts | 8 +++--- pages/collections/[id].tsx | 22 +++++++++------- pages/links/index.tsx | 17 +++++++----- pages/links/pinned.tsx | 17 +++++++----- pages/tags/[id].tsx | 26 +++++++++++-------- 5 files changed, 52 insertions(+), 38 deletions(-) diff --git a/lib/api/controllers/collections/postCollection.ts b/lib/api/controllers/collections/postCollection.ts index 94f4763..0ac533f 100644 --- a/lib/api/controllers/collections/postCollection.ts +++ b/lib/api/controllers/collections/postCollection.ts @@ -44,10 +44,10 @@ export default async function postCollection( color: collection.color, parent: collection.parentId ? { - connect: { - id: collection.parentId, - }, - } + connect: { + id: collection.parentId, + }, + } : undefined, }, include: { diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index 831e837..a4cac87 100644 --- a/pages/collections/[id].tsx +++ b/pages/collections/[id].tsx @@ -126,7 +126,8 @@ 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" : "" }...` ); @@ -138,7 +139,8 @@ export default function Index() { response.ok && toast.success( - `Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" + `Deleted ${selectedLinks.length} Link${ + selectedLinks.length > 1 ? "s" : "" }!` ); }; @@ -148,8 +150,9 @@ export default function Index() {
{activeCollection && ( @@ -324,10 +327,11 @@ 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" + }`} >
@@ -337,7 +341,7 @@ export default function Index() {
- {(editMode && links.length > 0) && ( + {editMode && links.length > 0 && (
{links.length > 0 && (
diff --git a/pages/links/index.tsx b/pages/links/index.tsx index 1b191ba..e8f1d98 100644 --- a/pages/links/index.tsx +++ b/pages/links/index.tsx @@ -52,7 +52,8 @@ 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" : "" }...` ); @@ -64,7 +65,8 @@ export default function Links() { response.ok && toast.success( - `Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" + `Deleted ${selectedLinks.length} Link${ + selectedLinks.length > 1 ? "s" : "" }!` ); }; @@ -96,10 +98,11 @@ 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" + }`} >
@@ -109,7 +112,7 @@ export default function Links() {
- {(editMode && links.length > 0) && ( + {editMode && links.length > 0 && (
{links.length > 0 && (
diff --git a/pages/links/pinned.tsx b/pages/links/pinned.tsx index 262aad5..f07f81a 100644 --- a/pages/links/pinned.tsx +++ b/pages/links/pinned.tsx @@ -50,7 +50,8 @@ export default function PinnedLinks() { const bulkDeleteLinks = async () => { const load = toast.loading( - `Deleting ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" + `Deleting ${selectedLinks.length} Link${ + selectedLinks.length > 1 ? "s" : "" }...` ); @@ -62,7 +63,8 @@ export default function PinnedLinks() { response.ok && toast.success( - `Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" + `Deleted ${selectedLinks.length} Link${ + selectedLinks.length > 1 ? "s" : "" }!` ); }; @@ -93,10 +95,11 @@ export default function PinnedLinks() { 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" + }`} >
@@ -106,7 +109,7 @@ export default function PinnedLinks() {
- {(editMode && links.length > 0) && ( + {editMode && links.length > 0 && (
{links.length > 0 && (
diff --git a/pages/tags/[id].tsx b/pages/tags/[id].tsx index 775dcc9..1d527f4 100644 --- a/pages/tags/[id].tsx +++ b/pages/tags/[id].tsx @@ -125,7 +125,8 @@ 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" : "" }...` ); @@ -137,7 +138,8 @@ export default function Index() { response.ok && toast.success( - `Deleted ${selectedLinks.length} Link${selectedLinks.length > 1 ? "s" : "" + `Deleted ${selectedLinks.length} Link${ + selectedLinks.length > 1 ? "s" : "" }!` ); }; @@ -196,10 +198,11 @@ export default function Index() {

8 - ? "dropdown-end" - : "" - }`} + className={`dropdown dropdown-bottom font-normal ${ + activeTag?.name.length && activeTag?.name.length > 8 + ? "dropdown-end" + : "" + }`} >
@@ -262,7 +266,7 @@ export default function Index() {
- {(editMode && links.length > 0) && ( + {editMode && links.length > 0 && (
{links.length > 0 && (