Allow collections with the same name

components/InputSelect/CollectionSelection.tsx

@@ -10,11 +10,11 @@ type Props = {
   onChange: any;
   showDefaultValue?: boolean;
   defaultValue?:
-    | {
+  | {
-        label: string;
+    label: string;
-        value?: number;
+    value?: number;
-      }
+  }
-    | undefined;
+  | undefined;
   creatable?: boolean;
 };
 
@@ -44,12 +44,54 @@ export default function CollectionSelection({
 
   useEffect(() => {
     const formatedCollections = collections.map((e) => {
-      return { value: e.id, label: e.name, ownerId: e.ownerId };
+      return { value: e.id, label: e.name, ownerId: e.ownerId, count: e._count, parentId: e.parentId };
     });
 
     setOptions(formatedCollections);
   }, [collections]);
 
+  const getParentNames = (parentId: number): string[] => {
+    const parentNames = [];
+    const parent = collections.find((e) => e.id === parentId);
+
+    if (parent) {
+      parentNames.push(parent.name);
+      if (parent.parentId) {
+        parentNames.push(...getParentNames(parent.parentId));
+      }
+    }
+
+    // Have the top level parent at beginning
+    return parentNames.reverse();
+  }
+
+  const customOption = ({ data, innerProps }: any) => {
+    return (
+      <div
+        {...innerProps}
+        className='px-2 py-2 last:border-0 border-b border-neutral-content hover:bg-primary/20 cursor-pointer'
+      >
+        <div className="flex w-full justify-between items-center">
+          <span>
+            {data.label}
+          </span>
+          <span>
+            {data.count?.links}
+          </span>
+        </div>
+        <div className="text-xs text-gray-600 dark:text-gray-300">
+          {getParentNames(data?.parentId).length > 0 ? (
+            <>
+              {getParentNames(data.parentId).join(' > ')} {'>'} {data.label}
+            </>
+          ) : (
+            data.label
+          )}
+        </div>
+      </div>
+    );
+  };
+
   if (creatable) {
     return (
       <CreatableSelect
@@ -60,7 +102,10 @@ export default function CollectionSelection({
         options={options}
         styles={styles}
         defaultValue={showDefaultValue ? defaultValue : null}
-        // menuPosition="fixed"
+        components={{
+          Option: customOption,
+        }}
+      // menuPosition="fixed"
       />
     );
   } else {
@@ -73,7 +118,7 @@ export default function CollectionSelection({
         options={options}
         styles={styles}
         defaultValue={showDefaultValue ? defaultValue : null}
-        // menuPosition="fixed"
+      // menuPosition="fixed"
       />
     );
   }

lib/api/controllers/collections/getCollections.ts

@@ -12,6 +12,12 @@ export default async function getCollection(userId: number) {
       _count: {
         select: { links: true },
       },
+      parent: {
+        select: {
+          id: true,
+          name: true,
+        },
+      },
       members: {
         include: {
           user: {

lib/api/controllers/collections/postCollection.ts

@@ -32,27 +32,6 @@ export default async function postCollection(
       };
   }
 
-  const findCollection = await prisma.user.findUnique({
-    where: {
-      id: userId,
-    },
-    select: {
-      collections: {
-        where: {
-          name: collection.name,
-        },
-      },
-    },
-  });
-
-  const checkIfCollectionExists = findCollection?.collections[0];
-
-  if (checkIfCollectionExists)
-    return {
-      response: "Oops! There's already a Collection with that name.",
-      status: 400,
-    };
-
   const newCollection = await prisma.collection.create({
     data: {
       owner: {
@@ -65,10 +44,10 @@ export default async function postCollection(
       color: collection.color,
       parent: collection.parentId
         ? {
-            connect: {
+          connect: {
-              id: collection.parentId,
+            id: collection.parentId,
-            },
+          },
-          }
+        }
         : undefined,
     },
     include: {

lib/api/controllers/links/postLink.ts

@@ -88,14 +88,11 @@ export default async function postLink(
       collection: {
         connectOrCreate: {
           where: {
-            name_ownerId: {
+            id: link.collection.id ?? 0,
-              ownerId: link.collection.ownerId,
-              name: link.collection.name,
-            },
           },
           create: {
             name: link.collection.name.trim(),
-            ownerId: userId,
+            ownerId: userId
           },
         },
       },

prisma/migrations/20240218080348_allow_duplicate_collection_names/migration.sql

@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "Collection_name_ownerId_key";

prisma/schema.prisma

@@ -91,8 +91,6 @@ model Collection {
   links           Link[]
   createdAt       DateTime              @default(now())
   updatedAt       DateTime              @default(now()) @updatedAt
-
-  @@unique([name, ownerId])
 }
 
 model UsersAndCollections {