@stoker-platform/web-app 0.5.150 → 0.5.152

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @stoker-platform/web-app
 
+## 0.5.152
+
+### Patch Changes
+
+- fix: allow for missing values in relation sort
+
+## 0.5.151
+
+### Patch Changes
+
+- fix: process preloaded collection page number change immediately
+
 ## 0.5.150
 
 ### Patch Changes

package/package.json

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

package/src/List.tsx

@@ -740,23 +740,18 @@ export function List({
                 const field = getField(fields, columnId)
                 if (!isRelationField(field)) return 0
                 const titleField = field.titleField
+                let rawA: string
+                let rawB: string
                 if (titleField) {
-                    return (Object.values(rowA.original[field.name])[0] as StokerRecord)[titleField].toLowerCase() >
-                        (Object.values(rowB.original[field.name])[0] as StokerRecord)[titleField].toLowerCase()
-                        ? 1
-                        : (Object.values(rowA.original[field.name])[0] as StokerRecord)[titleField].toLowerCase() <
-                            (Object.values(rowB.original[field.name])[0] as StokerRecord)[titleField].toLowerCase()
-                          ? -1
-                          : 0
+                    const recordA = Object.values(rowA.original[field.name] ?? {})[0] as StokerRecord | undefined
+                    const recordB = Object.values(rowB.original[field.name] ?? {})[0] as StokerRecord | undefined
+                    rawA = recordA?.[titleField]?.toString().toLowerCase() ?? ""
+                    rawB = recordB?.[titleField]?.toString().toLowerCase() ?? ""
                 } else {
-                    return (Object.keys(rowA.original[field.name])[0] as string) >
-                        (Object.keys(rowB.original[field.name])[0] as string)
-                        ? 1
-                        : (Object.keys(rowA.original[field.name])[0] as string) <
-                            (Object.keys(rowB.original[field.name])[0] as string)
-                          ? -1
-                          : 0
+                    rawA = (Object.keys(rowA.original[field.name] ?? {})[0] ?? "").toLowerCase()
+                    rawB = (Object.keys(rowB.original[field.name] ?? {})[0] ?? "").toLowerCase()
                 }
+                return rawA > rawB ? 1 : rawA < rawB ? -1 : 0
             },
             dateSortingFn: (rowA, rowB, columnId) => {
                 const valueA = getSortingValue(
@@ -812,11 +807,13 @@ export function List({
         const timer = setTimeout(() => {
             if (isInitialized && fullTextSearch && !isPreloadCacheEnabled && !isServerReadOnly) {
                 backToStart()
-            } else if (isInitialized && (isPreloadCacheEnabled || isServerReadOnly)) {
-                setPageIndex(0)
-                setState(`collection-page-number-${labels.collection.toLowerCase()}`, "page", 1)
             }
         }, 750)
+
+        if (isInitialized && (isPreloadCacheEnabled || isServerReadOnly)) {
+            setPageIndex(0)
+            setState(`collection-page-number-${labels.collection.toLowerCase()}`, "page", 1)
+        }
         return () => clearTimeout(timer)
     }, [search])