@firecms/core 3.4.0-canary.f6a889a → 3.4.0

package/dist/util/paths.d.ts

@@ -9,6 +9,34 @@ export declare function segmentsToStrippedPath(paths: string[]): string;
 /**
  * Extract the collection path routes
  * `products/B44RG6APH/locales` => [`products`, `locales`]
+ *
+ * Finds the entity ids by position, which only works while no id contains "/" — with one,
+ * every following segment shifts and the wrong elements are kept. Use
+ * {@link collectionSegmentsFrom} when the real boundaries are known.
+ *
  * @param path
  */
 export declare function fullPathToCollectionSegments(path: string): string[];
+/**
+ * The collection chain of an already-segmented path:
+ * `['products', 'B44RG6APH', 'locales']` => [`products`, `locales`]
+ *
+ * The counterpart of {@link fullPathToCollectionSegments} for callers that know the real
+ * segment boundaries. Kept as a separate function rather than an extra parameter on that
+ * one: these helpers are small enough to be passed point-free, and `paths.map(fn)` would
+ * then hand the array index in as the new argument.
+ */
+export declare function collectionSegmentsFrom(pathSegments: string[]): string[];
+/**
+ * The historical, positional reading of a flattened path:
+ * `products/B44RG6APH/locales` => [`products`, `locales`]
+ *
+ * This produces a **collection chain**, not a datasource `pathSegments` value, and must
+ * never be used as one — see `path_segments_no_fabrication.test.ts`. It is only correct
+ * while no entity id contains "/", which is why every caller prefers real segments when
+ * they are available, and why it is named for what it assumes.
+ *
+ * It is still the right reading for a path that came from a URL, where entity ids arrive
+ * escaped and so cannot contain a bare "/".
+ */
+export declare function positionalCollectionSegments(path: string): string[];

package/dist/util/permissions.d.ts

@@ -1,5 +1,11 @@
 import { AuthController, Entity, EntityCollection, Permissions, User } from "../types";
-export declare function resolvePermissions<M extends Record<string, any>, USER extends User>(collection: EntityCollection<M>, authController: AuthController<USER>, path: string, entity: Entity<M> | null): Permissions | undefined;
-export declare function canEditEntity<M extends Record<string, any>, USER extends User>(collection: EntityCollection<M>, authController: AuthController<USER>, path: string, entity: Entity<M> | null): boolean;
-export declare function canCreateEntity<M extends Record<string, any>, USER extends User>(collection: EntityCollection<M>, authController: AuthController<USER>, path: string, entity: Entity<M> | null): boolean;
-export declare function canDeleteEntity<M extends Record<string, any>, USER extends User>(collection: EntityCollection<M>, authController: AuthController<USER>, path: string, entity: Entity<M> | null): boolean;
+/**
+ * `pathSegments` is `path` split at its real segment boundaries. It is forwarded so the
+ * collection chain handed to a permissions builder stays correct when an entity id contains
+ * "/" — splitting `path` positionally would keep the wrong elements. Optional everywhere:
+ * omitted, behaviour is exactly as before.
+ */
+export declare function resolvePermissions<M extends Record<string, any>, USER extends User>(collection: EntityCollection<M>, authController: AuthController<USER>, path: string, entity: Entity<M> | null, pathSegments?: string[]): Permissions | undefined;
+export declare function canEditEntity<M extends Record<string, any>, USER extends User>(collection: EntityCollection<M>, authController: AuthController<USER>, path: string, entity: Entity<M> | null, pathSegments?: string[]): boolean;
+export declare function canCreateEntity<M extends Record<string, any>, USER extends User>(collection: EntityCollection<M>, authController: AuthController<USER>, path: string, entity: Entity<M> | null, pathSegments?: string[]): boolean;
+export declare function canDeleteEntity<M extends Record<string, any>, USER extends User>(collection: EntityCollection<M>, authController: AuthController<USER>, path: string, entity: Entity<M> | null, pathSegments?: string[]): boolean;

package/dist/util/urls.d.ts

