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

package/dist/index.umd.js

@@ -176,8 +176,8 @@
     if (openEntityMode === "side_panel") {
       sideEntityController.open({
         entityId,
-        path: fullIdPath ?? path,
-        // fullIdPath,
+        path,
+        fullIdPath,
         copy,
         selectedTab,
         collection,
@@ -920,7 +920,8 @@
     const {
       path,
       collections = [],
-      currentFullPath
+      currentFullPath,
+      currentFullIdPath
     } = props;
     const subpaths = removeInitialAndTrailingSlashes(path).split("/");
     const subpathCombinations = getCollectionPathsCombinations(subpaths);
@@ -933,13 +934,14 @@
         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, ""));
@@ -951,6 +953,7 @@
             type: "entity",
             entityId,
             path: collectionPath,
+            fullIdPath,
             fullPath,
             parentCollection: collection
           });
@@ -966,6 +969,7 @@
                 type: "custom_view",
                 path: collectionPath,
                 entityId,
+                fullIdPath,
                 fullPath: fullPath + "/" + customView.key,
                 view: customView
               });
@@ -974,6 +978,7 @@
                 path: newPath,
                 collections: collection.subcollections,
                 currentFullPath: fullPath,
+                currentFullIdPath: fullIdPath,
                 contextEntityViews: props.contextEntityViews
               }));
             }
@@ -9529,6 +9534,7 @@
     entity,
     collection,
     fullPath,
+    fullIdPath,
     width,
     frozen,
     isSelected,
