@stoker-platform/web-app 0.5.163 → 0.5.165

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @stoker-platform/web-app
 
+## 0.5.165
+
+### Patch Changes
+
+- feat: add secondary sort feature
+    - @stoker-platform/node-client@0.5.66
+    - @stoker-platform/utils@0.5.57
+    - @stoker-platform/web-client@0.5.67
+
+## 0.5.164
+
+### Patch Changes
+
+- feat: provide previous to onChange
+
 ## 0.5.163
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/web-app",
-    "version": "0.5.163",
+    "version": "0.5.165",
     "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.65",
-        "@stoker-platform/utils": "0.5.56",
-        "@stoker-platform/web-client": "0.5.66",
+        "@stoker-platform/node-client": "0.5.66",
+        "@stoker-platform/utils": "0.5.57",
+        "@stoker-platform/web-client": "0.5.67",
         "@tanstack/react-table": "^8.21.3",
         "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",

package/src/Collection.tsx

@@ -183,6 +183,13 @@ function Collection({
           }
         | undefined
     >(undefined)
+    const [secondarySort, setSecondarySort] = useState<
+        | {
+              field: string
+              direction?: "asc" | "desc"
+          }
+        | undefined
+    >(undefined)
 
     const [state, setStokerState] = useStokerState()
     const setState = useCallback(
@@ -1194,6 +1201,16 @@ function Collection({
                   }
                 | undefined
             setDefaultSort(defaultSortOverride || defaultSort)
+            const secondarySort = (await getCachedConfigValue(customization, [
+                ...collectionAdminPath,
+                "secondarySort",
+            ])) as
+                | {
+                      field: string
+                      direction?: "asc" | "desc"
+                  }
+                | undefined
+            setSecondarySort(secondarySort)
             const sortState = state[`collection-sort-${labels.collection.toLowerCase()}`]
             if (sortState && !relationList) {
                 const newSorting = JSON.parse(sortState)
@@ -2513,6 +2530,7 @@ function Collection({
                                                 setBackToStartKey={setBackToStartKey}
                                                 search={search}
                                                 defaultSort={defaultSort}
+                                                secondarySort={secondarySort}
                                                 setOptimisticList={setOptimisticList}
                                                 relationList={relationList}
                                                 relationCollection={relationCollection}

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

@@ -212,6 +212,12 @@ interface ListProps {
               direction?: "asc" | "desc"
           }
         | undefined
+    secondarySort:
+        | {
+              field: string
+              direction?: "asc" | "desc"
+          }
+        | undefined
     setOptimisticList: () => void
     relationList?: RelationList
     relationCollection?: CollectionSchema
@@ -237,6 +243,7 @@ export function List({
     setBackToStartKey,
     search,
     defaultSort,
+    secondarySort,
     setOptimisticList,
     relationList,
     relationCollection,
@@ -838,7 +845,10 @@ export function List({
         } else if (recordTitleField) {
             setSorting([{ id: recordTitleField, desc: false }])
         }
-    }, [table, recordTitleField])
+        if ((isPreloadCacheEnabled || isServerReadOnly) && secondarySort) {
+            setSorting((prev) => [...prev, { id: secondarySort.field, desc: secondarySort.direction === "desc" }])
+        }
+    }, [table, recordTitleField, secondarySort, isPreloadCacheEnabled, isServerReadOnly])
 
     useEffect(() => {
         if (isPreloadCacheEnabled || isServerReadOnly) {