@firecms/core 3.0.0-canary.271 → 3.0.0-canary.273

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.271",
+  "version": "3.0.0-canary.273",
   "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.271",
-    "@firecms/formex": "^3.0.0-canary.271",
-    "@firecms/ui": "^3.0.0-canary.271",
+    "@firecms/editor": "^3.0.0-canary.273",
+    "@firecms/formex": "^3.0.0-canary.273",
+    "@firecms/ui": "^3.0.0-canary.273",
     "@radix-ui/react-portal": "^1.1.9",
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",
@@ -108,7 +108,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "0f16c9b5332f70bbcad9eb4d249ba220964d4195",
+  "gitHead": "047306118e65e5187d7fc21a36652336b0092a00",
   "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/components/common/useColumnsIds.tsx

@@ -8,14 +8,7 @@ export const COLLECTION_GROUP_PARENT_ID = "collectionGroupParent";
 export function useColumnIds<M extends Record<string, any>>(collection: ResolvedEntityCollection<M>, includeSubcollections: boolean): PropertyColumnConfig[] {
     return useMemo(() => {
         if (collection.propertiesOrder) {
-            const propertyColumnConfigs = hideAndExpandKeys(collection, collection.propertiesOrder);
-            if (collection.collectionGroup) {
-                propertyColumnConfigs.push({
-                    key: COLLECTION_GROUP_PARENT_ID,
-                    disabled: true
-                });
-            }
-            return propertyColumnConfigs;
+            return hideAndExpandKeys(collection, collection.propertiesOrder);
         }
         return getDefaultColumnKeys(collection, includeSubcollections);
     }, [collection, includeSubcollections]);

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() {