@firecms/core 3.0.0-canary.225 → 3.0.0-canary.227

package/dist/index.umd.js

@@ -72,23 +72,46 @@
     const cleanPath = removeInitialAndTrailingSlashes(path);
     const subpaths = cleanPath.split("/");
     if (subpaths.length % 2 === 0) {
-      throw Error(`resolveCollectionPathAliases: Collection paths must have an odd number of segments: ${path}`);
-    }
-    const aliasedCollection = allCollections.find((col) => col.id === subpaths[0]);
-    let resolvedAliased;
-    if (aliasedCollection) {
-      resolvedAliased = aliasedCollection.path;
+      throw Error(`resolveCollectionPathIds: Collection paths must have an odd number of segments: ${path}`);
+    }
+    const exactMatch = allCollections.find((col) => col.path === cleanPath);
+    if (exactMatch) {
+      return exactMatch.path;
+    }
+    if (subpaths.length === 1) {
+      const aliasedCollection = allCollections.find((col) => col.id === subpaths[0]);
+      return aliasedCollection?.path ?? subpaths[0];
+    }
+    let matchingCollection;
+    let entityIndex = 1;
+    for (const collection of allCollections) {
+      const pathSegments = collection.path.split("/");
+      if (pathSegments.length > 1 && subpaths.slice(0, pathSegments.length).join("/") === collection.path) {
+        matchingCollection = collection;
+        entityIndex = pathSegments.length;
+        break;
+      }
     }
-    if (subpaths.length > 1) {
-      const segmentCollection = getCollectionByPathOrId(resolvedAliased ?? subpaths[0], allCollections);
-      if (!segmentCollection?.subcollections) {
+    if (!matchingCollection) {
+      const matchingCollections = allCollections.filter((col) => col.id === subpaths[0] || col.path === subpaths[0]);
+      if (!matchingCollections.length) {
         return cleanPath;
       }
-      const restOfThePath = cleanPath.split("/").slice(2).join("/");
-      return (resolvedAliased ?? subpaths[0]) + "/" + subpaths[1] + "/" + resolveCollectionPathIds(restOfThePath, segmentCollection.subcollections);
-    } else {
-      return resolvedAliased ?? cleanPath;
+      matchingCollection = matchingCollections[0];
+    }
+    const entityId = subpaths[entityIndex];
+    const remainingPath = subpaths.slice(entityIndex + 1);
+    if (remainingPath.length > 0) {
+      const subcollectionId = remainingPath[0];
+      const subcollection = matchingCollection.subcollections?.find((subcol) => subcol.id === subcollectionId);
+      if (subcollection) {
+        return `${matchingCollection.path}/${entityId}/${subcollection.path}`;
+      }
+    }
+    if (remainingPath.length === 0) {
+      return `${matchingCollection.path}/${entityId}`;
     }
+    return `${matchingCollection.path}/${entityId}/${remainingPath.join("/")}`;
   }
   function getCollectionByPathOrId(pathOrId, collections) {
     const subpaths = removeInitialAndTrailingSlashes(pathOrId).split("/");
@@ -10484,7 +10507,30 @@
     React.useEffect(() => {
       setColumns(columnsProp);
     }, [columnsProp]);
-    const [measureRef, bounds] = useMeasure();
+    const [_, setForceUpdate] = React.useState(false);
+    React.useEffect(() => {
+      if (tableRef.current) {
+        const resizeObserver = new ResizeObserver(() => {
+          setForceUpdate((prev) => !prev);
+        });
+        resizeObserver.observe(tableRef.current);
+        return () => {
+          if (tableRef.current) {
+            resizeObserver.unobserve(tableRef.current);
+          }
+          resizeObserver.disconnect();
+        };
+      }
+      return () => {
+      };
+    }, [tableRef]);
+    const [measureRef, bounds] = useMeasure({
+      debounce: 50,
+      polyfill: ResizeObserver,
+      scroll: true,
+      // This is important for handling zooming in react-flow
+      offsetSize: true
+    });
     const onColumnResizeInternal = React.useCallback((params) => {
       if (debug) console.log("onColumnResizeInternal", params);
       setColumns(columns.map((column) => column.key === params.column.key ? params.column : column));
@@ -12208,7 +12254,7 @@
       if (collection) {
         addRecentId(collection.id, entity.id);
       }
-      const path = collection?.collectionGroup ? entity.path : fullPath ?? entity.path;
+      const path = collection?.collectionGroup ? collection.id : fullPath ?? collection?.id ?? entity.path;
       const defaultSelectedView = resolveDefaultSelectedView(collection ? collection.defaultSelectedView : void 0, {
         status: "existing",
         entityId: entity.id
@@ -12244,7 +12290,7 @@
         path: entity.path,
         entityId: entity.id
       });
-      const path = collection?.collectionGroup ? entity.path : fullPath ?? entity.path;
+      const path = collection?.collectionGroup ? collection.id : fullPath ?? collection?.id ?? entity.path;
       navigateToEntity({
         openEntityMode,
         collection,
@@ -18424,9 +18470,9 @@
     ...collectionProp
   }) {
     const context = useFireCMSContext();
+    const navigation = useNavigationController();
     const fullPath = fullPathProp ?? collectionProp.path;
     const dataSource = useDataSource();
-    const navigation = useNavigationController();
     const sideEntityController = useSideEntityController();
     const authController = useAuthController();
     const userConfigPersistence = useUserConfigurationPersistence();