@stoker-platform/web-app 0.5.162 → 0.5.164

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @stoker-platform/web-app
 
+## 0.5.164
+
+### Patch Changes
+
+- feat: provide previous to onChange
+
+## 0.5.163
+
+### Patch Changes
+
+- fix: improve list search results sorting
+
 ## 0.5.162
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/web-app",
-    "version": "0.5.162",
+    "version": "0.5.164",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "scripts": {

package/src/Form.tsx

@@ -3733,6 +3733,8 @@ function RecordForm({
 
     const suppressDraftSaveRef = useRef(false)
 
+    const previous = useRef<StokerRecord | undefined>(undefined)
+
     useEffect(() => {
         if (!(suppressDraftSaveRef?.current || !isDirty)) {
             if (
@@ -3764,7 +3766,7 @@ function RecordForm({
                 tryPromise(customization.admin.onChange, [
                     operation,
                     cloneDeep(form.getValues()) as StokerRecord,
-                    prevState as StokerRecord,
+                    previous.current as StokerRecord,
                 ]).then((updatedRecord: StokerRecord) => {
                     if (updatedRecord && !isEqual(updatedRecord, formValues)) {
                         Object.entries(updatedRecord).forEach(([key, value]) => {
@@ -3773,6 +3775,7 @@ function RecordForm({
                     }
                 })
             }
+            previous.current = cloneDeep(form.getValues()) as StokerRecord
         }, 0)
     }, [form.watch()])
 
@@ -5226,7 +5229,7 @@ function RecordForm({
                                                                 Are you absolutely sure?
                                                             </AlertDialogTitle>
                                                             <AlertDialogDescription>
-                                                                {`This will remove system access for this ${labels.record}.`}
+                                                                {`This will remove system access for this ${recordTitle}.`}
                                                             </AlertDialogDescription>
                                                         </AlertDialogHeader>
                                                         <AlertDialogFooter>

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: {