ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
Move File Manager dialogs into components
Juan Denisa7413e34fad5
diff --git a/frontend/scripts/file-manager-browser.mjs b/frontend/scripts/file-manager-browser.mjsindex abce2a3e..2ca04ba1 100644--- a/frontend/scripts/file-manager-browser.mjs+++ b/frontend/scripts/file-manager-browser.mjs@@ -16,11 +16,14 @@ import {createRoot} from 'react-dom/client';import {MemoryRouter} from 'react-router-dom';import FileManager from '/src/pages/FileManager.jsx';window.pending=[];-const listing=(p)=>({path:p,parent:p==='/'?null:p.replace(/\\/[^/]+$/,'')||'/',entries:p==='/home'?[{name:'projects',path:'/home/projects',is_dir:true,type:'directory',size:0}]:[{name:'inside-'+p.split('/').pop()+'.txt',path:p+'/x.txt',is_dir:false,type:'file',size:1}]});+const listing=(p)=>({path:p,parent:p==='/'?null:p.replace(/\\/[^/]+$/,'')||'/',entries:p==='/home'?[{name:'projects',path:'/home/projects',is_dir:true,type:'directory',size:0,permissions:'drwxr-xr-x',permissions_octal:'750'}]:[{name:'inside-'+p.split('/').pop()+'.txt',path:p+'/x.txt',is_dir:false,type:'file',size:1}]});window.release=(p)=>{const i=window.pending.findIndex(x=>x.path===p);const x=window.pending.splice(i,1)[0];x.resolve(listing(p));};window.testApi={browseFiles:(p)=>(window.calls=window.calls||[]).push(p)&&window.holdAll||p!=='/home'?new Promise(resolve=>window.pending.push({path:p,resolve})):Promise.resolve(listing(p)),getDiskMounts:()=>Promise.resolve({mounts:[]}),+ createDirectory:(p)=>{(window.ops=window.ops||[]).push(['mkdir',p]);return Promise.resolve({});},+ renameFile:(p,n)=>{(window.ops=window.ops||[]).push(['rename',p,n]);return Promise.resolve({});},+ changeFilePermissions:(p,m)=>{(window.ops=window.ops||[]).push(['chmod',p,m]);return Promise.resolve({});},};createRoot(document.getElementById('root')).render(<MemoryRouter initialEntries={['/files']}><FileManager/></MemoryRouter>);`;@@ -95,6 +98,40 @@ try {await blocked.getByText('projects', { exact: true }).first().waitFor();assert.deepEqual(blockedErrors, []);console.log('PASS the File Manager renders and browses with storage blocked');++ // The dialogs: each owns its input, prefilled from the entry, and hands+ // the answer back to the page.+ const dlg = await browser.newPage();+ const dlgErrors = [];+ dlg.on('pageerror', error => dlgErrors.push(error.message));+ await dlg.goto(`http://127.0.0.1:${server.httpServer.address().port}/fm-check`);+ await dlg.getByText('projects', { exact: true }).first().waitFor();+ const lastOp = () => dlg.evaluate(() => (window.ops || []).at(-1));++ await dlg.getByRole('button', { name: 'New folder' }).first().click();+ await dlg.getByPlaceholder('new-folder').fill('assets');+ await dlg.getByRole('button', { name: 'Create folder' }).click();+ await dlg.waitForFunction(() => (window.ops || []).length === 1);+ assert.deepEqual(await lastOp(), ['mkdir', '/home/assets']);+ assert.equal(await dlg.getByPlaceholder('new-folder').count(), 0, 'new-folder dialog stayed open');++ await dlg.getByTitle('Rename').first().click();+ const renameInput = dlg.getByRole('dialog').getByRole('textbox');+ assert.equal(await renameInput.inputValue(), 'projects');+ await renameInput.fill('work');+ await renameInput.press('Enter');+ await dlg.waitForFunction(() => (window.ops || []).length === 2);+ assert.deepEqual(await lastOp(), ['rename', '/home/projects', 'work']);++ await dlg.getByTitle('Permissions').first().click();+ const modeInput = dlg.getByPlaceholder('755');+ assert.equal(await modeInput.inputValue(), '750');+ await modeInput.fill('700');+ await dlg.getByRole('button', { name: 'Apply' }).click();+ await dlg.waitForFunction(() => (window.ops || []).length === 3);+ assert.deepEqual(await lastOp(), ['chmod', '/home/projects', '700']);+ assert.deepEqual(dlgErrors, []);+ console.log('PASS new-folder, rename and permissions dialogs prefill and submit');} finally {await browser?.close();await server.close();diff --git a/frontend/src/components/file-manager/FileDialogs.jsx b/frontend/src/components/file-manager/FileDialogs.jsxnew file mode 100644index 00000000..37918e78--- /dev/null+++ b/frontend/src/components/file-manager/FileDialogs.jsx@@ -0,0 +1,76 @@+import { useState } from 'react';+import { useTranslation } from 'react-i18next';+import Modal from '@/components/Modal';+import { Button } from '@/components/ui/button';+import { Input } from '@/components/ui/input';+import { Label } from '@/components/ui/label';++// The File Manager's small one-field dialogs. Each owns its input value; the+// page only says which dialog is open and what to do with the answer. Mount+// with a `key` per target so reopening starts from a fresh value.++export function NamePromptModal({+ title, label, initialValue = '', placeholder, hint, submitLabel, onSubmit, onClose,+}) {+ const { t } = useTranslation();+ const [value, setValue] = useState(initialValue);+ const submit = () => {+ if (value.trim()) onSubmit(value);+ };+ return (+ <Modal open onClose={onClose} title={title}>+ <div className="form-group">+ <Label>{label}</Label>+ <Input+ type="text"+ value={value}+ onChange={(e) => setValue(e.target.value)}+ placeholder={placeholder}+ autoFocus+ onKeyDown={(e) => e.key === 'Enter' && submit()}+ />+ </div>+ {hint}+ <div className="modal-actions">+ <Button variant="outline" onClick={onClose}>{t('common.actions.cancel', 'Cancel')}</Button>+ <Button onClick={submit}>{submitLabel}</Button>+ </div>+ </Modal>+ );+}++export function PermissionsModal({ entry, onSubmit, onClose }) {+ const { t } = useTranslation();+ const [mode, setMode] = useState(entry.permissions_octal || '755');+ const submit = () => {+ if (mode.trim()) onSubmit(mode);+ };+ return (+ <Modal open onClose={onClose} title={t('app.fileManager.changePermissions', 'Change permissions')}>+ <div className="form-group">+ <Label>{t('app.fileManager.permissionsOctal', 'Permissions (octal)')}</Label>+ <Input+ type="text"+ value={mode}+ onChange={(e) => setMode(e.target.value)}+ placeholder="755"+ maxLength={4}+ autoFocus+ />+ </div>+ <p className="text-muted">{t('app.fileManager.current', 'Current:')} {entry.permissions} ({entry.permissions_octal})</p>+ <div className="permissions-help">+ <p>{t('app.fileManager.commonValues', 'Common values:')}</p>+ <ul>+ <li><code>755</code> {t('app.fileManager.ownerRwxGroupOtherRxDirectories', 'Owner: rwx, Group/Other: rx (directories)')}</li>+ <li><code>644</code> {t('app.fileManager.ownerRwGroupOtherRFiles', 'Owner: rw, Group/Other: r (files)')}</li>+ <li><code>600</code> {t('app.fileManager.ownerRwOnlyPrivateFiles', 'Owner: rw only (private files)')}</li>+ </ul>+ </div>+ <div className="modal-actions">+ <Button variant="outline" onClick={onClose}>{t('common.actions.cancel', 'Cancel')}</Button>+ <Button onClick={submit}>{t('app.fileManager.apply', 'Apply')}</Button>+ </div>+ </Modal>+ );+}diff --git a/frontend/src/i18n/locales/ar.json b/frontend/src/i18n/locales/ar.jsonindex 0f18ce47..0d097859 100644--- a/frontend/src/i18n/locales/ar.json+++ b/frontend/src/i18n/locales/ar.json@@ -2722,9 +2722,7 @@"copyPath": "نسخ المسار","couldNotCopyPath": "لا يمكن نسخ المسار","couldntOpenThisFolder": "فشل فتح هذا المجلد.",- "createFile": "إنشاء ملف","createFolder": "إنشاء مجلد",- "createNewFile": "إنشاء ملف جديد","createNewFolder": "إنشاء مجلد جديد","current": "حاضِر:","data": "بيانات",@@ -2737,14 +2735,11 @@"dropToUpload": "أسقط للتحميل","failed": "فشل: {{value}}","failed2": "فشل: {{message}}",- "failedToCreateFile": "فشل في إنشاء الملف: {{message}}","failedToCreateFolder": "فشل إنشاء المجلد: {{message}}","failedToLoadDirectory": "فشل تحميل الدليل: {{message}}","failedToReadFile": "فشل في قراءة الملف: {{message}}","failedToRename": "فشلت إعادة التسمية: {{message}}","failedToSave": "فشل الحفظ: {{message}}",- "fileCreated": "تم إنشاء الملف",- "fileName": "اسم الملف","fileSaved": "تم حفظ الملف","fileSystem": "نظام الملفات","filesWillBeUploadedTo": "سيتم رفع الملفات على",diff --git a/frontend/src/i18n/locales/bn.json b/frontend/src/i18n/locales/bn.jsonindex ae17233f..14222c4b 100644--- a/frontend/src/i18n/locales/bn.json+++ b/frontend/src/i18n/locales/bn.json@@ -2722,9 +2722,7 @@"copyPath": "পাথ কপি করুন","couldNotCopyPath": "পাথ কপি করা যায়নি","couldntOpenThisFolder": "এই ফোল্ডারটি খুলতে ব্যর্থ হয়েছে।",- "createFile": "ফাইল তৈরি করুন","createFolder": "ফোল্ডার তৈরি করুন",- "createNewFile": "নতুন ফাইল তৈরি করুন","createNewFolder": "নতুন ফোল্ডার তৈরি করুন","current": "বর্তমান:","data": "ডেটা",@@ -2737,14 +2735,11 @@"dropToUpload": "আপলোড করতে ড্রপ করুন","failed": "ব্যর্থ হয়েছে: {{value}}","failed2": "ব্যর্থ হয়েছে: {{message}}",- "failedToCreateFile": "ফাইল তৈরি করতে ব্যর্থ হয়েছে: {{message}}","failedToCreateFolder": "ফোল্ডার তৈরি করতে ব্যর্থ হয়েছে: {{message}}৷","failedToLoadDirectory": "ডিরেক্টরি লোড করতে ব্যর্থ হয়েছে: {{message}}","failedToReadFile": "ফাইল পড়তে ব্যর্থ হয়েছে: {{message}}","failedToRename": "নাম পরিবর্তন করতে ব্যর্থ হয়েছে: {{message}}","failedToSave": "সংরক্ষণ করতে ব্যর্থ হয়েছে: {{message}}",- "fileCreated": "ফাইল তৈরি করা হয়েছে",- "fileName": "ফাইলের নাম","fileSaved": "ফাইল সংরক্ষিত","fileSystem": "ফাইল সিস্টেম","filesWillBeUploadedTo": "ফাইল আপলোড করা হবে",diff --git a/frontend/src/i18n/locales/de.json b/frontend/src/i18n/locales/de.jsonindex 4f14f72a..5f371daf 100644--- a/frontend/src/i18n/locales/de.json+++ b/frontend/src/i18n/locales/de.json@@ -2722,9 +2722,7 @@"copyPath": "Pfad kopieren","couldNotCopyPath": "Pfad konnte nicht kopiert werden","couldntOpenThisFolder": "Dieser Ordner konnte nicht geöffnet werden.",- "createFile": "Datei erstellen","createFolder": "Ordner erstellen",- "createNewFile": "Neue Datei erstellen","createNewFolder": "Neuen Ordner erstellen","current": "Aktuell:","data": "Daten",@@ -2737,14 +2735,11 @@"dropToUpload": "Zum Hochladen ablegen","failed": "Fehlgeschlagen: {{value}}","failed2": "Fehlgeschlagen: {{message}}",- "failedToCreateFile": "Datei konnte nicht erstellt werden: {{message}}","failedToCreateFolder": "Ordner konnte nicht erstellt werden: {{message}}","failedToLoadDirectory": "Verzeichnis konnte nicht geladen werden: {{message}}","failedToReadFile": "Datei konnte nicht gelesen werden: {{message}}","failedToRename": "Umbenennen fehlgeschlagen: {{message}}","failedToSave": "Speichern fehlgeschlagen: {{message}}",- "fileCreated": "Datei erstellt",- "fileName": "Dateiname","fileSaved": "Datei gespeichert","fileSystem": "Dateisystem","filesWillBeUploadedTo": "Dateien werden hochgeladen",diff --git a/frontend/src/i18n/locales/en.json b/frontend/src/i18n/locales/en.jsonindex 9901b5cf..760df4d1 100644--- a/frontend/src/i18n/locales/en.json+++ b/frontend/src/i18n/locales/en.json@@ -2722,9 +2722,7 @@"copyPath": "Copy path","couldNotCopyPath": "Couldn't copy the path.","couldntOpenThisFolder": "Couldn't open this folder.",- "createFile": "Create file","createFolder": "Create folder",- "createNewFile": "Create new file","createNewFolder": "Create new folder","current": "Current:","data": "Data",@@ -2737,14 +2735,11 @@"dropToUpload": "Drop to upload","failed": "Couldn't finish for: {{value}}","failed2": "Couldn't do that. {{message}}",- "failedToCreateFile": "Couldn't create the file. {{message}}","failedToCreateFolder": "Couldn't create the folder. {{message}}","failedToLoadDirectory": "Couldn't load the folder. {{message}}","failedToReadFile": "Couldn't read the file. {{message}}","failedToRename": "Couldn't rename it. {{message}}","failedToSave": "Couldn't save. {{message}}",- "fileCreated": "File created",- "fileName": "File name","fileSaved": "File saved","fileSystem": "File system","filesWillBeUploadedTo": "Files will be uploaded to",diff --git a/frontend/src/i18n/locales/es.json b/frontend/src/i18n/locales/es.jsonindex 4b943af5..76eacc47 100644--- a/frontend/src/i18n/locales/es.json+++ b/frontend/src/i18n/locales/es.json@@ -2722,9 +2722,7 @@"copyPath": "Copiar ruta","couldNotCopyPath": "No se pudo copiar la ruta","couldntOpenThisFolder": "No se pudo abrir esta carpeta.",- "createFile": "Crear archivo","createFolder": "Crear carpeta",- "createNewFile": "Crear archivo nuevo","createNewFolder": "Crear carpeta nueva","current": "Actual:","data": "Datos",@@ -2737,14 +2735,11 @@"dropToUpload": "Suelta para subir","failed": "Error: {{value}}","failed2": "Error: {{message}}",- "failedToCreateFile": "No se pudo crear el archivo: {{message}}","failedToCreateFolder": "No se pudo crear la carpeta: {{message}}","failedToLoadDirectory": "No se pudo cargar el directorio: {{message}}","failedToReadFile": "No se pudo leer el archivo: {{message}}","failedToRename": "No se pudo renombrar: {{message}}","failedToSave": "No se pudo guardar: {{message}}",- "fileCreated": "Archivo creado",- "fileName": "Nombre del archivo","fileSaved": "Archivo guardado","fileSystem": "Sistema de archivos","filesWillBeUploadedTo": "Los archivos se subirán a",diff --git a/frontend/src/i18n/locales/fr.json b/frontend/src/i18n/locales/fr.jsonindex 31378ff1..034df72d 100644--- a/frontend/src/i18n/locales/fr.json+++ b/frontend/src/i18n/locales/fr.json@@ -2722,9 +2722,7 @@"copyPath": "Copier le chemin","couldNotCopyPath": "Impossible de copier le chemin","couldntOpenThisFolder": "Impossible d'ouvrir ce dossier.",- "createFile": "Créer un fichier","createFolder": "Créer un dossier",- "createNewFile": "Créer un nouveau fichier","createNewFolder": "Créer un nouveau dossier","current": "Actuel:","data": "Données",@@ -2737,14 +2735,11 @@"dropToUpload": "Déposer pour télécharger","failed": "Échec : {{value}}","failed2": "Échec : {{message}}",- "failedToCreateFile": "Échec de la création du fichier : {{message}}","failedToCreateFolder": "Échec de la création du dossier : {{message}}","failedToLoadDirectory": "Échec du chargement du répertoire : {{message}}","failedToReadFile": "Échec de la lecture du fichier : {{message}}","failedToRename": "Échec du changement de nom : {{message}}","failedToSave": "Échec de l'enregistrement : {{message}}",- "fileCreated": "Fichier créé",- "fileName": "Nom de fichier","fileSaved": "Fichier enregistré","fileSystem": "Système de fichiers","filesWillBeUploadedTo": "Les fichiers seront téléchargés vers",diff --git a/frontend/src/i18n/locales/id.json b/frontend/src/i18n/locales/id.jsonindex b8a97305..fcdb4b8b 100644--- a/frontend/src/i18n/locales/id.json+++ b/frontend/src/i18n/locales/id.json@@ -2722,9 +2722,7 @@"copyPath": "Salin jalur","couldNotCopyPath": "Tidak dapat menyalin jalur","couldntOpenThisFolder": "Gagal membuka folder ini.",- "createFile": "Buat Berkas","createFolder": "Buat Folder",- "createNewFile": "Buat File Baru","createNewFolder": "Buat Folder Baru","current": "Saat ini:","data": "Data",@@ -2737,14 +2735,11 @@"dropToUpload": "Jatuhkan untuk mengunggah","failed": "Gagal: {{value}}","failed2": "Gagal: {{message}}",- "failedToCreateFile": "Gagal membuat file: {{message}}","failedToCreateFolder": "Gagal membuat folder: {{message}}","failedToLoadDirectory": "Gagal memuat direktori: {{message}}","failedToReadFile": "Gagal membaca file: {{message}}","failedToRename": "Gagal mengganti nama: {{message}}","failedToSave": "Gagal menyimpan: {{message}}",- "fileCreated": "File dibuat",- "fileName": "Nama File","fileSaved": "Berkas disimpan","fileSystem": "Sistem berkas","filesWillBeUploadedTo": "File akan diunggah ke",diff --git a/frontend/src/i18n/locales/it.json b/frontend/src/i18n/locales/it.jsonindex 328b8f2a..bd2e3e16 100644--- a/frontend/src/i18n/locales/it.json+++ b/frontend/src/i18n/locales/it.json@@ -2722,9 +2722,7 @@"copyPath": "Copia percorso","couldNotCopyPath": "Impossibile copiare il percorso","couldntOpenThisFolder": "Impossibile aprire questa cartella",- "createFile": "Crea file","createFolder": "Crea cartella",- "createNewFile": "Crea nuovo file","createNewFolder": "Crea nuova cartella","current": "Attuale:","data": "Dati",@@ -2737,14 +2735,11 @@"dropToUpload": "Rilascia per caricare","failed": "Non riuscito: {{value}}","failed2": "Non riuscito: {{message}}",- "failedToCreateFile": "Impossibile creare il file: {{message}}","failedToCreateFolder": "Impossibile creare la cartella: {{message}}","failedToLoadDirectory": "Impossibile caricare la directory: {{message}}","failedToReadFile": "Impossibile leggere il file: {{message}}","failedToRename": "Impossibile rinominare: {{message}}","failedToSave": "Impossibile salvare: {{message}}",- "fileCreated": "File creato",- "fileName": "Nome del file","fileSaved": "File salvato","fileSystem": "File system","filesWillBeUploadedTo": "I file verranno caricati su",diff --git a/frontend/src/i18n/locales/ko.json b/frontend/src/i18n/locales/ko.jsonindex 940ab95a..e4a185fc 100644--- a/frontend/src/i18n/locales/ko.json+++ b/frontend/src/i18n/locales/ko.json@@ -2722,9 +2722,7 @@"copyPath": "경로 복사","couldNotCopyPath": "경로를 복사할 수 없습니다.","couldntOpenThisFolder": "이 폴더를 열지 못했습니다.",- "createFile": "파일 생성","createFolder": "폴더 생성",- "createNewFile": "새 파일 만들기","createNewFolder": "새 폴더 만들기","current": "현재:","data": "데이터",@@ -2737,14 +2735,11 @@"dropToUpload": "업로드하려면 드롭하세요.","failed": "실패: {{value}}","failed2": "실패: {{message}}",- "failedToCreateFile": "파일 생성 실패: {{message}}","failedToCreateFolder": "폴더 생성 실패: {{message}}","failedToLoadDirectory": "디렉터리를 로드하지 못했습니다: {{message}}","failedToReadFile": "파일을 읽지 못했습니다: {{message}}","failedToRename": "이름을 바꾸지 못했습니다: {{message}}","failedToSave": "저장 실패: {{message}}",- "fileCreated": "파일이 생성되었습니다.",- "fileName": "파일 이름","fileSaved": "파일이 저장되었습니다","fileSystem": "파일 시스템","filesWillBeUploadedTo": "파일은 다음 위치에 업로드됩니다.",diff --git a/frontend/src/i18n/locales/pl.json b/frontend/src/i18n/locales/pl.jsonindex 1d57ecb3..4432a234 100644--- a/frontend/src/i18n/locales/pl.json+++ b/frontend/src/i18n/locales/pl.json@@ -2722,9 +2722,7 @@"copyPath": "Skopiuj ścieżkę","couldNotCopyPath": "Nie można skopiować ścieżki","couldntOpenThisFolder": "Nie udało się otworzyć tego folderu.",- "createFile": "Utwórz plik","createFolder": "Utwórz folder",- "createNewFile": "Utwórz nowy plik","createNewFolder": "Utwórz nowy folder","current": "Aktualny:","data": "Dane",@@ -2737,14 +2735,11 @@"dropToUpload": "Upuść, aby przesłać","failed": "Niepowodzenie: {{value}}","failed2": "Niepowodzenie: {{message}}",- "failedToCreateFile": "Nie udało się utworzyć pliku: {{message}}","failedToCreateFolder": "Nie udało się utworzyć folderu: {{message}}","failedToLoadDirectory": "Nie udało się załadować katalogu: {{message}}","failedToReadFile": "Nie udało się odczytać pliku: {{message}}","failedToRename": "Nie udało się zmienić nazwy: {{message}}","failedToSave": "Nie udało się zapisać: {{message}}",- "fileCreated": "Plik został utworzony",- "fileName": "Nazwa pliku","fileSaved": "Plik został zapisany","fileSystem": "System plików","filesWillBeUploadedTo": "Pliki zostaną przesłane do",diff --git a/frontend/src/i18n/locales/pt.json b/frontend/src/i18n/locales/pt.jsonindex eee19e90..b3cd387d 100644--- a/frontend/src/i18n/locales/pt.json+++ b/frontend/src/i18n/locales/pt.json@@ -2722,9 +2722,7 @@"copyPath": "Copiar caminho","couldNotCopyPath": "Não foi possível copiar o caminho","couldntOpenThisFolder": "Falha ao abrir esta pasta.",- "createFile": "Criar arquivo","createFolder": "Criar pasta",- "createNewFile": "Criar novo arquivo","createNewFolder": "Criar nova pasta","current": "Atual:","data": "Dados",@@ -2737,14 +2735,11 @@"dropToUpload": "Solte para fazer upload","failed": "Falha: {{value}}","failed2": "Falha: {{message}}",- "failedToCreateFile": "Falha ao criar arquivo: {{message}}","failedToCreateFolder": "Falha ao criar pasta: {{message}}","failedToLoadDirectory": "Falha ao carregar o diretório: {{message}}","failedToReadFile": "Falha ao ler o arquivo: {{message}}","failedToRename": "Falha ao renomear: {{message}}","failedToSave": "Falha ao salvar: {{message}}",- "fileCreated": "Arquivo criado",- "fileName": "Nome do arquivo","fileSaved": "Arquivo salvo","fileSystem": "Sistema de arquivos","filesWillBeUploadedTo": "Os arquivos serão enviados para",diff --git a/frontend/src/i18n/locales/ru.json b/frontend/src/i18n/locales/ru.jsonindex af9a93c8..5dc1f0ba 100644--- a/frontend/src/i18n/locales/ru.json+++ b/frontend/src/i18n/locales/ru.json@@ -2722,9 +2722,7 @@"copyPath": "Копировать путь","couldNotCopyPath": "Не удалось скопировать путь","couldntOpenThisFolder": "Не удалось открыть эту папку.",- "createFile": "Создать файл","createFolder": "Создать папку",- "createNewFile": "Создать новый файл","createNewFolder": "Создать новую папку","current": "Текущий:","data": "Данные",@@ -2737,14 +2735,11 @@"dropToUpload": "Перетащите, чтобы загрузить","failed": "Не удалось: {{value}}","failed2": "Не удалось: {{message}}",- "failedToCreateFile": "Не удалось создать файл: {{message}}","failedToCreateFolder": "Не удалось создать папку: {{message}}.","failedToLoadDirectory": "Не удалось загрузить каталог: {{message}}.","failedToReadFile": "Не удалось прочитать файл: {{message}}","failedToRename": "Не удалось переименовать: {{message}}","failedToSave": "Не удалось сохранить: {{message}}",- "fileCreated": "Файл создан",- "fileName": "Имя файла","fileSaved": "Файл сохранен.","fileSystem": "Файловая система","filesWillBeUploadedTo": "Файлы будут загружены в",diff --git a/frontend/src/i18n/locales/th.json b/frontend/src/i18n/locales/th.jsonindex 13b76f58..b12da6c1 100644--- a/frontend/src/i18n/locales/th.json+++ b/frontend/src/i18n/locales/th.json@@ -2722,9 +2722,7 @@"copyPath": "คัดลอกเส้นทาง","couldNotCopyPath": "ไม่สามารถคัดลอกเส้นทางได้","couldntOpenThisFolder": "ไม่สามารถเปิดโฟลเดอร์นี้ได้",- "createFile": "สร้างไฟล์","createFolder": "สร้างโฟลเดอร์",- "createNewFile": "สร้างไฟล์ใหม่","createNewFolder": "สร้างโฟลเดอร์ใหม่","current": "ปัจจุบัน:","data": "ข้อมูล",@@ -2737,14 +2735,11 @@"dropToUpload": "วางเพื่ออัปโหลด","failed": "ล้มเหลว: {{value}}","failed2": "ล้มเหลว: {{message}}",- "failedToCreateFile": "ไม่สามารถสร้างไฟล์: {{message}}","failedToCreateFolder": "ไม่สามารถสร้างโฟลเดอร์: {{message}}","failedToLoadDirectory": "ไม่สามารถโหลดไดเร็กทอรี: {{message}}","failedToReadFile": "ไม่สามารถอ่านไฟล์: {{message}}","failedToRename": "ไม่สามารถเปลี่ยนชื่อ: {{message}}","failedToSave": "ไม่สามารถบันทึก: {{message}}",- "fileCreated": "สร้างไฟล์แล้ว",- "fileName": "ชื่อไฟล์","fileSaved": "บันทึกไฟล์แล้ว","fileSystem": "ระบบไฟล์","filesWillBeUploadedTo": "ไฟล์ต่างๆ จะถูกอัพโหลดไปที่",diff --git a/frontend/src/i18n/locales/tr.json b/frontend/src/i18n/locales/tr.jsonindex 1bbadbcf..b001b07a 100644--- a/frontend/src/i18n/locales/tr.json+++ b/frontend/src/i18n/locales/tr.json@@ -2722,9 +2722,7 @@"copyPath": "Yolu kopyala","couldNotCopyPath": "Yol kopyalanamadı","couldntOpenThisFolder": "Bu klasör açılamadı.",- "createFile": "Dosya Oluştur","createFolder": "Klasör Oluştur",- "createNewFile": "Yeni Dosya Oluştur","createNewFolder": "Yeni Klasör Oluştur","current": "Akım:","data": "Veri",@@ -2737,14 +2735,11 @@"dropToUpload": "Yüklemek için bırakın","failed": "Başarısız: {{value}}","failed2": "Başarısız: {{message}}",- "failedToCreateFile": "Dosya oluşturulamadı: {{message}}","failedToCreateFolder": "Klasör oluşturulamadı: {{message}}","failedToLoadDirectory": "Dizin yüklenemedi: {{message}}","failedToReadFile": "Dosya okunamadı: {{message}}","failedToRename": "Yeniden adlandırılamadı: {{message}}","failedToSave": "Kaydedilemedi: {{message}}",- "fileCreated": "Dosya oluşturuldu",- "fileName": "Dosya adı","fileSaved": "Dosya kaydedildi","fileSystem": "Dosya sistemi","filesWillBeUploadedTo": "Dosyalar şuraya yüklenecek:",diff --git a/frontend/src/i18n/locales/vi.json b/frontend/src/i18n/locales/vi.jsonindex 19881932..cf98eb1b 100644--- a/frontend/src/i18n/locales/vi.json+++ b/frontend/src/i18n/locales/vi.json@@ -2722,9 +2722,7 @@"copyPath": "Sao chép đường dẫn","couldNotCopyPath": "Không thể sao chép đường dẫn","couldntOpenThisFolder": "Không thể mở thư mục này.",- "createFile": "Tạo tập tin","createFolder": "Tạo thư mục",- "createNewFile": "Tạo tập tin mới","createNewFolder": "Tạo thư mục mới","current": "Hiện hành:","data": "dữ liệu",@@ -2737,14 +2735,11 @@"dropToUpload": "Thả để tải lên","failed": "Không thành công: {{value}}","failed2": "Không thành công: {{message}}",- "failedToCreateFile": "Không tạo được tệp: {{message}}","failedToCreateFolder": "Không tạo được thư mục: {{message}}","failedToLoadDirectory": "Không tải được thư mục: {{message}}","failedToReadFile": "Không đọc được tệp: {{message}}","failedToRename": "Không đổi tên được: {{message}}","failedToSave": "Không lưu được: {{message}}",- "fileCreated": "Đã tạo tệp",- "fileName": "Tên tệp","fileSaved": "Đã lưu tệp","fileSystem": "Hệ thống tệp","filesWillBeUploadedTo": "Các tập tin sẽ được tải lên",diff --git a/frontend/src/i18n/locales/zh-Hans.json b/frontend/src/i18n/locales/zh-Hans.jsonindex 9baefd93..2998e194 100644--- a/frontend/src/i18n/locales/zh-Hans.json+++ b/frontend/src/i18n/locales/zh-Hans.json@@ -2722,9 +2722,7 @@"copyPath": "复制路径","couldNotCopyPath": "无法复制路径","couldntOpenThisFolder": "打开此文件夹失败",- "createFile": "创建文件","createFolder": "创建文件夹",- "createNewFile": "创建新文件","createNewFolder": "创建新文件夹","current": "当前的:","data": "数据",@@ -2737,14 +2735,11 @@"dropToUpload": "拖放即可上传","failed": "失败:{{value}}","failed2": "失败:{{message}}",- "failedToCreateFile": "无法创建文件:{{message}}","failedToCreateFolder": "无法创建文件夹:{{message}}","failedToLoadDirectory": "无法加载目录:{{message}}","failedToReadFile": "无法读取文件:{{message}}","failedToRename": "重命名失败:{{message}}","failedToSave": "保存失败:{{message}}",- "fileCreated": "文件已创建",- "fileName": "文件名","fileSaved": "文件已保存","fileSystem": "文件系统","filesWillBeUploadedTo": "文件将上传至",diff --git a/frontend/src/i18n/locales/zh-Hant.json b/frontend/src/i18n/locales/zh-Hant.jsonindex 8c393f64..d79300c8 100644--- a/frontend/src/i18n/locales/zh-Hant.json+++ b/frontend/src/i18n/locales/zh-Hant.json@@ -2722,9 +2722,7 @@"copyPath": "複製路徑","couldNotCopyPath": "無法複製路徑","couldntOpenThisFolder": "無法開啟此資料夾",- "createFile": "建立檔案","createFolder": "建立資料夾",- "createNewFile": "建立新檔案","createNewFolder": "建立新資料夾","current": "目前的:","data": "資料",@@ -2737,14 +2735,11 @@"dropToUpload": "拖放即可上傳","failed": "失敗:{{value}}","failed2": "失敗:{{message}}",- "failedToCreateFile": "無法建立檔案:{{message}}","failedToCreateFolder": "建立資料夾失敗:{{message}}","failedToLoadDirectory": "無法載入目錄:{{message}}","failedToReadFile": "讀取檔案失敗:{{message}}","failedToRename": "重新命名失敗:{{message}}","failedToSave": "儲存失敗:{{message}}",- "fileCreated": "檔案已建立",- "fileName": "檔案名稱","fileSaved": "檔案已儲存","fileSystem": "檔案系統","filesWillBeUploadedTo": "檔案將上傳至",diff --git a/frontend/src/pages/FileManager.jsx b/frontend/src/pages/FileManager.jsxindex c10a500e..63d3b292 100644--- a/frontend/src/pages/FileManager.jsx+++ b/frontend/src/pages/FileManager.jsx@@ -4,7 +4,6 @@ import { useToast } from '../contexts/useToast.js';import ConfirmDialog from '../components/ConfirmDialog';import EmptyState from '../components/EmptyState';import ErrorState from '../components/ErrorState';-import Modal from '@/components/Modal';import {Folder, FolderOpen, File, Upload, FolderPlus,ArrowLeft, ArrowRight, ArrowUp, Search, X, RefreshCw, Eye, EyeOff,@@ -16,14 +15,13 @@ import {} from 'lucide-react';import { useNavigate, useSearchParams } from 'react-router-dom';import { Button } from '@/components/ui/button';-import { Input } from '@/components/ui/input';-import { Label } from '@/components/ui/label';import FolderTree from '../components/file-manager/FolderTree';import FileCard from '../components/file-manager/FileCard';import FileRow from '../components/file-manager/FileRow';import PreviewDrawer from '../components/file-manager/PreviewDrawer';import ContextMenu from '../components/file-manager/ContextMenu';+import { NamePromptModal, PermissionsModal } from '../components/file-manager/FileDialogs';import ServerPicker from '../components/ServerPicker';import { serverTarget, targetServerId } from '../utils/serverTarget';import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from '@/components/ui/select';@@ -246,16 +244,9 @@ function FileManager() {const [editing, setEditing] = useState(false);// ─── modals ──────────────────────────────────────────- const [showNewFileModal, setShowNewFileModal] = useState(false);- const [showNewFolderModal, setShowNewFolderModal] = useState(false);- const [showRenameModal, setShowRenameModal] = useState(false);- const [showPermissionsModal, setShowPermissionsModal] = useState(false);- const [newFileName, setNewFileName] = useState('');- const [newFolderName, setNewFolderName] = useState('');- const [renameTarget, setRenameTarget] = useState(null);- const [newName, setNewName] = useState('');- const [permissionsTarget, setPermissionsTarget] = useState(null);- const [newPermissions, setNewPermissions] = useState('');+ // { kind: 'newFolder' } | { kind: 'rename', entry } | { kind: 'permissions', entry } | null+ const [dialog, setDialog] = useState(null);+ const closeDialog = () => setDialog(null);const [confirmDialog, setConfirmDialog] = useState(null);// ─── upload ──────────────────────────────────────────@@ -593,28 +584,12 @@ function FileManager() {}};- const handleCreateFile = async () => {- if (!newFileName.trim()) return;- if (remoteGuard('create file')) return;- try {- await api.createFile(`${currentPath}/${newFileName}`);- toast.success(t('app.fileManager.fileCreated', 'File created'));- setShowNewFileModal(false);- setNewFileName('');- loadDirectory(currentPath);- } catch (error) {- toast.error(t('app.fileManager.failedToCreateFile', "Couldn't create the file. {{message}}", { message: errorReason(error) }));- }- };-- const handleCreateFolder = async () => {- if (!newFolderName.trim()) return;+ const handleCreateFolder = async (name) => {if (remoteGuard('create folder')) return;try {- await api.createDirectory(`${currentPath}/${newFolderName}`);+ await api.createDirectory(`${currentPath}/${name}`);toast.success(t('app.fileManager.folderCreated', 'Folder created'));- setShowNewFolderModal(false);- setNewFolderName('');+ closeDialog();loadDirectory(currentPath);// Refresh tree cache for parent so the new folder appears in the treeconst parent = currentPath;@@ -662,46 +637,32 @@ function FileManager() {});};- const handleRename = async () => {- if (!renameTarget || !newName.trim()) return;+ const handleRename = async (entry, name) => {if (remoteGuard('rename')) return;try {- await api.renameFile(renameTarget.path, newName);+ await api.renameFile(entry.path, name);toast.success(t('app.fileManager.renamed', 'Renamed'));- setShowRenameModal(false);- setRenameTarget(null);- setNewName('');+ closeDialog();loadDirectory(currentPath);} catch (error) {toast.error(t('app.fileManager.failedToRename', "Couldn't rename it. {{message}}", { message: errorReason(error) }));}};- const handleChangePermissions = async () => {- if (!permissionsTarget || !newPermissions.trim()) return;+ const handleChangePermissions = async (entry, mode) => {if (remoteGuard('change permissions')) return;try {- await api.changeFilePermissions(permissionsTarget.path, newPermissions);+ await api.changeFilePermissions(entry.path, mode);toast.success(t('app.fileManager.permissionsUpdated', 'Permissions updated'));- setShowPermissionsModal(false);- setPermissionsTarget(null);- setNewPermissions('');+ closeDialog();loadDirectory(currentPath);} catch (error) {toast.error(t('app.fileManager.failed2', "Couldn't do that. {{message}}", { message: errorReason(error) }));}};- const openRenameModal = (entry) => {- setRenameTarget(entry);- setNewName(entry.name);- setShowRenameModal(true);- };- const openPermissionsModal = (entry) => {- setPermissionsTarget(entry);- setNewPermissions(entry.permissions_octal || '755');- setShowPermissionsModal(true);- };+ const openRenameModal = (entry) => setDialog({ kind: 'rename', entry });+ const openPermissionsModal = (entry) => setDialog({ kind: 'permissions', entry });// ─── upload ──────────────────────────────────────────const uploadFiles = async (files) => {@@ -920,7 +881,7 @@ function FileManager() {type="button"variant="outline"size="sm"- onClick={() => setShowNewFolderModal(true)}+ onClick={() => setDialog({ kind: 'newFolder' })}disabled={isRemote || isS3}><FolderPlus size={14} /> {t('app.fileManager.newFolder', 'New folder')}@@ -1277,7 +1238,7 @@ function FileManager() {</Button><Button variant="unstyled" type="button"className="sidebar-action-btn"- onClick={() => setShowNewFolderModal(true)}+ onClick={() => setDialog({ kind: 'newFolder' })}disabled={isRemote}title={t('app.fileManager.newFolder', 'New folder')}>@@ -1467,88 +1428,36 @@ function FileManager() {onDelete={(e) => handleDelete(selectedEntries.length > 1 ? selectedEntries : e)}/>- {/* Modals */}- <Modal open={showNewFileModal} onClose={() => setShowNewFileModal(false)} title={t('app.fileManager.createNewFile', 'Create new file')}>- <div className="form-group">- <Label>{t('app.fileManager.fileName', 'File name')}</Label>- <Input- type="text"- value={newFileName}- onChange={(e) => setNewFileName(e.target.value)}- placeholder="example.txt"- autoFocus- onKeyDown={(e) => e.key === 'Enter' && handleCreateFile()}- />- </div>- <p className="text-muted">{t('app.fileManager.willBeCreatedIn', 'Will be created in:')} <code>{currentPath}</code></p>- <div className="modal-actions">- <Button variant="outline" onClick={() => setShowNewFileModal(false)}>{t('common.actions.cancel', 'Cancel')}</Button>- <Button onClick={handleCreateFile}>{t('app.fileManager.createFile', 'Create file')}</Button>- </div>- </Modal>-- <Modal open={showNewFolderModal} onClose={() => setShowNewFolderModal(false)} title={t('app.fileManager.createNewFolder', 'Create new folder')}>- <div className="form-group">- <Label>{t('app.fileManager.folderName', 'Folder name')}</Label>- <Input- type="text"- value={newFolderName}- onChange={(e) => setNewFolderName(e.target.value)}- placeholder="new-folder"- autoFocus- onKeyDown={(e) => e.key === 'Enter' && handleCreateFolder()}- />- </div>- <p className="text-muted">{t('app.fileManager.willBeCreatedIn', 'Will be created in:')} <code>{currentPath}</code></p>- <div className="modal-actions">- <Button variant="outline" onClick={() => setShowNewFolderModal(false)}>{t('common.actions.cancel', 'Cancel')}</Button>- <Button onClick={handleCreateFolder}>{t('app.fileManager.createFolder', 'Create folder')}</Button>- </div>- </Modal>-- <Modal open={showRenameModal} onClose={() => setShowRenameModal(false)} title={t('app.fileManager.rename2', 'Rename {{value}}', { value: renameTarget?.is_dir ? 'Folder' : 'File' })}>- <div className="form-group">- <Label>{t('app.fileManager.newName', 'New name')}</Label>- <Input- type="text"- value={newName}- onChange={(e) => setNewName(e.target.value)}- autoFocus- onKeyDown={(e) => e.key === 'Enter' && handleRename()}- />- </div>- <div className="modal-actions">- <Button variant="outline" onClick={() => setShowRenameModal(false)}>{t('common.actions.cancel', 'Cancel')}</Button>- <Button onClick={handleRename}>{t('app.fileManager.rename', 'Rename')}</Button>- </div>- </Modal>-- <Modal open={showPermissionsModal} onClose={() => setShowPermissionsModal(false)} title={t('app.fileManager.changePermissions', 'Change permissions')}>- <div className="form-group">- <Label>{t('app.fileManager.permissionsOctal', 'Permissions (octal)')}</Label>- <Input- type="text"- value={newPermissions}- onChange={(e) => setNewPermissions(e.target.value)}- placeholder="755"- maxLength={4}- autoFocus- />- </div>- <p className="text-muted">{t('app.fileManager.current', 'Current:')} {permissionsTarget?.permissions} ({permissionsTarget?.permissions_octal})</p>- <div className="permissions-help">- <p>{t('app.fileManager.commonValues', 'Common values:')}</p>- <ul>- <li><code>755</code> {t('app.fileManager.ownerRwxGroupOtherRxDirectories', 'Owner: rwx, Group/Other: rx (directories)')}</li>- <li><code>644</code> {t('app.fileManager.ownerRwGroupOtherRFiles', 'Owner: rw, Group/Other: r (files)')}</li>- <li><code>600</code> {t('app.fileManager.ownerRwOnlyPrivateFiles', 'Owner: rw only (private files)')}</li>- </ul>- </div>- <div className="modal-actions">- <Button variant="outline" onClick={() => setShowPermissionsModal(false)}>{t('common.actions.cancel', 'Cancel')}</Button>- <Button onClick={handleChangePermissions}>{t('app.fileManager.apply', 'Apply')}</Button>- </div>- </Modal>+ {dialog?.kind === 'newFolder' && (+ <NamePromptModal+ title={t('app.fileManager.createNewFolder', 'Create new folder')}+ label={t('app.fileManager.folderName', 'Folder name')}+ placeholder="new-folder"+ hint={<p className="text-muted">{t('app.fileManager.willBeCreatedIn', 'Will be created in:')} <code>{currentPath}</code></p>}+ submitLabel={t('app.fileManager.createFolder', 'Create folder')}+ onSubmit={handleCreateFolder}+ onClose={closeDialog}+ />+ )}+ {dialog?.kind === 'rename' && (+ <NamePromptModal+ key={dialog.entry.path}+ title={t('app.fileManager.rename2', 'Rename {{value}}', { value: dialog.entry.is_dir ? 'Folder' : 'File' })}+ label={t('app.fileManager.newName', 'New name')}+ initialValue={dialog.entry.name}+ submitLabel={t('app.fileManager.rename', 'Rename')}+ onSubmit={(name) => handleRename(dialog.entry, name)}+ onClose={closeDialog}+ />+ )}+ {dialog?.kind === 'permissions' && (+ <PermissionsModal+ key={dialog.entry.path}+ entry={dialog.entry}+ onSubmit={(mode) => handleChangePermissions(dialog.entry, mode)}+ onClose={closeDialog}+ />+ )}{confirmDialog && (<ConfirmDialog