@@ -0,0 +1,22 @@
+import type { PreviewType } from "../types";
+/**
+ * Is the given value an absolute `http(s)` URL, as opposed to a relative
+ * storage path such as `images/my_image.png`?
+ *
+ * Values saved in the datasource for storage properties can be either, e.g.
+ * when the property is configured with `storeUrl: true`, or when the value was
+ * written directly pointing to an externally hosted file.
+ */
+export declare function isAbsoluteHttpUrl(value?: string | null): boolean;
+/**
+ * Extract the lowercase file extension of a URL or path, ignoring any query
+ * string or hash fragment. Returns `undefined` when there is no extension.
+ */
+export declare function getFileExtensionFromUrl(urlOrPath?: string | null): string | undefined;
+/**
+ * Best effort guess of the preview type of a URL or path, based on its file
+ * extension. Used when no storage metadata (and therefore no content type) is
+ * available, e.g. for externally hosted files.
+ * Returns `undefined` when the extension is missing or not recognised.
+ */
+export declare function getPreviewTypeFromUrl(urlOrPath?: string | null): PreviewType | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.4.0-canary.f6a889a",
+  "version": "3.4.0",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -53,8 +53,8 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
-    "@firecms/formex": "3.4.0-canary.f6a889a",
-    "@firecms/ui": "3.4.0-canary.f6a889a",
+    "@firecms/formex": "3.4.0",
+    "@firecms/ui": "3.4.0",
     "@floating-ui/dom": "^1.7.4",
     "@radix-ui/react-portal": "^1.1.10",
     "@radix-ui/react-slot": "^1.2.4",
@@ -89,7 +89,7 @@
     "prosemirror-view": "^1.33.8",
     "react-dropzone": "^14.3.8",
     "react-fast-compare": "^3.2.2",
-    "react-i18next": "^14.1.3",
+    "react-i18next": "^17.0.11",
     "react-image-crop": "^11.0.10",
     "react-markdown": "^9.1.0",
     "react-moveable": "^0.56.0",

package/src/components/DeleteEntityDialog.tsx

