kodi/webmanager-mvp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: F1 en F2 en Log UI toegevoegd

Browse Source
This commit is contained in:
kodi
2026-03-12 07:55:45 +01:00
parent 9901c77919
commit 8f4263c222
7 changed files with 484 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webui/backend/data/tasks.db
BIN
View File
Binary file not shown.
webui/backend/tests/golden/__pycache__/test_ui_smoke_golden.cpython-313.pyc
BIN
View File
Binary file not shown.
webui/backend/tests/golden/test_ui_smoke_golden.py
+20
View File
@@ -37,8 +37,12 @@ class UiSmokeGoldenTest(unittest.TestCase):
self.assertIn('id="left-items"', body)
self.assertIn('id="right-items"', body)
self.assertIn('id="function-bar"', body)
self.assertIn('id="settings-btn"', body)
self.assertIn('id="rename-placeholder-btn"', body)
self.assertIn('id="view-btn"', body)
self.assertIn('id="edit-btn"', body)
self.assertIn("F1", body)
self.assertIn("F2", body)
self.assertIn("F3", body)
self.assertIn("F4", body)
self.assertIn("F5", body)
@@ -46,6 +50,10 @@ class UiSmokeGoldenTest(unittest.TestCase):
self.assertIn("F7", body)
self.assertIn("F8", body)
self.assertIn('id="viewer-modal"', body)
self.assertIn('id="settings-modal"', body)
self.assertIn('id="settings-general-tab"', body)
self.assertIn('id="settings-logs-tab"', body)
self.assertIn('id="settings-logs-list"', body)
self.assertIn('id="viewer-content"', body)
self.assertIn('id="editor-modal"', body)
self.assertIn('id="editor-content"', body)
@@ -68,6 +76,8 @@ class UiSmokeGoldenTest(unittest.TestCase):
self.assertNotIn('id="tasks-panel"', body)
ordered_ids = [
'id="settings-btn"',
'id="rename-placeholder-btn"',
'id="view-btn"',
'id="edit-btn"',
'id="copy-btn"',
@@ -78,6 +88,9 @@ class UiSmokeGoldenTest(unittest.TestCase):
]
positions = [body.index(marker) for marker in ordered_ids]
self.assertEqual(positions, sorted(positions))
rename_placeholder_index = body.index('id="rename-placeholder-btn"')
disabled_index = body.index("disabled", rename_placeholder_index)
self.assertLess(rename_placeholder_index, disabled_index)
def test_ui_static_assets_are_present_and_mapped(self) -> None:
mount = self._ui_mount()
@@ -89,6 +102,11 @@ class UiSmokeGoldenTest(unittest.TestCase):
self.assertIn('const THEME_STORAGE_KEY = "webmanager-theme"', app_js)
self.assertIn("document.documentElement.dataset.theme", app_js)
self.assertIn('document.getElementById("theme-toggle").onclick = toggleTheme;', app_js)
self.assertIn('document.getElementById("settings-btn").onclick = () => openSettings("general");', app_js)
self.assertIn('if (event.key === "F1") {', app_js)
self.assertIn('if (event.key === "F2") {', app_js)
self.assertIn('function openSettings(tab = "general")', app_js)
self.assertIn('await apiRequest("GET", "/api/history")', app_js)
self.assertIn('Cross-root directory move is not supported in v1', app_js)
self.assertIn('Batch directory move is not supported in v1', app_js)
self.assertIn('Batch move requires all selected items to be in the same root', app_js)
@@ -100,6 +118,8 @@ class UiSmokeGoldenTest(unittest.TestCase):
self.assertIn(':root[data-theme="dark"]', style_css)
self.assertIn(':root[data-theme="light"]', style_css)
self.assertIn('#theme-toggle', style_css)
self.assertIn('.settings-card', style_css)
self.assertIn('.settings-tabs', style_css)
app_js_url = app.url_path_for("ui", path="/app.js")
style_css_url = app.url_path_for("ui", path="/style.css")
webui/html/app.js
+135
View File
@@ -38,6 +38,10 @@ let batchMoveState = {
destinationBase: "",
count: 0,
};
let settingsState = {
activeTab: "general",
logsLoaded: false,
};
const THEME_STORAGE_KEY = "webmanager-theme";
function preferredTheme() {
@@ -154,6 +158,19 @@ function batchMoveElements() {
};
}
function settingsElements() {
return {
overlay: document.getElementById("settings-modal"),
closeButton: document.getElementById("settings-close-btn"),
generalTab: document.getElementById("settings-general-tab"),
logsTab: document.getElementById("settings-logs-tab"),
generalPanel: document.getElementById("settings-general-panel"),
logsPanel: document.getElementById("settings-logs-panel"),
logsList: document.getElementById("settings-logs-list"),
logsError: document.getElementById("settings-logs-error"),
};
}
async function apiRequest(method, url, body) {
const options = { method, headers: {} };
if (body !== undefined) {
@@ -899,6 +916,12 @@ function actionShortcutHandled(event) {
const noModifiers = !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey;
if (noModifiers) {
if (event.key === "F1") {
return triggerActionButton("settings-btn");
}
if (event.key === "F2") {
return false;
}
if (event.key === "F3") {
return triggerActionButton("view-btn");
}
@@ -956,6 +979,10 @@ function wildcardPopupElements() {
};
}
function isSettingsOpen() {
return !settingsElements().overlay.classList.contains("hidden");
}
function isWildcardPopupOpen() {
return !wildcardPopupElements().overlay.classList.contains("hidden");
}
@@ -1234,6 +1261,92 @@ function closeViewer() {
viewer.content.textContent = "";
}
function setSettingsTab(tab) {
const elements = settingsElements();
settingsState.activeTab = tab === "logs" ? "logs" : "general";
const isGeneral = settingsState.activeTab === "general";
elements.generalTab.classList.toggle("is-active", isGeneral);
elements.generalTab.setAttribute("aria-selected", isGeneral ? "true" : "false");
elements.logsTab.classList.toggle("is-active", !isGeneral);
elements.logsTab.setAttribute("aria-selected", !isGeneral ? "true" : "false");
elements.generalPanel.classList.toggle("hidden", !isGeneral);
elements.logsPanel.classList.toggle("hidden", isGeneral);
}
function formatHistoryLine(item) {
const timestamp = item.finished_at || item.created_at || "";
const when = formatModified(timestamp);
const primaryPath = item.path || [item.source, item.destination].filter(Boolean).join(" -> ");
return {
title: `${item.operation} · ${item.status}`,
path: primaryPath || "-",
meta: when,
error: item.status === "failed" ? (item.error_message || item.error_code || "") : "",
};
}
function renderHistoryItems(items) {
const elements = settingsElements();
elements.logsList.innerHTML = "";
if (!Array.isArray(items) || items.length === 0) {
const empty = document.createElement("div");
empty.className = "popup-meta";
empty.textContent = "No history entries yet.";
elements.logsList.append(empty);
return;
}
for (const item of items) {
const line = formatHistoryLine(item);
const row = document.createElement("div");
row.className = `settings-log-item status-${item.status}`;
const title = document.createElement("div");
title.className = "settings-log-title";
title.textContent = line.title;
const path = document.createElement("div");
path.className = "settings-log-path";
path.textContent = line.path;
const meta = document.createElement("div");
meta.className = "settings-log-meta";
meta.textContent = line.meta;
row.append(title, path, meta);
if (line.error) {
const error = document.createElement("div");
error.className = "settings-log-error";
error.textContent = line.error;
row.append(error);
}
elements.logsList.append(row);
}
}
async function loadHistoryForSettings() {
const elements = settingsElements();
elements.logsError.textContent = "";
elements.logsList.innerHTML = '<div class="popup-meta">Loading...</div>';
try {
const data = await apiRequest("GET", "/api/history");
renderHistoryItems(data.items || []);
settingsState.logsLoaded = true;
} catch (err) {
elements.logsList.innerHTML = "";
elements.logsError.textContent = err.message;
}
}
function closeSettings() {
settingsElements().overlay.classList.add("hidden");
}
async function openSettings(tab = "general") {
const elements = settingsElements();
elements.overlay.classList.remove("hidden");
setSettingsTab(tab);
if (settingsState.activeTab === "logs") {
await loadHistoryForSettings();
}
(settingsState.activeTab === "logs" ? elements.logsTab : elements.generalTab).focus();
}
function editorIsDirty() {
return editorElements().content.value !== editorState.originalContent;
}
@@ -1419,6 +1532,14 @@ function clearSelectionForActivePane() {
}
function handleKeyboardShortcuts(event) {
if (isSettingsOpen()) {
if (event.key === "Escape") {
event.preventDefault();
closeSettings();
return;
}
return;
}
if (isBatchMovePopupOpen()) {
if (event.key === "Escape") {
event.preventDefault();
@@ -1555,6 +1676,7 @@ function setupEvents() {
setupPaneEvents("right");
document.addEventListener("keydown", handleKeyboardShortcuts);
document.getElementById("theme-toggle").onclick = toggleTheme;
document.getElementById("settings-btn").onclick = () => openSettings("general");
document.getElementById("view-btn").onclick = openViewer;
document.getElementById("edit-btn").onclick = openEditor;
document.getElementById("rename-btn").onclick = renameSelected;
@@ -1563,6 +1685,19 @@ function setupEvents() {
document.getElementById("move-btn").onclick = openF6Flow;
document.getElementById("mkdir-btn").onclick = createFolderForActivePane;
const settings = settingsElements();
settings.closeButton.onclick = closeSettings;
settings.generalTab.onclick = () => setSettingsTab("general");
settings.logsTab.onclick = async () => {
setSettingsTab("logs");
await loadHistoryForSettings();
};
settings.overlay.onclick = (event) => {
if (event.target === settings.overlay) {
closeSettings();
}
};
const wildcard = wildcardPopupElements();
wildcard.cancelButton.onclick = closeWildcardPopup;
wildcard.applyButton.onclick = submitWildcardPopup;
webui/html/index.html
+21
View File
@@ -67,6 +67,8 @@
<section id="footer-bar">
<div id="function-bar-meta" class="pathline compact-line">Active:<code id="active-pane-label">left</code></div>
<div id="function-bar" class="toolbar compact-toolbar">
<button id="settings-btn" type="button"><span class="shortcut-hint">F1</span><span>Settings</span></button>
<button id="rename-placeholder-btn" type="button" disabled><span class="shortcut-hint">F2</span><span>Rename</span></button>
<button id="view-btn" type="button" disabled><span class="shortcut-hint">F3</span><span>View</span></button>
<button id="edit-btn" type="button" disabled><span class="shortcut-hint">F4</span><span>Edit</span></button>
<button id="copy-btn" type="button" disabled><span class="shortcut-hint">F5</span><span>Copy</span></button>
@@ -79,6 +81,25 @@
</section>
</div>
<div id="settings-modal" class="popup-overlay hidden" role="dialog" aria-modal="true" aria-labelledby="settings-title">
<div class="popup-card settings-card">
<button id="settings-close-btn" class="viewer-close" type="button" aria-label="Close settings">X</button>
<h3 id="settings-title">Settings</h3>
<div class="settings-tabs" role="tablist" aria-label="Settings tabs">
<button id="settings-general-tab" class="settings-tab is-active" type="button" role="tab" aria-selected="true">General</button>
<button id="settings-logs-tab" class="settings-tab" type="button" role="tab" aria-selected="false">Logs</button>
</div>
<section id="settings-general-panel" class="settings-panel" role="tabpanel" aria-labelledby="settings-general-tab">
<div class="settings-placeholder-title">General</div>
<div class="popup-meta">Future application settings will appear here.</div>
</section>
<section id="settings-logs-panel" class="settings-panel hidden" role="tabpanel" aria-labelledby="settings-logs-tab">
<div id="settings-logs-error" class="error"></div>
<div id="settings-logs-list" class="settings-log-list"></div>
</section>
</div>
</div>
<div id="wildcard-popup" class="popup-overlay hidden" role="dialog" aria-modal="true" aria-labelledby="wildcard-popup-title">
<div class="popup-card">
<h3 id="wildcard-popup-title">Wildcard Select</h3>
webui/html/style.css
+84
View File
@@ -459,6 +459,10 @@ button:disabled {
display: none;
}
.hidden {
display: none !important;
}
.popup-card {
width: min(420px, calc(100vw - 24px));
background: var(--color-surface-elevated);
@@ -500,6 +504,86 @@ button:disabled {
flex-direction: column;
}
.settings-card {
position: relative;
width: min(760px, calc(100vw - 32px));
max-height: calc(100vh - 56px);
display: flex;
flex-direction: column;
gap: 10px;
}
.settings-tabs {
display: flex;
gap: 6px;
padding-bottom: 4px;
border-bottom: 1px solid var(--color-border);
}
.settings-tab {
background: var(--color-button-secondary-bg);
}
.settings-tab.is-active {
border-color: var(--color-accent);
background: var(--color-button-hover);
}
.settings-panel {
min-height: 180px;
}
.settings-placeholder-title {
font-size: 13px;
font-weight: 700;
margin-bottom: 8px;
}
.settings-log-list {
display: flex;
flex-direction: column;
gap: 8px;
max-height: 46vh;
overflow-y: auto;
padding-right: 2px;
}
.settings-log-item {
border: 1px solid var(--color-border);
border-radius: var(--radius-sm);
padding: 8px 9px;
background: var(--color-surface);
}
.settings-log-item.status-failed {
border-color: var(--color-danger);
}
.settings-log-title {
font-size: 12px;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.04em;
margin-bottom: 3px;
}
.settings-log-path {
font-size: 13px;
margin-bottom: 4px;
word-break: break-word;
}
.settings-log-meta {
font-size: 12px;
color: var(--color-text-muted);
}
.settings-log-error {
margin-top: 5px;
font-size: 12px;
color: var(--color-danger);
}
.viewer-close {
position: absolute;
top: 10px;