@firecms/core 3.0.0-tw4.6 → 3.0.1

package/src/form/EntityForm.tsx

@@ -328,14 +328,7 @@ export function EntityForm<M extends Record<string, any>>({
         return [initialValues, initialDirty];
     }, [autoApplyLocalChanges, localChangesDataRaw, baseInitialValues, initialDirtyValues]);
 
-    const localChangesData = useMemo(() => {
-        if (!localChangesDataRaw) {
-            return undefined;
-        }
-        return getChanges(localChangesDataRaw, initialValues);
-    }, [localChangesDataRaw, initialValues]);
-
-    const hasLocalChanges = !localChangesCleared && localChangesData && Object.keys(localChangesData).length > 0;
+    const hasLocalChanges = !localChangesCleared && localChangesDataRaw && Object.keys(localChangesDataRaw).length > 0;
 
     const formex: FormexController<M> = formexProp ?? useCreateFormex<M>({
         initialValues: initialValues as M,
@@ -851,7 +844,7 @@ export function EntityForm<M extends Record<string, any>>({
                                 <LocalChangesMenu
                                     cacheKey={status === "new" || status === "copy" ? path + "#new" : path + "/" + entityId}
                                     properties={resolvedCollection.properties}
-                                    localChangesData={localChangesData as Partial<M>}
+                                    cachedData={localChangesDataRaw as Partial<M>}
                                     formex={formex}
                                     onClearLocalChanges={() => setLocalChangesCleared(true)}
                                 />}
@@ -863,7 +856,7 @@ export function EntityForm<M extends Record<string, any>>({
                                     </Chip>
                                 </Tooltip>
                                 : <Tooltip title={"The current form is in sync with the database"}>
-                                    <Chip size={"small"} className={"py-1"} >
+                                    <Chip size={"small"} className={"py-1"}>
                                         <CheckIcon size={"smallest"}/>
                                     </Chip>
                                 </Tooltip>}

package/src/form/components/LocalChangesMenu.tsx

@@ -24,14 +24,14 @@ import { PropertyCollectionView } from "../../components/PropertyCollectionView"
 
 interface LocalChangesMenuProps<M extends object> {
     cacheKey: string;
-    localChangesData: Partial<M>;
+    cachedData: Partial<M>;
     formex: FormexController<M>;
     onClearLocalChanges?: () => void;
     properties: ResolvedProperties<M>;
 }
 
 export function LocalChangesMenu<M extends object>({
-                                                       localChangesData,
+                                                       cachedData,
                                                        formex,
                                                        onClearLocalChanges,
                                                        cacheKey,
@@ -51,10 +51,10 @@ export function LocalChangesMenu<M extends object>({
     };
 
     const handleApply = () => {
-        const mergedValues = mergeDeep(formex.values, localChangesData);
+        const mergedValues = mergeDeep(formex.values, cachedData);
         const touched = { ...formex.touched };
-        const previewKeys = flattenKeys(localChangesData);
-        previewKeys.forEach((key) => {
+        const cachedKeys = flattenKeys(cachedData);
+        cachedKeys.forEach((key) => {
             touched[key] = true;
         });
 
@@ -121,7 +121,7 @@ export function LocalChangesMenu<M extends object>({
                         overflow: "auto"
                     }}>
                         <div className="p-4">
-                            <PropertyCollectionView data={localChangesData}
+                            <PropertyCollectionView data={cachedData}
                                                     properties={properties as ResolvedProperties}/>
                         </div>
                     </div>

package/src/form/components/StorageUploadProgress.tsx

@@ -11,7 +11,8 @@ export interface StorageUploadItemProps {
     entry: StorageFieldItem,
     onFileUploadComplete: (value: string,
                            entry: StorageFieldItem,
-                           metadata?: any) => Promise<void>;
+                           metadata?: any,
+                           uploadedUrl?: string) => Promise<void>;
     imageSize: number;
     simple: boolean;
 }
@@ -47,9 +48,9 @@ export function StorageUploadProgress({
             path: storagePath,
             metadata
         })
-            .then(async ({ path }) => {
+            .then(async ({ path, storageUrl }) => {
                 console.debug("Upload successful", path);
-                await onFileUploadComplete(path, entry, metadata);
+                await onFileUploadComplete(path, entry, metadata, storageUrl);
                 if (mounted.current)
                     setLoading(false);
             })

package/src/preview/components/EmptyValue.tsx

@@ -6,5 +6,5 @@ import React from "react";
 export function EmptyValue() {
 
     return <div
-        className="rounded-full bg-surface-200 bg-opacity-30 bg-surface-200/30 dark:bg-opacity-20 dark:bg-surface-200/20 w-5 h-2 inline-block"/>;
+        className="rounded-full bg-surface-200 bg-opacity-30 dark:bg-opacity-20 w-5 h-2 inline-block"/>;
 }

package/src/preview/components/ReferencePreview.tsx

@@ -57,7 +57,12 @@ function ReferencePreviewInternal({
         if (customizationController.components?.missingReference) {
             return <customizationController.components.missingReference path={reference.path}/>;
         } else {
-            throw Error(`Couldn't find the corresponding collection view for the path: ${reference.path}`);
+            return <EntityPreviewContainer
+                onClick={onClick}
+                size={size ?? "medium"}>
+                <ErrorView error={"Unexpected reference value. Click to edit"}
+                           tooltip={reference.pathWithId}/>
+            </EntityPreviewContainer>;
         }
     }
 

package/src/types/entities.ts

@@ -65,6 +65,16 @@ export class EntityReference {
         return `${this.path}/${this.id}`;
     }
 
+    get pathWithIdAndDatabase() {
+        if (this.databaseId) {
+            if (this.databaseId === "(default)") {
+                return this.pathWithId;
+            }
+            return `${this.databaseId}:::${this.path}/${this.id}`;
+        }
+        return this.pathWithId;
+    }
+
     isEntityReference() {
         return true;
     }

package/src/types/properties.ts

@@ -828,6 +828,16 @@ export type StorageConfig = {
      */
     storagePath: string | ((context: UploadedFileContext) => string);
 
+    /**
+     * When set to true, this flag indicates that the bucket name will be
+     * included in the saved storage path.
+     *
+     * E.g. `gs://my-bucket/path/to/file.png` instead of just `path/to/file.png`
+     *
+     * Defaults to false.
+     */
+    includeBucketUrl?: boolean;
+
     /**
      * When set to true, this flag indicates that the download URL of the file
      * will be saved in the datasource, instead of the storage path.

package/src/types/storage.ts

@@ -21,6 +21,15 @@ export interface UploadFileResult {
      * Bucket where the file was uploaded
      */
     bucket: string;
+
+    /**
+     * Fully qualified storage URL for the uploaded file.
+     *
+     * For example: `gs://my-bucket/path/to/file.png`.
+     *
+     * This is optional for backwards compatibility.
+     */
+    storageUrl?: string;
 }
 
 /**

package/src/util/useStorageUploadController.tsx

@@ -134,11 +134,21 @@ export function useStorageUploadController<M extends object>({
 
     const onFileUploadComplete = useCallback(async (uploadedPath: string,
                                                     entry: StorageFieldItem,
-                                                    metadata?: any) => {
+                                                    metadata?: any,
+                                                    uploadedUrl?: string) => {
 
         console.debug("onFileUploadComplete", uploadedPath, entry);
 
         let uploadPathOrDownloadUrl: string | null = uploadedPath;
+
+        if (storage.includeBucketUrl) {
+            if (!uploadedUrl) {
+                console.warn("includeBucketUrl is set but no fully-qualified storage URL was returned by the StorageSource. Falling back to the storage path.");
+            } else {
+                uploadPathOrDownloadUrl = uploadedUrl;
+            }
+        }
+
         if (storage.storeUrl) {
             uploadPathOrDownloadUrl = (await storageSource.getDownloadURL(uploadedPath)).url;
         }