@stoker-platform/web-app 0.5.148 → 0.5.150

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @stoker-platform/web-app
 
+## 0.5.150
+
+### Patch Changes
+
+- fix: fix page number / count when search present
+
+## 0.5.149
+
+### Patch Changes
+
+- fix: apply isMobile condition on initial retrieval
+
 ## 0.5.148
 
 ### Patch Changes

package/package.json

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

package/src/Filters.tsx

@@ -311,10 +311,10 @@ export function Filters({ collection, excluded, relationList }: FiltersProps) {
             }).then((data) => {
                 clearTimeout(pickerDebounceTimeout.current)
 
+                const numberOfResults = isCollectionPreloadCacheEnabled && isMobile ? 20 : 10
                 if (isCollectionPreloadCacheEnabled && query) {
                     const searchResults = localFullTextSearch(collectionSchema, query, data.records)
                     const objectIds = searchResults.map((result) => result.id)
-                    const numberOfResults = isMobile ? 20 : 10
                     setData((prev) => ({
                         ...prev,
                         [field]: data.records.filter((doc) => objectIds.includes(doc.id)).slice(0, numberOfResults),
@@ -322,7 +322,7 @@ export function Filters({ collection, excluded, relationList }: FiltersProps) {
                 } else {
                     setData((prev) => ({
                         ...prev,
-                        [field]: data.records.slice(0, 10),
+                        [field]: data.records.slice(0, numberOfResults),
                     }))
                 }
                 setLoadingImmediate((prev) => ({

package/src/Form.tsx

@@ -2021,13 +2021,13 @@ function RelationField({
             }).then((data) => {
                 clearTimeout(pickerDebounceTimeout.current)
 
+                const numberOfResults = isCollectionPreloadCacheEnabled && isMobile ? 20 : 10
                 if (isCollectionPreloadCacheEnabled && query) {
                     const searchResults = localFullTextSearch(relationCollection, query, data.records, (result) => {
                         if (!fieldCustomization.admin?.filterResults) return true
                         return !!fieldCustomization.admin?.filterResults?.(result, collection, record)
                     })
                     const objectIds = searchResults.map((result) => result.id)
-                    const numberOfResults = isMobile ? 20 : 10
                     orderData(data.records.filter((doc) => objectIds.includes(doc.id)).slice(0, numberOfResults)).then(
                         (data) => {
                             setData(data)
@@ -2045,7 +2045,7 @@ function RelationField({
                                     record,
                                 )
                             })
-                            .slice(0, 10),
+                            .slice(0, numberOfResults),
                     ).then((data) => {
                         setData(data)
                     })

package/src/List.tsx

@@ -812,6 +812,9 @@ 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)
         return () => clearTimeout(timer)
@@ -950,13 +953,13 @@ export function List({
                     }
                 }
             } else if (isInitialized && (isPreloadCacheEnabled || isServerReadOnly)) {
-                const newPageCount = Math.ceil(list.length / pageSize) || 1
+                const newPageCount = Math.ceil(searchList.length / pageSize) || 1
                 if (newPageCount !== pageCount) {
                     setPageCount(newPageCount)
                 }
             }
         }
-    }, [list])
+    }, [list, searchList])
 
     const nextPage = useCallback(() => {
         if (isLoading) return

package/src/PermissionPicker.tsx

@@ -139,13 +139,13 @@ export const PermissionPicker = ({
             }).then((data) => {
                 clearTimeout(pickerDebounceTimeout.current)
 
+                const numberOfResults = isCollectionPreloadCacheEnabled && isMobile ? 20 : 10
                 if (isCollectionPreloadCacheEnabled && query) {
                     const searchResults = localFullTextSearch(collection, query, data.records)
                     const objectIds = searchResults.map((result) => result.id)
-                    const numberOfResults = isMobile ? 20 : 10
                     setData(data.records.filter((doc) => objectIds.includes(doc.id)).slice(0, numberOfResults))
                 } else {
-                    setData(data.records.slice(0, 10))
+                    setData(data.records.slice(0, numberOfResults))
                 }
                 setIsLoadingImmediate(false)
                 setIsLoading(false)