@firecms/core 3.4.0-canary.0ef7442 → 3.4.0-canary.2575a08

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -90,6 +90,7 @@ import { useSelectionController } from "./useSelectionController";
 import { EntityCollectionViewStartActions } from "./EntityCollectionViewStartActions";
 import { addRecentId, getRecentIds } from "./utils";
 import { useScrollRestoration } from "../common/useScrollRestoration";
+import { entityCacheKey } from "../../util/entity_cache";
 
 const DEFAULT_ENTITY_OPEN_MODE: "side_panel" | "full_screen" = "side_panel";
 
@@ -109,8 +110,9 @@ export type EntityCollectionViewProps<M extends Record<string, any>> = {
     /**
      * `fullPath` split at its real segment boundaries, e.g. `["nodes", "node/42", "edges"]`.
      * Forwarded to the datasource so a parent entity id containing "/" stays unambiguous.
-     * Defaults to splitting `fullPath`, which is correct for any backend whose ids cannot
-     * contain "/".
+     *
+     * Optional, and never derived by splitting `fullPath` — a guess would be wrong in
+     * exactly the case the field exists for. Absent means "not known here", not "no slashes".
      */
     pathSegments?: string[];
     /**
@@ -198,7 +200,7 @@ export const EntityCollectionView = React.memo(
             collectionRef.current = collection;
         }, [collection]);
 
-        const canCreateEntities = canCreateEntity(collection, authController, fullPath, null);
+        const canCreateEntities = canCreateEntity(collection, authController, fullPath, null, pathSegments);
         const [highlightedEntity, setHighlightedEntity] = useState<Entity<M> | undefined>(undefined);
         const [deleteEntityClicked, setDeleteEntityClicked] = React.useState<Entity<M> | Entity<M>[] | undefined>(undefined);
 
@@ -228,7 +230,7 @@ export const EntityCollectionView = React.memo(
 
         const checkInlineEditing = useCallback((entity?: Entity<any>): boolean => {
             const collection = collectionRef.current;
-            if (!canEditEntity(collection, authController, fullPath, entity ?? null)) {
+            if (!canEditEntity(collection, authController, fullPath, entity ?? null, pathSegments)) {
                 return false;
             }
             return collection.inlineEditing === undefined || collection.inlineEditing;
@@ -351,10 +353,16 @@ export const EntityCollectionView = React.memo(
                 addRecentId(collection.id, clickedEntity.id);
             }
 
-            const path = collection?.collectionGroup ? clickedEntity.path : (fullPath ?? clickedEntity.path);
+            // In a collection group the row's own path is the real one, so the row's segments
+            // are the matching ones; otherwise both come from this view. `path` and
+            // `pathSegments` are picked from the same source so they cannot describe
+            // different chains.
+            const isCollectionGroup = Boolean(collection?.collectionGroup);
+            const path = isCollectionGroup ? clickedEntity.path : (fullPath ?? clickedEntity.path);
             navigateToEntity({
                 navigation,
                 path,
+                pathSegments: isCollectionGroup ? clickedEntity.pathSegments : (pathSegments ?? clickedEntity.pathSegments),
                 fullIdPath,
                 sideEntityController,
                 openEntityMode,
@@ -461,7 +469,7 @@ export const EntityCollectionView = React.memo(
             }
         }, [setViewMode, userConfigPersistence, onCollectionModifiedForUser, fullPath, analyticsController, viewMode]);
 
-        const createEnabled = canCreateEntity(collection, authController, fullPath, null);
+        const createEnabled = canCreateEntity(collection, authController, fullPath, null, pathSegments);
 
         const uniqueFieldValidator: UniqueFieldValidator = useCallback(
             ({
@@ -469,8 +477,8 @@ export const EntityCollectionView = React.memo(
                 value,
                 property,
                 entityId
-            }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection),
-            [fullPath]);
+            }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection, pathSegments),
+            [fullPath, pathSegments]);
 
         const onValueChange: OnCellValueChange<any, any> = ({
             value,
@@ -484,6 +492,8 @@ export const EntityCollectionView = React.memo(
 
             const saveProps: SaveEntityProps = {
                 path: entity.path ?? fullPath,
+                // Paired with the `path` above: the row's segments describe the row's path.
+                pathSegments: entity.path ? entity.pathSegments : pathSegments,
                 entityId: entity.id,
                 values: updatedValues,
                 previousValues: entity.values,
@@ -514,7 +524,7 @@ export const EntityCollectionView = React.memo(
 
         };
 
-        const resolvedFullPath = navigation.resolveIdsFrom(fullPath);
+        const resolvedFullPath = navigation.resolveIdsFrom(fullPath, pathSegments);
         const resolvedCollection = useMemo(() => resolveCollection<M>({
             collection,
             path: fullPath,
@@ -676,13 +686,15 @@ export const EntityCollectionView = React.memo(
                     width: 260,
                     dependencies: [],
                     Builder: ({ entity }) => {
-                        const collectionsWithPath = navigation.getParentReferencesFromPath(entity.path);
+                        // `entity.path` is a RAW datasource path, so its segments are passed:
+                        // splitting it would mis-read any parent id containing "/".
+                        const collectionsWithPath = navigation.getParentReferencesFromPath(entity.path, entity.pathSegments);
                         return (
                             <div className={"flex flex-col gap-2 w-full"}>
                                 {collectionsWithPath.map((reference) => {
                                     return (
                                         <ReferencePreview
-                                            key={reference.path + "/" + reference.id}
+                                            key={entityCacheKey(reference.path, reference.id)}
                                             reference={reference}
                                             size={"small"} />
                                     );
@@ -713,7 +725,7 @@ export const EntityCollectionView = React.memo(
             entity?: Entity<M>,
             customEntityActions?: EntityAction[]
         }): EntityAction[] => {
-            const deleteEnabled = entity ? canDeleteEntity(collection, authController, fullPath, entity) : true;
+            const deleteEnabled = entity ? canDeleteEntity(collection, authController, fullPath, entity, entity.pathSegments ?? pathSegments) : true;
             const actions: EntityAction[] = [
                 { ...editEntityAction, name: t("edit") }
             ];
@@ -843,6 +855,7 @@ export const EntityCollectionView = React.memo(
             onTextSearchClick,
             textSearchEnabled
         } = useTableSearchHelper({
+            pathSegments,
             collection,
             fullPath: resolvedFullPath,
             parentCollectionIds,
@@ -907,6 +920,7 @@ export const EntityCollectionView = React.memo(
                         collection={collection}
                         tableController={tableController}
                         path={fullPath}
+                        pathSegments={pathSegments}
                         relativePath={collection.path}
                         selectionController={usedSelectionController}
                         collectionEntitiesCount={docsCount}
@@ -918,6 +932,7 @@ export const EntityCollectionView = React.memo(
                         onMultipleDeleteClick={onMultipleDeleteClick}
                         onNewClick={onNewClick}
                         path={fullPath}
+                        pathSegments={pathSegments}
                         relativePath={collection.path}
                         selectionController={usedSelectionController}
                         selectionEnabled={selectionEnabled}
@@ -1026,6 +1041,7 @@ export const EntityCollectionView = React.memo(
                         getIdColumnWidth={getIdColumnWidth}
                         additionalIDHeaderWidget={<EntityIdHeaderWidget
                             path={fullPath}
+                            pathSegments={pathSegments}
                             fullIdPath={fullIdPath ?? fullPath}
                             collection={collection} />}
                         openEntityMode={openEntityMode}
@@ -1140,8 +1156,12 @@ function EntitiesCount({
 
     const sortByProperty = sortBy ? sortBy[0] : undefined;
     const currentSort = sortBy ? sortBy[1] : undefined;
-    const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
-    const resolvedPathSegments = pathSegments;
+    // Resolved together so the two representations always describe the same chain.
+    // Segments are resolved, never derived (see useEntityFetch).
+    const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath, pathSegments), [fullPath, pathSegments, navigation.resolveIdsFrom]);
+    const resolvedPathSegments = useMemo(() => pathSegments
+        ? (navigation.resolveSegmentsFrom?.(pathSegments) ?? pathSegments)
+        : undefined, [pathSegments, navigation.resolveSegmentsFrom]);
 
     useEffect(() => {
         if (dataSource.countEntities)
@@ -1182,10 +1202,13 @@ function buildPropertyWidthOverwrite(key: string, width: number): PartialEntityC
 function EntityIdHeaderWidget({
     collection,
     path,
+    pathSegments,
     fullIdPath
 }: {
     collection: EntityCollection,
     path: string,
+    /** `path` split at its real segment boundaries, when the caller knows them. */
+    pathSegments?: string[],
     fullIdPath: string
 }) {
 
@@ -1225,6 +1248,7 @@ function EntityIdHeaderWidget({
                                 collection,
                                 entityId,
                                 path,
+                                pathSegments,
                                 fullIdPath,
                                 sideEntityController,
                                 navigation
@@ -1250,7 +1274,7 @@ function EntityIdHeaderWidget({
                     </form>
                     {recentIds && recentIds.length > 0 && <div className="flex flex-col gap-2 p-2">
                         {recentIds.map(id => (
-                            <ReferencePreview reference={new EntityReference(id, path)}
+                            <ReferencePreview reference={new EntityReference(id, path, undefined, pathSegments)}
                                 key={id}
                                 hover={true}
                                 onClick={() => {
@@ -1260,6 +1284,7 @@ function EntityIdHeaderWidget({
                                         collection,
                                         entityId: id,
                                         path,
+                                        pathSegments,
                                         fullIdPath,
                                         sideEntityController,
                                         navigation

package/src/components/EntityCollectionView/EntityCollectionViewActions.tsx

@@ -22,6 +22,8 @@ import { useTranslation } from "../../hooks/useTranslation";
 export type EntityCollectionViewActionsProps<M extends Record<string, any>> = {
     collection: EntityCollection<M>;
     path: string;
+    /** `path` split at its real segment boundaries, when known. Never derived from `path`. */
+    pathSegments?: string[];
     relativePath: string;
     parentCollectionIds: string[];
     selectionEnabled: boolean;
@@ -40,6 +42,7 @@ export function EntityCollectionViewActions<M extends Record<string, any>>({
     onMultipleDeleteClick,
     selectionEnabled,
     path,
+    pathSegments,
     selectionController,
     tableController,
     collectionEntitiesCount,
@@ -56,7 +59,7 @@ export function EntityCollectionViewActions<M extends Record<string, any>>({
 
     const selectedEntities = selectionController.selectedEntities;
 
-    const addButton = canCreateEntity(collection, authController, path, null) &&
+    const addButton = canCreateEntity(collection, authController, path, null, pathSegments) &&
         onNewClick && (largeLayout
             ? <Button
                 id={`add_entity_${path}`}
@@ -75,7 +78,7 @@ export function EntityCollectionViewActions<M extends Record<string, any>>({
                 <AddIcon size={"small"} />
             </Button>);
 
-    const multipleDeleteEnabled = canDeleteEntity(collection, authController, path, null);
+    const multipleDeleteEnabled = canDeleteEntity(collection, authController, path, null, pathSegments);
 
     let multipleDeleteButton: React.ReactNode | undefined;
     if (selectionEnabled) {
@@ -107,6 +110,7 @@ export function EntityCollectionViewActions<M extends Record<string, any>>({
 
     const actionProps: CollectionActionsProps = {
         path,
+        pathSegments,
         relativePath,
         parentCollectionIds,
         collection,

package/src/components/EntityCollectionView/EntityCollectionViewStartActions.tsx

@@ -17,6 +17,8 @@ import { useTranslation } from "../../hooks/useTranslation";
 export type EntityCollectionViewStartActionsProps<M extends Record<string, any>> = {
     collection: EntityCollection<M>;
     path: string;
+    /** `path` split at its real segment boundaries, when known. Never derived from `path`. */
+    pathSegments?: string[];
     relativePath: string;
     parentCollectionIds: string[];
     selectionController: SelectionController<M>;
@@ -33,6 +35,7 @@ export function EntityCollectionViewStartActions<M extends Record<string, any>>(
     relativePath,
     parentCollectionIds,
     path,
+    pathSegments,
     selectionController,
     tableController,
     collectionEntitiesCount,
@@ -57,6 +60,7 @@ export function EntityCollectionViewStartActions<M extends Record<string, any>>(
 
     const actionProps: CollectionActionsProps = {
         path,
+        pathSegments,
         relativePath,
         parentCollectionIds,
         collection,

package/src/components/EntityCollectionView/useBoardDataController.tsx

@@ -82,8 +82,12 @@ export function useBoardDataController<M extends Record<string, any> = any, COLU
     const context = useFireCMSContext();
     const dataSource = useDataSource(collection);
     const navigation = useNavigationController();
-    const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
-    const resolvedPathSegments = pathSegments;
+    // Resolved together so the two representations always describe the same chain.
+    // Segments are resolved, never derived (see useEntityFetch).
+    const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath, pathSegments), [fullPath, pathSegments, navigation.resolveIdsFrom]);
+    const resolvedPathSegments = useMemo(() => pathSegments
+        ? (navigation.resolveSegmentsFrom?.(pathSegments) ?? pathSegments)
+        : undefined, [pathSegments, navigation.resolveSegmentsFrom]);
 
     // Stable refs for objects that shouldn't trigger re-subscriptions
     const dataSourceRef = useRef(dataSource);
@@ -212,6 +216,7 @@ export function useBoardDataController<M extends Record<string, any> = any, COLU
                             currentCollection.callbacks!.onFetch!({
                                 collection: currentCollection,
                                 path: currentResolvedPath,
+                                pathSegments: currentPathSegments,
                                 entity,
                                 context: currentContext
                             })

package/src/components/EntityPreview.tsx

@@ -63,7 +63,7 @@ export function EntityPreview({
 
     const navigationController = useNavigationController();
 
-    const collection = collectionProp ?? navigationController.getCollection(entity.path);
+    const collection = collectionProp ?? navigationController.getCollection(entity.path, false, entity.pathSegments);
 
     if (!collection) {
         throw Error(`Couldn't find the corresponding collection view for the path: ${entity.path}`);
@@ -177,6 +177,9 @@ export function EntityPreview({
                         sideEntityController.open({
                             entityId: entity.id,
                             path: entity.path,
+                            // Paired with `entity.path` above; undefined if the entity was
+                            // loaded without them.
+                            pathSegments: entity.pathSegments,
                             collection,
                             updateUrl: true
                         });

package/src/components/ReferenceTable/ReferenceSelectionTable.tsx

@@ -120,7 +120,7 @@ export function ReferenceSelectionTable<M extends Record<string, any>>(
     const analyticsController = useAnalyticsController();
     const customizationController = useCustomizationController();
 
-    const fullPath = navigation.resolveIdsFrom(pathInput);
+    const fullPath = navigation.resolveIdsFrom(pathInput, pathSegments);
 
     const dataSource = useDataSource(collection);
 
@@ -215,6 +215,7 @@ export function ReferenceSelectionTable<M extends Record<string, any>>(
         });
         sideEntityController.open({
             path: fullPath,
+            pathSegments,
             collection,
             updateUrl: true,
             onUpdate: ({ entity }) => {
@@ -288,6 +289,7 @@ export function ReferenceSelectionTable<M extends Record<string, any>>(
         textSearchEnabled
     } =
         useTableSearchHelper({
+            pathSegments,
             collection,
             fullPath,
         });
@@ -326,6 +328,7 @@ export function ReferenceSelectionTable<M extends Record<string, any>>(
                         actions={<ReferenceDialogActions
                             collection={collection}
                             path={fullPath}
+                            pathSegments={pathSegments}
                             onNewClick={onNewClick}
                             onClear={onClear}/>
                         }
@@ -352,11 +355,14 @@ export function ReferenceSelectionTable<M extends Record<string, any>>(
 function ReferenceDialogActions({
                                     collection,
                                     path,
+                                    pathSegments,
                                     onClear,
                                     onNewClick
                                 }: {
     collection: EntityCollection<any>,
     path: string,
+    /** `path` split at its real segment boundaries, when known. Never derived from `path`. */
+    pathSegments?: string[],
     onClear: () => void,
     onNewClick: () => void
 }) {
@@ -371,7 +377,7 @@ function ReferenceDialogActions({
             onNewClick();
         }
         : undefined;
-    const addButton = canCreateEntity(collection, authController, path, null) &&
+    const addButton = canCreateEntity(collection, authController, path, null, pathSegments) &&
         onClick && (largeLayout
             ? <Button
                 onClick={onClick}

package/src/components/common/default_entity_actions.tsx

@@ -18,6 +18,7 @@ export const editEntityAction: EntityAction = {
                 entity,
                 collection,
                 fullPath,
+                pathSegments,
                 fullIdPath,
                 context,
                 highlightEntity,
@@ -41,6 +42,12 @@ export const editEntityAction: EntityAction = {
         }
 
         const path = collection?.collectionGroup ? entity.path : (fullPath ?? collection?.path ?? entity.path);
+        // In a collection group `path` is the entity's own, so the entity's segments describe
+        // it. Otherwise the caller's segments win, falling back to the ones the entity was
+        // loaded with — both describe the same collection. Never derived from `path`.
+        const resolvedPathSegments = collection?.collectionGroup
+            ? entity.pathSegments
+            : (pathSegments ?? entity.pathSegments);
         const newFullIdPath = collection?.collectionGroup ? collection.id : (fullIdPath ?? collection?.id ?? entity.path);
         const defaultSelectedView = resolveDefaultSelectedView(
             collection ? collection.defaultSelectedView : undefined,
@@ -54,6 +61,7 @@ export const editEntityAction: EntityAction = {
             collection,
             entityId: entity.id,
             path,
+            pathSegments: resolvedPathSegments,
             fullIdPath: newFullIdPath,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),
@@ -75,6 +83,8 @@ export const copyEntityAction: EntityAction = {
                 collection,
                 context,
                 fullPath,
+                pathSegments,
+                fullIdPath,
                 highlightEntity,
                 unhighlightEntity,
                 openEntityMode
@@ -89,13 +99,23 @@ export const copyEntityAction: EntityAction = {
         });
 
         const path = collection?.collectionGroup ? collection.path : (fullPath ?? collection?.path ?? entity.path);
-        const fullIdPath = collection?.collectionGroup ? collection.id : (fullPath ?? collection?.id ?? entity.path);
+        // In a collection group `path` is the group's own root, which the entity's segments
+        // (its real nested location) do not describe — so they are deliberately not reused,
+        // and no substitute is invented.
+        const resolvedPathSegments = collection?.collectionGroup
+            ? undefined
+            : (pathSegments ?? entity.pathSegments);
+        // `fullIdPath` is the ESCAPED chain and is what becomes the URL; `fullPath` is the raw
+        // datasource path, whose parent ids may contain "/". Using the latter here wrote a URL
+        // that read back as a different entity. Mirrors editEntityAction.
+        const newFullIdPath = collection?.collectionGroup ? collection.id : (fullIdPath ?? collection?.id);
         navigateToEntity({
             openEntityMode,
             collection,
             entityId: entity.id,
             path,
-            fullIdPath,
+            pathSegments: resolvedPathSegments,
+            fullIdPath: newFullIdPath,
             copy: true,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),

package/src/components/common/useDataSourceTableController.tsx

@@ -27,8 +27,10 @@ export type DataSourceTableControllerProps<M extends Record<string, any> = any>
     fullPath: string;
     /**
      * `fullPath` split at its real segment boundaries. Passed through to the datasource so
-     * a parent entity id containing "/" stays unambiguous. Defaults to splitting
-     * `fullPath`, which is correct for any backend whose ids cannot contain "/".
+     * a parent entity id containing "/" stays unambiguous.
+     *
+     * Optional, and never derived by splitting `fullPath` — a guess would be wrong in
+     * exactly the case the field exists for. Absent means "not known here", not "no slashes".
      */
     pathSegments?: string[];
     /**
@@ -94,9 +96,12 @@ export function useDataSourceTableController<M extends Record<string, any> = any
     const [popupCell, setPopupCell] = React.useState<SelectedCellProps<M> | undefined>(undefined);
     const navigation = useNavigationController();
     const dataSource = useDataSource(collection);
-    const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
-    // Passed through as-is; never derived from `resolvedPath` (see useEntityFetch).
-    const resolvedPathSegments = pathSegments;
+    // Resolved together so the two representations always describe the same chain.
+    // Segments are resolved, never derived (see useEntityFetch).
+    const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath, pathSegments), [fullPath, pathSegments, navigation.resolveIdsFrom]);
+    const resolvedPathSegments = useMemo(() => pathSegments
+        ? (navigation.resolveSegmentsFrom?.(pathSegments) ?? pathSegments)
+        : undefined, [pathSegments, navigation.resolveSegmentsFrom]);
 
     const forceFilter = forceFilterFromProps ?? forceFilterFromCollection;
     const paginationEnabled = collection.pagination === undefined || Boolean(collection.pagination);
@@ -189,11 +194,23 @@ export function useDataSourceTableController<M extends Record<string, any> = any
 
     useUpdateUrl(filterValues, sortBy, searchString, updateUrl);
 
-    const collectionScroll = scrollRestoration?.getCollectionScroll(fullPath, filterValues);
-    const initialItemCount = collectionScroll?.data.length ?? pageSize;
+    // Keyed by `resolvedPath`, not `fullPath`, so the read agrees with the two writes below
+    // and in `onScroll`. What the cache holds is a slice of a dataset plus the offset into
+    // it, and the dataset is identified by what the datasource was actually queried with:
+    // `resolvedPath` + filters. Reading with the unresolved `fullPath` meant that for every
+    // collection reached through an id alias, or a subcollection whose parent ids need
+    // resolving, the entry was written under one key and looked up under another, so scroll
+    // restoration silently did nothing there.
+    const collectionScroll = scrollRestoration?.getCollectionScroll(resolvedPath, filterValues);
+    const initialItemCount = collectionScroll?.data.length || pageSize;
 
     useEffect(() => {
-        if (scrollRestoration) {
+        // Only re-seed an entry we actually have something to restore for. Writing an empty
+        // `data` array here poisoned the cache: this is a module level Map that outlives the
+        // mount, so the next mount of the same collection read `data.length === 0` back as the
+        // initial item count and called the datasource with `limit: 0`. Custom datasources
+        // treat that as falsy and drop the limit altogether, loading the whole collection.
+        if (scrollRestoration && rawData.length > 0) {
             scrollRestoration.updateCollectionScroll({
                 fullPath: resolvedPath,
                 scrollOffset: collectionScroll?.scrollOffset ?? 0,
@@ -247,6 +264,7 @@ export function useDataSourceTableController<M extends Record<string, any> = any
                             collection.callbacks!.onFetch!({
                                 collection,
                                 path: resolvedPath,
+                                pathSegments: resolvedPathSegments,
                                 entity,
                                 context
                             })));

package/src/components/common/useTableSearchHelper.ts

@@ -6,6 +6,8 @@ import { useCustomizationController, useDataSource, useFireCMSContext } from "..
 export interface UseTableSearchHelperParams<M extends Record<string, any>> {
     collection: EntityCollection<M>;
     fullPath: string;
+    /** `fullPath` split at its real segment boundaries, when known. Never derived from it. */
+    pathSegments?: string[];
     parentCollectionIds?: string[];
     /**
      * Search term that is already being applied without the user having gone through the
@@ -18,6 +20,7 @@ export interface UseTableSearchHelperParams<M extends Record<string, any>> {
 export function useTableSearchHelper<M extends Record<string, any>>({
                                                                         collection,
                                                                         fullPath,
+                                                                        pathSegments,
                                                                         parentCollectionIds,
                                                                         initialSearchString
                                                                     }: UseTableSearchHelperParams<M>) {
@@ -36,6 +39,7 @@ export function useTableSearchHelper<M extends Record<string, any>>({
     const props = {
         context,
         path: fullPath,
+        pathSegments,
         databaseId: collection.databaseId,
         collection,
         parentCollectionIds
@@ -62,6 +66,7 @@ export function useTableSearchHelper<M extends Record<string, any>>({
                             promises.push(p.collectionView.onTextSearchClick({
                                 context,
                                 path: fullPath,
+                                pathSegments,
                                 collection,
                                 parentCollectionIds
                             }));

package/src/core/EntityEditView.tsx

@@ -12,6 +12,7 @@ import {
 
 import { CircularProgressCenter, EntityCollectionView, EntityView, ErrorBoundary } from "../components";
 import {
+    buildSubcollectionPathSegments,
     canEditEntity,
     encodeEntityId,
     removeInitialAndTrailingSlashes,
@@ -28,7 +29,7 @@ import {
     useLargeLayout
 } from "../hooks";
 import { CircularProgress, cls, CodeIcon, defaultBorderMixin, Tab, Tabs, Typography, Menu, MenuItem, ExpandMoreIcon } from "@firecms/ui";
-import { getEntityFromMemoryCache } from "../util/entity_cache";
+import { entityCacheKey, getEntityFromMemoryCache } from "../util/entity_cache";
 import { EntityForm, EntityFormProps } from "../form";
 import { EntityEditViewFormActions } from "./EntityEditViewFormActions";
 import { EntityJsonPreview } from "../components/EntityJsonPreview";
@@ -42,6 +43,8 @@ export type OnUpdateParams = {
     entity: Entity<any>,
     status: EntityStatus,
     path: string,
+    /** `path` split at its real segment boundaries, when known. Never derived from `path`. */
+    pathSegments?: string[],
     entityId?: string;
     selectedTab?: string;
     collection: EntityCollection<any>
@@ -115,7 +118,7 @@ export function EntityEditView<M extends Record<string, any>, USER extends User>
     });
 
     const initialDirtyValues = entityId
-        ? getEntityFromMemoryCache(props.path + "/" + entityId)
+        ? getEntityFromMemoryCache(entityCacheKey(props.path, entityId))
         : getEntityFromMemoryCache(props.path + "#new");
 
     const authController = useAuthController();
@@ -127,7 +130,7 @@ export function EntityEditView<M extends Record<string, any>, USER extends User>
         if (status === "new" || status === "copy") {
             return true;
         } else {
-            return entity ? canEditEntity(props.collection, authController, props.path, entity ?? null) : undefined;
+            return entity ? canEditEntity(props.collection, authController, props.path, entity ?? null, props.pathSegments) : undefined;
         }
     }, [authController, entity, status]);
 
@@ -202,6 +205,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
             entityId,
             parentCollectionIds,
             path,
+            pathSegments,
             status,
             collection,
             context,
@@ -359,17 +363,9 @@ export function EntityEditViewInner<M extends Record<string, any>>({
         const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.path)}` : undefined;
         // `newFullIdPath` is fed to buildUrlCollectionPath downstream, so it stays escaped.
         const newFullIdPath = fullIdPath && usedEntity ? `${fullIdPath}/${encodeEntityId(usedEntity.id)}/${removeInitialAndTrailingSlashes(subcollectionId)}` : undefined;
-        // The subcollection sits under this entity, so its segments are ours plus this
-        // entity's id (kept whole, slashes and all) plus the subcollection's own path.
         // Only extendable when we were given real segments — deriving the parent chain
         // from the flattened `path` would drop the boundary of a slash-bearing parent id.
-        const newPathSegments = usedEntity && pathSegments
-            ? [
-                ...pathSegments,
-                usedEntity.id,
-                ...removeInitialAndTrailingSlashes(subcollection.path).split("/")
-            ]
-            : undefined;
+        const newPathSegments = buildSubcollectionPathSegments(pathSegments, usedEntity?.id, subcollection.path);
 
         if (selectedTab !== subcollectionId) return null;
         return (

package/src/core/EntityEditViewFormActions.tsx

@@ -39,6 +39,7 @@ import { ErrorTooltip } from "../components/ErrorTooltip";
 export function EntityEditViewFormActions({
                                               collection,
                                               path,
+                                              pathSegments,
                                               entity,
                                               layout,
                                               savingError,
@@ -63,8 +64,8 @@ export function EntityEditViewFormActions({
         const customEntityActions = (collection.entityActions ?? [])
             .map(action => resolveEntityAction(action, customizationController.entityActions))
             .filter(Boolean) as EntityAction[];
-        const createEnabled = canCreateEntity(collection, authController, path, null);
-        const deleteEnabled = entity ? canDeleteEntity(collection, authController, path, entity) : false;
+        const createEnabled = canCreateEntity(collection, authController, path, null, pathSegments);
+        const deleteEnabled = entity ? canDeleteEntity(collection, authController, path, entity, entity.pathSegments ?? pathSegments) : false;
         const actions: EntityAction[] = [];
         if (createEnabled)
             actions.push(copyEntityAction);