@firecms/core 3.0.0-canary.272 → 3.0.0-canary.274

package/dist/types/entities.d.ts

@@ -42,7 +42,11 @@ export declare class EntityReference {
      * to the root of the database).
      */
     readonly path: string;
-    constructor(id: string, path: string);
+    /**
+     * Optional database ID where the entity is stored (if multiple databases are used)
+     */
+    readonly databaseId?: string;
+    constructor(id: string, path: string, databaseId?: string);
     get pathWithId(): string;
     isEntityReference(): boolean;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.272",
+  "version": "3.0.0-canary.274",
   "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.272",
-    "@firecms/formex": "^3.0.0-canary.272",
-    "@firecms/ui": "^3.0.0-canary.272",
+    "@firecms/editor": "^3.0.0-canary.274",
+    "@firecms/formex": "^3.0.0-canary.274",
+    "@firecms/ui": "^3.0.0-canary.274",
     "@radix-ui/react-portal": "^1.1.9",
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",
@@ -108,7 +108,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "1b3738e54c7c7e6be9329c43091231486fe5dd74",
+  "gitHead": "d7256590ff4336af9a2a2a4d738ec04811d7222f",
   "publishConfig": {
     "access": "public"
   },

package/src/components/HomePage/DefaultHomePage.tsx

@@ -560,7 +560,6 @@ export function DefaultHomePage({
                     onClose={() => setDialogOpenForGroup(null)}
                     onRename={(newName) => {
                         handleRenameGroup(dialogOpenForGroup, newName);
-                        setDialogOpenForGroup(null);
                     }}
                 />
             )}

package/src/components/HomePage/HomePageDnD.tsx

@@ -504,6 +504,7 @@ export function useHomePageDnd({
             onPersist?.(updated); // <- ensure rename is saved
             return updated;
         });
+        setDialogOpenForGroup(null);
     };
 
     /* ---------------- public API ---------------- */

package/src/components/HomePage/RenameGroupDialog.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { Button, Dialog, DialogActions, DialogContent, DialogTitle, TextField } from "@firecms/ui";
 
 interface RenameGroupDialogProps {
@@ -9,7 +9,13 @@ interface RenameGroupDialogProps {
     onRename: (newName: string) => void;
 }
 
-export function RenameGroupDialog({ open, initialName, existingGroupNames, onClose, onRename }: RenameGroupDialogProps) {
+export function RenameGroupDialog({
+                                      open,
+                                      initialName,
+                                      existingGroupNames,
+                                      onClose,
+                                      onRename
+                                  }: RenameGroupDialogProps) {
     const [name, setName] = useState(initialName);
     const [error, setError] = useState<string | null>(null);
     const inputRef = useRef<HTMLInputElement | HTMLTextAreaElement | null>(null); // Create a ref for the input
@@ -86,7 +92,7 @@ export function RenameGroupDialog({ open, initialName, existingGroupNames, onClo
     if (!open) return null;
 
     return (
-        <Dialog open={open} onOpenChange={onClose}>
+        <Dialog open={open}>
             <DialogTitle>Rename Group</DialogTitle>
             <DialogContent>
                 <TextField

package/src/hooks/useCollapsedGroups.ts

@@ -6,12 +6,17 @@ import { useCallback, useEffect, useState } from "react";
  * when groups are removed from the navigation.
  */
 export function useCollapsedGroups(groupNames: string[]) {
+
+    console.log("Group names:", groupNames);
+
     // Load collapsed groups from localStorage on mount
     const [collapsedGroups, setCollapsedGroups] = useState<Record<string, boolean>>(() => {
         try {
             const stored = localStorage.getItem('firecms-collapsed-groups');
+            console.log("Loaded collapsed groups from localStorage:", stored);
             return stored ? JSON.parse(stored) : {};
         } catch {
+            console.warn("Could not access localStorage to get collapsed groups");
             return {};
         }
     });
@@ -20,13 +25,16 @@ export function useCollapsedGroups(groupNames: string[]) {
     useEffect(() => {
         try {
             localStorage.setItem('firecms-collapsed-groups', JSON.stringify(collapsedGroups));
+            console.log("Loaded collapsed groups from localStorage to get collapsed groups");
         } catch {
+            console.warn("Could not access localStorage to get collapsed groups");
             // Silently fail if localStorage is not available
         }
     }, [collapsedGroups]);
 
     // Clean up collapsed groups state when groups change - remove entries for groups that no longer exist
     useEffect(() => {
+        console.log("Cleaning up collapsed groups. Current groups:", groupNames, "Current collapsed state:", collapsedGroups);
         // Only clean up if we have actual groups loaded (avoid cleaning up during initial load)
         if (groupNames.length === 0) return;
 
@@ -50,10 +58,12 @@ export function useCollapsedGroups(groupNames: string[]) {
     }, [groupNames]);
 
     const isGroupCollapsed = useCallback((name: string) => {
+        console.log("Checking if group is collapsed:", name, "State:", collapsedGroups);
         return !!collapsedGroups[name];
     }, [collapsedGroups]);
 
     const toggleGroupCollapsed = useCallback((name: string) => {
+        console.log("Toggle group collapsed group:", name);
         setCollapsedGroups(prev => ({ ...prev, [name]: !prev[name] }));
     }, []);
 

package/src/types/entities.ts

@@ -50,9 +50,15 @@ export class EntityReference {
      */
     readonly path: string;
 
-    constructor(id: string, path: string) {
+    /**
+     * Optional database ID where the entity is stored (if multiple databases are used)
+     */
+    readonly databaseId?: string;
+
+    constructor(id: string, path: string, databaseId?: string) {
         this.id = id;
         this.path = path;
+        this.databaseId = databaseId;
     }
 
     get pathWithId() {