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

package/dist/index.es.js

@@ -369,10 +369,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 +754,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 ?? {};
@@ -4636,9 +4647,10 @@ const useFireCMSContext = () => {
   return fireCMSContextRef.current;
 };
 function useCollectionFetch(t0) {
-  const $ = c(26);
+  const $ = c(27);
   const {
     path: inputPath,
+    pathSegments,
     collection,
     filterValues,
     sortBy,
@@ -4672,10 +4684,16 @@ function useCollectionFetch(t0) {
   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) {
+  if ($[4] !== collection || $[5] !== context || $[6] !== currentSort || $[7] !== dataSource || $[8] !== filterValues || $[9] !== itemCount || $[10] !== path || $[11] !== pathSegments || $[12] !== searchString || $[13] !== sortByProperty) {
     t3 = () => {
       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({
@@ -4685,8 +4703,8 @@ function useCollectionFetch(t0) {
               context
             })));
           } catch (t42) {
-            const e = t42;
-            console.error(e);
+            const e_0 = t42;
+            console.error(e_0);
           }
         }
         setDataLoading(false);
@@ -4703,6 +4721,7 @@ function useCollectionFetch(t0) {
       if (dataSource.listenCollection) {
         return dataSource.listenCollection({
           path,
+          pathSegments,
           collection,
           onUpdate: onEntitiesUpdate,
           onError,
@@ -4716,6 +4735,7 @@ function useCollectionFetch(t0) {
       } else {
         dataSource.fetchCollection({
           path,
+          pathSegments,
           collection,
           searchString,
           filter: filterValues,
@@ -4734,54 +4754,55 @@ function useCollectionFetch(t0) {
     $[8] = filterValues;
     $[9] = itemCount;
     $[10] = path;
-    $[11] = searchString;
-    $[12] = sortByProperty;
-    $[13] = t3;
+    $[11] = pathSegments;
+    $[12] = searchString;
+    $[13] = sortByProperty;
+    $[14] = t3;
   } else {
-    t3 = $[13];
+    t3 = $[14];
   }
   let t4;
-  if ($[14] !== currentSort || $[15] !== filterValues || $[16] !== itemCount || $[17] !== path || $[18] !== searchString || $[19] !== sortByProperty) {
+  if ($[15] !== currentSort || $[16] !== filterValues || $[17] !== itemCount || $[18] !== path || $[19] !== searchString || $[20] !== sortByProperty) {
     t4 = [path, itemCount, currentSort, sortByProperty, filterValues, searchString];
-    $[14] = currentSort;
-    $[15] = filterValues;
-    $[16] = itemCount;
-    $[17] = path;
-    $[18] = searchString;
-    $[19] = sortByProperty;
-    $[20] = t4;
+    $[15] = currentSort;
+    $[16] = filterValues;
+    $[17] = itemCount;
+    $[18] = path;
+    $[19] = searchString;
+    $[20] = sortByProperty;
+    $[21] = t4;
   } else {
-    t4 = $[20];
+    t4 = $[21];
   }
   useEffect(t3, t4);
   let t5;
-  if ($[21] !== data || $[22] !== dataLoading || $[23] !== dataLoadingError || $[24] !== noMoreToLoad) {
+  if ($[22] !== data || $[23] !== dataLoading || $[24] !== dataLoadingError || $[25] !== noMoreToLoad) {
     t5 = {
       data,
       dataLoading,
       dataLoadingError,
       noMoreToLoad
     };
-    $[21] = data;
-    $[22] = dataLoading;
-    $[23] = dataLoadingError;
-    $[24] = noMoreToLoad;
-    $[25] = t5;
+    $[22] = data;
+    $[23] = dataLoading;
+    $[24] = dataLoadingError;
+    $[25] = noMoreToLoad;
+    $[26] = t5;
   } else {
-    t5 = $[25];
+    t5 = $[26];
   }
   return t5;
 }
 function _temp2$f() {
 }
-function _temp$D(e_0) {
+function _temp$D(e_1) {
   return {
-    ...e_0
+    ...e_1
   };
 }
 const CACHE = {};
 function useEntityFetch(t0) {
-  const $ = c(21);
+  const $ = c(19);
   const {
     path: inputPath,
     pathSegments: inputPathSegments,
@@ -4793,30 +4814,32 @@ 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("/");
+  if ($[0] !== inputPath || $[1] !== navigationController) {
+    t2 = navigationController.resolveIdsFrom(inputPath);
     $[0] = inputPath;
-    $[1] = inputPathSegments;
-    $[2] = navigationController;
-    $[3] = path;
-    $[4] = t2;
+    $[1] = navigationController;
+    $[2] = t2;
   } else {
-    path = $[3];
-    t2 = $[4];
+    t2 = $[2];
   }
-  const pathSegments = t2;
+  const path = t2;
+  const pathSegments = inputPathSegments;
   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) {
+  if ($[3] !== collection || $[4] !== context || $[5] !== dataSource || $[6] !== databaseId || $[7] !== entityId || $[8] !== path || $[9] !== pathSegments || $[10] !== useCache) {
     t3 = () => {
       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({
@@ -4874,41 +4897,41 @@ function useEntityFetch(t0) {
         }
       }
     };
-    $[5] = collection;
-    $[6] = context;
-    $[7] = dataSource;
-    $[8] = databaseId;
-    $[9] = entityId;
-    $[10] = path;
-    $[11] = pathSegments;
-    $[12] = useCache;
-    $[13] = t3;
+    $[3] = collection;
+    $[4] = context;
+    $[5] = dataSource;
+    $[6] = databaseId;
+    $[7] = entityId;
+    $[8] = path;
+    $[9] = pathSegments;
+    $[10] = useCache;
+    $[11] = t3;
   } else {
-    t3 = $[13];
+    t3 = $[11];
   }
   let t4;
-  if ($[14] !== entityId || $[15] !== path) {
+  if ($[12] !== entityId || $[13] !== path) {
     t4 = [entityId, path];
-    $[14] = entityId;
-    $[15] = path;
-    $[16] = t4;
+    $[12] = entityId;
+    $[13] = path;
+    $[14] = t4;
   } else {
-    t4 = $[16];
+    t4 = $[14];
   }
   useEffect(t3, t4);
   let t5;
-  if ($[17] !== dataLoading || $[18] !== dataLoadingError || $[19] !== entity) {
+  if ($[15] !== dataLoading || $[16] !== dataLoadingError || $[17] !== entity) {
     t5 = {
       entity,
       dataLoading,
       dataLoadingError
     };
-    $[17] = dataLoading;
-    $[18] = dataLoadingError;
-    $[19] = entity;
-    $[20] = t5;
+    $[15] = dataLoading;
+    $[16] = dataLoadingError;
+    $[17] = entity;
+    $[18] = t5;
   } else {
-    t5 = $[20];
+    t5 = $[18];
   }
   return t5;
 }
@@ -4971,7 +4994,7 @@ async function saveEntityWithCallbacks({
   return dataSource.saveEntity({
     collection,
     path: resolvedPath,
-    pathSegments: pathSegments ?? resolvedPath.split("/"),
+    pathSegments,
     entityId,
     values: updatedValues,
     previousValues,
@@ -5055,6 +5078,8 @@ async function deleteEntityWithCallbacks({
     }
   }
   return dataSource.deleteEntity({
+    // Carried by the entity from the fetch that produced it; undefined if unknown.
+    pathSegments: entity.pathSegments,
     entity,
     collection
   }).then(() => {
@@ -5096,6 +5121,8 @@ function resolveNavigationFrom({
       }
       return dataSource.fetchEntity({
         path: entry.path,
+        // The navigation entry already knows the real segment boundaries.
+        pathSegments: entry.pathSegments,
         entityId: entry.entityId,
         collection
       }).then((entity) => {
@@ -16742,6 +16769,7 @@ function getChanges(source, comparison) {
 }
 function EntityForm({
   path,
+  pathSegments,
   fullIdPath,
   entityId: entityIdProp,
   collection,
@@ -16808,7 +16836,7 @@ function EntityForm({
       if (mustSetCustomId) {
         return void 0;
       } else {
-        return dataSource.generateEntityId(path, collection);
+        return dataSource.generateEntityId(path, collection, pathSegments);
       }
     } else {
       return entityIdProp;
@@ -17121,7 +17149,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);
@@ -20089,7 +20117,7 @@ function useDataSourceTableController({
   const navigation = useNavigationController();
   const dataSource = useDataSource();
   const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
-  const resolvedPathSegments = useMemo(() => pathSegments ?? resolvedPath.split("/"), [pathSegments, resolvedPath]);
+  const resolvedPathSegments = pathSegments;
   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 +20125,7 @@ function useDataSourceTableController({
     if (!dataSource.isFilterCombinationValid) return true;
     return dataSource.isFilterCombinationValid({
       path: resolvedPath,
+      pathSegments: resolvedPathSegments,
       collection,
       filterValues,
       sortBy
@@ -20185,6 +20214,12 @@ 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({
@@ -20193,14 +20228,14 @@ function useDataSourceTableController({
             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 +20276,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 () => {
       };
     }
@@ -20754,6 +20789,7 @@ function ReferenceSelectionTable({
   multiselect,
   collection,
   path: pathInput,
+  pathSegments,
   selectedEntityIds: selectedEntityIdsProp,
   description,
   forceFilter,
@@ -20796,6 +20832,7 @@ function ReferenceSelectionTable({
     if (selectedEntityIds && collection) {
       Promise.all(selectedEntityIds.map((entityId) => dataSource.fetchEntity({
         path: fullPath,
+        pathSegments,
         entityId,
         collection
       }))).then((entities) => {
@@ -24394,6 +24431,7 @@ const EntityBoardCard = memo(EntityBoardCardInner);
 const DEFAULT_PAGE_SIZE = 20;
 function useBoardDataController({
   fullPath,
+  pathSegments,
   collection,
   columnProperty,
   columns,
@@ -24406,6 +24444,7 @@ function useBoardDataController({
   const dataSource = useDataSource();
   const navigation = useNavigationController();
   const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
+  const resolvedPathSegments = pathSegments;
   const dataSourceRef = useRef(dataSource);
   const collectionRef = useRef(collection);
   const contextRef = useRef(context);
@@ -24417,11 +24456,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 +24509,7 @@ function useBoardDataController({
     const currentOrderProperty = orderPropertyRef.current;
     const currentSearchString = searchStringRef.current;
     const currentResolvedPath = resolvedPathRef.current;
+    const currentPathSegments = resolvedPathSegmentsRef.current;
     const columnFilter = {
       ...currentFilterValues,
       [currentColumnProperty]: ["==", column]
@@ -24524,6 +24566,7 @@ function useBoardDataController({
     if (currentDataSource.listenCollection) {
       const unsubscribe = currentDataSource.listenCollection({
         path: currentResolvedPath,
+        pathSegments: currentPathSegments,
         collection: currentCollection,
         onUpdate,
         onError,
@@ -24538,6 +24581,7 @@ function useBoardDataController({
     } else {
       currentDataSource.fetchCollection({
         path: currentResolvedPath,
+        pathSegments: currentPathSegments,
         collection: currentCollection,
         searchString: currentSearchString,
         filter: columnFilter,
@@ -24566,6 +24610,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 +24625,7 @@ function useBoardDataController({
           };
           currentDataSource.countEntities({
             path: currentResolvedPath,
+            pathSegments: currentPathSegments,
             collection: currentCollection,
             filter: columnFilter,
             searchString: currentSearchString
@@ -24824,6 +24870,7 @@ function EntityCollectionBoardView({
   collection,
   tableController,
   fullPath,
+  pathSegments,
   parentCollectionIds = [],
   columnProperty,
   onEntityClick,
@@ -24917,6 +24964,7 @@ function EntityCollectionBoardView({
   const columns = localColumnsOrder;
   const boardDataController = useBoardDataController({
     fullPath,
+    pathSegments,
     collection,
     columnProperty,
     columns,
@@ -25462,7 +25510,7 @@ function PopupFormField(props) {
   return t0;
 }
 function PopupFormFieldLoading(t0) {
-  const $ = c(21);
+  const $ = c(22);
   const {
     tableKey,
     entityId,
@@ -25470,6 +25518,7 @@ function PopupFormFieldLoading(t0) {
     propertyKey,
     collection: inputCollection,
     path,
+    pathSegments,
     cellRect,
     open,
     onClose,
@@ -25480,33 +25529,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 +25571,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;
 }
@@ -26582,7 +26633,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,
@@ -26629,7 +26680,7 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
   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: [
+    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, {}),
@@ -26666,7 +26717,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 +26728,8 @@ function EntitiesCount({
   collection,
   filter,
   sortBy,
-  onCountChange
+  onCountChange,
+  pathSegments
 }) {
   const dataSource = useDataSource();
   const navigation = useNavigationController();
@@ -26686,15 +26738,17 @@ function EntitiesCount({
   const sortByProperty = sortBy ? sortBy[0] : void 0;
   const currentSort = sortBy ? sortBy[1] : void 0;
   const resolvedPath = useMemo(() => navigation.resolveIdsFrom(fullPath), [fullPath, navigation.resolveIdsFrom]);
+  const resolvedPathSegments = pathSegments;
   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);
@@ -28482,7 +28536,8 @@ function getParentReferencesFromPath(props) {
   const {
     path,
     collections = [],
-    currentFullPath
+    currentFullPath,
+    currentPathSegments = []
   } = props;
   const subpaths = removeInitialAndTrailingSlashes(path).split("/");
   const subpathCombinations = getCollectionPathsCombinations(subpaths);
@@ -28492,12 +28547,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 +28564,8 @@ function getParentReferencesFromPath(props) {
             result.push(...getParentReferencesFromPath({
               path: newPath,
               collections: collection.subcollections,
-              currentFullPath: fullPath
+              currentFullPath: fullPath,
+              currentPathSegments: entitySegments
             }));
           }
         }
@@ -30307,7 +30365,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 = usedEntity && pathSegments ? [...pathSegments, usedEntity.id, ...removeInitialAndTrailingSlashes(subcollection.path).split("/")] : void 0;
     if (selectedTab !== subcollectionId) return null;
     return /* @__PURE__ */ jsxs("div", { className: "relative flex-1 h-full overflow-auto w-full", role: "tabpanel", children: [
       globalLoading && /* @__PURE__ */ jsx(CircularProgressCenter, {}),
@@ -30330,7 +30388,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) => {
@@ -31039,11 +31097,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 +31118,17 @@ 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]),
     countEntities: delegate.countEntities ? async ({
       path: path_6,
+      pathSegments: pathSegments_7,
       collection: collection_7,
       filter: filter_1,
       order: order_1,
@@ -31075,6 +31137,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 +31146,7 @@ function useBuildDataSource({
     } : void 0,
     isFilterCombinationValid: useCallback(({
       path: path_7,
+      pathSegments: pathSegments_8,
       databaseId,
       filterValues,
       sortBy
@@ -31090,6 +31154,7 @@ function useBuildDataSource({
       if (!delegate.isFilterCombinationValid) return true;
       return delegate.isFilterCombinationValid({
         path: path_7,
+        pathSegments: pathSegments_8,
         databaseId,
         filterValues,
         sortBy