@firecms/core 3.0.0-canary.221 → 3.0.0-canary.223

package/dist/index.es.js

@@ -879,7 +879,11 @@ function getNavigationEntriesFromPath(props) {
   const result = [];
   for (let i = 0; i < subpathCombinations.length; i++) {
     const subpathCombination = subpathCombinations[i];
-    const collection = collections && collections.find((entry) => entry.id === subpathCombination || entry.path === subpathCombination);
+    let collection;
+    collection = collections && collections.find((entry) => entry.id === subpathCombination);
+    if (!collection) {
+      collection = collections && collections.find((entry) => entry.path === subpathCombination);
+    }
     if (collection) {
       const pathOrAlias = collection.id ?? collection.path;
       const collectionPath = currentFullPath && currentFullPath.length > 0 ? currentFullPath + "/" + pathOrAlias : pathOrAlias;
@@ -12204,6 +12208,10 @@ const editEntityAction = {
       addRecentId(collection.id, entity.id);
     }
     const path = collection?.collectionGroup ? entity.path : fullPath ?? entity.path;
+    const defaultSelectedView = resolveDefaultSelectedView(collection ? collection.defaultSelectedView : void 0, {
+      status: "existing",
+      entityId: entity.id
+    });
     navigateToEntity({
       openEntityMode,
       collection,
@@ -12211,7 +12219,8 @@ const editEntityAction = {
       path,
       sideEntityController: context.sideEntityController,
       onClose: () => unhighlightEntity?.(entity),
-      navigation: context.navigation
+      navigation: context.navigation,
+      selectedTab: defaultSelectedView
     });
     return Promise.resolve(void 0);
   }
@@ -20206,29 +20215,36 @@ function useBuildNavigationController(props) {
       ...result
     };
   }, [userConfigPersistence]);
-  const getCollectionFromPaths = useCallback((pathSegments) => {
+  const getCollectionById = useCallback((id) => {
     const collections_1 = collectionsRef.current;
-    if (collections_1 === void 0) throw Error("getCollectionFromPaths: Collections have not been initialised yet");
-    let currentCollections = [...collections_1 ?? []];
+    if (collections_1 === void 0) throw Error("getCollectionById: Collections have not been initialised yet");
+    const collection_0 = collections_1.find((c2) => c2.id === id);
+    if (!collection_0) return void 0;
+    return collection_0;
+  }, []);
+  const getCollectionFromPaths = useCallback((pathSegments) => {
+    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];
-      const collection_0 = currentCollections.find((c2) => c2.id === pathSegment || c2.path === pathSegment);
-      if (!collection_0) return void 0;
-      currentCollections = collection_0.subcollections;
-      if (i === pathSegments.length - 1) return collection_0;
+      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;
     }
     return void 0;
   }, []);
   const getCollectionFromIds = useCallback((ids) => {
-    const collections_2 = collectionsRef.current;
-    if (collections_2 === void 0) throw Error("getCollectionFromIds: Collections have not been initialised yet");
-    let currentCollections_0 = [...collections_2 ?? []];
+    const collections_3 = collectionsRef.current;
+    if (collections_3 === void 0) throw Error("getCollectionFromIds: Collections have not been initialised yet");
+    let currentCollections_0 = [...collections_3 ?? []];
     for (let i_0 = 0; i_0 < ids.length; i_0++) {
-      const id = ids[i_0];
-      const collection_1 = currentCollections_0.find((c_0) => c_0.id === id);
-      if (!collection_1) return void 0;
-      currentCollections_0 = collection_1.subcollections;
-      if (i_0 === ids.length - 1) return collection_1;
+      const id_0 = ids[i_0];
+      const collection_2 = currentCollections_0.find((c_1) => c_1.id === id_0);
+      if (!collection_2) return void 0;
+      currentCollections_0 = collection_2.subcollections;
+      if (i_0 === ids.length - 1) return collection_2;
     }
     return void 0;
   }, []);
@@ -20238,14 +20254,14 @@ function useBuildNavigationController(props) {
     throw Error("Expected path starting with " + fullCollectionPath);
   }, [fullCollectionPath]);
   const resolveIdsFrom = useCallback((path_3) => {
-    const collections_3 = collectionsRef.current ?? [];
-    return resolveCollectionPathIds(path_3, collections_3);
+    const collections_4 = collectionsRef.current ?? [];
+    return resolveCollectionPathIds(path_3, collections_4);
   }, []);
   const getAllParentReferencesForPath = useCallback((path_4) => {
-    const collections_4 = collectionsRef.current ?? [];
+    const collections_5 = collectionsRef.current ?? [];
     return getParentReferencesFromPath({
       path: path_4,
-      collections: collections_4
+      collections: collections_5
     });
   }, []);
   const getParentCollectionIds = useCallback((path_5) => {
@@ -20259,15 +20275,15 @@ function useBuildNavigationController(props) {
     return result_0.map((r) => getCollectionFromPaths(r)?.id).filter(Boolean);
   }, [getAllParentReferencesForPath]);
   const convertIdsToPaths = useCallback((ids_0) => {
-    const collections_5 = collectionsRef.current;
-    let currentCollections_1 = collections_5;
+    const collections_6 = collectionsRef.current;
+    let currentCollections_1 = collections_6;
     const paths = [];
     for (let i_3 = 0; i_3 < ids_0.length; i_3++) {
-      const id_0 = ids_0[i_3];
-      const collection_2 = currentCollections_1.find((c_1) => c_1.id === id_0);
-      if (!collection_2) throw Error(`Collection with id ${id_0} not found`);
-      paths.push(collection_2.path);
-      currentCollections_1 = collection_2.subcollections;
+      const id_1 = ids_0[i_3];
+      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);
+      currentCollections_1 = collection_3.subcollections;
     }
     return paths;
   }, [getCollectionFromIds]);
