@firecms/core 3.0.0-canary.226 → 3.0.0-canary.228

package/dist/components/EntityCollectionView/EntityCollectionView.d.ts

@@ -9,6 +9,10 @@ export type EntityCollectionViewProps<M extends Record<string, any>> = {
      * It defaults to the collection path if not provided.
      */
     fullPath?: string;
+    /**
+     * Full path using navigation ids.
+     */
+    fullIdPath?: string;
     /**
      * If this is a subcollection, specify the parent collection ids.
      */

package/dist/core/EntityEditView.d.ts

@@ -19,6 +19,10 @@ export type OnTabChangeParams<M extends Record<string, any>> = {
 };
 export interface EntityEditViewProps<M extends Record<string, any>> {
     path: string;
+    /**
+     * The navigation path to the entity.
+     */
+    fullIdPath?: string;
     collection: EntityCollection<M>;
     entityId?: string;
     databaseId?: string;
@@ -37,7 +41,7 @@ export interface EntityEditViewProps<M extends Record<string, any>> {
  * an entity is opened.
  */
 export declare function EntityEditView<M extends Record<string, any>, USER extends User>({ entityId, ...props }: EntityEditViewProps<M>): import("react/jsx-runtime").JSX.Element;
-export declare function EntityEditViewInner<M extends Record<string, any>>({ path, entityId, selectedTab: selectedTabProp, collection, parentCollectionIds, onValuesModified, onSaved, onTabChange, entity, cachedDirtyValues, dataLoading, layout, barActions, status, setStatus, formProps, canEdit }: EntityEditViewProps<M> & {
+export declare function EntityEditViewInner<M extends Record<string, any>>({ path, fullIdPath, entityId, selectedTab: selectedTabProp, collection, parentCollectionIds, onValuesModified, onSaved, onTabChange, entity, cachedDirtyValues, dataLoading, layout, barActions, status, setStatus, formProps, canEdit }: EntityEditViewProps<M> & {
     entity?: Entity<M>;
     cachedDirtyValues?: Partial<M>;
     dataLoading: boolean;

package/dist/index.es.js

@@ -149,6 +149,7 @@ function navigateToEntity({
   entityId,
   copy,
   path,
+  fullIdPath,
   selectedTab,
   sideEntityController,
   onClose,
@@ -157,7 +158,8 @@ function navigateToEntity({
   if (openEntityMode === "side_panel") {
     sideEntityController.open({
       entityId,
-      path,
+      path: fullIdPath ?? path,
+      // fullIdPath,
       copy,
       selectedTab,
       collection,
@@ -165,7 +167,7 @@ function navigateToEntity({
       onClose
     });
   } else {
-    let to = navigation.buildUrlCollectionPath(entityId ? `${path}/${entityId}` : path);
+    let to = navigation.buildUrlCollectionPath(entityId ? `${fullIdPath ?? path}/${entityId}` : fullIdPath ?? path);
     if (entityId && selectedTab) {
       to += `/${selectedTab}`;
     }
@@ -12253,7 +12255,7 @@ const editEntityAction = {
     if (collection) {
       addRecentId(collection.id, entity.id);
     }
-    const path = collection?.collectionGroup ? entity.path : fullPath ?? entity.path;
+    const path = collection?.collectionGroup ? collection.id : fullPath ?? collection?.id ?? entity.path;
     const defaultSelectedView = resolveDefaultSelectedView(collection ? collection.defaultSelectedView : void 0, {
       status: "existing",
       entityId: entity.id
@@ -12263,6 +12265,7 @@ const editEntityAction = {
       collection,
       entityId: entity.id,
       path,
+      fullIdPath: path,
       sideEntityController: context.sideEntityController,
       onClose: () => unhighlightEntity?.(entity),
       navigation: context.navigation,
@@ -12289,12 +12292,13 @@ const copyEntityAction = {
       path: entity.path,
       entityId: entity.id
     });
-    const path = collection?.collectionGroup ? entity.path : fullPath ?? entity.path;
+    const path = collection?.collectionGroup ? collection.id : fullPath ?? collection?.id ?? entity.path;
     navigateToEntity({
       openEntityMode,
       collection,
       entityId: entity.id,
       path,
+      fullIdPath: path,
       copy: true,
       sideEntityController: context.sideEntityController,
       onClose: () => unhighlightEntity?.(entity),
@@ -18462,6 +18466,7 @@ function createCacheKey(fullPath, filters) {
 const DEFAULT_ENTITY_OPEN_MODE = "side_panel";
 const EntityCollectionView = React__default.memo(function EntityCollectionView2({
   fullPath: fullPathProp,
+  fullIdPath,
   parentCollectionIds,
   isSubCollection,
   className,
@@ -18470,11 +18475,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
 }) {
   const context = useFireCMSContext();
   const navigation = useNavigationController();
-  const fullPath = (fullPathProp ? navigation.resolveIdsFrom(fullPathProp) : void 0) ?? collectionProp.path;
-  console.log("aaa", {
-    fullPathProp,
-    fullPath
-  });
+  const fullPath = fullPathProp ?? collectionProp.path;
   const dataSource = useDataSource();
   const sideEntityController = useSideEntityController();
   const authController = useAuthController();
@@ -18545,6 +18546,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     navigateToEntity({
       navigation,
       path,
+      fullIdPath,
       sideEntityController,
       openEntityMode,
       collection: collection_1,
@@ -18561,6 +18563,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
       collection: collection_2,
       entityId: void 0,
       path: fullPath,
+      fullIdPath,
       sideEntityController,
       navigation,
       onClose: unselectNavigatedEntity
@@ -18696,6 +18699,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
             entityId: entity_3.id,
             selectedTab: subcollection.id ?? subcollection.path,
             path: fullPath,
+            fullIdPath,
             navigation,
             sideEntityController
           });
@@ -18751,7 +18755,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, 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 ?? fullPath, 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) => {
@@ -18793,7 +18797,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
         /* @__PURE__ */ jsx(AddIcon, {}),
         "Create your first entity"
       ] })
-    ] }) : /* @__PURE__ */ jsx(Typography, { variant: "label", children: "No results with the applied filter/sort" }), hoverRow, inlineEditing: checkInlineEditing(), AdditionalHeaderWidget: buildAdditionalHeaderWidget, AddColumnComponent: addColumnComponentInternal, getIdColumnWidth, additionalIDHeaderWidget: /* @__PURE__ */ jsx(EntityIdHeaderWidget, { path: fullPath, collection }), openEntityMode }, `collection_table_${fullPath}`),
+    ] }) : /* @__PURE__ */ jsx(Typography, { variant: "label", children: "No results with the applied filter/sort" }), hoverRow, inlineEditing: checkInlineEditing(), AdditionalHeaderWidget: buildAdditionalHeaderWidget, AddColumnComponent: addColumnComponentInternal, getIdColumnWidth, additionalIDHeaderWidget: /* @__PURE__ */ jsx(EntityIdHeaderWidget, { path: fullPath, fullIdPath: fullIdPath ?? fullPath, collection }), openEntityMode }, `collection_table_${fullPath}`),
     popupCell && /* @__PURE__ */ jsx(PopupFormField, { open: Boolean(popupCell), onClose: onPopupClose, cellRect: popupCell?.cellRect, propertyKey: popupCell?.propertyKey, collection, entityId: popupCell.entityId, tableKey: tableKey.current, customFieldValidator: uniqueFieldValidator, path: resolvedFullPath, onCellValueChange: onValueChange, container: containerRef.current }, `popup_form_${popupCell?.propertyKey}_${popupCell?.entityId}`),
     deleteEntityClicked && /* @__PURE__ */ jsx(DeleteEntityDialog, { entityOrEntitiesToDelete: deleteEntityClicked, path: fullPath, collection, callbacks: collection.callbacks, open: Boolean(deleteEntityClicked), onEntityDelete: internalOnEntityDelete, onMultipleEntitiesDelete: internalOnMultipleEntitiesDelete, onClose: () => setDeleteEntityClicked(void 0) })
   ] });
@@ -18852,10 +18856,11 @@ function buildPropertyWidthOverwrite(key, width) {
   };
 }
 function EntityIdHeaderWidget(t0) {
-  const $ = c(40);
+  const $ = c(42);
   const {
     collection,
-    path
+    path,
+    fullIdPath
   } = t0;
   const navigation = useNavigationController();
   const [openPopup, setOpenPopup] = React__default.useState(false);
@@ -18884,7 +18889,7 @@ function EntityIdHeaderWidget(t0) {
     t4 = $[3];
   }
   let t5;
-  if ($[4] !== collection || $[5] !== navigation || $[6] !== openEntityMode || $[7] !== path || $[8] !== searchString || $[9] !== sideEntityController) {
+  if ($[4] !== collection || $[5] !== fullIdPath || $[6] !== navigation || $[7] !== openEntityMode || $[8] !== path || $[9] !== searchString || $[10] !== sideEntityController) {
     t5 = (e) => {
       e.preventDefault();
       if (!searchString) {
@@ -18898,77 +18903,79 @@ function EntityIdHeaderWidget(t0) {
         collection,
         entityId,
         path,
+        fullIdPath,
         sideEntityController,
         navigation
       });
     };
     $[4] = collection;
-    $[5] = navigation;
-    $[6] = openEntityMode;
-    $[7] = path;
-    $[8] = searchString;
-    $[9] = sideEntityController;
-    $[10] = t5;
+    $[5] = fullIdPath;
+    $[6] = navigation;
+    $[7] = openEntityMode;
+    $[8] = path;
+    $[9] = searchString;
+    $[10] = sideEntityController;
+    $[11] = t5;
   } else {
-    t5 = $[10];
+    t5 = $[11];
   }
   let t6;
-  if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
+  if ($[12] === Symbol.for("react.memo_cache_sentinel")) {
     t6 = (e_0) => {
       setSearchString(e_0.target.value);
     };
-    $[11] = t6;
+    $[12] = t6;
   } else {
-    t6 = $[11];
+    t6 = $[12];
   }
   let t7;
-  if ($[12] !== openPopup || $[13] !== searchString) {
+  if ($[13] !== openPopup || $[14] !== searchString) {
     t7 = /* @__PURE__ */ jsx("input", { autoFocus: openPopup, placeholder: "Find entity by ID", onChange: t6, value: searchString, className: "rounded-lg bg-white dark:bg-surface-800 flex-grow bg-transparent outline-none p-2 " + focusedDisabled });
-    $[12] = openPopup;
-    $[13] = searchString;
-    $[14] = t7;
+    $[13] = openPopup;
+    $[14] = searchString;
+    $[15] = t7;
   } else {
-    t7 = $[14];
+    t7 = $[15];
   }
   const t8 = !searchString.trim();
   let t9;
-  if ($[15] === Symbol.for("react.memo_cache_sentinel")) {
+  if ($[16] === Symbol.for("react.memo_cache_sentinel")) {
     t9 = /* @__PURE__ */ jsx(KeyboardTabIcon, {});
-    $[15] = t9;
+    $[16] = t9;
   } else {
-    t9 = $[15];
+    t9 = $[16];
   }
   let t10;
-  if ($[16] !== t8) {
+  if ($[17] !== t8) {
     t10 = /* @__PURE__ */ jsx(Button, { variant: "text", disabled: t8, type: "submit", children: t9 });
-    $[16] = t8;
-    $[17] = t10;
+    $[17] = t8;
+    $[18] = t10;
   } else {
-    t10 = $[17];
+    t10 = $[18];
   }
   let t11;
-  if ($[18] !== t10 || $[19] !== t7) {
+  if ($[19] !== t10 || $[20] !== t7) {
     t11 = /* @__PURE__ */ jsxs("div", { className: "flex p-2 w-full gap-2", children: [
       t7,
       t10
     ] });
-    $[18] = t10;
-    $[19] = t7;
-    $[20] = t11;
+    $[19] = t10;
+    $[20] = t7;
+    $[21] = t11;
   } else {
-    t11 = $[20];
+    t11 = $[21];
   }
   let t12;
-  if ($[21] !== t11 || $[22] !== t5) {
+  if ($[22] !== t11 || $[23] !== t5) {
     t12 = /* @__PURE__ */ jsx("form", { noValidate: true, onSubmit: t5, className: "w-96 max-w-full", children: t11 });
-    $[21] = t11;
-    $[22] = t5;
-    $[23] = t12;
+    $[22] = t11;
+    $[23] = t5;
+    $[24] = t12;
   } else {
-    t12 = $[23];
+    t12 = $[24];
   }
   let t13;
-  if ($[24] !== collection || $[25] !== navigation || $[26] !== openEntityMode || $[27] !== path || $[28] !== recentIds || $[29] !== sideEntityController) {
+  if ($[25] !== collection || $[26] !== fullIdPath || $[27] !== navigation || $[28] !== openEntityMode || $[29] !== path || $[30] !== recentIds || $[31] !== sideEntityController) {
     t13 = recentIds && recentIds.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2 p-2", children: recentIds.map((id) => /* @__PURE__ */ jsx(ReferencePreview, { reference: new EntityReference(id, path), hover: true, onClick: () => {
       setOpenPopup(false);
       navigateToEntity({
@@ -18976,49 +18983,51 @@ function EntityIdHeaderWidget(t0) {
         collection,
         entityId: id,
         path,
+        fullIdPath,
         sideEntityController,
         navigation
       });
     }, includeEntityLink: false, size: "small" }, id)) });
-    $[24] = collection;
-    $[25] = navigation;
-    $[26] = openEntityMode;
-    $[27] = path;
-    $[28] = recentIds;
-    $[29] = sideEntityController;
-    $[30] = t13;
+    $[25] = collection;
+    $[26] = fullIdPath;
+    $[27] = navigation;
+    $[28] = openEntityMode;
+    $[29] = path;
+    $[30] = recentIds;
+    $[31] = sideEntityController;
+    $[32] = t13;
   } else {
-    t13 = $[30];
+    t13 = $[32];
   }
   let t14;
-  if ($[31] !== t12 || $[32] !== t13) {
+  if ($[33] !== t12 || $[34] !== t13) {
     t14 = /* @__PURE__ */ jsxs("div", { className: t4, children: [
       t12,
       t13
     ] });
-    $[31] = t12;
-    $[32] = t13;
-    $[33] = t14;
+    $[33] = t12;
+    $[34] = t13;
+    $[35] = t14;
   } else {
-    t14 = $[33];
+    t14 = $[35];
   }
   let t15;
-  if ($[34] !== openPopup || $[35] !== t14) {
+  if ($[36] !== openPopup || $[37] !== t14) {
     t15 = /* @__PURE__ */ jsx(Popover, { open: openPopup, onOpenChange: setOpenPopup, sideOffset: 0, align: "start", alignOffset: -117, trigger: t3, children: t14 });
-    $[34] = openPopup;
-    $[35] = t14;
-    $[36] = t15;
+    $[36] = openPopup;
+    $[37] = t14;
+    $[38] = t15;
   } else {
-    t15 = $[36];
+    t15 = $[38];
   }
   let t16;
-  if ($[37] !== t15 || $[38] !== t2) {
+  if ($[39] !== t15 || $[40] !== t2) {
     t16 = /* @__PURE__ */ jsx(Tooltip, { title: t2, asChild: false, children: t15 });
-    $[37] = t15;
-    $[38] = t2;
-    $[39] = t16;
+    $[39] = t15;
+    $[40] = t2;
+    $[41] = t16;
   } else {
-    t16 = $[39];
+    t16 = $[41];
   }
   return t16;
 }
@@ -21274,6 +21283,7 @@ function EntityEditView({
 }
 function EntityEditViewInner({
   path,
+  fullIdPath,
   entityId,
   selectedTab: selectedTabProp,
   collection,
@@ -21371,18 +21381,19 @@ 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 fullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : void 0;
+    const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : void 0;
+    const newFullIdPath = fullIdPath ? `${fullIdPath}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : void 0;
     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, {}),
-      !globalLoading && (usedEntity && fullPath ? /* @__PURE__ */ jsx(EntityCollectionView, { fullPath, parentCollectionIds: [...parentCollectionIds, collection.id], isSubCollection: true, updateUrl: false, ...subcollection, openEntityMode: layout }) : /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center w-full h-full p-3", children: /* @__PURE__ */ jsx(Typography, { variant: "label", children: "You need to save your entity before adding additional collections" }) }))
+      !globalLoading && (usedEntity && newFullPath ? /* @__PURE__ */ jsx(EntityCollectionView, { fullPath: newFullPath, fullIdPath: newFullIdPath, parentCollectionIds: [...parentCollectionIds, collection.id], isSubCollection: true, updateUrl: false, ...subcollection, openEntityMode: layout }) : /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center w-full h-full p-3", children: /* @__PURE__ */ jsx(Typography, { variant: "label", children: "You need to save your entity before adding additional collections" }) }))
     ] }, `subcol_${subcollectionId}`);
   }).filter(Boolean);
   const onSideTabClick = (value_0) => {
     setSelectedTab(value_0);
     if (status === "existing") {
       onTabChange?.({
-        path,
+        path: fullIdPath ?? path,
         entityId,
         selectedTab: value_0 === MAIN_TAB_VALUE ? void 0 : value_0,
         collection
@@ -21699,6 +21710,7 @@ function buildSidePanelsFromUrl(path, collections, newFlag) {
     if (navigationEntry.type === "entity") {
       sidePanel = {
         path: navigationEntry.path,
+        // fullIdPath: navigationEntry.path,
         entityId: navigationEntry.entityId,
         copy: false,
         width: navigationEntry.parentCollection?.sideDialogWidth
@@ -21716,6 +21728,7 @@ function buildSidePanelsFromUrl(path, collections, newFlag) {
   if (newFlag) {
     sidePanel = {
       path: lastCollectionPath,
+      // fullIdPath: lastCollectionPath,
       copy: false
     };
   }
@@ -21724,10 +21737,8 @@ 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 resolvedPath = resolveIdsFrom(props.path);
   const resolvedPanelProps = {
     ...props,
-    path: resolvedPath,
     formProps: props.formProps
   };
   const entityViewWidth = getEntityViewWidth(props, smallLayout, customizationController, authController);
@@ -23229,7 +23240,7 @@ function FireCMSRoute() {
           } else {
             t8 = $[27];
           }
-          t62 = /* @__PURE__ */ jsx(EntityCollectionView, { 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.id, updateUrl: true, ...collection_0, Actions: toArray(collection_0.Actions) }, `collection_view_${collection_0.id ?? collection_0.path}`);
         }
         $[23] = navigation;
         $[24] = navigationEntries;
@@ -23318,9 +23329,10 @@ function EntityFullScreenRoute({
     return /* @__PURE__ */ jsx(NotFoundPage, {});
   }
   const collection = isNew ? lastCollectionEntry.collection : lastEntityEntry.parentCollection;
-  const collectionPath = navigation.resolveIdsFrom(isNew ? lastCollectionEntry.path : lastEntityEntry.path);
+  const fullIdPath = isNew ? lastCollectionEntry.path : lastEntityEntry.path;
+  const collectionPath = navigation.resolveIdsFrom(fullIdPath);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, collection, layout: "full_screen", path: collectionPath, copy: isCopy, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
+    /* @__PURE__ */ jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, fullIdPath, collection, layout: "full_screen", path: collectionPath, copy: isCopy, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
       const newSelectedTab = params.selectedTab;
       const newEntityId = params.entityId;
       if (newSelectedTab) {