From 2d0093172ace2cf288d2cfff6be4432297ec5772 Mon Sep 17 00:00:00 2001
From: Isaac Wise <iamisaacwise2006@gmail.com>
Date: Sun, 4 Feb 2024 23:43:59 -0600
Subject: [PATCH 1/2] Allow contributors to pin a link in a shared to a
 collection to their dashboard

---
 .../LinkViews/LinkComponents/LinkActions.tsx  |  7 ++--
 .../links/linkId/updateLinkById.ts            | 36 +++++++++++++++++--
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/components/LinkViews/LinkComponents/LinkActions.tsx b/components/LinkViews/LinkComponents/LinkActions.tsx
index c565cb1..4e04f47 100644
--- a/components/LinkViews/LinkComponents/LinkActions.tsx
+++ b/components/LinkViews/LinkComponents/LinkActions.tsx
@@ -67,9 +67,8 @@ export default function LinkActions({
   return (
     <>
       <div
-        className={`dropdown dropdown-left dropdown-end absolute ${
-          position || "top-3 right-3"
-        } z-20`}
+        className={`dropdown dropdown-left dropdown-end absolute ${position || "top-3 right-3"
+          } z-20`}
       >
         <div
           tabIndex={0}
@@ -80,7 +79,7 @@ export default function LinkActions({
           <i title="More" className="bi-three-dots text-xl" />
         </div>
         <ul className="dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box w-44 mr-1 translate-y-10">
-          {permissions === true ? (
+          {permissions ? (
             <li>
               <div
                 role="button"
diff --git a/lib/api/controllers/links/linkId/updateLinkById.ts b/lib/api/controllers/links/linkId/updateLinkById.ts
index 7f7fb2e..c7b1f84 100644
--- a/lib/api/controllers/links/linkId/updateLinkById.ts
+++ b/lib/api/controllers/links/linkId/updateLinkById.ts
@@ -21,6 +21,10 @@ export default async function updateLinkById(
     (e: UsersAndCollections) => e.userId === userId && e.canUpdate
   );
 
+  const canCreatePermission = collectionIsAccessible?.members.some(
+    (e: UsersAndCollections) => e.userId === userId && e.canCreate
+  );
+
   const isCollectionOwner =
     collectionIsAccessible?.ownerId === data.collection.ownerId &&
     data.collection.ownerId === userId;
@@ -34,6 +38,32 @@ export default async function updateLinkById(
       response: "You can't move a link to/from a collection you don't own.",
       status: 401,
     };
+
+  // If the user is able to create a link, they can pin it to their dashboard only.
+  if (canCreatePermission) {
+    const updatedLink = await prisma.link.update({
+      where: {
+        id: linkId,
+      },
+      data: {
+        pinnedBy: data?.pinnedBy && data.pinnedBy[0]
+          ? { connect: { id: userId } }
+          : { disconnect: { id: userId } },
+      },
+      include: {
+        collection: true,
+        pinnedBy: isCollectionOwner
+          ? {
+            where: { id: userId },
+            select: { id: true },
+          }
+          : undefined,
+      },
+    });
+
+    return { response: updatedLink, status: 200 };
+  }
+
   else if (collectionIsAccessible?.ownerId !== userId && !memberHasAccess)
     return {
       response: "Collection is not accessible.",
@@ -81,9 +111,9 @@ export default async function updateLinkById(
         collection: true,
         pinnedBy: isCollectionOwner
           ? {
-              where: { id: userId },
-              select: { id: true },
-            }
+            where: { id: userId },
+            select: { id: true },
+          }
           : undefined,
       },
     });

From daed2d82f4ff16bbb6fd6faea20a5bfb3bacaaa1 Mon Sep 17 00:00:00 2001
From: daniel31x13 <daniel31x13@gmail.com>
Date: Wed, 7 Feb 2024 09:48:40 -0500
Subject: [PATCH 2/2] minor improvements

---
 .../LinkViews/LinkComponents/LinkActions.tsx  | 35 ++++++++--------
 .../links/linkId/updateLinkById.ts            | 40 +++++++++----------
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/components/LinkViews/LinkComponents/LinkActions.tsx b/components/LinkViews/LinkComponents/LinkActions.tsx
index 4e04f47..d809dfc 100644
--- a/components/LinkViews/LinkComponents/LinkActions.tsx
+++ b/components/LinkViews/LinkComponents/LinkActions.tsx
@@ -67,8 +67,9 @@ export default function LinkActions({
   return (
     <>
       <div
-        className={`dropdown dropdown-left dropdown-end absolute ${position || "top-3 right-3"
-          } z-20`}
+        className={`dropdown dropdown-left dropdown-end absolute ${
+          position || "top-3 right-3"
+        } z-20`}
       >
         <div
           tabIndex={0}
@@ -79,22 +80,20 @@ export default function LinkActions({
           <i title="More" className="bi-three-dots text-xl" />
         </div>
         <ul className="dropdown-content z-[20] menu shadow bg-base-200 border border-neutral-content rounded-box w-44 mr-1 translate-y-10">
-          {permissions ? (
-            <li>
-              <div
-                role="button"
-                tabIndex={0}
-                onClick={() => {
-                  (document?.activeElement as HTMLElement)?.blur();
-                  pinLink();
-                }}
-              >
-                {link?.pinnedBy && link.pinnedBy[0]
-                  ? "Unpin"
-                  : "Pin to Dashboard"}
-              </div>
-            </li>
-          ) : undefined}
+          <li>
+            <div
+              role="button"
+              tabIndex={0}
+              onClick={() => {
+                (document?.activeElement as HTMLElement)?.blur();
+                pinLink();
+              }}
+            >
+              {link?.pinnedBy && link.pinnedBy[0]
+                ? "Unpin"
+                : "Pin to Dashboard"}
+            </div>
+          </li>
           {linkInfo !== undefined && toggleShowInfo ? (
             <li>
               <div
diff --git a/lib/api/controllers/links/linkId/updateLinkById.ts b/lib/api/controllers/links/linkId/updateLinkById.ts
index c7b1f84..ce6b920 100644
--- a/lib/api/controllers/links/linkId/updateLinkById.ts
+++ b/lib/api/controllers/links/linkId/updateLinkById.ts
@@ -21,10 +21,6 @@ export default async function updateLinkById(
     (e: UsersAndCollections) => e.userId === userId && e.canUpdate
   );
 
-  const canCreatePermission = collectionIsAccessible?.members.some(
-    (e: UsersAndCollections) => e.userId === userId && e.canCreate
-  );
-
   const isCollectionOwner =
     collectionIsAccessible?.ownerId === data.collection.ownerId &&
     data.collection.ownerId === userId;
@@ -32,31 +28,29 @@ export default async function updateLinkById(
   const unauthorizedSwitchCollection =
     !isCollectionOwner && collectionIsAccessible?.id !== data.collection.id;
 
-  // Makes sure collection members (non-owners) cannot move a link to/from a collection.
-  if (unauthorizedSwitchCollection)
-    return {
-      response: "You can't move a link to/from a collection you don't own.",
-      status: 401,
-    };
+  const canPinPermission = collectionIsAccessible?.members.some(
+    (e: UsersAndCollections) => e.userId === userId
+  );
 
   // If the user is able to create a link, they can pin it to their dashboard only.
-  if (canCreatePermission) {
+  if (canPinPermission) {
     const updatedLink = await prisma.link.update({
       where: {
         id: linkId,
       },
       data: {
-        pinnedBy: data?.pinnedBy && data.pinnedBy[0]
-          ? { connect: { id: userId } }
-          : { disconnect: { id: userId } },
+        pinnedBy:
+          data?.pinnedBy && data.pinnedBy[0]
+            ? { connect: { id: userId } }
+            : { disconnect: { id: userId } },
       },
       include: {
         collection: true,
         pinnedBy: isCollectionOwner
           ? {
-            where: { id: userId },
-            select: { id: true },
-          }
+              where: { id: userId },
+              select: { id: true },
+            }
           : undefined,
       },
     });
@@ -64,6 +58,12 @@ export default async function updateLinkById(
     return { response: updatedLink, status: 200 };
   }
 
+  // Makes sure collection members (non-owners) cannot move a link to/from a collection.
+  if (unauthorizedSwitchCollection)
+    return {
+      response: "You can't move a link to/from a collection you don't own.",
+      status: 401,
+    };
   else if (collectionIsAccessible?.ownerId !== userId && !memberHasAccess)
     return {
       response: "Collection is not accessible.",
@@ -111,9 +111,9 @@ export default async function updateLinkById(
         collection: true,
         pinnedBy: isCollectionOwner
           ? {
-            where: { id: userId },
-            select: { id: true },
-          }
+              where: { id: userId },
+              select: { id: true },
+            }
           : undefined,
       },
     });