@firecms/core 3.0.0-canary.295 → 3.0.0-canary.297

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/entity_cache.ts

@@ -122,7 +122,6 @@ export function hasEntityInCache(path: string): boolean {
  * Retrieves an entity from the in-memory cache or `localStorage`.
  * If the entity is not in the cache but exists in `localStorage`, it loads it into the cache.
  * @param path - The unique path/key for the entity.
- * @param useLocalStorage
  * @returns The cached entity or `undefined` if not found.
  */
 export function getEntityFromCache(path: string): object | undefined {
@@ -134,10 +133,6 @@ export function getEntityFromCache(path: string): object | undefined {
             const entityString = localStorage.getItem(key);
             if (entityString) {
                 const entity: object = JSON.parse(entityString, customReviver);
-                console.log("Loaded entity from localStorage:", {
-                    key,
-                    entity
-                });
                 return entity;
             }
         } catch (error) {

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;
         }