@@ -96,6 +96,8 @@ export function DeleteEntityDialog<M extends Record<string, any>>({
         deleteEntityWithCallbacks({
             dataSource,
             entity,
+            // The entity is the authority on where it lives; stated rather than left implicit.
+            pathSegments: entity.pathSegments,
             collection: resolvedCollection,
             callbacks,
             onDeleteSuccess,

package/src/components/EntityCollectionTable/EntityCollectionRowActions.tsx

@@ -3,7 +3,7 @@ import React, { MouseEvent, useCallback } from "react";
 import { CollectionSize, Entity, EntityAction, EntityCollection, SelectionController } from "../../types";
 import { Badge, Checkbox, cls, IconButton, Menu, MenuItem, MoreVertIcon, Skeleton, Tooltip } from "@firecms/ui";
 import { useFireCMSContext, useLargeLayout } from "../../hooks";
-import { getEntityFromCache } from "../../util/entity_cache";
+import { entityCacheKey, getEntityFromCache } from "../../util/entity_cache";
 import { getLocalChangesBackup } from "../../util";
 import { getChanges } from "../../form/EntityForm";
 
@@ -82,7 +82,7 @@ export const EntityCollectionRowActions = function EntityCollectionRowActions({
     const collapsedActions = actions.filter(a => a.collapsed || a.collapsed === undefined);
     const uncollapsedActions = actions.filter(a => a.collapsed === false);
     const enableLocalChangesBackup = collection ? getLocalChangesBackup(collection) : false;
-    const cachedData = enableLocalChangesBackup ? getEntityFromCache(fullPath + "/" + entity.id) : undefined;
+    const cachedData = enableLocalChangesBackup ? getEntityFromCache(entityCacheKey(fullPath, entity.id)) : undefined;
     const hasDraft = (() => {
         if (!cachedData || typeof cachedData !== "object" || Object.keys(cachedData).length === 0) return false;
         const realChanges = getChanges(cachedData as any, (entity?.values ?? {}) as any);

package/src/components/EntityCollectionTable/EntityCollectionTable.tsx

@@ -354,6 +354,7 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
                 onTextSearch={textSearchEnabled ? onTextSearch : undefined}
                 textSearchLoading={textSearchLoading}
                 onTextSearchClick={textSearchEnabled ? onTextSearchClick : undefined}
+                initialSearchString={tableController.searchString}
                 title={title}
                 actionsStart={actionsStart}
                 actions={actions}

package/src/components/EntityCollectionTable/internal/CollectionTableToolbar.tsx

@@ -20,6 +20,11 @@ interface CollectionTableToolbarProps {
     onTextSearchClick?: () => void;
     onTextSearch?: (searchString?: string) => void;
     textSearchLoading?: boolean;
+    /**
+     * Search term the search bar should start with, typically the one restored from the
+     * URL query params by the table controller.
+     */
+    initialSearchString?: string;
 }
 
 export function CollectionTableToolbar({
@@ -29,6 +34,7 @@ export function CollectionTableToolbar({
     onTextSearch,
     onTextSearchClick,
     textSearchLoading,
+    initialSearchString,
     title,
     viewModeToggle
 }: CollectionTableToolbarProps) {
@@ -79,6 +85,7 @@ export function CollectionTableToolbar({
                         disabled={Boolean(onTextSearchClick)}
                         onClick={onTextSearchClick}
                         onTextSearch={onTextSearchClick ? undefined : onTextSearch}
+                        initialValue={initialSearchString}
                         placeholder={t("search")}
                         expandable={true} />}
 

package/src/components/EntityCollectionTable/internal/popup_field/PopupFormField.tsx

@@ -26,6 +26,8 @@ import { OnCellValueChangeParams } from "../../../common";
 interface PopupFormFieldProps<M extends Record<string, any>> {
     customFieldValidator?: CustomFieldValidator;
     path: string;
+    /** `path` split at its real segment boundaries; forwarded to the datasource. */
+    pathSegments?: string[];
     entityId: string;
     tableKey: string;
     propertyKey?: Extract<keyof M, string>;
@@ -54,6 +56,7 @@ export function PopupFormFieldLoading<M extends Record<string, any>>({
                                                                          propertyKey,
                                                                          collection: inputCollection,
                                                                          path,
+                                                                         pathSegments,
                                                                          cellRect,
                                                                          open,
                                                                          onClose,
@@ -66,11 +69,12 @@ export function PopupFormFieldLoading<M extends Record<string, any>>({
         if (entityId && inputCollection) {
             dataSource.fetchEntity({
                 path,
+                pathSegments,
                 entityId,
                 collection: inputCollection
             }).then(setEntity);
         }
-    }, [entityId, inputCollection, dataSource, path]);
+    }, [entityId, inputCollection, dataSource, path, pathSegments]);
 
     if (!entity) return null;
     return <PopupFormFieldInternal {...{

package/src/components/EntityCollectionView/EntityCollectionBoardView.tsx

@@ -42,6 +42,8 @@ export type EntityCollectionBoardViewProps<M extends Record<string, any> = any>
     collection: EntityCollection<M>;
     tableController: EntityTableController<M>;
     fullPath: string;
+    /** `fullPath` split at its real segment boundaries; forwarded to the datasource. */
+    pathSegments?: string[];
     parentCollectionIds?: string[];
     columnProperty: string;
     onEntityClick?: (entity: Entity<M>) => void;
@@ -60,6 +62,7 @@ export function EntityCollectionBoardView<M extends Record<string, any> = any>({
     collection,
     tableController,
     fullPath,
+    pathSegments,
     parentCollectionIds = [],
     columnProperty,
     onEntityClick,
@@ -169,6 +172,7 @@ export function EntityCollectionBoardView<M extends Record<string, any> = any>({
     // Use the new per-column data controller
     const boardDataController = useBoardDataController<M>({
         fullPath,
+        pathSegments,
         collection,
         columnProperty,
         columns,
@@ -270,6 +274,7 @@ export function EntityCollectionBoardView<M extends Record<string, any> = any>({
 
         currentDataSource.countEntities({
             path: fullPath,
+            pathSegments,
             collection: currentCollection
         }).then(count => {
             totalCount = count;
@@ -281,6 +286,7 @@ export function EntityCollectionBoardView<M extends Record<string, any> = any>({
 
         currentDataSource.countEntities({
             path: fullPath,
+            pathSegments,
             collection: currentCollection,
             filter: { [orderProperty]: ["!=", null] } as FilterValues<string>
         }).then(count => {
@@ -432,6 +438,8 @@ export function EntityCollectionBoardView<M extends Record<string, any> = any>({
 
         const saveProps: SaveEntityProps = {
             path: entity.path,
+            // Paired with `entity.path`: the segments the entity was loaded with.
+            pathSegments: entity.pathSegments,
             entityId: entity.id,
             values: updatedValues as M,
             previousValues: entity.values,
@@ -472,6 +480,7 @@ export function EntityCollectionBoardView<M extends Record<string, any> = any>({
             console.log("Fetching all documents from collection...");
             const allDocs = await dataSource.fetchCollection<M>({
                 path: fullPath,
+                pathSegments,
                 collection,
                 limit: 10000 // Fetch all
             });
@@ -492,6 +501,8 @@ export function EntityCollectionBoardView<M extends Record<string, any> = any>({
 
                 const saveProps: SaveEntityProps = {
                     path: entity.path,
+                    // Paired with `entity.path`: the segments the entity was loaded with.
+                    pathSegments: entity.pathSegments,
                     entityId: entity.id,
                     values: updatedValues as M,
                     previousValues: entity.values,
@@ -663,6 +674,7 @@ export function EntityCollectionBoardView<M extends Record<string, any> = any>({
                         });
                         sideEntityController.open({
                             path: fullPath,
+                            pathSegments,
                             collection,
                             entityId: undefined,
                             updateUrl: true,

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";
 
@@ -106,6 +107,14 @@ export type EntityCollectionViewProps<M extends Record<string, any>> = {
      * Full path using navigation ids.
      */
     fullIdPath?: string;
+    /**
+     * `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.
+     *
+     * 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[];
     /**
      * If this is a subcollection, specify the parent collection ids.
      */
@@ -152,6 +161,7 @@ export const EntityCollectionView = React.memo(
     function EntityCollectionView<M extends Record<string, any>>({
         fullPath: fullPathProp,
         fullIdPath,
+        pathSegments,
         parentCollectionIds,
         isSubCollection,
         className,
@@ -190,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);
 
@@ -220,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;
@@ -317,6 +327,7 @@ export const EntityCollectionView = React.memo(
 
         const tableController = useDataSourceTableController<M>({
             fullPath,
+            pathSegments,
             collection,
             lastDeleteTimestamp,
             scrollRestoration,
@@ -342,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,
@@ -365,6 +382,7 @@ export const EntityCollectionView = React.memo(
                 collection,
                 entityId: undefined,
                 path: fullPath,
+                pathSegments,
                 fullIdPath,
                 sideEntityController,
                 navigation,
@@ -440,6 +458,7 @@ export const EntityCollectionView = React.memo(
         const onViewModeChange = useCallback((mode: ViewMode) => {
             analyticsController.onAnalyticsEvent?.("view_mode_changed", {
                 path: fullPath,
+                pathSegments,
                 from: viewMode,
                 to: mode
             });
@@ -450,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(
             ({
@@ -458,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,
@@ -473,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,
@@ -503,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,
@@ -581,6 +602,7 @@ export const EntityCollectionView = React.memo(
         const onKanbanPropertyChange = useCallback((property: string) => {
             analyticsController.onAnalyticsEvent?.("kanban_property_changed", {
                 path: fullPath,
+                pathSegments,
                 property
             });
             setSelectedKanbanProperty(property);
@@ -645,6 +667,7 @@ export const EntityCollectionView = React.memo(
                                     entityId: entity.id,
                                     selectedTab: subcollection.id ?? subcollection.path,
                                     path: fullPath,
+                                    pathSegments,
                                     fullIdPath,
                                     navigation,
                                     sideEntityController
@@ -663,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"} />
                                     );
@@ -700,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") }
             ];
@@ -776,6 +801,7 @@ export const EntityCollectionView = React.memo(
         // EntitiesCount fetches count and updates breadcrumb - no visual rendering needed here
         const countFetcher = <EntitiesCount
             fullPath={fullPath}
+            pathSegments={pathSegments}
             collection={collection}
             filter={tableController.filterValues}
             sortBy={tableController.sortBy}
@@ -829,9 +855,14 @@ export const EntityCollectionView = React.memo(
             onTextSearchClick,
             textSearchEnabled
         } = useTableSearchHelper({
+            pathSegments,
             collection,
             fullPath: resolvedFullPath,
-            parentCollectionIds
+            parentCollectionIds,
+            // When the search term comes from the URL instead of the search bar, text search
+            // has never been initialised for this collection. Initialise it so the search bar
+            // is usable (editable and clearable) right away.
+            initialSearchString: tableController.searchString
         });
 
         // Popover open state managed at parent level to prevent closing when view changes
@@ -881,6 +912,7 @@ export const EntityCollectionView = React.memo(
                     loading={tableController.dataLoading}
                     onTextSearch={textSearchEnabled && textSearchInitialised ? tableController.setSearchString : undefined}
                     onTextSearchClick={textSearchEnabled && !textSearchInitialised ? onTextSearchClick : undefined}
+                    initialSearchString={tableController.searchString}
                     textSearchLoading={textSearchLoading}
                     viewModeToggle={viewModeToggleElement}
                     actionsStart={<EntityCollectionViewStartActions
@@ -888,6 +920,7 @@ export const EntityCollectionView = React.memo(
                         collection={collection}
                         tableController={tableController}
                         path={fullPath}
+                        pathSegments={pathSegments}
                         relativePath={collection.path}
                         selectionController={usedSelectionController}
                         collectionEntitiesCount={docsCount}
@@ -899,6 +932,7 @@ export const EntityCollectionView = React.memo(
                         onMultipleDeleteClick={onMultipleDeleteClick}
                         onNewClick={onNewClick}
                         path={fullPath}
+                        pathSegments={pathSegments}
                         relativePath={collection.path}
                         selectionController={usedSelectionController}
                         selectionEnabled={selectionEnabled}
@@ -915,6 +949,7 @@ export const EntityCollectionView = React.memo(
                         collection={collection}
                         tableController={tableController}
                         fullPath={fullPath}
+                        pathSegments={pathSegments}
                         parentCollectionIds={parentCollectionIds}
                         columnProperty={selectedKanbanProperty}
                         onEntityClick={onEntityClick}
@@ -1006,6 +1041,7 @@ export const EntityCollectionView = React.memo(
                         getIdColumnWidth={getIdColumnWidth}
                         additionalIDHeaderWidget={<EntityIdHeaderWidget
                             path={fullPath}
+                            pathSegments={pathSegments}
                             fullIdPath={fullIdPath ?? fullPath}
                             collection={collection} />}
                         openEntityMode={openEntityMode}
@@ -1045,6 +1081,7 @@ export const EntityCollectionView = React.memo(
 
                 {popupCell && <PopupFormField
                     key={`popup_form_${popupCell?.propertyKey}_${popupCell?.entityId}`}
+                    pathSegments={pathSegments}
                     open={Boolean(popupCell)}
                     onClose={onPopupClose}
                     cellRect={popupCell?.cellRect}
@@ -1100,13 +1137,16 @@ function EntitiesCount({
     collection,
     filter,
     sortBy,
-    onCountChange
+    onCountChange,
+    pathSegments
 }: {
     fullPath: string,
     collection: EntityCollection,
     filter?: FilterValues<any>,
     sortBy?: [string, "asc" | "desc"],
     onCountChange?: (count: number) => void,
+    /** `fullPath` split at its real segment boundaries; forwarded to countEntities. */
+    pathSegments?: string[],
 }) {
 
     const dataSource = useDataSource(collection);
@@ -1116,18 +1156,24 @@ function EntitiesCount({
 
     const sortByProperty = sortBy ? sortBy[0] : undefined;
     const currentSort = sortBy ? sortBy[1] : undefined;
-    const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
+    // 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)
             dataSource.countEntities({
                 path: resolvedPath,
+                pathSegments: resolvedPathSegments,
                 collection,
                 filter,
                 orderBy: sortByProperty,
                 order: currentSort
             }).then(setCount).catch(setError);
-    }, [fullPath, dataSource.countEntities, resolvedPath, collection, filter, sortByProperty, currentSort]);
+    }, [fullPath, dataSource.countEntities, resolvedPath, resolvedPathSegments, collection, filter, sortByProperty, currentSort]);
 
     useEffect(() => {
         if (onCountChange && count !== undefined) {
@@ -1156,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
 }) {
 
@@ -1199,6 +1248,7 @@ function EntityIdHeaderWidget({
                                 collection,
                                 entityId,
                                 path,
+                                pathSegments,
                                 fullIdPath,
                                 sideEntityController,
                                 navigation
@@ -1224,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={() => {
@@ -1234,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,