@firecms/core 3.0.0-canary.182 → 3.0.0-canary.184

package/package.json

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

package/src/form/validation.ts

@@ -90,11 +90,11 @@ export function mapPropertyToYup<T extends CMSType>(propertyContext: PropertyCon
 }
 
 export function getYupMapObjectSchema({
-                                                                         property,
-                                                                         entityId,
-                                                                         customFieldValidator,
-                                                                         name
-                                                                     }: PropertyContext<Record<string, any>>): ObjectSchema<any> {
+                                          property,
+                                          entityId,
+                                          customFieldValidator,
+                                          name
+                                      }: PropertyContext<Record<string, any>>): ObjectSchema<any> {
     const objectSchema: any = {};
     const validation = property.validation;
     if (property.properties)
@@ -159,7 +159,13 @@ function getYupStringSchema({
         if (validation.lowercase) collection = collection.lowercase();
         if (validation.uppercase) collection = collection.uppercase();
         if (property.email) collection = collection.email(`${property.name} must be an email`);
-        if (property.url) collection = collection.url(`${property.name} must be a url`);
+        if (property.url) {
+            if (!property.storage || property.storage?.storeUrl) {
+                collection = collection.url(`${property.name} must be a url`);
+            } else {
+                console.warn(`Property ${property.name} has a url validation but its storage configuration is not set to store urls`);
+            }
+        }
     } else {
         collection = collection.notRequired().nullable(true);
     }

package/src/hooks/useBuildNavigationController.tsx

@@ -51,6 +51,11 @@ export type BuildNavigationContextProps<EC extends EntityCollection, USER extend
      * @param collections
      */
     injectCollections?: (collections: EntityCollection[]) => EntityCollection[];
+
+    /**
+     * If true, the navigation logic will not be updated until this flag is false
+     */
+    disabled?: boolean;
 };
 
 export function useBuildNavigationController<EC extends EntityCollection, USER extends User>(props: BuildNavigationContextProps<EC, USER>): NavigationController {
@@ -65,7 +70,8 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
         viewsOrder,
         userConfigPersistence,
         dataSourceDelegate,
-        injectCollections
+        injectCollections,
+        disabled
     } = props;
 
     const navigate = useNavigate();
@@ -189,7 +195,7 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
 
     const refreshNavigation = useCallback(async () => {
 
-        if (authController.initialLoading)
+        if (disabled || authController.initialLoading)
             return;
 
         console.debug("Refreshing navigation");
@@ -241,6 +247,7 @@ export function useBuildNavigationController<EC extends EntityCollection, USER e
         collectionPermissions,
         authController.user,
         authController.initialLoading,
+        disabled,
         viewsProp,
         adminViewsProp,
         computeTopNavigation,

package/src/preview/PropertyPreview.tsx

@@ -75,7 +75,14 @@ export const PropertyPreview = React.memo(function PropertyPreview<T extends CMS
     } else if (property.dataType === "string") {
         const stringProperty = property as ResolvedStringProperty;
         if (typeof value === "string") {
-            if (stringProperty.url) {
+            if (stringProperty.storage) {
+                const filePath = stringProperty.storage.previewUrl ? stringProperty.storage.previewUrl(value) : value;
+                content = <StorageThumbnail
+                    interactive={interactive}
+                    storeUrl={property.storage?.storeUrl ?? false}
+                    size={props.size}
+                    storagePathOrDownloadUrl={filePath}/>;
+            } else if (stringProperty.url) {
                 if (typeof stringProperty.url === "boolean")
                     content =
                         <UrlComponentPreview size={props.size}
@@ -88,13 +95,6 @@ export const PropertyPreview = React.memo(function PropertyPreview<T extends CMS
                                              previewType={stringProperty.url}/>;
             } else if (stringProperty.markdown) {
                 content = <Markdown source={value} size={"small"}/>;
-            } else if (stringProperty.storage) {
-                const filePath = stringProperty.storage.previewUrl ? stringProperty.storage.previewUrl(value) : value;
-                content = <StorageThumbnail
-                    interactive={interactive}
-                    storeUrl={property.storage?.storeUrl ?? false}
-                    size={props.size}
-                    storagePathOrDownloadUrl={filePath}/>;
             } else {
                 content = <StringPropertyPreview {...props}
                                                  property={stringProperty}

package/src/preview/property_previews/MapPropertyPreview.tsx

@@ -58,6 +58,7 @@ export function MapPropertyPreview<T extends Record<string, any> = Record<string
             {mapPropertyKeys &&
                 mapPropertyKeys.map((key, index) => {
                     const childProperty = mapProperty.properties![key];
+                    const isArrayOrMap = childProperty.dataType === "map" || childProperty === "array";
                     return (
                         <div
                             key={`map_preview_table_${key}}`}
@@ -75,7 +76,7 @@ export function MapPropertyPreview<T extends Record<string, any> = Record<string
                                 <div
                                     className="flex-grow max-w-[75%]">
                                     <ErrorBoundary>
-                                        {!(childProperty.dataType === "map" || childProperty === "array") &&
+                                        {!isArrayOrMap &&
                                             <PropertyPreview
                                                 propertyKey={key}
                                                 value={(value)[key]}
@@ -86,7 +87,7 @@ export function MapPropertyPreview<T extends Record<string, any> = Record<string
                                 </div>
                             </div>
 
-                            {(childProperty.dataType === "map" || childProperty === "array") &&
+                            {isArrayOrMap &&
                                 <div className={cls(defaultBorderMixin, "border-l pl-4 ml-2 my-2")}>
                                     <PropertyPreview
                                         propertyKey={key}

package/src/routes/FireCMSRoute.tsx

@@ -23,6 +23,7 @@ export function FireCMSRoute() {
     const hash = location.hash;
     const isSidePanel = hash.includes("#side");
     const isNew = hash.includes("#new") || hash.includes("#new_side");
+    const isCopy = hash.includes("#copy");
 
     const pathname = location.pathname;
     const navigationPath = navigation.urlPathToDataPath(pathname);
@@ -62,6 +63,7 @@ export function FireCMSRoute() {
             pathname={pathname}
             navigationEntries={navigationEntries}
             isNew={true}
+            isCopy={false}
         />;
     }
 
@@ -100,6 +102,7 @@ export function FireCMSRoute() {
         pathname={pathname}
         navigationEntries={navigationEntries}
         isNew={isNew}
+        isCopy={isCopy}
     />;
 
 }
@@ -107,11 +110,13 @@ export function FireCMSRoute() {
 function EntityFullScreenRoute({
                                    pathname,
                                    navigationEntries,
-                                   isNew
+                                   isNew,
+                                   isCopy
                                }: {
     pathname: string;
     navigationEntries: NavigationViewInternal[],
-    isNew: boolean
+    isNew: boolean,
+    isCopy: boolean
 }) {
 
     const navigation = useNavigationController();
@@ -160,34 +165,6 @@ function EntityFullScreenRoute({
         console.warn("Blocker not available, navigation will not be blocked");
     }
 
-    function updateUrl(entityId: string | undefined, newSelectedTab: string | undefined, replace: boolean, path: string, isNew: boolean) {
-
-        console.log("Updating url", {
-            entityId,
-            newSelectedTab,
-            replace,
-            basePath,
-            path,
-            isNew
-        });
-
-        if (!isNew && (newSelectedTab ?? null) === (selectedTab ?? null)) {
-            return;
-        }
-
-        if (isNew) {
-            navigate(`${basePath}/${entityId}`, { replace: replace });
-            return;
-        }
-
-        if (newSelectedTab) {
-            navigate(`${basePath}/${entityId}/${newSelectedTab}`, { replace: replace });
-        } else {
-            navigate(`${basePath}/${entityId}`, { replace: replace });
-        }
-
-    }
-
     const lastCollectionEntry = navigationEntries.findLast((entry) => entry.type === "collection");
 
     if (isNew && !lastCollectionEntry) {
@@ -203,19 +180,30 @@ function EntityFullScreenRoute({
 
     return <>
         <EntityEditView
-            key={collection.id + "_" + (isNew ? "new" : entityId)}
+            key={collection.id + "_" + (isNew ? "new" : (isCopy ? entityId + "_copy" : entityId))}
             entityId={isNew ? undefined : entityId}
             collection={collection}
             layout={"full_screen"}
             path={collectionPath}
+            copy={isCopy}
             selectedTab={selectedTab ?? undefined}
             onValuesModified={(modified) => blocked.current = modified}
             onSaved={(params) => {
-                updateUrl(params.entityId, params.selectedTab, true, params.path, isNew);
+                console.log("Entity saved", params);
+                navigate(`${basePath}/${params.entityId}`, { replace: true });
             }}
             onTabChange={(params) => {
-                updateUrl(params.entityId, params.selectedTab, !isNew, params.path, isNew);
+                // updateUrl(params.entityId, params.selectedTab, !isNew, params.path, isNew);
                 setSelectedTab(params.selectedTab);
+                if (isNew) {
+                    return;
+                }
+                const newSelectedTab = params.selectedTab;
+                if (newSelectedTab) {
+                    navigate(`${basePath}/${entityId}/${newSelectedTab}`, { replace: true });
+                } else {
+                    navigate(`${basePath}/${entityId}`, { replace: true });
+                }
             }}
             parentCollectionIds={parentCollectionIds}
         />

package/src/util/entity_cache.ts

@@ -150,7 +150,7 @@ export function hasEntityInCache(path: string): boolean {
 export function removeEntityFromCache(path: string): void {
 
 
-    console.log("Removing entity from cache", path);
+    console.debug("Removing entity from cache", path);
 
     // Remove from the in-memory cache
     entityCache.delete(path);