merged and fixed conflicts

app/components/list/filters/clear-search.tsx

@@ -1,14 +1,28 @@
 import type { ButtonProps } from "~/components/shared/button";
 import { Button } from "~/components/shared/button";
+import { useSearchParams } from "~/hooks/search-params";
 
 export const ClearSearch = ({
   buttonProps,
   children,
 }: {
   buttonProps?: ButtonProps;
   children?: string;
-}) => (
-  <Button to="." {...buttonProps}>
-    {children}
-  </Button>
-);
+}) => {
+  const [, setSearchParams] = useSearchParams();
+  return (
+    <Button
+      to="."
+      {...buttonProps}
+      onClick={() => {
+        setSearchParams((prev) => {
+          prev.delete("s");
+
+          return prev;
+        });
+      }}
+    >
+      {children}
+    </Button>
+  );
+};

app/components/list/index.tsx

@@ -100,7 +100,7 @@ export const List = React.forwardRef<HTMLDivElement, ListProps>(function List(
   const { items, totalItems, perPage, modelName } =
     useLoaderData<IndexResponse>();
   const { singular, plural } = modelName;
-  const totalIncomingItems = items.length;
+  const totalIncomingItems = items?.length;
   const hasItems = totalIncomingItems > 0;
   const selectedBulkItemsCount = useAtomValue(selectedBulkItemsCountAtom);
   const setSelectedBulkItems = useSetAtom(setSelectedBulkItemsAtom);

app/modules/asset/advanced-index-query.server.ts

@@ -21,8 +21,14 @@ export function generateWhereClause(
   if (search) {
     const words = search.trim().split(/\s+/).filter(Boolean);
     if (words.length > 0) {
-      const searchVector = words.join(" & ");
-      whereClause = Prisma.sql`${whereClause} AND (to_tsvector('english', a.title) @@ to_tsquery('english', ${searchVector}))`;
+      const searchQuery = words
+        .map((word) => `${word}:* | ${word}`)
+        .join(" | ");
+      whereClause = Prisma.sql`
+        ${whereClause} AND (
+          to_tsvector('english', a."title" || ' ' || COALESCE(a."description", '')) @@ to_tsquery('english', ${searchQuery})
+        )
+      `;
     }
   }
 

app/modules/asset/service.server.ts

@@ -740,10 +740,6 @@ export async function getAdvancedPaginatedAndFilterableAssets({
         ${assetReturnFragment}
       FROM sorted_asset_query aq;
     `;
-
-    console.log(query.sql);
-    console.log(query.values);
-
     const result = await db.$queryRaw<AdvancedIndexQueryResult>(query);
     const totalAssets = result[0].total_count;
     const assets: AdvancedIndexAsset[] = result[0].assets;