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

package/dist/types/collections.d.ts

@@ -289,6 +289,10 @@ export interface EntityCollection<M extends Record<string, any> = any, USER exte
      * Defaults to false.
      */
     alwaysApplyDefaultValues?: boolean;
+    /**
+     * If set to true, a tab including the JSON representation of the entity will be included.
+     */
+    includeJsonView?: boolean;
 }
 /**
  * Parameter passed to the `Actions` prop in the collection configuration.

package/dist/types/navigation.d.ts

@@ -49,6 +49,10 @@ export type NavigationController<EC extends EntityCollection = EntityCollection<
      * The collection is resolved from the given path or alias.
      */
     getCollection: (pathOrId: string, includeUserOverride?: boolean) => EC | undefined;
+    /**
+     * Get the top level collection configuration for a given id
+     */
+    getCollectionById: (id: string) => EC | undefined;
     /**
      * Get the collection configuration from its parent ids.
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.221",
+  "version": "3.0.0-canary.223",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -50,9 +50,9 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@firecms/editor": "^3.0.0-canary.221",
-    "@firecms/formex": "^3.0.0-canary.221",
-    "@firecms/ui": "^3.0.0-canary.221",
+    "@firecms/editor": "^3.0.0-canary.223",
+    "@firecms/formex": "^3.0.0-canary.223",
+    "@firecms/ui": "^3.0.0-canary.223",
     "@hello-pangea/dnd": "^17.0.0",
     "@radix-ui/react-portal": "^1.1.3",
     "clsx": "^2.1.1",
@@ -105,7 +105,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "2734014b372cfc49275621a9a6113e8f3cb3ee4e",
+  "gitHead": "279654356c6a23355aab5fcf78d1171339025610",
   "publishConfig": {
     "access": "public"
   },

package/src/components/common/default_entity_actions.tsx

@@ -2,7 +2,7 @@ import { DeleteIcon, EditIcon, FileCopyIcon } from "@firecms/ui";
 import { EntityAction } from "../../types";
 import { DeleteEntityDialog } from "../DeleteEntityDialog";
 import { addRecentId } from "../EntityCollectionView/utils";
-import { navigateToEntity } from "../../util";
+import { navigateToEntity, resolveDefaultSelectedView } from "../../util";
 
 export const editEntityAction: EntityAction = {
     icon: <EditIcon/>,
@@ -30,7 +30,14 @@ export const editEntityAction: EntityAction = {
             addRecentId(collection.id, entity.id);
         }
 
-        const path = collection?.collectionGroup ? entity.path : (fullPath ?? entity.path)
+        const path = collection?.collectionGroup ? entity.path : (fullPath ?? entity.path);
+        const defaultSelectedView = resolveDefaultSelectedView(
+            collection ? collection.defaultSelectedView : undefined,
+            {
+                status: "existing",
+                entityId: entity.id,
+            }
+        );
         navigateToEntity({
             openEntityMode,
             collection,
@@ -38,7 +45,8 @@ export const editEntityAction: EntityAction = {
             path,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),
-            navigation: context.navigation
+            navigation: context.navigation,
+            selectedTab: defaultSelectedView
         });
 
         return Promise.resolve(undefined);

package/src/core/EntityEditView.tsx

@@ -179,7 +179,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
     const subcollectionsCount = subcollections?.length ?? 0;
     const customViews = collection.entityViews;
     const customViewsCount = customViews?.length ?? 0;
-    const includeJsonView = true;
+    const includeJsonView = collection.includeJsonView === undefined ? true : collection.includeJsonView;
     const hasAdditionalViews = customViewsCount > 0 || subcollectionsCount > 0 || includeJsonView;
 
     const {

package/src/hooks/useBuildNavigationController.tsx

@@ -291,6 +291,16 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
 
     }, [userConfigPersistence]);
 
+    const getCollectionById = useCallback((id: string): EC | undefined => {
+        const collections = collectionsRef.current;
+        if (collections === undefined)
+            throw Error("getCollectionById: Collections have not been initialised yet");
+        const collection: EntityCollection | undefined = collections.find(c => c.id === id);
+        if (!collection)
+            return undefined;
+        return collection as EC;
+    }, []);
+
     const getCollectionFromPaths = useCallback(<EC extends EntityCollection>(pathSegments: string[]): EC | undefined => {
 
         const collections = collectionsRef.current;
@@ -398,6 +408,7 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
         baseCollectionPath,
         initialised,
         getCollection,
+        getCollectionById,
         getCollectionFromPaths,
         getCollectionFromIds,
         isUrlCollectionPath,

package/src/routes/FireCMSRoute.tsx

@@ -13,6 +13,7 @@ import { useBreadcrumbsController } from "../hooks/useBreadcrumbsController";
 import { toArray } from "../util/arrays";
 import { EntityCollectionView, NotFoundPage } from "../components";
 import { UnsavedChangesDialog } from "../components/UnsavedChangesDialog";
+import { EntityCollection } from "../types";
 
 export function FireCMSRoute() {
 
@@ -68,7 +69,10 @@ export function FireCMSRoute() {
     }
 
     if (navigationEntries.length === 1 && navigationEntries[0].type === "collection") {
-        const collection = navigation.getCollection(navigationEntries[0].path);
+        let collection: EntityCollection<any> | undefined;
+        collection = navigation.getCollectionById(navigationEntries[0].id);
+        if (!collection)
+            collection = navigation.getCollection(navigationEntries[0].path);
         if (!collection)
             return null;
         return <EntityCollectionView
@@ -84,7 +88,11 @@ export function FireCMSRoute() {
     if (isSidePanel) {
         const lastCollectionEntry = navigationEntries.findLast((entry) => entry.type === "collection");
         if (lastCollectionEntry) {
-            const collection = navigation.getCollection(lastCollectionEntry.path);
+            let collection: EntityCollection<any> | undefined;
+            const firstEntry = navigationEntries[0] as NavigationViewCollectionInternal<any>;
+            collection = navigation.getCollectionById(firstEntry.id);
+            if (!collection)
+                collection = navigation.getCollection(firstEntry.path);
             if (!collection)
                 return null;
             return <EntityCollectionView

package/src/types/collections.ts

@@ -332,6 +332,11 @@ export interface EntityCollection<M extends Record<string, any> = any, USER exte
      * Defaults to false.
      */
     alwaysApplyDefaultValues?: boolean;
+
+    /**
+     * If set to true, a tab including the JSON representation of the entity will be included.
+     */
+    includeJsonView?: boolean;
 }
 
 /**

package/src/types/navigation.ts

@@ -59,6 +59,11 @@ export type NavigationController<EC extends EntityCollection = EntityCollection<
      */
     getCollection: (pathOrId: string, includeUserOverride?: boolean) => EC | undefined;
 
+    /**
+     * Get the top level collection configuration for a given id
+     */
+    getCollectionById: (id: string) => EC | undefined;
+
     /**
      * Get the collection configuration from its parent ids.
      */

package/src/util/navigation_from_path.ts

@@ -51,7 +51,11 @@ export function getNavigationEntriesFromPath(props: {
     for (let i = 0; i < subpathCombinations.length; i++) {
         const subpathCombination = subpathCombinations[i];
 
-        const collection: EntityCollection<any> | undefined = collections && collections.find((entry) => entry.id === subpathCombination || entry.path === subpathCombination);
+        let collection: EntityCollection<any> | undefined;
+        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;