From 0b7dc77e78dd24e8291e92312fdfa48561af6940 Mon Sep 17 00:00:00 2001
From: Jaime Idolpx <jaime@idolpx.com>
Date: Mon, 8 Jun 2026 13:02:34 -0400
Subject: [PATCH] feat(MediaManager): add folder mounting functionality and
 improve base URL handling

---
 src/app/components/MediaManager.tsx | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/components/MediaManager.tsx b/src/app/components/MediaManager.tsx
index b65de38..44068ef 100644
--- a/src/app/components/MediaManager.tsx
+++ b/src/app/components/MediaManager.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import {
   AlignLeft,
   ArrowLeft,
@@ -23,7 +23,6 @@ import {
   Home,
   Image as ImageIcon,
   Loader2,
-  Menu,
   MoreVertical,
   Move,
   Pencil,
@@ -251,6 +250,7 @@ function EntryIcon({ entry }: { entry: EntryInfo }) {
 // ─── ActionsModal ─────────────────────────────────────────────────────────────
 
 interface FolderManagementActions {
+  onMountFolder: () => void;
   onNewFolder: () => void;
   onNewFile: () => void;
   onUpload: () => void;
@@ -294,6 +294,11 @@ function ActionsModal({ entry, onClose, onOpen, onMount, onDownload, onRename, o
             {/* Folder management items — current-folder context (header Actions) */}
             {fm && (
               <>
+                <button onClick={() => { onClose(); fm.onMountFolder(); }}
+                  className="w-full text-left px-4 py-3 rounded border border-neutral-200 hover:bg-blue-50 hover:border-blue-300 inline-flex items-center gap-3">
+                  <HardDrive className="w-4 h-4 text-amber-600" /> <span>Mount Folder</span>
+                </button>
+                <div className="border-t border-neutral-100" />
                 <button onClick={() => { onClose(); fm.onNewFolder(); }}
                   className="w-full text-left px-4 py-3 rounded border border-neutral-200 hover:bg-neutral-50 inline-flex items-center gap-3">
                   <FolderPlus className="w-4 h-4 text-neutral-500" /> <span>New Folder</span>
@@ -740,8 +745,11 @@ export default function MediaManager({ initialPath = '/', rootPath, title, confi
     }
 
     if (!dev.enabled) dev.enabled = 1;
-    if (folderConfig?.['cache'] === '.') dev.cache = splitPath(mountEntry.path).parent;
-    if (folderConfig?.['base_url']) dev.base_url = folderConfig['base_url'];
+    if (folderConfig?.['base_url']) {
+      dev.base_url = folderConfig['base_url'];
+      delete dev.url;
+    }
+    if (folderConfig?.['cache'] === '.') dev.cache = path;
     setConfig(newConfig);
     setMountEntry(null);
     const deviceId = `${deviceType}-${key}`;
@@ -1175,6 +1183,7 @@ export default function MediaManager({ initialPath = '/', rootPath, title, confi
         onCut={e => cutOrCopyEntry(e, 'move')}
         onDelete={e => void deleteEntry(e)}
         folderManagement={folderActionOpen ? {
+          onMountFolder: () => setMountEntry({ name: splitPath(path).name || '/', path, type: 'folder', size: 0, lastModified: null, contentType: null }),
           onNewFolder: () => { setShowNewFolder(true); setShowNewFile(false); },
           onNewFile:   () => { setShowNewFile(true);   setShowNewFolder(false); },
           onUpload:    () => fileInputRef.current?.click(),