@firecms/core 3.4.0-canary.63041d0 → 3.4.0-canary.cfeed0b

package/dist/index.es.js

@@ -10,7 +10,7 @@ import { useLocation, useNavigate, Link, NavLink, Routes, Route, createBrowserRo
 import Fuse from "fuse.js";
 import equal from "react-fast-compare";
 import jsonLogic from "json-logic-js";
-import { useTranslation as useTranslation$1, initReactI18next, I18nextProvider } from "react-i18next";
+import { useTranslation as useTranslation$1, I18nContext, initReactI18next, I18nextProvider } from "react-i18next";
 import { format } from "date-fns";
 import * as locales from "date-fns/locale";
 import { useDropzone } from "react-dropzone";
@@ -215,6 +215,11 @@ function encodeEntityId(entityId) {
 function decodeEntityId(encodedEntityId) {
   return encodedEntityId.replaceAll("%2F", "/").replaceAll("%23", "#").replaceAll("%3F", "?").replaceAll("%25", "%");
 }
+function buildSubcollectionPathSegments(parentPathSegments, entityId, subcollectionPath) {
+  if (!parentPathSegments || !entityId) return void 0;
+  const ownSegments = removeInitialAndTrailingSlashes(subcollectionPath).split("/");
+  return [...parentPathSegments, entityId, ...ownSegments];
+}
 function getLastSegment(path) {
   const cleanPath = removeInitialAndTrailingSlashes(path);
   if (cleanPath.includes("/")) {
@@ -223,7 +228,88 @@ function getLastSegment(path) {
   }
   return cleanPath;
 }
-function resolveCollectionPathIds(path, allCollections) {
+function walkPathSegments(pathSegments, allCollections) {
+  const resolved = [];
+  const steps = [];
+  let currentCollections = allCollections;
+  let index = 0;
+  while (index < pathSegments.length) {
+    const remaining = pathSegments.slice(index);
+    if (!currentCollections || currentCollections.length === 0) {
+      resolved.push(...remaining);
+      return {
+        resolved,
+        steps,
+        unmatched: remaining[0]
+      };
+    }
+    let match;
+    for (const collection of currentCollections) {
+      for (const candidate of [collection.path, collection.id]) {
+        if (!candidate) continue;
+        const parts = removeInitialAndTrailingSlashes(candidate).split("/");
+        if (parts.length > remaining.length) continue;
+        if (parts.some((part, i) => part !== remaining[i])) continue;
+        if (!match || parts.length > match.length) match = {
+          collection,
+          length: parts.length
+        };
+      }
+    }
+    if (!match) {
+      resolved.push(...remaining);
+      return {
+        resolved,
+        steps,
+        unmatched: remaining[0]
+      };
+    }
+    resolved.push(...removeInitialAndTrailingSlashes(match.collection.path).split("/"));
+    index += match.length;
+    const step = {
+      collection: match.collection,
+      collectionPath: resolved.join("/"),
+      collectionSegments: [...resolved]
+    };
+    steps.push(step);
+    if (index >= pathSegments.length) {
+      return {
+        resolved,
+        steps,
+        collection: match.collection
+      };
+    }
+    step.entityId = pathSegments[index];
+    resolved.push(pathSegments[index]);
+    index += 1;
+    if (index >= pathSegments.length) {
+      return {
+        resolved,
+        steps,
+        collection: match.collection
+      };
+    }
+    currentCollections = match.collection.subcollections;
+  }
+  return {
+    resolved,
+    steps
+  };
+}
+function resolveCollectionPathSegments(pathSegments, allCollections) {
+  const walk = walkPathSegments(pathSegments, allCollections);
+  if (walk.unmatched !== void 0) {
+    console.warn(`resolveCollectionPathSegments: Collection definition not found for segment "${walk.unmatched}" in [${pathSegments.join(", ")}]. Carrying the remaining segments through unresolved.`);
+  }
+  return walk.resolved;
+}
+function getCollectionByPathSegments(pathSegments, collections) {
+  return walkPathSegments(pathSegments, collections).collection;
+}
+function resolveCollectionPathIds(path, allCollections, pathSegments) {
+  if (pathSegments) {
+    return resolveCollectionPathSegments(pathSegments, allCollections).join("/");
+  }
   let remainingPath = removeInitialAndTrailingSlashes(path);
   if (!remainingPath) {
     return "";
@@ -285,7 +371,10 @@ function resolveCollectionPathIds(path, allCollections) {
   }
   return resolvedPathParts.join("/");
 }
-function getCollectionByPathOrId(pathOrId, collections) {
+function getCollectionByPathOrId(pathOrId, collections, pathSegments) {
+  if (pathSegments) {
+    return getCollectionByPathSegments(pathSegments, collections);
+  }
   const subpaths = removeInitialAndTrailingSlashes(pathOrId).split("/");
   if (subpaths.length % 2 === 0) {
     throw Error(`getCollectionByPathOrId: Collection paths must have an odd number of segments: ${pathOrId}`);
@@ -342,6 +431,9 @@ function navigateToEntity({
       onClose
     });
   } else {
+    if (!fullIdPath && pathSegments?.some((segment) => segment.includes("/"))) {
+      console.warn(`navigateToEntity: no "fullIdPath" was given and "${path}" contains an entity id with a "/", so no unambiguous URL can be built for it. The link will point at a different location. Pass "fullIdPath" — the escaped chain — alongside "path".`);
+    }
     let to = navigation.buildUrlCollectionPath(entityId ? `${fullIdPath ?? path}/${encodeEntityId(entityId)}` : fullIdPath ?? path);
     if (entityId && selectedTab) {
       to += `/${selectedTab}`;
@@ -369,10 +461,21 @@ class EntityReference {
    * Optional database ID where the entity is stored (if multiple databases are used)
    */
   databaseId;
-  constructor(id, path, databaseId) {
+  /**
+   * `path` split at its real segment boundaries, e.g. `["nodes", "node/42", "edges"]`.
+   *
+   * `path` is a single flattened string, so a parent entity id containing "/" cannot be
+   * recovered from it. This keeps each segment whole.
+   *
+   * Optional, and never derived by splitting `path` — a guess would be wrong in exactly
+   * the case the field exists for. Absent means "not known here", not "no slashes".
+   */
+  pathSegments;
+  constructor(id, path, databaseId, pathSegments) {
     this.id = id;
     this.path = path;
     this.databaseId = databaseId;
+    this.pathSegments = pathSegments;
   }
   get pathWithId() {
     return `${this.path}/${this.id}`;
@@ -743,7 +846,7 @@ function getReferenceFrom(entity) {
   if (!entity) {
     throw new Error("getReferenceFrom: entity is null or undefined");
   }
-  return new EntityReference(entity.id, entity.path, entity.databaseId);
+  return new EntityReference(entity.id, entity.path, entity.databaseId, entity.pathSegments);
 }
 function traverseValuesProperties(inputValues, properties, operation) {
   const safeInputValues = inputValues ?? {};
@@ -1234,7 +1337,12 @@ function getNavigationEntriesFromPath(props) {
               path: newPath,
               collections: collection.subcollections,
               currentFullPath: fullPath,
-              currentFullIdPath: fullIdPath,
+              // The entity id is a hop in the id chain exactly as it is in the
+              // other two. Without it a nested `fullIdPath` was
+              // "products/locales" rather than "products/pid/locales", so any
+              // URL built from it pointed at a collection that does not exist.
+              // Escaped, because `fullIdPath` is URL-facing.
+              currentFullIdPath: fullIdPath + "/" + encodedEntityId,
               currentFullUrlPath: fullUrlPath,
               currentPathSegments: entitySegments,
               contextEntityViews: props.contextEntityViews
@@ -1406,7 +1514,16 @@ function segmentsToStrippedPath(paths) {
   return paths.reduce((a, b) => `${a}${COLLECTION_PATH_SEPARATOR}${b}`);
 }
 function fullPathToCollectionSegments(path) {
-  return path.split("/").filter((e, i) => i % 2 === 0);
+  return positionalCollectionSegments(path);
+}
+function collectionSegmentsFrom(pathSegments) {
+  return keepCollectionPositions(pathSegments);
+}
+function positionalCollectionSegments(path) {
+  return keepCollectionPositions(path.split("/"));
+}
+function keepCollectionPositions(segments) {
+  return segments.filter((e, i) => i % 2 === 0);
 }
 function serializeRegExp(input) {
   if (!input) return "";
@@ -1636,35 +1753,35 @@ const DEFAULT_PERMISSIONS = {
   create: true,
   delete: true
 };
-function resolvePermissions(collection, authController, path, entity) {
+function resolvePermissions(collection, authController, path, entity, pathSegments) {
   const permission = collection.permissions;
   if (permission === void 0) {
     return DEFAULT_PERMISSIONS;
   } else if (typeof permission === "object") {
     return permission;
   } else if (typeof permission === "function") {
-    const pathSegments = fullPathToCollectionSegments(path);
+    const collectionSegments = pathSegments ? collectionSegmentsFrom(pathSegments) : fullPathToCollectionSegments(path);
     return permission({
       entity,
       path,
       user: authController.user,
       authController,
       collection,
-      pathSegments
+      pathSegments: collectionSegments
     });
   }
   console.error("Permissions:", permission);
   throw Error("New type of permission added and not mapped");
 }
-function canEditEntity(collection, authController, path, entity) {
-  return resolvePermissions(collection, authController, path, entity)?.edit ?? DEFAULT_PERMISSIONS.edit;
+function canEditEntity(collection, authController, path, entity, pathSegments) {
+  return resolvePermissions(collection, authController, path, entity, pathSegments)?.edit ?? DEFAULT_PERMISSIONS.edit;
 }
-function canCreateEntity(collection, authController, path, entity) {
+function canCreateEntity(collection, authController, path, entity, pathSegments) {
   if (collection.collectionGroup) return false;
-  return resolvePermissions(collection, authController, path, entity)?.create ?? DEFAULT_PERMISSIONS.create;
+  return resolvePermissions(collection, authController, path, entity, pathSegments)?.create ?? DEFAULT_PERMISSIONS.create;
 }
-function canDeleteEntity(collection, authController, path, entity) {
-  return resolvePermissions(collection, authController, path, entity)?.delete ?? DEFAULT_PERMISSIONS.delete;
+function canDeleteEntity(collection, authController, path, entity, pathSegments) {
+  return resolvePermissions(collection, authController, path, entity, pathSegments)?.delete ?? DEFAULT_PERMISSIONS.delete;
 }
 function toNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
@@ -4636,9 +4753,10 @@ const useFireCMSContext = () => {
   return fireCMSContextRef.current;
 };
 function useCollectionFetch(t0) {
-  const $ = c(26);
+  const $ = c(31);
   const {
     path: inputPath,
+    pathSegments: inputPathSegments,
     collection,
     filterValues,
     sortBy,
@@ -4648,45 +4766,63 @@ function useCollectionFetch(t0) {
   const dataSource = useDataSource();
   const navigationController = useNavigationController();
   let t1;
-  if ($[0] !== inputPath || $[1] !== navigationController) {
-    t1 = navigationController.resolveIdsFrom(inputPath);
-    $[0] = inputPath;
+  if ($[0] !== inputPathSegments || $[1] !== navigationController) {
+    t1 = inputPathSegments ? navigationController.resolveSegmentsFrom?.(inputPathSegments) ?? inputPathSegments : void 0;
+    $[0] = inputPathSegments;
     $[1] = navigationController;
     $[2] = t1;
   } else {
     t1 = $[2];
   }
-  const path = t1;
+  const pathSegments = t1;
+  let t2;
+  if ($[3] !== inputPath || $[4] !== inputPathSegments || $[5] !== navigationController) {
+    t2 = navigationController.resolveIdsFrom(inputPath, inputPathSegments);
+    $[3] = inputPath;
+    $[4] = inputPathSegments;
+    $[5] = navigationController;
+    $[6] = t2;
+  } else {
+    t2 = $[6];
+  }
+  const path = t2;
   const sortByProperty = sortBy ? sortBy[0] : void 0;
   const currentSort = sortBy ? sortBy[1] : void 0;
   const context = useFireCMSContext();
-  let t2;
-  if ($[3] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
-    t2 = [];
-    $[3] = t2;
+  let t3;
+  if ($[7] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    t3 = [];
+    $[7] = t3;
   } else {
-    t2 = $[3];
+    t3 = $[7];
   }
-  const [data, setData] = useState(t2);
+  const [data, setData] = useState(t3);
   const [dataLoading, setDataLoading] = useState(false);
   const [dataLoadingError, setDataLoadingError] = useState();
   const [noMoreToLoad, setNoMoreToLoad] = useState(false);
-  let t3;
-  if ($[4] !== collection || $[5] !== context || $[6] !== currentSort || $[7] !== dataSource || $[8] !== filterValues || $[9] !== itemCount || $[10] !== path || $[11] !== searchString || $[12] !== sortByProperty) {
-    t3 = () => {
+  let t4;
+  if ($[8] !== collection || $[9] !== context || $[10] !== currentSort || $[11] !== dataSource || $[12] !== filterValues || $[13] !== itemCount || $[14] !== path || $[15] !== pathSegments || $[16] !== searchString || $[17] !== sortByProperty) {
+    t4 = () => {
       setDataLoading(true);
       const onEntitiesUpdate = async (entities) => {
+        if (pathSegments) {
+          entities = entities.map((e) => e.pathSegments ? e : {
+            ...e,
+            pathSegments
+          });
+        }
         if (collection.callbacks?.onFetch) {
           try {
             entities = await Promise.all(entities.map((entity) => collection.callbacks.onFetch({
               collection,
               path,
+              pathSegments,
               entity,
               context
             })));
-          } catch (t42) {
-            const e = t42;
-            console.error(e);
+          } catch (t52) {
+            const e_0 = t52;
+            console.error(e_0);
           }
         }
         setDataLoading(false);
@@ -4703,6 +4839,7 @@ function useCollectionFetch(t0) {
       if (dataSource.listenCollection) {
         return dataSource.listenCollection({
           path,
+          pathSegments,
           collection,
           onUpdate: onEntitiesUpdate,
           onError,
@@ -4716,6 +4853,7 @@ function useCollectionFetch(t0) {
       } else {
         dataSource.fetchCollection({
           path,
+          pathSegments,
           collection,
           searchString,
           filter: filterValues,
@@ -4727,61 +4865,185 @@ function useCollectionFetch(t0) {
         return _temp2$f;
       }
     };
-    $[4] = collection;
-    $[5] = context;
-    $[6] = currentSort;
-    $[7] = dataSource;
-    $[8] = filterValues;
-    $[9] = itemCount;
-    $[10] = path;
-    $[11] = searchString;
-    $[12] = sortByProperty;
-    $[13] = t3;
+    $[8] = collection;
+    $[9] = context;
+    $[10] = currentSort;
+    $[11] = dataSource;
+    $[12] = filterValues;
+    $[13] = itemCount;
+    $[14] = path;
+    $[15] = pathSegments;
+    $[16] = searchString;
+    $[17] = sortByProperty;
+    $[18] = t4;
   } else {
-    t3 = $[13];
+    t4 = $[18];
   }
-  let t4;
-  if ($[14] !== currentSort || $[15] !== filterValues || $[16] !== itemCount || $[17] !== path || $[18] !== searchString || $[19] !== sortByProperty) {
-    t4 = [path, itemCount, currentSort, sortByProperty, filterValues, searchString];
-    $[14] = currentSort;
-    $[15] = filterValues;
-    $[16] = itemCount;
-    $[17] = path;
-    $[18] = searchString;
-    $[19] = sortByProperty;
-    $[20] = t4;
+  let t5;
+  if ($[19] !== currentSort || $[20] !== filterValues || $[21] !== itemCount || $[22] !== path || $[23] !== searchString || $[24] !== sortByProperty) {
+    t5 = [path, itemCount, currentSort, sortByProperty, filterValues, searchString];
+    $[19] = currentSort;
+    $[20] = filterValues;
+    $[21] = itemCount;
+    $[22] = path;
+    $[23] = searchString;
+    $[24] = sortByProperty;
+    $[25] = t5;
   } else {
-    t4 = $[20];
+    t5 = $[25];
   }
-  useEffect(t3, t4);
-  let t5;
-  if ($[21] !== data || $[22] !== dataLoading || $[23] !== dataLoadingError || $[24] !== noMoreToLoad) {
-    t5 = {
+  useEffect(t4, t5);
+  let t6;
+  if ($[26] !== data || $[27] !== dataLoading || $[28] !== dataLoadingError || $[29] !== noMoreToLoad) {
+    t6 = {
       data,
       dataLoading,
       dataLoadingError,
       noMoreToLoad
     };
-    $[21] = data;
-    $[22] = dataLoading;
-    $[23] = dataLoadingError;
-    $[24] = noMoreToLoad;
-    $[25] = t5;
+    $[26] = data;
+    $[27] = dataLoading;
+    $[28] = dataLoadingError;
+    $[29] = noMoreToLoad;
+    $[30] = t6;
   } else {
-    t5 = $[25];
+    t6 = $[30];
   }
-  return t5;
+  return t6;
 }
 function _temp2$f() {
 }
-function _temp$D(e_0) {
+function _temp$D(e_1) {
   return {
-    ...e_0
+    ...e_1
   };
 }
+function entityCacheKey(path, entityId) {
+  return `${path}/${entityId === void 0 ? entityId : encodeEntityId(entityId)}`;
+}
+const LOCAL_STORAGE_PREFIX = "entity_cache::";
+const entityCache = /* @__PURE__ */ new Map();
+const isLocalStorageAvailable = typeof localStorage !== "undefined";
+function customReplacer(key) {
+  const value = this[key];
+  if (value instanceof Date) {
+    return {
+      __type: "Date",
+      value: value.toISOString()
+    };
+  }
+  if (value instanceof EntityReference) {
+    return {
+      __type: "EntityReference",
+      id: value.id,
+      path: value.path,
+      databaseId: value.databaseId
+    };
+  }
+  if (value instanceof GeoPoint) {
+    return {
+      __type: "GeoPoint",
+      latitude: value.latitude,
+      longitude: value.longitude
+    };
+  }
+  if (value instanceof Vector) {
+    return {
+      __type: "Vector",
+      value: value.value
+    };
+  }
+  return value;
+}
+function customReviver(key, value) {
+  if (value && typeof value === "object" && "__type" in value) {
+    switch (value.__type) {
+      case "Date":
+        return new Date(value.value);
+      case "EntityReference":
+        return new EntityReference(value.id, value.path, value.databaseId);
+      case "GeoPoint":
+        return new GeoPoint(value.latitude, value.longitude);
+      case "Vector":
+        return new Vector(value.value);
+      default:
+        return value;
+    }
+  }
+  return value;
+}
+function saveEntityToCache(path, data) {
+  if (isLocalStorageAvailable) {
+    try {
+      const key = LOCAL_STORAGE_PREFIX + path;
+      const entityString = JSON.stringify(data, customReplacer);
+      console.debug("Saving entity to localStorage:", {
+        key,
+        entityString
+      });
+      localStorage.setItem(key, entityString);
+    } catch (error) {
+      console.error(`Failed to save entity for path "${path}" to localStorage:`, error);
+    }
+  }
+}
+function removeEntityFromMemoryCache(path) {
+  entityCache.delete(path);
+}
+function saveEntityToMemoryCache(path, data) {
+  entityCache.set(path, data);
+}
+function getEntityFromMemoryCache(path) {
+  return entityCache.get(path);
+}
+function getEntityFromCache(path) {
+  if (isLocalStorageAvailable) {
+    try {
+      const key = LOCAL_STORAGE_PREFIX + path;
+      const entityString = localStorage.getItem(key);
+      if (entityString) {
+        const entity = JSON.parse(entityString, customReviver);
+        return entity;
+      }
+    } catch (error) {
+      console.error(`Failed to load entity for path "${path}" from localStorage:`, error);
+    }
+  }
+  return void 0;
+}
+function removeEntityFromCache(path) {
+  if (isLocalStorageAvailable) {
+    try {
+      const key = LOCAL_STORAGE_PREFIX + path;
+      localStorage.removeItem(key);
+    } catch (error) {
+      console.error(`Failed to remove entity for path "${path}" from localStorage:`, error);
+    }
+  }
+}
+function flattenKeys(obj, prefix = "", result = []) {
+  if (isObject(obj) || Array.isArray(obj)) {
+    const plainObject = isPlainObject(obj);
+    if (!plainObject && prefix) {
+      result.push(prefix);
+    } else {
+      for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+          const newKey = prefix ? Array.isArray(obj) ? `${prefix}[${key}]` : `${prefix}.${key}` : key;
+          if (isObject(obj[key]) || Array.isArray(obj[key])) {
+            flattenKeys(obj[key], newKey, result);
+          } else {
+            result.push(newKey);
+          }
+        }
+      }
+    }
+  }
+  return result;
+}
 const CACHE = {};
 function useEntityFetch(t0) {
-  const $ = c(21);
+  const $ = c(23);
   const {
     path: inputPath,
     pathSegments: inputPathSegments,
@@ -4793,44 +5055,57 @@ function useEntityFetch(t0) {
   const useCache = t1 === void 0 ? false : t1;
   const dataSource = useDataSource();
   const navigationController = useNavigationController();
-  let path;
   let t2;
-  if ($[0] !== inputPath || $[1] !== inputPathSegments || $[2] !== navigationController) {
-    path = navigationController.resolveIdsFrom(inputPath);
-    t2 = inputPathSegments ?? path.split("/");
-    $[0] = inputPath;
-    $[1] = inputPathSegments;
-    $[2] = navigationController;
-    $[3] = path;
-    $[4] = t2;
+  if ($[0] !== inputPathSegments || $[1] !== navigationController) {
+    t2 = inputPathSegments ? navigationController.resolveSegmentsFrom?.(inputPathSegments) ?? inputPathSegments : void 0;
+    $[0] = inputPathSegments;
+    $[1] = navigationController;
+    $[2] = t2;
   } else {
-    path = $[3];
-    t2 = $[4];
+    t2 = $[2];
   }
   const pathSegments = t2;
+  let t3;
+  if ($[3] !== inputPath || $[4] !== inputPathSegments || $[5] !== navigationController) {
+    t3 = navigationController.resolveIdsFrom(inputPath, inputPathSegments);
+    $[3] = inputPath;
+    $[4] = inputPathSegments;
+    $[5] = navigationController;
+    $[6] = t3;
+  } else {
+    t3 = $[6];
+  }
+  const path = t3;
   const context = useFireCMSContext();
   const [entity, setEntity] = useState();
   const [dataLoading, setDataLoading] = useState(true);
   const [dataLoadingError, setDataLoadingError] = useState();
-  let t3;
-  if ($[5] !== collection || $[6] !== context || $[7] !== dataSource || $[8] !== databaseId || $[9] !== entityId || $[10] !== path || $[11] !== pathSegments || $[12] !== useCache) {
-    t3 = () => {
+  let t4;
+  if ($[7] !== collection || $[8] !== context || $[9] !== dataSource || $[10] !== databaseId || $[11] !== entityId || $[12] !== path || $[13] !== pathSegments || $[14] !== useCache) {
+    t4 = () => {
       setDataLoading(true);
       const onEntityUpdate = async (updatedEntity) => {
+        if (updatedEntity && pathSegments && !updatedEntity.pathSegments) {
+          updatedEntity = {
+            ...updatedEntity,
+            pathSegments
+          };
+        }
         if (collection.callbacks?.onFetch && updatedEntity) {
           try {
             updatedEntity = await collection.callbacks.onFetch({
               collection,
               path,
+              pathSegments,
               entity: updatedEntity,
               context
             });
-          } catch (t42) {
-            const e = t42;
+          } catch (t52) {
+            const e = t52;
             console.error(e);
           }
         }
-        CACHE[`${path}/${entityId}`] = updatedEntity;
+        CACHE[entityCacheKey(path, entityId)] = updatedEntity;
         setEntity(updatedEntity);
         setDataLoading(false);
         setDataLoadingError(void 0);
@@ -4841,8 +5116,8 @@ function useEntityFetch(t0) {
         setEntity(void 0);
         setDataLoadingError(error);
       };
-      if (entityId && useCache && CACHE[`${path}/${entityId}`]) {
-        setEntity(CACHE[`${path}/${entityId}`]);
+      if (entityId && useCache && CACHE[entityCacheKey(path, entityId)]) {
+        setEntity(CACHE[entityCacheKey(path, entityId)]);
         setDataLoading(false);
         setDataLoadingError(void 0);
         return _temp$C;
@@ -4874,43 +5149,43 @@ function useEntityFetch(t0) {
         }
       }
     };
-    $[5] = collection;
-    $[6] = context;
-    $[7] = dataSource;
-    $[8] = databaseId;
-    $[9] = entityId;
-    $[10] = path;
-    $[11] = pathSegments;
-    $[12] = useCache;
-    $[13] = t3;
+    $[7] = collection;
+    $[8] = context;
+    $[9] = dataSource;
+    $[10] = databaseId;
+    $[11] = entityId;
+    $[12] = path;
+    $[13] = pathSegments;
+    $[14] = useCache;
+    $[15] = t4;
   } else {
-    t3 = $[13];
+    t4 = $[15];
   }
-  let t4;
-  if ($[14] !== entityId || $[15] !== path) {
-    t4 = [entityId, path];
-    $[14] = entityId;
-    $[15] = path;
-    $[16] = t4;
+  let t5;
+  if ($[16] !== entityId || $[17] !== path) {
+    t5 = [entityId, path];
+    $[16] = entityId;
+    $[17] = path;
+    $[18] = t5;
   } else {
-    t4 = $[16];
+    t5 = $[18];
   }
-  useEffect(t3, t4);
-  let t5;
-  if ($[17] !== dataLoading || $[18] !== dataLoadingError || $[19] !== entity) {
-    t5 = {
+  useEffect(t4, t5);
+  let t6;
+  if ($[19] !== dataLoading || $[20] !== dataLoadingError || $[21] !== entity) {
+    t6 = {
       entity,
       dataLoading,
       dataLoadingError
     };
-    $[17] = dataLoading;
-    $[18] = dataLoadingError;
-    $[19] = entity;
-    $[20] = t5;
+    $[19] = dataLoading;
+    $[20] = dataLoadingError;
+    $[21] = entity;
+    $[22] = t6;
   } else {
-    t5 = $[20];
+    t6 = $[22];
   }
-  return t5;
+  return t6;
 }
 function _temp3$5() {
 }
@@ -4938,7 +5213,7 @@ async function saveEntityWithCallbacks({
   }
   let updatedValues;
   const customizationController = context.customizationController;
-  const resolvedPath = context.navigation.resolveIdsFrom(path);
+  const resolvedPath = context.navigation.resolveIdsFrom(path, pathSegments);
   const callbacks = collection.callbacks;
   if (callbacks?.onPreSave) {
     try {
@@ -4953,6 +5228,7 @@ async function saveEntityWithCallbacks({
       updatedValues = await callbacks.onPreSave({
         collection: resolvedCollection,
         path,
+        pathSegments,
         resolvedPath,
         entityId,
         values,
@@ -4971,7 +5247,7 @@ async function saveEntityWithCallbacks({
   return dataSource.saveEntity({
     collection,
     path: resolvedPath,
-    pathSegments: pathSegments ?? resolvedPath.split("/"),
+    pathSegments,
     entityId,
     values: updatedValues,
     previousValues,
@@ -4990,6 +5266,7 @@ async function saveEntityWithCallbacks({
         callbacks.onSaveSuccess({
           collection: resolvedCollection,
           path,
+          pathSegments,
           resolvedPath,
           entityId: entity.id,
           values: updatedValues,
@@ -5015,6 +5292,7 @@ async function saveEntityWithCallbacks({
       callbacks.onSaveFailure({
         collection: resolvedCollection,
         path,
+        pathSegments,
         resolvedPath,
         entityId,
         values: updatedValues,
@@ -5029,6 +5307,7 @@ async function saveEntityWithCallbacks({
 async function deleteEntityWithCallbacks({
   dataSource,
   entity,
+  pathSegments,
   collection,
   callbacks,
   onDeleteSuccess,
@@ -5038,11 +5317,13 @@ async function deleteEntityWithCallbacks({
   context
 }) {
   console.debug("Deleting entity", entity.path, entity.id);
+  const resolvedPathSegments = pathSegments ?? entity.pathSegments;
   const entityDeleteProps = {
     entity,
     collection,
     entityId: entity.id,
     path: entity.path,
+    pathSegments: resolvedPathSegments,
     context
   };
   if (callbacks?.onPreDelete) {
@@ -5055,6 +5336,7 @@ async function deleteEntityWithCallbacks({
     }
   }
   return dataSource.deleteEntity({
+    pathSegments: resolvedPathSegments,
     entity,
     collection
   }).then(() => {
@@ -5090,12 +5372,14 @@ function resolveNavigationFrom({
     if (entry.type === "collection") {
       return Promise.resolve(entry);
     } else if (entry.type === "entity") {
-      const collection = navigation.getCollection(entry.path);
+      const collection = navigation.getCollection(entry.path, false, entry.pathSegments);
       if (!collection) {
         throw Error(`No collection defined in the navigation for the entity with path ${entry.path}`);
       }
       return dataSource.fetchEntity({
         path: entry.path,
+        // The navigation entry already knows the real segment boundaries.
+        pathSegments: entry.pathSegments,
         entityId: entry.entityId,
         collection
       }).then((entity) => {
@@ -6495,7 +6779,7 @@ function EntityPreview({
   const sideEntityController = useSideEntityController();
   const customizationController = useCustomizationController();
   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}`);
   }
@@ -6538,6 +6822,9 @@ 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
       });
@@ -6662,7 +6949,7 @@ const ReferencePreview = function ReferencePreview2(props) {
   return t0;
 };
 function ReferencePreviewInternal(t0) {
-  const $ = c(22);
+  const $ = c(23);
   const {
     disabled,
     reference,
@@ -6678,70 +6965,71 @@ function ReferencePreviewInternal(t0) {
   const customizationController = useCustomizationController();
   const navigationController = useNavigationController();
   let t3;
-  if ($[0] !== navigationController || $[1] !== reference.path) {
-    t3 = navigationController.getCollection(reference.path);
+  if ($[0] !== navigationController || $[1] !== reference.path || $[2] !== reference.pathSegments) {
+    t3 = navigationController.getCollection(reference.path, false, reference.pathSegments);
     $[0] = navigationController;
     $[1] = reference.path;
-    $[2] = t3;
+    $[2] = reference.pathSegments;
+    $[3] = t3;
   } else {
-    t3 = $[2];
+    t3 = $[3];
   }
   const collection = t3;
   if (!collection) {
     if (customizationController.components?.missingReference) {
       let t42;
-      if ($[3] !== customizationController.components.missingReference || $[4] !== reference.path) {
+      if ($[4] !== customizationController.components.missingReference || $[5] !== reference.path) {
         t42 = /* @__PURE__ */ jsx(customizationController.components.missingReference, { path: reference.path });
-        $[3] = customizationController.components.missingReference;
-        $[4] = reference.path;
-        $[5] = t42;
+        $[4] = customizationController.components.missingReference;
+        $[5] = reference.path;
+        $[6] = t42;
       } else {
-        t42 = $[5];
+        t42 = $[6];
       }
       return t42;
     } else {
       const t42 = size ?? "medium";
       let t5;
-      if ($[6] !== reference.pathWithId) {
+      if ($[7] !== reference.pathWithId) {
         t5 = /* @__PURE__ */ jsx(ErrorView, { error: "Unexpected reference value. Click to edit", tooltip: reference.pathWithId });
-        $[6] = reference.pathWithId;
-        $[7] = t5;
+        $[7] = reference.pathWithId;
+        $[8] = t5;
       } else {
-        t5 = $[7];
+        t5 = $[8];
       }
       let t6;
-      if ($[8] !== onClick || $[9] !== t42 || $[10] !== t5) {
+      if ($[9] !== onClick || $[10] !== t42 || $[11] !== t5) {
         t6 = /* @__PURE__ */ jsx(EntityPreviewContainer, { onClick, size: t42, children: t5 });
-        $[8] = onClick;
-        $[9] = t42;
-        $[10] = t5;
-        $[11] = t6;
+        $[9] = onClick;
+        $[10] = t42;
+        $[11] = t5;
+        $[12] = t6;
       } else {
-        t6 = $[11];
+        t6 = $[12];
       }
       return t6;
     }
   }
   let t4;
-  if ($[12] !== collection || $[13] !== disabled || $[14] !== hover || $[15] !== includeEntityLink || $[16] !== includeId || $[17] !== onClick || $[18] !== previewProperties || $[19] !== reference || $[20] !== size) {
+  if ($[13] !== collection || $[14] !== disabled || $[15] !== hover || $[16] !== includeEntityLink || $[17] !== includeId || $[18] !== onClick || $[19] !== previewProperties || $[20] !== reference || $[21] !== size) {
     t4 = /* @__PURE__ */ jsx(ReferencePreviewExisting, { reference, collection, previewProperties, size, disabled, includeEntityLink, includeId, onClick, hover });
-    $[12] = collection;
-    $[13] = disabled;
-    $[14] = hover;
-    $[15] = includeEntityLink;
-    $[16] = includeId;
-    $[17] = onClick;
-    $[18] = previewProperties;
-    $[19] = reference;
-    $[20] = size;
-    $[21] = t4;
+    $[13] = collection;
+    $[14] = disabled;
+    $[15] = hover;
+    $[16] = includeEntityLink;
+    $[17] = includeId;
+    $[18] = onClick;
+    $[19] = previewProperties;
+    $[20] = reference;
+    $[21] = size;
+    $[22] = t4;
   } else {
-    t4 = $[21];
+    t4 = $[22];
   }
   return t4;
 }
 function ReferencePreviewExisting(t0) {
-  const $ = c(35);
+  const $ = c(37);
   const {
     reference,
     collection,
@@ -6754,9 +7042,10 @@ function ReferencePreviewExisting(t0) {
     hover
   } = t0;
   let t1;
-  if ($[0] !== collection || $[1] !== reference.id || $[2] !== reference.path) {
+  if ($[0] !== collection || $[1] !== reference.id || $[2] !== reference.path || $[3] !== reference.pathSegments) {
     t1 = {
       path: reference.path,
+      pathSegments: reference.pathSegments,
       entityId: reference.id,
       collection,
       useCache: true
@@ -6764,46 +7053,48 @@ function ReferencePreviewExisting(t0) {
     $[0] = collection;
     $[1] = reference.id;
     $[2] = reference.path;
-    $[3] = t1;
+    $[3] = reference.pathSegments;
+    $[4] = t1;
   } else {
-    t1 = $[3];
+    t1 = $[4];
   }
   const {
     entity,
     dataLoading
   } = useEntityFetch(t1);
   if (entity) {
-    referencesCache.set(reference.pathWithId, entity);
+    referencesCache.set(entityCacheKey(reference.path, reference.id), entity);
   }
   let t2;
-  if ($[4] !== entity || $[5] !== reference.pathWithId) {
-    t2 = entity ?? referencesCache.get(reference.pathWithId);
-    $[4] = entity;
-    $[5] = reference.pathWithId;
-    $[6] = t2;
+  if ($[5] !== entity || $[6] !== reference.id || $[7] !== reference.path) {
+    t2 = entity ?? referencesCache.get(entityCacheKey(reference.path, reference.id));
+    $[5] = entity;
+    $[6] = reference.id;
+    $[7] = reference.path;
+    $[8] = t2;
   } else {
-    t2 = $[6];
+    t2 = $[8];
   }
   const usedEntity = t2;
   let body;
   if (!reference) {
     let t32;
-    if ($[7] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    if ($[9] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t32 = /* @__PURE__ */ jsx(ErrorView, { error: "Reference not set" });
-      $[7] = t32;
+      $[9] = t32;
     } else {
-      t32 = $[7];
+      t32 = $[9];
     }
     body = t32;
   } else {
     if (usedEntity && !usedEntity.values) {
       let t32;
-      if ($[8] !== reference.path) {
+      if ($[10] !== reference.path) {
         t32 = /* @__PURE__ */ jsx(ErrorView, { error: "Reference does not exist", tooltip: reference.path });
-        $[8] = reference.path;
-        $[9] = t32;
+        $[10] = reference.path;
+        $[11] = t32;
       } else {
-        t32 = $[9];
+        t32 = $[11];
       }
       body = t32;
     }
@@ -6812,15 +7103,15 @@ function ReferencePreviewExisting(t0) {
     const t32 = disabled ? void 0 : onClick;
     const t4 = disabled ? void 0 : hover;
     let t5;
-    if ($[10] !== body || $[11] !== size || $[12] !== t32 || $[13] !== t4) {
+    if ($[12] !== body || $[13] !== size || $[14] !== t32 || $[15] !== t4) {
       t5 = /* @__PURE__ */ jsx(EntityPreviewContainer, { onClick: t32, hover: t4, size, children: body });
-      $[10] = body;
-      $[11] = size;
-      $[12] = t32;
-      $[13] = t4;
-      $[14] = t5;
+      $[12] = body;
+      $[13] = size;
+      $[14] = t32;
+      $[15] = t4;
+      $[16] = t5;
     } else {
-      t5 = $[14];
+      t5 = $[16];
     }
     return t5;
   }
@@ -6828,21 +7119,21 @@ function ReferencePreviewExisting(t0) {
     const t32 = disabled ? void 0 : onClick;
     const t4 = disabled ? void 0 : hover;
     let t5;
-    if ($[15] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    if ($[17] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t5 = /* @__PURE__ */ jsx(Skeleton, {});
-      $[15] = t5;
+      $[17] = t5;
     } else {
-      t5 = $[15];
+      t5 = $[17];
     }
     let t6;
-    if ($[16] !== size || $[17] !== t32 || $[18] !== t4) {
+    if ($[18] !== size || $[19] !== t32 || $[20] !== t4) {
       t6 = /* @__PURE__ */ jsx(EntityPreviewContainer, { onClick: t32, hover: t4, size, children: t5 });
-      $[16] = size;
-      $[17] = t32;
-      $[18] = t4;
-      $[19] = t6;
+      $[18] = size;
+      $[19] = t32;
+      $[20] = t4;
+      $[21] = t6;
     } else {
-      t6 = $[19];
+      t6 = $[21];
     }
     return t6;
   }
@@ -6850,39 +7141,39 @@ function ReferencePreviewExisting(t0) {
     const t32 = disabled ? void 0 : onClick;
     const t4 = disabled ? void 0 : hover;
     let t5;
-    if ($[20] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+    if ($[22] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
       t5 = /* @__PURE__ */ jsx(ErrorView, { error: "Entity not found" });
-      $[20] = t5;
+      $[22] = t5;
     } else {
-      t5 = $[20];
+      t5 = $[22];
     }
     let t6;
-    if ($[21] !== size || $[22] !== t32 || $[23] !== t4) {
+    if ($[23] !== size || $[24] !== t32 || $[25] !== t4) {
       t6 = /* @__PURE__ */ jsx(EntityPreviewContainer, { onClick: t32, hover: t4, size, children: t5 });
-      $[21] = size;
-      $[22] = t32;
-      $[23] = t4;
-      $[24] = t6;
+      $[23] = size;
+      $[24] = t32;
+      $[25] = t4;
+      $[26] = t6;
     } else {
-      t6 = $[24];
+      t6 = $[26];
     }
     return t6;
   }
   let t3;
-  if ($[25] !== collection || $[26] !== disabled || $[27] !== hover || $[28] !== includeEntityLink || $[29] !== includeId || $[30] !== onClick || $[31] !== previewProperties || $[32] !== size || $[33] !== usedEntity) {
+  if ($[27] !== collection || $[28] !== disabled || $[29] !== hover || $[30] !== includeEntityLink || $[31] !== includeId || $[32] !== onClick || $[33] !== previewProperties || $[34] !== size || $[35] !== usedEntity) {
     t3 = /* @__PURE__ */ jsx(EntityPreview, { size, previewKeys: previewProperties, disabled, entity: usedEntity, collection, onClick, includeEntityLink, includeId, hover });
-    $[25] = collection;
-    $[26] = disabled;
-    $[27] = hover;
-    $[28] = includeEntityLink;
-    $[29] = includeId;
-    $[30] = onClick;
-    $[31] = previewProperties;
-    $[32] = size;
-    $[33] = usedEntity;
-    $[34] = t3;
+    $[27] = collection;
+    $[28] = disabled;
+    $[29] = hover;
+    $[30] = includeEntityLink;
+    $[31] = includeId;
+    $[32] = onClick;
+    $[33] = previewProperties;
+    $[34] = size;
+    $[35] = usedEntity;
+    $[36] = t3;
   } else {
-    t3 = $[34];
+    t3 = $[36];
   }
   return t3;
 }
@@ -11179,126 +11470,6 @@ const PropertyTableCell = React__default.memo(function PropertyTableCell2({
 function areEqual(prevProps, nextProps) {
   return prevProps.height === nextProps.height && prevProps.propertyKey === nextProps.propertyKey && prevProps.align === nextProps.align && prevProps.width === nextProps.width && equal(prevProps.property, nextProps.property) && equal(prevProps.value, nextProps.value) && equal(prevProps.entity.id, nextProps.entity.id) && equal(prevProps.entity.values, nextProps.entity.values) && prevProps.isDragging === nextProps.isDragging && prevProps.isDraggable === nextProps.isDraggable && prevProps.frozen === nextProps.frozen;
 }
-const LOCAL_STORAGE_PREFIX = "entity_cache::";
-const entityCache = /* @__PURE__ */ new Map();
-const isLocalStorageAvailable = typeof localStorage !== "undefined";
-function customReplacer(key) {
-  const value = this[key];
-  if (value instanceof Date) {
-    return {
-      __type: "Date",
-      value: value.toISOString()
-    };
-  }
-  if (value instanceof EntityReference) {
-    return {
-      __type: "EntityReference",
-      id: value.id,
-      path: value.path,
-      databaseId: value.databaseId
-    };
-  }
-  if (value instanceof GeoPoint) {
-    return {
-      __type: "GeoPoint",
-      latitude: value.latitude,
-      longitude: value.longitude
-    };
-  }
-  if (value instanceof Vector) {
-    return {
-      __type: "Vector",
-      value: value.value
-    };
-  }
-  return value;
-}
-function customReviver(key, value) {
-  if (value && typeof value === "object" && "__type" in value) {
-    switch (value.__type) {
-      case "Date":
-        return new Date(value.value);
-      case "EntityReference":
-        return new EntityReference(value.id, value.path, value.databaseId);
-      case "GeoPoint":
-        return new GeoPoint(value.latitude, value.longitude);
-      case "Vector":
-        return new Vector(value.value);
-      default:
-        return value;
-    }
-  }
-  return value;
-}
-function saveEntityToCache(path, data) {
-  if (isLocalStorageAvailable) {
-    try {
-      const key = LOCAL_STORAGE_PREFIX + path;
-      const entityString = JSON.stringify(data, customReplacer);
-      console.debug("Saving entity to localStorage:", {
-        key,
-        entityString
-      });
-      localStorage.setItem(key, entityString);
-    } catch (error) {
-      console.error(`Failed to save entity for path "${path}" to localStorage:`, error);
-    }
-  }
-}
-function removeEntityFromMemoryCache(path) {
-  entityCache.delete(path);
-}
-function saveEntityToMemoryCache(path, data) {
-  entityCache.set(path, data);
-}
-function getEntityFromMemoryCache(path) {
-  return entityCache.get(path);
-}
-function getEntityFromCache(path) {
-  if (isLocalStorageAvailable) {
-    try {
-      const key = LOCAL_STORAGE_PREFIX + path;
-      const entityString = localStorage.getItem(key);
-      if (entityString) {
-        const entity = JSON.parse(entityString, customReviver);
-        return entity;
-      }
-    } catch (error) {
-      console.error(`Failed to load entity for path "${path}" from localStorage:`, error);
-    }
-  }
-  return void 0;
-}
-function removeEntityFromCache(path) {
-  if (isLocalStorageAvailable) {
-    try {
-      const key = LOCAL_STORAGE_PREFIX + path;
-      localStorage.removeItem(key);
-    } catch (error) {
-      console.error(`Failed to remove entity for path "${path}" from localStorage:`, error);
-    }
-  }
-}
-function flattenKeys(obj, prefix = "", result = []) {
-  if (isObject(obj) || Array.isArray(obj)) {
-    const plainObject = isPlainObject(obj);
-    if (!plainObject && prefix) {
-      result.push(prefix);
-    } else {
-      for (const key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key)) {
-          const newKey = prefix ? Array.isArray(obj) ? `${prefix}[${key}]` : `${prefix}.${key}` : key;
-          if (isObject(obj[key]) || Array.isArray(obj[key])) {
-            flattenKeys(obj[key], newKey, result);
-          } else {
-            result.push(newKey);
-          }
-        }
-      }
-    }
-  }
-  return result;
-}
 function FieldHelperText(t0) {
   const $ = c(10);
   const {
@@ -16742,6 +16913,7 @@ function getChanges(source, comparison) {
 }
 function EntityForm({
   path,
+  pathSegments,
   fullIdPath,
   entityId: entityIdProp,
   collection,
@@ -16792,6 +16964,7 @@ function EntityForm({
       entityId: entityIdProp,
       collection,
       path,
+      pathSegments,
       values: valuesToBeSaved
     });
   }, false, 2e3);
@@ -16808,7 +16981,7 @@ function EntityForm({
       if (mustSetCustomId) {
         return void 0;
       } else {
-        return dataSource.generateEntityId(path, collection);
+        return dataSource.generateEntityId(path, collection, pathSegments);
       }
     } else {
       return entityIdProp;
@@ -16819,7 +16992,7 @@ function EntityForm({
   const [savingError, setSavingError] = useState();
   const autoSave = collection.formAutoSave && !collection.customId;
   const baseInitialValues = useMemo(() => getInitialEntityValues(authController, collection, path, status, entity, customizationController.propertyConfigs), [authController, collection, path, status, entity, customizationController.propertyConfigs]);
-  const localChangesDataRaw = useMemo(() => entityId ? getEntityFromCache(path + "/" + entityId) : getEntityFromCache(path + "#new"), [entityId, path]);
+  const localChangesDataRaw = useMemo(() => entityId ? getEntityFromCache(entityCacheKey(path, entityId)) : getEntityFromCache(path + "#new"), [entityId, path]);
   const [localChangesCleared, setLocalChangesCleared] = useState(false);
   const localChangesBackup = getLocalChangesBackup(collection);
   const autoApplyLocalChanges = localChangesBackup === "auto_apply";
@@ -16881,7 +17054,7 @@ function EntityForm({
       onValuesModified?.(false, initialValues_0);
     },
     onValuesChangeDeferred: (values_0, controller) => {
-      const key = status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId;
+      const key = status === "new" || status === "copy" ? path + "#new" : entityCacheKey(path, entityId);
       if (controller.dirty && localChangesBackup !== false) {
         const touchedValues = removeEmptyContainers(extractTouchedValues(values_0, controller.touched));
         if (touchedValues && Object.keys(touchedValues).length > 0) {
@@ -16946,8 +17119,8 @@ function EntityForm({
       removeEntityFromMemoryCache(path + "#new");
       removeEntityFromCache(path + "#new");
     } else {
-      removeEntityFromMemoryCache(path + "/" + entityId);
-      removeEntityFromCache(path + "/" + entityId);
+      removeEntityFromMemoryCache(entityCacheKey(path, entityId));
+      removeEntityFromCache(entityCacheKey(path, entityId));
     }
   }
   const onSaveSuccess = (updatedEntity) => {
@@ -16965,6 +17138,7 @@ function EntityForm({
         entity: updatedEntity,
         status,
         path,
+        pathSegments,
         entityId: updatedEntity.id,
         collection
       });
@@ -16983,10 +17157,12 @@ function EntityForm({
     previousValues,
     entityId: entityId_0,
     collection: collection_0,
-    path: path_0
+    path: path_0,
+    pathSegments: pathSegments_0
   }) => {
     return saveEntityWithCallbacks({
       path: path_0,
+      pathSegments: pathSegments_0,
       entityId: entityId_0,
       values: values_2,
       previousValues,
@@ -17003,6 +17179,7 @@ function EntityForm({
   const onSaveEntityRequest = async ({
     collection: collection_1,
     path: path_1,
+    pathSegments: pathSegments_1,
     entityId: entityId_1,
     values: values_3,
     previousValues: previousValues_0,
@@ -17015,6 +17192,7 @@ function EntityForm({
       return saveEntity({
         collection: collection_1,
         path: path_1,
+        pathSegments: pathSegments_1,
         entityId: entityId_1,
         values: values_3,
         previousValues: previousValues_0
@@ -17027,6 +17205,7 @@ function EntityForm({
     return onSaveEntityRequest({
       collection: resolvedCollection,
       path,
+      pathSegments,
       entityId,
       values: values_4,
       previousValues: entity?.values,
@@ -17071,12 +17250,13 @@ function EntityForm({
   const pluginBeforeTitle = [];
   const plugins = customizationController.plugins;
   const actionsDisabled = disabled || formex.isSubmitting || status === "existing" && !formex.dirty || Boolean(disabledProp);
-  const parentCollectionIds = navigationController.getParentCollectionIds(path);
+  const parentCollectionIds = navigationController.getParentCollectionIds(path, pathSegments);
   if (plugins && collection) {
     const actionProps = {
       entityId,
       parentCollectionIds,
       path,
+      pathSegments,
       status,
       collection,
       context,
@@ -17121,7 +17301,7 @@ function EntityForm({
   const uniqueFieldValidator = useCallback(({
     name,
     value
-  }) => dataSource.checkUniqueField(path, name, value, entityId, collection), [dataSource, path, entityId]);
+  }) => dataSource.checkUniqueField(path, name, value, entityId, collection, pathSegments), [dataSource, path, entityId]);
   const validationSchema = useMemo(() => entityId ? getYupEntitySchema(entityId, resolvedCollection.properties, uniqueFieldValidator) : void 0, [entityId, resolvedCollection.properties, uniqueFieldValidator]);
   useOnAutoSave(autoSave, formex, lastSavedValues, save);
   const prevEntityValuesRef = useRef(entity?.values);
@@ -17225,13 +17405,13 @@ function EntityForm({
   if (!resolvedCollection || !path) {
     throw Error("INTERNAL: Collection and path must be defined in form context");
   }
-  const dialogActions = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, fullPath: path, fullIdPath, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex, disabled: actionsDisabled, status, pluginActions: pluginActions ?? [], openEntityMode, showDefaultActions, navigateBack, formContext });
+  const dialogActions = /* @__PURE__ */ jsx(EntityFormActionsComponent, { collection: resolvedCollection, path, pathSegments, fullPath: path, fullIdPath, entity, layout: forceActionsAtTheBottom ? "bottom" : "side", savingError, formex, disabled: actionsDisabled, status, pluginActions: pluginActions ?? [], openEntityMode, showDefaultActions, navigateBack, formContext });
   return /* @__PURE__ */ jsx(Formex, { value: formex, children: /* @__PURE__ */ jsxs("form", { onSubmit: formex.handleSubmit, onReset: () => formex.resetForm({
     values: baseInitialValues
   }), noValidate: true, className: cls("flex-1 flex flex-row w-full overflow-y-auto justify-center", className), children: [
     /* @__PURE__ */ jsx("div", { id: `form_${path}`, className: cls("relative flex flex-row max-w-4xl lg:max-w-3xl xl:max-w-4xl 2xl:max-w-6xl w-full h-fit"), children: /* @__PURE__ */ jsxs("div", { className: cls("flex flex-col w-full pt-12 pb-16 px-4 sm:px-8 md:px-10"), children: [
       /* @__PURE__ */ jsxs("div", { className: "flex flex-row gap-4 self-end sticky top-4 z-10", children: [
-        manualApplyLocalChanges && hasLocalChanges && /* @__PURE__ */ jsx(LocalChangesMenu, { cacheKey: status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId, properties: resolvedCollection.properties, cachedData: localChangesDataRaw, formex, onClearLocalChanges: () => setLocalChangesCleared(true) }),
+        manualApplyLocalChanges && hasLocalChanges && /* @__PURE__ */ jsx(LocalChangesMenu, { cacheKey: status === "new" || status === "copy" ? path + "#new" : entityCacheKey(path, entityId), properties: resolvedCollection.properties, cachedData: localChangesDataRaw, formex, onClearLocalChanges: () => setLocalChangesCleared(true) }),
         formex.dirty ? /* @__PURE__ */ jsx(Tooltip, { title: "This form has been modified", children: /* @__PURE__ */ jsx(Chip, { size: "small", className: "py-1", colorScheme: "orangeDarker", children: /* @__PURE__ */ jsx(EditIcon, { size: "smallest" }) }) }) : /* @__PURE__ */ jsx(Tooltip, { title: "The current form is in sync with the database", children: /* @__PURE__ */ jsx(Chip, { size: "small", className: "py-1", children: /* @__PURE__ */ jsx(CheckIcon, { size: "smallest" }) }) })
       ] }),
       formView
@@ -17322,7 +17502,7 @@ const EntityCollectionRowActions = function EntityCollectionRowActions2({
   const collapsedActions = actions.filter((a_0) => a_0.collapsed || a_0.collapsed === void 0);
   const uncollapsedActions = actions.filter((a_1) => a_1.collapsed === false);
   const enableLocalChangesBackup = collection ? getLocalChangesBackup(collection) : false;
-  const cachedData = enableLocalChangesBackup ? getEntityFromCache(fullPath + "/" + entity.id) : void 0;
+  const cachedData = enableLocalChangesBackup ? getEntityFromCache(entityCacheKey(fullPath, entity.id)) : void 0;
   const hasDraft = (() => {
     if (!cachedData || typeof cachedData !== "object" || Object.keys(cachedData).length === 0) return false;
     const realChanges = getChanges(cachedData, entity?.values ?? {});
@@ -20088,8 +20268,8 @@ function useDataSourceTableController({
   const [popupCell, setPopupCell] = React__default.useState(void 0);
   const navigation = useNavigationController();
   const dataSource = useDataSource();
-  const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
-  const resolvedPathSegments = useMemo(() => pathSegments ?? resolvedPath.split("/"), [pathSegments, resolvedPath]);
+  const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath, pathSegments), [fullPath, pathSegments, navigation.resolveIdsFrom]);
+  const resolvedPathSegments = useMemo(() => pathSegments ? navigation.resolveSegmentsFrom?.(pathSegments) ?? pathSegments : void 0, [pathSegments, navigation.resolveSegmentsFrom]);
   const forceFilter = forceFilterFromProps ?? forceFilterFromCollection;
   const paginationEnabled = collection.pagination === void 0 || Boolean(collection.pagination);
   const pageSize = typeof collection.pagination === "number" ? collection.pagination : DEFAULT_PAGE_SIZE$1;
@@ -20097,6 +20277,7 @@ function useDataSourceTableController({
     if (!dataSource.isFilterCombinationValid) return true;
     return dataSource.isFilterCombinationValid({
       path: resolvedPath,
+      pathSegments: resolvedPathSegments,
       collection,
       filterValues,
       sortBy
@@ -20185,22 +20366,29 @@ function useDataSourceTableController({
   useEffect(() => {
     setDataLoading(true);
     const onEntitiesUpdate = async (entities) => {
+      if (resolvedPathSegments) {
+        entities = entities.map((e) => e.pathSegments ? e : {
+          ...e,
+          pathSegments: resolvedPathSegments
+        });
+      }
       if (collection.callbacks?.onFetch) {
         try {
           entities = await Promise.all(entities.map((entity) => collection.callbacks.onFetch({
             collection,
             path: resolvedPath,
+            pathSegments: resolvedPathSegments,
             entity,
             context
           })));
-        } catch (e) {
-          console.error(e);
+        } catch (e_0) {
+          console.error(e_0);
         }
       }
       setDataLoading(false);
       setDataLoadingError(void 0);
-      setRawData(entities.map((e_0) => ({
-        ...e_0
+      setRawData(entities.map((e_1) => ({
+        ...e_1
         // values: sanitizeData(e.values, resolvedCollection.properties)
       })));
       setNoMoreToLoad(!itemCount || entities.length < itemCount);
@@ -20241,8 +20429,8 @@ function useDataSourceTableController({
         return () => {
         };
       }
-    } catch (e_1) {
-      onError(e_1 instanceof Error ? e_1 : new Error(String(e_1)));
+    } catch (e_2) {
+      onError(e_2 instanceof Error ? e_2 : new Error(String(e_2)));
       return () => {
       };
     }
@@ -20346,10 +20534,11 @@ function useSelectionController(onSelectionChange) {
   };
 }
 function useTableSearchHelper(t0) {
-  const $ = c(18);
+  const $ = c(19);
   const {
     collection,
     fullPath,
+    pathSegments,
     parentCollectionIds,
     initialSearchString
   } = t0;
@@ -20361,11 +20550,12 @@ function useTableSearchHelper(t0) {
   const autoInitialisedRef = useRef(false);
   let onTextSearchClick;
   let textSearchEnabled;
-  if ($[0] !== collection || $[1] !== context || $[2] !== customizationController.plugins || $[3] !== dataSource || $[4] !== fullPath || $[5] !== parentCollectionIds) {
+  if ($[0] !== collection || $[1] !== context || $[2] !== customizationController.plugins || $[3] !== dataSource || $[4] !== fullPath || $[5] !== parentCollectionIds || $[6] !== pathSegments) {
     textSearchEnabled = Boolean(collection.textSearchEnabled);
     const props = {
       context,
       path: fullPath,
+      pathSegments,
       databaseId: collection.databaseId,
       collection,
       parentCollectionIds
@@ -20385,6 +20575,7 @@ function useTableSearchHelper(t0) {
               promises.push(p_1.collectionView.onTextSearchClick({
                 context,
                 path: fullPath,
+                pathSegments,
                 collection,
                 parentCollectionIds
               }));
@@ -20416,15 +20607,16 @@ function useTableSearchHelper(t0) {
     $[3] = dataSource;
     $[4] = fullPath;
     $[5] = parentCollectionIds;
-    $[6] = onTextSearchClick;
-    $[7] = textSearchEnabled;
+    $[6] = pathSegments;
+    $[7] = onTextSearchClick;
+    $[8] = textSearchEnabled;
   } else {
-    onTextSearchClick = $[6];
-    textSearchEnabled = $[7];
+    onTextSearchClick = $[7];
+    textSearchEnabled = $[8];
   }
   const shouldAutoInitialise = Boolean(initialSearchString) && textSearchEnabled && !textSearchInitialised && Boolean(onTextSearchClick);
   let t1;
-  if ($[8] !== onTextSearchClick || $[9] !== shouldAutoInitialise) {
+  if ($[9] !== onTextSearchClick || $[10] !== shouldAutoInitialise) {
     t1 = () => {
       if (autoInitialisedRef.current || !shouldAutoInitialise) {
         return;
@@ -20432,36 +20624,36 @@ function useTableSearchHelper(t0) {
       autoInitialisedRef.current = true;
       onTextSearchClick?.();
     };
-    $[8] = onTextSearchClick;
-    $[9] = shouldAutoInitialise;
-    $[10] = t1;
+    $[9] = onTextSearchClick;
+    $[10] = shouldAutoInitialise;
+    $[11] = t1;
   } else {
-    t1 = $[10];
+    t1 = $[11];
   }
   let t2;
-  if ($[11] !== shouldAutoInitialise) {
+  if ($[12] !== shouldAutoInitialise) {
     t2 = [shouldAutoInitialise];
-    $[11] = shouldAutoInitialise;
-    $[12] = t2;
+    $[12] = shouldAutoInitialise;
+    $[13] = t2;
   } else {
-    t2 = $[12];
+    t2 = $[13];
   }
   useEffect(t1, t2);
   let t3;
-  if ($[13] !== onTextSearchClick || $[14] !== textSearchEnabled || $[15] !== textSearchInitialised || $[16] !== textSearchLoading) {
+  if ($[14] !== onTextSearchClick || $[15] !== textSearchEnabled || $[16] !== textSearchInitialised || $[17] !== textSearchLoading) {
     t3 = {
       textSearchLoading,
       textSearchInitialised,
       onTextSearchClick,
       textSearchEnabled
     };
-    $[13] = onTextSearchClick;
-    $[14] = textSearchEnabled;
-    $[15] = textSearchInitialised;
-    $[16] = textSearchLoading;
-    $[17] = t3;
+    $[14] = onTextSearchClick;
+    $[15] = textSearchEnabled;
+    $[16] = textSearchInitialised;
+    $[17] = textSearchLoading;
+    $[18] = t3;
   } else {
-    t3 = $[17];
+    t3 = $[18];
   }
   return t3;
 }
@@ -20530,6 +20722,8 @@ function DeleteEntityDialog({
   const performDelete = useCallback((entity_3) => deleteEntityWithCallbacks({
     dataSource,
     entity: entity_3,
+    // The entity is the authority on where it lives; stated rather than left implicit.
+    pathSegments: entity_3.pathSegments,
     collection: resolvedCollection,
     callbacks,
     onDeleteSuccess,
@@ -20631,6 +20825,7 @@ const editEntityAction = {
     entity,
     collection,
     fullPath,
+    pathSegments,
     fullIdPath,
     context,
     highlightEntity,
@@ -20649,6 +20844,7 @@ const editEntityAction = {
       addRecentId(collection.id, entity.id);
     }
     const path = collection?.collectionGroup ? entity.path : fullPath ?? collection?.path ?? entity.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 : void 0, {
       status: "existing",
@@ -20659,6 +20855,7 @@ const editEntityAction = {
       collection,
       entityId: entity.id,
       path,
+      pathSegments: resolvedPathSegments,
       fullIdPath: newFullIdPath,
       sideEntityController: context.sideEntityController,
       onClose: () => unhighlightEntity?.(entity),
@@ -20680,6 +20877,8 @@ const copyEntityAction = {
     collection,
     context,
     fullPath,
+    pathSegments,
+    fullIdPath,
     highlightEntity,
     unhighlightEntity,
     openEntityMode
@@ -20693,13 +20892,15 @@ const copyEntityAction = {
       entityId: entity.id
     });
     const path = collection?.collectionGroup ? collection.path : fullPath ?? collection?.path ?? entity.path;
-    const fullIdPath = collection?.collectionGroup ? collection.id : fullPath ?? collection?.id ?? entity.path;
+    const resolvedPathSegments = collection?.collectionGroup ? void 0 : pathSegments ?? entity.pathSegments;
+    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),
@@ -20754,6 +20955,7 @@ function ReferenceSelectionTable({
   multiselect,
   collection,
   path: pathInput,
+  pathSegments,
   selectedEntityIds: selectedEntityIdsProp,
   description,
   forceFilter,
@@ -20768,7 +20970,7 @@ function ReferenceSelectionTable({
   const navigation = useNavigationController();
   const analyticsController = useAnalyticsController();
   const customizationController = useCustomizationController();
-  const fullPath = navigation.resolveIdsFrom(pathInput);
+  const fullPath = navigation.resolveIdsFrom(pathInput, pathSegments);
   const dataSource = useDataSource();
   const [entitiesDisplayedFirst, setEntitiesDisplayedFirst] = useState([]);
   const toggleEntitySelection = (entity) => {
@@ -20796,6 +20998,7 @@ function ReferenceSelectionTable({
     if (selectedEntityIds && collection) {
       Promise.all(selectedEntityIds.map((entityId) => dataSource.fetchEntity({
         path: fullPath,
+        pathSegments,
         entityId,
         collection
       }))).then((entities) => {
@@ -20842,6 +21045,7 @@ function ReferenceSelectionTable({
     });
     sideEntityController.open({
       path: fullPath,
+      pathSegments,
       collection,
       updateUrl: true,
       onUpdate: ({
@@ -20891,6 +21095,7 @@ function ReferenceSelectionTable({
     onTextSearchClick,
     textSearchEnabled
   } = useTableSearchHelper({
+    pathSegments,
     collection,
     fullPath
   });
@@ -20902,7 +21107,7 @@ function ReferenceSelectionTable({
       }) : t("select_from", {
         name: collection.name
       })
-    ] }), defaultSize: collection.defaultSize, properties: resolvedCollection.properties, forceFilter, inlineEditing: false, selectionController, actions: /* @__PURE__ */ jsx(ReferenceDialogActions, { collection, path: fullPath, onNewClick, onClear }) }) }),
+    ] }), defaultSize: collection.defaultSize, properties: resolvedCollection.properties, forceFilter, inlineEditing: false, selectionController, actions: /* @__PURE__ */ jsx(ReferenceDialogActions, { collection, path: fullPath, pathSegments, onNewClick, onClear }) }) }),
     /* @__PURE__ */ jsxs(DialogActions, { translucent: false, children: [
       description && /* @__PURE__ */ jsx(Typography, { variant: "body2", className: "flex-grow text-left", children: description }),
       /* @__PURE__ */ jsx(Button, { onClick: onDone, variant: "filled", children: t("done") })
@@ -20910,10 +21115,11 @@ function ReferenceSelectionTable({
   ] });
 }
 function ReferenceDialogActions(t0) {
-  const $ = c(17);
+  const $ = c(18);
   const {
     collection,
     path,
+    pathSegments,
     onClear,
     onNewClick
   } = t0;
@@ -20935,8 +21141,8 @@ function ReferenceDialogActions(t0) {
   }
   const onClick = t1;
   let t2;
-  if ($[2] !== authController || $[3] !== collection || $[4] !== largeLayout || $[5] !== onClick || $[6] !== path || $[7] !== t) {
-    t2 = canCreateEntity(collection, authController, path, null) && onClick && (largeLayout ? /* @__PURE__ */ jsx(Button, { onClick, startIcon: /* @__PURE__ */ jsx(AddIcon, {}), children: t("add_specific", {
+  if ($[2] !== authController || $[3] !== collection || $[4] !== largeLayout || $[5] !== onClick || $[6] !== path || $[7] !== pathSegments || $[8] !== t) {
+    t2 = canCreateEntity(collection, authController, path, null, pathSegments) && onClick && (largeLayout ? /* @__PURE__ */ jsx(Button, { onClick, startIcon: /* @__PURE__ */ jsx(AddIcon, {}), children: t("add_specific", {
       name: collection.singularName ?? collection.name
     }) }) : /* @__PURE__ */ jsx(Button, { onClick, children: /* @__PURE__ */ jsx(AddIcon, {}) }));
     $[2] = authController;
@@ -20944,40 +21150,41 @@ function ReferenceDialogActions(t0) {
     $[4] = largeLayout;
     $[5] = onClick;
     $[6] = path;
-    $[7] = t;
-    $[8] = t2;
+    $[7] = pathSegments;
+    $[8] = t;
+    $[9] = t2;
   } else {
-    t2 = $[8];
+    t2 = $[9];
   }
   const addButton = t2;
   let t3;
-  if ($[9] !== t) {
+  if ($[10] !== t) {
     t3 = t("clear");
-    $[9] = t;
-    $[10] = t3;
+    $[10] = t;
+    $[11] = t3;
   } else {
-    t3 = $[10];
+    t3 = $[11];
   }
   let t4;
-  if ($[11] !== onClear || $[12] !== t3) {
+  if ($[12] !== onClear || $[13] !== t3) {
     t4 = /* @__PURE__ */ jsx(Button, { onClick: onClear, variant: "text", children: t3 });
-    $[11] = onClear;
-    $[12] = t3;
-    $[13] = t4;
+    $[12] = onClear;
+    $[13] = t3;
+    $[14] = t4;
   } else {
-    t4 = $[13];
+    t4 = $[14];
   }
   let t5;
-  if ($[14] !== addButton || $[15] !== t4) {
+  if ($[15] !== addButton || $[16] !== t4) {
     t5 = /* @__PURE__ */ jsxs(Fragment, { children: [
       t4,
       addButton
     ] });
-    $[14] = addButton;
-    $[15] = t4;
-    $[16] = t5;
+    $[15] = addButton;
+    $[16] = t4;
+    $[17] = t5;
   } else {
-    t5 = $[16];
+    t5 = $[17];
   }
   return t5;
 }
@@ -22893,7 +23100,7 @@ const useBreadcrumbsController = () => {
   return useContext(BreadcrumbContext);
 };
 function EntityCollectionViewActions(t0) {
-  const $ = c(45);
+  const $ = c(48);
   const {
     collection,
     relativePath,
@@ -22902,6 +23109,7 @@ function EntityCollectionViewActions(t0) {
     onMultipleDeleteClick,
     selectionEnabled,
     path,
+    pathSegments,
     selectionController,
     tableController,
     collectionEntitiesCount
@@ -22924,8 +23132,8 @@ function EntityCollectionViewActions(t0) {
   const largeLayout = useLargeLayout();
   const selectedEntities = selectionController.selectedEntities;
   let t2;
-  if ($[2] !== authController || $[3] !== collection || $[4] !== largeLayout || $[5] !== onNewClick || $[6] !== path || $[7] !== t) {
-    t2 = canCreateEntity(collection, authController, path, null) && onNewClick && (largeLayout ? /* @__PURE__ */ jsxs(Button, { id: `add_entity_${path}`, onClick: onNewClick, startIcon: /* @__PURE__ */ jsx(AddIcon, { size: "small" }), variant: "filled", color: "primary", children: [
+  if ($[2] !== authController || $[3] !== collection || $[4] !== largeLayout || $[5] !== onNewClick || $[6] !== path || $[7] !== pathSegments || $[8] !== t) {
+    t2 = canCreateEntity(collection, authController, path, null, pathSegments) && onNewClick && (largeLayout ? /* @__PURE__ */ jsxs(Button, { id: `add_entity_${path}`, onClick: onNewClick, startIcon: /* @__PURE__ */ jsx(AddIcon, { size: "small" }), variant: "filled", color: "primary", children: [
       t("add"),
       " ",
       collection.singularName ?? collection.name
@@ -22935,65 +23143,68 @@ function EntityCollectionViewActions(t0) {
     $[4] = largeLayout;
     $[5] = onNewClick;
     $[6] = path;
-    $[7] = t;
-    $[8] = t2;
+    $[7] = pathSegments;
+    $[8] = t;
+    $[9] = t2;
   } else {
-    t2 = $[8];
+    t2 = $[9];
   }
   const addButton = t2;
   let t3;
-  if ($[9] !== authController || $[10] !== collection || $[11] !== path) {
-    t3 = canDeleteEntity(collection, authController, path, null);
-    $[9] = authController;
-    $[10] = collection;
-    $[11] = path;
-    $[12] = t3;
+  if ($[10] !== authController || $[11] !== collection || $[12] !== path || $[13] !== pathSegments) {
+    t3 = canDeleteEntity(collection, authController, path, null, pathSegments);
+    $[10] = authController;
+    $[11] = collection;
+    $[12] = path;
+    $[13] = pathSegments;
+    $[14] = t3;
   } else {
-    t3 = $[12];
+    t3 = $[14];
   }
   const multipleDeleteEnabled = t3;
   let multipleDeleteButton;
   if (selectionEnabled) {
     let t42;
-    if ($[13] !== largeLayout || $[14] !== multipleDeleteEnabled || $[15] !== onMultipleDeleteClick || $[16] !== selectedEntities?.length) {
+    if ($[15] !== largeLayout || $[16] !== multipleDeleteEnabled || $[17] !== onMultipleDeleteClick || $[18] !== selectedEntities?.length) {
       t42 = largeLayout ? /* @__PURE__ */ jsxs(Button, { variant: "text", disabled: !selectedEntities?.length || !multipleDeleteEnabled, startIcon: /* @__PURE__ */ jsx(DeleteIcon, { size: "small" }), onClick: onMultipleDeleteClick, color: "primary", className: "lg:w-20", children: [
         "(",
         selectedEntities?.length,
         ")"
       ] }) : /* @__PURE__ */ jsx(IconButton, { size: "small", color: "primary", disabled: !selectedEntities?.length || !multipleDeleteEnabled, onClick: onMultipleDeleteClick, children: /* @__PURE__ */ jsx(DeleteIcon, { size: "small" }) });
-      $[13] = largeLayout;
-      $[14] = multipleDeleteEnabled;
-      $[15] = onMultipleDeleteClick;
-      $[16] = selectedEntities?.length;
-      $[17] = t42;
+      $[15] = largeLayout;
+      $[16] = multipleDeleteEnabled;
+      $[17] = onMultipleDeleteClick;
+      $[18] = selectedEntities?.length;
+      $[19] = t42;
     } else {
-      t42 = $[17];
+      t42 = $[19];
     }
     const button = t42;
     let t52;
-    if ($[18] !== multipleDeleteEnabled || $[19] !== t) {
+    if ($[20] !== multipleDeleteEnabled || $[21] !== t) {
       t52 = multipleDeleteEnabled ? t("delete_selected") : t("cannot_delete_selected");
-      $[18] = multipleDeleteEnabled;
-      $[19] = t;
-      $[20] = t52;
+      $[20] = multipleDeleteEnabled;
+      $[21] = t;
+      $[22] = t52;
     } else {
-      t52 = $[20];
+      t52 = $[22];
     }
     let t62;
-    if ($[21] !== button || $[22] !== t52) {
+    if ($[23] !== button || $[24] !== t52) {
       t62 = /* @__PURE__ */ jsx(Tooltip, { title: t52, children: button });
-      $[21] = button;
-      $[22] = t52;
-      $[23] = t62;
+      $[23] = button;
+      $[24] = t52;
+      $[25] = t62;
     } else {
-      t62 = $[23];
+      t62 = $[25];
     }
     multipleDeleteButton = t62;
   }
   let t4;
-  if ($[24] !== collection || $[25] !== collectionEntitiesCount || $[26] !== context || $[27] !== parentCollectionIds || $[28] !== path || $[29] !== relativePath || $[30] !== selectionController || $[31] !== tableController) {
+  if ($[26] !== collection || $[27] !== collectionEntitiesCount || $[28] !== context || $[29] !== parentCollectionIds || $[30] !== path || $[31] !== pathSegments || $[32] !== relativePath || $[33] !== selectionController || $[34] !== tableController) {
     t4 = {
       path,
+      pathSegments,
       relativePath,
       parentCollectionIds,
       collection,
@@ -23002,28 +23213,29 @@ function EntityCollectionViewActions(t0) {
       tableController,
       collectionEntitiesCount
     };
-    $[24] = collection;
-    $[25] = collectionEntitiesCount;
-    $[26] = context;
-    $[27] = parentCollectionIds;
-    $[28] = path;
-    $[29] = relativePath;
-    $[30] = selectionController;
-    $[31] = tableController;
-    $[32] = t4;
+    $[26] = collection;
+    $[27] = collectionEntitiesCount;
+    $[28] = context;
+    $[29] = parentCollectionIds;
+    $[30] = path;
+    $[31] = pathSegments;
+    $[32] = relativePath;
+    $[33] = selectionController;
+    $[34] = tableController;
+    $[35] = t4;
   } else {
-    t4 = $[32];
+    t4 = $[35];
   }
   const actionProps = t4;
   let actions;
-  if ($[33] !== actionProps || $[34] !== collection.Actions || $[35] !== plugins) {
+  if ($[36] !== actionProps || $[37] !== collection.Actions || $[38] !== plugins) {
     let t52;
-    if ($[37] !== actionProps) {
+    if ($[40] !== actionProps) {
       t52 = (Action, i) => /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(Action, { ...actionProps }) }, `actions_${i}`);
-      $[37] = actionProps;
-      $[38] = t52;
+      $[40] = actionProps;
+      $[41] = t52;
     } else {
-      t52 = $[38];
+      t52 = $[41];
     }
     actions = toArray(collection.Actions).map(t52);
     if (plugins) {
@@ -23033,34 +23245,34 @@ function EntityCollectionViewActions(t0) {
         }
       });
     }
-    $[33] = actionProps;
-    $[34] = collection.Actions;
-    $[35] = plugins;
-    $[36] = actions;
+    $[36] = actionProps;
+    $[37] = collection.Actions;
+    $[38] = plugins;
+    $[39] = actions;
   } else {
-    actions = $[36];
+    actions = $[39];
   }
   let t5;
-  if ($[39] !== actions) {
+  if ($[42] !== actions) {
     t5 = /* @__PURE__ */ jsx(ErrorBoundary, { children: actions });
-    $[39] = actions;
-    $[40] = t5;
+    $[42] = actions;
+    $[43] = t5;
   } else {
-    t5 = $[40];
+    t5 = $[43];
   }
   let t6;
-  if ($[41] !== addButton || $[42] !== multipleDeleteButton || $[43] !== t5) {
+  if ($[44] !== addButton || $[45] !== multipleDeleteButton || $[46] !== t5) {
     t6 = /* @__PURE__ */ jsxs(Fragment, { children: [
       t5,
       multipleDeleteButton,
       addButton
     ] });
-    $[41] = addButton;
-    $[42] = multipleDeleteButton;
-    $[43] = t5;
-    $[44] = t6;
+    $[44] = addButton;
+    $[45] = multipleDeleteButton;
+    $[46] = t5;
+    $[47] = t6;
   } else {
-    t6 = $[44];
+    t6 = $[47];
   }
   return t6;
 }
@@ -24394,6 +24606,7 @@ const EntityBoardCard = memo(EntityBoardCardInner);
 const DEFAULT_PAGE_SIZE = 20;
 function useBoardDataController({
   fullPath,
+  pathSegments,
   collection,
   columnProperty,
   columns,
@@ -24405,7 +24618,8 @@ function useBoardDataController({
   const context = useFireCMSContext();
   const dataSource = useDataSource();
   const navigation = useNavigationController();
-  const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
+  const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath, pathSegments), [fullPath, pathSegments, navigation.resolveIdsFrom]);
+  const resolvedPathSegments = useMemo(() => pathSegments ? navigation.resolveSegmentsFrom?.(pathSegments) ?? pathSegments : void 0, [pathSegments, navigation.resolveSegmentsFrom]);
   const dataSourceRef = useRef(dataSource);
   const collectionRef = useRef(collection);
   const contextRef = useRef(context);
@@ -24417,11 +24631,13 @@ function useBoardDataController({
   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;
   const [columnItemCounts, setColumnItemCounts] = useState(() => {
     const initial = {};
     columns.forEach((col) => {
@@ -24468,6 +24684,7 @@ function useBoardDataController({
     const currentOrderProperty = orderPropertyRef.current;
     const currentSearchString = searchStringRef.current;
     const currentResolvedPath = resolvedPathRef.current;
+    const currentPathSegments = resolvedPathSegmentsRef.current;
     const columnFilter = {
       ...currentFilterValues,
       [currentColumnProperty]: ["==", column]
@@ -24488,6 +24705,7 @@ function useBoardDataController({
           processed = await Promise.all(processed.map((entity) => currentCollection.callbacks.onFetch({
             collection: currentCollection,
             path: currentResolvedPath,
+            pathSegments: currentPathSegments,
             entity,
             context: currentContext
           })));
@@ -24524,6 +24742,7 @@ function useBoardDataController({
     if (currentDataSource.listenCollection) {
       const unsubscribe = currentDataSource.listenCollection({
         path: currentResolvedPath,
+        pathSegments: currentPathSegments,
         collection: currentCollection,
         onUpdate,
         onError,
@@ -24538,6 +24757,7 @@ function useBoardDataController({
     } else {
       currentDataSource.fetchCollection({
         path: currentResolvedPath,
+        pathSegments: currentPathSegments,
         collection: currentCollection,
         searchString: currentSearchString,
         filter: columnFilter,
@@ -24566,6 +24786,7 @@ function useBoardDataController({
     const currentColumnProperty = columnPropertyRef.current;
     const currentSearchString = searchStringRef.current;
     const currentResolvedPath = resolvedPathRef.current;
+    const currentPathSegments = resolvedPathSegmentsRef.current;
     const currentColumns = columns;
     const currentColumnItemCounts = columnItemCounts;
     const timeoutId = setTimeout(() => {
@@ -24580,6 +24801,7 @@ function useBoardDataController({
           };
           currentDataSource.countEntities({
             path: currentResolvedPath,
+            pathSegments: currentPathSegments,
             collection: currentCollection,
             filter: columnFilter,
             searchString: currentSearchString
@@ -24824,6 +25046,7 @@ function EntityCollectionBoardView({
   collection,
   tableController,
   fullPath,
+  pathSegments,
   parentCollectionIds = [],
   columnProperty,
   onEntityClick,
@@ -24917,6 +25140,7 @@ function EntityCollectionBoardView({
   const columns = localColumnsOrder;
   const boardDataController = useBoardDataController({
     fullPath,
+    pathSegments,
     collection,
     columnProperty,
     columns,
@@ -24990,6 +25214,7 @@ function EntityCollectionBoardView({
     let completed = 0;
     currentDataSource.countEntities({
       path: fullPath,
+      pathSegments,
       collection: currentCollection
     }).then((count) => {
       totalCount = count;
@@ -25000,6 +25225,7 @@ function EntityCollectionBoardView({
     }).catch((e) => console.warn("Failed to get total count:", e));
     currentDataSource.countEntities({
       path: fullPath,
+      pathSegments,
       collection: currentCollection,
       filter: {
         [orderProperty]: ["!=", null]
@@ -25107,6 +25333,8 @@ function EntityCollectionBoardView({
     }
     const saveProps = {
       path: entity_2.path,
+      // Paired with `entity.path`: the segments the entity was loaded with.
+      pathSegments: entity_2.pathSegments,
       entityId: entity_2.id,
       values: updatedValues,
       previousValues: entity_2.values,
@@ -25144,6 +25372,7 @@ function EntityCollectionBoardView({
       console.log("Fetching all documents from collection...");
       const allDocs = await dataSource.fetchCollection({
         path: fullPath,
+        pathSegments,
         collection,
         limit: 1e4
         // Fetch all
@@ -25162,6 +25391,8 @@ function EntityCollectionBoardView({
         }, orderProperty, index);
         const saveProps_0 = {
           path: entity_4.path,
+          // Paired with `entity.path`: the segments the entity was loaded with.
+          pathSegments: entity_4.pathSegments,
           entityId: entity_4.id,
           values: updatedValues_0,
           previousValues: entity_4.values,
@@ -25247,6 +25478,7 @@ function EntityCollectionBoardView({
       });
       sideEntityController.open({
         path: fullPath,
+        pathSegments,
         collection,
         entityId: void 0,
         updateUrl: true,
@@ -25462,7 +25694,7 @@ function PopupFormField(props) {
   return t0;
 }
 function PopupFormFieldLoading(t0) {
-  const $ = c(21);
+  const $ = c(22);
   const {
     tableKey,
     entityId,
@@ -25470,6 +25702,7 @@ function PopupFormFieldLoading(t0) {
     propertyKey,
     collection: inputCollection,
     path,
+    pathSegments,
     cellRect,
     open,
     onClose,
@@ -25480,33 +25713,35 @@ function PopupFormFieldLoading(t0) {
   const [entity, setEntity] = useState(void 0);
   let t1;
   let t2;
-  if ($[0] !== dataSource || $[1] !== entityId || $[2] !== inputCollection || $[3] !== path) {
+  if ($[0] !== dataSource || $[1] !== entityId || $[2] !== inputCollection || $[3] !== path || $[4] !== pathSegments) {
     t1 = () => {
       if (entityId && inputCollection) {
         dataSource.fetchEntity({
           path,
+          pathSegments,
           entityId,
           collection: inputCollection
         }).then(setEntity);
       }
     };
-    t2 = [entityId, inputCollection, dataSource, path];
+    t2 = [entityId, inputCollection, dataSource, path, pathSegments];
     $[0] = dataSource;
     $[1] = entityId;
     $[2] = inputCollection;
     $[3] = path;
-    $[4] = t1;
-    $[5] = t2;
+    $[4] = pathSegments;
+    $[5] = t1;
+    $[6] = t2;
   } else {
-    t1 = $[4];
-    t2 = $[5];
+    t1 = $[5];
+    t2 = $[6];
   }
   useEffect(t1, t2);
   if (!entity) {
     return null;
   }
   let t3;
-  if ($[6] !== cellRect || $[7] !== container || $[8] !== customFieldValidator || $[9] !== entityId || $[10] !== inputCollection || $[11] !== onCellValueChange || $[12] !== onClose || $[13] !== open || $[14] !== path || $[15] !== propertyKey || $[16] !== tableKey) {
+  if ($[7] !== cellRect || $[8] !== container || $[9] !== customFieldValidator || $[10] !== entityId || $[11] !== inputCollection || $[12] !== onCellValueChange || $[13] !== onClose || $[14] !== open || $[15] !== path || $[16] !== propertyKey || $[17] !== tableKey) {
     t3 = {
       tableKey,
       entityId,
@@ -25520,29 +25755,29 @@ function PopupFormFieldLoading(t0) {
       onCellValueChange,
       container
     };
-    $[6] = cellRect;
-    $[7] = container;
-    $[8] = customFieldValidator;
-    $[9] = entityId;
-    $[10] = inputCollection;
-    $[11] = onCellValueChange;
-    $[12] = onClose;
-    $[13] = open;
-    $[14] = path;
-    $[15] = propertyKey;
-    $[16] = tableKey;
-    $[17] = t3;
+    $[7] = cellRect;
+    $[8] = container;
+    $[9] = customFieldValidator;
+    $[10] = entityId;
+    $[11] = inputCollection;
+    $[12] = onCellValueChange;
+    $[13] = onClose;
+    $[14] = open;
+    $[15] = path;
+    $[16] = propertyKey;
+    $[17] = tableKey;
+    $[18] = t3;
   } else {
-    t3 = $[17];
+    t3 = $[18];
   }
   let t4;
-  if ($[18] !== entity || $[19] !== t3) {
+  if ($[19] !== entity || $[20] !== t3) {
     t4 = /* @__PURE__ */ jsx(PopupFormFieldInternal, { ...t3, entity });
-    $[18] = entity;
-    $[19] = t3;
-    $[20] = t4;
+    $[19] = entity;
+    $[20] = t3;
+    $[21] = t4;
   } else {
-    t4 = $[20];
+    t4 = $[21];
   }
   return t4;
 }
@@ -25941,12 +26176,13 @@ function FiltersDialog({
   ] });
 }
 function EntityCollectionViewStartActions(t0) {
-  const $ = c(37);
+  const $ = c(38);
   const {
     collection,
     relativePath,
     parentCollectionIds,
     path,
+    pathSegments,
     selectionController,
     tableController,
     collectionEntitiesCount,
@@ -25981,9 +26217,10 @@ function EntityCollectionViewStartActions(t0) {
   }
   const activeFilterCount = t2;
   let t3;
-  if ($[5] !== collection || $[6] !== collectionEntitiesCount || $[7] !== context || $[8] !== parentCollectionIds || $[9] !== path || $[10] !== relativePath || $[11] !== selectionController || $[12] !== tableController) {
+  if ($[5] !== collection || $[6] !== collectionEntitiesCount || $[7] !== context || $[8] !== parentCollectionIds || $[9] !== path || $[10] !== pathSegments || $[11] !== relativePath || $[12] !== selectionController || $[13] !== tableController) {
     t3 = {
       path,
+      pathSegments,
       relativePath,
       parentCollectionIds,
       collection,
@@ -25997,44 +26234,45 @@ function EntityCollectionViewStartActions(t0) {
     $[7] = context;
     $[8] = parentCollectionIds;
     $[9] = path;
-    $[10] = relativePath;
-    $[11] = selectionController;
-    $[12] = tableController;
-    $[13] = t3;
+    $[10] = pathSegments;
+    $[11] = relativePath;
+    $[12] = selectionController;
+    $[13] = tableController;
+    $[14] = t3;
   } else {
-    t3 = $[13];
+    t3 = $[14];
   }
   const actionProps = t3;
   const hasAnyAllowedFilters = !tableController.allowedFilters || tableController.allowedFilters.length > 0;
   let t4;
-  if ($[14] !== activeFilterCount || $[15] !== hasAnyAllowedFilters || $[16] !== largeLayout || $[17] !== resolvedProperties || $[18] !== t || $[19] !== tableController.setFilterValues) {
+  if ($[15] !== activeFilterCount || $[16] !== hasAnyAllowedFilters || $[17] !== largeLayout || $[18] !== resolvedProperties || $[19] !== t || $[20] !== tableController.setFilterValues) {
     t4 = resolvedProperties && tableController.setFilterValues && hasAnyAllowedFilters && /* @__PURE__ */ jsx(Tooltip, { title: t("filters"), children: /* @__PURE__ */ jsx(Badge, { color: "primary", invisible: activeFilterCount === 0, children: largeLayout ? /* @__PURE__ */ jsxs(Button, { variant: "text", size: "small", onClick: () => setFiltersDialogOpen(true), startIcon: /* @__PURE__ */ jsx(FilterListIcon, { size: "small" }), className: cls(activeFilterCount > 0 && "text-primary"), children: [
       t("filters"),
       activeFilterCount > 0 ? ` (${activeFilterCount})` : ""
     ] }) : /* @__PURE__ */ jsx(IconButton, { size: "small", onClick: () => setFiltersDialogOpen(true), className: cls(activeFilterCount > 0 && "text-primary"), children: /* @__PURE__ */ jsx(FilterListIcon, { size: "small" }) }) }) }, "filters_tooltip");
-    $[14] = activeFilterCount;
-    $[15] = hasAnyAllowedFilters;
-    $[16] = largeLayout;
-    $[17] = resolvedProperties;
-    $[18] = t;
-    $[19] = tableController.setFilterValues;
-    $[20] = t4;
+    $[15] = activeFilterCount;
+    $[16] = hasAnyAllowedFilters;
+    $[17] = largeLayout;
+    $[18] = resolvedProperties;
+    $[19] = t;
+    $[20] = tableController.setFilterValues;
+    $[21] = t4;
   } else {
-    t4 = $[20];
+    t4 = $[21];
   }
   const filtersButton = t4;
   const t5 = !collection.forceFilter;
   let t6;
-  if ($[21] !== t5 || $[22] !== tableController) {
+  if ($[22] !== t5 || $[23] !== tableController) {
     t6 = /* @__PURE__ */ jsx(ClearFilterSortButton, { tableController, enabled: t5 }, "clear_filter");
-    $[21] = t5;
-    $[22] = tableController;
-    $[23] = t6;
+    $[22] = t5;
+    $[23] = tableController;
+    $[24] = t6;
   } else {
-    t6 = $[23];
+    t6 = $[24];
   }
   let actions;
-  if ($[24] !== actionProps || $[25] !== filtersButton || $[26] !== plugins || $[27] !== t6) {
+  if ($[25] !== actionProps || $[26] !== filtersButton || $[27] !== plugins || $[28] !== t6) {
     actions = [filtersButton, t6];
     if (plugins) {
       plugins.forEach((plugin, i) => {
@@ -26043,36 +26281,36 @@ function EntityCollectionViewStartActions(t0) {
         }
       });
     }
-    $[24] = actionProps;
-    $[25] = filtersButton;
-    $[26] = plugins;
-    $[27] = t6;
-    $[28] = actions;
+    $[25] = actionProps;
+    $[26] = filtersButton;
+    $[27] = plugins;
+    $[28] = t6;
+    $[29] = actions;
   } else {
-    actions = $[28];
+    actions = $[29];
   }
   let t7;
-  if ($[29] !== collection.forceFilter || $[30] !== filtersDialogOpen || $[31] !== resolvedProperties || $[32] !== tableController) {
+  if ($[30] !== collection.forceFilter || $[31] !== filtersDialogOpen || $[32] !== resolvedProperties || $[33] !== tableController) {
     t7 = resolvedProperties && tableController.setFilterValues && /* @__PURE__ */ jsx(FiltersDialog, { open: filtersDialogOpen, onOpenChange: setFiltersDialogOpen, properties: resolvedProperties, filterValues: tableController.filterValues, setFilterValues: (filterValues_0) => tableController.setFilterValues?.(filterValues_0 ?? {}), forceFilter: collection.forceFilter, allowedFilters: tableController.allowedFilters?.map(_temp$g) });
-    $[29] = collection.forceFilter;
-    $[30] = filtersDialogOpen;
-    $[31] = resolvedProperties;
-    $[32] = tableController;
-    $[33] = t7;
+    $[30] = collection.forceFilter;
+    $[31] = filtersDialogOpen;
+    $[32] = resolvedProperties;
+    $[33] = tableController;
+    $[34] = t7;
   } else {
-    t7 = $[33];
+    t7 = $[34];
   }
   let t8;
-  if ($[34] !== actions || $[35] !== t7) {
+  if ($[35] !== actions || $[36] !== t7) {
     t8 = /* @__PURE__ */ jsxs(Fragment, { children: [
       actions,
       t7
     ] });
-    $[34] = actions;
-    $[35] = t7;
-    $[36] = t8;
+    $[35] = actions;
+    $[36] = t7;
+    $[37] = t8;
   } else {
-    t8 = $[36];
+    t8 = $[37];
   }
   return t8;
 }
@@ -26150,7 +26388,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
   useEffect(() => {
     collectionRef.current = collection;
   }, [collection]);
-  const canCreateEntities = canCreateEntity(collection, authController, fullPath, null);
+  const canCreateEntities = canCreateEntity(collection, authController, fullPath, null, pathSegments);
   const [highlightedEntity, setHighlightedEntity] = useState(void 0);
   const [deleteEntityClicked, setDeleteEntityClicked] = React__default.useState(void 0);
   const [lastDeleteTimestamp, setLastDeleteTimestamp] = React__default.useState(0);
@@ -26168,7 +26406,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
   }, [highlightedEntity]);
   const checkInlineEditing = useCallback((entity) => {
     const collection_0 = collectionRef.current;
-    if (!canEditEntity(collection_0, authController, fullPath, entity ?? null)) {
+    if (!canEditEntity(collection_0, authController, fullPath, entity ?? null, pathSegments)) {
       return false;
     }
     return collection_0.inlineEditing === void 0 || collection_0.inlineEditing;
@@ -26258,10 +26496,12 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
     if (collection_1) {
       addRecentId(collection_1.id, clickedEntity.id);
     }
-    const path = collection_1?.collectionGroup ? clickedEntity.path : fullPath ?? clickedEntity.path;
+    const isCollectionGroup = Boolean(collection_1?.collectionGroup);
+    const path = isCollectionGroup ? clickedEntity.path : fullPath ?? clickedEntity.path;
     navigateToEntity({
       navigation,
       path,
+      pathSegments: isCollectionGroup ? clickedEntity.pathSegments : pathSegments ?? clickedEntity.pathSegments,
       fullIdPath,
       sideEntityController,
       openEntityMode,
@@ -26349,13 +26589,13 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
       });
     }
   }, [setViewMode, userConfigPersistence, onCollectionModifiedForUser, fullPath, analyticsController, viewMode]);
-  const createEnabled = canCreateEntity(collection, authController, fullPath, null);
+  const createEnabled = canCreateEntity(collection, authController, fullPath, null, pathSegments);
   const uniqueFieldValidator = useCallback(({
     name,
     value,
     property,
     entityId
-  }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection), [fullPath]);
+  }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection, pathSegments), [fullPath, pathSegments]);
   const onValueChange = ({
     value: value_0,
     propertyKey,
@@ -26368,6 +26608,8 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
     }, propertyKey, value_0);
     const saveProps = {
       path: entity_1.path ?? fullPath,
+      // Paired with the `path` above: the row's segments describe the row's path.
+      pathSegments: entity_1.path ? entity_1.pathSegments : pathSegments,
       entityId: entity_1.id,
       values: updatedValues,
       previousValues: entity_1.values,
@@ -26395,7 +26637,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
       }
     });
   };
-  const resolvedFullPath = navigation.resolveIdsFrom(fullPath);
+  const resolvedFullPath = navigation.resolveIdsFrom(fullPath, pathSegments);
   const resolvedCollection = useMemo(() => resolveCollection({
     collection,
     path: fullPath,
@@ -26524,9 +26766,9 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
       Builder: ({
         entity: entity_4
       }) => {
-        const collectionsWithPath = navigation.getParentReferencesFromPath(entity_4.path);
+        const collectionsWithPath = navigation.getParentReferencesFromPath(entity_4.path, entity_4.pathSegments);
         return /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2 w-full", children: collectionsWithPath.map((reference) => {
-          return /* @__PURE__ */ jsx(ReferencePreview, { reference, size: "small" }, reference.path + "/" + reference.id);
+          return /* @__PURE__ */ jsx(ReferencePreview, { reference, size: "small" }, entityCacheKey(reference.path, reference.id));
         }) });
       }
     }] : [];
@@ -26540,7 +26782,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
     entity: entity_5,
     customEntityActions
   }) => {
-    const deleteEnabled = entity_5 ? canDeleteEntity(collection, authController, fullPath, entity_5) : true;
+    const deleteEnabled = entity_5 ? canDeleteEntity(collection, authController, fullPath, entity_5, entity_5.pathSegments ?? pathSegments) : true;
     const actions = [{
       ...editEntityAction,
       name: t("edit")
@@ -26582,7 +26824,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
       breadcrumbs.updateCount(fullPath, docsCount);
     }
   }, [docsCount, fullPath, breadcrumbs.updateCount]);
-  const countFetcher = /* @__PURE__ */ jsx(EntitiesCount, { fullPath, collection, filter: tableController.filterValues, sortBy: tableController.sortBy, onCountChange: setDocsCount });
+  const countFetcher = /* @__PURE__ */ jsx(EntitiesCount, { fullPath, pathSegments, collection, filter: tableController.filterValues, sortBy: tableController.sortBy, onCountChange: setDocsCount });
   const buildAdditionalHeaderWidget = useCallback(({
     property: property_2,
     propertyKey: propertyKey_1,
@@ -26605,6 +26847,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
     onTextSearchClick,
     textSearchEnabled
   } = useTableSearchHelper({
+    pathSegments,
     collection,
     fullPath: resolvedFullPath,
     parentCollectionIds,
@@ -26628,8 +26871,8 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
   }, [tableController.dataLoadingError, customizationController.plugins, fullPath, collection, parentCollectionIds]);
   return /* @__PURE__ */ jsxs("div", { className: cls("overflow-hidden h-full w-full rounded-md flex flex-col", className), ref: containerRef, children: [
     countFetcher,
-    /* @__PURE__ */ jsx(CollectionTableToolbar, { loading: tableController.dataLoading, onTextSearch: textSearchEnabled && textSearchInitialised ? tableController.setSearchString : void 0, onTextSearchClick: textSearchEnabled && !textSearchInitialised ? onTextSearchClick : void 0, initialSearchString: tableController.searchString, textSearchLoading, viewModeToggle: viewModeToggleElement, actionsStart: /* @__PURE__ */ jsx(EntityCollectionViewStartActions, { parentCollectionIds: parentCollectionIds ?? [], collection, tableController, path: fullPath, relativePath: collection.path, selectionController: usedSelectionController, collectionEntitiesCount: docsCount, resolvedProperties: resolvedCollection.properties }), actions: /* @__PURE__ */ jsx(EntityCollectionViewActions, { parentCollectionIds: parentCollectionIds ?? [], collection, tableController, onMultipleDeleteClick, onNewClick, path: fullPath, relativePath: collection.path, selectionController: usedSelectionController, selectionEnabled, collectionEntitiesCount: docsCount }) }),
-    tableController.dataLoadingError ? pluginErrorView ?? /* @__PURE__ */ jsx(CollectionDataErrorBanner, { error: tableController.dataLoadingError }) : viewMode === "kanban" && enabledViews.includes("kanban") ? /* @__PURE__ */ jsx(EntityCollectionBoardView, { collection, tableController, fullPath, parentCollectionIds, columnProperty: selectedKanbanProperty, onEntityClick, selectionController: usedSelectionController, selectionEnabled, highlightedEntities: highlightedEntity ? [highlightedEntity] : [], deletedEntities, emptyComponent: canCreateEntities && tableController.filterValues === void 0 && tableController.sortBy === void 0 ? /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-center justify-center", children: [
+    /* @__PURE__ */ jsx(CollectionTableToolbar, { loading: tableController.dataLoading, onTextSearch: textSearchEnabled && textSearchInitialised ? tableController.setSearchString : void 0, onTextSearchClick: textSearchEnabled && !textSearchInitialised ? onTextSearchClick : void 0, initialSearchString: tableController.searchString, textSearchLoading, viewModeToggle: viewModeToggleElement, actionsStart: /* @__PURE__ */ jsx(EntityCollectionViewStartActions, { parentCollectionIds: parentCollectionIds ?? [], collection, tableController, path: fullPath, pathSegments, relativePath: collection.path, selectionController: usedSelectionController, collectionEntitiesCount: docsCount, resolvedProperties: resolvedCollection.properties }), actions: /* @__PURE__ */ jsx(EntityCollectionViewActions, { parentCollectionIds: parentCollectionIds ?? [], collection, tableController, onMultipleDeleteClick, onNewClick, path: fullPath, pathSegments, relativePath: collection.path, selectionController: usedSelectionController, selectionEnabled, collectionEntitiesCount: docsCount }) }),
+    tableController.dataLoadingError ? pluginErrorView ?? /* @__PURE__ */ jsx(CollectionDataErrorBanner, { error: tableController.dataLoadingError }) : viewMode === "kanban" && enabledViews.includes("kanban") ? /* @__PURE__ */ jsx(EntityCollectionBoardView, { collection, tableController, fullPath, pathSegments, parentCollectionIds, columnProperty: selectedKanbanProperty, onEntityClick, selectionController: usedSelectionController, selectionEnabled, highlightedEntities: highlightedEntity ? [highlightedEntity] : [], deletedEntities, emptyComponent: canCreateEntities && tableController.filterValues === void 0 && tableController.sortBy === void 0 ? /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-center justify-center", children: [
       /* @__PURE__ */ jsx(Typography, { variant: "subtitle2", children: t("so_empty") }),
       /* @__PURE__ */ jsxs(Button, { onClick: onNewClick, className: "mt-4", children: [
         /* @__PURE__ */ jsx(AddIcon, {}),
@@ -26647,7 +26890,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
         /* @__PURE__ */ jsx(AddIcon, {}),
         t("create_your_first_entry")
       ] })
-    ] }) : /* @__PURE__ */ jsx(Typography, { variant: "label", children: t("no_results_filter_sort") }), hoverRow, inlineEditing: checkInlineEditing(), AdditionalHeaderWidget: buildAdditionalHeaderWidget, AddColumnComponent: addColumnComponentInternal, getIdColumnWidth, additionalIDHeaderWidget: /* @__PURE__ */ jsx(EntityIdHeaderWidget, { path: fullPath, fullIdPath: fullIdPath ?? fullPath, collection }), openEntityMode, onColumnsOrderChange: (newColumns) => {
+    ] }) : /* @__PURE__ */ jsx(Typography, { variant: "label", children: t("no_results_filter_sort") }), hoverRow, inlineEditing: checkInlineEditing(), AdditionalHeaderWidget: buildAdditionalHeaderWidget, AddColumnComponent: addColumnComponentInternal, getIdColumnWidth, additionalIDHeaderWidget: /* @__PURE__ */ jsx(EntityIdHeaderWidget, { path: fullPath, pathSegments, fullIdPath: fullIdPath ?? fullPath, collection }), openEntityMode, onColumnsOrderChange: (newColumns) => {
       const seenKeys = /* @__PURE__ */ new Set();
       const newPropertiesOrder = newColumns.filter((col) => !col.frozen && getPropertyInPath(collection.properties, col.key)).map((col_0) => col_0.key).filter((key_1) => {
         if (seenKeys.has(key_1)) return false;
@@ -26666,7 +26909,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
         });
       }
     } }, `collection_table_${fullPath}`),
-    popupCell && /* @__PURE__ */ jsx(PopupFormField, { open: Boolean(popupCell), onClose: onPopupClose, cellRect: popupCell?.cellRect, propertyKey: popupCell?.propertyKey, collection, entityId: popupCell.entityId, tableKey: tableKey.current, customFieldValidator: uniqueFieldValidator, path: resolvedFullPath, onCellValueChange: onValueChange, container: containerRef.current }, `popup_form_${popupCell?.propertyKey}_${popupCell?.entityId}`),
+    popupCell && /* @__PURE__ */ jsx(PopupFormField, { pathSegments, open: Boolean(popupCell), onClose: onPopupClose, cellRect: popupCell?.cellRect, propertyKey: popupCell?.propertyKey, collection, entityId: popupCell.entityId, tableKey: tableKey.current, customFieldValidator: uniqueFieldValidator, path: resolvedFullPath, onCellValueChange: onValueChange, container: containerRef.current }, `popup_form_${popupCell?.propertyKey}_${popupCell?.entityId}`),
     deleteEntityClicked && /* @__PURE__ */ jsx(DeleteEntityDialog, { entityOrEntitiesToDelete: deleteEntityClicked, path: fullPath, collection, callbacks: collection.callbacks, open: Boolean(deleteEntityClicked), onEntityDelete: internalOnEntityDelete, onMultipleEntitiesDelete: internalOnMultipleEntitiesDelete, onClose: () => setDeleteEntityClicked(void 0) })
   ] });
 }, (a, b) => {
@@ -26677,7 +26920,8 @@ function EntitiesCount({
   collection,
   filter,
   sortBy,
-  onCountChange
+  onCountChange,
+  pathSegments
 }) {
   const dataSource = useDataSource();
   const navigation = useNavigationController();
@@ -26685,16 +26929,18 @@ function EntitiesCount({
   const [error, setError] = useState(void 0);
   const sortByProperty = sortBy ? sortBy[0] : void 0;
   const currentSort = sortBy ? sortBy[1] : void 0;
-  const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
+  const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath, pathSegments), [fullPath, pathSegments, navigation.resolveIdsFrom]);
+  const resolvedPathSegments = useMemo(() => pathSegments ? navigation.resolveSegmentsFrom?.(pathSegments) ?? pathSegments : void 0, [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 !== void 0) {
       setError(void 0);
@@ -26724,10 +26970,11 @@ function buildPropertyWidthOverwrite(key, width) {
   };
 }
 function EntityIdHeaderWidget(t0) {
-  const $ = c(48);
+  const $ = c(50);
   const {
     collection,
     path,
+    pathSegments,
     fullIdPath
   } = t0;
   const navigation = useNavigationController();
@@ -26768,7 +27015,7 @@ function EntityIdHeaderWidget(t0) {
     t4 = $[6];
   }
   let t5;
-  if ($[7] !== collection || $[8] !== fullIdPath || $[9] !== navigation || $[10] !== openEntityMode || $[11] !== path || $[12] !== searchString || $[13] !== sideEntityController) {
+  if ($[7] !== collection || $[8] !== fullIdPath || $[9] !== navigation || $[10] !== openEntityMode || $[11] !== path || $[12] !== pathSegments || $[13] !== searchString || $[14] !== sideEntityController) {
     t5 = (e) => {
       e.preventDefault();
       if (!searchString) {
@@ -26782,6 +27029,7 @@ function EntityIdHeaderWidget(t0) {
         collection,
         entityId,
         path,
+        pathSegments,
         fullIdPath,
         sideEntityController,
         navigation
@@ -26792,130 +27040,133 @@ function EntityIdHeaderWidget(t0) {
     $[9] = navigation;
     $[10] = openEntityMode;
     $[11] = path;
-    $[12] = searchString;
-    $[13] = sideEntityController;
-    $[14] = t5;
+    $[12] = pathSegments;
+    $[13] = searchString;
+    $[14] = sideEntityController;
+    $[15] = t5;
   } else {
-    t5 = $[14];
+    t5 = $[15];
   }
   let t6;
-  if ($[15] !== t) {
+  if ($[16] !== t) {
     t6 = t("find_entity_by_id");
-    $[15] = t;
-    $[16] = t6;
+    $[16] = t;
+    $[17] = t6;
   } else {
-    t6 = $[16];
+    t6 = $[17];
   }
   let t7;
-  if ($[17] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+  if ($[18] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
     t7 = (e_0) => {
       setSearchString(e_0.target.value);
     };
-    $[17] = t7;
+    $[18] = t7;
   } else {
-    t7 = $[17];
+    t7 = $[18];
   }
   let t8;
-  if ($[18] !== openPopup || $[19] !== searchString || $[20] !== t6) {
+  if ($[19] !== openPopup || $[20] !== searchString || $[21] !== t6) {
     t8 = /* @__PURE__ */ jsx("input", { autoFocus: openPopup, placeholder: t6, onChange: t7, value: searchString, className: "rounded-lg bg-white dark:bg-surface-800 flex-grow bg-transparent outline-none p-2 " + focusedDisabled });
-    $[18] = openPopup;
-    $[19] = searchString;
-    $[20] = t6;
-    $[21] = t8;
+    $[19] = openPopup;
+    $[20] = searchString;
+    $[21] = t6;
+    $[22] = t8;
   } else {
-    t8 = $[21];
+    t8 = $[22];
   }
   const t9 = !searchString.trim();
   let t10;
-  if ($[22] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
+  if ($[23] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
     t10 = /* @__PURE__ */ jsx(KeyboardTabIcon, {});
-    $[22] = t10;
+    $[23] = t10;
   } else {
-    t10 = $[22];
+    t10 = $[23];
   }
   let t11;
-  if ($[23] !== t9) {
+  if ($[24] !== t9) {
     t11 = /* @__PURE__ */ jsx(Button, { variant: "text", disabled: t9, type: "submit", children: t10 });
-    $[23] = t9;
-    $[24] = t11;
+    $[24] = t9;
+    $[25] = t11;
   } else {
-    t11 = $[24];
+    t11 = $[25];
   }
   let t12;
-  if ($[25] !== t11 || $[26] !== t8) {
+  if ($[26] !== t11 || $[27] !== t8) {
     t12 = /* @__PURE__ */ jsxs("div", { className: "flex p-2 w-full gap-2", children: [
       t8,
       t11
     ] });
-    $[25] = t11;
-    $[26] = t8;
-    $[27] = t12;
+    $[26] = t11;
+    $[27] = t8;
+    $[28] = t12;
   } else {
-    t12 = $[27];
+    t12 = $[28];
   }
   let t13;
-  if ($[28] !== t12 || $[29] !== t5) {
+  if ($[29] !== t12 || $[30] !== t5) {
     t13 = /* @__PURE__ */ jsx("form", { noValidate: true, onSubmit: t5, className: "w-96 max-w-full", children: t12 });
-    $[28] = t12;
-    $[29] = t5;
-    $[30] = t13;
+    $[29] = t12;
+    $[30] = t5;
+    $[31] = t13;
   } else {
-    t13 = $[30];
+    t13 = $[31];
   }
   let t14;
-  if ($[31] !== collection || $[32] !== fullIdPath || $[33] !== navigation || $[34] !== openEntityMode || $[35] !== path || $[36] !== recentIds || $[37] !== sideEntityController) {
-    t14 = recentIds && recentIds.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2 p-2", children: recentIds.map((id) => /* @__PURE__ */ jsx(ReferencePreview, { reference: new EntityReference(id, path), hover: true, onClick: () => {
+  if ($[32] !== collection || $[33] !== fullIdPath || $[34] !== navigation || $[35] !== openEntityMode || $[36] !== path || $[37] !== pathSegments || $[38] !== recentIds || $[39] !== sideEntityController) {
+    t14 = recentIds && recentIds.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-2 p-2", children: recentIds.map((id) => /* @__PURE__ */ jsx(ReferencePreview, { reference: new EntityReference(id, path, void 0, pathSegments), hover: true, onClick: () => {
       setOpenPopup(false);
       navigateToEntity({
         openEntityMode,
         collection,
         entityId: id,
         path,
+        pathSegments,
         fullIdPath,
         sideEntityController,
         navigation
       });
     }, includeEntityLink: false, size: "small" }, id)) });
-    $[31] = collection;
-    $[32] = fullIdPath;
-    $[33] = navigation;
-    $[34] = openEntityMode;
-    $[35] = path;
-    $[36] = recentIds;
-    $[37] = sideEntityController;
-    $[38] = t14;
+    $[32] = collection;
+    $[33] = fullIdPath;
+    $[34] = navigation;
+    $[35] = openEntityMode;
+    $[36] = path;
+    $[37] = pathSegments;
+    $[38] = recentIds;
+    $[39] = sideEntityController;
+    $[40] = t14;
   } else {
-    t14 = $[38];
+    t14 = $[40];
   }
   let t15;
-  if ($[39] !== t13 || $[40] !== t14) {
+  if ($[41] !== t13 || $[42] !== t14) {
     t15 = /* @__PURE__ */ jsxs("div", { className: t4, children: [
       t13,
       t14
     ] });
-    $[39] = t13;
-    $[40] = t14;
-    $[41] = t15;
+    $[41] = t13;
+    $[42] = t14;
+    $[43] = t15;
   } else {
-    t15 = $[41];
+    t15 = $[43];
   }
   let t16;
-  if ($[42] !== openPopup || $[43] !== t15) {
+  if ($[44] !== openPopup || $[45] !== t15) {
     t16 = /* @__PURE__ */ jsx(Popover, { open: openPopup, onOpenChange: setOpenPopup, sideOffset: 0, align: "start", alignOffset: -117, trigger: t3, children: t15 });
-    $[42] = openPopup;
-    $[43] = t15;
-    $[44] = t16;
+    $[44] = openPopup;
+    $[45] = t15;
+    $[46] = t16;
   } else {
-    t16 = $[44];
+    t16 = $[46];
   }
   let t17;
-  if ($[45] !== t16 || $[46] !== t2) {
+  if ($[47] !== t16 || $[48] !== t2) {
     t17 = /* @__PURE__ */ jsx(Tooltip, { title: t2, asChild: false, children: t16 });
-    $[45] = t16;
-    $[46] = t2;
-    $[47] = t17;
+    $[47] = t16;
+    $[48] = t2;
+    $[49] = t17;
   } else {
-    t17 = $[47];
+    t17 = $[49];
   }
   return t17;
 }
@@ -28482,8 +28733,13 @@ function getParentReferencesFromPath(props) {
   const {
     path,
     collections = [],
-    currentFullPath
+    currentFullPath,
+    currentPathSegments = [],
+    pathSegments
   } = props;
+  if (pathSegments) {
+    return getParentReferencesFromPathSegments(pathSegments, collections);
+  }
   const subpaths = removeInitialAndTrailingSlashes(path).split("/");
   const subpathCombinations = getCollectionPathsCombinations(subpaths);
   const result = [];
@@ -28492,12 +28748,14 @@ function getParentReferencesFromPath(props) {
     const collection = collections && collections.find((entry) => entry.id === subpathCombination || entry.path === subpathCombination);
     if (collection) {
       const collectionPath = currentFullPath && currentFullPath.length > 0 ? currentFullPath + "/" + collection.path : collection.path;
+      const collectionSegments = [...currentPathSegments, ...collection.path.split("/")];
       const restOfThePath = removeInitialAndTrailingSlashes(removeInitialAndTrailingSlashes(path).replace(subpathCombination, ""));
       const nextSegments = restOfThePath.length > 0 ? restOfThePath.split("/") : [];
       if (nextSegments.length > 0) {
         const entityId = decodeEntityId(nextSegments[0]);
         const fullPath = collectionPath + "/" + entityId;
-        result.push(new EntityReference(entityId, collectionPath));
+        const entitySegments = [...collectionSegments, entityId];
+        result.push(new EntityReference(entityId, collectionPath, void 0, collectionSegments));
         if (nextSegments.length > 1) {
           const newPath = nextSegments.slice(1).join("/");
           if (!collection) {
@@ -28507,7 +28765,8 @@ function getParentReferencesFromPath(props) {
             result.push(...getParentReferencesFromPath({
               path: newPath,
               collections: collection.subcollections,
-              currentFullPath: fullPath
+              currentFullPath: fullPath,
+              currentPathSegments: entitySegments
             }));
           }
         }
@@ -28517,6 +28776,9 @@ function getParentReferencesFromPath(props) {
   }
   return result;
 }
+function getParentReferencesFromPathSegments(pathSegments, collections) {
+  return walkPathSegments(pathSegments, collections).steps.filter((step) => step.entityId !== void 0).map((step) => new EntityReference(step.entityId, step.collectionPath, void 0, step.collectionSegments));
+}
 const DEFAULT_BASE_PATH = "/";
 const DEFAULT_COLLECTION_PATH = "/c";
 const NAVIGATION_ADMIN_GROUP_NAME = "Admin";
@@ -28721,10 +28983,10 @@ function useBuildNavigationController(props) {
   useEffect(() => {
     refreshNavigation();
   }, [refreshNavigation]);
-  const getCollection = useCallback((idOrPath, includeUserOverride = false) => {
+  const getCollection = useCallback((idOrPath, includeUserOverride = false, pathSegments) => {
     const collections_0 = collectionsRef.current;
     if (!collections_0) return void 0;
-    const baseCollection = getCollectionByPathOrId(removeInitialAndTrailingSlashes(idOrPath), collections_0);
+    const baseCollection = getCollectionByPathOrId(removeInitialAndTrailingSlashes(idOrPath), collections_0, pathSegments);
     const userOverride = includeUserOverride ? userConfigPersistence?.getCollectionConfig(idOrPath) : void 0;
     let overriddenCollection = baseCollection;
     if (baseCollection && userOverride) {
@@ -28759,16 +29021,16 @@ function useBuildNavigationController(props) {
     if (!collection_0) return void 0;
     return collection_0;
   }, []);
-  const getCollectionFromPaths = useCallback((pathSegments) => {
+  const getCollectionFromPaths = useCallback((pathSegments_0) => {
     const collections_2 = collectionsRef.current;
     if (collections_2 === void 0) throw Error("getCollectionFromPaths: Collections have not been initialised yet");
     let currentCollections = [...collections_2 ?? []];
-    for (let i = 0; i < pathSegments.length; i++) {
-      const pathSegment = pathSegments[i];
+    for (let i = 0; i < pathSegments_0.length; i++) {
+      const pathSegment = pathSegments_0[i];
       const collection_1 = currentCollections.find((c_0) => c_0.id === pathSegment || c_0.path === pathSegment);
       if (!collection_1) return void 0;
       currentCollections = collection_1.subcollections;
-      if (i === pathSegments.length - 1) return collection_1;
+      if (i === pathSegments_0.length - 1) return collection_1;
     }
     return void 0;
   }, []);
@@ -28793,33 +29055,37 @@ function useBuildNavigationController(props) {
     if (cleanPath_0.startsWith(fullCollectionPath)) return cleanPath_0.replace(fullCollectionPath, "");
     throw Error("Expected path starting with " + fullCollectionPath);
   }, [fullCollectionPath]);
-  const resolveIdsFrom = useCallback((path_3) => {
+  const resolveIdsFrom = useCallback((path_3, pathSegments_1) => {
     const collections_4 = collectionsRef.current ?? [];
-    return resolveCollectionPathIds(path_3, collections_4);
+    return resolveCollectionPathIds(path_3, collections_4, pathSegments_1);
   }, []);
-  const getAllParentReferencesForPath = useCallback((path_4) => {
+  const resolveSegmentsFrom = useCallback((pathSegments_2) => {
     const collections_5 = collectionsRef.current ?? [];
+    return resolveCollectionPathSegments(pathSegments_2, collections_5);
+  }, []);
+  const getAllParentReferencesForPath = useCallback((path_4, pathSegments_3) => {
+    const collections_6 = collectionsRef.current ?? [];
     return getParentReferencesFromPath({
       path: path_4,
-      collections: collections_5
+      pathSegments: pathSegments_3,
+      collections: collections_6
     });
   }, []);
-  const getParentCollectionIds = useCallback((path_5) => {
-    const strings = path_5.split("/");
-    const oddPathSegments = strings.filter((_, i_1) => i_1 % 2 === 0);
+  const getParentCollectionIds = useCallback((path_5, pathSegments_4) => {
+    const oddPathSegments = pathSegments_4 ? collectionSegmentsFrom(pathSegments_4) : fullPathToCollectionSegments(path_5);
     oddPathSegments.pop();
     const result_0 = [];
-    for (let i_2 = 1; i_2 <= oddPathSegments.length; i_2++) {
-      result_0.push(oddPathSegments.slice(0, i_2));
+    for (let i_1 = 1; i_1 <= oddPathSegments.length; i_1++) {
+      result_0.push(oddPathSegments.slice(0, i_1));
     }
     return result_0.map((r) => getCollectionFromPaths(r)?.id).filter(Boolean);
   }, [getAllParentReferencesForPath]);
   const convertIdsToPaths = useCallback((ids_0) => {
-    const collections_6 = collectionsRef.current;
-    let currentCollections_1 = collections_6;
+    const collections_7 = collectionsRef.current;
+    let currentCollections_1 = collections_7;
     const paths = [];
-    for (let i_3 = 0; i_3 < ids_0.length; i_3++) {
-      const id_1 = ids_0[i_3];
+    for (let i_2 = 0; i_2 < ids_0.length; i_2++) {
+      const id_1 = ids_0[i_2];
       const collection_3 = currentCollections_1.find((c_2) => c_2.id === id_1);
       if (!collection_3) throw Error(`Collection with id ${id_1} not found`);
       paths.push(collection_3.path);
@@ -28845,6 +29111,7 @@ function useBuildNavigationController(props) {
     urlPathToDataPath,
     buildUrlCollectionPath,
     resolveIdsFrom,
+    resolveSegmentsFrom,
     topLevelNavigation,
     refreshNavigation,
     getParentReferencesFromPath: getAllParentReferencesForPath,
@@ -29602,6 +29869,7 @@ function EntitySidePanel(props) {
     if (params.status !== "existing") {
       sideEntityController.replace({
         path: params.path,
+        pathSegments: params.pathSegments ?? pathSegments,
         entityId: params.entityId,
         fullIdPath: props.fullIdPath,
         selectedTab: params.selectedTab,
@@ -29615,9 +29883,9 @@ function EntitySidePanel(props) {
     }
   };
   const parentCollectionIds = useMemo(() => {
-    return navigationController.getParentCollectionIds(path);
+    return navigationController.getParentCollectionIds(path, pathSegments);
   }, [navigationController, path]);
-  const collection = props.collection ?? navigationController.getCollection(fullIdPath ?? path);
+  const collection = props.collection ?? navigationController.getCollection(fullIdPath ?? path, false, pathSegments);
   useEffect(() => {
     function beforeunload(e) {
       if (blocked && collection) {
@@ -29645,7 +29913,7 @@ function EntitySidePanel(props) {
   }) => /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(IconButton, { className: "self-center", size: "smallest", onClick: onClose, children: /* @__PURE__ */ jsx(CloseIcon, { size: "smallest" }) }),
     allowFullScreen && /* @__PURE__ */ jsx(IconButton, { className: "self-center", size: "smallest", onClick: () => {
-      const key = status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId;
+      const key = status === "new" || status === "copy" ? path + "#new" : entityCacheKey(path, entityId);
       saveEntityToMemoryCache(key, values);
       if (entityId) navigate(location.pathname + location.search);
       else navigate(location.pathname + location.search + "#new");
@@ -29657,6 +29925,7 @@ function EntitySidePanel(props) {
   }) => {
     sideEntityController.replace({
       path,
+      pathSegments,
       entityId: entityId_0,
       fullIdPath: props.fullIdPath,
       selectedTab,
@@ -29772,6 +30041,7 @@ function SideDialogView({
 function EntityEditViewFormActions({
   collection,
   path,
+  pathSegments,
   entity,
   layout,
   savingError,
@@ -29794,8 +30064,8 @@ function EntityEditViewFormActions({
   } = useTranslation();
   const entityActions = useMemo(() => {
     const customEntityActions = (collection.entityActions ?? []).map((action) => resolveEntityAction(action, customizationController.entityActions)).filter(Boolean);
-    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 = [];
     if (createEnabled) actions.push(copyEntityAction);
     if (deleteEnabled) actions.push(deleteEntityAction);
@@ -30151,7 +30421,7 @@ function EntityEditView$1({
     databaseId: props.databaseId,
     useCache: false
   });
-  const initialDirtyValues = entityId ? getEntityFromMemoryCache(props.path + "/" + entityId) : getEntityFromMemoryCache(props.path + "#new");
+  const initialDirtyValues = entityId ? getEntityFromMemoryCache(entityCacheKey(props.path, entityId)) : getEntityFromMemoryCache(props.path + "#new");
   const authController = useAuthController();
   const initialStatus = props.copy ? "copy" : entityId ? "existing" : "new";
   const [status, setStatus] = useState(initialStatus);
@@ -30159,7 +30429,7 @@ function EntityEditView$1({
     if (status === "new" || status === "copy") {
       return true;
     } else {
-      return entity ? canEditEntity(props.collection, authController, props.path, entity ?? null) : void 0;
+      return entity ? canEditEntity(props.collection, authController, props.path, entity ?? null, props.pathSegments) : void 0;
     }
   }, [authController, entity, status]);
   if (dataLoading && !initialDirtyValues || (!entity || canEdit === void 0) && (status === "existing" || status === "copy")) {
@@ -30209,6 +30479,7 @@ function EntityEditViewInner({
       entityId,
       parentCollectionIds,
       path,
+      pathSegments,
       status,
       collection,
       context,
@@ -30307,7 +30578,7 @@ function EntityEditViewInner({
     const subcollectionId = subcollection.id ?? subcollection.path;
     const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.path)}` : void 0;
     const newFullIdPath = fullIdPath && usedEntity ? `${fullIdPath}/${encodeEntityId(usedEntity.id)}/${removeInitialAndTrailingSlashes(subcollectionId)}` : void 0;
-    const newPathSegments = usedEntity ? [...pathSegments ?? path.split("/"), usedEntity.id, ...removeInitialAndTrailingSlashes(subcollection.path).split("/")] : void 0;
+    const newPathSegments = buildSubcollectionPathSegments(pathSegments, usedEntity?.id, subcollection.path);
     if (selectedTab !== subcollectionId) return null;
     return /* @__PURE__ */ jsxs("div", { className: "relative flex-1 h-full overflow-auto w-full", role: "tabpanel", children: [
       globalLoading && /* @__PURE__ */ jsx(CircularProgressCenter, {}),
@@ -30330,7 +30601,7 @@ function EntityEditViewInner({
     /* @__PURE__ */ jsx(EntityView, { className: "px-8 h-full overflow-auto", entity, path, collection }),
     /* @__PURE__ */ jsx("div", { className: "h-16" })
   ] }) }) : null;
-  const entityView = /* @__PURE__ */ jsx(EntityForm, { fullIdPath, collection, path, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, ...formProps, onEntityChange: (entity_0) => {
+  const entityView = /* @__PURE__ */ jsx(EntityForm, { fullIdPath, collection, path, pathSegments, entityId: entityId ?? usedEntity?.id, onValuesModified, entity, initialDirtyValues, openEntityMode: layout, forceActionsAtTheBottom: actionsAtTheBottom, initialStatus: status, className: cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className), EntityFormActionsComponent: EntityEditViewFormActions, disabled: !canEdit, ...formProps, onEntityChange: (entity_0) => {
     setUsedEntity(entity_0);
     formProps?.onEntityChange?.(entity_0);
   }, onStatusChange: (status_0) => {
@@ -30601,19 +30872,21 @@ function buildSidePanelsFromUrl(path, collections, newFlag) {
   return sidePanel ? [sidePanel] : [];
 }
 const propsToSidePanel = (props, buildUrlCollectionPath, resolveIdsFrom, smallLayout, customizationController, authController, locationSearch) => {
-  const collectionPath = removeInitialAndTrailingSlashes(props.path);
-  const urlPath = props.entityId ? buildUrlCollectionPath(`${collectionPath}/${encodeEntityId(props.entityId)}${props.selectedTab ? "/" + props.selectedTab : ""}${locationSearch}#${SIDE_URL_HASH}`) : buildUrlCollectionPath(`${collectionPath}${locationSearch}#${NEW_URL_HASH}`);
+  const urlChain = removeInitialAndTrailingSlashes(props.fullIdPath ?? props.path);
+  const urlPath = props.entityId ? buildUrlCollectionPath(`${urlChain}/${encodeEntityId(props.entityId)}${props.selectedTab ? "/" + props.selectedTab : ""}${locationSearch}#${SIDE_URL_HASH}`) : buildUrlCollectionPath(`${urlChain}${locationSearch}#${NEW_URL_HASH}`);
   const resolvedPanelProps = {
     ...props,
     formProps: props.formProps
   };
   const entityViewWidth = getEntityViewWidth(props, smallLayout, customizationController, authController);
   return {
-    key: `${props.path}/${props.entityId}`,
+    // Built from the escaped chain so that two different chains which happen to flatten
+    // to the same raw string are still two different panels.
+    key: `${urlChain}/${props.entityId ? encodeEntityId(props.entityId) : ""}`,
     component: void 0,
     // Lazy render in SideDialogs for better performance
     urlPath,
-    parentUrlPath: buildUrlCollectionPath(collectionPath),
+    parentUrlPath: buildUrlCollectionPath(urlChain),
     width: entityViewWidth,
     onClose: props.onClose,
     additional: resolvedPanelProps
@@ -30882,7 +31155,7 @@ function useBuildDataSource({
       onUpdate,
       onError
     }) => {
-      const collection_0 = collectionProp ?? navigationController.getCollection(path_0);
+      const collection_0 = collectionProp ?? navigationController.getCollection(path_0, false, pathSegments_0);
       const usedDelegate_0 = collection_0?.overrides?.dataSourceDelegate ?? delegate;
       if (!usedDelegate_0.listenCollection) throw Error("useBuildDataSource delegate not initialised");
       return usedDelegate_0.listenCollection({
@@ -30968,7 +31241,7 @@ function useBuildDataSource({
       collection: collectionProp_0,
       status
     }) => {
-      const collection_3 = collectionProp_0 ?? navigationController.getCollection(path_3);
+      const collection_3 = collectionProp_0 ?? navigationController.getCollection(path_3, false, pathSegments_3);
       const usedDelegate_3 = collection_3?.overrides?.dataSourceDelegate ?? delegate;
       const resolvedCollection = collection_3 ? resolveCollection({
         collection: collection_3,
@@ -31025,8 +31298,11 @@ function useBuildDataSource({
         status
       }).then((res) => {
         return {
-          id: res.id,
-          path: res.path,
+          ...res,
+          // A delegate that predates `pathSegments` returns none; the segments we
+          // just saved with describe exactly this entity's collection, so they are
+          // the authoritative answer rather than a guess.
+          pathSegments: res.pathSegments ?? pathSegments_3,
           values: usedDelegate_3.delegateToCMSModel(finalValues)
         };
       });
@@ -31039,11 +31315,14 @@ function useBuildDataSource({
      */
     deleteEntity: useCallback(({
       entity,
+      pathSegments: pathSegments_4,
       collection: collection_4
     }) => {
       const usedDelegate_4 = collection_4?.overrides?.dataSourceDelegate ?? delegate;
       return usedDelegate_4.deleteEntity({
         entity,
+        // Falls back to what the entity carries from the fetch that produced it.
+        pathSegments: pathSegments_4 ?? entity.pathSegments,
         collection: collection_4
       });
     }, [delegate.deleteEntity]),
@@ -31057,16 +31336,19 @@ function useBuildDataSource({
      * @return `true` if there are no other fields besides the given entity
      * @group Firestore
      */
-    checkUniqueField: useCallback((path_4, name, value, entityId_2, collection_5) => {
+    checkUniqueField: useCallback((path_4, name, value, entityId_2, collection_5, pathSegments_5) => {
       const usedDelegate_5 = collection_5?.overrides?.dataSourceDelegate ?? delegate;
-      return usedDelegate_5.checkUniqueField(path_4, name, value, entityId_2, collection_5);
+      return usedDelegate_5.checkUniqueField(path_4, name, value, entityId_2, collection_5, pathSegments_5);
     }, [delegate.checkUniqueField]),
-    generateEntityId: useCallback((path_5, collection_6) => {
+    generateEntityId: useCallback((path_5, collection_6, pathSegments_6) => {
       const usedDelegate_6 = collection_6?.overrides?.dataSourceDelegate ?? delegate;
-      return usedDelegate_6.generateEntityId(path_5, collection_6);
+      return usedDelegate_6.generateEntityId(path_5, collection_6, pathSegments_6);
     }, [delegate.generateEntityId]),
+    // Typed with the declared props rather than an inline duplicate: the duplicate is
+    // free to drift from the interface, and a field it forgets is dropped in silence.
     countEntities: delegate.countEntities ? async ({
       path: path_6,
+      pathSegments: pathSegments_7,
       collection: collection_7,
       filter: filter_1,
       order: order_1,
@@ -31075,6 +31357,7 @@ function useBuildDataSource({
       const usedDelegate_7 = collection_7?.overrides?.dataSourceDelegate ?? delegate;
       return usedDelegate_7.countEntities({
         path: path_6,
+        pathSegments: pathSegments_7,
         filter: filter_1,
         orderBy: orderBy_1,
         order: order_1,
@@ -31083,6 +31366,7 @@ function useBuildDataSource({
     } : void 0,
     isFilterCombinationValid: useCallback(({
       path: path_7,
+      pathSegments: pathSegments_8,
       databaseId,
       filterValues,
       sortBy
@@ -31090,6 +31374,7 @@ function useBuildDataSource({
       if (!delegate.isFilterCombinationValid) return true;
       return delegate.isFilterCombinationValid({
         path: path_7,
+        pathSegments: pathSegments_8,
         databaseId,
         filterValues,
         sortBy
@@ -32587,7 +32872,7 @@ function FireCMSRoute() {
         let collection;
         collection = navigation.getCollectionById(navigationEntries[0].id);
         if (!collection) {
-          collection = navigation.getCollection(navigationEntries[0].path);
+          collection = navigation.getCollection(navigationEntries[0].path, false, navigationEntries[0].pathSegments);
         }
         if (!collection) {
           t16 = null;
@@ -32698,7 +32983,7 @@ function FireCMSRoute() {
           const firstEntry = navigationEntries[0];
           collection_0 = navigation.getCollectionById(firstEntry.id);
           if (!collection_0) {
-            collection_0 = navigation.getCollection(firstEntry.path);
+            collection_0 = navigation.getCollection(firstEntry.path, false, firstEntry.pathSegments);
           }
           if (!collection_0) {
             t16 = null;
@@ -32871,9 +33156,10 @@ function EntityFullScreenRoute({
   }
   const collection = isNew ? lastCollectionEntry.collection : lastEntityEntry.parentCollection;
   const fullIdPath = isNew ? lastCollectionEntry.fullPath : parentCollectionEntry?.fullPath ?? lastEntityEntry.fullPath;
-  const collectionPath = navigation.resolveIdsFrom(isNew ? lastCollectionEntry.path : lastEntityEntry.path);
+  const pathSegments = isNew ? lastCollectionEntry.pathSegments : lastEntityEntry.pathSegments;
+  const collectionPath = navigation.resolveIdsFrom(isNew ? lastCollectionEntry.path : lastEntityEntry.path, pathSegments);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(React__default.Suspense, { fallback: null, children: /* @__PURE__ */ jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, fullIdPath, pathSegments: isNew ? lastCollectionEntry.pathSegments : lastEntityEntry.pathSegments, collection, layout: "full_screen", path: collectionPath, copy: isCopy, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
+    /* @__PURE__ */ jsx(React__default.Suspense, { fallback: null, children: /* @__PURE__ */ jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, fullIdPath, pathSegments, collection, layout: "full_screen", path: collectionPath, copy: isCopy, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
       const newEntityId = params.entityId;
       if (!newEntityId) return;
       navigate(buildEntityUrl(newEntityId, params.selectedTab), {
@@ -38965,12 +39251,27 @@ function FireCMSi18nProvider({
   translations,
   children
 }) {
+  const parentI18n = useContext(I18nContext)?.i18n;
+  const parentInstance = parentI18n?.hasResourceBundle?.("en", FIRECMS_NS) ? parentI18n : void 0;
   const i18nRef = useRef(null);
   const [ready, setReady] = React__default.useState(false);
   if (!i18nRef.current) {
     const instance = i18next.createInstance();
     const resources = buildResources(translations);
-    let initialLocale = locale;
+    if (parentInstance) {
+      const inherited = parentInstance.services?.resourceStore?.data ?? {};
+      for (const [lang, namespaces] of Object.entries(inherited)) {
+        const bundle = namespaces?.[FIRECMS_NS];
+        if (!bundle) continue;
+        resources[lang] = {
+          [FIRECMS_NS]: {
+            ...bundle,
+            ...translations?.[lang] ?? {}
+          }
+        };
+      }
+    }
+    let initialLocale = parentInstance?.language ?? locale;
     if (typeof window !== "undefined") {
       const stored = localStorage.getItem(FIRECMS_LOCALE_STORAGE_KEY);
       if (stored) initialLocale = stored;
@@ -38995,6 +39296,17 @@ function FireCMSi18nProvider({
     });
     i18nRef.current = instance;
   }
+  useEffect(() => {
+    if (!parentInstance || !i18nRef.current) return;
+    const instance_0 = i18nRef.current;
+    const follow = (lng_0) => {
+      if (instance_0.language !== lng_0) instance_0.changeLanguage(lng_0);
+    };
+    parentInstance.on("languageChanged", follow);
+    return () => {
+      parentInstance.off("languageChanged", follow);
+    };
+  }, [parentInstance]);
   useEffect(() => {
     if (i18nRef.current && i18nRef.current.language !== locale) {
       const hasUserPreference = typeof window !== "undefined" && Boolean(localStorage.getItem(FIRECMS_LOCALE_STORAGE_KEY));
@@ -39006,11 +39318,11 @@ function FireCMSi18nProvider({
   useEffect(() => {
     if (!i18nRef.current) return;
     const resources_0 = buildResources(translations);
-    for (const [lang, bundle] of Object.entries(resources_0)) {
+    for (const [lang_0, bundle_0] of Object.entries(resources_0)) {
       i18nRef.current.addResourceBundle(
-        lang,
+        lang_0,
         FIRECMS_NS,
-        bundle[FIRECMS_NS],
+        bundle_0[FIRECMS_NS],
         true,
         // deep merge
         true
@@ -43760,9 +44072,11 @@ export {
   buildProperties,
   buildPropertiesOrBuilder,
   buildProperty,
+  buildSubcollectionPathSegments,
   canCreateEntity,
   canDeleteEntity,
   canEditEntity,
+  collectionSegmentsFrom,
   copyEntityAction,
   decodeEntityId,
   defaultDateFormat,
@@ -43781,6 +44095,7 @@ export {
   getArrayValuesCount,
   getBracketNotation,
   getCollectionByPathOrId,
+  getCollectionByPathSegments,
   getCollectionPathsCombinations,
   getColorForProperty,
   getColorScheme,
@@ -43842,6 +44157,7 @@ export {
   parseGeoPoint,
   pick,
   plural,
+  positionalCollectionSegments,
   prettifyIdentifier,
   printChanged,
   propertiesToColumns,
@@ -43863,6 +44179,7 @@ export {
   resolveArrayProperty,
   resolveCollection,
   resolveCollectionPathIds,
+  resolveCollectionPathSegments,
   resolveDefaultSelectedView,
   resolveEntityAction,
   resolveEntityView,
@@ -43925,6 +44242,7 @@ export {
   useTraceUpdate,
   useTranslation,
   useValidateAuthenticator,
+  walkPathSegments,
   yupToFormErrors
 };
 //# sourceMappingURL=index.es.js.map