Merge pull request #492 from IsaacWise06/issue/442

feat(links): Allow the user to enable/disable merging duplicates

components/CollectionListing.tsx

@@ -226,8 +226,7 @@ const renderItem = (
   return (
     <div ref={provided.innerRef} {...provided.draggableProps} className="mb-1">
       <div
-        className={`${
+        className={`${currentPath === `/collections/${collection.id}`
-          currentPath === `/collections/${collection.id}`
             ? "bg-primary/20 is-active"
             : "hover:bg-neutral/20"
           } duration-100 flex gap-1 items-center pr-2 pl-1 rounded-md`}

components/ModalContent/NewLinkModal.tsx

@@ -109,7 +109,6 @@ export default function NewLinkModal({ onClose }: Props) {
         toast.success(`Created!`);
         onClose();
       } else toast.error(response.data as string);
-
       setSubmitLoader(false);
 
       return response;

lib/api/controllers/links/postLink.ts

@@ -87,6 +87,29 @@ export default async function postLink(
     return { response: "Uncaught error.", status: 500 };
   }
 
+  const user = await prisma.user.findUnique({
+    where: {
+      id: userId,
+    },
+  });
+
+  if (user?.preventDuplicateLinks) {
+    const existingLink = await prisma.link.findFirst({
+      where: {
+        url: link.url?.trim(),
+        collection: {
+          ownerId: userId,
+        },
+      },
+    });
+
+    if (existingLink)
+      return {
+        response: "Link already exists",
+        status: 409,
+      };
+  }
+
   const numberOfLinksTheUserHas = await prisma.link.count({
     where: {
       collection: {
@@ -126,7 +149,7 @@ export default async function postLink(
 
   const newLink = await prisma.link.create({
     data: {
-      url: link.url,
+      url: link.url?.trim(),
       name: link.name,
       description,
       type: linkType,

lib/api/controllers/users/userId/updateUserById.ts

@@ -190,6 +190,7 @@ export default async function updateUserById(
       archiveAsPDF: data.archiveAsPDF,
       archiveAsWaybackMachine: data.archiveAsWaybackMachine,
       linksRouteTo: data.linksRouteTo,
+      preventDuplicateLinks: data.preventDuplicateLinks,
       password:
         data.newPassword && data.newPassword !== ""
           ? newHashedPassword

pages/settings/preference.tsx

@@ -16,6 +16,8 @@ export default function Appearance() {
   const { account, updateAccount } = useAccountStore();
   const [user, setUser] = useState<AccountSettings>(account);
 
+  const [preventDuplicateLinks, setPreventDuplicateLinks] =
+    useState<boolean>(false);
   const [archiveAsScreenshot, setArchiveAsScreenshot] =
     useState<boolean>(false);
   const [archiveAsPDF, setArchiveAsPDF] = useState<boolean>(false);
@@ -32,6 +34,7 @@ export default function Appearance() {
       archiveAsPDF,
       archiveAsWaybackMachine,
       linksRouteTo,
+      preventDuplicateLinks,
     });
   }, [
     account,
@@ -39,6 +42,7 @@ export default function Appearance() {
     archiveAsPDF,
     archiveAsWaybackMachine,
     linksRouteTo,
+    preventDuplicateLinks,
   ]);
 
   function objectIsEmpty(obj: object) {
@@ -51,6 +55,7 @@ export default function Appearance() {
       setArchiveAsPDF(account.archiveAsPDF);
       setArchiveAsWaybackMachine(account.archiveAsWaybackMachine);
       setLinksRouteTo(account.linksRouteTo);
+      setPreventDuplicateLinks(account.preventDuplicateLinks);
     }
   }, [account]);
 
@@ -144,6 +149,13 @@ export default function Appearance() {
           <p className="capitalize text-3xl font-thin inline">Link Settings</p>
 
           <div className="divider my-3"></div>
+          <div className="mb-3">
+            <Checkbox
+              label="Prevent duplicate links"
+              state={preventDuplicateLinks}
+              onClick={() => setPreventDuplicateLinks(!preventDuplicateLinks)}
+            />
+          </div>
 
           <p>Clicking on Links should:</p>
           <div className="p-3">

prisma/migrations/20240305045701_add_merge_duplicate_links/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "preventDuplicateLinks" BOOLEAN NOT NULL DEFAULT false;

prisma/schema.prisma

@@ -43,6 +43,7 @@ model User {
   accessTokens            AccessToken[]
   subscriptions           Subscription?
   linksRouteTo            LinksRouteTo          @default(ORIGINAL)
+  preventDuplicateLinks   Boolean               @default(false)
   archiveAsScreenshot     Boolean               @default(true)
   archiveAsPDF            Boolean               @default(true)
   archiveAsWaybackMachine Boolean               @default(false)