@firecms/core 3.0.0-canary.198 → 3.0.0-canary.199

package/dist/util/navigation_from_path.d.ts

@@ -18,6 +18,7 @@ export interface NavigationViewEntityCustomInternal<M extends Record<string, any
     type: "custom_view";
     path: string;
     fullPath: string;
+    entityId: string;
     view: EntityCustomView<M>;
 }
 export declare function getNavigationEntriesFromPath(props: {

package/package.json

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

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -348,7 +348,7 @@ export const EntityCollectionView = React.memo(
             const updatedValues = setIn({ ...entity.values }, propertyKey, value);
 
             const saveProps: SaveEntityProps = {
-                path: fullPath,
+                path: entity.path ?? fullPath,
                 entityId: entity.id,
                 values: updatedValues,
                 previousValues: entity.values,

package/src/form/EntityForm.tsx

@@ -494,77 +494,76 @@ export function EntityForm<M extends Record<string, any>>({
     const formFieldKeys = getFormFieldKeys(resolvedCollection);
 
     const formFields = () => (
-            <FormLayout>
-                {formFieldKeys.map((key) => {
-                    const property = resolvedCollection.properties[key];
-                    if (property) {
-                        const underlyingValueHasChanged: boolean =
-                            !!underlyingChanges &&
-                            Object.keys(underlyingChanges).includes(key) &&
-                            formex.touched[key];
-                        const disabled = (!autoSave && formex.isSubmitting) || isReadOnly(property) || Boolean(property.disabled);
-                        const hidden = isHidden(property);
-                        if (hidden) return null;
-                        const widthPercentage = property.widthPercentage ?? 100;
-                        const cmsFormFieldProps: PropertyFieldBindingProps<any, M> = {
-                            propertyKey: key,
-                            disabled,
-                            property,
-                            includeDescription: property.description || property.longDescription,
-                            underlyingValueHasChanged: underlyingValueHasChanged && !autoSave,
-                            context: formContext,
-                            partOfArray: false,
-                            minimalistView: false,
-                            autoFocus: false
-                        };
-
-                        return (
-                            <FormEntry propertyKey={key}
-                                       widthPercentage={widthPercentage}
-                                       key={`field_${key}`}>
-                                <PropertyFieldBinding {...cmsFormFieldProps} />
-                            </FormEntry>
-                        );
-                    }
+        <FormLayout>
+            {formFieldKeys.map((key) => {
+                const property = resolvedCollection.properties[key];
+                if (property) {
+                    const underlyingValueHasChanged: boolean =
+                        !!underlyingChanges &&
+                        Object.keys(underlyingChanges).includes(key) &&
+                        formex.touched[key];
+                    const disabled = (!autoSave && formex.isSubmitting) || isReadOnly(property) || Boolean(property.disabled);
+                    const hidden = isHidden(property);
+                    if (hidden) return null;
+                    const widthPercentage = property.widthPercentage ?? 100;
+                    const cmsFormFieldProps: PropertyFieldBindingProps<any, M> = {
+                        propertyKey: key,
+                        disabled,
+                        property,
+                        includeDescription: property.description || property.longDescription,
+                        underlyingValueHasChanged: underlyingValueHasChanged && !autoSave,
+                        context: formContext,
+                        partOfArray: false,
+                        minimalistView: false,
+                        autoFocus: false
+                    };
+
+                    return (
+                        <FormEntry propertyKey={key}
+                                   widthPercentage={widthPercentage}
+                                   key={`field_${key}`}>
+                            <PropertyFieldBinding {...cmsFormFieldProps} />
+                        </FormEntry>
+                    );
+                }
 
-                    const additionalField = resolvedCollection.additionalFields?.find(f => f.key === key);
-                    if (additionalField && entity) {
-                        const Builder = additionalField.Builder;
-                        if (!Builder && !additionalField.value) {
-                            throw new Error("When using additional fields you need to provide a Builder or a value");
-                        }
-                        const child = Builder
-                            ? <Builder entity={entity} context={context}/>
-                            : <div className={"w-full"}>
-                                {additionalField.value?.({
-                                    entity,
-                                    context
-                                })?.toString()}
-                            </div>;
-
-                        return (
-                            <div key={`additional_${key}`} className={"w-full"}>
-                                <LabelWithIconAndTooltip
-                                    propertyKey={key}
-                                    icon={<NotesIcon size={"small"}/>}
-                                    title={additionalField.name}
-                                    className={"text-text-secondary dark:text-text-secondary-dark ml-3.5"}/>
-                                <div
-                                    className={cls(paperMixin, "w-full min-h-14 p-4 md:p-6 overflow-x-scroll no-scrollbar")}>
-                                    <ErrorBoundary>
-                                        {child}
-                                    </ErrorBoundary>
-                                </div>
-                            </div>
-                        );
+                const additionalField = resolvedCollection.additionalFields?.find(f => f.key === key);
+                if (additionalField && entity) {
+                    const Builder = additionalField.Builder;
+                    if (!Builder && !additionalField.value) {
+                        throw new Error("When using additional fields you need to provide a Builder or a value");
                     }
+                    const child = Builder
+                        ? <Builder entity={entity} context={context}/>
+                        : <div className={"w-full"}>
+                            {additionalField.value?.({
+                                entity,
+                                context
+                            })?.toString()}
+                        </div>;
+
+                    return (
+                        <div key={`additional_${key}`} className={"w-full"}>
+                            <LabelWithIconAndTooltip
+                                propertyKey={key}
+                                icon={<NotesIcon size={"small"}/>}
+                                title={additionalField.name}
+                                className={"text-text-secondary dark:text-text-secondary-dark ml-3.5"}/>
+                            <div
+                                className={cls(paperMixin, "w-full min-h-14 p-4 md:p-6 overflow-x-scroll no-scrollbar")}>
+                                <ErrorBoundary>
+                                    {child}
+                                </ErrorBoundary>
+                            </div>
+                        </div>
+                    );
+                }
 
-                    console.warn(`Property ${key} not found in collection ${resolvedCollection.name} in properties or additional fields. Skipping.`);
-                    return null;
-                }).filter(Boolean)}
-            </FormLayout>
-        )
-    ;
+                console.warn(`Property ${key} not found in collection ${resolvedCollection.name} in properties or additional fields. Skipping.`);
+                return null;
+            }).filter(Boolean)}
+        </FormLayout>
+    );
 
     const formRef = useRef<HTMLDivElement>(null);
 

package/src/internal/useBuildSideEntityController.tsx

@@ -104,12 +104,10 @@ export const useBuildSideEntityController = (navigation: NavigationController,
                 const panelsFromUrl = buildSidePanelsFromUrl(entityOrCollectionPath, navigation.collections ?? [], newFlag);
                 for (let i = 0; i < panelsFromUrl.length; i++) {
                     const props = panelsFromUrl[i];
-                    // setTimeout(() => {
                     if (i === 0)
                         sideDialogsController.replace(propsToSidePanel(props, navigation.buildUrlCollectionPath, navigation.resolveIdsFrom, smallLayout));
                     else
                         sideDialogsController.open(propsToSidePanel(props, navigation.buildUrlCollectionPath, navigation.resolveIdsFrom, smallLayout))
-                    // }, 1);
                 }
             }
             initialised.current = true;

package/src/routes/FireCMSRoute.tsx

@@ -107,6 +107,19 @@ export function FireCMSRoute() {
 
 }
 
+function getSelectedTabFromUrl(isNew: boolean, lastCustomView: NavigationViewCollectionInternal<any> | NavigationViewEntityCustomInternal<any> | undefined) {
+    if (isNew) {
+        return undefined;
+    } else if (lastCustomView) {
+        if (lastCustomView.type === "custom_view") {
+            return lastCustomView.view.key;
+        } else if (lastCustomView.type === "collection") {
+            return lastCustomView.id ?? lastCustomView.path;
+        }
+    }
+    return undefined;
+}
+
 function EntityFullScreenRoute({
                                    pathname,
                                    navigationEntries,
@@ -136,7 +149,7 @@ function EntityFullScreenRoute({
 
     const entityId = lastEntityEntry?.entityId;
 
-    const urlTab = isNew ? undefined : (lastCustomView && "id" in lastCustomView ? lastCustomView?.id : undefined) ?? lastCustomView?.path;
+    const urlTab = getSelectedTabFromUrl(isNew, lastCustomView);
     const [selectedTab, setSelectedTab] = useState<string | undefined>(urlTab);
 
     const parentCollectionIds = navigation.getParentCollectionIds(navigationPath);

package/src/util/navigation_from_path.ts

@@ -27,6 +27,7 @@ export interface NavigationViewEntityCustomInternal<M extends Record<string, any
     type: "custom_view";
     path: string;
     fullPath: string;
+    entityId: string;
     view: EntityCustomView<M>;
 }
 
@@ -88,13 +89,11 @@ export function getNavigationEntriesFromPath(props: {
                         .filter(Boolean)
                         .find((entry) => entry!.key === newPath);
                     if (customView) {
-                        const path = currentFullPath && currentFullPath.length > 0
-                            ? (currentFullPath + "/" + customView.key)
-                            : customView.key;
                         result.push({
                             type: "custom_view",
-                            path,
-                            fullPath: fullPath + "/" + path,
+                            path: collectionPath,
+                            entityId: entityId,
+                            fullPath: fullPath + "/" + customView.key,
                             view: customView
                         });
                     } else if (collection.subcollections) {