@stoker-platform/web-app 0.5.103 → 0.5.105

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @stoker-platform/web-app
 
+## 0.5.105
+
+### Patch Changes
+
+- fix: improve search all querying
+
+## 0.5.104
+
+### Patch Changes
+
+- fix: use soft delete archivedField instead of literal field name
+
 ## 0.5.103
 
 ### Patch Changes

package/package.json

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

package/src/DashboardChart.tsx

@@ -63,8 +63,8 @@ export const DashboardChart = ({ chart, title, collection }: DashboardChartProps
 
     const constraints = useMemo(() => {
         const existingConstraints = [...(chart.constraints || [])]
-        if (softDelete) {
-            existingConstraints.push(["Archived", "==", false])
+        if (softDelete?.archivedField) {
+            existingConstraints.push([softDelete.archivedField, "==", false])
         }
         return existingConstraints
     }, [])

package/src/DashboardMetric.tsx

@@ -53,8 +53,8 @@ export const DashboardMetric = ({ metric, title, collection }: DashboardMetricPr
 
     const constraints = useMemo(() => {
         const existingConstraints = [...(metric.constraints || [])]
-        if (softDelete) {
-            existingConstraints.push(["Archived", "==", false])
+        if (softDelete?.archivedField) {
+            existingConstraints.push([softDelete.archivedField, "==", false])
         }
         return existingConstraints
     }, [])

package/src/DashboardReminder.tsx

@@ -68,8 +68,8 @@ export const DashboardReminder = ({ reminder, title, collection }: DashboardRemi
 
     const constraints = useMemo(() => {
         const existingConstraints = [...(reminder.constraints || [])]
-        if (softDelete) {
-            existingConstraints.push(["Archived", "==", false])
+        if (softDelete?.archivedField) {
+            existingConstraints.push([softDelete.archivedField, "==", false])
         }
         return existingConstraints
     }, [])

package/src/Filters.tsx

@@ -254,12 +254,15 @@ export function Filters({ collection, excluded, relationList }: FiltersProps) {
                 newConstraints = constraints.map((constraint) => where(constraint[0], constraint[1], constraint[2]))
             }
             if (isCollectionServerReadOnly) {
-                if (softDelete) {
-                    newConstraints.push(["Archived", "==", false] as QueryConstraint & [string, string, unknown])
+                if (softDelete?.archivedField) {
+                    newConstraints.push([softDelete.archivedField, "==", false] as QueryConstraint &
+                        [string, string, unknown])
                 }
             } else {
-                if (softDelete) {
-                    newConstraints.push(where("Archived", "==", false) as QueryConstraint & [string, string, unknown])
+                if (softDelete?.archivedField) {
+                    newConstraints.push(
+                        where(softDelete.archivedField, "==", false) as QueryConstraint & [string, string, unknown],
+                    )
                 }
             }
 

package/src/Form.tsx

@@ -1942,13 +1942,15 @@ function RelationField({
                 newConstraints = constraints.map((constraint) => where(constraint[0], constraint[1], constraint[2]))
             }
             if (isCollectionServerReadOnly) {
-                if (softDelete) {
-                    newConstraints.push(["Archived", "==", false] as QueryConstraint & [string, WhereFilterOp, unknown])
+                if (softDelete?.archivedField) {
+                    newConstraints.push([softDelete.archivedField, "==", false] as QueryConstraint &
+                        [string, WhereFilterOp, unknown])
                 }
             } else {
-                if (softDelete) {
+                if (softDelete?.archivedField) {
                     newConstraints.push(
-                        where("Archived", "==", false) as QueryConstraint & [string, WhereFilterOp, unknown],
+                        where(softDelete.archivedField, "==", false) as QueryConstraint &
+                            [string, WhereFilterOp, unknown],
                     )
                 }
             }

package/src/PermissionPicker.tsx

@@ -90,13 +90,15 @@ export const PermissionPicker = ({
                 newConstraints = constraints.map((constraint) => where(constraint[0], constraint[1], constraint[2]))
             }
             if (isCollectionServerReadOnly) {
-                if (softDelete) {
-                    newConstraints.push(["Archived", "==", false] as QueryConstraint & [string, WhereFilterOp, unknown])
+                if (softDelete?.archivedField) {
+                    newConstraints.push([softDelete.archivedField, "==", false] as QueryConstraint &
+                        [string, WhereFilterOp, unknown])
                 }
             } else {
-                if (softDelete) {
+                if (softDelete?.archivedField) {
                     newConstraints.push(
-                        where("Archived", "==", false) as QueryConstraint & [string, WhereFilterOp, unknown],
+                        where(softDelete.archivedField, "==", false) as QueryConstraint &
+                            [string, WhereFilterOp, unknown],
                     )
                 }
             }

package/src/SearchAllResults.tsx

@@ -1,6 +1,6 @@
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
 import { CollectionSchema, StokerRecord } from "@stoker-platform/types"
-import { createElement, Suspense, useCallback, useEffect, useRef, useState } from "react"
+import { createElement, Suspense, useCallback, useEffect, useState } from "react"
 import { LoadingSpinner } from "./components/ui/loading-spinner"
 import { preloadCacheEnabled } from "./utils/preloadCacheEnabled"
 import { serverReadOnly } from "./utils/serverReadOnly"
@@ -37,10 +37,11 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
     const [loading, setLoading] = useState(true)
     const [isCacheLoading, setIsCacheLoading] = useState(false)
     const [unsubscribe, setUnsubscribe] = useState<Unsubscribe[] | undefined>(undefined)
-    const searchResults = useRef<string[] | undefined>(undefined)
     const [title, setTitle] = useState<string | undefined>(undefined)
     const [icon, setIcon] = useState<string | undefined>(undefined)
 
+    const MAX_RESULTS = 5
+
     const getData = useCallback(async () => {
         if (!isPreloadCacheEnabled) {
             setLoading(true)
@@ -59,19 +60,16 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
         if (fullTextSearch && !isPreloadCacheEnabled) {
             const disjunctions = getFilterDisjunctions(collection)
             const hitsPerPage = disjunctions === 0 ? 5 : Math.min(5, Math.max(1, Math.floor(30 / disjunctions)))
-            const objectIDs = await performFullTextSearch(collection, search, hitsPerPage)
-            searchResults.current = objectIDs
+            const algoliaConstraints: [string, "==" | "in", unknown][] = []
+            if (softDelete?.archivedField) {
+                algoliaConstraints.push([softDelete.archivedField, "==", false])
+            }
+            const objectIDs = await performFullTextSearch(collection, search, hitsPerPage, algoliaConstraints)
             if (objectIDs.length > 0) {
                 if (isServerReadOnly) {
                     query.queries[0].constraints = [["id", "in", objectIDs]]
-                    if (softDelete) {
-                        query.queries[0].constraints.push(["Archived", "==", false])
-                    }
                 } else {
                     query.queries[0].constraints = [where("id", "in", objectIDs)]
-                    if (softDelete) {
-                        query.queries[0].constraints.push(where("Archived", "==", false))
-                    }
                 }
             } else if (search) {
                 setResults([])
@@ -91,11 +89,14 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
 
                     const load = () => {
                         if (isPreloadCacheEnabled) {
-                            const searchResults = localFullTextSearch(collection, search, loadedDocs)
-                            const searchRecords = loadedDocs.filter((doc) =>
-                                searchResults.map((result) => result.id).includes(doc.id),
+                            const activeRecords = softDelete?.archivedField
+                                ? loadedDocs.filter((doc) => !doc[softDelete.archivedField])
+                                : loadedDocs
+                            const miniSearchResults = localFullTextSearch(collection, search, activeRecords)
+                            const searchRecords = activeRecords.filter((doc) =>
+                                miniSearchResults.map((result) => result.id).includes(doc.id),
                             )
-                            setResults(searchRecords)
+                            setResults(searchRecords.slice(0, MAX_RESULTS))
                             setLoading(false)
                         } else {
                             setResults(loadedDocs)
@@ -127,9 +128,7 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
                         },
                         {
                             constraints: currentQuery.constraints as QueryConstraint[],
-                            pagination: {
-                                number: 5,
-                            },
+                            pagination: isPreloadCacheEnabled ? undefined : { number: MAX_RESULTS },
                         },
                     )
                     const { unsubscribe: newUnsubscribe } = result
@@ -149,7 +148,7 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
                 const data = await getSome([labels.collection], {
                     constraints: query.queries[0].constraints as [string, WhereFilterOp, unknown][],
                     pagination: {
-                        number: 5,
+                        number: MAX_RESULTS,
                     },
                 })
                 setResults(data.records)
@@ -163,7 +162,7 @@ export function SearchAllResults({ collection, search }: { collection: Collectio
                 subscribe()
             }
         })
-    }, [isPreloadCacheEnabled, isServerReadOnly, unsubscribe, location, search])
+    }, [isPreloadCacheEnabled, isServerReadOnly, unsubscribe, search])
 
     useEffect(() => {
         const initialize = async () => {