@@ -9566,6 +9572,7 @@
           action.onClick({
             entity,
             fullPath,
+            fullIdPath,
             collection,
             context,
             selectionController,
@@ -9580,6 +9587,7 @@
           action_0.onClick({
             entity,
             fullPath,
+            fullIdPath,
             collection,
             context,
             selectionController,
@@ -12389,6 +12397,7 @@
       entity,
       collection,
       fullPath,
+      fullIdPath,
       context,
       highlightEntity,
       unhighlightEntity,
@@ -12402,7 +12411,8 @@
       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
@@ -12412,7 +12422,7 @@
         collection,
         entityId: entity.id,
         path,
-        fullIdPath: path,
+        fullIdPath: newFullIdPath,
         sideEntityController: context.sideEntityController,
         onClose: () => unhighlightEntity?.(entity),
         navigation: context.navigation,
@@ -12439,13 +12449,14 @@
         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),
@@ -14677,8 +14688,10 @@
     return !ele || ele === document.body ? document.body : isScrollable(ele) ? ele : getScrollableParent(ele.parentNode);
   };
   function EntityFormActions(t0) {
-    const $ = reactCompilerRuntime.c(12);
+    const $ = reactCompilerRuntime.c(14);
     const {
+      fullPath,
+      fullIdPath,
       collection,
       entity,
       layout,
@@ -14692,8 +14705,10 @@
     const context = useFireCMSContext();
     const sideEntityController = useSideEntityController();
     let t1;
-    if ($[0] !== collection || $[1] !== context || $[2] !== disabled || $[3] !== entity || $[4] !== formex2.isSubmitting || $[5] !== layout || $[6] !== openEntityMode || $[7] !== pluginActions || $[8] !== savingError || $[9] !== sideEntityController || $[10] !== status) {
+    if ($[0] !== collection || $[1] !== context || $[2] !== disabled || $[3] !== entity || $[4] !== formex2.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,
@@ -14705,6 +14720,8 @@
         pluginActions,
         openEntityMode
       }) : buildSideActions$1({
+        fullPath,
+        fullIdPath,
         savingError,
         entity,
         collection,
@@ -14721,21 +14738,25 @@
       $[2] = disabled;
       $[3] = entity;
       $[4] = formex2.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,
@@ -14752,7 +14773,8 @@
         event.stopPropagation();
         if (entity) action.onClick({
           entity,
-          fullPath: collection.path,
+          fullPath: fullPath ?? collection.path,
+          fullIdPath: fullIdPath ?? collection.id,
           collection,
           context,
           sideEntityController,
@@ -14793,6 +14815,7 @@
   }
   function EntityForm({
     path,
+    fullIdPath,
     entityId: entityIdProp,
     collection,
     onValuesModified,
@@ -15207,7 +15230,7 @@
     if (!resolvedCollection || !path) {
       throw Error("INTERNAL: Collection and path must be defined in form context");
     }
-    const dialogActions = /* @__PURE__ */ jsxRuntime.jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex: formex$1, disabled: actionsDisabled, status, pluginActions, openEntityMode, showDefaultActions });
+    const dialogActions = /* @__PURE__ */ jsxRuntime.jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, fullPath: path, fullIdPath, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex: formex$1, disabled: actionsDisabled, status, pluginActions, openEntityMode, showDefaultActions });
     return /* @__PURE__ */ jsxRuntime.jsx(formex.Formex, { value: formex$1, children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: formex$1.handleSubmit, onReset: () => formex$1.resetForm({
       values: getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs)
     }), noValidate: true, className: ui.cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", className), children: [
@@ -19971,7 +19994,7 @@
         entity: entity_6,
         customEntityActions: collection.entityActions
       });
-      return /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.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__ */ jsxRuntime.jsx(ui.Popover, { open: popOverOpen, onOpenChange: setPopOverOpen, enabled: Boolean(collection.description), trigger: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-start", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.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) => {
@@ -20375,7 +20398,7 @@
     return t7;
   }
   function FireCMSLogo(t0) {
-    const $ = reactCompilerRuntime.c(9);
+    const $ = reactCompilerRuntime.c(8);
     const {
       width,
       height,
@@ -20385,70 +20408,36 @@
     const t1 = width ?? "100%";
     const t2 = height ?? "100%";
     let t3;
+    let t4;
+    let t5;
     if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-      t3 = /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsx("stop", { stopColor: "#FF5B79", offset: "0%" }),
-        /* @__PURE__ */ jsxRuntime.jsx("stop", { stopColor: "#FA5574", offset: "28.0930803%" }),
-        /* @__PURE__ */ jsxRuntime.jsx("stop", { stopColor: "#EC4C51", offset: "44.7242531%" }),
-        /* @__PURE__ */ jsxRuntime.jsx("stop", { stopColor: "#9543C1", offset: "71.4578165%" }),
-        /* @__PURE__ */ jsxRuntime.jsx("stop", { stopColor: "#3857B3", offset: "100%" })
-      ] });
+      t3 = /* @__PURE__ */ jsxRuntime.jsx("circle", { cx: "291.5", cy: "291.5", r: "291.5", fill: "#0070F4" });
+      t4 = /* @__PURE__ */ jsxRuntime.jsx("ellipse", { cx: "292", cy: "291.5", rx: "173", ry: "173.5", fill: "#FF3773" });
+      t5 = /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.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__ */ jsxRuntime.jsx("stop", { stopColor: "#68294F", stopOpacity: "0", offset: "0%" }),
-        /* @__PURE__ */ jsxRuntime.jsx("stop", { stopColor: "#5E2548", stopOpacity: "0.04641108", offset: "75.3503173%" }),
-        /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsxs("defs", { children: [
-        t3,
-        t4,
-        /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsx("stop", { stopColor: "#68294F", stopOpacity: "0", offset: "0%" }),
-          /* @__PURE__ */ jsxRuntime.jsx("stop", { stopColor: "#5E2548", stopOpacity: "0.04641108", offset: "84.0867343%" }),
-          /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsx("g", { id: "Page-1", stroke: "none", strokeWidth: "1", fill: "none", fillRule: "evenodd", children: /* @__PURE__ */ jsxRuntime.jsxs("g", { id: "firecms_logo", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("circle", { fill: "url(#radialGradient-1)", cx: "299.5", cy: "299.5", r: "299.5" }),
-        /* @__PURE__ */ jsxRuntime.jsx("circle", { fill: "url(#radialGradient-2)", cx: "299.5", cy: "299.5", r: "299.5" }),
-        /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.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__ */ jsxRuntime.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.createContext({
     hasDrawer: false,
@@ -22782,8 +22771,15 @@
     }), role: "tabpanel", children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsxs("div", { className: "relative flex-1 h-full overflow-auto w-full", role: "tabpanel", children: [
         globalLoading && /* @__PURE__ */ jsxRuntime.jsx(CircularProgressCenter, {}),
@@ -22806,7 +22802,7 @@
       /* @__PURE__ */ jsxRuntime.jsx(EntityView, { className: "px-8 h-full overflow-auto", entity, path, collection }),
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-16" })
     ] }) }) : null;
-    const entityView = /* @__PURE__ */ jsxRuntime.jsx(EntityForm, { collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues: cachedDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: ui.cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, ...formProps, onEntityChange: (entity_0) => {
+    const entityView = /* @__PURE__ */ jsxRuntime.jsx(EntityForm, { fullIdPath, collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues: cachedDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: ui.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) => {
@@ -22864,6 +22860,7 @@
       allowFullScreen = true,
       path,
       entityId,
+      fullIdPath,
       formProps
     } = props;
     const {
@@ -22892,6 +22889,7 @@
         sideEntityController.replace({
           path: params.path,
           entityId: params.entityId,
+          fullIdPath: props.fullIdPath,
           selectedTab: params.selectedTab,
           updateUrl: true,
           collection: params.collection
@@ -22929,21 +22927,21 @@
     if (!props || !collection) {
       return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full" });
     }
-    return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsx(EntityEditView, { ...props, layout: "side_panel", collection, parentCollectionIds, onValuesModified, onSaved: onUpdate, barActions: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsx(EntityEditView, { ...props, fullIdPath, layout: "side_panel", collection, parentCollectionIds, onValuesModified, onSaved: onUpdate, barActions: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.IconButton, { className: "self-center", onClick: onClose, children: /* @__PURE__ */ jsxRuntime.jsx(ui.CloseIcon, { size: "small" }) }),
       allowFullScreen && /* @__PURE__ */ jsxRuntime.jsx(ui.IconButton, { className: "self-center", onClick: () => {
         if (entityId) navigate(location.pathname);
         else navigate(location.pathname + "#new");
       }, children: /* @__PURE__ */ jsxRuntime.jsx(ui.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
@@ -23100,16 +23098,18 @@
     });
     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
@@ -23127,7 +23127,7 @@
     if (newFlag) {
       sidePanel = {
         path: lastCollectionPath,
-        // fullIdPath: lastCollectionPath,
+        fullIdPath: lastCollectionId,
         copy: false
       };
     }
@@ -23135,7 +23135,7 @@
   }
   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
@@ -23144,7 +23144,7 @@
     return {
       key: `${props.path}/${props.entityId}`,
       component: /* @__PURE__ */ jsxRuntime.jsx(EntitySidePanel, { ...resolvedPanelProps }),
-      urlPath: newPath,
+      urlPath,
       parentUrlPath: buildUrlCollectionPath(collectionPath),
       width: entityViewWidth,
       onClose: props.onClose,
@@ -24616,7 +24616,7 @@
           } else {
             t8 = $[22];
           }
-          t62 = /* @__PURE__ */ jsxRuntime.jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t8, fullPath: collection.id, updateUrl: true, ...collection, Actions: toArray(collection.Actions) }, `collection_view_${collection.id ?? collection.path}`);
+          t62 = /* @__PURE__ */ jsxRuntime.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;
@@ -24656,7 +24656,7 @@
             } else {
               t8 = $[27];
             }
-            t62 = /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.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;