@firecms/core 3.0.0-canary.284 → 3.0.0-canary.285

package/dist/util/entity_cache.d.ts

@@ -8,9 +8,10 @@ export declare function saveEntityToCache(path: string, data: object): void;
  * Retrieves an entity from the in-memory cache or `localStorage`.
  * If the entity is not in the cache but exists in `localStorage`, it loads it into the cache.
  * @param path - The unique path/key for the entity.
+ * @param useLocalStorage
  * @returns The cached entity or `undefined` if not found.
  */
-export declare function getEntityFromCache(path: string): object | undefined;
+export declare function getEntityFromCache(path: string, useLocalStorage?: boolean): object | undefined;
 export declare function hasEntityInCache(path: string): boolean;
 /**
  * Removes an entity from both the in-memory cache and `localStorage`.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.284",
+  "version": "3.0.0-canary.285",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -53,9 +53,9 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
-    "@firecms/editor": "^3.0.0-canary.284",
-    "@firecms/formex": "^3.0.0-canary.284",
-    "@firecms/ui": "^3.0.0-canary.284",
+    "@firecms/editor": "^3.0.0-canary.285",
+    "@firecms/formex": "^3.0.0-canary.285",
+    "@firecms/ui": "^3.0.0-canary.285",
     "@radix-ui/react-portal": "^1.1.9",
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",
@@ -108,7 +108,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "443c1f2616b08bf03cd00ce2932be53d3aa96110",
+  "gitHead": "a442a00b64764b353c977cc9e758953995bd9513",
   "publishConfig": {
     "access": "public"
   },

package/src/core/EntityEditView.tsx

@@ -99,11 +99,9 @@ export function EntityEditView<M extends Record<string, any>, USER extends User>
 
     const enableLocalChangesBackup = props.collection.enableLocalChangesBackup !== undefined ? props.collection.enableLocalChangesBackup : true;
 
-    const initialDirtyValues = enableLocalChangesBackup
-        ? (entityId
-            ? getEntityFromCache(props.path + "/" + entityId)
-            : getEntityFromCache(props.path + "#new"))
-        : undefined;
+    const initialDirtyValues = entityId
+        ? getEntityFromCache(props.path + "/" + entityId, enableLocalChangesBackup)
+        : getEntityFromCache(props.path + "#new", enableLocalChangesBackup);
 
     const authController = useAuthController();
 

package/src/util/entity_cache.ts

@@ -18,25 +18,40 @@ function customReplacer(key: string): any {
     // Handle Date objects
     // @ts-ignore
     if (value instanceof Date) {
-        return { __type: "Date", value: value.toISOString() };
+        return {
+            __type: "Date",
+            value: value.toISOString()
+        };
     }
 
     // Handle EntityReference
     // @ts-ignore
     if (value instanceof EntityReference) {
-        return { __type: "EntityReference", id: value.id, path: value.path, databaseId: value.databaseId };
+        return {
+            __type: "EntityReference",
+            id: value.id,
+            path: value.path,
+            databaseId: value.databaseId
+        };
     }
 
     // Handle GeoPoint
     // @ts-ignore
     if (value instanceof GeoPoint) {
-        return { __type: "GeoPoint", latitude: value.latitude, longitude: value.longitude };
+        return {
+            __type: "GeoPoint",
+            latitude: value.latitude,
+            longitude: value.longitude
+        };
     }
 
     // Handle Vector
     // @ts-ignore
     if (value instanceof Vector) {
-        return { __type: "Vector", value: value.value };
+        return {
+            __type: "Vector",
+            value: value.value
+        };
     }
 
     return value;
@@ -61,33 +76,6 @@ function customReviver(key: string, value: any): any {
     return value;
 }
 
-// Initialize the in-memory cache by loading entities from `localStorage`
-if (isLocalStorageAvailable) {
-    try {
-        // Iterate over all keys in localStorage to find those with the specified prefix
-        for (let i = 0; i < localStorage.length; i++) {
-            const fullKey = localStorage.key(i);
-            if (fullKey && fullKey.startsWith(LOCAL_STORAGE_PREFIX)) {
-                const path = fullKey.substring(LOCAL_STORAGE_PREFIX.length);
-                const entityString = localStorage.getItem(fullKey);
-                if (entityString) {
-                    try {
-                        const entity: object = JSON.parse(entityString, customReviver);
-                        entityCache.set(path, entity);
-                    } catch (parseError) {
-                        console.error(
-                            `Failed to parse entity for path "${path}" from localStorage:`,
-                            parseError
-                        );
-                    }
-                }
-            }
-        }
-    } catch (error) {
-        console.error("Error accessing localStorage during initialization:", error);
-    }
-}
-
 /**
  * Saves data to the in-memory cache and persists it individually in `localStorage`.
  * @param path - The unique path/key for the data.
@@ -116,9 +104,10 @@ export function saveEntityToCache(path: string, data: object): void {
  * Retrieves an entity from the in-memory cache or `localStorage`.
  * If the entity is not in the cache but exists in `localStorage`, it loads it into the cache.
  * @param path - The unique path/key for the entity.
+ * @param useLocalStorage
  * @returns The cached entity or `undefined` if not found.
  */
-export function getEntityFromCache(path: string): object | undefined {
+export function getEntityFromCache(path: string, useLocalStorage = true): object | undefined {
 
     // Attempt to retrieve the entity from the in-memory cache
     if (entityCache.has(path)) {
@@ -126,7 +115,7 @@ export function getEntityFromCache(path: string): object | undefined {
     }
 
     // If not in the cache, attempt to load it from localStorage
-    if (isLocalStorageAvailable) {
+    if (isLocalStorageAvailable && useLocalStorage) {
         try {
             const key = LOCAL_STORAGE_PREFIX + path;
             const entityString = localStorage.getItem(key);