@firecms/core 3.0.0-canary.231 → 3.0.0-canary.232

package/dist/index.es.js

@@ -68,49 +68,66 @@ function getLastSegment(path) {
   return cleanPath;
 }
 function resolveCollectionPathIds(path, allCollections) {
-  const cleanPath = removeInitialAndTrailingSlashes(path);
-  const subpaths = cleanPath.split("/");
-  if (subpaths.length % 2 === 0) {
-    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;
+  let remainingPath = removeInitialAndTrailingSlashes(path);
+  if (!remainingPath) {
+    return "";
+  }
+  let currentCollections = allCollections;
+  const resolvedPathParts = [];
+  while (remainingPath.length > 0) {
+    if (!currentCollections || currentCollections.length === 0) {
+      console.warn(`resolveCollectionPathIds: Path structure implies subcollections, but none found before segment starting with "${remainingPath}" in original path "${path}". Appending remaining original path.`);
+      resolvedPathParts.push(remainingPath);
+      remainingPath = "";
       break;
     }
-  }
-  if (!matchingCollection) {
-    const matchingCollections = allCollections.filter((col) => col.id === subpaths[0] || col.path === subpaths[0]);
-    if (!matchingCollections.length) {
-      return cleanPath;
+    let foundMatch = false;
+    const potentialMatches = currentCollections.flatMap((col) => [{
+      col,
+      match: col.path
+    }, {
+      col,
+      match: col.id
+    }]).filter((p) => p.match && remainingPath.startsWith(p.match)).sort((a, b) => b.match.length - a.match.length);
+    if (potentialMatches.length > 0) {
+      const {
+        col: foundCollection,
+        match: matchString
+      } = potentialMatches[0];
+      resolvedPathParts.push(foundCollection.path);
+      remainingPath = removeInitialSlash(remainingPath.substring(matchString.length));
+      if (remainingPath.length === 0) {
+        foundMatch = true;
+        break;
+      }
+      const idSeparatorIndex = remainingPath.indexOf("/");
+      let entityId;
+      if (idSeparatorIndex > -1) {
+        entityId = remainingPath.substring(0, idSeparatorIndex);
+        remainingPath = remainingPath.substring(idSeparatorIndex + 1);
+      } else {
+        entityId = remainingPath;
+        remainingPath = "";
+        console.warn(`resolveCollectionPathIds: Path seems to end with an entity ID "${entityId}" instead of a collection segment in original path "${path}". This might indicate an invalid input path.`);
+      }
+      resolvedPathParts.push(entityId);
+      currentCollections = foundCollection.subcollections;
+      foundMatch = true;
+      if (!currentCollections && remainingPath.length > 0) {
+        console.warn(`resolveCollectionPathIds: Path continues after entity ID "${entityId}", but no subcollections are defined for the preceding collection "${foundCollection.path}" in path "${path}". Appending remaining original path.`);
+        resolvedPathParts.push(remainingPath);
+        remainingPath = "";
+        break;
+      }
     }
-    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 (!foundMatch) {
+      console.warn(`resolveCollectionPathIds: Collection definition not found for segment starting with "${remainingPath}" in original path "${path}". Appending remaining original path.`);
+      resolvedPathParts.push(remainingPath);
+      remainingPath = "";
+      break;
     }
   }
-  if (remainingPath.length === 0) {
-    return `${matchingCollection.path}/${entityId}`;
-  }
-  return `${matchingCollection.path}/${entityId}/${remainingPath.join("/")}`;
+  return resolvedPathParts.join("/");
 }
 function getCollectionByPathOrId(pathOrId, collections) {
   const subpaths = removeInitialAndTrailingSlashes(pathOrId).split("/");
@@ -6496,7 +6513,7 @@ function _temp$n(t0) {
   return /* @__PURE__ */ jsxs("div", { className: cls(defaultBorderMixin, "last:border-b-0 border-b"), children: [
     /* @__PURE__ */ jsxs("div", { className: "flex flex-row pt-0.5 pb-0.5 gap-2", children: [
       /* @__PURE__ */ jsx("div", { className: "min-w-[140px] w-[25%] py-1", children: /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "font-mono break-words", color: "secondary", children: key }) }, `table-cell-title-${key}-${key}`),
-      /* @__PURE__ */ jsx("div", { className: "flex-grow max-w-[75%]", children: childValue && /* @__PURE__ */ jsx(Typography, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: childValue.toString() }) }) })
+      /* @__PURE__ */ jsx("div", { className: "flex-grow max-w-[75%]", children: childValue && typeof childValue !== "object" && /* @__PURE__ */ jsx(Typography, { children: /* @__PURE__ */ jsx(ErrorBoundary, { children: childValue.toString() }) }) })
     ] }),
     typeof childValue === "object" && /* @__PURE__ */ jsx("div", { className: cls(defaultBorderMixin, "border-l pl-4"), children: /* @__PURE__ */ jsx(KeyValuePreview, { value: childValue }) })
   ] }, `map_preview_table_${key}}`);
@@ -16640,6 +16657,7 @@ function KeyValueFieldBinding(t0) {
     t6 = $[15];
   }
   const title = t6;
+  console.log("minimalistView", propertyKey, minimalistView);
   let t7;
   if ($[16] !== expanded || $[17] !== mapFormView || $[18] !== minimalistView || $[19] !== title) {
     t7 = !minimalistView && /* @__PURE__ */ jsx(ExpandablePanel, { initiallyExpanded: expanded, title, innerClassName: "px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2", children: mapFormView });
@@ -18261,7 +18279,7 @@ function PopupFormFieldInternal({
     underlyingValueHasChanged: false,
     context: formContext,
     partOfArray: false,
-    minimalistView: false,
+    minimalistView: true,
     autoFocus: open
   } : void 0;
   let internalForm = /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx("div", { className: "w-[700px] max-w-full max-h-[85vh]", children: /* @__PURE__ */ jsxs("form", { onSubmit: handleSubmit, noValidate: true, children: [
@@ -18313,7 +18331,7 @@ function ClearFilterSortButton(t0) {
   if ((filterIsSet || sortIsSet) && (tableController.clearFilter || tableController.setSortBy)) {
     let label;
     if (filterIsSet && sortIsSet) {
-      label = "Clear filter and sort";
+      label = "Clear filter/sort";
     } else {
       if (filterIsSet) {
         label = "Clear filter";