@stoker-platform/web-app 0.5.156 → 0.5.158

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @stoker-platform/web-app
 
+## 0.5.158
+
+### Patch Changes
+
+- fix: improve preload cache expansion handling
+
+## 0.5.157
+
+### Patch Changes
+
+- feat: export datetime fields in correct format
+    - @stoker-platform/node-client@0.5.63
+    - @stoker-platform/utils@0.5.54
+    - @stoker-platform/web-client@0.5.64
+
 ## 0.5.156
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/web-app",
-    "version": "0.5.156",
+    "version": "0.5.158",
     "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.50.0",
-        "@stoker-platform/node-client": "0.5.62",
-        "@stoker-platform/utils": "0.5.53",
-        "@stoker-platform/web-client": "0.5.63",
+        "@stoker-platform/node-client": "0.5.63",
+        "@stoker-platform/utils": "0.5.54",
+        "@stoker-platform/web-client": "0.5.64",
         "@tanstack/react-table": "^8.21.3",
         "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",

package/src/DateRange.tsx

@@ -51,8 +51,9 @@ export function DateRangeSelector({
     const { filters, setFilters } = useFilters()
     const [, setState] = useStokerState()
     const [isInitialized, setIsInitialized] = useState(false)
+    const [isExpandingCache, setIsExpandingCache] = useState(false)
 
-    const { isRouteLoading, isRouteLoadingImmediate } = useRouteLoading()
+    const { isRouteLoading, isRouteLoadingImmediate, setIsRouteLoading } = useRouteLoading()
 
     useEffect(() => {
         if (filters.length === 0 || isInitialized) return
@@ -134,7 +135,7 @@ export function DateRangeSelector({
                 if (!relationList) {
                     setState(`collection-range-${labels.collection.toLowerCase()}`, "range", JSON.stringify(value))
                 }
-                expandCache(collection, value, preloadRange, setPreloadRange)
+                expandCache(collection, value, preloadRange, setPreloadRange, setIsExpandingCache, setIsRouteLoading)
             })
         },
         [preloadRange, rangeFilter, rangeSelector, isInitialized, currentField],
@@ -145,6 +146,7 @@ export function DateRangeSelector({
     const disabled =
         isRouteLoading.has(location.pathname) ||
         (isPreloadCacheEnabled && !preloadRange) ||
+        (isPreloadCacheEnabled && isExpandingCache) ||
         connectionStatus === "offline" ||
         tryFunction(customization.admin?.disableRangeSelector)
     const preventChange = isRouteLoadingImmediate.has(location.pathname)

package/src/utils/expandCache.ts

@@ -4,7 +4,7 @@ import cloneDeep from "lodash/cloneDeep.js"
 import { getRange } from "@stoker-platform/utils"
 import { getTimezone, preloadCollection } from "@stoker-platform/web-client"
 
-export const expandCache = (
+export const expandCache = async (
     collection: CollectionSchema,
     newRange: DateRange,
     preloadRange: DateRange | undefined,
@@ -16,6 +16,8 @@ export const expandCache = (
             | undefined
         >
     >,
+    setIsExpandingCache?: React.Dispatch<React.SetStateAction<boolean>>,
+    setIsRouteLoading?: (operation: "+" | "-", route: string, immediate?: boolean) => void,
 ) => {
     const { labels, preloadCache } = collection
     const timezone = getTimezone()
@@ -40,16 +42,23 @@ export const expandCache = (
             } else if (preloadCacheRangeDates.end) {
                 preloadCacheRange.end = preloadRange.to as Date
             }
-            preloadCollection(labels.collection, undefined, preloadCacheRange)
-            setPreloadRange((prev) => {
-                return {
-                    ...prev,
-                    [labels.collection]: {
-                        from: preloadCacheRange.start as Date,
-                        to: preloadCacheRange.end as Date,
-                    },
-                }
-            })
+            setIsExpandingCache?.(true)
+            setIsRouteLoading?.("+", location.pathname, true)
+            try {
+                await preloadCollection(labels.collection, undefined, preloadCacheRange)
+                setPreloadRange((prev) => {
+                    return {
+                        ...prev,
+                        [labels.collection]: {
+                            from: preloadCacheRange.start as Date,
+                            to: preloadCacheRange.end as Date,
+                        },
+                    }
+                })
+            } finally {
+                setIsExpandingCache?.(false)
+                setIsRouteLoading?.("-", location.pathname)
+            }
         }
     }
 }

package/src/utils/prepareCSVData.ts

@@ -70,7 +70,9 @@ export const prepareCSVData = (collection: CollectionSchema, data: any[]) => {
             if (field.type === "Boolean") {
                 docData[field.name] = escapeCSVField(doc[field.name] ? "Yes" : "No")
             } else if (field.type === "Timestamp" && doc[field.name]) {
-                const formattedDate = DateTime.fromJSDate((doc[field.name] as Timestamp).toDate()).toFormat(dateFormat)
+                const formattedDate = tryFunction(fieldCustomization.admin?.time)
+                    ? DateTime.fromJSDate((doc[field.name] as Timestamp).toDate()).toFormat("dd/MM/yy HH:mm")
+                    : DateTime.fromJSDate((doc[field.name] as Timestamp).toDate()).toFormat(dateFormat)
                 docData[field.name] = escapeCSVField(formattedDate)
             } else if (isRelationField(field) && doc[field.name]) {
                 const relationCollection = schema.collections[field.collection]