@firecms/core 3.0.0-canary.252 → 3.0.0-canary.253

package/dist/types/entity_actions.d.ts

@@ -46,6 +46,7 @@ export type EntityActionClickProps<M extends object, USER extends User = User> =
     entity: Entity<M>;
     context: FireCMSContext<USER>;
     fullPath?: string;
+    fullIdPath?: string;
     collection?: EntityCollection<M>;
     selectionController?: SelectionController;
     highlightEntity?: (entity: Entity<any>) => void;

package/dist/types/side_entity_controller.d.ts

@@ -11,6 +11,10 @@ export interface EntitySidePanelProps<M extends Record<string, any> = any> {
      * Absolute path of the entity
      */
     path: string;
+    /**
+     * Full CMS path of the entity, including the collection and sub-collections.
+     */
+    fullIdPath?: string;
     /**
      * ID of the entity, if not set, it means we are creating a new entity
      */

package/dist/util/navigation_from_path.d.ts

@@ -4,6 +4,7 @@ export interface NavigationViewEntityInternal<M extends Record<string, any>> {
     type: "entity";
     entityId: string;
     path: string;
+    fullIdPath: string;
     fullPath: string;
     parentCollection: EntityCollection<M>;
 }
@@ -11,12 +12,14 @@ export interface NavigationViewCollectionInternal<M extends Record<string, any>>
     type: "collection";
     id: string;
     path: string;
+    fullIdPath: string;
     fullPath: string;
     collection: EntityCollection<M>;
 }
 export interface NavigationViewEntityCustomInternal<M extends Record<string, any>> {
     type: "custom_view";
     path: string;
+    fullIdPath: string;
     fullPath: string;
     entityId: string;
     view: EntityCustomView<M>;
@@ -25,5 +28,6 @@ export declare function getNavigationEntriesFromPath(props: {
     path: string;
     collections: EntityCollection[] | undefined;
     currentFullPath?: string;
+    currentFullIdPath?: string;
     contextEntityViews?: EntityCustomView<any>[];
 }): NavigationViewInternal[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.252",
+  "version": "3.0.0-canary.253",
   "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.252",
-    "@firecms/formex": "^3.0.0-canary.252",
-    "@firecms/ui": "^3.0.0-canary.252",
+    "@firecms/editor": "^3.0.0-canary.253",
+    "@firecms/formex": "^3.0.0-canary.253",
+    "@firecms/ui": "^3.0.0-canary.253",
     "@radix-ui/react-portal": "^1.1.3",
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",
@@ -107,7 +107,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "6134752725aae829739231039456404ef396b9ea",
+  "gitHead": "c4dff639fcd32ba5d706f5b8cf92692af6e94893",
   "publishConfig": {
     "access": "public"
   },

package/src/components/EntityCollectionTable/EntityCollectionRowActions.tsx

@@ -33,6 +33,7 @@ export const EntityCollectionRowActions = function EntityCollectionRowActions({
                                                                                   entity,
                                                                                   collection,
                                                                                   fullPath,
+                                                                                  fullIdPath,
                                                                                   width,
                                                                                   frozen,
                                                                                   isSelected,
@@ -50,6 +51,7 @@ export const EntityCollectionRowActions = function EntityCollectionRowActions({
                                                                                   entity: Entity<any>,
                                                                                   collection?: EntityCollection<any>,
                                                                                   fullPath?: string,
+                                                                                  fullIdPath?: string,
                                                                                   width: number,
                                                                                   frozen?: boolean,
                                                                                   size: CollectionSize,
@@ -107,6 +109,7 @@ export const EntityCollectionRowActions = function EntityCollectionRowActions({
                                     action.onClick({
                                         entity,
                                         fullPath,
+                                        fullIdPath,
                                         collection,
                                         context,
                                         selectionController,
@@ -136,6 +139,7 @@ export const EntityCollectionRowActions = function EntityCollectionRowActions({
                                         action.onClick({
                                             entity,
                                             fullPath,
+                                            fullIdPath,
                                             collection,
                                             context,
                                             selectionController,

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -256,7 +256,6 @@ export const EntityCollectionView = React.memo(
         }, [unselectNavigatedEntity, sideEntityController]);
 
         const onNewClick = useCallback(() => {
-
             const collection = collectionRef.current;
             analyticsController.onAnalyticsEvent?.("new_entity_click", {
                 path: fullPath
@@ -539,7 +538,8 @@ export const EntityCollectionView = React.memo(
                     highlightEntity={setHighlightedEntity}
                     unhighlightEntity={unselectNavigatedEntity}
                     collection={collection}
-                    fullPath={fullIdPath ?? fullPath}
+                    fullPath={fullPath}
+                    fullIdPath={fullIdPath}
                     actions={actions}
                     hideId={collection?.hideIdFromCollection}
                     onCollectionChange={updateLastDeleteTimestamp}

package/src/components/FireCMSLogo.tsx

@@ -14,59 +14,15 @@ export function FireCMSLogo({
     return (
         <svg
             width={width ?? "100%"} height={height ?? "100%"}
-            viewBox="0 0 599 599" version="1.1"
+            version="1.1"
             style={style}
             className={className}
-            xmlns="http://www.w3.org/2000/svg">
-            <defs>
-                <radialGradient cx="28.6213569%" cy="43.1133328%"
-                                fx="28.6213569%"
-                                fy="43.1133328%" r="71.5003456%"
-                                gradientTransform="translate(0.286214,0.431133),rotate(3.343450),scale(1.000000,0.996175),translate(-0.286214,-0.431133)"
-                                id="radialGradient-1">
-                    <stop stopColor="#FF5B79" offset="0%"/>
-                    <stop stopColor="#FA5574" offset="28.0930803%"/>
-                    <stop stopColor="#EC4C51" offset="44.7242531%"/>
-                    <stop stopColor="#9543C1" offset="71.4578165%"/>
-                    <stop stopColor="#3857B3" offset="100%"/>
-                </radialGradient>
-                <radialGradient cx="53.6205516%" cy="47.2473036%"
-                                fx="53.6205516%"
-                                fy="47.2473036%" r="50.8229649%"
-                                gradientTransform="translate(0.536206,0.472473),rotate(90.000000),scale(1.000000,1.206631),translate(-0.536206,-0.472473)"
-                                id="radialGradient-2">
-                    <stop stopColor="#68294F" stopOpacity="0" offset="0%"/>
-                    <stop stopColor="#5E2548" stopOpacity="0.04641108"
-                          offset="75.3503173%"/>
-                    <stop stopColor="#0D060B" stopOpacity="0.437431709"
-                          offset="100%"/>
-                </radialGradient>
-                <radialGradient cx="53.8605015%" cy="48.1990423%"
-                                fx="53.8605015%"
-                                fy="48.1990423%" r="59.9151549%"
-                                gradientTransform="translate(0.538605,0.481990),rotate(180.000000),scale(1.000000,0.925027),translate(-0.538605,-0.481990)"
-                                id="radialGradient-3">
-                    <stop stopColor="#68294F" stopOpacity="0" offset="0%"/>
-                    <stop stopColor="#5E2548" stopOpacity="0.04641108"
-                          offset="84.0867343%"/>
-                    <stop stopColor="#FF0000" stopOpacity="0.567324765"
-                          offset="100%"/>
-                </radialGradient>
-            </defs>
-            <g id="Page-1" stroke="none" strokeWidth="1" fill="none"
-               fillRule="evenodd">
-                <g id="firecms_logo">
-                    <circle fill="url(#radialGradient-1)" cx="299.5"
-                            cy="299.5"
-                            r="299.5"/>
-                    <circle fill="url(#radialGradient-2)" cx="299.5"
-                            cy="299.5"
-                            r="299.5"/>
-                    <circle fill="url(#radialGradient-3)" cx="299.5"
-                            cy="299.5"
-                            r="299.5"/>
-                </g>
-            </g>
+            viewBox="0 0 583 583" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <circle cx="291.5" cy="291.5" r="291.5" fill="#0070F4"/>
+            <ellipse cx="292" cy="291.5" rx="173" ry="173.5" fill="#FF3773"/>
+            <path
+                d="M465 291.5C465 268.847 460.525 246.416 451.831 225.487C443.137 204.558 430.394 185.542 414.329 169.524C398.265 153.506 379.194 140.8 358.204 132.131C337.215 123.462 314.719 119 292 119C269.281 119 246.785 123.462 225.796 132.131C204.806 140.8 185.735 153.506 169.671 169.524C153.606 185.542 140.863 204.558 132.169 225.487C123.475 246.416 119 268.847 119 291.5L292 291.5H465Z"
+                fill="#FFA400"/>
         </svg>
     );
 

package/src/components/common/default_entity_actions.tsx

@@ -13,6 +13,7 @@ export const editEntityAction: EntityAction = {
                 entity,
                 collection,
                 fullPath,
+                fullIdPath,
                 context,
                 highlightEntity,
                 unhighlightEntity,
@@ -30,7 +31,8 @@ export const editEntityAction: EntityAction = {
             addRecentId(collection.id, entity.id);
         }
 
-        const path = collection?.collectionGroup ? collection.id : (fullPath ?? collection?.id ?? entity.path);
+        const path = collection?.collectionGroup ? collection.path : (fullPath ?? collection?.path ?? entity.path);
+        const newFullIdPath = collection?.collectionGroup ? collection.id : (fullIdPath ?? collection?.id ?? entity.path);
         const defaultSelectedView = resolveDefaultSelectedView(
             collection ? collection.defaultSelectedView : undefined,
             {
@@ -43,7 +45,7 @@ export const editEntityAction: EntityAction = {
             collection,
             entityId: entity.id,
             path,
-            fullIdPath: path,
+            fullIdPath: newFullIdPath,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),
             navigation: context.navigation,
@@ -73,13 +75,14 @@ export const copyEntityAction: EntityAction = {
             entityId: entity.id
         });
 
-        const path = collection?.collectionGroup ? collection.id : (fullPath ?? collection?.id ?? entity.path);
+        const path = collection?.collectionGroup ? collection.path : (fullPath ?? collection?.path ?? entity.path);
+        const fullIdPath = collection?.collectionGroup ? collection.id : (fullPath ?? collection?.id ?? entity.path);
         navigateToEntity({
             openEntityMode,
             collection,
             entityId: entity.id,
             path,
-            fullIdPath: path,
+            fullIdPath,
             copy: true,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),

package/src/core/EntityEditView.tsx

@@ -41,9 +41,13 @@ export type OnTabChangeParams<M extends Record<string, any>> = {
     entityId?: string;
     selectedTab?: string;
     collection: EntityCollection<M>;
+
 };
 
 export interface EntityEditViewProps<M extends Record<string, any>> {
+    /**
+     * The database path of the entity, e.g. "users" or "products".
+     */
     path: string;
     /**
      * The navigation path to the entity.
@@ -279,8 +283,15 @@ export function EntityEditViewInner<M extends Record<string, any>>({
 
     const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
         const subcollectionId = subcollection.id ?? subcollection.path;
-        const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : undefined;
+        const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.path)}` : undefined;
         const newFullIdPath = fullIdPath ? `${fullIdPath}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : undefined;
+        console.debug("Rendering subcollection", {
+            subcollectionId,
+            fullIdPath,
+            newFullPath,
+            newFullIdPath,
+            selectedTab
+        });
 
         if (selectedTab !== subcollectionId) return null;
         return (
@@ -342,6 +353,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
     </div> : null;
 
     const entityView = <EntityForm<M>
+        fullIdPath={fullIdPath}
         collection={collection}
         path={path}
         entityId={entityId ?? usedEntity?.id}

package/src/core/EntitySidePanel.tsx

@@ -23,6 +23,7 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
         allowFullScreen = true,
         path,
         entityId,
+        fullIdPath,
         formProps,
     } = props;
 
@@ -57,6 +58,7 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
             sideEntityController.replace({
                 path: params.path,
                 entityId: params.entityId,
+                fullIdPath: props.fullIdPath,
                 selectedTab: params.selectedTab,
                 updateUrl: true,
                 collection: params.collection,
@@ -110,6 +112,7 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
             <ErrorBoundary>
                 <EntityEditView
                     {...props}
+                    fullIdPath={fullIdPath}
                     layout={"side_panel"}
                     collection={collection}
                     parentCollectionIds={parentCollectionIds}
@@ -133,7 +136,6 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
                         </IconButton>}
                     </>}
                     onTabChange={({
-                                      path,
                                       entityId,
                                       selectedTab,
                                       collection,
@@ -141,6 +143,7 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
                         sideEntityController.replace({
                             path,
                             entityId,
+                            fullIdPath: props.fullIdPath,
                             selectedTab,
                             updateUrl: true,
                             collection,

package/src/form/EntityForm.tsx

@@ -57,6 +57,7 @@ export type OnUpdateParams = {
 
 export type EntityFormProps<M extends Record<string, any>> = {
     path: string;
+    fullIdPath?: string;
     collection: EntityCollection<M>;
     entityId?: string;
     entity?: Entity<M>;
@@ -96,6 +97,7 @@ export type EntityFormProps<M extends Record<string, any>> = {
 
 export function EntityForm<M extends Record<string, any>>({
                                                               path,
+                                                              fullIdPath,
                                                               entityId: entityIdProp,
                                                               collection,
                                                               onValuesModified,
@@ -119,6 +121,7 @@ export function EntityForm<M extends Record<string, any>>({
                                                               children
                                                           }: EntityFormProps<M>) {
 
+
     if (collection.customId && collection.formAutoSave) {
         console.warn(`The collection ${collection.path} has customId and formAutoSave enabled. This is not supported and formAutoSave will be ignored`);
     }
@@ -665,9 +668,12 @@ export function EntityForm<M extends Record<string, any>>({
         throw Error("INTERNAL: Collection and path must be defined in form context");
     }
 
+
     const dialogActions = <EntityFormActionsComponent
         collection={resolvedCollection}
         path={path}
+        fullPath={path}
+        fullIdPath={fullIdPath}
         entity={entity}
         layout={forceActionsAtTheBottom ? "bottom" : "side"}
         savingError={savingError}

package/src/form/EntityFormActions.tsx

@@ -5,6 +5,8 @@ import { FormexController } from "@firecms/formex";
 import { useFireCMSContext, useSideEntityController } from "../hooks";
 
 export interface EntityFormActionsProps {
+    fullPath: string;
+    fullIdPath?: string;
     collection: ResolvedEntityCollection;
     path: string;
     entity?: Entity;
@@ -19,6 +21,8 @@ export interface EntityFormActionsProps {
 }
 
 export function EntityFormActions({
+                                      fullPath,
+                                      fullIdPath,
                                       collection,
                                       entity,
                                       layout,
@@ -35,6 +39,8 @@ export function EntityFormActions({
 
     return layout === "bottom"
         ? buildBottomActions({
+            fullPath,
+            fullIdPath,
             savingError,
             entity,
             collection,
@@ -47,6 +53,8 @@ export function EntityFormActions({
             openEntityMode
         })
         : buildSideActions({
+            fullPath,
+            fullIdPath,
             savingError,
             entity,
             collection,
@@ -61,6 +69,8 @@ export function EntityFormActions({
 }
 
 type ActionsViewProps<M extends object> = {
+    fullPath: string,
+    fullIdPath?: string,
     savingError: Error | undefined,
     entity: Entity<M> | undefined,
     formActions?: EntityAction[],
@@ -77,6 +87,8 @@ type ActionsViewProps<M extends object> = {
 function buildBottomActions<M extends object>({
                                                   savingError,
                                                   entity,
+                                                  fullPath,
+                                                  fullIdPath,
                                                   formActions,
                                                   collection,
                                                   context,
@@ -104,7 +116,8 @@ function buildBottomActions<M extends object>({
                         if (entity)
                             action.onClick({
                                 entity,
-                                fullPath: collection.path,
+                                fullPath: fullPath ?? collection.path,
+                                fullIdPath: fullIdPath ?? collection.id,
                                 collection: collection,
                                 context,
                                 sideEntityController,

package/src/internal/useBuildSideEntityController.tsx

@@ -215,6 +215,7 @@ export const useBuildSideEntityController = (navigation: NavigationController,
 
 export function buildSidePanelsFromUrl(path: string, collections: EntityCollection[], newFlag: boolean): EntitySidePanelProps<any>[] {
 
+
     const navigationViewsForPath: NavigationViewInternal<any>[] = getNavigationEntriesFromPath({
         path,
         collections
@@ -222,18 +223,20 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
 
     let sidePanel: EntitySidePanelProps<any> | undefined = undefined;
     let lastCollectionPath = "";
+    let lastCollectionId: string | undefined = undefined;
     for (let i = 0; i < navigationViewsForPath.length; i++) {
         const navigationEntry = navigationViewsForPath[i];
 
         if (navigationEntry.type === "collection") {
             lastCollectionPath = navigationEntry.path;
+            lastCollectionId = navigationEntry.collection.id;
         }
 
         const previousEntry = navigationViewsForPath[i - 1];
         if (navigationEntry.type === "entity") {
             sidePanel = {
                 path: navigationEntry.path,
-                // fullIdPath: navigationEntry.path,
+                fullIdPath: navigationEntry.fullIdPath,
                 entityId: navigationEntry.entityId,
                 copy: false,
                 width: navigationEntry.parentCollection?.sideDialogWidth
@@ -255,7 +258,7 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
     if (newFlag) {
         sidePanel = {
             path: lastCollectionPath,
-            // fullIdPath: lastCollectionPath,
+            fullIdPath: lastCollectionId,
             copy: false
         }
     }
@@ -273,7 +276,7 @@ const propsToSidePanel = (props: EntitySidePanelProps,
 
     const collectionPath = removeInitialAndTrailingSlashes(props.path);
 
-    const newPath = props.entityId
+    const urlPath = props.entityId
         ? buildUrlCollectionPath(`${collectionPath}/${props.entityId}${props.selectedTab ? "/" + props.selectedTab : ""}#${SIDE_URL_HASH}`)
         : buildUrlCollectionPath(`${collectionPath}#${NEW_URL_HASH}`);
 
@@ -286,7 +289,7 @@ const propsToSidePanel = (props: EntitySidePanelProps,
     return {
         key: `${props.path}/${props.entityId}`,
         component: <EntitySidePanel {...resolvedPanelProps}/>,
-        urlPath: newPath,
+        urlPath: urlPath,
         parentUrlPath: buildUrlCollectionPath(collectionPath),
         width: entityViewWidth,
         onClose: props.onClose,

package/src/routes/FireCMSRoute.tsx

@@ -79,7 +79,8 @@ export function FireCMSRoute() {
             key={`collection_view_${collection.id ?? collection.path}`}
             isSubCollection={false}
             parentCollectionIds={[]}
-            fullPath={collection.id}
+            fullPath={collection.path}
+            fullIdPath={collection.id}
             updateUrl={true}
             {...collection}
             Actions={toArray(collection.Actions)}/>
@@ -100,7 +101,7 @@ export function FireCMSRoute() {
                 fullIdPath={collection.id}
                 isSubCollection={false}
                 parentCollectionIds={[]}
-                fullPath={collection.id}
+                fullPath={collection.path}
                 updateUrl={true}
                 {...collection}
                 Actions={toArray(collection.Actions)}/>;
@@ -200,7 +201,6 @@ function EntityFullScreenRoute({
     const collection = isNew ? lastCollectionEntry!.collection : lastEntityEntry!.parentCollection;
     const fullIdPath = isNew ? lastCollectionEntry!.path : lastEntityEntry!.path;
     const collectionPath = navigation.resolveIdsFrom(fullIdPath);
-
     return <>
         <EntityEditView
             key={collection.id + "_" + (isNew ? "new" : (isCopy ? entityId + "_copy" : entityId))}

package/src/types/entity_actions.tsx

@@ -54,6 +54,7 @@ export type EntityActionClickProps<M extends object, USER extends User = User> =
     entity: Entity<M>;
     context: FireCMSContext<USER>;
     fullPath?: string;
+    fullIdPath?: string;
     collection?: EntityCollection<M>;
     selectionController?: SelectionController;
     highlightEntity?: (entity: Entity<any>) => void;

package/src/types/side_entity_controller.tsx

@@ -15,6 +15,11 @@ export interface EntitySidePanelProps<M extends Record<string, any> = any> {
      */
     path: string;
 
+    /**
+     * Full CMS path of the entity, including the collection and sub-collections.
+     */
+    fullIdPath?: string;
+
     /**
      * ID of the entity, if not set, it means we are creating a new entity
      */

package/src/util/navigation_from_path.ts

@@ -11,6 +11,7 @@ export interface NavigationViewEntityInternal<M extends Record<string, any>> {
     type: "entity";
     entityId: string;
     path: string;
+    fullIdPath: string;
     fullPath: string;
     parentCollection: EntityCollection<M>;
 }
@@ -19,6 +20,7 @@ export interface NavigationViewCollectionInternal<M extends Record<string, any>>
     type: "collection";
     id: string;
     path: string;
+    fullIdPath: string;
     fullPath: string;
     collection: EntityCollection<M>;
 }
@@ -26,6 +28,7 @@ export interface NavigationViewCollectionInternal<M extends Record<string, any>>
 export interface NavigationViewEntityCustomInternal<M extends Record<string, any>> {
     type: "custom_view";
     path: string;
+    fullIdPath: string;
     fullPath: string;
     entityId: string;
     view: EntityCustomView<M>;
@@ -35,13 +38,15 @@ export function getNavigationEntriesFromPath(props: {
     path: string,
     collections: EntityCollection[] | undefined,
     currentFullPath?: string,
+    currentFullIdPath?: string,
     contextEntityViews?: EntityCustomView<any>[]
 }): NavigationViewInternal [] {
 
     const {
         path,
         collections = [],
-        currentFullPath
+        currentFullPath,
+        currentFullIdPath
     } = props;
 
     const subpaths = removeInitialAndTrailingSlashes(path).split("/");
@@ -58,16 +63,18 @@ export function getNavigationEntriesFromPath(props: {
         }
 
         if (collection) {
-            const pathOrAlias = collection.id ?? collection.path;
             const collectionPath = currentFullPath && currentFullPath.length > 0
-                ? (currentFullPath + "/" + pathOrAlias)
-                : pathOrAlias;
-
+                ? (currentFullPath + "/" + collection.path)
+                : collection.path;
+            const fullIdPath = currentFullIdPath && currentFullIdPath.length > 0
+                ? (currentFullIdPath + "/" + collection.id)
+                : collection.id;
             result.push({
                 type: "collection",
                 id: collection.id,
                 path: collectionPath,
                 fullPath: collectionPath,
+                fullIdPath,
                 collection
             });
             const restOfThePath = removeInitialAndTrailingSlashes(removeInitialAndTrailingSlashes(path).replace(subpathCombination, ""));
@@ -79,6 +86,7 @@ export function getNavigationEntriesFromPath(props: {
                     type: "entity",
                     entityId,
                     path: collectionPath,
+                    fullIdPath,
                     fullPath: fullPath,
                     parentCollection: collection
                 });
@@ -97,6 +105,7 @@ export function getNavigationEntriesFromPath(props: {
                             type: "custom_view",
                             path: collectionPath,
                             entityId: entityId,
+                            fullIdPath,
                             fullPath: fullPath + "/" + customView.key,
                             view: customView
                         });
@@ -105,6 +114,7 @@ export function getNavigationEntriesFromPath(props: {
                             path: newPath,
                             collections: collection.subcollections,
                             currentFullPath: fullPath,
+                            currentFullIdPath: fullIdPath,
                             contextEntityViews: props.contextEntityViews
                         }));
                     }

package/src/util/navigation_utils.ts

@@ -201,8 +201,8 @@ export function navigateToEntity({
 
         sideEntityController.open({
             entityId,
-            path: fullIdPath ?? path,
-            // fullIdPath,
+            path,
+            fullIdPath,
             copy,
             selectedTab,
             collection,