From 818b04b7815e6da11739d5f05014ee65b003d7af Mon Sep 17 00:00:00 2001
From: Daniel <daniel31x13@gmail.com>
Date: Wed, 5 Jul 2023 10:43:37 +0330
Subject: [PATCH] bug fix

---
 components/FilterSearchDropdown.tsx   | 11 -------
 lib/api/controllers/links/getLinks.ts | 41 ++++++++++-----------------
 types/global.ts                       |  1 -
 3 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/components/FilterSearchDropdown.tsx b/components/FilterSearchDropdown.tsx
index e9fc001..ab7313e 100644
--- a/components/FilterSearchDropdown.tsx
+++ b/components/FilterSearchDropdown.tsx
@@ -9,7 +9,6 @@ type Props = {
     name: boolean;
     url: boolean;
     description: boolean;
-    collection: boolean;
     tags: boolean;
   };
 };
@@ -53,16 +52,6 @@ export default function FilterSearchDropdown({
             })
           }
         />
-        <Checkbox
-          label="Collection"
-          state={searchFilter.collection}
-          onClick={() =>
-            setSearchFilter({
-              ...searchFilter,
-              collection: !searchFilter.collection,
-            })
-          }
-        />
         <Checkbox
           label="Tags"
           state={searchFilter.tags}
diff --git a/lib/api/controllers/links/getLinks.ts b/lib/api/controllers/links/getLinks.ts
index 944f040..127ccd1 100644
--- a/lib/api/controllers/links/getLinks.ts
+++ b/lib/api/controllers/links/getLinks.ts
@@ -41,6 +41,21 @@ export default async function getLink(userId: number, body: string) {
         }
       : undefined,
     where: {
+      collection: {
+        id: query.collectionId ? query.collectionId : undefined, // If collectionId was defined, filter by collection
+        OR: [
+          {
+            ownerId: userId,
+          },
+          {
+            members: {
+              some: {
+                userId,
+              },
+            },
+          },
+        ],
+      },
       [query.searchQuery ? "OR" : "AND"]: [
         {
           pinnedBy: query.pinnedOnly ? { some: { id: userId } } : undefined,
@@ -72,32 +87,6 @@ export default async function getLink(userId: number, body: string) {
             mode: "insensitive",
           },
         },
-        {
-          collection: {
-            id: query.collectionId ? query.collectionId : undefined, // If collectionId was defined, filter by collection
-            name:
-              query.searchQuery && query.searchFilter?.collection
-                ? {
-                    contains: query.searchQuery,
-                    mode: "insensitive",
-                  }
-                : undefined,
-            OR: query.searchQuery
-              ? undefined
-              : [
-                  {
-                    ownerId: userId,
-                  },
-                  {
-                    members: {
-                      some: {
-                        userId,
-                      },
-                    },
-                  },
-                ],
-          },
-        },
         {
           tags:
             query.searchQuery && !query.searchFilter?.tags
diff --git a/types/global.ts b/types/global.ts
index ab96c7a..a0c3f92 100644
--- a/types/global.ts
+++ b/types/global.ts
@@ -60,7 +60,6 @@ export type LinkSearchFilter = {
   name: boolean;
   url: boolean;
   description: boolean;
-  collection: boolean;
   tags: boolean;
 };