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

package/dist/util/navigation_utils.d.ts

@@ -18,13 +18,14 @@ export declare function getCollectionByPathOrId(pathOrId: string, collections: E
  * @param subpaths
  */
 export declare function getCollectionPathsCombinations(subpaths: string[]): string[];
-export declare function navigateToEntity({ openEntityMode, collection, entityId, copy, path, selectedTab, sideEntityController, onClose, navigation }: {
+export declare function navigateToEntity({ openEntityMode, collection, entityId, copy, path, fullIdPath, selectedTab, sideEntityController, onClose, navigation }: {
     openEntityMode: "side_panel" | "full_screen";
     collection?: EntityCollection;
     entityId?: string;
     selectedTab?: string;
     copy?: boolean;
     path: string;
+    fullIdPath?: string;
     sideEntityController: SideEntityController;
     onClose?: () => void;
     navigation: NavigationController;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.227",
+  "version": "3.0.0-canary.228",
   "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.227",
-    "@firecms/formex": "^3.0.0-canary.227",
-    "@firecms/ui": "^3.0.0-canary.227",
+    "@firecms/editor": "^3.0.0-canary.228",
+    "@firecms/formex": "^3.0.0-canary.228",
+    "@firecms/ui": "^3.0.0-canary.228",
     "@hello-pangea/dnd": "^17.0.0",
     "@radix-ui/react-portal": "^1.1.3",
     "clsx": "^2.1.1",
@@ -105,7 +105,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "7bd583a9a6d3edb89a5872aebd2c358bff4f1b09",
+  "gitHead": "6b0cda6fb616bccabeb7e082b7ff589b3475cfa0",
   "publishConfig": {
     "access": "public"
   },

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -93,6 +93,10 @@ export type EntityCollectionViewProps<M extends Record<string, any>> = {
      * It defaults to the collection path if not provided.
      */
     fullPath?: string;
+    /**
+     * Full path using navigation ids.
+     */
+    fullIdPath?: string;
     /**
      * If this is a subcollection, specify the parent collection ids.
      */
@@ -138,6 +142,7 @@ export type EntityCollectionViewProps<M extends Record<string, any>> = {
 export const EntityCollectionView = React.memo(
     function EntityCollectionView<M extends Record<string, any>>({
                                                                      fullPath: fullPathProp,
+                                                                     fullIdPath,
                                                                      parentCollectionIds,
                                                                      isSubCollection,
                                                                      className,
@@ -146,6 +151,7 @@ export const EntityCollectionView = React.memo(
                                                                  }: EntityCollectionViewProps<M>
     ) {
 
+
         const context = useFireCMSContext();
         const navigation = useNavigationController();
         const fullPath = fullPathProp ?? collectionProp.path;
@@ -240,6 +246,7 @@ export const EntityCollectionView = React.memo(
             navigateToEntity({
                 navigation,
                 path,
+                fullIdPath,
                 sideEntityController,
                 openEntityMode,
                 collection,
@@ -259,6 +266,7 @@ export const EntityCollectionView = React.memo(
                 collection,
                 entityId: undefined,
                 path: fullPath,
+                fullIdPath,
                 sideEntityController,
                 navigation,
                 onClose: unselectNavigatedEntity
@@ -426,6 +434,7 @@ export const EntityCollectionView = React.memo(
                                         entityId: entity.id,
                                         selectedTab: subcollection.id ?? subcollection.path,
                                         path: fullPath,
+                                        fullIdPath,
                                         navigation,
                                         sideEntityController
                                     })
@@ -529,7 +538,7 @@ export const EntityCollectionView = React.memo(
                     highlightEntity={setHighlightedEntity}
                     unhighlightEntity={unselectNavigatedEntity}
                     collection={collection}
-                    fullPath={fullPath}
+                    fullPath={fullIdPath ?? fullPath}
                     actions={actions}
                     hideId={collection?.hideIdFromCollection}
                     onCollectionChange={updateLastDeleteTimestamp}
@@ -693,6 +702,7 @@ export const EntityCollectionView = React.memo(
                     getIdColumnWidth={getIdColumnWidth}
                     additionalIDHeaderWidget={<EntityIdHeaderWidget
                         path={fullPath}
+                        fullIdPath={fullIdPath ?? fullPath}
                         collection={collection}/>}
                     openEntityMode={openEntityMode}
                 />
@@ -809,10 +819,12 @@ function buildPropertyWidthOverwrite(key: string, width: number): PartialEntityC
 
 function EntityIdHeaderWidget({
                                   collection,
-                                  path
+                                  path,
+                                  fullIdPath
                               }: {
     collection: EntityCollection,
-    path: string
+    path: string,
+    fullIdPath: string
 }) {
 
     const navigation = useNavigationController();
@@ -850,6 +862,7 @@ function EntityIdHeaderWidget({
                                   collection,
                                   entityId,
                                   path,
+                                  fullIdPath,
                                   sideEntityController,
                                   navigation
                               })
@@ -884,6 +897,7 @@ function EntityIdHeaderWidget({
                                                       collection,
                                                       entityId: id,
                                                       path,
+                                                      fullIdPath,
                                                       sideEntityController,
                                                       navigation
                                                   })

package/src/components/common/default_entity_actions.tsx

@@ -43,6 +43,7 @@ export const editEntityAction: EntityAction = {
             collection,
             entityId: entity.id,
             path,
+            fullIdPath: path,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),
             navigation: context.navigation,
@@ -78,6 +79,7 @@ export const copyEntityAction: EntityAction = {
             collection,
             entityId: entity.id,
             path,
+            fullIdPath: path,
             copy: true,
             sideEntityController: context.sideEntityController,
             onClose: () => unhighlightEntity?.(entity),

package/src/core/EntityEditView.tsx

@@ -45,6 +45,10 @@ export type OnTabChangeParams<M extends Record<string, any>> = {
 
 export interface EntityEditViewProps<M extends Record<string, any>> {
     path: string;
+    /**
+     * The navigation path to the entity.
+     */
+    fullIdPath?: string;
     collection: EntityCollection<M>;
     entityId?: string;
     databaseId?: string;
@@ -119,6 +123,7 @@ export function EntityEditView<M extends Record<string, any>, USER extends User>
 
 export function EntityEditViewInner<M extends Record<string, any>>({
                                                                        path,
+                                                                       fullIdPath,
                                                                        entityId,
                                                                        selectedTab: selectedTabProp,
                                                                        collection,
@@ -272,7 +277,9 @@ export function EntityEditViewInner<M extends Record<string, any>>({
 
     const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
         const subcollectionId = subcollection.id ?? subcollection.path;
-        const fullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : undefined;
+        const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : undefined;
+        const newFullIdPath = fullIdPath ? `${fullIdPath}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : undefined;
+
         if (selectedTab !== subcollectionId) return null;
         return (
             <div
@@ -283,9 +290,10 @@ export function EntityEditViewInner<M extends Record<string, any>>({
                 {globalLoading && <CircularProgressCenter/>}
 
                 {!globalLoading &&
-                    (usedEntity && fullPath
+                    (usedEntity && newFullPath
                         ? <EntityCollectionView
-                            fullPath={fullPath}
+                            fullPath={newFullPath}
+                            fullIdPath={newFullIdPath}
                             parentCollectionIds={[...parentCollectionIds, collection.id]}
                             isSubCollection={true}
                             updateUrl={false}
@@ -307,7 +315,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
         setSelectedTab(value);
         if (status === "existing") {
             onTabChange?.({
-                path,
+                path: fullIdPath ?? path,
                 entityId,
                 selectedTab: value === MAIN_TAB_VALUE ? undefined : value,
                 collection

package/src/internal/useBuildSideEntityController.tsx

@@ -233,6 +233,7 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
         if (navigationEntry.type === "entity") {
             sidePanel = {
                 path: navigationEntry.path,
+                // fullIdPath: navigationEntry.path,
                 entityId: navigationEntry.entityId,
                 copy: false,
                 width: navigationEntry.parentCollection?.sideDialogWidth
@@ -254,6 +255,7 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
     if (newFlag) {
         sidePanel = {
             path: lastCollectionPath,
+            // fullIdPath: lastCollectionPath,
             copy: false
         }
     }
@@ -274,16 +276,13 @@ const propsToSidePanel = (props: EntitySidePanelProps,
     const newPath = props.entityId
         ? buildUrlCollectionPath(`${collectionPath}/${props.entityId}${props.selectedTab ? "/" + props.selectedTab : ""}#${SIDE_URL_HASH}`)
         : buildUrlCollectionPath(`${collectionPath}#${NEW_URL_HASH}`);
-    const resolvedPath = resolveIdsFrom(props.path);
 
     const resolvedPanelProps: EntitySidePanelProps<any> = {
         ...props,
-        path: resolvedPath,
         formProps: props.formProps
     };
 
     const entityViewWidth = getEntityViewWidth(props, smallLayout, customizationController, authController);
-
     return {
         key: `${props.path}/${props.entityId}`,
         component: <EntitySidePanel {...resolvedPanelProps}/>,

package/src/routes/FireCMSRoute.tsx

@@ -97,6 +97,7 @@ export function FireCMSRoute() {
                 return null;
             return <EntityCollectionView
                 key={`collection_view_${collection.id ?? collection.path}`}
+                fullIdPath={collection.id}
                 isSubCollection={false}
                 parentCollectionIds={[]}
                 fullPath={collection.id}
@@ -197,12 +198,14 @@ function EntityFullScreenRoute({
     }
 
     const collection = isNew ? lastCollectionEntry!.collection : lastEntityEntry!.parentCollection;
-    const collectionPath = navigation.resolveIdsFrom(isNew ? lastCollectionEntry!.path : lastEntityEntry!.path);
+    const fullIdPath = isNew ? lastCollectionEntry!.path : lastEntityEntry!.path;
+    const collectionPath = navigation.resolveIdsFrom(fullIdPath);
 
     return <>
         <EntityEditView
             key={collection.id + "_" + (isNew ? "new" : (isCopy ? entityId + "_copy" : entityId))}
             entityId={isNew ? undefined : entityId}
+            fullIdPath={fullIdPath}
             collection={collection}
             layout={"full_screen"}
             path={collectionPath}

package/src/types/side_entity_controller.tsx

@@ -20,6 +20,11 @@ export interface EntitySidePanelProps<M extends Record<string, any> = any> {
      */
     entityId?: string;
 
+    // /**
+    //  * Navigation path with ids of the entity
+    //  */
+    // fullIdPath: string;
+
     /**
      * Set this flag to true if you want to make a copy of an existing entity
      */

package/src/util/navigation_utils.ts

@@ -102,6 +102,7 @@ export function resolveCollectionPathIds(path: string, allCollections: EntityCol
     // Default case - couldn't match subcollection
     return `${matchingCollection.path}/${entityId}/${remainingPath.join("/")}`;
 }
+
 /**
  * Find the corresponding view at any depth for a given path.
  * Note that path or segments of the paths can be collection aliases.
@@ -161,6 +162,7 @@ export function navigateToEntity({
                                      entityId,
                                      copy,
                                      path,
+                                     fullIdPath,
                                      selectedTab,
                                      sideEntityController,
                                      onClose,
@@ -174,6 +176,7 @@ export function navigateToEntity({
                                      selectedTab?: string;
                                      copy?: boolean;
                                      path: string;
+                                     fullIdPath?: string;
                                      sideEntityController: SideEntityController;
                                      onClose?: () => void;
                                      navigation: NavigationController
@@ -183,7 +186,8 @@ export function navigateToEntity({
 
         sideEntityController.open({
             entityId,
-            path,
+            path: fullIdPath ?? path,
+            // fullIdPath,
             copy,
             selectedTab,
             collection,
@@ -192,7 +196,7 @@ export function navigateToEntity({
         });
 
     } else {
-        let to = navigation.buildUrlCollectionPath(entityId ? `${path}/${entityId}` : path);
+        let to = navigation.buildUrlCollectionPath(entityId ? `${fullIdPath ?? path}/${entityId}` : fullIdPath ?? path);
         if (entityId && selectedTab) {
             to += `/${selectedTab}`;
         }