@stoker-platform/web-app 0.5.161 → 0.5.163

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @stoker-platform/web-app
 
+## 0.5.163
+
+### Patch Changes
+
+- fix: improve list search results sorting
+
+## 0.5.162
+
+### Patch Changes
+
+- fix: improve local full text search filtering
+    - @stoker-platform/node-client@0.5.65
+    - @stoker-platform/utils@0.5.56
+    - @stoker-platform/web-client@0.5.66
+
 ## 0.5.161
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/web-app",
-    "version": "0.5.161",
+    "version": "0.5.163",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "scripts": {
@@ -51,9 +51,9 @@
         "@radix-ui/react-tooltip": "^1.2.8",
         "@react-google-maps/api": "^2.20.8",
         "@sentry/react": "^10.56.0",
-        "@stoker-platform/node-client": "0.5.64",
-        "@stoker-platform/utils": "0.5.55",
-        "@stoker-platform/web-client": "0.5.65",
+        "@stoker-platform/node-client": "0.5.65",
+        "@stoker-platform/utils": "0.5.56",
+        "@stoker-platform/web-client": "0.5.66",
         "@tanstack/react-table": "^8.21.3",
         "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",

package/src/Form.tsx

@@ -171,7 +171,6 @@ import {
 import { FiltersProvider } from "./providers/FiltersProvider"
 import Collection from "./Collection"
 import { Separator } from "./components/ui/separator"
-import { SearchResult } from "minisearch"
 import { sortList } from "./utils/sortList"
 import MonthPicker from "./components/ui/month-picker"
 
@@ -2050,11 +2049,7 @@ function RelationField({
                         data.records.filter((doc) => {
                             if (!isCollectionPreloadCacheEnabled) return true
                             if (!fieldCustomization.admin?.filterResults) return true
-                            return !!fieldCustomization.admin?.filterResults?.(
-                                doc as unknown as SearchResult,
-                                collection,
-                                record,
-                            )
+                            return !!fieldCustomization.admin?.filterResults?.(doc, collection, record)
                         }),
                     ).then((data) => {
                         setData(data.slice(0, numberOfResults))

package/src/List.tsx

@@ -635,10 +635,19 @@ export function List({
         return [selectColumnDef, ...fieldColumns]
     }, [fields, isPreloadCacheEnabled, isServerReadOnly, recordTitleField, connectionStatus])
 
+    const isSearchRelevanceOrder = !!(search && isPreloadCacheEnabled)
+
     const searchList = useMemo(() => {
         if (search && (isPreloadCacheEnabled || isServerReadOnly)) {
-            const searchResults = localFullTextSearch(collection, search, list || []).map((result) => result.id)
-            return list?.filter((record) => searchResults.includes(record.id)) || []
+            const searchResults = localFullTextSearch(collection, search, list || [])
+            if (isPreloadCacheEnabled) {
+                const recordsById = new Map((list || []).map((record) => [record.id, record]))
+                return searchResults
+                    .map((result) => recordsById.get(result.id))
+                    .filter((record): record is StokerRecord => record !== undefined)
+            }
+            const searchResultIds = searchResults.map((result) => result.id)
+            return list?.filter((record) => searchResultIds.includes(record.id)) || []
         }
         return list || []
     }, [isPreloadCacheEnabled, isServerReadOnly, list, search])
@@ -658,6 +667,7 @@ export function List({
         getCoreRowModel: getCoreRowModel(),
         getPaginationRowModel: getPaginationRowModel(),
         onSortingChange: (sortingUpdater) => {
+            if (isSearchRelevanceOrder) return
             if (typeof sortingUpdater === "function") {
                 const newSorting = sortingUpdater(sorting)
                 const field = getField(fields, newSorting[0].id)
@@ -697,9 +707,9 @@ export function List({
         onRowSelectionChange: setRowSelection,
         pageCount,
         autoResetPageIndex: false,
-        enableSorting: true,
+        enableSorting: !isSearchRelevanceOrder,
         state: {
-            sorting,
+            sorting: isSearchRelevanceOrder ? [] : sorting,
             columnFilters,
             rowSelection,
             pagination: {

package/src/utils/localFullTextSearch.ts

@@ -1,11 +1,11 @@
 import { CollectionSchema, StokerRecord } from "@stoker-platform/types"
-import MiniSearch, { Options, SearchResult } from "minisearch"
+import MiniSearch, { Options } from "minisearch"
 
 export const localFullTextSearch = (
     collection: CollectionSchema,
     query: string,
     list: StokerRecord[],
-    filter?: (result: SearchResult) => boolean,
+    filter?: (result: StokerRecord) => boolean,
     tokenize?: boolean,
 ) => {
     const { recordTitleField, fullTextSearch } = collection
@@ -17,14 +17,15 @@ export const localFullTextSearch = (
                 fuzzy: 0.2,
                 prefix: true,
             }),
-            filter,
         },
     }
+    if (filter) {
+        list = list.filter((record) => filter(record))
+    }
     if (tokenize) {
         miniSearchConfig.tokenize = (string) => [string]
     }
     const miniSearch = new MiniSearch(miniSearchConfig)
-    // eslint-disable-next-line security/detect-object-injection
     miniSearch.addAll(list)
     const results = miniSearch.search(query)
     return results