Fix for overriding collection in sideentitycontroller

firecmsco · Jan 28, 2025 · def41e0 · def41e0
1 parent e75810c
commit def41e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/examples/example_pro/src/FirestoreApp/views/ExampleCMSView.tsx b/examples/example_pro/src/FirestoreApp/views/ExampleCMSView.tsx
@@ -235,7 +235,7 @@ export function ExampleCMSView() {
                                 variant={"outlined"}
                                 onClick={() => sideEntityController.open({
                                     entityId: "B003WT1622",
-                                    path: "/products-test",
+                                    path: "/products",
                                     collection: customProductCollection,
                                     width: 1000
                                 })}>

diff --git a/packages/firecms_core/src/core/EntityEditView.tsx b/packages/firecms_core/src/core/EntityEditView.tsx
@@ -332,7 +332,6 @@ export function EntityEditViewInner<M extends Record<string, any>>({
     }, [authController, usedEntity, status]);
 
     const readOnly = !canEdit;
-    console.log("readOnly", readOnly);
 
     const onPreSaveHookError = useCallback((e: Error) => {
         setSaving(false);

diff --git a/packages/firecms_core/src/core/EntitySidePanel.tsx b/packages/firecms_core/src/core/EntitySidePanel.tsx
@@ -62,20 +62,18 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
     }, [navigationController, props.path]);
 
     const collection = useMemo(() => {
-        if (!props) return undefined;
-        let usedCollection = props.collection;
+        if (props.collection) {
+            return props.collection;
+        }
 
         const registryCollection = navigationController.getCollection(props.path);
         if (registryCollection) {
-            usedCollection = registryCollection;
-        }
-        if (!usedCollection) {
-            console.error("ERROR: No collection found in path `", props.path, "`. Entity id: ", props.entityId);
-            throw Error("ERROR: No collection found in path `" + props.path + "`. Make sure you have defined a collection for this path in the root navigation.");
+            return registryCollection;
         }
 
-        return usedCollection;
-    }, [navigationController, props]);
+        console.error("ERROR: No collection found in path `", props.path, "`. Entity id: ", props.entityId);
+        throw Error("ERROR: No collection found in path `" + props.path + "`. Make sure you have defined a collection for this path in the root navigation.");
+    }, [navigationController, props.collection]);
 
     useEffect(() => {
         function beforeunload(e: any) {