@@ -20282,6 +20298,7 @@ function useBuildNavigationController(props) {
     baseCollectionPath,
     initialised,
     getCollection,
+    getCollectionById,
     getCollectionFromPaths,
     getCollectionFromIds,
     isUrlCollectionPath,
@@ -21285,7 +21302,7 @@ function EntityEditViewInner({
   const subcollectionsCount = subcollections?.length ?? 0;
   const customViews = collection.entityViews;
   const customViewsCount = customViews?.length ?? 0;
-  const includeJsonView = true;
+  const includeJsonView = collection.includeJsonView === void 0 ? true : collection.includeJsonView;
   const hasAdditionalViews = customViewsCount > 0 || subcollectionsCount > 0 || includeJsonView;
   const {
     resolvedEntityViews,
@@ -21384,15 +21401,16 @@ function EntityEditViewInner({
   }, Builder: selectedSecondaryForm?.Builder });
   const subcollectionTabs = subcollections && subcollections.map((subcollection_0) => /* @__PURE__ */ jsx(Tab, { className: "text-sm min-w-[120px]", value: subcollection_0.id, children: subcollection_0.name }, `entity_detail_collection_tab_${subcollection_0.name}`));
   const customViewTabs = resolvedEntityViews.map((view) => /* @__PURE__ */ jsx(Tab, { className: "text-sm min-w-[120px]", value: view.key, children: view.name }, `entity_detail_collection_tab_${view.name}`));
+  const shouldShowTopBar = Boolean(barActions) || hasAdditionalViews;
   let result = /* @__PURE__ */ jsxs("div", { className: "relative flex flex-col h-full w-full bg-white dark:bg-surface-900", children: [
-    /* @__PURE__ */ jsxs("div", { className: cls("h-14 flex overflow-visible overflow-x-scroll w-full no-scrollbar h-14 border-b pl-2 pr-2 pt-1 flex items-end bg-surface-50 dark:bg-surface-900", defaultBorderMixin), children: [
+    shouldShowTopBar && /* @__PURE__ */ jsxs("div", { className: cls("h-14 flex overflow-visible overflow-x-scroll w-full no-scrollbar h-14 border-b pl-2 pr-2 pt-1 flex items-end bg-surface-50 dark:bg-surface-900", defaultBorderMixin), children: [
       barActions,
       /* @__PURE__ */ jsx("div", { className: "flex-grow" }),
       globalLoading && /* @__PURE__ */ jsx("div", { className: "self-center", children: /* @__PURE__ */ jsx(CircularProgress, { size: "small" }) }),
-      /* @__PURE__ */ jsxs(Tabs, { value: selectedTab, onValueChange: (value_1) => {
+      hasAdditionalViews && /* @__PURE__ */ jsxs(Tabs, { value: selectedTab, onValueChange: (value_1) => {
         onSideTabClick(value_1);
       }, children: [
-        /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: JSON_TAB_VALUE, innerClassName: "block", className: "text-sm", children: /* @__PURE__ */ jsx(CodeIcon, { size: "small" }) }),
+        includeJsonView && /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: JSON_TAB_VALUE, innerClassName: "block", className: "text-sm", children: /* @__PURE__ */ jsx(CodeIcon, { size: "small" }) }),
         /* @__PURE__ */ jsx(Tab, { disabled: !hasAdditionalViews, value: MAIN_TAB_VALUE, className: "text-sm min-w-[120px]", children: collection.singularName ?? collection.name }),
         customViewTabs,
         subcollectionTabs
@@ -23031,7 +23049,7 @@ function getFieldId(property) {
   return getDefaultFieldId(property);
 }
 function FireCMSRoute() {
-  const $ = c(32);
+  const $ = c(33);
   const location = useLocation$1();
   const navigation = useNavigationController();
   const breadcrumbs = useBreadcrumbsController();
@@ -23144,7 +23162,11 @@ function FireCMSRoute() {
     if ($[18] !== navigation || $[19] !== navigationEntries) {
       t7 = Symbol.for("react.early_return_sentinel");
       bb0: {
-        const collection = navigation.getCollection(navigationEntries[0].path);
+        let collection;
+        collection = navigation.getCollectionById(navigationEntries[0].id);
+        if (!collection) {
+          collection = navigation.getCollection(navigationEntries[0].path);
+        }
         if (!collection) {
           t7 = null;
           break bb0;
@@ -23172,48 +23194,56 @@ function FireCMSRoute() {
     return t62;
   }
   if (isSidePanel) {
-    let t62;
-    if ($[23] !== navigation || $[24] !== navigationEntries) {
-      t62 = Symbol.for("react.early_return_sentinel");
-      bb1: {
-        const lastCollectionEntry = navigationEntries.findLast(_temp2$1);
-        if (lastCollectionEntry) {
-          const collection_0 = navigation.getCollection(lastCollectionEntry.path);
+    const lastCollectionEntry = navigationEntries.findLast(_temp2$1);
+    if (lastCollectionEntry) {
+      let t62;
+      let t7;
+      if ($[23] !== navigation || $[24] !== navigationEntries) {
+        t7 = Symbol.for("react.early_return_sentinel");
+        bb1: {
+          let collection_0;
+          const firstEntry = navigationEntries[0];
+          collection_0 = navigation.getCollectionById(firstEntry.id);
           if (!collection_0) {
-            t62 = null;
+            collection_0 = navigation.getCollection(firstEntry.path);
+          }
+          if (!collection_0) {
+            t7 = null;
             break bb1;
           }
-          let t7;
-          if ($[26] === Symbol.for("react.memo_cache_sentinel")) {
-            t7 = [];
-            $[26] = t7;
+          let t8;
+          if ($[27] === Symbol.for("react.memo_cache_sentinel")) {
+            t8 = [];
+            $[27] = t8;
           } else {
-            t7 = $[26];
+            t8 = $[27];
           }
-          t62 = /* @__PURE__ */ jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t7, fullPath: collection_0.id, updateUrl: true, ...collection_0, Actions: toArray(collection_0.Actions) }, `collection_view_${collection_0.id ?? collection_0.path}`);
-          break bb1;
+          t62 = /* @__PURE__ */ jsx(EntityCollectionView, { isSubCollection: false, parentCollectionIds: t8, fullPath: collection_0.id, updateUrl: true, ...collection_0, Actions: toArray(collection_0.Actions) }, `collection_view_${collection_0.id ?? collection_0.path}`);
         }
+        $[23] = navigation;
+        $[24] = navigationEntries;
+        $[25] = t62;
+        $[26] = t7;
+      } else {
+        t62 = $[25];
+        t7 = $[26];
+      }
+      if (t7 !== Symbol.for("react.early_return_sentinel")) {
+        return t7;
       }
-      $[23] = navigation;
-      $[24] = navigationEntries;
-      $[25] = t62;
-    } else {
-      t62 = $[25];
-    }
-    if (t62 !== Symbol.for("react.early_return_sentinel")) {
       return t62;
     }
   }
   let t6;
-  if ($[27] !== isCopy || $[28] !== isNew || $[29] !== navigationEntries || $[30] !== pathname) {
+  if ($[28] !== isCopy || $[29] !== isNew || $[30] !== navigationEntries || $[31] !== pathname) {
     t6 = /* @__PURE__ */ jsx(EntityFullScreenRoute, { pathname, navigationEntries, isNew, isCopy });
-    $[27] = isCopy;
-    $[28] = isNew;
-    $[29] = navigationEntries;
-    $[30] = pathname;
-    $[31] = t6;
+    $[28] = isCopy;
+    $[29] = isNew;
+    $[30] = navigationEntries;
+    $[31] = pathname;
+    $[32] = t6;
   } else {
-    t6 = $[31];
+    t6 = $[32];
   }
   return t6;
 }