Merge pull request #1568 from Shelf-nu/1567-bug-broken-query-in-simpl…

…e-index-search fix: broken query in simple index:
Shelf-nu · Jan 9, 2025 · 4e4f7c6 · 4e4f7c6
2 parents c83000e + c58886c
commit 4e4f7c6
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 673 deletions.
diff --git a/app/components/assets/assets-index/advanced-asset-columns.tsx b/app/components/assets/assets-index/advanced-asset-columns.tsx
@@ -39,7 +39,6 @@ import {
   type AssetIndexLoaderData,
 } from "~/routes/_layout+/assets._index";
 import { getCustomFieldDisplayValue } from "~/utils/custom-fields";
-import { markSubstring } from "~/utils/mark-substring";
 import { isLink } from "~/utils/misc";
 import {
   PermissionAction,
@@ -149,7 +148,7 @@ export function AdvancedIndexColumn({
                   className="font-medium underline hover:text-gray-600"
                   title={item.title}
                 >
-                  {markSubstring(item.title)}
+                  {item.title}
                 </Link>
               </div>
             </div>

diff --git a/app/modules/asset/data.server.ts b/app/modules/asset/data.server.ts
@@ -175,7 +175,7 @@ export async function simpleModeLoader({
       searchFieldLabel: "Search assets",
       searchFieldTooltip: {
         title: "Search your asset database",
-        text: "Search assets based on asset name or description, category, tag, location, custodian name. Simply separate your keywords by a space: 'Laptop lenovo 2020'.",
+        text: "Search assets based on asset name or description, category, tag, location, custodian name. Separate your keywords by a comma(,) to search with OR condition. For example: searching 'Laptop, lenovo, 2020' will find assets matching any of these terms.",
       },
       totalCategories,
       totalTags,
@@ -357,7 +357,7 @@ export async function advancedModeLoader({
       searchFieldLabel: "Search by asset name",
       searchFieldTooltip: {
         title: "Search your asset database",
-        text: "Search assets based on asset name Simply separate your keywords by a space: 'Laptop lenovo 2020'.",
+        text: "Search assets based on asset name. Separate your keywords by a comma(,) to search with OR condition. For example: searching 'Laptop, lenovo, 2020' will find assets matching any of these terms.",
       },
       filters,
       organizationId,

diff --git a/app/modules/asset/query.server.ts b/app/modules/asset/query.server.ts
@@ -29,10 +29,23 @@ export function generateWhereClause(
   }
 
   if (search) {
-    const words = search.trim().split(/\s+/).filter(Boolean);
+    const words = search
+      .trim()
+      .split(",")
+      .map((term) => term.trim())
+      .filter(Boolean);
+
     if (words.length > 0) {
-      const searchPattern = `%${words.join("%")}%`;
-      whereClause = Prisma.sql`${whereClause} AND a."title" ILIKE ${searchPattern}`;
+      // Create OR conditions for each search term
+      const searchConditions = words.map(
+        (term) => Prisma.sql`a.title ILIKE ${`%${term}%`}`
+      );
+
+      // Combine all search terms with OR
+      whereClause = Prisma.sql`${whereClause} AND (${Prisma.join(
+        searchConditions,
+        " OR "
+      )})`;
     }
   }
 

diff --git a/app/modules/asset/service.server.ts b/app/modules/asset/service.server.ts
@@ -249,7 +249,8 @@ async function getAssets(params: {
       const searchTerms = search
         .toLowerCase()
         .trim()
-        .split(/\s+/)
+        .split(",")
+        .map((term) => term.trim())
         .filter(Boolean);
 
       where.OR = searchTerms.map((term) => ({

diff --git a/app/routes/_layout+/assets._index.tsx b/app/routes/_layout+/assets._index.tsx
@@ -67,7 +67,6 @@ import { checkExhaustiveSwitch } from "~/utils/check-exhaustive-switch";
 import { sendNotification } from "~/utils/emitter/send-notification.server";
 import { ShelfError, makeShelfError } from "~/utils/error";
 import { data, error, parseData } from "~/utils/http.server";
-import { markSubstring } from "~/utils/mark-substring";
 import {
   PermissionAction,
   PermissionEntity,
@@ -416,7 +415,7 @@ const ListAssetContent = ({ item }: { item: AssetsFromViewItem }) => {
             </div>
             <div className="min-w-[130px]">
               <span className="word-break mb-1 block font-medium">
-                {markSubstring(item.title)}
+                {item.title}
               </span>
               <div>
                 <AssetStatusBadge

diff --git a/app/utils/mark-substring.tsx b/app/utils/mark-substring.tsx
@@ -1,11 +1,26 @@
+/**
+ * This is temp deprecated until we find a better way to implement it.
+ */
+
 export function markSubstring(string: string) {
   const searchParams = new URLSearchParams(window.location.search);
 
   let content = <>{string}</>;
 
   if (searchParams.has("s")) {
     const searchQuery = searchParams.get("s")?.toLowerCase() as string;
-    const searchIndex = string.toLowerCase().indexOf(searchQuery);
+    const searchTerms = searchQuery.split(",").map((term) => term.trim());
+    let searchIndex = -1;
+    let currentSearchTerm = "";
+
+    for (const term of searchTerms) {
+      const index = string.toLowerCase().indexOf(term);
+      if (index !== -1 && (searchIndex === -1 || index < searchIndex)) {
+        searchIndex = index;
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        currentSearchTerm = term;
+      }
+    }
     if (searchIndex !== -1) {
       const searchLength = searchQuery.length;
       content = (