Skip to content

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.

fix: bind file editor previews to their storage target

Juan Denisd00c4a72eafc
diff --git a/frontend/scripts/file-manager-browser.mjs b/frontend/scripts/file-manager-browser.mjs
index ab58062b..cf92b3d3 100644
--- a/frontend/scripts/file-manager-browser.mjs
+++ b/frontend/scripts/file-manager-browser.mjs
@@ -222,7 +222,16 @@ try {
await preview.getByRole('button', { name: 'Save', exact: true }).click();
await editor.waitForFunction(() => (window.toasts || []).length > 0);
assert.equal(await preview.locator('textarea').inputValue(), 'unsaved draft');
+ await editor.evaluate(() => {
+ const browse = window.testApi.browseRemoteFiles;
+ window.testApi.browseRemoteFiles = (...args) => new Promise(resolve => {
+ window.releaseEditorTarget = () => resolve(browse(...args));
+ });
+ });
await editor.getByRole('button', { name: 'pick-agent' }).click();
+ await editor.waitForFunction(() => Boolean(window.releaseEditorTarget));
+ await preview.waitFor({ state: 'detached' });
+ await editor.evaluate(() => window.releaseEditorTarget());
await editor.getByText('on-agent.txt').first().waitFor();
assert.equal(await preview.count(), 0, 'the previous target preview stayed open');
assert.deepEqual(editorErrors, []);
diff --git a/frontend/src/components/file-manager/hooks/useFileEditor.js b/frontend/src/components/file-manager/hooks/useFileEditor.js
index 82344c4c..0b25a053 100644
--- a/frontend/src/components/file-manager/hooks/useFileEditor.js
+++ b/frontend/src/components/file-manager/hooks/useFileEditor.js
@@ -2,7 +2,10 @@ import { useEffect, useRef, useState } from 'react';
import { errorReason } from '@/utils/errorMessage';
export default function useFileEditor({ fileApi, toast, t, onSaved }) {
- const [previewFile, setPreview] = useState(null);
+ const [preview, setPreview] = useState(null);
+ // A target change must hide the old file immediately, before navigation
+ // effects or the new listing finish. Never save its draft through a new adapter.
+ const previewFile = preview?.fileApi === fileApi ? preview.entry : null;
const [fileContent, setFileContent] = useState('');
const [editing, setEditing] = useState(false);
const generation = useRef(0);
@@ -17,7 +20,7 @@ export default function useFileEditor({ fileApi, toast, t, onSaved }) {
const setPreviewFile = (entry) => {
generation.current++;
- setPreview(entry);
+ setPreview(entry ? { fileApi, entry } : null);
setFileContent('');
setEditing(false);
};