@stoker-platform/web-app 0.5.176 → 0.5.178

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @stoker-platform/web-app
 
+## 0.5.178
+
+### Patch Changes
+
+- fix: fix filters button showing when no filters to show
+
+## 0.5.177
+
+### Patch Changes
+
+- fix: always use local search for serverReadOnly collections
+
 ## 0.5.176
 
 ### Patch Changes

package/package.json

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

package/src/Collection.tsx

@@ -1298,7 +1298,7 @@ function Collection({
             })
         }
         return excluded
-    }, [isPreloadCacheEnabled, cardsConfig, statusField, tab])
+    }, [isPreloadCacheEnabled, cardsConfig, statusField, tab, filters])
 
     const filtersActive = useMemo(() => {
         return (
@@ -1335,12 +1335,13 @@ function Collection({
             if (!field) return false
 
             if (filter.roles && !filter.roles.includes(userRole)) return false
+            if (relationList && relationList.field === filter.field) return false
 
             if (filter.type === "relation") {
                 if (!isRelationField(field)) return false
                 const relationCollection = schema.collections[field.collection]
-                if (!relationCollection || !relationCollection.fullTextSearch) return false
-                const collectionPermissions = permissions?.collections?.[relationCollection.labels.collection]
+                if (!relationCollection?.fullTextSearch) return false
+                const collectionPermissions = permissions.collections?.[relationCollection.labels.collection]
                 const fullCollectionAccess = collectionPermissions && collectionAccess("Read", collectionPermissions)
                 const dependencyAccess = hasDependencyAccess(relationCollection, schema, permissions)
                 if (!fullCollectionAccess && dependencyAccess.length === 0) return false
@@ -1572,7 +1573,7 @@ function Collection({
                     pushConstraint(softDelete.archivedField, "==", false)
                 }
 
-                if (fullTextSearch && !isPreloadCacheEnabled && query) {
+                if (fullTextSearch && !isPreloadCacheEnabled && !isServerReadOnly && query) {
                     const disjunctions = getFilterDisjunctions(collection)
                     const hitsPerPage =
                         disjunctions === 0 ? 10 : Math.min(10, Math.max(1, Math.floor(30 / disjunctions)))
@@ -1599,7 +1600,7 @@ function Collection({
                         | [string, WhereFilterOp, unknown][]
                         | QueryConstraint[],
                     only: isPreloadCacheEnabled ? "cache" : undefined,
-                    pagination: isPreloadCacheEnabled ? undefined : { number: 10 },
+                    pagination: isPreloadCacheEnabled || (isServerReadOnly && query) ? undefined : { number: 10 },
                     noEmbeddingFields: true,
                 })
 
@@ -1611,7 +1612,7 @@ function Collection({
                     return !array?.includes(parentId)
                 })
 
-                if (isPreloadCacheEnabled && query) {
+                if ((isPreloadCacheEnabled || isServerReadOnly) && query) {
                     const searchResults = localFullTextSearch(collection, query, filtered)
                     const objectIds = searchResults.map((result) => result.id)
                     setSelectableData(filtered.filter((doc) => objectIds.includes(doc.id)).slice(0, 10))

package/src/Filters.tsx

@@ -275,7 +275,7 @@ export function Filters({ collection, excluded, relationList }: FiltersProps) {
             }
 
             let searchObjectIDs: string[] | undefined
-            if (fullTextSearch && !isCollectionPreloadCacheEnabled && query) {
+            if (fullTextSearch && !isCollectionPreloadCacheEnabled && !isCollectionServerReadOnly && query) {
                 const disjunctions = getFilterDisjunctions(collectionSchema)
                 const hitsPerPage = disjunctions === 0 ? 10 : Math.min(10, Math.max(1, Math.floor(30 / disjunctions)))
                 const objectIDs = await performFullTextSearch(collectionSchema, query, hitsPerPage, constraints)
@@ -308,13 +308,16 @@ export function Filters({ collection, excluded, relationList }: FiltersProps) {
             getSome([collection], {
                 constraints: newConstraints as QueryConstraint[] | [string, WhereFilterOp, unknown][],
                 only: isCollectionPreloadCacheEnabled ? "cache" : undefined,
-                pagination: isCollectionPreloadCacheEnabled ? undefined : { number: 10 },
+                pagination:
+                    isCollectionPreloadCacheEnabled || (isCollectionServerReadOnly && query)
+                        ? undefined
+                        : { number: 10 },
                 noEmbeddingFields: true,
             }).then((data) => {
                 clearTimeout(pickerDebounceTimeout.current)
 
                 const numberOfResults = isCollectionPreloadCacheEnabled && isMobile ? 20 : 10
-                if (isCollectionPreloadCacheEnabled && query) {
+                if ((isCollectionPreloadCacheEnabled || isCollectionServerReadOnly) && query) {
                     const searchResults = localFullTextSearch(collectionSchema, query, data.records)
                     const recordsById = new Map(data.records.map((doc) => [doc.id, doc]))
                     const ordered = searchResults

package/src/Form.tsx

@@ -1974,7 +1974,7 @@ function RelationField({
             }
 
             let searchObjectIDs: string[] | undefined
-            if (fullTextSearch && !isCollectionPreloadCacheEnabled && query) {
+            if (fullTextSearch && !isCollectionPreloadCacheEnabled && !isCollectionServerReadOnly && query) {
                 const disjunctions = getFilterDisjunctions(relationCollection)
                 const hitsPerPage = disjunctions === 0 ? 10 : Math.min(10, Math.max(1, Math.floor(30 / disjunctions)))
                 const objectIDs = await performFullTextSearch(relationCollection, query, hitsPerPage, constraints)
@@ -2020,13 +2020,16 @@ function RelationField({
             getSome([labels.collection], {
                 constraints: newConstraints,
                 only: isCollectionPreloadCacheEnabled ? "cache" : undefined,
-                pagination: isCollectionPreloadCacheEnabled ? undefined : { number: 10 },
+                pagination:
+                    isCollectionPreloadCacheEnabled || (isCollectionServerReadOnly && query)
+                        ? undefined
+                        : { number: 10 },
                 noEmbeddingFields: true,
             }).then((data) => {
                 clearTimeout(pickerDebounceTimeout.current)
 
                 const numberOfResults = isCollectionPreloadCacheEnabled && isMobile ? 20 : 10
-                if (isCollectionPreloadCacheEnabled && query) {
+                if ((isCollectionPreloadCacheEnabled || isCollectionServerReadOnly) && query) {
                     const searchResults = localFullTextSearch(relationCollection, query, data.records, (result) => {
                         if (!fieldCustomization.admin?.filterResults) return true
                         return !!fieldCustomization.admin?.filterResults?.(result, collection, record)

package/src/PermissionPicker.tsx

@@ -109,7 +109,7 @@ export const PermissionPicker = ({
             }
 
             let searchObjectIDs: string[] | undefined
-            if (fullTextSearch && !isCollectionPreloadCacheEnabled && query) {
+            if (fullTextSearch && !isCollectionPreloadCacheEnabled && !isCollectionServerReadOnly && query) {
                 const disjunctions = getFilterDisjunctions(collection)
                 const hitsPerPage = disjunctions === 0 ? 10 : Math.min(10, Math.max(1, Math.floor(30 / disjunctions)))
                 const objectIDs = await performFullTextSearch(collection, query, hitsPerPage, constraints)
@@ -136,13 +136,16 @@ export const PermissionPicker = ({
             getSome([labels.collection], {
                 constraints: newConstraints,
                 only: isCollectionPreloadCacheEnabled ? "cache" : undefined,
-                pagination: isCollectionPreloadCacheEnabled ? undefined : { number: 10 },
+                pagination:
+                    isCollectionPreloadCacheEnabled || (isCollectionServerReadOnly && query)
+                        ? undefined
+                        : { number: 10 },
                 noEmbeddingFields: true,
             }).then((data) => {
                 clearTimeout(pickerDebounceTimeout.current)
 
                 const numberOfResults = isCollectionPreloadCacheEnabled && isMobile ? 20 : 10
-                if (isCollectionPreloadCacheEnabled && query) {
+                if ((isCollectionPreloadCacheEnabled || isCollectionServerReadOnly) && query) {
                     const searchResults = localFullTextSearch(collection, query, data.records)
                     const recordsById = new Map(data.records.map((doc) => [doc.id, doc]))
                     const ordered = searchResults

package/src/SearchAllResults.tsx

@@ -58,7 +58,7 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
             ],
         }
 
-        if (fullTextSearch && !isPreloadCacheEnabled) {
+        if (fullTextSearch && !isPreloadCacheEnabled && !isServerReadOnly) {
             const disjunctions = getFilterDisjunctions(collection)
             const hitsPerPage = disjunctions === 0 ? 5 : Math.min(5, Math.max(1, Math.floor(30 / disjunctions)))
             const algoliaConstraints: [string, "==" | "in", unknown][] = []
@@ -67,11 +67,7 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
             }
             const objectIDs = await performFullTextSearch(collection, search, hitsPerPage, algoliaConstraints)
             if (objectIDs.length > 0) {
-                if (isServerReadOnly) {
-                    query.queries[0].constraints = [["id", "in", objectIDs]]
-                } else {
-                    query.queries[0].constraints = [where("id", "in", objectIDs)]
-                }
+                query.queries[0].constraints = [where("id", "in", objectIDs)]
             } else if (search) {
                 setResults([])
                 setLoading(false)
@@ -105,7 +101,7 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
                             setResults(searchRecords.slice(0, MAX_RESULTS))
                             setLoading(false)
                         } else {
-                            setResults(loadedDocs)
+                            setResults(loadedDocs.slice(0, MAX_RESULTS))
                             setLoading(false)
                         }
 
@@ -151,13 +147,23 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
             }
 
             const getServerData = async () => {
+                const serverConstraints: [string, WhereFilterOp, unknown][] = []
+                if (softDelete?.archivedField) {
+                    serverConstraints.push([softDelete.archivedField, "==", false])
+                }
                 const data = await getSome([labels.collection], {
-                    constraints: query.queries[0].constraints as [string, WhereFilterOp, unknown][],
-                    pagination: {
-                        number: MAX_RESULTS,
-                    },
+                    constraints: serverConstraints,
+                    pagination: search && fullTextSearch ? undefined : { number: MAX_RESULTS },
                 })
-                setResults(data.records)
+                let records = data.records
+                if (search && fullTextSearch) {
+                    const searchResults = localFullTextSearch(collection, search, records)
+                    const recordsById = new Map(records.map((record) => [record.id, record]))
+                    records = searchResults
+                        .map((result) => recordsById.get(result.id))
+                        .filter((record): record is StokerRecord => record !== undefined)
+                }
+                setResults(records.slice(0, MAX_RESULTS))
                 setLoading(false)
                 resolve()
             }