@firecms/core 3.3.0-canary.d3242eb → 3.4.0-canary.00f9be5

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,
@@ -178,7 +188,9 @@ export const EntityCollectionView = React.memo(
 
         const collection = useMemo(() => {
             const userOverride = userConfigPersistence?.getCollectionConfig<M>(fullPath);
-            return (userOverride ? mergeDeep(collectionProp, userOverride) : collectionProp) as EntityCollection<M>;
+            if (!userOverride) return collectionProp;
+            const { properties, ...rest } = userOverride;
+            return mergeDeep(collectionProp, rest) as EntityCollection<M>;
         }, [collectionProp, fullPath, userConfigPersistence?.getCollectionConfig]);
 
         const openEntityMode = collection?.openEntityMode ?? DEFAULT_ENTITY_OPEN_MODE;
@@ -188,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);
 
@@ -218,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;
@@ -315,6 +327,7 @@ export const EntityCollectionView = React.memo(
 
         const tableController = useDataSourceTableController<M>({
             fullPath,
+            pathSegments,
             collection,
             lastDeleteTimestamp,
             scrollRestoration,
@@ -340,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,
@@ -363,6 +382,7 @@ export const EntityCollectionView = React.memo(
                 collection,
                 entityId: undefined,
                 path: fullPath,
+                pathSegments,
                 fullIdPath,
                 sideEntityController,
                 navigation,
@@ -438,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
             });
@@ -448,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(
             ({
@@ -456,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,
@@ -471,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,
@@ -501,13 +524,14 @@ export const EntityCollectionView = React.memo(
 
         };
 
-        const resolvedFullPath = navigation.resolveIdsFrom(fullPath);
+        const resolvedFullPath = navigation.resolveIdsFrom(fullPath, pathSegments);
         const resolvedCollection = useMemo(() => resolveCollection<M>({
             collection,
             path: fullPath,
             propertyConfigs: customizationController.propertyConfigs,
             authController,
-        }), [collection, fullPath]);
+            userConfigPersistence,
+        }), [collection, fullPath, userConfigPersistence]);
 
         // Check if Kanban view is possible (collection has at least one string enum property)
         const hasEnumProperty = useMemo(() => {
@@ -578,6 +602,7 @@ export const EntityCollectionView = React.memo(
         const onKanbanPropertyChange = useCallback((property: string) => {
             analyticsController.onAnalyticsEvent?.("kanban_property_changed", {
                 path: fullPath,
+                pathSegments,
                 property
             });
             setSelectedKanbanProperty(property);
@@ -642,6 +667,7 @@ export const EntityCollectionView = React.memo(
                                     entityId: entity.id,
                                     selectedTab: subcollection.id ?? subcollection.path,
                                     path: fullPath,
+                                    pathSegments,
                                     fullIdPath,
                                     navigation,
                                     sideEntityController
@@ -660,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"} />
                                     );
@@ -697,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") }
             ];
@@ -773,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}
@@ -826,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
@@ -878,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
@@ -885,6 +920,7 @@ export const EntityCollectionView = React.memo(
                         collection={collection}
                         tableController={tableController}
                         path={fullPath}
+                        pathSegments={pathSegments}
                         relativePath={collection.path}
                         selectionController={usedSelectionController}
                         collectionEntitiesCount={docsCount}
@@ -896,6 +932,7 @@ export const EntityCollectionView = React.memo(
                         onMultipleDeleteClick={onMultipleDeleteClick}
                         onNewClick={onNewClick}
                         path={fullPath}
+                        pathSegments={pathSegments}
                         relativePath={collection.path}
                         selectionController={usedSelectionController}
                         selectionEnabled={selectionEnabled}
@@ -912,6 +949,7 @@ export const EntityCollectionView = React.memo(
                         collection={collection}
                         tableController={tableController}
                         fullPath={fullPath}
+                        pathSegments={pathSegments}
                         parentCollectionIds={parentCollectionIds}
                         columnProperty={selectedKanbanProperty}
                         onEntityClick={onEntityClick}
@@ -1003,6 +1041,7 @@ export const EntityCollectionView = React.memo(
                         getIdColumnWidth={getIdColumnWidth}
                         additionalIDHeaderWidget={<EntityIdHeaderWidget
                             path={fullPath}
+                            pathSegments={pathSegments}
                             fullIdPath={fullIdPath ?? fullPath}
                             collection={collection} />}
                         openEntityMode={openEntityMode}
@@ -1042,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}
@@ -1097,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);
@@ -1113,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) {
@@ -1153,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
 }) {
 
@@ -1196,6 +1248,7 @@ function EntityIdHeaderWidget({
                                 collection,
                                 entityId,
                                 path,
+                                pathSegments,
                                 fullIdPath,
                                 sideEntityController,
                                 navigation
@@ -1221,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={() => {
@@ -1231,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,
@@ -66,8 +70,10 @@ export function EntityCollectionViewStartActions<M extends Record<string, any>>(
         collectionEntitiesCount
     };
 
+    const hasAnyAllowedFilters = !tableController.allowedFilters || tableController.allowedFilters.length > 0;
+
     // Filters button
-    const filtersButton = resolvedProperties && tableController.setFilterValues && (
+    const filtersButton = resolvedProperties && tableController.setFilterValues && hasAnyAllowedFilters && (
         <Tooltip title={t("filters")}
             key={"filters_tooltip"}>
             <Badge
@@ -131,6 +137,7 @@ export function EntityCollectionViewStartActions<M extends Record<string, any>>(
                     filterValues={tableController.filterValues}
                     setFilterValues={(filterValues) => tableController.setFilterValues?.(filterValues ?? {})}
                     forceFilter={collection.forceFilter}
+                    allowedFilters={tableController.allowedFilters?.map(key => key.toString())}
                 />
             )}
         </>

package/src/components/EntityCollectionView/FiltersDialog.tsx

@@ -12,7 +12,6 @@ import {
     DialogActions,
     DialogContent,
     DialogTitle,
-    FilterListIcon,
     Typography
 } from "@firecms/ui";
 import { useTranslation } from "../../hooks/useTranslation";
@@ -30,6 +29,7 @@ export interface FiltersDialogProps {
     filterValues: FilterValues<any> | undefined;
     setFilterValues: (filterValues?: FilterValues<any>) => void;
     forceFilter?: FilterValues<any>;
+    allowedFilters?: string[];
 }
 
 /**
@@ -42,7 +42,8 @@ export function FiltersDialog({
     properties,
     filterValues,
     setFilterValues,
-    forceFilter
+    forceFilter,
+    allowedFilters
 }: FiltersDialogProps) {
     const { t } = useTranslation();
     
@@ -59,18 +60,18 @@ export function FiltersDialog({
         }
     }, [open, filterValues]);
 
-    // Get list of filterable properties
-    const filterableProperties = useMemo(() => {
-        return Object.entries(properties).filter(([key, property]) => {
-            if (!property) return false;
-            // Force filter properties should not be editable
-            if (forceFilter && key in forceFilter) return false;
-            // Check if property type is filterable
-            const baseProperty = property.dataType === "array" ? property.of : property;
-            if (!baseProperty) return false;
-            return ["string", "number", "boolean", "date", "reference"].includes(baseProperty.dataType);
+    // Get list of editable filter properties
+    const editableFilterProperties = useMemo(() => {
+        return Object.entries(properties).filter(([key]) => {
+            const isFilterAllowed = !allowedFilters || allowedFilters.includes(key);
+
+            const isFilterForced = Boolean(forceFilter && Object.keys(forceFilter).includes(key));
+
+            return isFilterAllowed && !isFilterForced;
         });
-    }, [properties, forceFilter]);
+    }, [properties, allowedFilters, forceFilter]);
+
+    const hasEditableFilterProperties = editableFilterProperties.length > 0;
 
     const handleFilterChange = useCallback((propertyKey: string, value?: [VirtualTableWhereFilterOp, any]) => {
         setLocalFilters(prev => {
@@ -103,7 +104,13 @@ export function FiltersDialog({
 
     // Check if any reference field's dialog is currently open (should hide this dialog)
     const isAnyFieldHidden = Object.values(hiddenFields).some(hidden => hidden);
-    const activeFilterCount = Object.keys(localFilters).length;
+
+    const getActiveFilterCount = () => {
+        const editableLocalFilters = Object.keys(localFilters).filter((key) => !forceFilter || !(key in forceFilter));
+        return editableLocalFilters.length;
+    }
+
+    const activeFilterCount = getActiveFilterCount();
 
     const renderFilterField = useCallback((propertyKey: string, property: ResolvedProperty) => {
         const isArray = property.dataType === "array";
@@ -185,14 +192,14 @@ export function FiltersDialog({
             </DialogTitle>
 
             <DialogContent >
-                {filterableProperties.length === 0 ? (
+                {!hasEditableFilterProperties ? (
                     <Typography color="secondary" className="py-8 text-center">
                         {t("no_filterable_properties")}
                     </Typography>
                 ) : (
                     <table className="w-full border-collapse">
                         <tbody>
-                            {filterableProperties.map(([propertyKey, property], index) => {
+                            {editableFilterProperties.map(([propertyKey, property], index) => {
                                 const hasFilter = propertyKey in localFilters;
 
                                 return (
@@ -234,18 +241,22 @@ export function FiltersDialog({
                     {t("clear")}
                 </Button>
                 <div className="flex-grow" />
-                <Button
-                    variant="text"
-                    onClick={() => onOpenChange(false)}
-                >
-                    {t("cancel")}
-                </Button>
-                <Button
-                    variant="filled"
-                    onClick={handleApply}
-                >
-                    {t("apply_filters")}
-                </Button>
+                {hasEditableFilterProperties && (
+                    <>
+                        <Button
+                            variant="text"
+                            onClick={() => onOpenChange(false)}
+                        >
+                            {t("cancel")}
+                        </Button>
+                        <Button
+                            variant="filled"
+                            onClick={handleApply}
+                        >
+                            {t("apply_filters")}
+                        </Button>
+                    </>
+                )}
             </DialogActions>
         </Dialog>
     );

package/src/components/EntityCollectionView/useBoardDataController.tsx

@@ -45,6 +45,8 @@ export interface BoardDataController<M extends Record<string, any> = any, COLUMN
 export interface UseBoardDataControllerProps<M extends Record<string, any> = any> {
     /** Full path to the collection */
     fullPath: string;
+    /** `fullPath` split at its real segment boundaries; forwarded to the datasource. */
+    pathSegments?: string[];
     /** The entity collection configuration */
     collection: EntityCollection<M>;
     /** Property key used for column assignment */
@@ -67,6 +69,7 @@ export interface UseBoardDataControllerProps<M extends Record<string, any> = any
  */
 export function useBoardDataController<M extends Record<string, any> = any, COLUMN extends string = string>({
     fullPath,
+    pathSegments,
     collection,
     columnProperty,
     columns,
@@ -79,7 +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]);
+    // 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);
@@ -95,11 +103,13 @@ export function useBoardDataController<M extends Record<string, any> = any, COLU
     const orderPropertyRef = useRef(orderProperty);
     const searchStringRef = useRef(searchString);
     const resolvedPathRef = useRef(resolvedPath);
+    const resolvedPathSegmentsRef = useRef(resolvedPathSegments);
     filterValuesRef.current = filterValues;
     columnPropertyRef.current = columnProperty;
     orderPropertyRef.current = orderProperty;
     searchStringRef.current = searchString;
     resolvedPathRef.current = resolvedPath;
+    resolvedPathSegmentsRef.current = resolvedPathSegments;
 
     // Track item count per column for pagination
     const [columnItemCounts, setColumnItemCounts] = useState<Record<string, number>>(() => {
@@ -168,6 +178,7 @@ export function useBoardDataController<M extends Record<string, any> = any, COLU
         const currentOrderProperty = orderPropertyRef.current;
         const currentSearchString = searchStringRef.current;
         const currentResolvedPath = resolvedPathRef.current;
+        const currentPathSegments = resolvedPathSegmentsRef.current;
 
         // Build filter for this column
         const columnFilter: FilterValues<string> = {
@@ -205,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
                             })
@@ -248,6 +260,7 @@ export function useBoardDataController<M extends Record<string, any> = any, COLU
         if (currentDataSource.listenCollection) {
             const unsubscribe = currentDataSource.listenCollection<M>({
                 path: currentResolvedPath,
+                pathSegments: currentPathSegments,
                 collection: currentCollection,
                 onUpdate,
                 onError,
@@ -262,6 +275,7 @@ export function useBoardDataController<M extends Record<string, any> = any, COLU
         } else {
             currentDataSource.fetchCollection<M>({
                 path: currentResolvedPath,
+                pathSegments: currentPathSegments,
                 collection: currentCollection,
                 searchString: currentSearchString,
                 filter: columnFilter,
@@ -297,6 +311,7 @@ export function useBoardDataController<M extends Record<string, any> = any, COLU
         const currentColumnProperty = columnPropertyRef.current;
         const currentSearchString = searchStringRef.current;
         const currentResolvedPath = resolvedPathRef.current;
+        const currentPathSegments = resolvedPathSegmentsRef.current;
         const currentColumns = columns;
         const currentColumnItemCounts = columnItemCounts;
 
@@ -316,6 +331,7 @@ export function useBoardDataController<M extends Record<string, any> = any, COLU
                     };
                     currentDataSource.countEntities({
                         path: currentResolvedPath,
+                        pathSegments: currentPathSegments,
                         collection: currentCollection,
                         filter: columnFilter,
                         searchString: currentSearchString