refac
This commit is contained in:
1 parent
5caa91a493
commit
2dadc5435a
7 files changed
+101
-38
No files matched your search
@@ -23,6 +23,7 @@ from open_webui.utils.json_codec import JSONCodec
|
|||||||
from open_webui.utils.terminals import (
|
from open_webui.utils.terminals import (
|
||||||
TERMINAL_CONTEXT_HEADER,
|
TERMINAL_CONTEXT_HEADER,
|
||||||
get_terminal_server_url,
|
get_terminal_server_url,
|
||||||
|
is_terminal_orchestrator,
|
||||||
terminal_context_available,
|
terminal_context_available,
|
||||||
terminal_context_config,
|
terminal_context_config,
|
||||||
terminal_context_id,
|
terminal_context_id,
|
||||||
@@ -233,7 +234,7 @@ async def _resolve_authenticated_connection(ws: WebSocket, server_id: str):
|
|||||||
The client must send ``{"type": "auth", "token": "<jwt>"}`` as its first
|
The client must send ``{"type": "auth", "token": "<jwt>"}`` as its first
|
||||||
message after connecting.
|
message after connecting.
|
||||||
|
|
||||||
Returns ``(user, connection, chat_id)`` on success, or ``None`` after
|
Returns ``(user, connection, chat_id, token)`` on success, or ``None`` after
|
||||||
closing *ws* with an appropriate error code.
|
closing *ws* with an appropriate error code.
|
||||||
"""
|
"""
|
||||||
import asyncio
|
import asyncio
|
||||||
@@ -247,7 +248,8 @@ async def _resolve_authenticated_connection(ws: WebSocket, server_id: str):
|
|||||||
if payload.get('type') != 'auth':
|
if payload.get('type') != 'auth':
|
||||||
await ws.close(code=4001, reason='Expected auth message')
|
await ws.close(code=4001, reason='Expected auth message')
|
||||||
return None
|
return None
|
||||||
user = await get_verified_user_by_token(payload.get('token', ''), getattr(ws.app.state, 'redis', None))
|
token = payload.get('token', '')
|
||||||
|
user = await get_verified_user_by_token(token, getattr(ws.app.state, 'redis', None))
|
||||||
if user is None:
|
if user is None:
|
||||||
await ws.close(code=4001, reason='Invalid token')
|
await ws.close(code=4001, reason='Invalid token')
|
||||||
return None
|
return None
|
||||||
@@ -279,7 +281,7 @@ async def _resolve_authenticated_connection(ws: WebSocket, server_id: str):
|
|||||||
if not terminal_context_available(connection, 'chat'):
|
if not terminal_context_available(connection, 'chat'):
|
||||||
await ws.close(code=4003, reason='Terminal server is not available in chats')
|
await ws.close(code=4003, reason='Terminal server is not available in chats')
|
||||||
return None
|
return None
|
||||||
return user, connection, chat_id if isinstance(chat_id, str) else ''
|
return user, connection, chat_id if isinstance(chat_id, str) else '', token
|
||||||
|
|
||||||
|
|
||||||
@router.websocket('/{server_id}/api/terminals/{session_id}')
|
@router.websocket('/{server_id}/api/terminals/{session_id}')
|
||||||
@@ -292,14 +294,14 @@ async def ws_terminal(
|
|||||||
|
|
||||||
Uses first-message auth: the client sends ``{"type": "auth", "token": "<jwt>"}``
|
Uses first-message auth: the client sends ``{"type": "auth", "token": "<jwt>"}``
|
||||||
as its first message. The proxy validates the JWT, then connects to the
|
as its first message. The proxy validates the JWT, then connects to the
|
||||||
upstream terminal server and authenticates with the server's API key.
|
upstream terminal server using the configured terminal auth mode.
|
||||||
"""
|
"""
|
||||||
await ws.accept()
|
await ws.accept()
|
||||||
|
|
||||||
result = await _resolve_authenticated_connection(ws, server_id)
|
result = await _resolve_authenticated_connection(ws, server_id)
|
||||||
if result is None:
|
if result is None:
|
||||||
return
|
return
|
||||||
user, connection, chat_id = result
|
user, connection, chat_id, token = result
|
||||||
|
|
||||||
base_url = get_terminal_server_url(connection)
|
base_url = get_terminal_server_url(connection)
|
||||||
if not base_url:
|
if not base_url:
|
||||||
@@ -347,6 +349,8 @@ async def ws_terminal(
|
|||||||
if auth_type == 'bearer':
|
if auth_type == 'bearer':
|
||||||
key = normalize_bearer_token(connection.get('key', ''))
|
key = normalize_bearer_token(connection.get('key', ''))
|
||||||
await upstream.send_str(_json.dumps({'type': 'auth', 'token': key}))
|
await upstream.send_str(_json.dumps({'type': 'auth', 'token': key}))
|
||||||
|
elif auth_type == 'session' and is_terminal_orchestrator(connection):
|
||||||
|
await upstream.send_str(_json.dumps({'type': 'auth', 'token': token}))
|
||||||
|
|
||||||
await publish_event(
|
await publish_event(
|
||||||
app,
|
app,
|
||||||
|
|||||||
@@ -3,6 +3,12 @@ export type FileEntry = {
|
|||||||
type: 'file' | 'directory';
|
type: 'file' | 'directory';
|
||||||
size?: number;
|
size?: number;
|
||||||
modified?: number;
|
modified?: number;
|
||||||
|
writable?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type TerminalFileList = {
|
||||||
|
entries: FileEntry[];
|
||||||
|
writable?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ListeningPort = {
|
export type ListeningPort = {
|
||||||
@@ -85,7 +91,7 @@ export const listFiles = async (
|
|||||||
apiKey: string,
|
apiKey: string,
|
||||||
path: string = '/',
|
path: string = '/',
|
||||||
sessionId?: string
|
sessionId?: string
|
||||||
): Promise<FileEntry[] | null> => {
|
): Promise<TerminalFileList | null> => {
|
||||||
// The endpoint uses `directory` as the query param name
|
// The endpoint uses `directory` as the query param name
|
||||||
const url = `${baseUrl.replace(/\/$/, '')}/files/list?directory=${encodeURIComponent(path)}`;
|
const url = `${baseUrl.replace(/\/$/, '')}/files/list?directory=${encodeURIComponent(path)}`;
|
||||||
const headers: Record<string, string> = bearerHeaders(apiKey);
|
const headers: Record<string, string> = bearerHeaders(apiKey);
|
||||||
@@ -99,7 +105,7 @@ export const listFiles = async (
|
|||||||
console.error('open-terminal listFiles error:', err);
|
console.error('open-terminal listFiles error:', err);
|
||||||
return null;
|
return null;
|
||||||
});
|
});
|
||||||
return res?.entries ?? null;
|
return res?.entries ? { entries: res.entries, writable: res.writable } : null;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const readFile = async (
|
export const readFile = async (
|
||||||
|
|||||||
@@ -93,6 +93,7 @@
|
|||||||
let currentPath = savedPath;
|
let currentPath = savedPath;
|
||||||
let fileRoot: TerminalFileRoot | null = null;
|
let fileRoot: TerminalFileRoot | null = null;
|
||||||
let entries: FileEntry[] = [];
|
let entries: FileEntry[] = [];
|
||||||
|
let currentWritable = true;
|
||||||
let loading = false;
|
let loading = false;
|
||||||
let error: string | null = null;
|
let error: string | null = null;
|
||||||
|
|
||||||
@@ -175,6 +176,7 @@
|
|||||||
|
|
||||||
// ── File preview state ───────────────────────────────────────────────
|
// ── File preview state ───────────────────────────────────────────────
|
||||||
let selectedFile: string | null = null;
|
let selectedFile: string | null = null;
|
||||||
|
let selectedFileWritable = true;
|
||||||
let previewPort: number | null = null;
|
let previewPort: number | null = null;
|
||||||
let fileContent: string | null = null;
|
let fileContent: string | null = null;
|
||||||
let fileImageUrl: string | null = null;
|
let fileImageUrl: string | null = null;
|
||||||
@@ -410,6 +412,7 @@
|
|||||||
loading = true;
|
loading = true;
|
||||||
error = null;
|
error = null;
|
||||||
selectedFile = null;
|
selectedFile = null;
|
||||||
|
selectedFileWritable = true;
|
||||||
previewPort = null;
|
previewPort = null;
|
||||||
clearFilePreview();
|
clearFilePreview();
|
||||||
clearSelection();
|
clearSelection();
|
||||||
@@ -428,7 +431,8 @@
|
|||||||
'Failed to load directory. Check your Terminal connection in Settings → Integrations.';
|
'Failed to load directory. Check your Terminal connection in Settings → Integrations.';
|
||||||
entries = [];
|
entries = [];
|
||||||
} else {
|
} else {
|
||||||
entries = sortEntries(result);
|
currentWritable = result.writable !== false;
|
||||||
|
entries = sortEntries(result.entries);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -439,6 +443,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
const filePath = `${currentPath}${entry.name}`;
|
const filePath = `${currentPath}${entry.name}`;
|
||||||
|
selectedFileWritable = entry.writable !== false;
|
||||||
pushNavHistory(currentPath, filePath);
|
pushNavHistory(currentPath, filePath);
|
||||||
|
|
||||||
const terminal = selectedTerminal;
|
const terminal = selectedTerminal;
|
||||||
@@ -566,6 +571,7 @@
|
|||||||
// ── Drag-and-drop upload ─────────────────────────────────────────────
|
// ── Drag-and-drop upload ─────────────────────────────────────────────
|
||||||
const handleDragOver = (e: DragEvent) => {
|
const handleDragOver = (e: DragEvent) => {
|
||||||
if (selectedFile) return;
|
if (selectedFile) return;
|
||||||
|
if (!currentWritable) return;
|
||||||
if (!e.dataTransfer?.types.includes('Files')) return;
|
if (!e.dataTransfer?.types.includes('Files')) return;
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
@@ -578,7 +584,7 @@
|
|||||||
isDragOver = false;
|
isDragOver = false;
|
||||||
|
|
||||||
const terminal = selectedTerminal;
|
const terminal = selectedTerminal;
|
||||||
if (selectedFile || !terminal) return;
|
if (selectedFile || !terminal || !currentWritable) return;
|
||||||
|
|
||||||
const droppedFiles = Array.from(e.dataTransfer?.files ?? []);
|
const droppedFiles = Array.from(e.dataTransfer?.files ?? []);
|
||||||
if (!droppedFiles.length) return;
|
if (!droppedFiles.length) return;
|
||||||
@@ -593,7 +599,7 @@
|
|||||||
|
|
||||||
const handleUploadFiles = async (files: File[]) => {
|
const handleUploadFiles = async (files: File[]) => {
|
||||||
const terminal = selectedTerminal;
|
const terminal = selectedTerminal;
|
||||||
if (!files.length || !terminal) return;
|
if (!files.length || !terminal || !currentWritable) return;
|
||||||
|
|
||||||
uploading = true;
|
uploading = true;
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
@@ -605,6 +611,7 @@
|
|||||||
|
|
||||||
// ── Folder creation ──────────────────────────────────────────────────
|
// ── Folder creation ──────────────────────────────────────────────────
|
||||||
const startNewFolder = async () => {
|
const startNewFolder = async () => {
|
||||||
|
if (!currentWritable) return;
|
||||||
creatingFolder = true;
|
creatingFolder = true;
|
||||||
newFolderName = '';
|
newFolderName = '';
|
||||||
await tick();
|
await tick();
|
||||||
@@ -634,6 +641,7 @@
|
|||||||
|
|
||||||
// ── File creation ────────────────────────────────────────────────────
|
// ── File creation ────────────────────────────────────────────────────
|
||||||
const startNewFile = async () => {
|
const startNewFile = async () => {
|
||||||
|
if (!currentWritable) return;
|
||||||
creatingFile = true;
|
creatingFile = true;
|
||||||
newFileName = '';
|
newFileName = '';
|
||||||
await tick();
|
await tick();
|
||||||
@@ -658,7 +666,7 @@
|
|||||||
// ── Delete ───────────────────────────────────────────────────────────
|
// ── Delete ───────────────────────────────────────────────────────────
|
||||||
const handleDelete = async (path: string, name: string) => {
|
const handleDelete = async (path: string, name: string) => {
|
||||||
const terminal = selectedTerminal;
|
const terminal = selectedTerminal;
|
||||||
if (!terminal) return;
|
if (!terminal || !currentWritable) return;
|
||||||
|
|
||||||
const result = await deleteEntry(terminal.url, terminal.key, path, chatId ?? undefined);
|
const result = await deleteEntry(terminal.url, terminal.key, path, chatId ?? undefined);
|
||||||
toast[result ? 'success' : 'error'](
|
toast[result ? 'success' : 'error'](
|
||||||
@@ -668,6 +676,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
const requestDelete = (path: string, name: string) => {
|
const requestDelete = (path: string, name: string) => {
|
||||||
|
if (!currentWritable) return;
|
||||||
deleteTarget = { path, name };
|
deleteTarget = { path, name };
|
||||||
showDeleteConfirm = true;
|
showDeleteConfirm = true;
|
||||||
};
|
};
|
||||||
@@ -675,7 +684,7 @@
|
|||||||
// ── Move (drag-and-drop) ────────────────────────────────────────────
|
// ── Move (drag-and-drop) ────────────────────────────────────────────
|
||||||
const handleMove = async (source: string, destFolder: string) => {
|
const handleMove = async (source: string, destFolder: string) => {
|
||||||
const terminal = selectedTerminal;
|
const terminal = selectedTerminal;
|
||||||
if (!terminal) return;
|
if (!terminal || !currentWritable) return;
|
||||||
|
|
||||||
const fileName = source.split('/').pop() ?? '';
|
const fileName = source.split('/').pop() ?? '';
|
||||||
const destination = `${destFolder}${fileName}`;
|
const destination = `${destFolder}${fileName}`;
|
||||||
@@ -704,7 +713,7 @@
|
|||||||
// ── Rename ──────────────────────────────────────────────────────────
|
// ── Rename ──────────────────────────────────────────────────────────
|
||||||
const handleRename = async (oldPath: string, newName: string) => {
|
const handleRename = async (oldPath: string, newName: string) => {
|
||||||
const terminal = selectedTerminal;
|
const terminal = selectedTerminal;
|
||||||
if (!terminal || !newName) return;
|
if (!terminal || !newName || !currentWritable) return;
|
||||||
|
|
||||||
const dir = oldPath.substring(0, oldPath.lastIndexOf('/') + 1) || currentPath;
|
const dir = oldPath.substring(0, oldPath.lastIndexOf('/') + 1) || currentPath;
|
||||||
const destination = `${dir}${newName}`;
|
const destination = `${dir}${newName}`;
|
||||||
@@ -733,6 +742,13 @@
|
|||||||
|
|
||||||
$: selectedCount = selectedEntries.size;
|
$: selectedCount = selectedEntries.size;
|
||||||
$: hasSelectedFiles = [...selectedEntries].some((p) => !p.endsWith('/'));
|
$: hasSelectedFiles = [...selectedEntries].some((p) => !p.endsWith('/'));
|
||||||
|
$: selectedEntriesWritable =
|
||||||
|
currentWritable &&
|
||||||
|
[...selectedEntries].every((path) => {
|
||||||
|
const name = path.replace(/\/$/, '').split('/').pop();
|
||||||
|
const entry = entries.find((item) => item.name === name);
|
||||||
|
return entry?.writable !== false;
|
||||||
|
});
|
||||||
|
|
||||||
const clearSelection = () => {
|
const clearSelection = () => {
|
||||||
selectedEntries = new Set();
|
selectedEntries = new Set();
|
||||||
@@ -792,7 +808,7 @@
|
|||||||
|
|
||||||
const bulkDelete = async () => {
|
const bulkDelete = async () => {
|
||||||
const terminal = selectedTerminal;
|
const terminal = selectedTerminal;
|
||||||
if (!terminal) return;
|
if (!terminal || !selectedEntriesWritable) return;
|
||||||
|
|
||||||
const paths = [...selectedEntries];
|
const paths = [...selectedEntries];
|
||||||
let ok = 0;
|
let ok = 0;
|
||||||
@@ -1046,6 +1062,7 @@
|
|||||||
breadcrumbs={buildBreadcrumbs(currentPath)}
|
breadcrumbs={buildBreadcrumbs(currentPath)}
|
||||||
{selectedFile}
|
{selectedFile}
|
||||||
{loading}
|
{loading}
|
||||||
|
writable={currentWritable}
|
||||||
{canGoBack}
|
{canGoBack}
|
||||||
{canGoForward}
|
{canGoForward}
|
||||||
{sortBy}
|
{sortBy}
|
||||||
@@ -1143,9 +1160,9 @@
|
|||||||
{#if isHtml && showRaw}
|
{#if isHtml && showRaw}
|
||||||
<Tooltip content={$i18n.t('Save')}>
|
<Tooltip content={$i18n.t('Save')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={() => filePreviewRef?.saveCodeFile()}
|
on:click={() => filePreviewRef?.saveCodeFile()}
|
||||||
disabled={saving}
|
disabled={saving || !selectedFileWritable}
|
||||||
aria-label={$i18n.t('Save')}
|
aria-label={$i18n.t('Save')}
|
||||||
>
|
>
|
||||||
{#if saving}
|
{#if saving}
|
||||||
@@ -1171,9 +1188,9 @@
|
|||||||
{:else if isMarkdown && showRaw}
|
{:else if isMarkdown && showRaw}
|
||||||
<Tooltip content={$i18n.t('Save')}>
|
<Tooltip content={$i18n.t('Save')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={() => filePreviewRef?.saveCodeFile()}
|
on:click={() => filePreviewRef?.saveCodeFile()}
|
||||||
disabled={saving}
|
disabled={saving || !selectedFileWritable}
|
||||||
aria-label={$i18n.t('Save')}
|
aria-label={$i18n.t('Save')}
|
||||||
>
|
>
|
||||||
{#if saving}
|
{#if saving}
|
||||||
@@ -1199,9 +1216,9 @@
|
|||||||
{:else if isCode}
|
{:else if isCode}
|
||||||
<Tooltip content={$i18n.t('Save')}>
|
<Tooltip content={$i18n.t('Save')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={() => filePreviewRef?.saveCodeFile()}
|
on:click={() => filePreviewRef?.saveCodeFile()}
|
||||||
disabled={saving}
|
disabled={saving || !selectedFileWritable}
|
||||||
aria-label={$i18n.t('Save')}
|
aria-label={$i18n.t('Save')}
|
||||||
>
|
>
|
||||||
{#if saving}
|
{#if saving}
|
||||||
@@ -1243,9 +1260,9 @@
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip content={$i18n.t('Save')}>
|
<Tooltip content={$i18n.t('Save')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={() => filePreviewRef?.saveEdit()}
|
on:click={() => filePreviewRef?.saveEdit()}
|
||||||
disabled={saving}
|
disabled={saving || !selectedFileWritable}
|
||||||
aria-label={$i18n.t('Save')}
|
aria-label={$i18n.t('Save')}
|
||||||
>
|
>
|
||||||
{#if saving}
|
{#if saving}
|
||||||
@@ -1269,8 +1286,9 @@
|
|||||||
{:else}
|
{:else}
|
||||||
<Tooltip content={$i18n.t('Edit')}>
|
<Tooltip content={$i18n.t('Edit')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={() => filePreviewRef?.startEdit()}
|
on:click={() => filePreviewRef?.startEdit()}
|
||||||
|
disabled={!selectedFileWritable}
|
||||||
aria-label={$i18n.t('Edit')}
|
aria-label={$i18n.t('Edit')}
|
||||||
>
|
>
|
||||||
<PenAlt className="size-3.5" />
|
<PenAlt className="size-3.5" />
|
||||||
@@ -1309,7 +1327,7 @@
|
|||||||
<Tooltip content={$i18n.t('Download')}>
|
<Tooltip content={$i18n.t('Download')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
||||||
on:click={() => downloadFile(selectedFile)}
|
on:click={() => selectedFile && downloadFile(selectedFile)}
|
||||||
aria-label={$i18n.t('Download')}
|
aria-label={$i18n.t('Download')}
|
||||||
>
|
>
|
||||||
<svg
|
<svg
|
||||||
@@ -1335,6 +1353,7 @@
|
|||||||
<BulkActionBar
|
<BulkActionBar
|
||||||
count={selectedCount}
|
count={selectedCount}
|
||||||
hasFiles={hasSelectedFiles}
|
hasFiles={hasSelectedFiles}
|
||||||
|
canDelete={selectedEntriesWritable}
|
||||||
onDelete={() => {
|
onDelete={() => {
|
||||||
deleteTarget = { path: '__bulk__', name: `${selectedCount} items` };
|
deleteTarget = { path: '__bulk__', name: `${selectedCount} items` };
|
||||||
showDeleteConfirm = true;
|
showDeleteConfirm = true;
|
||||||
@@ -1370,6 +1389,7 @@
|
|||||||
bind:saving
|
bind:saving
|
||||||
bind:currentSlide
|
bind:currentSlide
|
||||||
{selectedFile}
|
{selectedFile}
|
||||||
|
readOnly={!selectedFileWritable}
|
||||||
{fileLoading}
|
{fileLoading}
|
||||||
{fileImageUrl}
|
{fileImageUrl}
|
||||||
{fileVideoUrl}
|
{fileVideoUrl}
|
||||||
@@ -1394,7 +1414,7 @@
|
|||||||
overlay={overlay || isDraggingHandle}
|
overlay={overlay || isDraggingHandle}
|
||||||
onSave={async (content) => {
|
onSave={async (content) => {
|
||||||
const terminal = selectedTerminal;
|
const terminal = selectedTerminal;
|
||||||
if (!terminal || !selectedFile) return;
|
if (!terminal || !selectedFile || !selectedFileWritable) return;
|
||||||
const fileName = selectedFile.split('/').pop() ?? 'file';
|
const fileName = selectedFile.split('/').pop() ?? 'file';
|
||||||
const dir = selectedFile.substring(0, selectedFile.lastIndexOf('/') + 1) || '/';
|
const dir = selectedFile.substring(0, selectedFile.lastIndexOf('/') + 1) || '/';
|
||||||
const file = new File([content], fileName, { type: 'text/plain' });
|
const file = new File([content], fileName, { type: 'text/plain' });
|
||||||
@@ -1490,6 +1510,7 @@
|
|||||||
onSelect={handleSelect}
|
onSelect={handleSelect}
|
||||||
onLongPress={enterSelectionMode}
|
onLongPress={enterSelectionMode}
|
||||||
showDate={sortBy === 'date'}
|
showDate={sortBy === 'date'}
|
||||||
|
parentWritable={currentWritable}
|
||||||
/>
|
/>
|
||||||
{/each}
|
{/each}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
export let count: number = 0;
|
export let count: number = 0;
|
||||||
export let hasFiles: boolean = false;
|
export let hasFiles: boolean = false;
|
||||||
|
export let canDelete = true;
|
||||||
|
|
||||||
export let onDelete: () => void = () => {};
|
export let onDelete: () => void = () => {};
|
||||||
export let onDownload: () => void = () => {};
|
export let onDownload: () => void = () => {};
|
||||||
@@ -64,8 +65,9 @@
|
|||||||
|
|
||||||
<Tooltip content={$i18n.t('Delete')}>
|
<Tooltip content={$i18n.t('Delete')}>
|
||||||
<button
|
<button
|
||||||
class="p-1 rounded transition text-gray-400 dark:text-gray-500 hover:bg-gray-100 dark:hover:bg-gray-800 hover:text-gray-600 dark:hover:text-gray-400"
|
class="p-1 rounded transition text-gray-400 dark:text-gray-500 hover:bg-gray-100 dark:hover:bg-gray-800 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={onDelete}
|
on:click={onDelete}
|
||||||
|
disabled={!canDelete}
|
||||||
aria-label={$i18n.t('Delete')}
|
aria-label={$i18n.t('Delete')}
|
||||||
>
|
>
|
||||||
<GarbageBin className="size-3.5" />
|
<GarbageBin className="size-3.5" />
|
||||||
|
|||||||
@@ -32,6 +32,10 @@
|
|||||||
export let onSelect: (entry: FileEntry, event: MouseEvent) => void = () => {};
|
export let onSelect: (entry: FileEntry, event: MouseEvent) => void = () => {};
|
||||||
export let onLongPress: () => void = () => {};
|
export let onLongPress: () => void = () => {};
|
||||||
export let showDate: boolean = false;
|
export let showDate: boolean = false;
|
||||||
|
export let parentWritable = true;
|
||||||
|
|
||||||
|
$: writable = entry.writable !== false;
|
||||||
|
$: canMutate = parentWritable && writable;
|
||||||
|
|
||||||
const formatRelativeTime = (epoch: number): string => {
|
const formatRelativeTime = (epoch: number): string => {
|
||||||
const diff = Math.floor(Date.now() / 1000) - epoch;
|
const diff = Math.floor(Date.now() / 1000) - epoch;
|
||||||
@@ -143,6 +147,7 @@
|
|||||||
role={entry.type === 'directory' ? 'button' : undefined}
|
role={entry.type === 'directory' ? 'button' : undefined}
|
||||||
on:dragover={(e) => {
|
on:dragover={(e) => {
|
||||||
if (entry.type !== 'directory') return;
|
if (entry.type !== 'directory') return;
|
||||||
|
if (!writable) return;
|
||||||
if (!e.dataTransfer?.types.includes('application/x-terminal-file-move')) return;
|
if (!e.dataTransfer?.types.includes('application/x-terminal-file-move')) return;
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
@@ -155,6 +160,7 @@
|
|||||||
}}
|
}}
|
||||||
on:drop={(e) => {
|
on:drop={(e) => {
|
||||||
if (entry.type !== 'directory') return;
|
if (entry.type !== 'directory') return;
|
||||||
|
if (!writable) return;
|
||||||
const raw = e.dataTransfer?.getData('application/x-terminal-file-move');
|
const raw = e.dataTransfer?.getData('application/x-terminal-file-move');
|
||||||
if (!raw) return;
|
if (!raw) return;
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -173,8 +179,12 @@
|
|||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
class="flex-1 flex items-center gap-2 px-3 py-1.5 text-left min-w-0"
|
class="flex-1 flex items-center gap-2 px-3 py-1.5 text-left min-w-0"
|
||||||
draggable={true}
|
draggable={canMutate}
|
||||||
on:dragstart={(e) => {
|
on:dragstart={(e) => {
|
||||||
|
if (!canMutate) {
|
||||||
|
e.preventDefault();
|
||||||
|
return;
|
||||||
|
}
|
||||||
const filePath = `${currentPath}${entry.name}`;
|
const filePath = `${currentPath}${entry.name}`;
|
||||||
// If dragging a selected item, drag all selected
|
// If dragging a selected item, drag all selected
|
||||||
if (selected && selectedPaths.size > 1) {
|
if (selected && selectedPaths.size > 1) {
|
||||||
@@ -282,6 +292,9 @@
|
|||||||
{entry.name}
|
{entry.name}
|
||||||
</span>
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
|
{#if !writable && !renaming}
|
||||||
|
<span class="text-[10px] text-gray-400 shrink-0">Read-only</span>
|
||||||
|
{/if}
|
||||||
{#if entry.type === 'file' && entry.size !== undefined && !renaming}
|
{#if entry.type === 'file' && entry.size !== undefined && !renaming}
|
||||||
{#if showDate && entry.modified}
|
{#if showDate && entry.modified}
|
||||||
<span class="text-[10px] text-gray-400 shrink-0"
|
<span class="text-[10px] text-gray-400 shrink-0"
|
||||||
@@ -354,9 +367,11 @@
|
|||||||
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="select-none flex h-[1.6875rem] w-full items-center gap-2 rounded-xl px-2 text-[13px] hover:bg-gray-50/40 dark:hover:bg-gray-800/40 transition"
|
class="select-none flex h-[1.6875rem] w-full items-center gap-2 rounded-xl px-2 text-[13px] hover:bg-gray-50/40 dark:hover:bg-gray-800/40 transition disabled:opacity-40 disabled:hover:bg-transparent"
|
||||||
|
disabled={!canMutate}
|
||||||
on:click={(e) => {
|
on:click={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
if (!canMutate) return;
|
||||||
startRename();
|
startRename();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -366,9 +381,11 @@
|
|||||||
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="select-none flex h-[1.6875rem] w-full items-center gap-2 rounded-xl px-2 text-[13px] hover:bg-gray-50/40 dark:hover:bg-gray-800/40 transition"
|
class="select-none flex h-[1.6875rem] w-full items-center gap-2 rounded-xl px-2 text-[13px] hover:bg-gray-50/40 dark:hover:bg-gray-800/40 transition disabled:opacity-40 disabled:hover:bg-transparent"
|
||||||
|
disabled={!canMutate}
|
||||||
on:click={(e) => {
|
on:click={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
if (!canMutate) return;
|
||||||
onDelete(`${currentPath}${entry.name}`, entry.name);
|
onDelete(`${currentPath}${entry.name}`, entry.name);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
export let breadcrumbs: { label: string; path: string }[] = [];
|
export let breadcrumbs: { label: string; path: string }[] = [];
|
||||||
export let selectedFile: string | null = null;
|
export let selectedFile: string | null = null;
|
||||||
export let loading = false;
|
export let loading = false;
|
||||||
|
export let writable = true;
|
||||||
|
|
||||||
export let onNavigate: (path: string) => void = () => {};
|
export let onNavigate: (path: string) => void = () => {};
|
||||||
export let onRefresh: () => void = () => {};
|
export let onRefresh: () => void = () => {};
|
||||||
@@ -114,6 +115,7 @@
|
|||||||
: ''}"
|
: ''}"
|
||||||
on:click={() => onNavigate(crumb.path)}
|
on:click={() => onNavigate(crumb.path)}
|
||||||
on:dragover={(e) => {
|
on:dragover={(e) => {
|
||||||
|
if (!writable) return;
|
||||||
if (!e.dataTransfer?.types.includes('application/x-terminal-file-move')) return;
|
if (!e.dataTransfer?.types.includes('application/x-terminal-file-move')) return;
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
@@ -123,6 +125,7 @@
|
|||||||
if (dragOverCrumb === i) dragOverCrumb = null;
|
if (dragOverCrumb === i) dragOverCrumb = null;
|
||||||
}}
|
}}
|
||||||
on:drop={(e) => {
|
on:drop={(e) => {
|
||||||
|
if (!writable) return;
|
||||||
const raw = e.dataTransfer?.getData('application/x-terminal-file-move');
|
const raw = e.dataTransfer?.getData('application/x-terminal-file-move');
|
||||||
if (!raw) return;
|
if (!raw) return;
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -145,6 +148,11 @@
|
|||||||
</span>
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
{#if !writable}
|
||||||
|
<span class="text-[10px] text-gray-400 dark:text-gray-500 shrink-0">
|
||||||
|
Read-only
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<Tooltip content={$i18n.t('Refresh')}>
|
<Tooltip content={$i18n.t('Refresh')}>
|
||||||
<button
|
<button
|
||||||
@@ -240,8 +248,9 @@
|
|||||||
</Dropdown>
|
</Dropdown>
|
||||||
<Tooltip content={$i18n.t('New Folder')}>
|
<Tooltip content={$i18n.t('New Folder')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={onNewFolder}
|
on:click={onNewFolder}
|
||||||
|
disabled={!writable}
|
||||||
aria-label={$i18n.t('New Folder')}
|
aria-label={$i18n.t('New Folder')}
|
||||||
>
|
>
|
||||||
<NewFolderAlt className="size-3.5" />
|
<NewFolderAlt className="size-3.5" />
|
||||||
@@ -249,8 +258,9 @@
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip content={$i18n.t('New File')}>
|
<Tooltip content={$i18n.t('New File')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={onNewFile}
|
on:click={onNewFile}
|
||||||
|
disabled={!writable}
|
||||||
aria-label={$i18n.t('New File')}
|
aria-label={$i18n.t('New File')}
|
||||||
>
|
>
|
||||||
<FilePlusAlt className="size-3.5" />
|
<FilePlusAlt className="size-3.5" />
|
||||||
@@ -279,8 +289,9 @@
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip content={$i18n.t('Upload')}>
|
<Tooltip content={$i18n.t('Upload')}>
|
||||||
<button
|
<button
|
||||||
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400"
|
class="shrink-0 p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-400 disabled:opacity-30 disabled:hover:bg-transparent"
|
||||||
on:click={() => uploadInput?.click()}
|
on:click={() => uploadInput?.click()}
|
||||||
|
disabled={!writable}
|
||||||
aria-label={$i18n.t('Upload')}
|
aria-label={$i18n.t('Upload')}
|
||||||
>
|
>
|
||||||
<svg
|
<svg
|
||||||
@@ -305,7 +316,7 @@
|
|||||||
multiple
|
multiple
|
||||||
hidden
|
hidden
|
||||||
on:change={async () => {
|
on:change={async () => {
|
||||||
if (!uploadInput?.files?.length) return;
|
if (!writable || !uploadInput?.files?.length) return;
|
||||||
onUploadFiles(Array.from(uploadInput.files));
|
onUploadFiles(Array.from(uploadInput.files));
|
||||||
uploadInput.value = '';
|
uploadInput.value = '';
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -41,6 +41,7 @@
|
|||||||
export let onSheetChange: ((sheet: string) => void) | null = null;
|
export let onSheetChange: ((sheet: string) => void) | null = null;
|
||||||
|
|
||||||
export let overlay = false;
|
export let overlay = false;
|
||||||
|
export let readOnly = false;
|
||||||
|
|
||||||
export let onSave: ((content: string) => Promise<void>) | null = null;
|
export let onSave: ((content: string) => Promise<void>) | null = null;
|
||||||
|
|
||||||
@@ -59,6 +60,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const startEdit = async () => {
|
export const startEdit = async () => {
|
||||||
|
if (readOnly) return;
|
||||||
editContent = fileContent ?? '';
|
editContent = fileContent ?? '';
|
||||||
editing = true;
|
editing = true;
|
||||||
showRaw = true;
|
showRaw = true;
|
||||||
@@ -67,7 +69,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const saveEdit = async () => {
|
export const saveEdit = async () => {
|
||||||
if (!onSave) return;
|
if (!onSave || readOnly) return;
|
||||||
saving = true;
|
saving = true;
|
||||||
await onSave(editContent);
|
await onSave(editContent);
|
||||||
saving = false;
|
saving = false;
|
||||||
@@ -81,7 +83,7 @@
|
|||||||
|
|
||||||
/** Save code file directly from CodeMirror */
|
/** Save code file directly from CodeMirror */
|
||||||
export const saveCodeFile = async () => {
|
export const saveCodeFile = async () => {
|
||||||
if (!onSave) return;
|
if (!onSave || readOnly) return;
|
||||||
saving = true;
|
saving = true;
|
||||||
const content = fileCodeEditorRef?.getValue() ?? '';
|
const content = fileCodeEditorRef?.getValue() ?? '';
|
||||||
await onSave(content);
|
await onSave(content);
|
||||||
@@ -426,7 +428,7 @@
|
|||||||
bind:this={fileCodeEditorRef}
|
bind:this={fileCodeEditorRef}
|
||||||
value={fileContent ?? ''}
|
value={fileContent ?? ''}
|
||||||
filePath={selectedFile}
|
filePath={selectedFile}
|
||||||
{onSave}
|
onSave={readOnly ? null : onSave}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{:else if isMarkdown && !showRaw}
|
{:else if isMarkdown && !showRaw}
|
||||||
@@ -439,7 +441,7 @@
|
|||||||
bind:this={fileCodeEditorRef}
|
bind:this={fileCodeEditorRef}
|
||||||
value={fileContent ?? ''}
|
value={fileContent ?? ''}
|
||||||
filePath={selectedFile}
|
filePath={selectedFile}
|
||||||
{onSave}
|
onSave={readOnly ? null : onSave}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{:else if isCsv && !showRaw && csvRows.length > 0}
|
{:else if isCsv && !showRaw && csvRows.length > 0}
|
||||||
@@ -496,7 +498,7 @@
|
|||||||
bind:this={fileCodeEditorRef}
|
bind:this={fileCodeEditorRef}
|
||||||
value={fileContent ?? ''}
|
value={fileContent ?? ''}
|
||||||
filePath={selectedFile}
|
filePath={selectedFile}
|
||||||
{onSave}
|
onSave={readOnly ? null : onSave}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{:else if isSvg && highlightedHtml && !showRaw}
|
{:else if isSvg && highlightedHtml && !showRaw}
|
||||||
|
|||||||
Reference in new issue
Block a user