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

package/dist/components/EntityCollectionTable/EntityCollectionRowActions.d.ts

@@ -12,10 +12,11 @@ import { CollectionSize, Entity, EntityAction, EntityCollection, SelectionContro
  *
  * @group Collection components
  */
-export declare const EntityCollectionRowActions: ({ entity, collection, fullPath, width, frozen, isSelected, selectionEnabled, size, highlightEntity, onCollectionChange, unhighlightEntity, actions, hideId, selectionController, openEntityMode }: {
+export declare const EntityCollectionRowActions: ({ entity, collection, fullPath, fullIdPath, width, frozen, isSelected, selectionEnabled, size, highlightEntity, onCollectionChange, unhighlightEntity, actions, hideId, selectionController, openEntityMode }: {
     entity: Entity<any>;
     collection?: EntityCollection<any>;
     fullPath?: string;
+    fullIdPath?: string;
     width: number;
     frozen?: boolean;
     size: CollectionSize;

package/dist/core/EntityEditView.d.ts

@@ -18,6 +18,9 @@ export type OnTabChangeParams<M extends Record<string, any>> = {
     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.

package/dist/form/EntityForm.d.ts

@@ -13,6 +13,7 @@ export type OnUpdateParams = {
 };
 export type EntityFormProps<M extends Record<string, any>> = {
     path: string;
+    fullIdPath?: string;
     collection: EntityCollection<M>;
     entityId?: string;
     entity?: Entity<M>;
@@ -45,5 +46,5 @@ export type EntityFormProps<M extends Record<string, any>> = {
     Builder?: React.ComponentType<EntityCustomViewParams<M>>;
     children?: React.ReactNode;
 };
-export declare function EntityForm<M extends Record<string, any>>({ path, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, initialDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode, formex: formexProp, disabled: disabledProp, Builder, EntityFormActionsComponent, showDefaultActions, showEntityPath, children }: EntityFormProps<M>): import("react/jsx-runtime").JSX.Element;
+export declare function EntityForm<M extends Record<string, any>>({ path, fullIdPath, entityId: entityIdProp, collection, onValuesModified, onIdChange, onSaved, entity, initialDirtyValues, onFormContextReady, forceActionsAtTheBottom, initialStatus, className, onStatusChange, onEntityChange, openEntityMode, formex: formexProp, disabled: disabledProp, Builder, EntityFormActionsComponent, showDefaultActions, showEntityPath, children }: EntityFormProps<M>): import("react/jsx-runtime").JSX.Element;
 export declare function yupToFormErrors(yupError: ValidationError): Record<string, any>;

package/dist/form/EntityFormActions.d.ts

@@ -2,6 +2,8 @@ import React from "react";
 import { Entity, ResolvedEntityCollection } from "../types";
 import { FormexController } from "@firecms/formex";
 export interface EntityFormActionsProps {
+    fullPath: string;
+    fullIdPath?: string;
     collection: ResolvedEntityCollection;
     path: string;
     entity?: Entity;
@@ -14,4 +16,4 @@ export interface EntityFormActionsProps {
     openEntityMode: "side_panel" | "full_screen";
     showDefaultActions?: boolean;
 }
-export declare function EntityFormActions({ collection, entity, layout, savingError, formex, disabled, status, pluginActions, openEntityMode }: EntityFormActionsProps): import("react/jsx-runtime").JSX.Element;
+export declare function EntityFormActions({ fullPath, fullIdPath, collection, entity, layout, savingError, formex, disabled, status, pluginActions, openEntityMode }: EntityFormActionsProps): import("react/jsx-runtime").JSX.Element;

package/dist/index.es.js

@@ -178,8 +178,8 @@ function navigateToEntity({
   if (openEntityMode === "side_panel") {
     sideEntityController.open({
       entityId,
-      path: fullIdPath ?? path,
-      // fullIdPath,
+      path,
+      fullIdPath,
       copy,
       selectedTab,
       collection,
@@ -922,7 +922,8 @@ function getNavigationEntriesFromPath(props) {
   const {
     path,
     collections = [],
-    currentFullPath
+    currentFullPath,
+    currentFullIdPath
   } = props;
   const subpaths = removeInitialAndTrailingSlashes(path).split("/");
   const subpathCombinations = getCollectionPathsCombinations(subpaths);
@@ -935,13 +936,14 @@ function getNavigationEntriesFromPath(props) {
       collection = collections && collections.find((entry) => entry.path === subpathCombination);
     }
     if (collection) {
-      const pathOrAlias = collection.id ?? collection.path;
-      const collectionPath = currentFullPath && currentFullPath.length > 0 ? currentFullPath + "/" + pathOrAlias : pathOrAlias;
+      const collectionPath = currentFullPath && currentFullPath.length > 0 ? 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, ""));
@@ -953,6 +955,7 @@ function getNavigationEntriesFromPath(props) {
           type: "entity",
           entityId,
           path: collectionPath,
+          fullIdPath,
           fullPath,
           parentCollection: collection
         });
@@ -968,6 +971,7 @@ function getNavigationEntriesFromPath(props) {
               type: "custom_view",
               path: collectionPath,
               entityId,
+              fullIdPath,
               fullPath: fullPath + "/" + customView.key,
               view: customView
             });
@@ -976,6 +980,7 @@ function getNavigationEntriesFromPath(props) {
               path: newPath,
               collections: collection.subcollections,
               currentFullPath: fullPath,
+              currentFullIdPath: fullIdPath,
               contextEntityViews: props.contextEntityViews
             }));
           }
@@ -9531,6 +9536,7 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
   entity,
   collection,
   fullPath,
+  fullIdPath,
   width,
   frozen,
   isSelected,
@@ -9568,6 +9574,7 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
         action.onClick({
           entity,
           fullPath,
+          fullIdPath,
           collection,
           context,
           selectionController,
@@ -9582,6 +9589,7 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
         action_0.onClick({
           entity,
           fullPath,
+          fullIdPath,
           collection,
           context,
           selectionController,
@@ -12391,6 +12399,7 @@ const editEntityAction = {
     entity,
     collection,
     fullPath,
+    fullIdPath,
     context,
     highlightEntity,
     unhighlightEntity,
@@ -12404,7 +12413,8 @@ const editEntityAction = {
     if (collection) {
       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 : void 0, {
       status: "existing",
       entityId: entity.id
@@ -12414,7 +12424,7 @@ const editEntityAction = {
       collection,
       entityId: entity.id,
       path,
-      fullIdPath: path,
+      fullIdPath: newFullIdPath,
       sideEntityController: context.sideEntityController,
       onClose: () => unhighlightEntity?.(entity),
       navigation: context.navigation,
@@ -12441,13 +12451,14 @@ const copyEntityAction = {
       path: entity.path,
       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),
@@ -14679,8 +14690,10 @@ const getScrollableParent = (ele) => {
   return !ele || ele === document.body ? document.body : isScrollable(ele) ? ele : getScrollableParent(ele.parentNode);
 };
 function EntityFormActions(t0) {
-  const $ = c(12);
+  const $ = c(14);
   const {
+    fullPath,
+    fullIdPath,
     collection,
     entity,
     layout,
@@ -14694,8 +14707,10 @@ function EntityFormActions(t0) {
   const context = useFireCMSContext();
   const sideEntityController = useSideEntityController();
   let t1;
-  if ($[0] !== collection || $[1] !== context || $[2] !== disabled || $[3] !== entity || $[4] !== formex.isSubmitting || $[5] !== layout || $[6] !== openEntityMode || $[7] !== pluginActions || $[8] !== savingError || $[9] !== sideEntityController || $[10] !== status) {
+  if ($[0] !== collection || $[1] !== context || $[2] !== disabled || $[3] !== entity || $[4] !== formex.isSubmitting || $[5] !== fullIdPath || $[6] !== fullPath || $[7] !== layout || $[8] !== openEntityMode || $[9] !== pluginActions || $[10] !== savingError || $[11] !== sideEntityController || $[12] !== status) {
     t1 = layout === "bottom" ? buildBottomActions$1({
+      fullPath,
+      fullIdPath,
       savingError,
       entity,
       collection,
@@ -14707,6 +14722,8 @@ function EntityFormActions(t0) {
       pluginActions,
       openEntityMode
     }) : buildSideActions$1({
+      fullPath,
+      fullIdPath,
       savingError,
       entity,
       collection,
@@ -14723,21 +14740,25 @@ function EntityFormActions(t0) {
     $[2] = disabled;
     $[3] = entity;
     $[4] = formex.isSubmitting;
-    $[5] = layout;
-    $[6] = openEntityMode;
-    $[7] = pluginActions;
-    $[8] = savingError;
-    $[9] = sideEntityController;
-    $[10] = status;
-    $[11] = t1;
+    $[5] = fullIdPath;
+    $[6] = fullPath;
+    $[7] = layout;
+    $[8] = openEntityMode;
+    $[9] = pluginActions;
+    $[10] = savingError;
+    $[11] = sideEntityController;
+    $[12] = status;
+    $[13] = t1;
   } else {
-    t1 = $[11];
+    t1 = $[13];
   }
   return t1;
 }
 function buildBottomActions$1({
   savingError,
   entity,
+  fullPath,
+  fullIdPath,
   formActions,
   collection,
   context,
@@ -14754,7 +14775,8 @@ function buildBottomActions$1({
       event.stopPropagation();
       if (entity) action.onClick({
         entity,
-        fullPath: collection.path,
+        fullPath: fullPath ?? collection.path,
+        fullIdPath: fullIdPath ?? collection.id,
         collection,
         context,
         sideEntityController,
@@ -14795,6 +14817,7 @@ function buildSideActions$1({
 }
 function EntityForm({
   path,
+  fullIdPath,
   entityId: entityIdProp,
   collection,
   onValuesModified,
@@ -15209,7 +15232,7 @@ function EntityForm({
   if (!resolvedCollection || !path) {
     throw Error("INTERNAL: Collection and path must be defined in form context");
   }
-  const dialogActions = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex, disabled: actionsDisabled, status, pluginActions, openEntityMode, showDefaultActions });
+  const dialogActions = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, fullPath: path, fullIdPath, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex, disabled: actionsDisabled, status, pluginActions, openEntityMode, showDefaultActions });
   return /* @__PURE__ */ jsx(Formex, { value: formex, children: /* @__PURE__ */ jsxs("form", { onSubmit: formex.handleSubmit, onReset: () => formex.resetForm({
     values: getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs)
   }), noValidate: true, className: cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", className), children: [
@@ -19973,7 +19996,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
       entity: entity_6,
       customEntityActions: collection.entityActions
     });
-    return /* @__PURE__ */ jsx(EntityCollectionRowActions, { entity: entity_6, width: width_0, frozen, isSelected, selectionEnabled, size: size_0, highlightEntity: setHighlightedEntity, unhighlightEntity: unselectNavigatedEntity, collection, fullPath: fullIdPath ?? fullPath, actions: actions_0, hideId: collection?.hideIdFromCollection, onCollectionChange: updateLastDeleteTimestamp, selectionController: usedSelectionController, openEntityMode });
+    return /* @__PURE__ */ jsx(EntityCollectionRowActions, { entity: entity_6, width: width_0, frozen, isSelected, selectionEnabled, size: size_0, highlightEntity: setHighlightedEntity, unhighlightEntity: unselectNavigatedEntity, collection, fullPath, fullIdPath, actions: actions_0, hideId: collection?.hideIdFromCollection, onCollectionChange: updateLastDeleteTimestamp, selectionController: usedSelectionController, openEntityMode });
   }, [updateLastDeleteTimestamp, usedSelectionController]);
   const title = /* @__PURE__ */ jsx(Popover, { open: popOverOpen, onOpenChange: setPopOverOpen, enabled: Boolean(collection.description), trigger: /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-start", children: [
     /* @__PURE__ */ jsx(Typography, { variant: "subtitle1", className: `leading-none truncate max-w-[160px] lg:max-w-[240px] ${collection.description ? "cursor-pointer" : "cursor-auto"}`, onClick: collection.description ? (e_2) => {
@@ -20377,7 +20400,7 @@ function ConfirmationDialog(t0) {
   return t7;
 }
 function FireCMSLogo(t0) {
-  const $ = c(9);
+  const $ = c(8);
   const {
     width,
     height,
@@ -20387,70 +20410,36 @@ function FireCMSLogo(t0) {
   const t1 = width ?? "100%";
   const t2 = height ?? "100%";
   let t3;
+  let t4;
+  let t5;
   if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-    t3 = /* @__PURE__ */ jsxs("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", children: [
-      /* @__PURE__ */ jsx("stop", { stopColor: "#FF5B79", offset: "0%" }),
-      /* @__PURE__ */ jsx("stop", { stopColor: "#FA5574", offset: "28.0930803%" }),
-      /* @__PURE__ */ jsx("stop", { stopColor: "#EC4C51", offset: "44.7242531%" }),
-      /* @__PURE__ */ jsx("stop", { stopColor: "#9543C1", offset: "71.4578165%" }),
-      /* @__PURE__ */ jsx("stop", { stopColor: "#3857B3", offset: "100%" })
-    ] });
+    t3 = /* @__PURE__ */ jsx("circle", { cx: "291.5", cy: "291.5", r: "291.5", fill: "#0070F4" });
+    t4 = /* @__PURE__ */ jsx("ellipse", { cx: "292", cy: "291.5", rx: "173", ry: "173.5", fill: "#FF3773" });
+    t5 = /* @__PURE__ */ jsx("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" });
     $[0] = t3;
-  } else {
-    t3 = $[0];
-  }
-  let t4;
-  if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
-    t4 = /* @__PURE__ */ jsxs("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", children: [
-      /* @__PURE__ */ jsx("stop", { stopColor: "#68294F", stopOpacity: "0", offset: "0%" }),
-      /* @__PURE__ */ jsx("stop", { stopColor: "#5E2548", stopOpacity: "0.04641108", offset: "75.3503173%" }),
-      /* @__PURE__ */ jsx("stop", { stopColor: "#0D060B", stopOpacity: "0.437431709", offset: "100%" })
-    ] });
     $[1] = t4;
-  } else {
-    t4 = $[1];
-  }
-  let t5;
-  if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
-    t5 = /* @__PURE__ */ jsxs("defs", { children: [
-      t3,
-      t4,
-      /* @__PURE__ */ jsxs("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", children: [
-        /* @__PURE__ */ jsx("stop", { stopColor: "#68294F", stopOpacity: "0", offset: "0%" }),
-        /* @__PURE__ */ jsx("stop", { stopColor: "#5E2548", stopOpacity: "0.04641108", offset: "84.0867343%" }),
-        /* @__PURE__ */ jsx("stop", { stopColor: "#FF0000", stopOpacity: "0.567324765", offset: "100%" })
-      ] })
-    ] });
     $[2] = t5;
   } else {
+    t3 = $[0];
+    t4 = $[1];
     t5 = $[2];
   }
   let t6;
-  if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
-    t6 = /* @__PURE__ */ jsx("g", { id: "Page-1", stroke: "none", strokeWidth: "1", fill: "none", fillRule: "evenodd", children: /* @__PURE__ */ jsxs("g", { id: "firecms_logo", children: [
-      /* @__PURE__ */ jsx("circle", { fill: "url(#radialGradient-1)", cx: "299.5", cy: "299.5", r: "299.5" }),
-      /* @__PURE__ */ jsx("circle", { fill: "url(#radialGradient-2)", cx: "299.5", cy: "299.5", r: "299.5" }),
-      /* @__PURE__ */ jsx("circle", { fill: "url(#radialGradient-3)", cx: "299.5", cy: "299.5", r: "299.5" })
-    ] }) });
-    $[3] = t6;
-  } else {
-    t6 = $[3];
-  }
-  let t7;
-  if ($[4] !== className || $[5] !== style || $[6] !== t1 || $[7] !== t2) {
-    t7 = /* @__PURE__ */ jsxs("svg", { width: t1, height: t2, viewBox: "0 0 599 599", version: "1.1", style, className, xmlns: "http://www.w3.org/2000/svg", children: [
-      t5,
-      t6
+  if ($[3] !== className || $[4] !== style || $[5] !== t1 || $[6] !== t2) {
+    t6 = /* @__PURE__ */ jsxs("svg", { width: t1, height: t2, version: "1.1", style, className, viewBox: "0 0 583 583", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [
+      t3,
+      t4,
+      t5
     ] });
-    $[4] = className;
-    $[5] = style;
-    $[6] = t1;
-    $[7] = t2;
-    $[8] = t7;
+    $[3] = className;
+    $[4] = style;
+    $[5] = t1;
+    $[6] = t2;
+    $[7] = t6;
   } else {
-    t7 = $[8];
+    t6 = $[7];
   }
-  return t7;
+  return t6;
 }
 const AppContext = React__default.createContext({
   hasDrawer: false,
@@ -22784,8 +22773,15 @@ function EntityEditViewInner({
   }), role: "tabpanel", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityJsonPreview, { values: formContext?.values ?? entity?.values ?? {} }) }) }, "json_view");
   const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
     const subcollectionId = subcollection.id ?? subcollection.path;
-    const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : void 0;
+    const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.path)}` : void 0;
     const newFullIdPath = fullIdPath ? `${fullIdPath}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : void 0;
+    console.debug("Rendering subcollection", {
+      subcollectionId,
+      fullIdPath,
+      newFullPath,
+      newFullIdPath,
+      selectedTab
+    });
     if (selectedTab !== subcollectionId) return null;
     return /* @__PURE__ */ jsxs("div", { className: "relative flex-1 h-full overflow-auto w-full", role: "tabpanel", children: [
       globalLoading && /* @__PURE__ */ jsx(CircularProgressCenter, {}),
@@ -22808,7 +22804,7 @@ function EntityEditViewInner({
     /* @__PURE__ */ jsx(EntityView, { className: "px-8 h-full overflow-auto", entity, path, collection }),
     /* @__PURE__ */ jsx("div", { className: "h-16" })
   ] }) }) : null;
-  const entityView = /* @__PURE__ */ jsx(EntityForm, { collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues: cachedDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, ...formProps, onEntityChange: (entity_0) => {
+  const entityView = /* @__PURE__ */ jsx(EntityForm, { fullIdPath, collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues: cachedDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, ...formProps, onEntityChange: (entity_0) => {
     setUsedEntity(entity_0);
     formProps?.onEntityChange?.(entity_0);
   }, onStatusChange: (status_0) => {
@@ -22866,6 +22862,7 @@ function EntitySidePanel(props) {
     allowFullScreen = true,
     path,
     entityId,
+    fullIdPath,
     formProps
   } = props;
   const {
@@ -22894,6 +22891,7 @@ function EntitySidePanel(props) {
       sideEntityController.replace({
         path: params.path,
         entityId: params.entityId,
+        fullIdPath: props.fullIdPath,
         selectedTab: params.selectedTab,
         updateUrl: true,
         collection: params.collection
@@ -22931,21 +22929,21 @@ function EntitySidePanel(props) {
   if (!props || !collection) {
     return /* @__PURE__ */ jsx("div", { className: "w-full" });
   }
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityEditView, { ...props, layout: "side_panel", collection, parentCollectionIds, onValuesModified, onSaved: onUpdate, barActions: /* @__PURE__ */ jsxs(Fragment, { children: [
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(EntityEditView, { ...props, fullIdPath, layout: "side_panel", collection, parentCollectionIds, onValuesModified, onSaved: onUpdate, barActions: /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(IconButton, { className: "self-center", onClick: onClose, children: /* @__PURE__ */ jsx(CloseIcon, { size: "small" }) }),
     allowFullScreen && /* @__PURE__ */ jsx(IconButton, { className: "self-center", onClick: () => {
       if (entityId) navigate(location.pathname);
       else navigate(location.pathname + "#new");
     }, children: /* @__PURE__ */ jsx(OpenInFullIcon, { size: "small" }) })
   ] }), onTabChange: ({
-    path: path_0,
     entityId: entityId_0,
     selectedTab,
     collection: collection_0
   }) => {
     sideEntityController.replace({
-      path: path_0,
+      path,
       entityId: entityId_0,
+      fullIdPath: props.fullIdPath,
       selectedTab,
       updateUrl: true,
       collection: collection_0
@@ -23102,16 +23100,18 @@ function buildSidePanelsFromUrl(path, collections, newFlag) {
   });
   let sidePanel = void 0;
   let lastCollectionPath = "";
+  let lastCollectionId = void 0;
   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
@@ -23129,7 +23129,7 @@ function buildSidePanelsFromUrl(path, collections, newFlag) {
   if (newFlag) {
     sidePanel = {
       path: lastCollectionPath,
-      // fullIdPath: lastCollectionPath,
+      fullIdPath: lastCollectionId,
       copy: false
     };
   }
@@ -23137,7 +23137,7 @@ function buildSidePanelsFromUrl(path, collections, newFlag) {
 }
 const propsToSidePanel = (props, buildUrlCollectionPath, resolveIdsFrom, smallLayout, customizationController, authController) => {
   const collectionPath = removeInitialAndTrailingSlashes(props.path);
-  const newPath = props.entityId ? buildUrlCollectionPath(`${collectionPath}/${props.entityId}${props.selectedTab ? "/" + props.selectedTab : ""}#${SIDE_URL_HASH}`) : buildUrlCollectionPath(`${collectionPath}#${NEW_URL_HASH}`);
+  const urlPath = props.entityId ? buildUrlCollectionPath(`${collectionPath}/${props.entityId}${props.selectedTab ? "/" + props.selectedTab : ""}#${SIDE_URL_HASH}`) : buildUrlCollectionPath(`${collectionPath}#${NEW_URL_HASH}`);
   const resolvedPanelProps = {
     ...props,
     formProps: props.formProps
@@ -23146,7 +23146,7 @@ const propsToSidePanel = (props, buildUrlCollectionPath, resolveIdsFrom, smallLa
   return {
     key: `${props.path}/${props.entityId}`,
     component: /* @__PURE__ */ jsx(EntitySidePanel, { ...resolvedPanelProps }),
-    urlPath: newPath,
+    urlPath,
     parentUrlPath: buildUrlCollectionPath(collectionPath),
     width: entityViewWidth,
     onClose: props.onClose,
@@ -24618,7 +24618,7 @@ function FireCMSRoute() {
         } else {
           t8 = $[22];
         }
-        t62 = /* @__PURE__ */ jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t8, fullPath: collection.id, updateUrl: true, ...collection, Actions: toArray(collection.Actions) }, `collection_view_${collection.id ?? collection.path}`);
+        t62 = /* @__PURE__ */ jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t8, fullPath: collection.path, fullIdPath: collection.id, updateUrl: true, ...collection, Actions: toArray(collection.Actions) }, `collection_view_${collection.id ?? collection.path}`);
       }
       $[18] = navigation;
       $[19] = navigationEntries;
@@ -24658,7 +24658,7 @@ function FireCMSRoute() {
           } else {
             t8 = $[27];
           }
-          t62 = /* @__PURE__ */ jsx(EntityCollectionView, { fullIdPath: collection_0.id, isSubCollection: false, parentCollectionIds: t8, fullPath: collection_0.id, updateUrl: true, ...collection_0, Actions: toArray(collection_0.Actions) }, `collection_view_${collection_0.id ?? collection_0.path}`);
+          t62 = /* @__PURE__ */ jsx(EntityCollectionView, { fullIdPath: collection_0.id, isSubCollection: false, parentCollectionIds: t8, fullPath: collection_0.path, updateUrl: true, ...collection_0, Actions: toArray(collection_0.Actions) }, `collection_view_${collection_0.id ?? collection_0.path}`);
         }
         $[23] = navigation;
         $[24] = navigationEntries;