+ ${svgIcon('eye-off', { className: 'fvplus-docker-visibility-notice-icon' })}
+ ${escapeHtml(translate('docker.visibility.hidden-title', 'Folder hidden'))} ${escapeHtml(String(hiddenFolderUndo.folderName || translate('docker.visibility.folder-fallback', 'Folder')))} ${escapeHtml(translate('docker.visibility.hidden-message', 'was hidden from the Docker view.'))}
+
+
` : ''}
+ ${allFoldersHidden ? `
+ ${svgIcon('eye-off', { className: 'fvplus-docker-visibility-notice-icon' })}
+ ${escapeHtml(translate('docker.visibility.all-hidden-title', 'All folder rows are hidden.'))} ${escapeHtml(translate('docker.visibility.all-hidden-help', 'Reveal them temporarily or restore every hidden folder.'))}
+
+
+
` : ''}`;
Array.from(bar.querySelectorAll('button')).forEach((button) => {
button.disabled = button.disabled || busy;
});
@@ -408,10 +457,39 @@
actionMenuOpen = '';
folderFilterMode = 'all';
clearFocusedFolder();
+ setRevealHiddenFolders(false);
applyFilterState();
sync();
};
+ const clearHiddenFolderUndo = (folderId = '') => {
+ const expectedId = String(folderId || '').trim();
+ if (expectedId && String(hiddenFolderUndo?.folderId || '') !== expectedId) return false;
+ if (hiddenFolderUndoTimer) {
+ win?.clearTimeout?.(hiddenFolderUndoTimer);
+ hiddenFolderUndoTimer = 0;
+ }
+ hiddenFolderUndo = null;
+ return true;
+ };
+
+ const offerHiddenFolderUndo = ({ folderId = '', folderName = '' } = {}) => {
+ clearHiddenFolderUndo();
+ const id = String(folderId || '').trim();
+ if (!id) return;
+ hiddenFolderUndo = {
+ folderId: id,
+ folderName: String(folderName || translate('docker.visibility.folder-fallback', 'Folder')),
+ expiresAt: Date.now() + 10000
+ };
+ hiddenFolderUndoTimer = win?.setTimeout?.(() => {
+ hiddenFolderUndoTimer = 0;
+ hiddenFolderUndo = null;
+ sync();
+ }, 10000) || 0;
+ sync();
+ };
+
const getRootFolderIds = () => {
const folders = getFolders() || {};
const hierarchy = buildFolderHierarchy(folders);
@@ -443,6 +521,37 @@
if (SETTINGS_ROUTES[route] && win?.location) win.location.href = SETTINGS_ROUTES[route];
return;
}
+ const hiddenButton = target.closest?.('[data-fvplus-docker-hidden]');
+ if (hiddenButton && !hiddenButton.disabled) {
+ event.preventDefault();
+ const action = String(hiddenButton.getAttribute('data-fvplus-docker-hidden') || '');
+ actionMenuOpen = '';
+ if (action === 'toggle-reveal') {
+ folderFilterMode = 'all';
+ clearFocusedFolder();
+ const current = getHiddenVisibilitySummary()?.revealHiddenFolders === true;
+ setRevealHiddenFolders(!current);
+ applyFilterState();
+ sync();
+ }
+ if (action === 'restore-all') {
+ runTask(async () => {
+ await restoreAllHiddenFolders();
+ clearHiddenFolderUndo();
+ setRevealHiddenFolders(false);
+ applyFilterState();
+ });
+ }
+ if (action === 'undo' && hiddenFolderUndo?.folderId) {
+ const undoId = hiddenFolderUndo.folderId;
+ clearHiddenFolderUndo(undoId);
+ runTask(async () => {
+ await restoreHiddenFolder(undoId);
+ applyFilterState();
+ });
+ }
+ return;
+ }
const toolButton = target.closest?.('[data-fvplus-docker-tool]');
if (toolButton && !toolButton.disabled) {
event.preventDefault();
@@ -540,7 +649,9 @@
setFilterMode: setFolderFilter,
setPageViewMode,
resetView,
- getFilterMode: () => folderFilterMode
+ getFilterMode: () => folderFilterMode,
+ offerHiddenFolderUndo,
+ clearHiddenFolderUndo
});
};
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.actions.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.actions.js
index 1fd43702..fa1cfce6 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.actions.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.actions.js
@@ -61,7 +61,7 @@
const getDockerMenuLabel = typeof deps.getDockerMenuLabel === 'function'
? deps.getDockerMenuLabel
: ((_key, fallback) => String(fallback || _key || '').trim());
- const requestClient = deps.requestClient || win?.FolderViewPlusRequest || null;
+ const webuiProfiles = deps.webuiProfiles || win?.FolderViewPlusFoundationModules?.folderWebuiProfiles || null, requestClient = deps.requestClient || win?.FolderViewPlusRequest || null;
const folderSettingsTransfer = deps.folderSettingsTransfer
|| (typeof win?.FolderViewPlusFolderSettingsTransfer?.createApi === 'function'
? win.FolderViewPlusFolderSettingsTransfer.createApi({ window: win })
@@ -518,7 +518,6 @@
// Editor prefill is best-effort only.
}
};
-
const buildDockerFolderEditorUrl = (id = '', options = {}) => {
const params = new URLSearchParams();
const hashParams = new URLSearchParams();
@@ -533,23 +532,23 @@
params.set('parentId', parentId);
hashParams.set('parentId', parentId);
}
+ const section = String(options?.section || '').trim();
+ if (section === 'webuiProfiles') { params.set('section', section); hashParams.set('section', section); }
params.set('_', String(Date.now()));
return `/Docker/Folder?${params.toString()}#${hashParams.toString()}`;
};
-
- const editFolder = (id) => {
+ const editFolder = (id, options = {}) => {
if (!ensureDockerFolderUnlocked(id, 'Edit folder')) {
return;
}
debugLog(`[FV3_DEBUG] editFolder (id: ${id}): Redirecting to edit page.`);
seedFolderEditorPrefill('docker', id);
- const targetUrl = buildDockerFolderEditorUrl(id);
+ const targetUrl = buildDockerFolderEditorUrl(id, options);
recordFolderEditorLaunchDebug('docker', 'docker', id, targetUrl);
if (win?.location) {
win.location.href = targetUrl;
}
};
-
const createChildFolder = (parentId) => {
const safeParentId = normalizeFolderParentId(parentId);
if (!safeParentId || !getFolderById(safeParentId)) {
@@ -617,7 +616,7 @@
return out;
}, []);
- const showFolderWebuiPopupWarning = (openedCount, totalCount, blockedUrls) => {
+ const showFolderWebuiPopupWarning = (openedCount, totalCount, blockedUrls, retryLabel = 'Open all WebUIs') => {
const blockedList = Array.isArray(blockedUrls) ? blockedUrls.slice(0, 6) : [];
const linkHtml = blockedList
.map((url) => `
@@ -3058,7 +3055,7 @@ const initEditorChrome = () => {
updateMemberBulkMoveUi();
editorMode = loadEditorModePreference();
- activeEditorSection = normalizeActiveEditorSection('general', editorMode);
+ activeEditorSection = normalizeActiveEditorSection(activeEditorSection, editorMode);
advancedSectionCollapsedState = loadAdvancedCollapseState();
$('#fvRegexSimulatorInput').off('input').on('input', updateRegexSimulator);
$('#fvSuggestDefaults').off('click').on('click', suggestDefaultsFromMembers);
@@ -3157,6 +3154,7 @@ const hydrateCurrentEditFolder = (folderRecord, folderRecordId, foldersMap = {},
setFieldValue('icon', normalizedFolder.icon);
setFieldChecked('folder_webui', normalizedFolder.settings.folder_webui || false);
setFieldValue('folder_webui_url', normalizedFolder.settings.folder_webui_url || '');
+ getFolderWebuiProfilesApi()?.hydrate(normalizedFolder.settings.webui_profiles || normalizedFolder.settings.webuiProfiles || []);
setFieldValue('preview', String(normalizedFolder.settings.preview));
setFieldValue('preview_rows', String(normalizePreviewRowLimit(normalizedFolder.settings, normalizedFolder)));
setFieldValue('preview_overflow', normalizedFolder.settings.preview_overflow || normalizedFolder.settings.previewOverflow || 'default');
@@ -3195,7 +3193,7 @@ const hydrateCurrentEditFolder = (folderRecord, folderRecordId, foldersMap = {},
setFieldValue('folder_accent_color', normalizeHexColor(normalizedFolder.settings.folder_accent_color, DEFAULT_FOLDER_ACCENT_COLOR));
setFieldValue('status_color_started', normalizeHexColor(normalizedFolder.settings.status_color_started, DEFAULT_FOLDER_STATUS_COLORS.started));
setFieldValue('status_color_paused', normalizeHexColor(normalizedFolder.settings.status_color_paused, DEFAULT_FOLDER_STATUS_COLORS.paused));
- setFieldValue('status_color_stopped', normalizeHexColor(normalizedFolder.settings.status_color_stopped, DEFAULT_FOLDER_STATUS_COLORS.stopped));
+ setFieldValue('status_color_stopped', normalizeHexColor(normalizedFolder.settings.status_color_stopped, DEFAULT_FOLDER_STATUS_COLORS.stopped)); setFieldValue('status_color_text', normalizeHexColor(normalizedFolder.settings.status_color_text, DEFAULT_FOLDER_STATUS_COLORS.text));
setFieldChecked('status_color_lock', normalizedFolder.settings.status_color_lock === true || normalizedFolder.settings.statusColorLock === true);
setFieldValue('health_warn_stopped_percent', normalizedFolder.settings.health_warn_stopped_percent === undefined
|| normalizedFolder.settings.health_warn_stopped_percent === null
@@ -3506,6 +3504,7 @@ const startFolderEditorRuntime = async () => {
await bindIconPickerEvents();
updateList();
+ getFolderWebuiProfilesApi()?.refreshMembers();
applySectionTags();
initEditorChrome();
updateForm();
@@ -3797,6 +3796,7 @@ const buildFolderPayloadFromForm = (e) => {
settings: {
folder_webui: e.folder_webui.checked,
folder_webui_url: e.folder_webui_url.value.toString(),
+ webui_profiles: getFolderWebuiProfilesApi()?.serialize() || [],
preview: parseInt(e.preview.value.toString()),
preview_rows: normalizedPreviewRows,
preview_overflow: ['expand_row', 'scroll'].includes(String(e.preview_overflow?.value)) ? String(e.preview_overflow.value) : 'default',
@@ -3839,9 +3839,9 @@ const buildFolderPayloadFromForm = (e) => {
dropdown_hover_color: normalizeHexColor(e.dropdown_hover_color.value.toString(), DEFAULT_DROPDOWN_HOVER_COLOR),
folder_accent_enabled: e.folder_accent_enabled.checked,
folder_accent_color: normalizeHexColor(e.folder_accent_color.value.toString(), DEFAULT_FOLDER_ACCENT_COLOR),
- status_color_started: normalizeHexColor(e.status_color_started.value.toString(), DEFAULT_FOLDER_STATUS_COLORS.started),
+ status_color_started: normalizeHexColor(e.status_color_started.value.toString(), DEFAULT_FOLDER_STATUS_COLORS.started), status_color_started_explicit: true,
status_color_paused: normalizeHexColor(e.status_color_paused.value.toString(), DEFAULT_FOLDER_STATUS_COLORS.paused),
- status_color_stopped: normalizeHexColor(e.status_color_stopped.value.toString(), DEFAULT_FOLDER_STATUS_COLORS.stopped),
+ status_color_stopped: normalizeHexColor(e.status_color_stopped.value.toString(), DEFAULT_FOLDER_STATUS_COLORS.stopped), status_color_text: normalizeHexColor(e.status_color_text.value.toString(), DEFAULT_FOLDER_STATUS_COLORS.text),
status_color_lock: e.status_color_lock?.checked === true,
health_warn_stopped_percent: healthWarnThreshold,
health_critical_stopped_percent: healthCriticalThreshold,
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.member-identity.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.member-identity.js
index 5db8a342..5c33635e 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.member-identity.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.member-identity.js
@@ -1,12 +1,12 @@
// @ts-check
(function(root, factory) {
if (typeof module === 'object' && module.exports) {
- module.exports = factory();
+ module.exports = factory(require('./folder.webui-profiles.js'));
return;
}
- root.FolderViewPlusMemberIdentity = factory();
+ root.FolderViewPlusMemberIdentity = factory(root.FolderViewPlusFoundationModules?.folderWebuiProfiles);
root.FolderViewPlusMemberIdentityModuleLoaded = true;
-}(typeof globalThis !== 'undefined' ? globalThis : this, function() {
+}(typeof globalThis !== 'undefined' ? globalThis : this, function(webuiProfiles) {
'use strict';
const asObject = (value) => value && typeof value === 'object' && !Array.isArray(value) ? value : {};
@@ -197,6 +197,7 @@
folder.memberIdentities = normalizeIdentityMap(folder.memberIdentities || folder.member_identities, safeType);
folder.hiddenPreviewMembers = uniqueStrings(folder.hiddenPreviewMembers || folder.hidden_preview);
folder.actions = Array.isArray(folder.actions) ? folder.actions.map((action) => ({ ...asObject(action) })) : [];
+ folder.settings = { ...asObject(folder.settings) };
folder.containers.forEach((name) => {
if (liveNames.has(name)) {
claimedNames.add(name);
@@ -234,6 +235,9 @@
folder.containers = renameListEntry(folder.containers, oldName, newName);
folder.hiddenPreviewMembers = renameListEntry(folder.hiddenPreviewMembers, oldName, newName);
folder.actions = renameActionTargets(folder.actions, oldName, newName);
+ if (typeof webuiProfiles?.renameProfileMember === 'function') {
+ folder.settings.webui_profiles = webuiProfiles.renameProfileMember(folder.settings.webui_profiles, oldName, newName);
+ }
delete folder.memberIdentities[oldName];
folder.memberIdentities[newName] = resolution.candidate.identity;
renames[oldName] = newName;
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.settings-transfer.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.settings-transfer.js
index 4b14c06a..8094ae35 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.settings-transfer.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.settings-transfer.js
@@ -38,6 +38,8 @@
const normalizedSettings = source.settings && typeof source.settings === 'object'
? deepClone(source.settings) || {}
: {};
+ delete normalizedSettings.webui_profiles;
+ delete normalizedSettings.webuiProfiles;
const actions = Array.isArray(source.actions) ? source.actions : [];
const normalizedActions = [];
let droppedMemberBoundActionCount = 0;
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.webui-profiles.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.webui-profiles.js
new file mode 100644
index 00000000..6db80b2c
--- /dev/null
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.webui-profiles.js
@@ -0,0 +1,446 @@
+// @ts-check
+(function(root, factory) {
+ if (typeof module === 'object' && module.exports) {
+ module.exports = factory();
+ return;
+ }
+ const modules = root.FolderViewPlusFoundationModules = root.FolderViewPlusFoundationModules || {};
+ modules.folderWebuiProfiles = factory();
+}(typeof globalThis !== 'undefined' ? globalThis : this, function() {
+ 'use strict';
+
+ const MAX_PROFILES = 100;
+ const MAX_PROFILE_MEMBERS = 250;
+ const MAX_PROFILE_NAME_LENGTH = 80;
+ const MAX_MEMBER_NAME_LENGTH = 160;
+ const PROFILE_ID_PATTERN = /^[A-Za-z0-9._:-]{1,64}$/;
+ const isObject = (value) => value && typeof value === 'object' && !Array.isArray(value);
+ const cleanText = (value, maxLength) => String(value ?? '')
+ .replace(/[\u0000-\u001f\u007f]/g, '')
+ .trim()
+ .slice(0, maxLength);
+ const uniqueStrings = (value, maxItems = MAX_PROFILE_MEMBERS) => {
+ const seen = new Set();
+ const result = [];
+ for (const entry of Array.isArray(value) ? value : []) {
+ const text = cleanText(entry, MAX_MEMBER_NAME_LENGTH);
+ if (!text || seen.has(text)) continue;
+ seen.add(text);
+ result.push(text);
+ if (result.length >= maxItems) break;
+ }
+ return result;
+ };
+ const createProfileId = (win = null) => {
+ try {
+ const generated = win?.crypto?.randomUUID?.();
+ if (generated && PROFILE_ID_PATTERN.test(generated)) return generated;
+ } catch (_error) {
+ // Fall through to a locally unique identifier.
+ }
+ return `profile-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+ };
+ const normalizeProfiles = (value, options = {}) => {
+ const source = Array.isArray(value) ? value : [];
+ const maxProfiles = Math.max(1, Math.min(MAX_PROFILES, Number(options.maxProfiles) || MAX_PROFILES));
+ const usedIds = new Set();
+ const result = [];
+ for (let index = 0; index < source.length && result.length < maxProfiles; index += 1) {
+ const entry = isObject(source[index]) ? source[index] : null;
+ if (!entry) continue;
+ let id = cleanText(entry.id, 64);
+ if (!PROFILE_ID_PATTERN.test(id)) id = `profile-${index + 1}`;
+ const baseId = id;
+ let suffix = 2;
+ while (usedIds.has(id)) {
+ id = `${baseId.slice(0, 58)}-${suffix}`;
+ suffix += 1;
+ }
+ usedIds.add(id);
+ result.push({
+ id,
+ name: cleanText(entry.name, MAX_PROFILE_NAME_LENGTH) || `Profile ${result.length + 1}`,
+ containers: uniqueStrings(entry.containers || entry.members)
+ });
+ }
+ return result;
+ };
+ const stripProfilesFromSettings = (settings) => {
+ const next = isObject(settings) ? JSON.parse(JSON.stringify(settings)) : {};
+ delete next.webui_profiles;
+ delete next.webuiProfiles;
+ return next;
+ };
+ const renameProfileMember = (profiles, oldName, newName) => normalizeProfiles(profiles).map((profile) => ({
+ ...profile,
+ containers: uniqueStrings(profile.containers.map((name) => name === oldName ? newName : name))
+ }));
+ const getRuntimeEntryName = (fallbackName, entry) => cleanText(
+ entry?.name || entry?.Name || entry?.info?.Name || fallbackName,
+ MAX_MEMBER_NAME_LENGTH
+ );
+ const collectProfileTargets = (profile, runtimeEntries, options = {}) => {
+ const normalized = normalizeProfiles([profile])[0] || null;
+ if (!normalized) return { profile: null, urls: [], selectedCount: 0, eligibleCount: 0, unavailableCount: 0 };
+ const selected = new Set(normalized.containers);
+ const matched = new Set();
+ const urls = [];
+ const getSafeWebuiUrl = typeof options.getSafeWebuiUrl === 'function'
+ ? options.getSafeWebuiUrl
+ : ((url) => cleanText(url, 2048));
+ const runningOnly = options.runningOnly !== false;
+ Object.entries(isObject(runtimeEntries) ? runtimeEntries : {}).forEach(([fallbackName, entry]) => {
+ const name = getRuntimeEntryName(fallbackName, entry);
+ if (!name || !selected.has(name)) return;
+ matched.add(name);
+ const running = entry?.state === true && entry?.pause !== true;
+ const url = getSafeWebuiUrl(entry?.webui || entry?.WebUi || entry?.WebUI || '');
+ if (url && (!runningOnly || running)) urls.push(url);
+ });
+ const dedupedUrls = Array.from(new Set(urls));
+ return {
+ profile: normalized,
+ urls: dedupedUrls,
+ selectedCount: normalized.containers.length,
+ eligibleCount: dedupedUrls.length,
+ unavailableCount: Math.max(0, normalized.containers.length - matched.size)
+ };
+ };
+ const summarizeProfiles = (profiles, availableMemberNames = []) => {
+ const available = new Set(uniqueStrings(availableMemberNames, 5000));
+ const normalized = normalizeProfiles(profiles);
+ let selectedReferenceCount = 0;
+ let unavailableReferenceCount = 0;
+ normalized.forEach((profile) => {
+ selectedReferenceCount += profile.containers.length;
+ unavailableReferenceCount += profile.containers.filter((name) => !available.has(name)).length;
+ });
+ return {
+ profileCount: normalized.length,
+ selectedReferenceCount,
+ unavailableReferenceCount,
+ duplicateProfileIdCount: 0,
+ invalidProfileCount: 0
+ };
+ };
+ const resolveProfileLaunch = (settings, profileId, runtimeEntries, options = {}) => {
+ const profile = normalizeProfiles(settings?.webui_profiles || settings?.webuiProfiles)
+ .find((entry) => entry.id === cleanText(profileId, 64)) || null;
+ return profile ? collectProfileTargets(profile, runtimeEntries, options) : null;
+ };
+ const appendRuntimeMenuItems = (target, options = {}) => {
+ const profiles = normalizeProfiles(options.profiles);
+ if (!Array.isArray(target) || profiles.length === 0) return false;
+ const translate = typeof options.translate === 'function' ? options.translate : ((_key, fallback) => fallback);
+ const onOpen = typeof options.onOpen === 'function' ? options.onOpen : (() => {});
+ const onManage = typeof options.onManage === 'function' ? options.onManage : (() => {});
+ target.push({
+ text: translate('docker.webui-profiles.open', 'Open WebUI profile'),
+ icon: 'fa-list-alt',
+ subMenu: profiles.map((profile) => {
+ const result = collectProfileTargets(profile, options.runtimeEntries, {
+ runningOnly: true,
+ getSafeWebuiUrl: options.getSafeWebuiUrl
+ });
+ return {
+ text: translate('docker.webui-profiles.ready', '$1 ($2 of $3 ready)', profile.name, result.eligibleCount, result.selectedCount),
+ icon: 'fa-external-link',
+ disabled: result.eligibleCount === 0,
+ action: (event) => { event?.preventDefault?.(); onOpen(profile.id); }
+ };
+ })
+ }, {
+ text: translate('docker.webui-profiles.manage', 'Manage WebUI profiles'),
+ icon: 'fa-sliders',
+ action: (event) => { event?.preventDefault?.(); onManage(); }
+ });
+ return true;
+ };
+
+ const createEditorApi = (deps = {}) => {
+ const win = deps.window || (typeof window !== 'undefined' ? window : null);
+ const doc = deps.document || win?.document || null;
+ const form = deps.form || doc?.getElementById?.('fvFolderEditorForm') || null;
+ const getMembers = typeof deps.getMembers === 'function' ? deps.getMembers : (() => []);
+ const translate = typeof deps.translate === 'function' ? deps.translate : ((_key, fallback) => fallback);
+ const onChange = typeof deps.onChange === 'function' ? deps.onChange : (() => {});
+ const type = cleanText(deps.type, 16).toLowerCase() === 'docker' ? 'docker' : 'vm';
+ const host = form?.querySelector?.('#fvWebuiProfilesWorkspace') || null;
+ const hiddenInput = form?.querySelector?.('input[name="webui_profiles"]') || null;
+ let profiles = [];
+ let disposed = false;
+ let memberRefreshTimer = 0;
+
+ const readIncludedMembers = () => {
+ const allMembers = new Map((Array.isArray(getMembers()) ? getMembers() : [])
+ .map((member) => [cleanText(member?.Name || member?.name, MAX_MEMBER_NAME_LENGTH), member])
+ .filter(([name]) => Boolean(name)));
+ const names = Array.from(form?.querySelectorAll?.('input[name*="containers"]:checked') || [])
+ .map((input) => cleanText(input.value, MAX_MEMBER_NAME_LENGTH))
+ .filter(Boolean);
+ return names.map((name) => {
+ const member = allMembers.get(name) || {};
+ const rawState = member?.State || member?.RawState || {};
+ const state = rawState?.Paused === true
+ ? 'paused'
+ : (rawState?.Running === true ? 'running' : 'stopped');
+ return {
+ name,
+ state,
+ hasWebui: Boolean(member?.WebUi || member?.WebUI || member?.webui || member?.webuiCapability === true)
+ };
+ });
+ };
+ const writeHiddenInput = (notify = true) => {
+ if (!hiddenInput) return;
+ hiddenInput.value = JSON.stringify(profiles.map((profile) => ({
+ id: profile.id,
+ name: cleanText(profile.name, MAX_PROFILE_NAME_LENGTH),
+ containers: uniqueStrings(profile.containers)
+ })));
+ if (notify) {
+ hiddenInput.dispatchEvent(new win.Event('change', { bubbles: true }));
+ onChange(profiles);
+ }
+ };
+ const button = (label, icon, action, className = '') => {
+ const node = doc.createElement('button');
+ node.type = 'button';
+ node.className = `fv-webui-profile-button ${className}`.trim();
+ node.setAttribute('aria-label', label);
+ const glyph = doc.createElement('i');
+ glyph.className = `fa ${icon}`;
+ glyph.setAttribute('aria-hidden', 'true');
+ const text = doc.createElement('span');
+ text.textContent = label;
+ node.append(glyph, text);
+ node.addEventListener('click', action);
+ return node;
+ };
+ const setStatus = (message = '', tone = '') => {
+ const node = host?.querySelector?.('.fv-webui-profiles-status');
+ if (!node) return;
+ node.textContent = message;
+ node.className = `fv-webui-profiles-status${tone ? ` is-${tone}` : ''}`;
+ };
+ const validate = () => {
+ if (type !== 'docker') return true;
+ const names = new Set();
+ let message = '';
+ profiles.forEach((profile) => {
+ const name = cleanText(profile.name, MAX_PROFILE_NAME_LENGTH);
+ const key = name.toLocaleLowerCase();
+ if (!message && !name) message = translate('editor.webui-profiles.error-name', 'Every WebUI profile needs a name.');
+ if (!message && names.has(key)) message = translate('editor.webui-profiles.error-duplicate', 'WebUI profile names must be unique within this folder.');
+ names.add(key);
+ if (!message && uniqueStrings(profile.containers).length === 0) {
+ message = translate('editor.webui-profiles.error-members', 'Every WebUI profile must select at least one folder member.');
+ }
+ });
+ Array.from(host?.querySelectorAll?.('.fv-webui-profile-name') || []).forEach((input) => {
+ const name = cleanText(input.value, MAX_PROFILE_NAME_LENGTH).toLocaleLowerCase();
+ const count = profiles.filter((profile) => cleanText(profile.name, MAX_PROFILE_NAME_LENGTH).toLocaleLowerCase() === name).length;
+ input.classList.toggle('fv-input-error', !name || count > 1);
+ input.setAttribute('aria-invalid', !name || count > 1 ? 'true' : 'false');
+ });
+ setStatus(message, message ? 'error' : 'ready');
+ return !message;
+ };
+ const renderMemberRows = (profile, list, query = '') => {
+ const members = readIncludedMembers();
+ const availableNames = new Set(members.map((member) => member.name));
+ profile.containers.forEach((name) => {
+ if (!availableNames.has(name)) members.push({ name, state: 'unavailable', hasWebui: false });
+ });
+ const normalizedQuery = cleanText(query, 160).toLocaleLowerCase();
+ list.replaceChildren();
+ members.forEach((member) => {
+ if (normalizedQuery && !member.name.toLocaleLowerCase().includes(normalizedQuery)) return;
+ const row = doc.createElement('label');
+ row.className = `fv-webui-profile-member is-${member.state}`;
+ const checkbox = doc.createElement('input');
+ checkbox.type = 'checkbox';
+ checkbox.checked = profile.containers.includes(member.name);
+ checkbox.value = member.name;
+ checkbox.addEventListener('change', () => {
+ profile.containers = checkbox.checked
+ ? uniqueStrings([...profile.containers, member.name])
+ : profile.containers.filter((name) => name !== member.name);
+ writeHiddenInput();
+ validate();
+ });
+ const name = doc.createElement('strong');
+ name.textContent = member.name;
+ const meta = doc.createElement('span');
+ const webuiLabel = member.hasWebui
+ ? translate('editor.webui-profiles.webui-ready', 'WebUI configured')
+ : translate('editor.webui-profiles.webui-runtime', 'WebUI checked at launch');
+ meta.textContent = member.state === 'unavailable'
+ ? translate('editor.webui-profiles.unavailable', 'Unavailable in this folder')
+ : `${member.state} · ${webuiLabel}`;
+ row.append(checkbox, name, meta);
+ list.appendChild(row);
+ });
+ if (!list.children.length) {
+ const empty = doc.createElement('p');
+ empty.className = 'fv-webui-profile-empty-members';
+ empty.textContent = translate('editor.webui-profiles.no-members', 'No matching folder members are available.');
+ list.appendChild(empty);
+ }
+ };
+ const renderProfile = (profile, index) => {
+ const card = doc.createElement('article');
+ card.className = 'fv-webui-profile-card';
+ card.dataset.profileId = profile.id;
+ const header = doc.createElement('div');
+ header.className = 'fv-webui-profile-head';
+ const nameInput = doc.createElement('input');
+ nameInput.type = 'text';
+ nameInput.className = 'fv-webui-profile-name';
+ nameInput.maxLength = MAX_PROFILE_NAME_LENGTH;
+ nameInput.value = profile.name;
+ nameInput.setAttribute('aria-label', translate('editor.webui-profiles.name', 'Profile name'));
+ nameInput.addEventListener('input', () => {
+ profile.name = nameInput.value;
+ writeHiddenInput();
+ validate();
+ });
+ const actions = doc.createElement('div');
+ actions.className = 'fv-webui-profile-actions';
+ actions.append(
+ button(translate('editor.webui-profiles.duplicate', 'Duplicate'), 'fa-copy', () => {
+ if (profiles.length >= MAX_PROFILES) return;
+ profiles.splice(index + 1, 0, {
+ id: createProfileId(win),
+ name: `${cleanText(profile.name, 68) || 'Profile'} Copy`,
+ containers: [...profile.containers]
+ });
+ writeHiddenInput();
+ render();
+ }),
+ button(translate('editor.webui-profiles.move-up', 'Move up'), 'fa-chevron-up', () => {
+ if (index <= 0) return;
+ [profiles[index - 1], profiles[index]] = [profiles[index], profiles[index - 1]];
+ writeHiddenInput();
+ render();
+ }, 'is-icon'),
+ button(translate('editor.webui-profiles.move-down', 'Move down'), 'fa-chevron-down', () => {
+ if (index >= profiles.length - 1) return;
+ [profiles[index + 1], profiles[index]] = [profiles[index], profiles[index + 1]];
+ writeHiddenInput();
+ render();
+ }, 'is-icon'),
+ button(translate('editor.webui-profiles.delete', 'Delete'), 'fa-trash', () => {
+ profiles.splice(index, 1);
+ writeHiddenInput();
+ render();
+ }, 'is-danger')
+ );
+ header.append(nameInput, actions);
+ const tools = doc.createElement('div');
+ tools.className = 'fv-webui-profile-tools';
+ const search = doc.createElement('input');
+ search.type = 'search';
+ search.placeholder = translate('editor.webui-profiles.search', 'Search folder members');
+ search.setAttribute('aria-label', search.placeholder);
+ const list = doc.createElement('div');
+ list.className = 'fv-webui-profile-members';
+ search.addEventListener('input', () => renderMemberRows(profile, list, search.value));
+ tools.append(
+ search,
+ button(translate('editor.webui-profiles.select-webui', 'Select all with WebUI'), 'fa-check-square-o', () => {
+ profile.containers = uniqueStrings(readIncludedMembers().filter((member) => member.hasWebui).map((member) => member.name));
+ writeHiddenInput();
+ render();
+ }),
+ button(translate('editor.webui-profiles.clear', 'Clear selection'), 'fa-square-o', () => {
+ profile.containers = [];
+ writeHiddenInput();
+ render();
+ })
+ );
+ renderMemberRows(profile, list);
+ card.append(header, tools, list);
+ return card;
+ };
+ const render = () => {
+ if (!host || disposed) return;
+ host.replaceChildren();
+ if (type !== 'docker') {
+ host.closest?.('.basic')?.setAttribute?.('hidden', 'hidden');
+ return;
+ }
+ const toolbar = doc.createElement('div');
+ toolbar.className = 'fv-webui-profiles-toolbar';
+ const summary = doc.createElement('p');
+ summary.textContent = profiles.length
+ ? translate('editor.webui-profiles.count', '$1 saved profile(s)', profiles.length).replace('$1', String(profiles.length))
+ : translate('editor.webui-profiles.empty', 'No custom WebUI profiles yet.');
+ const add = button(translate('editor.webui-profiles.add', 'Add profile'), 'fa-plus', () => {
+ if (profiles.length >= MAX_PROFILES) {
+ setStatus(translate('editor.webui-profiles.limit', 'This folder has reached the WebUI profile safety limit.'), 'error');
+ return;
+ }
+ profiles.push({ id: createProfileId(win), name: `Profile ${profiles.length + 1}`, containers: [] });
+ writeHiddenInput();
+ render();
+ }, 'is-primary');
+ toolbar.append(summary, add);
+ host.appendChild(toolbar);
+ const cards = doc.createElement('div');
+ cards.className = 'fv-webui-profile-list';
+ profiles.forEach((profile, index) => cards.appendChild(renderProfile(profile, index)));
+ host.appendChild(cards);
+ const status = doc.createElement('p');
+ status.className = 'fv-webui-profiles-status';
+ status.setAttribute('aria-live', 'polite');
+ host.appendChild(status);
+ validate();
+ };
+ const hydrate = (value) => {
+ profiles = normalizeProfiles(value);
+ writeHiddenInput(false);
+ render();
+ };
+ const scheduleMemberRefresh = () => {
+ if (memberRefreshTimer) win.clearTimeout(memberRefreshTimer);
+ memberRefreshTimer = win.setTimeout(() => {
+ memberRefreshTimer = 0;
+ render();
+ }, 0);
+ };
+ const memberChangeHandler = (event) => {
+ if (event?.target?.matches?.('input[name*="containers"]')) scheduleMemberRefresh();
+ };
+ form?.addEventListener?.('change', memberChangeHandler);
+ hydrate([]);
+ return Object.freeze({
+ hydrate,
+ render,
+ refreshMembers: scheduleMemberRefresh,
+ serialize: () => normalizeProfiles(profiles),
+ validate,
+ snapshot: () => ({ profiles: normalizeProfiles(profiles), ...summarizeProfiles(profiles, readIncludedMembers().map((member) => member.name)) }),
+ dispose: () => {
+ disposed = true;
+ if (memberRefreshTimer) win.clearTimeout(memberRefreshTimer);
+ form?.removeEventListener?.('change', memberChangeHandler);
+ host?.replaceChildren?.();
+ }
+ });
+ };
+
+ return Object.freeze({
+ MAX_PROFILES,
+ MAX_PROFILE_MEMBERS,
+ MAX_PROFILE_NAME_LENGTH,
+ normalizeProfiles,
+ stripProfilesFromSettings,
+ renameProfileMember,
+ collectProfileTargets,
+ summarizeProfiles,
+ resolveProfileLaunch,
+ appendRuntimeMenuItems,
+ createEditorApi
+ });
+}));
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.folder-contract.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.folder-contract.js
index 827f214c..a87d8d91 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.folder-contract.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.folder-contract.js
@@ -3,10 +3,12 @@
'use strict';
const DEFAULT_FOLDER_STATUS_COLORS = Object.freeze({
- started: '#ffffff',
+ started: '#55b72d',
paused: '#b8860b',
- stopped: '#ff4d4d'
+ stopped: '#ff4d4d',
+ text: '#ffffff'
});
+ const LEGACY_DEFAULT_FOLDER_STARTED_COLOR = '#ffffff';
const DEFAULT_FOLDER_ACCENT_COLOR = '#ffca63';
const DEFAULT_PREVIEW_BORDER_COLOR = '#afa89e';
const DEFAULT_PREVIEW_BORDER_WIDTH = 1;
@@ -141,6 +143,7 @@
window.FolderViewPlusFolderContract = {
DEFAULT_FOLDER_STATUS_COLORS,
+ LEGACY_DEFAULT_FOLDER_STARTED_COLOR,
DEFAULT_FOLDER_ACCENT_COLOR,
DEFAULT_PREVIEW_BORDER_COLOR,
DEFAULT_PREVIEW_BORDER_WIDTH,
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.starter-templates.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.starter-templates.js
index cc88dd85..5dfc619e 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.starter-templates.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.starter-templates.js
@@ -566,9 +566,9 @@ const buildStarterFolderPayload = (name, iconPath = DEFAULT_STARTER_FOLDER_ICON)
preview_vertical_bars_color: '#afa89e',
folder_accent_enabled: false,
folder_accent_color: '#ffca63',
- status_color_started: '#ffffff',
+ status_color_started: '#55b72d',
status_color_paused: '#b8860b',
- status_color_stopped: '#ff4d4d',
+ status_color_stopped: '#ff4d4d', status_color_text: '#ffffff',
health_warn_stopped_percent: '',
health_critical_stopped_percent: '',
health_profile: '',
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.ui.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.ui.js
index 50d6ba6d..263f1cb6 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.ui.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.ui.js
@@ -41,6 +41,8 @@
'check-circle': '
',
'clock': '
',
'document': '
',
+ 'eye': '
',
+ 'eye-off': '
',
'folder': '
',
'globe': '
',
'heart': '
',
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-normalization.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-normalization.js
index 7a6c1c1e..35c22d11 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-normalization.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-normalization.js
@@ -28,9 +28,10 @@
const PERFORMANCE_PROFILE_OPTIONS = ['standard', 'adaptive', 'maximum'];
const RUNTIME_PAGE_VIEW_MODE_OPTIONS = ['folderview', 'host', 'command'];
const DEFAULT_FOLDER_STATUS_COLORS = {
- started: '#ffffff',
+ started: '#55b72d',
paused: '#b8860b',
- stopped: '#ff4d4d'
+ stopped: '#ff4d4d',
+ text: '#ffffff'
};
const DEFAULT_HEALTH_PREFS = {
cardsEnabled: true,
@@ -105,11 +106,10 @@
} = utilityFoundation;
const getFolderStatusColors = (settings) => {
- const source = isPlainObject(settings) ? settings : {};
- return {
- started: normalizeHexColor(source.status_color_started, DEFAULT_FOLDER_STATUS_COLORS.started),
+ const source = isPlainObject(settings) ? settings : {}; const normalizedStarted = normalizeHexColor(source.status_color_started, DEFAULT_FOLDER_STATUS_COLORS.started); const startedExplicit = source.status_color_started_explicit === true || source.statusColorStartedExplicit === true;
+ return { started: !startedExplicit && normalizedStarted === '#ffffff' ? DEFAULT_FOLDER_STATUS_COLORS.started : normalizedStarted,
paused: normalizeHexColor(source.status_color_paused, DEFAULT_FOLDER_STATUS_COLORS.paused),
- stopped: normalizeHexColor(source.status_color_stopped, DEFAULT_FOLDER_STATUS_COLORS.stopped)
+ stopped: normalizeHexColor(source.status_color_stopped, DEFAULT_FOLDER_STATUS_COLORS.stopped), text: normalizeHexColor(source.status_color_text, DEFAULT_FOLDER_STATUS_COLORS.text)
};
};
@@ -243,7 +243,7 @@
return Array.from(
new Set(
value
- .map((item) => String(item || '').trim())
+ .filter((item) => typeof item === 'string').map((item) => item.trim())
.filter((item) => item !== '')
)
);
@@ -279,7 +279,7 @@
return null;
}
- const name = String(value.name || '').trim();
+ const name = typeof value.name === 'string' ? value.name.trim() : '';
if (name === '') {
return null;
}
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-prefs.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-prefs.js
index 42fddae9..b636cc65 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-prefs.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-prefs.js
@@ -85,8 +85,8 @@
const folderDefaultsSettings = isPlainObject(folderDefaultsProfileRaw.settings)
? JSON.parse(JSON.stringify(folderDefaultsProfileRaw.settings))
: {};
- const folderDefaultsActionsRaw = Array.isArray(folderDefaultsProfileRaw.actions) ? folderDefaultsProfileRaw.actions : [];
- const folderDefaultsActions = [];
+ delete folderDefaultsSettings.webui_profiles; delete folderDefaultsSettings.webuiProfiles;
+ const folderDefaultsActionsRaw = Array.isArray(folderDefaultsProfileRaw.actions) ? folderDefaultsProfileRaw.actions : [], folderDefaultsActions = [];
folderDefaultsActionsRaw.forEach((entry) => {
if (!isPlainObject(entry)) {
return;
@@ -318,6 +318,7 @@
)
};
const pinnedFolderIds = normalizeStringIdList(incoming.pinnedFolderIds);
+ const hiddenFolderIds = normalizeStringIdList(incoming.hiddenFolderIds);
const expandedFolderState = normalizeExpandedFolderStateMap(incoming.expandedFolderState);
const hideEmptyFolders = incoming.hideEmptyFolders === true;
const appColumnWidth = normalizeAppColumnWidth(incoming.appColumnWidth);
@@ -346,6 +347,7 @@
sortMode,
manualOrder,
pinnedFolderIds,
+ hiddenFolderIds,
expandedFolderState,
hideEmptyFolders,
appColumnWidth,
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.page-diagnostics.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.page-diagnostics.js
index f226dc59..0b299692 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.page-diagnostics.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.page-diagnostics.js
@@ -78,8 +78,8 @@
highContrast: snapshot?.appearance?.highContrast === true
},
state: {
- visibleRows: boundedCount(snapshot?.state?.visibleRows),
- folderRows: boundedCount(snapshot?.state?.folderRows),
+ visibleRows: boundedCount(snapshot?.state?.visibleRows), folderRows: boundedCount(snapshot?.state?.folderRows),
+ hiddenFolderSelections: boundedCount(snapshot?.state?.hiddenFolderSelections), effectivelyHiddenFolders: boundedCount(snapshot?.state?.effectivelyHiddenFolders), revealedHiddenFolderRows: boundedCount(snapshot?.state?.revealedHiddenFolderRows), revealHiddenFolders: snapshot?.state?.revealHiddenFolders === true,
expandedFolders: boundedCount(snapshot?.state?.expandedFolders),
visibleMembers: boundedCount(snapshot?.state?.visibleMembers),
loadingIndicators: boundedCount(snapshot?.state?.loadingIndicators),
@@ -152,8 +152,8 @@
highContrast: matchesMedia(win, '(prefers-contrast: more)')
},
state: {
- visibleRows: countVisible(host, 'tr', win),
- folderRows: countVisible(host, '.folder, .folder-showcase-outer', win),
+ visibleRows: countVisible(host, 'tr', win), folderRows: countVisible(host, '.folder, .folder-showcase-outer', win),
+ hiddenFolderSelections: boundedCount(doc?.body?.getAttribute?.('data-fvplus-docker-hidden-explicit')), effectivelyHiddenFolders: boundedCount(doc?.body?.getAttribute?.('data-fvplus-docker-hidden-effective')), revealedHiddenFolderRows: countVisible(host, '.folder.fv-folder-hidden-revealed', win), revealHiddenFolders: doc?.body?.getAttribute?.('data-fvplus-docker-hidden-reveal') === 'true',
expandedFolders: countVisible(host, '.folder[expanded="true"], .folder-showcase-outer[expanded="true"]', win),
visibleMembers: countVisible(host, '.folder-preview-wrapper, .folder-element-docker, .folder-element-vm', win),
loadingIndicators: countVisible(host, '.spinner, .fv-runtime-loading-row, [aria-busy="true"]', win),
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.shared-primitives.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.shared-primitives.js
index 58bdfbc1..a415cbdc 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.shared-primitives.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.shared-primitives.js
@@ -114,6 +114,7 @@
const clearClassName = String(options.clearClassName || 'fvplus-docker-quick-clear');
const labelSet = options.labelSet instanceof Set ? options.labelSet : new Set();
const iconClassCandidates = Array.isArray(options.iconClassCandidates) ? options.iconClassCandidates : [];
+ const minimumItems = Math.max(1, Number(options.minimumItems) || 3), maximumItems = Math.max(minimumItems, Number(options.maximumItems) || minimumItems);
const selectors = Array.isArray(options.selectors) && options.selectors.length
? options.selectors
: [
@@ -167,10 +168,8 @@
if (!$menu || !$menu.length) {
return false;
}
- const $quickItems = $menu.children('li').filter((_, item) => isQuickItem($(item))).slice(0, 3);
- if ($quickItems.length < 3) {
- return false;
- }
+ const $quickItems = $menu.children('li').filter((_, item) => isQuickItem($(item))).slice(0, maximumItems);
+ if ($quickItems.length < minimumItems) return false;
$menu.addClass(menuClassName);
$quickItems.each((_, item) => {
const $item = $(item);
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/vm.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/vm.js
index 5b274cb9..15635566 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/vm.js
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/vm.js
@@ -22,9 +22,9 @@ const applyVmThemeResolverTokens = (reason = 'vm-runtime:initial', options = {})
);
const DEFAULT_FOLDER_ICON_PATH = '/plugins/folderview.plus/images/folder-icon.png';
const localDefaultFolderStatusColors = runtimeShared.DEFAULT_FOLDER_STATUS_COLORS || {
- started: '#ffffff',
+ started: '#55b72d',
paused: '#b8860b',
- stopped: '#ff4d4d'
+ stopped: '#ff4d4d', text: '#ffffff'
};
const normalizeStatusHexColor = typeof runtimeShared.normalizeStatusHexColor === 'function'
? runtimeShared.normalizeStatusHexColor
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-integrity.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-integrity.php
index de8c1ce6..0ac0f66b 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-integrity.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-integrity.php
@@ -88,7 +88,7 @@ function diagnosticsFolderStatusColors(array $folder): array {
return [
'started' => diagnosticsNormalizeStatusColor($settings['status_color_started'] ?? null, FVPLUS_DEFAULT_FOLDER_STATUS_COLORS['started']),
'paused' => diagnosticsNormalizeStatusColor($settings['status_color_paused'] ?? null, FVPLUS_DEFAULT_FOLDER_STATUS_COLORS['paused']),
- 'stopped' => diagnosticsNormalizeStatusColor($settings['status_color_stopped'] ?? null, FVPLUS_DEFAULT_FOLDER_STATUS_COLORS['stopped'])
+ 'stopped' => diagnosticsNormalizeStatusColor($settings['status_color_stopped'] ?? null, FVPLUS_DEFAULT_FOLDER_STATUS_COLORS['stopped']), 'text' => diagnosticsNormalizeStatusColor($settings['status_color_text'] ?? null, FVPLUS_DEFAULT_FOLDER_STATUS_COLORS['text'])
];
}
@@ -664,13 +664,8 @@ function diagnosticsBuildIntegrityChecks(string $type, array $folders, array $pr
$missingManualOrderIds[] = $manualId;
}
}
- $missingPinnedFolderIds = [];
- foreach (($prefs['pinnedFolderIds'] ?? []) as $pinnedId) {
- $pinnedId = (string)$pinnedId;
- if ($pinnedId !== '' && !array_key_exists($pinnedId, $folders)) {
- $missingPinnedFolderIds[] = $pinnedId;
- }
- }
+ $missingPreferenceFolderIds = static fn($ids): array => array_values(array_filter(normalizeStringIdList($ids), static fn($id): bool => !array_key_exists((string)$id, $folders)));
+ $missingPinnedFolderIds = $missingPreferenceFolderIds($prefs['pinnedFolderIds'] ?? []); $missingHiddenFolderIds = $missingPreferenceFolderIds($prefs['hiddenFolderIds'] ?? []);
$pathHealth = diagnosticsBuildPathHealth($type, $privacyMode);
$pathIssueCount = count($pathHealth['issues'] ?? []);
@@ -693,6 +688,7 @@ function diagnosticsBuildIntegrityChecks(string $type, array $folders, array $pr
+ count($invalidRules)
+ count($missingManualOrderIds)
+ count($missingPinnedFolderIds)
+ + count($missingHiddenFolderIds)
+ $orphanedCount
+ $buildConflicts($effectiveAssignments)['count']
+ $pathIssueCount
@@ -729,6 +725,10 @@ function diagnosticsBuildIntegrityChecks(string $type, array $folders, array $pr
'count' => count($missingPinnedFolderIds),
'ids' => array_values(array_unique($missingPinnedFolderIds))
],
+ 'missingHiddenFolderIds' => [
+ 'count' => count($missingHiddenFolderIds),
+ 'ids' => array_values(array_unique($missingHiddenFolderIds))
+ ],
'duplicateAssignments' => [
'explicit' => $buildConflicts($explicitAssignments),
'regex' => $buildConflicts($regexAssignments),
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-summary.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-summary.php
index d34de629..a08ae811 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-summary.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-summary.php
@@ -1,4 +1,4 @@
- 0, 'paused' => 0, 'stopped' => 0, 'total' => 0];
$entityStateCounts = ['started' => 0, 'paused' => 0, 'stopped' => 0];
$updateCounts = ['available' => 0, 'upToDate' => 0, 'unknown' => 0, 'total' => 0];
- $assignedItemSet = [];
-
+ $assignedItemSet = []; $webuiProfileDiagnostics = fvplusMergeWebuiProfileDiagnostics([], []);
foreach ($infoByName as $name => $item) {
if (!is_array($item)) {
continue;
@@ -135,7 +134,9 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
$members[] = $name;
}
}
-
+ if ($type === 'docker') {
+ $webuiProfileDiagnostics = fvplusMergeWebuiProfileDiagnostics($webuiProfileDiagnostics, fvplusBuildWebuiProfileDiagnostics($folder['settings'] ?? [], $members));
+ }
$started = 0;
$paused = 0;
$stopped = 0;
@@ -233,7 +234,6 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
);
}
}
-
$entityDetails = [];
$entityDetailsTotal = 0;
$entityDetailsMaxEntries = 200;
@@ -306,6 +306,7 @@ function diagnosticsBuildStateSnapshot(string $type, array $folders, array $pref
'maxDepth' => $maxDepth,
'updateCounts' => $updateCounts,
'managerCounts' => $managerCounts,
+ 'webuiProfiles' => $webuiProfileDiagnostics,
'entityDetails' => [
'total' => $entityDetailsTotal,
'maxEntries' => $entityDetailsMaxEntries,
@@ -415,14 +416,12 @@ function diagnosticsBuildIntegrityIssueDetail(array $integrity): string {
);
}
- $missingPinnedFolderIds = max(0, (int)($integrity['missingPinnedFolderIds']['count'] ?? 0));
- if ($missingPinnedFolderIds > 0) {
- return sprintf(
- '%d pinned folder id%s no longer %s an existing folder.',
- $missingPinnedFolderIds,
- $missingPinnedFolderIds === 1 ? '' : 's',
- $missingPinnedFolderIds === 1 ? 'matches' : 'match'
- );
+ foreach ([['missingPinnedFolderIds', 'pinned'], ['missingHiddenFolderIds', 'hidden']] as [$key, $label]) {
+ $missingFolderIds = max(0, (int)($integrity[$key]['count'] ?? 0));
+ if ($missingFolderIds > 0) {
+ return sprintf('%d %s folder id%s no longer %s an existing folder.', $missingFolderIds, $label,
+ $missingFolderIds === 1 ? '' : 's', $missingFolderIds === 1 ? 'matches' : 'match');
+ }
}
$duplicateNameCount = max(0, (int)($integrity['duplicateFolderNames']['count'] ?? 0));
@@ -588,6 +587,7 @@ function diagnosticsBuildRecommendedActions(array $typesData, array $customIcons
|| ((int)($integrity['invalidFolderRegex']['count'] ?? 0)) > 0
|| ((int)($integrity['invalidFolderIconPaths']['count'] ?? 0)) > 0
|| ((int)($integrity['missingPinnedFolderIds']['count'] ?? 0)) > 0
+ || ((int)($integrity['missingHiddenFolderIds']['count'] ?? 0)) > 0
|| ((int)($integrity['missingManualOrderIds']['count'] ?? 0)) > 0;
if ($prefsNeedCleanup) {
break;
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-support-bundle.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-support-bundle.php
index 53ecd59b..e4aee60e 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-support-bundle.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-support-bundle.php
@@ -240,12 +240,8 @@ function diagnosticsBuildSupportBundlePluginTypeSection(string $type, array $typ
'pluginState.' . $type . '.prefs.expandedFolderState',
is_array($typeData['expandedFolderState'] ?? null) ? $typeData['expandedFolderState'] : []
),
- 'pinnedFolders' => diagnosticsSupportBundleRedactFolderIdList(
- $redactor,
- $type,
- 'pluginState.' . $type . '.prefs.pinnedFolders.*',
- is_array($typeData['pinnedFolderIds'] ?? null) ? $typeData['pinnedFolderIds'] : []
- ),
+ 'pinnedFolders' => diagnosticsSupportBundleRedactFolderIdList($redactor, $type, 'pluginState.' . $type . '.prefs.pinnedFolders.*', is_array($typeData['pinnedFolderIds'] ?? null) ? $typeData['pinnedFolderIds'] : []),
+ 'hiddenFolders' => diagnosticsSupportBundleRedactFolderIdList($redactor, $type, 'pluginState.' . $type . '.prefs.hiddenFolders.*', is_array($typeData['hiddenFolderIds'] ?? null) ? $typeData['hiddenFolderIds'] : []),
'hideEmptyFolders' => (bool)($typeData['hideEmptyFolders'] ?? false),
'appColumnWidth' => (string)($typeData['appColumnWidth'] ?? 'standard'),
'setupWizardCompleted' => (bool)($typeData['setupWizardCompleted'] ?? false),
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics.php
index ee46244b..1f826ccc 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics.php
@@ -158,8 +158,8 @@ function getDiagnosticsSnapshot(string $privacyMode = FVPLUS_DIAGNOSTICS_DEFAULT
'sortMode' => $prefs['sortMode'] ?? 'created',
'ruleCount' => count($prefs['autoRules'] ?? []),
'manualOrderCount' => count($prefs['manualOrder'] ?? []),
- 'pinnedFolderCount' => count($prefs['pinnedFolderIds'] ?? []),
- 'pinnedFolderIds' => normalizeStringIdList($prefs['pinnedFolderIds'] ?? []),
+ 'pinnedFolderCount' => count($prefs['pinnedFolderIds'] ?? []), 'pinnedFolderIds' => normalizeStringIdList($prefs['pinnedFolderIds'] ?? []),
+ 'hiddenFolderCount' => count($prefs['hiddenFolderIds'] ?? []), 'hiddenFolderIds' => normalizeStringIdList($prefs['hiddenFolderIds'] ?? []),
'expandedFolderState' => normalizeExpandedStateMap($prefs['expandedFolderState'] ?? []),
'hideEmptyFolders' => normalizeBool($prefs['hideEmptyFolders'] ?? false, false),
'appColumnWidth' => normalizeAppColumnWidth($prefs['appColumnWidth'] ?? 'standard'),
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.folder-mutations.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.folder-mutations.php
index f21fdeb0..ddaafe27 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.folder-mutations.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.folder-mutations.php
@@ -264,9 +264,7 @@ function applyFolderBatchOperations(string $type, array $operations, $expectedRe
];
});
}
-
- function applyFolderMemberIdentityPatches(string $type, array $patches): array {
- $type = ensureType($type);
+ function applyFolderMemberIdentityPatches(string $type, array $patches): array { $type = ensureType($type);
$fileData = readRawFolderMap($type);
$changedFolderIds = [];
$renameCount = 0;
@@ -306,6 +304,9 @@ function applyFolderMemberIdentityPatches(string $type, array $patches): array {
}
}
unset($action);
+ $profiles = fvplusNormalizeWebuiProfiles($folder['settings']['webui_profiles'] ?? []);
+ foreach ($profiles as &$profile) $profile['containers'] = array_values(array_unique(array_map(static fn($name) => $name === $oldName ? $newName : $name, $profile['containers'])));
+ unset($profile); $folder['settings']['webui_profiles'] = $profiles;
if (is_array($folder['memberIdentities'][$oldName] ?? null)) {
$folder['memberIdentities'][$newName] = $folder['memberIdentities'][$oldName];
unset($folder['memberIdentities'][$oldName]);
@@ -356,7 +357,6 @@ function applyFolderMemberIdentityPatches(string $type, array $patches): array {
'metadata' => readConfigMetadata($type, true)
];
}
-
function applyFolderSettingsPayload(string $type, array $targetIds, array $settingsPayload): array {
$type = ensureType($type);
$normalizedSettings = normalizeFolderSettingsTransferPayload($settingsPayload);
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.php
index d165678c..f0649c57 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.php
@@ -399,9 +399,10 @@ function fv3_get_tailscale_fqdn_from_container(string $containerName, bool $cont
const FVPLUS_MAX_FOLDER_STRING_BYTES = 2048;
const FVPLUS_DOCKER_FOLDER_LABEL_KEYS = ['folderview.plus', 'folder.view3', 'folder.view2', 'folder.view'];
const FVPLUS_DEFAULT_FOLDER_STATUS_COLORS = [
- 'started' => '#ffffff',
+ 'started' => '#55b72d',
'paused' => '#b8860b',
- 'stopped' => '#ff4d4d'
+ 'stopped' => '#ff4d4d',
+ 'text' => '#ffffff'
];
const FVPLUS_LEGACY_CONFIG_DIRS = [
'/boot/config/plugins/folder.view3',
@@ -444,6 +445,7 @@ function fv3_get_tailscale_fqdn_from_container(string $containerName, bool $cont
require_once(__DIR__ . '/lib.api-contract.php');
require_once(__DIR__ . '/lib.preflight.php');
+ require_once(__DIR__ . '/lib.webui-profiles.php');
require_once(__DIR__ . '/lib.prefs.php');
require_once(__DIR__ . '/lib.diagnostics.php');
require_once(__DIR__ . '/lib.docker-runtime.php');
@@ -1198,6 +1200,10 @@ function normalizeFolderContentPayload(array $content): array {
if (!is_array($normalized['settings'] ?? null)) {
$normalized['settings'] = [];
}
+ $normalized['settings']['webui_profiles'] = fvplusNormalizeWebuiProfiles(
+ $normalized['settings']['webui_profiles'] ?? ($normalized['settings']['webuiProfiles'] ?? [])
+ );
+ unset($normalized['settings']['webuiProfiles']);
$rawPreviewRows = $normalized['settings']['preview_rows']
?? ($normalized['settings']['previewRows']
?? ($normalized['preview_rows']
@@ -1330,7 +1336,7 @@ function normalizeFolderSettingsTransferPayload(array $payload): array {
$normalized['settings'] = [];
if (array_key_exists('settings', $payload) && is_array($payload['settings'])) {
$settingsCarrier = normalizeFolderContentPayload(['settings' => $payload['settings']]);
- $normalized['settings'] = is_array($settingsCarrier['settings'] ?? null) ? $settingsCarrier['settings'] : [];
+ $normalized['settings'] = fvplusStripWebuiProfilesFromSettings($settingsCarrier['settings'] ?? []);
}
$normalizedActions = [];
@@ -1800,8 +1806,15 @@ function reorderFolderMapByPrefs(string $type, array $folders): array {
}
function reconcileManualOrderPrefs(array $prefs, array $folders): array {
+ $nextPrefs = $prefs;
+ $nextPrefs['hiddenFolderIds'] = array_values(array_filter(
+ normalizeStringIdList($prefs['hiddenFolderIds'] ?? []),
+ static function ($id) use ($folders): bool {
+ return array_key_exists((string)$id, $folders);
+ }
+ ));
if (($prefs['sortMode'] ?? 'created') !== 'manual') {
- return $prefs;
+ return $nextPrefs;
}
$order = [];
foreach ((array)($prefs['manualOrder'] ?? []) as $id) {
@@ -1814,8 +1827,8 @@ function reconcileManualOrderPrefs(array $prefs, array $folders): array {
$order[] = $id;
}
}
- $prefs['manualOrder'] = $order;
- return $prefs;
+ $nextPrefs['manualOrder'] = $order;
+ return $nextPrefs;
}
function syncManualOrderWithFolders(string $type, array $folders): void {
@@ -1998,7 +2011,7 @@ function normalizeTemplateEntry(array $template): ?array {
if ($id === '') {
$id = generateId(12);
}
- $settings = is_array($template['settings'] ?? null) ? $template['settings'] : [];
+ $settings = fvplusStripWebuiProfilesFromSettings($template['settings'] ?? []);
$actions = is_array($template['actions'] ?? null) ? array_values($template['actions']) : [];
return [
'id' => $id,
@@ -2079,7 +2092,7 @@ function createFolderTemplateFromFolder(string $type, string $folderId, string $
'name' => $name,
'icon' => (string)($folder['icon'] ?? ''),
'regex' => (string)($folder['regex'] ?? ''),
- 'settings' => is_array($folder['settings'] ?? null) ? $folder['settings'] : [],
+ 'settings' => fvplusStripWebuiProfilesFromSettings($folder['settings'] ?? []),
'actions' => is_array($folder['actions'] ?? null) ? $folder['actions'] : [],
'createdAt' => gmdate('c')
];
@@ -2554,7 +2567,6 @@ function autoRuleDecision(array $rules, string $name, array $infoByName, string
}
require_once(__DIR__ . '/lib.folder-rules.php'); require_once(__DIR__ . '/lib.docker-start-order-sequence.php');
-
require_once(__DIR__ . '/lib.docker-order.php');
require_once(__DIR__ . '/lib.folder-mutations.php');
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.prefs.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.prefs.php
index c7a939fc..f40d84f0 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.prefs.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.prefs.php
@@ -9,6 +9,7 @@ function defaultTypePrefs(): array {
'sortMode' => 'created',
'manualOrder' => [],
'pinnedFolderIds' => [],
+ 'hiddenFolderIds' => [],
'expandedFolderState' => [],
'hideEmptyFolders' => false,
'appColumnWidth' => 'standard',
@@ -108,6 +109,7 @@ function normalizeTypeFolderDefaultsProfile($value): array {
$incoming = is_array($value) ? $value : [];
$profileIncoming = is_array($incoming['profile'] ?? null) ? $incoming['profile'] : [];
$settingsIncoming = is_array($profileIncoming['settings'] ?? null) ? $profileIncoming['settings'] : [];
+ $settingsIncoming = fvplusStripWebuiProfilesFromSettings($settingsIncoming);
$actionsIncoming = is_array($profileIncoming['actions'] ?? null) ? $profileIncoming['actions'] : [];
$normalizedActions = [];
@@ -442,6 +444,7 @@ function normalizeTypePrefs(array $prefs): array {
}
$normalized['manualOrder'] = normalizeStringIdList($manualOrder);
$normalized['pinnedFolderIds'] = normalizeStringIdList($prefs['pinnedFolderIds'] ?? []);
+ $normalized['hiddenFolderIds'] = normalizeStringIdList($prefs['hiddenFolderIds'] ?? []);
$normalized['expandedFolderState'] = normalizeExpandedStateMap($prefs['expandedFolderState'] ?? []);
$normalized['hideEmptyFolders'] = normalizeBool($prefs['hideEmptyFolders'] ?? false, false);
$normalized['appColumnWidth'] = normalizeAppColumnWidth($prefs['appColumnWidth'] ?? 'standard');
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.validation.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.validation.php
index 04a3f326..1b15fef5 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.validation.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.validation.php
@@ -152,6 +152,9 @@ function fvplus_assert_prefs_payload_shape(array $payload): void {
if (array_key_exists('pinnedFolderIds', $payload)) {
fvplus_validation_assert_list_of_scalarish($payload['pinnedFolderIds'], 'pinnedFolderIds', 10000);
}
+ if (array_key_exists('hiddenFolderIds', $payload)) {
+ fvplus_validation_assert_list_of_scalarish($payload['hiddenFolderIds'], 'hiddenFolderIds', 10000);
+ }
if (array_key_exists('expandedFolderState', $payload)) {
fvplus_validation_assert_assoc_map($payload['expandedFolderState'], 'expandedFolderState', 20000);
}
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.webui-profiles.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.webui-profiles.php
new file mode 100644
index 00000000..403a2c39
--- /dev/null
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.webui-profiles.php
@@ -0,0 +1,127 @@
+ $rawProfile) {
+ if (count($profiles) >= FVPLUS_WEBUI_PROFILE_MAX_PROFILES || !is_array($rawProfile)) {
+ continue;
+ }
+ $id = fvplusWebuiProfileCleanString($rawProfile['id'] ?? '', 64);
+ if (!preg_match('/^[A-Za-z0-9._:-]{1,64}$/', $id)) {
+ $id = 'profile-' . ((int)$sourceIndex + 1);
+ }
+ $baseId = $id;
+ $suffix = 2;
+ while (isset($usedIds[$id])) {
+ $id = substr($baseId, 0, 58) . '-' . $suffix;
+ $suffix++;
+ }
+ $usedIds[$id] = true;
+
+ $name = fvplusWebuiProfileCleanString($rawProfile['name'] ?? '', FVPLUS_WEBUI_PROFILE_MAX_NAME_BYTES);
+ if ($name === '') {
+ $name = 'Profile ' . (count($profiles) + 1);
+ }
+ $baseName = $name;
+ $nameKey = strtolower($name);
+ $suffix = 2;
+ while (isset($usedNames[$nameKey])) {
+ $suffixText = ' ' . $suffix;
+ $name = substr($baseName, 0, max(1, FVPLUS_WEBUI_PROFILE_MAX_NAME_BYTES - strlen($suffixText))) . $suffixText;
+ $nameKey = strtolower($name);
+ $suffix++;
+ }
+ $usedNames[$nameKey] = true;
+
+ $rawMembers = is_array($rawProfile['containers'] ?? null)
+ ? $rawProfile['containers']
+ : (is_array($rawProfile['members'] ?? null) ? $rawProfile['members'] : []);
+ $containers = [];
+ $seenMembers = [];
+ foreach ($rawMembers as $rawMember) {
+ if (count($containers) >= FVPLUS_WEBUI_PROFILE_MAX_MEMBERS) {
+ break;
+ }
+ $member = fvplusWebuiProfileCleanString($rawMember, FVPLUS_WEBUI_PROFILE_MAX_MEMBER_BYTES);
+ if ($member === '' || isset($seenMembers[$member])) {
+ continue;
+ }
+ $seenMembers[$member] = true;
+ $containers[] = $member;
+ }
+ $profiles[] = ['id' => $id, 'name' => $name, 'containers' => $containers];
+ }
+ return $profiles;
+}
+
+function fvplusStripWebuiProfilesFromSettings($settings): array {
+ $normalized = is_array($settings) ? $settings : [];
+ unset($normalized['webui_profiles'], $normalized['webuiProfiles']);
+ return $normalized;
+}
+
+function fvplusBuildWebuiProfileDiagnostics($settings, array $availableMembers): array {
+ $rawSettings = is_array($settings) ? $settings : [];
+ $rawProfiles = $rawSettings['webui_profiles'] ?? ($rawSettings['webuiProfiles'] ?? []);
+ $invalidProfileCount = 0;
+ $rawIds = [];
+ $duplicateProfileIdCount = 0;
+ foreach (is_array($rawProfiles) ? $rawProfiles : [] as $rawProfile) {
+ if (!is_array($rawProfile)) {
+ $invalidProfileCount++;
+ continue;
+ }
+ $rawId = fvplusWebuiProfileCleanString($rawProfile['id'] ?? '', 64);
+ $rawName = fvplusWebuiProfileCleanString($rawProfile['name'] ?? '', FVPLUS_WEBUI_PROFILE_MAX_NAME_BYTES);
+ if ($rawId === '' || !preg_match('/^[A-Za-z0-9._:-]{1,64}$/', $rawId) || $rawName === '') {
+ $invalidProfileCount++;
+ }
+ if ($rawId !== '' && isset($rawIds[$rawId])) {
+ $duplicateProfileIdCount++;
+ }
+ if ($rawId !== '') {
+ $rawIds[$rawId] = true;
+ }
+ }
+ $profiles = fvplusNormalizeWebuiProfiles($rawProfiles);
+ $available = array_fill_keys(array_values(array_unique(array_map('strval', $availableMembers))), true);
+ $selectedReferenceCount = 0;
+ $unavailableReferenceCount = 0;
+ foreach ($profiles as $profile) {
+ foreach ($profile['containers'] as $member) {
+ $selectedReferenceCount++;
+ if (!isset($available[$member])) {
+ $unavailableReferenceCount++;
+ }
+ }
+ }
+ return [
+ 'profileCount' => count($profiles),
+ 'selectedReferenceCount' => $selectedReferenceCount,
+ 'unavailableReferenceCount' => $unavailableReferenceCount,
+ 'duplicateProfileIdCount' => $duplicateProfileIdCount,
+ 'invalidProfileCount' => $invalidProfileCount
+ ];
+}
+
+function fvplusMergeWebuiProfileDiagnostics(array $left, array $right): array {
+ $keys = ['profileCount', 'selectedReferenceCount', 'unavailableReferenceCount', 'duplicateProfileIdCount', 'invalidProfileCount'];
+ $merged = [];
+ foreach ($keys as $key) {
+ $merged[$key] = max(0, (int)($left[$key] ?? 0)) + max(0, (int)($right[$key] ?? 0));
+ }
+ return $merged;
+}
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/prefs.php b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/prefs.php
index 973c995b..a49abc1a 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/prefs.php
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/prefs.php
@@ -47,6 +47,7 @@
(string)($current['sortMode'] ?? 'created') !== (string)($saved['sortMode'] ?? 'created')
|| normalizeStringIdList($current['manualOrder'] ?? []) !== normalizeStringIdList($saved['manualOrder'] ?? [])
|| normalizeStringIdList($current['pinnedFolderIds'] ?? []) !== normalizeStringIdList($saved['pinnedFolderIds'] ?? [])
+ || normalizeStringIdList($current['hiddenFolderIds'] ?? []) !== normalizeStringIdList($saved['hiddenFolderIds'] ?? [])
);
if ($orderPrefsChanged) {
syncManualOrderWithFolders($type, readRawFolderMap($type));
@@ -75,7 +76,8 @@
'backupCoalesced' => (bool)($backup['coalesced'] ?? false),
'sortMode' => (string)($saved['sortMode'] ?? 'created'),
'ruleCount' => count($saved['autoRules'] ?? []),
- 'pinnedFolderCount' => count($saved['pinnedFolderIds'] ?? [])
+ 'pinnedFolderCount' => count($saved['pinnedFolderIds'] ?? []),
+ 'hiddenFolderCount' => count($saved['hiddenFolderIds'] ?? [])
], 'ok', 'server');
$auditRecorded = true;
} catch (Throwable $err) {
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/docker.css b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/docker.css
index 0d75a4cc..2b0b75b5 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/docker.css
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/docker.css
@@ -550,12 +550,45 @@ tr.fv-folder-locked .folder-appname {
display: none !important;
}
+#docker_list > tr.fv-folder-user-hidden {
+ display: none !important;
+}
+
+body.fvplus-docker-reveal-hidden #docker_list > tr.fv-folder-user-hidden:not(.fv-toolbar-filter-hidden):not(.fv-folder-focus-hidden) {
+ display: table-row !important;
+ opacity: 0.58;
+}
+
+body.fvplus-docker-reveal-hidden #docker_list > tr.folder.fv-folder-hidden-revealed > td {
+ background-image: linear-gradient(rgba(255, 154, 60, 0.045), rgba(255, 154, 60, 0.045));
+}
+
+.fv-folder-hidden-indicator {
+ display: inline-flex;
+ align-items: center;
+ gap: 0.24rem;
+ margin-left: 0.45rem;
+ color: #ff9a3c;
+ font-size: 0.86em;
+ font-weight: 700;
+ text-transform: uppercase;
+}
+
+.fv-folder-hidden-indicator-icon,
+.fvplus-docker-quick-svg,
+.fvplus-docker-action-svg,
+.fvplus-docker-visibility-notice-icon {
+ width: 1em;
+ height: 1em;
+ flex: 0 0 auto;
+}
+
.folder-update-text {
white-space: nowrap;
}
span.folder-state.fv-folder-state-started {
- color: var(--fvplus-folder-status-started, var(--fvplus-status-started));
+ color: var(--fvplus-folder-status-text, #ffffff);
}
span.folder-state {
@@ -565,11 +598,11 @@ span.folder-state {
}
span.folder-state.fv-folder-state-paused {
- color: var(--fvplus-folder-status-paused, var(--fvplus-status-paused));
+ color: var(--fvplus-folder-status-text, #ffffff);
}
span.folder-state.fv-folder-state-stopped {
- color: var(--fvplus-folder-status-stopped, var(--fvplus-status-stopped));
+ color: var(--fvplus-folder-status-text, #ffffff);
}
i.folder-load-status.started {
@@ -973,6 +1006,29 @@ tr.folder.fv-parent-expanded div.folder-preview {
color: var(--fvplus-folder-status-stopped, var(--fvplus-status-stopped)) !important;
}
+.folder-preview .fv-preview-status-compact .state,
+.folder-preview span.state[class*="fv-preview-status-"] {
+ color: var(--fvplus-folder-status-text, #ffffff) !important;
+}
+
+.folder-preview i.fv-preview-lifecycle-pending {
+ color: var(--fvplus-folder-status-started, var(--fvplus-status-started)) !important;
+}
+
+.folder-preview [data-fv-lifecycle-action="start"] i.fv-preview-lifecycle-pending,
+.folder-preview [data-fv-lifecycle-action="resume"] i.fv-preview-lifecycle-pending,
+.folder-preview [data-fv-lifecycle-action="restart"] i.fv-preview-lifecycle-pending {
+ color: var(--fvplus-folder-status-started, var(--fvplus-status-started)) !important;
+}
+
+.folder-preview [data-fv-lifecycle-action="pause"] i.fv-preview-lifecycle-pending {
+ color: var(--fvplus-folder-status-paused, var(--fvplus-status-paused)) !important;
+}
+
+.folder-preview [data-fv-lifecycle-action="stop"] i.fv-preview-lifecycle-pending {
+ color: var(--fvplus-folder-status-stopped, var(--fvplus-status-stopped)) !important;
+}
+
.folder-preview-wrapper .inner > span.appname {
display: inline-block;
overflow: clip;
@@ -1391,6 +1447,12 @@ div.folder-preview-4 span.outer {
font-size: 14px !important;
}
+.fvplus-docker-context-menu > li.fvplus-docker-quick-item .fvplus-docker-quick-svg {
+ width: 15px;
+ height: 15px;
+ font-size: 15px !important;
+}
+
.fvplus-docker-context-menu > li.fvplus-docker-quick-clear {
clear: both;
}
@@ -1688,6 +1750,59 @@ body.fvplus-privacy-vm-sensitive-externalUrls a.fvplus-sensitive-external-url {
background: rgba(128, 128, 128, 0.32);
}
+.fvplus-docker-action-menu-item .fvplus-docker-action-svg {
+ justify-self: center;
+}
+
+.fvplus-docker-visibility-notice {
+ flex: 1 0 100%;
+ width: 100%;
+ min-width: 0;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ gap: 0.55rem;
+ padding: 0.58rem 0.72rem;
+ border: 1px solid rgba(255, 154, 60, 0.48);
+ border-radius: 6px;
+ background: rgba(255, 154, 60, 0.08);
+ color: inherit;
+}
+
+.fvplus-docker-visibility-notice > span {
+ flex: 1 1 auto;
+ min-width: 0;
+}
+
+.fvplus-docker-visibility-notice > button {
+ flex: 0 0 auto;
+ margin: 0 !important;
+}
+
+.fvplus-docker-visibility-notice > .fvplus-docker-visibility-button {
+ border: 1px solid var(--fvplus-ui-border-subtle, rgba(128, 128, 128, 0.34)) !important;
+ background: var(--fvplus-ui-control, rgba(128, 128, 128, 0.1)) !important;
+ color: var(--fvplus-ui-text-primary, inherit) !important;
+ box-shadow: none !important;
+}
+
+.fvplus-docker-visibility-notice > .fvplus-docker-visibility-button:hover:not(:disabled) {
+ border-color: var(--fvplus-ui-border-strong, rgba(128, 128, 128, 0.58)) !important;
+ background: var(--fvplus-ui-control-hover, rgba(128, 128, 128, 0.2)) !important;
+ color: var(--fvplus-ui-text-primary, inherit) !important;
+}
+
+.fvplus-docker-visibility-notice > .fvplus-docker-visibility-button:focus-visible {
+ border-color: var(--fvplus-ui-border-strong, rgba(128, 128, 128, 0.58)) !important;
+ box-shadow: 0 0 0 3px var(--fvplus-ui-focus-ring, rgba(74, 179, 255, 0.24)) !important;
+ outline: 0 !important;
+}
+
+.fvplus-docker-visibility-notice.is-undo {
+ border-color: rgba(85, 183, 45, 0.52);
+ background: rgba(85, 183, 45, 0.08);
+}
+
#docker_list > tr.fv-toolbar-filter-hidden {
display: none !important;
}
@@ -1727,4 +1842,13 @@ body.fvplus-privacy-vm-sensitive-externalUrls a.fvplus-sensitive-external-url {
.fvplus-docker-action-separator {
display: none;
}
+
+ .fvplus-docker-visibility-notice {
+ align-items: stretch;
+ flex-wrap: wrap;
+ }
+
+ .fvplus-docker-visibility-notice > span {
+ flex-basis: calc(100% - 2rem);
+ }
}
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folder.css b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folder.css
index 06c5116a..b882c164 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folder.css
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folder.css
@@ -4954,7 +4954,8 @@ table.sortable td:nth-child(4) {
.fv-third-party-pack-actions-panel > button,
.fv-third-party-inline-actions > button,
.fv-modern-field-row .custom-action,
- .fv-folder-action-dialog .ui-dialog-buttonpane button
+ .fv-folder-action-dialog .ui-dialog-buttonpane button,
+ .fv-webui-profile-button
) {
border: 0 !important;
border-radius: 8px !important;
@@ -4982,7 +4983,8 @@ table.sortable td:nth-child(4) {
.fv-third-party-pack-actions-panel > button,
.fv-third-party-inline-actions > button,
.fv-modern-field-row .custom-action,
- .fv-folder-action-dialog .ui-dialog-buttonpane button
+ .fv-folder-action-dialog .ui-dialog-buttonpane button,
+ .fv-webui-profile-button
):hover,
:is(
.fv-editor-hero-actions > button,
@@ -5001,7 +5003,8 @@ table.sortable td:nth-child(4) {
.fv-third-party-pack-actions-panel > button,
.fv-third-party-inline-actions > button,
.fv-modern-field-row .custom-action,
- .fv-folder-action-dialog .ui-dialog-buttonpane button
+ .fv-folder-action-dialog .ui-dialog-buttonpane button,
+ .fv-webui-profile-button
):focus-visible {
background: var(--fv-editor-button-hover-top) !important;
box-shadow: var(--fv-editor-button-shadow-hover) !important;
@@ -5024,7 +5027,8 @@ table.sortable td:nth-child(4) {
.fv-third-party-pack-actions-panel > button,
.fv-third-party-inline-actions > button,
.fv-modern-field-row .custom-action,
- .fv-folder-action-dialog .ui-dialog-buttonpane button
+ .fv-folder-action-dialog .ui-dialog-buttonpane button,
+ .fv-webui-profile-button
):active {
background: var(--fv-editor-button-active-top) !important;
box-shadow: var(--fv-editor-button-shadow-active) !important;
@@ -5295,6 +5299,130 @@ body[data-fvplus-host-theme="white"] #fvEditorActionBar .folder-btn-submit:activ
display: none !important;
}
+.fv-webui-profiles-section dl,
+.fv-webui-profiles-section dd {
+ width: 100%;
+}
+
+#fvWebuiProfilesWorkspace {
+ display: grid;
+ gap: 0.85rem;
+ width: 100%;
+}
+
+.fv-webui-profiles-toolbar,
+.fv-webui-profile-head,
+.fv-webui-profile-tools,
+.fv-webui-profile-member {
+ display: flex;
+ align-items: center;
+ gap: 0.65rem;
+}
+
+.fv-webui-profiles-toolbar,
+.fv-webui-profile-head {
+ justify-content: space-between;
+}
+
+.fv-webui-profiles-toolbar p,
+.fv-webui-profile-card p {
+ margin: 0;
+}
+
+.fv-webui-profile-list {
+ display: grid;
+ gap: 0.85rem;
+}
+
+.fv-webui-profile-card {
+ display: grid;
+ gap: 0.75rem;
+ padding: 0.9rem;
+ border: 1px solid var(--fv-editor-border, rgba(127, 127, 127, 0.35));
+ border-radius: 8px;
+ background: var(--fv-editor-panel, rgba(127, 127, 127, 0.06));
+}
+
+.fv-webui-profile-name,
+.fv-webui-profile-tools input[type="search"] {
+ min-width: 0;
+ border-color: var(--fv-editor-border, currentColor);
+ background: var(--fv-editor-input-bg, inherit);
+ color: inherit;
+}
+
+.fv-webui-profile-name {
+ flex: 1 1 18rem;
+ font-weight: 700;
+}
+
+.fv-webui-profile-actions,
+.fv-webui-profile-tools {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0.45rem;
+}
+
+.fv-webui-profile-tools input[type="search"] {
+ flex: 1 1 14rem;
+}
+
+.fv-webui-profile-button {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.35rem;
+ min-height: 34px;
+ padding: 0.35rem 0.65rem;
+ cursor: pointer;
+}
+
+.fv-webui-profile-button:focus-visible {
+ outline: 2px solid var(--fv-editor-focus-ring) !important;
+ outline-offset: 2px;
+}
+
+.fv-webui-profile-button > i,
+.fv-webui-profile-button > span {
+ color: inherit !important;
+}
+
+.fv-webui-profile-members {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(230px, 1fr));
+ gap: 0.45rem;
+}
+
+.fv-webui-profile-member {
+ display: grid;
+ grid-template-columns: auto minmax(0, 1fr);
+ padding: 0.55rem 0.65rem;
+ border: 1px solid var(--fv-editor-border, rgba(127, 127, 127, 0.3));
+ border-radius: 6px;
+ cursor: pointer;
+}
+
+.fv-webui-profile-member > span {
+ grid-column: 2;
+ opacity: 0.72;
+ font-size: 0.86rem;
+}
+
+.fv-webui-profile-member.is-unavailable {
+ border-style: dashed;
+ opacity: 0.75;
+}
+
+.fv-webui-profiles-status {
+ min-height: 1.3em;
+}
+
+.fv-webui-profiles-status.is-error,
+.fv-input-error {
+ color: var(--fv-editor-danger, #e05252);
+ border-color: var(--fv-editor-danger, #e05252) !important;
+}
+
@media (max-width: 980px) {
#fvEditorChrome {
position: static;
@@ -5378,6 +5506,23 @@ body[data-fvplus-host-theme="white"] #fvEditorActionBar .folder-btn-submit:activ
width: 100%;
}
+ .fv-webui-profiles-toolbar,
+ .fv-webui-profile-head,
+ .fv-webui-profile-tools {
+ align-items: stretch;
+ flex-direction: column;
+ }
+
+ .fv-webui-profile-actions,
+ .fv-webui-profile-button,
+ .fv-webui-profile-tools input[type="search"] {
+ width: 100%;
+ }
+
+ .fv-webui-profile-actions .fv-webui-profile-button {
+ flex: 1 1 9rem;
+ }
+
.fv-custom-icon-row {
grid-template-columns: 24px minmax(0, 1fr);
align-items: start;
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folderviewplus.css b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folderviewplus.css
index bd1014b7..3aa66a9d 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folderviewplus.css
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/folderviewplus.css
@@ -3544,7 +3544,7 @@ body.fv-mobile-compact #fv-settings-root .status-breakdown-list {
--fvplus-theme-accent: var(--fvplus-settings-accent, #f0a030);
--fvplus-theme-surface-panel: var(--fvplus-settings-surface-panel, #1b1d20);
--fvplus-theme-border-subtle: var(--fvplus-settings-border-subtle, rgba(255, 255, 255, 0.12));
- --fvplus-status-started: #ffffff;
+ --fvplus-status-started: #55b72d;
--fvplus-status-paused: #b8860b;
--fvplus-status-stopped: #ff4d4d;
--fvplus-graph-cpu: #5aa4ff;
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/vm.css b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/vm.css
index 8b82031f..f46b13eb 100644
--- a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/vm.css
+++ b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/vm.css
@@ -241,7 +241,7 @@ tr.fv-folder-locked .folder-appname {
}
span.folder-state.fv-folder-state-started {
- color: var(--fvplus-folder-status-started, var(--fvplus-status-started));
+ color: var(--fvplus-folder-status-text, #ffffff);
}
span.folder-state {
@@ -251,11 +251,11 @@ span.folder-state {
}
span.folder-state.fv-folder-state-paused {
- color: var(--fvplus-folder-status-paused, var(--fvplus-status-paused));
+ color: var(--fvplus-folder-status-text, #ffffff);
}
span.folder-state.fv-folder-state-stopped {
- color: var(--fvplus-folder-status-stopped, var(--fvplus-status-stopped));
+ color: var(--fvplus-folder-status-text, #ffffff);
}
i.folder-load-status.started {
diff --git a/tests/architecture-boundaries.test.mjs b/tests/architecture-boundaries.test.mjs
index aeff5787..f86b102c 100644
--- a/tests/architecture-boundaries.test.mjs
+++ b/tests/architecture-boundaries.test.mjs
@@ -15,14 +15,14 @@ test('all FolderView Plus page and loader script graphs are contract-guarded', (
assert.deepEqual(result.failures, []);
assert.equal(result.pageCount, 5);
assert.equal(result.sourceCount, 8);
- assert.equal(result.referenceCount, 290);
+ assert.equal(result.referenceCount, 296);
});
test('entrypoints and contracted modules declare ownership boundaries', () => {
assert.equal(architecture.schemaVersion, 2);
assert.equal(architecture.entrypointContracts.length, 9);
- assert.equal(architecture.moduleContracts.length, 50);
- assert.equal(architecture.serverModuleContracts.length, 29);
+ assert.equal(architecture.moduleContracts.length, 53);
+ assert.equal(architecture.serverModuleContracts.length, 30);
const allowedConsumers = new Set(architecture.consumerScopes);
for (const contract of [...architecture.entrypointContracts, ...architecture.moduleContracts, ...architecture.serverModuleContracts]) {
assert.ok(contract.file, 'boundary contract must name its file');
diff --git a/tests/browser/cases/docker-hidden-folders.mjs b/tests/browser/cases/docker-hidden-folders.mjs
new file mode 100644
index 00000000..b30e8ea7
--- /dev/null
+++ b/tests/browser/cases/docker-hidden-folders.mjs
@@ -0,0 +1,26 @@
+import assert from 'node:assert/strict';
+import { assertImmediateThemedUndo } from '../helpers/docker-hidden-folder-context.mjs';
+
+export const registerDockerHiddenFolderFixtureCases = ({ test, baseUrl }) => {
+test('Docker hidden folders remain recoverable through reveal, restore all, and undo', async ({ page }) => {
+ await page.goto(`${baseUrl}/runtime`, { waitUntil: 'load' });
+ await assertImmediateThemedUndo(page, 'media');
+
+ await page.click('[data-fvplus-docker-menu="view"]');
+ const revealControl = page.locator('#fvplus-docker-action-bar .fvplus-docker-action-menu.is-open [data-fvplus-docker-hidden="toggle-reveal"]');
+ assert.match(await revealControl.textContent(), /Hidden folders \(1\)/);
+ await revealControl.click();
+ assert.equal(await page.locator('#docker_list > tr.folder-id-media').isVisible(), true);
+ assert.equal(await page.locator('#docker_list > tr.folder-id-media .fv-folder-hidden-indicator').count(), 1);
+
+ await page.click('[data-fvplus-docker-menu="view"]');
+ await page.click('[data-fvplus-docker-hidden="restore-all"]');
+ await page.waitForFunction(() => window.fixtureRuntime.hiddenFolders.getSummary().explicitCount === 0);
+ assert.equal(await page.locator('#docker_list > tr.fv-folder-user-hidden').count(), 0);
+
+ await page.evaluate(() => window.fixtureRuntime.hiddenFolders.hideFolder('updates'));
+ await page.click('[data-fvplus-docker-hidden="undo"]');
+ await page.waitForFunction(() => window.fixtureRuntime.hiddenFolders.getSummary().explicitCount === 0);
+ assert.equal(await page.locator('#docker_list > tr.folder-id-updates').isVisible(), true);
+});
+};
diff --git a/tests/browser/cases/docker.mjs b/tests/browser/cases/docker.mjs
index 921808bb..1cc7ce40 100644
--- a/tests/browser/cases/docker.mjs
+++ b/tests/browser/cases/docker.mjs
@@ -1,5 +1,8 @@
import assert from 'node:assert/strict';
-import { exerciseDockerPreviewContextDiagnostics } from '../helpers/docker-preview-context.mjs';
+import {
+ exerciseChildFolderPreviewContext,
+ exerciseDockerPreviewContextDiagnostics
+} from '../helpers/docker-preview-context.mjs';
export const registerDockerFixtureCases = ({ test, baseUrl }) => {
test('Docker action bar is idempotent and reports fixture counts', async ({ page }) => {
@@ -61,13 +64,29 @@ test('Docker single-row preview cloning falls back without stopping later member
assert.deepEqual(result.missingWrapper, { ok: false, reason: 'preview-markup-missing' });
assert.deepEqual(result.invalidSelector, { ok: false, reason: 'preview-clone-failed' });
assert.equal(result.renderedCount, 3, 'a malformed member must not stop subsequent preview rendering');
+ assert.equal(result.renderedContainerId, 'fixture-0');
+ assert.equal(result.renderedContainerName, 'fixture-container-0');
assert.equal(result.fallbackCount, 2);
});
+test('Docker lifecycle pending colors follow each action destination state', async ({ page }) => {
+ await page.goto(`${baseUrl}/docker-layout-stability`, { waitUntil: 'load' });
+ const colors = await page.evaluate(() => window.fixtureDockerLifecyclePendingColors.run());
+ assert.equal(colors.start, 'rgb(17, 170, 34)');
+ assert.equal(colors.resume, 'rgb(17, 170, 34)');
+ assert.equal(colors.restart, 'rgb(17, 170, 34)');
+ assert.equal(colors.pause, 'rgb(204, 153, 0)');
+ assert.equal(colors.stop, 'rgb(221, 34, 51)');
+});
+
test('Docker multi-row previews bridge native context without cloned handlers or duplicate ids', async ({ page }) => {
await exerciseDockerPreviewContextDiagnostics({ page, baseUrl });
});
+test('Docker child-folder preview chip opens its action menu after multi-row reflow', async ({ page }) => {
+ await exerciseChildFolderPreviewContext({ page, baseUrl });
+});
+
test('Docker folder context menu opens from the first folder-icon click', async ({ page }) => {
await page.goto(`${baseUrl}/docker-layout-stability`, { waitUntil: 'load' });
const result = await page.evaluate(() => window.fixtureFolderContextFirstClick.run());
diff --git a/tests/browser/cases/folder-editor.mjs b/tests/browser/cases/folder-editor.mjs
index 3d3e418c..08ce281f 100644
--- a/tests/browser/cases/folder-editor.mjs
+++ b/tests/browser/cases/folder-editor.mjs
@@ -1,5 +1,4 @@
import assert from 'node:assert/strict';
-
export const registerFolderEditorFixtureCases = ({ test, baseUrl }) => {
test('Folder action sheet uses the compact retained action set and accessible dialog', async ({ page }) => {
await page.goto(`${baseUrl}/folder-editor`, { waitUntil: 'load' });
@@ -41,4 +40,5 @@ test('Folder action sheet traps focus, copies details, and restores trigger focu
assert.equal(await page.evaluate(() => window.fixtureFolderEditor.calls.includes('delete')), true);
assert.equal(await page.locator('#fv-folder-action-sheet-backdrop').count(), 0);
});
+
};
diff --git a/tests/browser/cases/folder-webui-profile-theme.mjs b/tests/browser/cases/folder-webui-profile-theme.mjs
new file mode 100644
index 00000000..cd507a66
--- /dev/null
+++ b/tests/browser/cases/folder-webui-profile-theme.mjs
@@ -0,0 +1,37 @@
+import assert from 'node:assert/strict';
+export const registerFolderWebuiProfileThemeFixtureCase = ({ test, baseUrl }) => {
+test('Custom WebUI profile buttons resist Unraid defaults and follow editor theme tokens', async ({ page }) => {
+ await page.goto(`${baseUrl}/folder-editor`, { waitUntil: 'load' });
+ await page.getByRole('button', { name: 'Add profile' }).click();
+ const readTheme = () => page.evaluate(() => {
+ const form = document.querySelector('.folder-editor-form');
+ const neutral = document.querySelector('.fv-webui-profile-actions .fv-webui-profile-button:not(.is-danger)');
+ const neutralProbe = document.createElement('span');
+ neutralProbe.style.cssText = 'position:absolute;left:-9999px;background:var(--fv-editor-button-bg-top);color:var(--fv-editor-button-fg)';
+ form.append(neutralProbe);
+ const neutralStyle = getComputedStyle(neutral);
+ const neutralProbeStyle = getComputedStyle(neutralProbe);
+ const result = {
+ background: neutralStyle.backgroundColor, expectedBackground: neutralProbeStyle.backgroundColor,
+ color: neutralStyle.color, expectedColor: neutralProbeStyle.color,
+ borderWidth: neutralStyle.borderTopWidth
+ };
+ neutralProbe.remove();
+ return result;
+ });
+ const dark = await readTheme();
+ assert.equal(dark.background, dark.expectedBackground);
+ assert.equal(dark.color, dark.expectedColor);
+ assert.equal(dark.borderWidth, '0px');
+ assert.notEqual(dark.color, 'rgb(255, 128, 0)');
+ await page.evaluate(() => { document.documentElement.dataset.fvplusHostTheme = 'white'; });
+ await page.waitForTimeout(200);
+ const light = await readTheme();
+ assert.equal(light.background, light.expectedBackground);
+ assert.equal(light.color, light.expectedColor);
+ assert.equal(light.borderWidth, '0px');
+ assert.notEqual(light.background, dark.background);
+ await page.evaluate(() => { delete document.documentElement.dataset.fvplusHostTheme; });
+ await page.waitForTimeout(200);
+});
+};
diff --git a/tests/browser/cases/folder-webui-profiles.mjs b/tests/browser/cases/folder-webui-profiles.mjs
new file mode 100644
index 00000000..0d272bb9
--- /dev/null
+++ b/tests/browser/cases/folder-webui-profiles.mjs
@@ -0,0 +1,32 @@
+import assert from 'node:assert/strict';
+
+export const registerFolderWebuiProfileFixtureCases = ({ test, baseUrl }) => {
+test('Custom WebUI profiles support create, select, duplicate, reorder, and delete', async ({ page }) => {
+ await page.goto(`${baseUrl}/folder-editor`, { waitUntil: 'load' });
+ await page.getByRole('button', { name: 'Add profile' }).click();
+ const card = page.locator('.fv-webui-profile-card').first();
+ await card.locator('.fv-webui-profile-name').fill('Media tools');
+ await card.getByText('Plex', { exact: true }).click();
+ await card.getByText('Tautulli', { exact: true }).click();
+ let stored = JSON.parse(await page.locator('input[name="webui_profiles"]').inputValue());
+ assert.deepEqual(stored[0].containers.sort(), ['Plex', 'Tautulli']);
+ await card.getByRole('button', { name: 'Duplicate' }).click();
+ assert.equal(await page.locator('.fv-webui-profile-card').count(), 2);
+ await page.locator('.fv-webui-profile-card').nth(1).getByRole('button', { name: 'Move up' }).click();
+ await page.locator('.fv-webui-profile-card').first().getByRole('button', { name: 'Delete' }).click();
+ assert.equal(await page.locator('.fv-webui-profile-card').count(), 1);
+ stored = JSON.parse(await page.locator('input[name="webui_profiles"]').inputValue());
+ assert.equal(stored[0].name, 'Media tools');
+});
+
+test('Custom WebUI profile editor remains usable on mobile and keyboard focus is visible', async ({ page }) => {
+ await page.setViewportSize({ width: 390, height: 844 });
+ await page.goto(`${baseUrl}/folder-editor`, { waitUntil: 'load' });
+ await page.getByRole('button', { name: 'Add profile' }).click();
+ const overflow = await page.evaluate(() => document.documentElement.scrollWidth - document.documentElement.clientWidth);
+ assert.ok(overflow <= 1, `unexpected horizontal overflow: ${overflow}px`);
+ await page.keyboard.press('Tab');
+ const focusedTag = await page.evaluate(() => document.activeElement?.tagName || '');
+ assert.ok(['BUTTON', 'INPUT'].includes(focusedTag));
+});
+};
diff --git a/tests/browser/cases/foundation.mjs b/tests/browser/cases/foundation.mjs
index be030b91..648a5bf0 100644
--- a/tests/browser/cases/foundation.mjs
+++ b/tests/browser/cases/foundation.mjs
@@ -121,7 +121,7 @@ test('Generated localization covers initial, attributed, parameterized, and dyna
await page.waitForTimeout(150);
const settledSnapshot = await page.evaluate(() => window.FolderViewPlusI18n.snapshot());
assert.equal(snapshot.dynamicTranslationObserver, true);
- assert.equal(snapshot.autoBoundMessageCount, 1574);
+ assert.equal(snapshot.autoBoundMessageCount, 1579);
assert.ok(snapshot.autoTranslatedNodeCount >= 303);
assert.equal(settledSnapshot.autoTranslatedNodeCount, snapshot.autoTranslatedNodeCount, 'localization must settle without observing its own writes forever');
});
diff --git a/tests/browser/fixtures/docker-layout-stability.html b/tests/browser/fixtures/docker-layout-stability.html
index e76819ef..e0a6ef29 100644
--- a/tests/browser/fixtures/docker-layout-stability.html
+++ b/tests/browser/fixtures/docker-layout-stability.html
@@ -94,10 +94,23 @@
+
+
+
+ |
+
+
+ |
+
+ | Child folder row |
+
+
+
+
@@ -162,6 +175,7 @@
previewMode: 1,
context: 1,
ctid: `fixture-${index}`,
+ containerName: `fixture-container-${index}`,
appendModelPreview: () => {
fallbackCount += 1;
const $fallback = window.jQuery('
Fallback');
@@ -180,10 +194,34 @@
missingWrapper: { ok: missingWrapper.ok, reason: missingWrapper.reason },
invalidSelector: { ok: invalidSelector.ok, reason: invalidSelector.reason },
renderedCount: renderTarget.children().length,
+ renderedContainerId: renderTarget.children().first().attr('data-fv-container-id'),
+ renderedContainerName: renderTarget.children().first().attr('data-fv-container-name'),
fallbackCount
};
}
};
+ window.fixtureDockerLifecyclePendingColors = {
+ run: () => {
+ const $preview = window.jQuery('
')
+ .css('--fvplus-folder-status-started', '#11aa22')
+ .css('--fvplus-folder-status-paused', '#cc9900')
+ .css('--fvplus-folder-status-stopped', '#dd2233');
+ const colors = {};
+ ['start', 'resume', 'restart', 'pause', 'stop'].forEach((action) => {
+ const $surface = window.jQuery('
').attr('data-fv-lifecycle-action', action);
+ const $icon = window.jQuery('
');
+ $surface.append($icon);
+ $preview.append($surface);
+ });
+ window.jQuery(document.body).append($preview);
+ $preview.children().each((_, surface) => {
+ const action = surface.getAttribute('data-fv-lifecycle-action');
+ colors[action] = window.getComputedStyle(surface.querySelector('i')).color;
+ });
+ $preview.remove();
+ return colors;
+ }
+ };
window.localStorage.removeItem(window.FolderViewPlusDockerPreviewActions.PREVIEW_CONTEXT_DIAGNOSTICS_STORAGE_KEY);
const actionsApi = window.FolderViewPlusDockerPreviewActions.createApi({
window,
@@ -277,6 +315,141 @@
};
buildNativeContextPreview('rows-2');
buildNativeContextPreview('unlimited');
+ const childFolderFixtureState = {
+ editCount: 0,
+ actionCount: 0,
+ contextBindings: { default: 0, advanced: 0 },
+ contextClicks: { default: 0, advanced: 0 },
+ contextAudits: 0
+ };
+ const childFolderFixtureFolders = {
+ 'fixture-parent': {
+ name: 'Private parent fixture',
+ settings: { preview: 1, preview_rows: 2, context: 1 },
+ runtimeContainers: {},
+ status: { expanded: false }
+ },
+ 'fixture-child': {
+ name: 'Private child fixture',
+ icon: '',
+ settings: { preview: 1, preview_rows: 2 },
+ runtimeContainers: {},
+ status: { expanded: false }
+ }
+ };
+ const childFolderFixtureHierarchy = {
+ ids: ['fixture-parent', 'fixture-child'],
+ parentById: { 'fixture-parent': '', 'fixture-child': 'fixture-parent' },
+ childrenById: { 'fixture-parent': ['fixture-child'], 'fixture-child': [] }
+ };
+ const layoutChildFolderFixtureRows = ($preview, settings) => {
+ const runtimeShared = window.FolderViewDockerRuntimeShared;
+ const wrappers = runtimeShared.flattenPreviewWrappers($preview);
+ runtimeShared.finalizePreviewRows($preview, wrappers.map((wrapper) => [wrapper]), settings);
+ };
+ const childFolderHierarchyApi = window.FolderViewPlusDockerRuntimeHierarchy.createApi({
+ window,
+ $: window.jQuery,
+ getGlobalFolders: () => childFolderFixtureFolders,
+ getDockerFolderHierarchy: () => childFolderFixtureHierarchy,
+ buildRuntimeContainerMapForFolder: (folderId, includeDescendants) => {
+ if (folderId === 'fixture-child') {
+ return { childMember: { name: 'Private child member', state: true } };
+ }
+ if (folderId === 'fixture-parent' && includeDescendants !== true) {
+ return {
+ parentMemberOne: { name: 'Private parent member one', shortId: 'fixture-parent-one', state: true },
+ parentMemberTwo: { name: 'Private parent member two', shortId: 'fixture-parent-two', state: true }
+ };
+ }
+ return {};
+ },
+ buildDockerPreviewItem: ({ entry }) => {
+ const $item = window.jQuery('
')
+ .attr('data-fv-container-id', entry?.shortId || '')
+ .find('.appname').text(entry?.name || 'Member').end();
+ return { $item, $tooltipTrigger: $item.find('.fv-preview-trigger').first() };
+ },
+ bindDockerNestedPreviewContext: ($item, _tooltipTrigger, _entry, folder) => {
+ const mode = Number(folder?.settings?.context || 1) === 2 ? 'advanced' : 'default';
+ childFolderFixtureState.contextBindings[mode] += 1;
+ $item
+ .attr('data-fixture-parent-context', mode)
+ .off('click.fixtureParentContext')
+ .on('click.fixtureParentContext', (event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ childFolderFixtureState.contextClicks[mode] += 1;
+ });
+ return true;
+ },
+ auditDockerPreviewContextBridges: () => {
+ childFolderFixtureState.contextAudits += 1;
+ },
+ applyFolderPreviewLayout: () => {},
+ layoutFolderPreviewRows: layoutChildFolderFixtureRows,
+ editFolder: () => { childFolderFixtureState.editCount += 1; },
+ openFolderActions: () => { childFolderFixtureState.actionCount += 1; },
+ recordChildFolderPreviewRender: actionsApi.recordChildFolderPreviewRender,
+ recordChildFolderPreviewBinding: actionsApi.recordChildFolderPreviewBinding,
+ recordChildFolderPreviewMenuOpen: actionsApi.recordChildFolderPreviewMenuOpen
+ });
+ const renderChildFolderFixture = () => childFolderHierarchyApi.renderNestedAggregatePreview(
+ 'fixture-parent',
+ childFolderFixtureFolders['fixture-parent'],
+ {},
+ { includeChildFolders: true }
+ );
+ renderChildFolderFixture();
+ for (let pass = 0; pass < 2; pass += 1) {
+ layoutChildFolderFixtureRows(
+ window.jQuery('#fixture-child-folder-preview'),
+ childFolderFixtureFolders['fixture-parent'].settings
+ );
+ }
+ window.fixtureChildFolderPreviewContext = {
+ closeMenu() {
+ window.jQuery('.fv-folder-preview-context-menu').remove();
+ window.jQuery(document).off('click.fvFolderPreviewContext keydown.fvFolderPreviewContext');
+ },
+ dispatchTouchClick() {
+ this.closeMenu();
+ const item = document.querySelector('#fixture-child-folder-preview .fv-folder-preview-child');
+ const event = new Event('click', { bubbles: true, cancelable: true });
+ Object.defineProperty(event, 'changedTouches', {
+ value: [{ clientX: 321, clientY: 145 }]
+ });
+ item.dispatchEvent(event);
+ },
+ rerenderMemberContext(contextMode, listViewMode = 'basic') {
+ childFolderFixtureFolders['fixture-parent'].settings.context = Number(contextMode);
+ document.cookie = `docker_listview_mode=${listViewMode}; path=/`;
+ renderChildFolderFixture();
+ },
+ snapshot() {
+ const menu = document.querySelector('.fv-folder-preview-context-menu');
+ return {
+ chipCount: document.querySelectorAll('#fixture-child-folder-preview .fv-folder-preview-child').length,
+ rowCount: document.querySelectorAll('#fixture-child-folder-preview .folder-preview-row').length,
+ menuCount: document.querySelectorAll('.fv-folder-preview-context-menu').length,
+ menuLeft: Number.parseFloat(menu?.style?.left || '0'),
+ menuTop: Number.parseFloat(menu?.style?.top || '0'),
+ menuWidth: Number(menu?.offsetWidth || 180),
+ menuHeight: Number(menu?.offsetHeight || 112),
+ viewportWidth: Number(window.innerWidth || document.documentElement.clientWidth || 0),
+ viewportHeight: Number(window.innerHeight || document.documentElement.clientHeight || 0),
+ menuActions: Array.from(menu?.querySelectorAll('button') || []).map((button) => button.textContent.trim()),
+ focusedAction: document.activeElement?.textContent?.trim() || '',
+ editCount: childFolderFixtureState.editCount,
+ actionCount: childFolderFixtureState.actionCount,
+ memberContextBindings: { ...childFolderFixtureState.contextBindings },
+ memberContextClicks: { ...childFolderFixtureState.contextClicks },
+ memberContextAudits: childFolderFixtureState.contextAudits,
+ listViewMode: document.cookie.includes('docker_listview_mode=advanced') ? 'advanced' : 'basic',
+ diagnostics: actionsApi.getPreviewContextDiagnosticsSnapshot()
+ };
+ }
+ };
window.fixtureNativePreviewContext.breakRows2HandlersAndAudit = () => {
const $preview = window.jQuery('#fixture-context-preview-rows-2');
const rows = $preview.children('.folder-preview-row').get();
@@ -298,7 +471,7 @@
previewInlineHandlerCount: document.querySelectorAll('.fixture-context-preview [onclick], .fixture-context-preview [oncontextmenu]').length,
startedClassCount: document.querySelectorAll('.fixture-context-preview .state.fv-preview-status-started').length,
bridgeCount: document.querySelectorAll('.fixture-context-preview [data-fv-preview-context="native"][role="button"][tabindex="0"]').length,
- previewRowCount: document.querySelectorAll('.fixture-context-preview .folder-preview-row').length,
+ previewRowCount: document.querySelectorAll('#fixture-context-preview-rows-2 .folder-preview-row, #fixture-context-preview-unlimited .folder-preview-row').length,
diagnostics: actionsApi.getPreviewContextDiagnosticsSnapshot()
});
const layoutEngine = window.FolderViewPlusRuntimeColumnLayout.createColumnLayoutEngine({
diff --git a/tests/browser/fixtures/folder-editor.html b/tests/browser/fixtures/folder-editor.html
index c01bcf37..f78a9ead 100644
--- a/tests/browser/fixtures/folder-editor.html
+++ b/tests/browser/fixtures/folder-editor.html
@@ -6,17 +6,44 @@
FolderView Plus folder action fixture
-
+
+
-
+
+
+
diff --git a/tests/browser/fixtures/runtime.fixture.js b/tests/browser/fixtures/runtime.fixture.js
index d3f0ec77..80b9adb5 100644
--- a/tests/browser/fixtures/runtime.fixture.js
+++ b/tests/browser/fixtures/runtime.fixture.js
@@ -12,6 +12,8 @@
let prefs = { pageViewMode: 'folderview', hideEmptyFolders: false, health: { warnStoppedPercent: 60 } };
const events = [];
let refreshCount = 0;
+ let deferHiddenFolderSave = false;
+ let pendingHiddenFolderSave = null;
const hostAdapter = window.FolderViewPlusRuntimeHostAdapters.getOrCreate('docker', { window, document });
const privacyEvents = [];
let privacySwitchInitializeCount = 0;
@@ -128,6 +130,7 @@
const normalizePrefs = (value = {}) => ({
pageViewMode: ['host', 'command'].includes(String(value.pageViewMode || '')) ? value.pageViewMode : 'folderview',
hideEmptyFolders: value.hideEmptyFolders === true,
+ hiddenFolderIds: Array.isArray(value.hiddenFolderIds) ? [...new Set(value.hiddenFolderIds.map(String).filter(Boolean))] : [],
health: { warnStoppedPercent: Number(value.health?.warnStoppedPercent) || 60 }
});
const applyPrefs = (nextPrefs = prefs) => {
@@ -140,7 +143,45 @@
row.hidden = mode === 'command';
});
};
- const api = window.FolderViewPlusDockerRuntimeActionBar.createApi({
+ let api = null;
+ const hiddenFolders = window.FolderViewPlusFoundationModules.dockerHiddenFolders.createApi({
+ window,
+ document,
+ $: window.jQuery,
+ getFolders: () => folders,
+ getPrefs: () => prefs,
+ setPrefs: (value) => { prefs = normalizePrefs(value); },
+ normalizePrefs,
+ normalizeParentId: (value) => String(value || ''),
+ readFolderIdFromRow: (row) => String(row?.dataset?.folderId || ''),
+ readFolderOwnerFromRow: (row) => String(row?.dataset?.folderOwner || ''),
+ runtimeStateStore: { set: () => {} },
+ safeActionRunner: window.FolderViewDockerRuntimeShared.createSafeUiActionRunner(),
+ runGuardedAction: async (_name, action) => {
+ try { return { ok: true, value: await action() }; } catch (error) { return { ok: false, error }; }
+ },
+ savePrefs: async (patch) => {
+ const nextPrefs = normalizePrefs({ ...prefs, ...patch });
+ if (deferHiddenFolderSave) {
+ return new Promise((resolve, reject) => {
+ pendingHiddenFolderSave = { nextPrefs, resolve, reject };
+ });
+ }
+ prefs = nextPrefs;
+ return prefs;
+ },
+ fetchPrefs: async () => prefs,
+ syncDependentUi: () => api?.sync(),
+ getFocusedFolderId: () => '',
+ clearFocusedFolder: () => events.push({ type: 'clear-focus' }),
+ offerUndo: (payload) => api?.offerHiddenFolderUndo(payload),
+ dismissUndo: (folderId = '') => api?.clearHiddenFolderUndo(folderId),
+ translate: (_key, fallback) => fallback,
+ escapeHtml: (value) => String(value ?? '').replace(/[&<>"']/g, (char) => ({
+ '&': '&', '<': '<', '>': '>', '"': '"', "'": '''
+ }[char]))
+ });
+ api = window.FolderViewPlusDockerRuntimeActionBar.createApi({
window,
document,
hostAdapter,
@@ -168,6 +209,7 @@
getFocusedFolderId: () => '',
clearFocusedFolder: () => events.push({ type: 'clear-focus' }),
scheduleWidthReflow: () => {},
+ hiddenFolders,
buildFolderHierarchy: () => ({ parentById: { media: '', updates: '', empty: '' } }),
expandFolderBranch: (id) => events.push({ type: 'expand', id }),
collapseFolderBranch: (id) => events.push({ type: 'collapse', id }),
@@ -179,6 +221,28 @@
window.fixtureRuntime = {
api,
+ hiddenFolders,
+ hiddenFolderPersistence: {
+ defer: () => { deferHiddenFolderSave = true; },
+ isPending: () => !!pendingHiddenFolderSave,
+ resolve: () => {
+ const pending = pendingHiddenFolderSave;
+ pendingHiddenFolderSave = null;
+ deferHiddenFolderSave = false;
+ if (!pending) return false;
+ prefs = pending.nextPrefs;
+ pending.resolve(prefs);
+ return true;
+ },
+ reject: () => {
+ const pending = pendingHiddenFolderSave;
+ pendingHiddenFolderSave = null;
+ deferHiddenFolderSave = false;
+ if (!pending) return false;
+ pending.reject(new Error('fixture hidden-folder save failed'));
+ return true;
+ }
+ },
events,
privacyToggle: {
rememberIdentity: () => {
diff --git a/tests/browser/fixtures/runtime.html b/tests/browser/fixtures/runtime.html
index 4a71aef1..f0bcff68 100644
--- a/tests/browser/fixtures/runtime.html
+++ b/tests/browser/fixtures/runtime.html
@@ -24,12 +24,12 @@
| Application | Version | Network | Container IP | Container port | LAN IP:PORT |
|---|
- | Media | 1/2 started |
+ | Media | 1/2 started |
| Plex | up-to-date | bridge | 172.17.0.2 | 32400/TCP | 10.0.0.10:32400 |
| Sonarr | up-to-date | bridge | 172.17.0.3 | 8989/TCP | 10.0.0.10:8989 |
- | Updates | 1 update |
+ | Updates | 1 update |
| Toolbox | update ready | bridge | 172.17.0.4 | 8080/TCP | 10.0.0.10:8080 |
- | Empty | 0 members |
+ | Empty | 0 members |
| Orphan | up-to-date | bridge | 172.17.0.8 | 9000/TCP | 10.0.0.10:9000 |
@@ -50,6 +50,7 @@
+
diff --git a/tests/browser/helpers/docker-hidden-folder-context.mjs b/tests/browser/helpers/docker-hidden-folder-context.mjs
new file mode 100644
index 00000000..1a526027
--- /dev/null
+++ b/tests/browser/helpers/docker-hidden-folder-context.mjs
@@ -0,0 +1,31 @@
+import assert from 'node:assert/strict';
+
+export const assertImmediateThemedUndo = async (page, folderId) => {
+ await page.evaluate(() => window.fixtureRuntime.hiddenFolderPersistence.defer());
+ await page.evaluate((id) => { void window.fixtureRuntime.hiddenFolders.hideFolder(id); }, folderId);
+ assert.equal(await page.locator('#docker_list > tr.fv-folder-user-hidden').count(), 3);
+ assert.equal(await page.locator(`#docker_list > tr.folder-id-${folderId}`).isVisible(), false);
+ assert.equal(await page.evaluate(() => window.fixtureRuntime.hiddenFolderPersistence.isPending()), true);
+ const undoButton = page.locator('[data-fvplus-docker-hidden="undo"]');
+ assert.equal(await undoButton.isVisible(), true, 'Undo must render before the deferred preference save resolves');
+ const themedButton = await undoButton.evaluate((button) => {
+ const probe = document.createElement('div');
+ probe.style.cssText = 'position:absolute;left:-9999px;border:1px solid var(--fvplus-ui-border-subtle);background:var(--fvplus-ui-control);color:var(--fvplus-ui-text-primary)';
+ document.body.appendChild(probe);
+ const buttonStyle = getComputedStyle(button);
+ const probeStyle = getComputedStyle(probe);
+ const result = {
+ classApplied: button.classList.contains('fvplus-docker-visibility-button'),
+ borderColor: buttonStyle.borderTopColor, expectedBorderColor: probeStyle.borderTopColor,
+ backgroundColor: buttonStyle.backgroundColor, expectedBackgroundColor: probeStyle.backgroundColor,
+ color: buttonStyle.color, expectedColor: probeStyle.color
+ };
+ probe.remove();
+ return result;
+ });
+ assert.equal(themedButton.classApplied, true);
+ assert.equal(themedButton.borderColor, themedButton.expectedBorderColor);
+ assert.equal(themedButton.backgroundColor, themedButton.expectedBackgroundColor);
+ assert.equal(themedButton.color, themedButton.expectedColor);
+ await page.evaluate(() => window.fixtureRuntime.hiddenFolderPersistence.resolve());
+};
diff --git a/tests/browser/helpers/docker-preview-context.mjs b/tests/browser/helpers/docker-preview-context.mjs
index d13d3fc0..95cfaf34 100644
--- a/tests/browser/helpers/docker-preview-context.mjs
+++ b/tests/browser/helpers/docker-preview-context.mjs
@@ -83,3 +83,81 @@ export const exerciseDockerPreviewContextDiagnostics = async ({ page, baseUrl })
);
assert.equal(result.diagnostics.failureReasons['handler-missing'], 2);
};
+
+export const exerciseChildFolderPreviewContext = async ({ page, baseUrl }) => {
+ await page.goto(`${baseUrl}/docker-layout-stability`, { waitUntil: 'load' });
+ const chip = page.locator('#fixture-child-folder-preview .fv-folder-preview-child');
+ const snapshot = () => page.evaluate(() => window.fixtureChildFolderPreviewContext.snapshot());
+
+ let result = await snapshot();
+ assert.deepEqual([result.chipCount, result.rowCount], [1, 3]);
+ assert.deepEqual(result.memberContextBindings, { default: 2, advanced: 0 });
+ await page.locator('#fixture-child-folder-preview .fv-nested-preview-item').first().click();
+ result = await snapshot();
+ assert.deepEqual(result.memberContextClicks, { default: 1, advanced: 0 });
+
+ await chip.click();
+ result = await snapshot();
+ assert.equal(result.menuCount, 1, 'normal click must open the child-folder menu');
+ assert.ok(result.menuLeft > 0);
+ assert.ok(result.menuTop > 0);
+ assert.deepEqual(result.menuActions, ['Expand to folder', 'Edit folder', 'Open folder actions']);
+ await page.getByRole('menuitem', { name: 'Edit folder' }).click();
+ result = await snapshot();
+ assert.deepEqual([result.menuCount, result.editCount], [0, 1]);
+
+ await chip.focus();
+ await chip.press('Enter');
+ await page.waitForFunction(() => document.activeElement?.textContent?.includes('Expand to folder'));
+ result = await snapshot();
+ assert.equal(result.menuCount, 1, 'keyboard activation must open the child-folder menu');
+ assert.equal(result.focusedAction, 'Expand to folder');
+ assert.ok(result.menuLeft > 0, 'keyboard activation must use the chip geometry');
+ assert.ok(result.menuTop > 0, 'keyboard activation must use the chip geometry');
+ await page.keyboard.press('Escape');
+
+ await chip.click({ button: 'right' });
+ result = await snapshot();
+ assert.equal(result.menuCount, 1, 'right-click must keep opening the child-folder menu');
+ await page.getByRole('menuitem', { name: 'Open folder actions' }).click();
+ result = await snapshot();
+ assert.deepEqual([result.menuCount, result.actionCount], [0, 1]);
+
+ await page.evaluate(() => window.fixtureChildFolderPreviewContext.dispatchTouchClick());
+ result = await snapshot();
+ assert.equal(result.menuCount, 1, 'touch-like activation must open the child-folder menu');
+ const expectedTouchLeft = Math.max(8, Math.min(321, result.viewportWidth - result.menuWidth - 8));
+ const expectedTouchTop = Math.max(8, Math.min(145, result.viewportHeight - result.menuHeight - 8));
+ assert.deepEqual([result.menuLeft, result.menuTop], [expectedTouchLeft, expectedTouchTop]);
+ assert.deepEqual(
+ [result.diagnostics.childFolderPreview.counters.chipsRendered,
+ result.diagnostics.childFolderPreview.counters.bindings,
+ result.diagnostics.childFolderPreview.counters.menuOpenAttempts,
+ result.diagnostics.childFolderPreview.counters.menuOpens,
+ result.diagnostics.childFolderPreview.counters.menuOpenFailures],
+ [1, 1, 4, 4, 0]
+ );
+ assert.deepEqual(
+ result.diagnostics.childFolderPreview.inputMethods,
+ { mouse: 1, keyboard: 1, contextmenu: 1, touch: 1, unknown: 0 }
+ );
+ assert.doesNotMatch(
+ JSON.stringify(result.diagnostics.childFolderPreview),
+ /Private parent fixture|Private child fixture|fixture-parent|fixture-child/
+ );
+
+ await page.evaluate(() => window.fixtureChildFolderPreviewContext.rerenderMemberContext(2, 'advanced'));
+ await page.locator('#fixture-child-folder-preview .fv-nested-preview-item').first().click();
+ result = await snapshot();
+ assert.deepEqual(result.memberContextBindings, { default: 2, advanced: 2 });
+ assert.deepEqual(result.memberContextClicks, { default: 1, advanced: 1 });
+ assert.equal(result.listViewMode, 'advanced');
+
+ await page.evaluate(() => window.fixtureChildFolderPreviewContext.rerenderMemberContext(1, 'advanced'));
+ await page.locator('#fixture-child-folder-preview .fv-nested-preview-item').nth(1).click();
+ result = await snapshot();
+ assert.deepEqual(result.memberContextBindings, { default: 4, advanced: 2 });
+ assert.deepEqual(result.memberContextClicks, { default: 2, advanced: 1 });
+ assert.equal(result.listViewMode, 'advanced');
+ assert.equal(result.memberContextAudits, 3);
+};
diff --git a/tests/dashboard-lifecycle-reconciliation.test.mjs b/tests/dashboard-lifecycle-reconciliation.test.mjs
index 3db18721..52309b95 100644
--- a/tests/dashboard-lifecycle-reconciliation.test.mjs
+++ b/tests/dashboard-lifecycle-reconciliation.test.mjs
@@ -160,6 +160,114 @@ test('Docker page lifecycle defaults resolve container ids and clear expanded pr
assert.equal(finalized.details.remainingBusyPreviewActionIconCount, 0);
});
+test('Docker restart lifecycle keeps its pending surface through the initial running snapshot', async () => {
+ const scheduled = [];
+ const finalized = [];
+ const api = reconcileModule.createApi({
+ window: {
+ setTimeout(handler, delayMs) {
+ scheduled.push({ handler, delayMs });
+ return scheduled.length;
+ }
+ },
+ refreshDockerRuntimeStateInPlace: async () => true,
+ isDockerLifecycleStateSettled: () => true,
+ getDockerLifecycleStateSnapshot: () => ({ state: 'running', active: true, paused: false }),
+ finalizeDockerLifecycleSurface: (request, outcome) => finalized.push({ request, outcome }),
+ lifecycleRefreshDelaysMs: [0, 750]
+ });
+
+ api.runDockerLifecycleRefresh({ action: 'restart', container: 'abc123def456' });
+ scheduled[0].handler();
+ await flushPromises();
+ assert.equal(finalized.length, 0);
+
+ scheduled[1].handler();
+ await flushPromises();
+ assert.equal(finalized.length, 1);
+ assert.equal(finalized[0].outcome.settled, true);
+ assert.equal(finalized[0].outcome.attempt, 2);
+});
+
+test('Docker native lifecycle hook marks and restores a matching compact preview status icon', async () => {
+ const scheduled = [];
+ const iconAttributes = new Map([['class', 'fa fa-play fv-preview-status-started']]);
+ const surfaceAttributes = new Map([
+ ['data-fv-container-id', 'abc123def456'],
+ ['data-fv-container-name', 'example-container']
+ ]);
+ const icon = {
+ getAttribute: (name) => iconAttributes.get(name) || '',
+ setAttribute: (name, value) => iconAttributes.set(name, String(value)),
+ hasAttribute: (name) => iconAttributes.has(name),
+ removeAttribute: (name) => iconAttributes.delete(name)
+ };
+ const surface = {
+ getAttribute: (name) => surfaceAttributes.get(name) || '',
+ setAttribute: (name, value) => surfaceAttributes.set(name, String(value)),
+ removeAttribute: (name) => surfaceAttributes.delete(name),
+ querySelectorAll: () => [icon]
+ };
+ const document = {
+ querySelectorAll(selector) {
+ if (selector.includes('data-fv-container-id')) return [surface];
+ if (selector.includes('data-fv-lifecycle-pending')) {
+ return surfaceAttributes.get('data-fv-lifecycle-pending') === 'true' ? [surface] : [];
+ }
+ if (selector.includes('data-fv-lifecycle-icon-class')) {
+ return iconAttributes.has('data-fv-lifecycle-icon-class') ? [icon] : [];
+ }
+ return [];
+ }
+ };
+ const entry = {
+ shortId: 'abc123def456',
+ name: 'example-container',
+ info: { Id: 'abc123def4567890', Name: 'example-container', State: { Running: true, Paused: false } }
+ };
+ const window = {
+ eventControl: (...args) => {
+ window[args[1]]();
+ return true;
+ },
+ setTimeout(handler, delayMs) {
+ scheduled.push({ handler, delayMs });
+ return scheduled.length;
+ }
+ };
+ const api = reconcileModule.createApi({
+ window,
+ document,
+ getDockerRuntimeInfoEntries: () => [entry],
+ refreshDockerRuntimeStateInPlace: async () => true,
+ syncDockerVisibleFoldersFromRuntimeCache: () => true,
+ lifecycleRefreshDelaysMs: [0],
+ getDockerHostGuardsApi: () => ({
+ wrapHostHook(name, handler) {
+ const original = window[name];
+ window[name] = (...args) => handler({
+ args,
+ invokeOriginal: (...overrideArgs) => original(...overrideArgs)
+ });
+ }
+ })
+ });
+
+ api.bindLifecycleEventControlPatch();
+ window.eventControl({ action: 'restart', container: 'abc123def456' }, 'loadlist');
+ assert.match(iconAttributes.get('class'), /fa-refresh/);
+ assert.match(iconAttributes.get('class'), /fa-spin/);
+ assert.equal(surfaceAttributes.get('aria-busy'), 'true');
+ assert.equal(surfaceAttributes.get('data-fv-lifecycle-action'), 'restart');
+
+ scheduled[0].handler();
+ await flushPromises();
+ assert.equal(iconAttributes.get('class'), 'fa fa-play fv-preview-status-started');
+ assert.equal(surfaceAttributes.has('aria-busy'), false);
+ assert.equal(surfaceAttributes.has('data-fv-lifecycle-action'), false);
+ assert.equal(iconAttributes.has('data-fv-lifecycle-icon-class'), false);
+});
+
test('Dashboard stop followed by start cancels the stale stop tail and converges to running', async () => {
const scheduled = [];
const refreshStates = [false, false, true];
diff --git a/tests/diagnostics-summary-contract.test.mjs b/tests/diagnostics-summary-contract.test.mjs
index b1827244..c595dce7 100644
--- a/tests/diagnostics-summary-contract.test.mjs
+++ b/tests/diagnostics-summary-contract.test.mjs
@@ -60,6 +60,7 @@ const buildIntegrityChecks = (overrides = {}) => ({
invalidAutoRules: { count: 0, rules: [] },
missingManualOrderIds: { count: 0, ids: [] },
missingPinnedFolderIds: { count: 0, ids: [] },
+ missingHiddenFolderIds: { count: 0, ids: [] },
duplicateAssignments: {
explicit: { count: 0, examples: [] },
regex: { count: 0, examples: [] },
@@ -124,3 +125,14 @@ test('diagnostics summary still surfaces concrete path issues first', () => {
assert.ok(dockerCard, 'docker summary card is missing');
assert.equal(dockerCard.detail, 'Missing /boot/config/plugins/folderview.plus/docker.folder.json');
});
+
+test('diagnostics summary identifies stale hidden-folder preferences', () => {
+ const summary = runOverviewSummary({
+ typesData: buildTypesData(buildIntegrityChecks({
+ issuesCount: 1,
+ missingHiddenFolderIds: { count: 1, ids: ['removed-folder'] }
+ }))
+ });
+ const dockerCard = summary.cards.find((card) => card.key === 'docker');
+ assert.equal(dockerCard?.detail, '1 hidden folder id no longer matches an existing folder.');
+});
diff --git a/tests/docker-clone-branch-regression.test.mjs b/tests/docker-clone-branch-regression.test.mjs
index 27d6860a..36218aa4 100644
--- a/tests/docker-clone-branch-regression.test.mjs
+++ b/tests/docker-clone-branch-regression.test.mjs
@@ -76,7 +76,8 @@ test('docker clone payload builder deep-clones mutable folder fields', () => {
icon: 'icon.svg',
settings: {
layout: 'grid',
- nested: { enabled: true }
+ nested: { enabled: true },
+ webui_profiles: [{ id: 'media', name: 'Media tools', containers: ['plex'] }]
},
regex: '^media',
containers: ['plex'],
@@ -98,6 +99,8 @@ test('docker clone payload builder deep-clones mutable folder fields', () => {
assert.equal(payload.parentId, 'child-parent');
assert.notStrictEqual(payload.settings, source.settings);
assert.notStrictEqual(payload.settings.nested, source.settings.nested);
+ assert.notStrictEqual(payload.settings.webui_profiles, source.settings.webui_profiles);
+ assert.deepEqual(payload.settings.webui_profiles, source.settings.webui_profiles);
assert.notStrictEqual(payload.containers, source.containers);
assert.notStrictEqual(payload.actions, source.actions);
assert.notStrictEqual(payload.actions[0], source.actions[0]);
diff --git a/tests/docker-folder-context-feature-actions.test.mjs b/tests/docker-folder-context-feature-actions.test.mjs
index 1d45ef98..9920e651 100644
--- a/tests/docker-folder-context-feature-actions.test.mjs
+++ b/tests/docker-folder-context-feature-actions.test.mjs
@@ -19,17 +19,23 @@ const runtimeSharedControlsScript = fs.readFileSync(
path.join(repoRoot, 'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.shared-controls.js'),
'utf8'
);
+const webuiProfilesScript = fs.readFileSync(
+ path.join(repoRoot, 'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.webui-profiles.js'),
+ 'utf8'
+);
const runtimeSharedControls = require(path.join(
repoRoot,
'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.shared-controls.js'
));
+const dockerRuntimeActions = require('../src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.actions.js');
+const webuiProfiles = require('../src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.webui-profiles.js');
test('docker folder context supports open-all-webui actions with scoped options', () => {
assert.match(dockerScript, /const collectFolderWebuiTargets = \(id, includeDescendants = true, runningOnly = true\) => \{/);
assert.match(dockerRuntimeActionsScript, /const collectFolderWebuiTargets = \(id, includeDescendants = true, runningOnly = true\) =>/);
assert.match(runtimeSharedControlsScript, /const openWebuiPopupWindow = \(url, targetName = '_blank'\) =>/);
- assert.match(dockerScript, /const openFolderWebuisFromMenu = \(id, runningOnly = true, includeDescendants = false\) => \{/);
- assert.match(dockerRuntimeActionsScript, /const openFolderWebuisFromMenu = \(id, runningOnly = true, includeDescendants = false\) =>/);
+ assert.match(dockerScript, /const openFolderWebuisFromMenu = \(id, runningOnly = true, includeDescendants = false, profileId = ''\) =>/);
+ assert.match(dockerRuntimeActionsScript, /const openFolderWebuisFromMenu = \(id, runningOnly = true, includeDescendants = false, profileId = ''\) =>/);
assert.match(dockerScript, /Open all WebUIs/);
assert.match(dockerScript, /collectFolderWebuiTargets\(id, false, true\)/);
assert.match(dockerRuntimeActionsScript, /entry\?\.state === true && entry\?\.pause !== true/);
@@ -40,6 +46,42 @@ test('docker folder context supports open-all-webui actions with scoped options'
assert.match(dockerRuntimeActionsScript, /Blocked WebUIs \(manual open\)/);
assert.match(dockerScript, /dockerRuntimeInfoByName/);
assert.match(dockerScript, /openFolderWebuisFromMenu\(id, true, false\)/);
+ assert.match(dockerScript, /appendRuntimeMenuItems/);
+ assert.match(webuiProfilesScript, /docker\.webui-profiles\.open/);
+ assert.match(dockerScript, /editFolder\(id, \{ section: 'webuiProfiles' \}\)/);
+});
+
+test('custom WebUI profile launches only selected running direct members', async () => {
+ const opened = [];
+ const api = dockerRuntimeActions.createApi({
+ window: { setTimeout, location: { host: 'tower.local' } },
+ document: {},
+ webuiProfiles,
+ getGlobalFolders: () => ({
+ media: {
+ settings: {
+ webui_profiles: [{ id: 'media-tools', name: 'Media tools', containers: ['Plex', 'Tautulli', 'Stopped'] }]
+ }
+ }
+ }),
+ getScopedRuntimeContainersForFolder: () => ({
+ Plex: { state: true, pause: false, webui: 'http://plex/' },
+ Tautulli: { state: true, pause: false, webui: 'http://tautulli/' },
+ Stopped: { state: false, pause: false, webui: 'http://stopped/' },
+ Other: { state: true, pause: false, webui: 'http://other/' }
+ }),
+ getSafeWebuiUrl: (value) => value,
+ openWebuiPopupWindow: (url) => { opened.push(url); return true; },
+ runDockerGuardedAction: async (_name, action) => action()
+ });
+
+ api.openFolderWebuisFromMenu('media', true, false, 'media-tools');
+ await new Promise((resolve) => setImmediate(resolve));
+ assert.deepEqual(opened, ['http://plex/', 'http://tautulli/']);
+
+ api.openFolderWebuisFromMenu('media', true, false, 'missing-profile');
+ await new Promise((resolve) => setImmediate(resolve));
+ assert.deepEqual(opened, ['http://plex/', 'http://tautulli/']);
});
test('open-all WebUI popup detection uses a secured blank handle before navigation', () => {
diff --git a/tests/docker-folder-row-quick-actions.test.mjs b/tests/docker-folder-row-quick-actions.test.mjs
index da48bcd5..8c969043 100644
--- a/tests/docker-folder-row-quick-actions.test.mjs
+++ b/tests/docker-folder-row-quick-actions.test.mjs
@@ -8,6 +8,10 @@ const dockerScript = fs.readFileSync(
path.join(repoRoot, 'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js'),
'utf8'
);
+const dockerHiddenFoldersScript = fs.readFileSync(
+ path.join(repoRoot, 'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.hidden-folders.js'),
+ 'utf8'
+);
const dockerPreviewActionsScript = fs.readFileSync(
path.join(repoRoot, 'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.preview-actions.js'),
'utf8'
@@ -46,13 +50,18 @@ const dockerFolderSameLevelMoveBlock = extractConstFunctionBlock(
'ensureDockerFolderUnlocked'
);
-test('docker context menu keeps focus/pin/lock quick actions at the top', () => {
+test('docker context menu keeps focus/pin/lock/hide quick actions at the top', () => {
assert.match(dockerScript, /text:\s*focused[\s\S]*getDockerMenuLabel\('clear-focus-folder',\s*'Clear focus'\)/);
assert.match(dockerScript, /text:\s*pinned[\s\S]*getDockerMenuLabel\('unpin-folder',\s*'Unpin folder'\)/);
assert.match(dockerScript, /text:\s*locked[\s\S]*getDockerMenuLabel\('unlock-folder',\s*'Unlock folder'\)/);
assert.match(dockerScript, /toggleDockerFolderFocus\(id\)/);
assert.match(dockerScript, /toggleDockerFolderPin\(id\)/);
assert.match(dockerScript, /toggleDockerFolderLock\(id\)/);
+ assert.match(dockerHiddenFoldersScript, /translate\('docker\.folder\.hide',\s*'Hide folder'\)/);
+ assert.match(dockerHiddenFoldersScript, /hiddenOwnerId \? restoreFolder\(hiddenOwnerId\) : hideFolder\(id\)/);
+ assert.match(dockerScript, /minimumItems:\s*4/);
+ assert.match(dockerScript, /maximumItems:\s*4/);
+ assert.match(dockerHiddenFoldersScript, /svgIcon\(\$icon\.hasClass\('fa-eye-slash'\)/);
assert.match(dockerScript, /queueDockerFolderContextQuickIcons\(/);
assert.match(dockerScript, /createDockerContextMenuQuickStripAdapter/);
assert.match(dockerScript, /dockerContextQuickStripAdapter/);
@@ -248,6 +257,20 @@ test('docker lifecycle reconciliation restores expanded preview action icons fro
assert.match(dockerScript, /getDockerRuntimeInfoEntries: \(\) => Object\.values\(dockerRuntimeInfoByName \|\| \{\}\),/);
assert.match(dockerScript, /syncDockerVisibleFoldersFromRuntimeCache: \(changedNames = null\) => syncDockerVisibleFoldersFromRuntimeCache\(changedNames\),/);
assert.match(dockerReconcileScript, /remainingBusyPreviewActionIconCount:/);
+ assert.match(dockerScript, /\.attr\('data-fv-container-id', String\(ctid \|\| ''\)\.trim\(\)\)/);
+ assert.match(dockerScript, /\.attr\('data-fv-container-name', String\(previewEntry\?\.name \|\| ''\)\.trim\(\)\)/);
+ assert.match(dockerReconcileScript, /const markDockerLifecycleSurfacePending = \(request = \{\}\) =>/);
+ assert.match(dockerReconcileScript, /const clearDockerLifecycleSurfacePending = \(request = \{\}\) =>/);
+ assert.match(dockerReconcileScript, /const restartWarmupPending = action === 'restart'/);
+ assert.match(dockerPreviewActionsScript, /\.attr\('data-fv-container-id', String\(options\.ctid \|\| ''\)\.trim\(\)\)/);
+ assert.match(dockerPreviewActionsScript, /\.attr\('data-fv-container-name', String\(options\.containerName \|\| ''\)\.trim\(\)\)/);
+ assert.match(dockerScript, /context: folder\.settings\.context, ctid, containerName: previewEntry\?\.name, autostart/);
+ assert.match(dockerScript, /span\.hand:last`\)[\s\S]*?\.attr\('data-fv-container-id', String\(ctid \|\| ''\)\.trim\(\)\)[\s\S]*?\.attr\('data-fv-container-name', String\(previewEntry\?\.name \|\| ''\)\.trim\(\)\)/);
+ assert.match(dockerScript, /lstSpan\.children\('span\.inner:last'\)[\s\S]*?\.attr\('data-fv-container-id', String\(ctid \|\| ''\)\.trim\(\)\)[\s\S]*?\.attr\('data-fv-container-name', String\(previewEntry\?\.name \|\| ''\)\.trim\(\)\)/);
+ assert.match(dockerCss, /\.folder-preview i\.fv-preview-lifecycle-pending\s*\{[^}]*var\(--fvplus-folder-status-started,\s*var\(--fvplus-status-started\)\)/);
+ assert.match(dockerCss, /data-fv-lifecycle-action="restart"[^}]*fv-preview-lifecycle-pending[\s\S]*?var\(--fvplus-folder-status-started,\s*var\(--fvplus-status-started\)\)/);
+ assert.match(dockerCss, /data-fv-lifecycle-action="pause"[^}]*fv-preview-lifecycle-pending\s*\{[^}]*var\(--fvplus-folder-status-paused,\s*var\(--fvplus-status-paused\)\)/);
+ assert.match(dockerCss, /data-fv-lifecycle-action="stop"[^}]*fv-preview-lifecycle-pending\s*\{[^}]*var\(--fvplus-folder-status-stopped,\s*var\(--fvplus-status-stopped\)\)/);
});
test('docker incremental lifecycle sync refreshes initialized preview menus from canonical runtime state', () => {
diff --git a/tests/docker-hidden-folder-visibility.test.mjs b/tests/docker-hidden-folder-visibility.test.mjs
new file mode 100644
index 00000000..71b51960
--- /dev/null
+++ b/tests/docker-hidden-folder-visibility.test.mjs
@@ -0,0 +1,136 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+
+const root = path.resolve(process.cwd());
+const read = (relativePath) => fs.readFileSync(path.join(root, relativePath), 'utf8');
+const dockerJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js');
+const hiddenFoldersJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.hidden-folders.js');
+const require = createRequire(import.meta.url);
+const hiddenFoldersModule = require(path.join(root, 'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.hidden-folders.js'));
+const prefsJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils-prefs.js');
+const libPrefsPhp = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.prefs.php');
+const validationPhp = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.validation.php');
+const diagnosticsPhp = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.diagnostics-support-bundle.php');
+const pageDiagnosticsJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.page-diagnostics.js');
+
+test('hidden folder ids use normalized conflict-safe server preferences', () => {
+ assert.match(libPrefsPhp, /'hiddenFolderIds'\s*=>\s*\[\]/);
+ assert.match(libPrefsPhp, /\$normalized\['hiddenFolderIds'\]\s*=\s*normalizeStringIdList/);
+ assert.match(validationPhp, /fvplus_validation_assert_list_of_scalarish\(\$payload\['hiddenFolderIds'\], 'hiddenFolderIds'/);
+ assert.match(prefsJs, /const hiddenFolderIds = normalizeStringIdList\(incoming\.hiddenFolderIds\)/);
+ assert.match(hiddenFoldersJs, /savePrefs\(\{ hiddenFolderIds \}/);
+ assert.match(hiddenFoldersJs, /safeActionRunner\.run\('docker-hidden-folders'/);
+ assert.match(hiddenFoldersJs, /queueIfBusy:\s*true/);
+ assert.match(hiddenFoldersJs, /if \(!intent\.isLatest\(\)\) return/);
+ assert.match(hiddenFoldersJs, /pendingIdsOverride = \{ ids: normalizeIds\(nextIds\), expiresAt:/);
+ assert.match(dockerJs, /dockerHiddenFoldersApi\.reconcilePrefs\(applyDockerPinnedFolderPrefsOverride/);
+});
+
+test('hidden parent folders suppress their complete visual branch without changing membership', () => {
+ assert.match(hiddenFoldersJs, /cursor = normalizeParentId\(folder\?\.parentId \|\| folder\?\.parent_id \|\| ''\)/);
+ assert.match(hiddenFoldersJs, /const ownerId = folderId \|\| readFolderOwnerFromRow\(row\)/);
+ assert.match(hiddenFoldersJs, /\$row\.toggleClass\('fv-folder-user-hidden', hidden\)/);
+ assert.match(hiddenFoldersJs, /if \(hidden && getOwnerId\(getFocusedFolderId\(\)\)\) clearFocusedFolder\(\)/);
+});
+
+test('hidden-folder hierarchy resolves explicit ancestors without exposing identities', () => {
+ const prefs = { hiddenFolderIds: ['root', 'root', ''] };
+ const api = hiddenFoldersModule.createApi({
+ getPrefs: () => prefs,
+ getFolders: () => ({ root: {}, child: { parentId: 'root' }, other: {} }),
+ normalizeParentId: (value) => String(value || '')
+ });
+ assert.deepEqual(api.normalizeIds(prefs.hiddenFolderIds), ['root']);
+ assert.equal(api.getOwnerId('child'), 'root');
+ assert.equal(api.getOwnerId('other'), '');
+ assert.deepEqual(api.getSummary().effectiveIds.sort(), ['child', 'root']);
+});
+
+test('newer optimistic hidden-folder intent survives an older preference broadcast', () => {
+ let prefs = { hiddenFolderIds: [] };
+ const emptyCollection = { toggleClass: () => emptyCollection, each: () => emptyCollection };
+ const api = hiddenFoldersModule.createApi({
+ $: () => emptyCollection,
+ getPrefs: () => prefs,
+ setPrefs: (value) => { prefs = value; },
+ normalizePrefs: (value) => ({ ...value, hiddenFolderIds: Array.isArray(value.hiddenFolderIds) ? value.hiddenFolderIds : [] }),
+ getFolders: () => ({ root: {} }),
+ runtimeStateStore: { set: () => {} },
+ safeActionRunner: {
+ run: (_key, _action, settings) => {
+ settings.onIntent({ isLatest: () => true });
+ return new Promise(() => {});
+ }
+ }
+ });
+ void api.hideFolder('root');
+ assert.deepEqual(api.reconcilePrefs({ hiddenFolderIds: [] }).hiddenFolderIds, ['root']);
+});
+
+test('hide offers Undo before deferred persistence resolves', async () => {
+ let prefs = { hiddenFolderIds: [] };
+ let resolveSave;
+ const undoOffers = [];
+ const emptyCollection = { toggleClass: () => emptyCollection, each: () => emptyCollection };
+ const api = hiddenFoldersModule.createApi({
+ $: () => emptyCollection,
+ getPrefs: () => prefs,
+ setPrefs: (value) => { prefs = value; },
+ normalizePrefs: (value) => ({ ...value, hiddenFolderIds: Array.isArray(value.hiddenFolderIds) ? value.hiddenFolderIds : [] }),
+ getFolders: () => ({ root: { name: 'Root' } }),
+ runtimeStateStore: { set: () => {} },
+ safeActionRunner: {
+ run: async (_key, action, settings) => {
+ const intent = { isLatest: () => true };
+ settings.onIntent(intent);
+ return action(intent);
+ }
+ },
+ savePrefs: () => new Promise((resolve) => { resolveSave = resolve; }),
+ offerUndo: (payload) => undoOffers.push(payload)
+ });
+ const pending = api.hideFolder('root');
+ assert.deepEqual(prefs.hiddenFolderIds, ['root']);
+ assert.deepEqual(undoOffers, [{ folderId: 'root', folderName: 'Root' }]);
+ resolveSave({ hiddenFolderIds: ['root'] });
+ assert.equal(await pending, true);
+ assert.equal(undoOffers.length, 1);
+});
+
+test('failed hide dismisses only its optimistic Undo notice', async () => {
+ let prefs = { hiddenFolderIds: [] };
+ const dismissed = [];
+ const emptyCollection = { toggleClass: () => emptyCollection, each: () => emptyCollection };
+ const api = hiddenFoldersModule.createApi({
+ $: () => emptyCollection,
+ getPrefs: () => prefs,
+ setPrefs: (value) => { prefs = value; },
+ normalizePrefs: (value) => ({ ...value, hiddenFolderIds: Array.isArray(value.hiddenFolderIds) ? value.hiddenFolderIds : [] }),
+ getFolders: () => ({ root: { name: 'Root' } }),
+ runtimeStateStore: { set: () => {} },
+ safeActionRunner: {
+ run: async (_key, action, settings) => {
+ const intent = { isLatest: () => true };
+ settings.onIntent(intent);
+ return action(intent);
+ }
+ },
+ savePrefs: async () => { throw new Error('save failed'); },
+ fetchPrefs: async () => ({ hiddenFolderIds: [] }),
+ dismissUndo: (folderId) => dismissed.push(folderId)
+ });
+ assert.equal(await api.hideFolder('root'), false);
+ assert.deepEqual(prefs.hiddenFolderIds, []);
+ assert.deepEqual(dismissed, ['root']);
+});
+
+test('hidden-folder diagnostics retain counts and hash folder identities', () => {
+ assert.match(diagnosticsPhp, /prefs\.hiddenFolders\.\*/);
+ assert.match(diagnosticsPhp, /diagnosticsSupportBundleRedactFolderIdList/);
+ assert.match(pageDiagnosticsJs, /hiddenFolderSelections/);
+ assert.match(pageDiagnosticsJs, /effectivelyHiddenFolders/);
+ assert.match(pageDiagnosticsJs, /revealHiddenFolders/);
+});
diff --git a/tests/docker-preview-overflow-feature.test.mjs b/tests/docker-preview-overflow-feature.test.mjs
index 9f85df68..a423f073 100644
--- a/tests/docker-preview-overflow-feature.test.mjs
+++ b/tests/docker-preview-overflow-feature.test.mjs
@@ -13,6 +13,7 @@ const folderPreviewModelJs = read('src/folderview.plus/usr/local/emhttp/plugins/
const folderEditorSharedJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.shared.js');
const dockerJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js');
const dockerPreviewActionsScript = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.preview-actions.js');
+const dockerChildFolderPreviewMenuJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.child-folder-preview-menu.js');
const sharedRuntimeJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.shared.js');
const dockerRuntimeHierarchyJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.hierarchy.js');
const dockerCss = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/docker.css');
@@ -156,20 +157,36 @@ test('docker runtime applies preview row layout limits and keeps compact preview
assert.match(folderPreviewModelJs, /const formatRuntimeCountLabel = \(startedCount, memberCount\) => \{/);
assert.match(dockerRuntimeHierarchyJs, /previewModelModule\.createChildFolderPreviewModel\(\{/);
assert.match(dockerRuntimeHierarchyJs, /runtimeCountLabel/);
- assert.match(dockerRuntimeHierarchyJs, /const showFolderPreviewContextMenu = \(event, rootId, childId, childName\) => \{/);
- assert.match(dockerRuntimeHierarchyJs, /addAction\('Expand to folder', 'fa-level-down'/);
- assert.match(dockerRuntimeHierarchyJs, /addAction\('Edit folder', 'fa-pencil'/);
- assert.match(dockerRuntimeHierarchyJs, /addAction\('Open folder actions', 'fa-bars'/);
- assert.match(dockerRuntimeHierarchyJs, /addAction\('Open folder actions', 'fa-bars', \(\) => \{[\s\S]*expandFolderPathToChild\(rootId, childId\);[\s\S]*scrollFolderRowIntoView\(childId\);[\s\S]*openFolderActions\(childId\);/);
+ assert.match(dockerChildFolderPreviewMenuJs, /const resolveInputMethod = \(event = null\) => \{/);
+ assert.match(dockerChildFolderPreviewMenuJs, /const resolveActivationPoint = \(event = null, \$item = null\) => \{/);
+ assert.match(dockerChildFolderPreviewMenuJs, /const show = \(options = \{\}\) => \{/);
+ assert.match(dockerChildFolderPreviewMenuJs, /addAction\('Expand to folder', 'fa-level-down'/);
+ assert.match(dockerChildFolderPreviewMenuJs, /addAction\('Edit folder', 'fa-pencil'/);
+ assert.match(dockerChildFolderPreviewMenuJs, /addAction\('Open folder actions', 'fa-bars'/);
+ assert.match(dockerChildFolderPreviewMenuJs, /addAction\('Open folder actions', 'fa-bars', \(\) => \{[\s\S]*expandFolderPathToChild\(rootId, childId\);[\s\S]*scrollFolderRowIntoView\(childId\);[\s\S]*openFolderActions\(childId\);/);
assert.match(dockerRuntimeHierarchyJs, /data-folder-preview-root/);
assert.match(dockerRuntimeHierarchyJs, /data-folder-preview-child/);
assert.match(dockerRuntimeHierarchyJs, /data-folder-preview-depth/);
+ assert.match(dockerRuntimeHierarchyJs, /aria-haspopup="menu"/);
+ assert.match(dockerRuntimeHierarchyJs, /childFolderPreviewMenuApi\?\.show\?\.\(\{/);
+ assert.match(dockerRuntimeHierarchyJs, /click\.fvChildFolderPreviewMenu keydown\.fvChildFolderPreviewMenu/);
+ assert.match(dockerRuntimeHierarchyJs, /contextmenu\.fvChildFolderPreviewMenu/);
+ assert.match(dockerRuntimeHierarchyJs, /recordChildFolderPreviewRender\(\);/);
+ assert.match(dockerRuntimeHierarchyJs, /recordChildFolderPreviewBinding\(\);/);
+ assert.doesNotMatch(dockerRuntimeHierarchyJs, /\$item\.on\('click keydown',[\s\S]*expandFolderPathToChild\(parentId, childId\);/);
assert.match(dockerRuntimeHierarchyJs, /includeChildFolders\s*:\s*shouldHideNestedPreviewItems\(folder\?\.settings \|\| \{\}\)/);
assert.match(dockerRuntimeHierarchyJs, /buildRuntimeContainerMapForFolder\(id, false\)/);
+ assert.match(dockerRuntimeHierarchyJs, /bindDockerNestedPreviewContext\(item, \$tooltipTrigger, entry, folder, id\);/);
+ assert.match(dockerRuntimeHierarchyJs, /auditDockerPreviewContextBridges\(\$preview, folder\?\.settings \|\| \{\}\);/);
+ assert.match(dockerJs, /const bindDockerNestedPreviewContext = \(\$item, \$tooltipTrigger, entry = \{\}, folder = \{\}, folderId = ''\) =>/);
+ assert.match(dockerPreviewActionsScript, /const findDockerNestedPreviewSourceRow = \(entry = \{\}\) =>/);
+ assert.match(dockerPreviewActionsScript, /const bindDockerNestedPreviewContext = \(options = \{\}\) =>/);
+ assert.match(dockerPreviewActionsScript, /findDockerNestedPreviewSourceRow\(options\.entry \|\| \{\}\)/);
+ assert.match(dockerJs, /dockerAdvancedPreviewContextBindersByName\.get\(containerName\)/);
+ assert.match(dockerJs, /bindAdvancedContext\(\$trigger, \{ folder, folderId \}\)/);
assert.match(dockerRuntimeHierarchyJs, /const depthLimit = normalizeChildFolderPreviewDepth\(folder\?\.settings \|\| \{\}\);/);
assert.match(dockerRuntimeHierarchyJs, /for \(const descendant of getFolderPreviewDescendants\(id, depthLimit\)\)/);
assert.doesNotMatch(dockerRuntimeHierarchyJs, /for \(const childId of getFolderChildren\(id\)\) \{[\s\S]*buildChildFolderPreviewItem\(id, childId, childFolder\)/);
- assert.match(dockerRuntimeHierarchyJs, /expandFolderPathToChild\(parentId, childId\);/);
assert.match(dockerJs, /editFolder: \(id\) => editFolder\(id\)/);
assert.match(dockerJs, /openFolderActions: \(id\) => \{/);
assert.match(dockerJs, /const trigger = document\.getElementById\(String\(id \|\| ''\)\.trim\(\)\);/);
@@ -178,6 +195,9 @@ test('docker runtime applies preview row layout limits and keeps compact preview
assert.match(dockerJs, /const clientY = rect \? rect\.top \+ Math\.max\(1, rect\.height \/ 2\) : 0;/);
assert.match(dockerJs, /trigger\.dispatchEvent\(new MouseEvent\('click'/);
assert.match(dockerJs, /clientX,\s*[\r\n]+\s*clientY/);
+ assert.match(dockerJs, /recordChildFolderPreviewMenuOpen: \(details\) => getDockerPreviewActionsApi\(\)\?\.recordChildFolderPreviewMenuOpen\?\.\(details\)/);
+ assert.match(dockerPreviewActionsScript, /childFolderPreview:\s*\{/);
+ assert.match(dockerPreviewActionsScript, /recordChildFolderPreviewMenuOpen\(details = \{\}\) \{/);
assert.match(dockerJs, /addDockerFolderContext\(id\);/);
assert.match(dockerJs, /const maxItemsPerRow = Math\.max\(1,\s*getFolderPreviewItemsPerRow\(settings\)\)/);
assert.match(dockerJs, /const \$measurement = availableWidth > 0/);
diff --git a/tests/docker-runtime-action-bar.test.mjs b/tests/docker-runtime-action-bar.test.mjs
index 2ababeb7..ff9a8b16 100644
--- a/tests/docker-runtime-action-bar.test.mjs
+++ b/tests/docker-runtime-action-bar.test.mjs
@@ -8,6 +8,7 @@ const repoRoot = path.resolve(process.cwd());
const read = (relativePath) => fs.readFileSync(path.join(repoRoot, relativePath), 'utf8');
const dockerJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js');
const actionBarJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.action-bar.js');
+const hiddenFoldersJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.hidden-folders.js');
const require = createRequire(import.meta.url);
const actionBarModule = require(path.join(
repoRoot,
@@ -38,7 +39,9 @@ test('FolderView action bar exposes the complete folder and troubleshooting cont
'Health Issues',
'Manage Folders',
'View',
- 'Tools'
+ 'Tools',
+ 'Hidden folders',
+ 'Restore all hidden folders'
]) {
assert.ok(
actionBarJs.includes(`'${label}'`) || actionBarJs.includes(`>${label}`),
@@ -211,3 +214,29 @@ test('hiding empty folders reconciles an active empty-only filter before renderi
assert.match(actionBarJs, /if \(reconcileFilterWithPrefs\(\)\) applyFilterState\(\)/);
assert.match(actionBarJs, /actionMenuOpen = '';[\s\S]{0,1200}if \(tool === 'reset'\) resetView\(\)/);
});
+
+test('hidden folder recovery remains available outside the hidden runtime rows', () => {
+ assert.match(actionBarJs, /data-fvplus-docker-hidden="toggle-reveal"/);
+ assert.match(actionBarJs, /data-fvplus-docker-hidden="restore-all"/);
+ assert.match(actionBarJs, /All folder rows are hidden\./);
+ assert.match(actionBarJs, /data-fvplus-docker-hidden="undo"/);
+ assert.match(actionBarJs, /fvplus-docker-visibility-button/);
+ assert.match(actionBarJs, /const clearHiddenFolderUndo = \(folderId = ''\) =>/);
+ assert.match(actionBarJs, /setRevealHiddenFolders\(false\)/);
+ assert.doesNotMatch(actionBarJs, /resetView[\s\S]{0,500}restoreAllHiddenFolders/);
+ assert.match(dockerCss, /#docker_list > tr\.fv-folder-user-hidden\s*\{[\s\S]*display:\s*none !important/);
+ assert.match(dockerCss, /body\.fvplus-docker-reveal-hidden #docker_list > tr\.fv-folder-user-hidden/);
+ assert.match(dockerCss, /\.fvplus-docker-visibility-notice > \.fvplus-docker-visibility-button\s*\{[\s\S]*--fvplus-ui-border-subtle[\s\S]*--fvplus-ui-control[\s\S]*--fvplus-ui-text-primary/);
+ assert.match(hiddenFoldersJs, /const restoreAll = async \(\) =>/);
+ assert.match(hiddenFoldersJs, /hiddenFolderIds/);
+});
+
+test('hidden-folder Undo dismissal is scoped to the matching folder', () => {
+ const api = actionBarModule.createApi({
+ window: { addEventListener() {}, setTimeout: () => 1, clearTimeout() {}, Element: null, HTMLElement: null },
+ document: { addEventListener() {}, querySelectorAll: () => [], getElementById: () => null, querySelector: () => null }
+ });
+ api.offerHiddenFolderUndo({ folderId: 'media', folderName: 'Media' });
+ assert.equal(api.clearHiddenFolderUndo('updates'), false);
+ assert.equal(api.clearHiddenFolderUndo('media'), true);
+});
diff --git a/tests/docker-runtime-shared-architecture.test.mjs b/tests/docker-runtime-shared-architecture.test.mjs
index 1edc6fdd..bbab2e95 100644
--- a/tests/docker-runtime-shared-architecture.test.mjs
+++ b/tests/docker-runtime-shared-architecture.test.mjs
@@ -17,6 +17,7 @@ const runtimeSharedDiagnosticsJs = read('src/folderview.plus/usr/local/emhttp/pl
const dockerModulesJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.modules.js');
const dockerRuntimeInfoJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.info.js');
const dockerPreviewActionsJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.preview-actions.js');
+const dockerChildFolderPreviewMenuJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.child-folder-preview-menu.js');
const dockerRuntimeHierarchyJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.hierarchy.js');
const dockerColumnControllerJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.column-controller.js');
const dockerRuntimeActionsJs = read('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.actions.js');
@@ -54,6 +55,7 @@ test('docker runtime page loads shared runtime module before docker modules/runt
const modulesIndex = dockerPage.indexOf('/plugins/folderview.plus/scripts/docker.modules.js');
const runtimeInfoIndex = dockerPage.indexOf('/plugins/folderview.plus/scripts/docker.runtime.info.js');
const previewActionsIndex = dockerPage.indexOf('/plugins/folderview.plus/scripts/docker.runtime.preview-actions.js');
+ const childFolderPreviewMenuIndex = dockerPage.indexOf('/plugins/folderview.plus/scripts/docker.runtime.child-folder-preview-menu.js');
const runtimeHierarchyIndex = dockerPage.indexOf('/plugins/folderview.plus/scripts/docker.runtime.hierarchy.js');
const runtimeActionsIndex = dockerPage.indexOf('/plugins/folderview.plus/scripts/docker.runtime.actions.js');
const hostGuardsIndex = dockerPage.indexOf('/plugins/folderview.plus/scripts/docker.runtime.host-guards.js');
@@ -78,6 +80,7 @@ test('docker runtime page loads shared runtime module before docker modules/runt
assert.ok(modulesIndex >= 0, 'docker modules script include is missing');
assert.ok(runtimeInfoIndex >= 0, 'docker runtime info script include is missing');
assert.ok(previewActionsIndex >= 0, 'docker preview actions script include is missing');
+ assert.ok(childFolderPreviewMenuIndex >= 0, 'child-folder preview menu script include is missing');
assert.ok(runtimeHierarchyIndex >= 0, 'docker hierarchy script include is missing');
assert.ok(runtimeActionsIndex >= 0, 'docker actions script include is missing');
assert.ok(hostGuardsIndex >= 0, 'docker host guards script include is missing');
@@ -106,7 +109,8 @@ test('docker runtime page loads shared runtime module before docker modules/runt
assert.ok(hostAdapterIndex < orderingIndex && orderingIndex < runtimeIndex, 'shared ordering must load after the host adapter and before docker.js');
assert.ok(modulesIndex < runtimeInfoIndex, 'docker.modules.js must load before docker.runtime.info.js');
assert.ok(runtimeInfoIndex < previewActionsIndex, 'docker.runtime.info.js must load before docker.runtime.preview-actions.js');
- assert.ok(previewActionsIndex < runtimeHierarchyIndex, 'docker preview action helpers must load before docker.runtime.hierarchy.js');
+ assert.ok(previewActionsIndex < childFolderPreviewMenuIndex, 'docker preview action helpers must load before child-folder preview menus');
+ assert.ok(childFolderPreviewMenuIndex < runtimeHierarchyIndex, 'child-folder preview menus must load before docker.runtime.hierarchy.js');
assert.ok(runtimeHierarchyIndex < runtimeActionsIndex, 'docker hierarchy helpers must load before docker.runtime.actions.js');
assert.ok(runtimeActionsIndex < hostGuardsIndex, 'docker action helpers must load before docker.runtime.host-guards.js');
assert.ok(hostGuardsIndex < diagnosticsIndex, 'docker host guards must load before docker.runtime.diagnostics.js');
@@ -155,6 +159,10 @@ test('docker extracted helper modules export createApi entry points with safe gl
assert.match(dockerPreviewActionsJs, /root\.FolderViewPlusDockerPreviewActions = factory\(\);/);
assert.match(dockerPreviewActionsJs, /root\.FolderViewPlusDockerPreviewActionsModuleLoaded = true;/);
assert.match(dockerPreviewActionsJs, /const createApi = \(deps = \{\}\) =>/);
+ assert.match(dockerChildFolderPreviewMenuJs, /^\/\/ @ts-check/m);
+ assert.match(dockerChildFolderPreviewMenuJs, /const fallbackWindow = typeof globalThis !== 'undefined'/);
+ assert.match(dockerChildFolderPreviewMenuJs, /root\.FolderViewPlusFoundationModules\.dockerChildFolderPreviewMenu = factory\(\);/);
+ assert.match(dockerChildFolderPreviewMenuJs, /const createApi = \(deps = \{\}\) =>/);
assert.match(dockerRuntimeHierarchyJs, /^\/\/ @ts-check/m);
assert.match(dockerRuntimeHierarchyJs, /const fallbackWindow = typeof globalThis !== 'undefined'/);
assert.match(dockerRuntimeHierarchyJs, /root\.FolderViewPlusDockerRuntimeHierarchy = factory\(\);/);
@@ -213,6 +221,7 @@ test('docker runtime consumes shared state store and guarded async action wrappe
assert.match(dockerJs, /const dockerRuntimeShared = window\.FolderViewDockerRuntimeShared \|\| \{\};/);
assert.match(dockerJs, /const dockerRuntimeInfoModule = window\.FolderViewPlusDockerRuntimeInfo \|\| null;/);
assert.match(dockerJs, /const dockerPreviewActionsModule = window\.FolderViewPlusDockerPreviewActions \|\| null;/);
+ assert.match(dockerJs, /const dockerChildFolderPreviewMenuModule = window\.FolderViewPlusFoundationModules\?\.dockerChildFolderPreviewMenu \|\| null;/);
assert.match(dockerJs, /const dockerRuntimeHierarchyModule = window\.FolderViewPlusDockerRuntimeHierarchy \|\| null;/);
assert.match(dockerJs, /const dockerRuntimeActionsModule = window\.FolderViewPlusDockerRuntimeActions \|\| null;/);
assert.match(dockerJs, /const dockerHostGuardsModule = window\.FolderViewPlusDockerHostGuards \|\| null;/);
diff --git a/tests/folder-editor-route-guard.test.mjs b/tests/folder-editor-route-guard.test.mjs
index 9b0eb9d6..491615b7 100644
--- a/tests/folder-editor-route-guard.test.mjs
+++ b/tests/folder-editor-route-guard.test.mjs
@@ -92,7 +92,7 @@ test('folder editor URLs duplicate folder identity into the hash for navigation-
assert.match(dockerRuntimeActionsJs, /const EDITOR_DEBUG_LAUNCH_STORAGE_KEY = 'fv\.folder\.editor\.debug\.launch\.v1';/);
assert.match(dockerRuntimeActionsJs, /const recordFolderEditorLaunchDebug = \(sourcePage, folderType, id, targetUrl\) =>/);
assert.match(dockerRuntimeActionsJs, /win\.name = `\$\{EDITOR_WINDOW_NAME_PREFIX\}\$\{payload\}`;/);
- assert.match(dockerJs, /const editFolder = \(id\) => \{[\s\S]*actionsApi\.editFolder\(id\);/);
+ assert.match(dockerJs, /const editFolder = \(id, options = \{\}\) => getDockerRuntimeActionsApi\(\)\?\.editFolder\?\.\(id, options\);/);
assert.match(vmJs, /const EDITOR_WINDOW_NAME_PREFIX = 'fv\.folder\.editor\.v1:'/);
assert.match(vmJs, /const EDITOR_BOOTSTRAP_COOKIE_NAME = 'fv_folder_editor_bootstrap';/);
assert.match(vmJs, /const EDITOR_DEBUG_LAUNCH_STORAGE_KEY = 'fv\.folder\.editor\.debug\.launch\.v1';/);
diff --git a/tests/folder-editor-settings-contract.test.mjs b/tests/folder-editor-settings-contract.test.mjs
index 476f1cee..847d65bf 100644
--- a/tests/folder-editor-settings-contract.test.mjs
+++ b/tests/folder-editor-settings-contract.test.mjs
@@ -66,7 +66,9 @@ test('modern folder editor schema fields all exist in the page markup and metada
test('modern folder editor load path covers every schema-backed field', () => {
assert.match(folderJs, /populateParentFolderOptions\(/);
- const fieldsLoadedViaBinding = schemaFields.filter((fieldName) => fieldName !== 'parent_folder_id');
+ const fieldsLoadedViaBinding = schemaFields.filter(
+ (fieldName) => !['parent_folder_id', 'webui_profiles'].includes(fieldName)
+ );
fieldsLoadedViaBinding.forEach((fieldName) => {
assert.match(
folderJs,
@@ -74,6 +76,7 @@ test('modern folder editor load path covers every schema-backed field', () => {
`Expected modern folder editor loader to bind ${fieldName}.`
);
});
+ assert.match(folderJs, /getFolderWebuiProfilesApi\(\)\?\.hydrate\(normalizedFolder\.settings\.webui_profiles/);
assert.match(folderJs, /const getFolderEditorStateApi = \(\) =>/);
assert.match(folderJs, /const restoreSectionSavedValues = \(sectionKey\) => \{\s*getFolderEditorStateApi\(\)\?\.restoreSectionSavedValues\(sectionKey\);\s*\};/);
diff --git a/tests/folder-settings-transfer.test.mjs b/tests/folder-settings-transfer.test.mjs
index c5b57113..9d064b95 100644
--- a/tests/folder-settings-transfer.test.mjs
+++ b/tests/folder-settings-transfer.test.mjs
@@ -62,7 +62,8 @@ test('folder settings transfer copies only safe settings payload fields', () =>
icon: 'folder.png',
settings: {
preview: 2,
- override_default_actions: true
+ override_default_actions: true,
+ webui_profiles: [{ id: 'media', name: 'Media', containers: ['one'] }]
},
actions: [
{ type: 1, name: 'Script action', script: 'echo ok' },
@@ -77,6 +78,7 @@ test('folder settings transfer copies only safe settings payload fields', () =>
assert.deepEqual(Object.keys(entry.payload).sort(), ['actions', 'icon', 'settings']);
assert.equal(entry.payload.icon, 'folder.png');
assert.equal(entry.payload.settings.preview, 2);
+ assert.equal(entry.payload.settings.webui_profiles, undefined);
assert.equal(entry.payload.actions.length, 1);
assert.equal(entry.payload.actions[0].name, 'Script action');
assert.deepEqual(Array.from(entry.meta.omittedTopLevelKeys), ['name', 'parentId', 'regex', 'containers', 'id', 'createdAt', 'updatedAt']);
diff --git a/tests/folder-webui-profiles.test.mjs b/tests/folder-webui-profiles.test.mjs
new file mode 100644
index 00000000..a9bfe03e
--- /dev/null
+++ b/tests/folder-webui-profiles.test.mjs
@@ -0,0 +1,61 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const profiles = require('../src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.webui-profiles.js');
+
+test('normalizes profile identities, names, and selected members', () => {
+ const normalized = profiles.normalizeProfiles([
+ { id: 'media', name: ' Media ', containers: ['Plex', 'Plex', '', 'Tautulli'] },
+ { id: 'media', name: '', members: ['Overseerr'] },
+ null
+ ]);
+ assert.deepEqual(normalized, [
+ { id: 'media', name: 'Media', containers: ['Plex', 'Tautulli'] },
+ { id: 'media-2', name: 'Profile 2', containers: ['Overseerr'] }
+ ]);
+});
+
+test('resolves only currently eligible selected WebUIs and deduplicates URLs', () => {
+ const result = profiles.collectProfileTargets({
+ id: 'media', name: 'Media', containers: ['Plex', 'Tautulli', 'Missing', 'Stopped']
+ }, {
+ Plex: { name: 'Plex', state: true, pause: false, webui: 'http://plex/' },
+ Tautulli: { state: true, pause: false, WebUi: 'http://plex/' },
+ Stopped: { state: false, pause: false, webui: 'http://stopped/' },
+ Other: { state: true, pause: false, webui: 'http://other/' }
+ }, {
+ getSafeWebuiUrl: (value) => /^https?:/.test(value) ? value : '',
+ runningOnly: true
+ });
+ assert.deepEqual(result.urls, ['http://plex/']);
+ assert.equal(result.selectedCount, 4);
+ assert.equal(result.eligibleCount, 1);
+ assert.equal(result.unavailableCount, 1);
+});
+
+test('renames profile targets and strips profiles from transferable settings', () => {
+ assert.deepEqual(profiles.renameProfileMember([
+ { id: 'media', name: 'Media', containers: ['Plex', 'Tautulli'] }
+ ], 'Plex', 'Plex-Media'), [
+ { id: 'media', name: 'Media', containers: ['Plex-Media', 'Tautulli'] }
+ ]);
+ assert.deepEqual(profiles.stripProfilesFromSettings({
+ preview: 2,
+ webui_profiles: [{ id: 'media' }],
+ webuiProfiles: [{ id: 'legacy' }]
+ }), { preview: 2 });
+});
+
+test('diagnostic summary contains counts only', () => {
+ assert.deepEqual(profiles.summarizeProfiles([
+ { id: 'media', name: 'Media', containers: ['Plex', 'Missing'] }
+ ], ['Plex']), {
+ profileCount: 1,
+ selectedReferenceCount: 2,
+ unavailableReferenceCount: 1,
+ duplicateProfileIdCount: 0,
+ invalidProfileCount: 0
+ });
+});
diff --git a/tests/folderviewplus-utils.test.mjs b/tests/folderviewplus-utils.test.mjs
index e1f9de60..013006d9 100644
--- a/tests/folderviewplus-utils.test.mjs
+++ b/tests/folderviewplus-utils.test.mjs
@@ -202,6 +202,24 @@ test('normalizeFolderMap rejects prototype keys and unsafe identifiers', () => {
assert.equal(utils.normalizeFolderId('bad/id'), '');
});
+test('normalizeFolderMap rejects non-string names and members without coercion', () => {
+ const nonCoercible = { toString: 0 };
+ const normalized = utils.normalizeFolderMap({
+ unsafe: {
+ name: nonCoercible,
+ containers: []
+ },
+ safe: {
+ name: ' Safe ',
+ containers: [' plex ', nonCoercible, 42, 'plex', 'sonarr']
+ }
+ });
+
+ assert.deepEqual(Object.keys(normalized), ['safe']);
+ assert.equal(normalized.safe.name, 'Safe');
+ assert.deepEqual(normalized.safe.containers, ['plex', 'sonarr']);
+});
+
test('normalizeFolderMembers is exported and normalizes arrays/objects', () => {
assert.equal(typeof utils.normalizeFolderMembers, 'function');
assert.deepEqual(
@@ -503,20 +521,29 @@ test('orderFoldersByPrefs keeps child folders nested after parent in sorted outp
test('getFolderStatusColors normalizes and defaults values', () => {
const defaults = utils.getFolderStatusColors({});
assert.deepEqual(defaults, {
- started: '#ffffff',
+ started: '#55b72d',
paused: '#b8860b',
- stopped: '#ff4d4d'
+ stopped: '#ff4d4d',
+ text: '#ffffff'
});
+ assert.equal(utils.getFolderStatusColors({ status_color_started: '#ffffff' }).started, '#55b72d');
+ assert.equal(utils.getFolderStatusColors({
+ status_color_started: '#ffffff',
+ status_color_started_explicit: true
+ }).started, '#ffffff');
+
const custom = utils.getFolderStatusColors({
status_color_started: '#AbC',
status_color_paused: '#123456',
- status_color_stopped: 'bad-value'
+ status_color_stopped: 'bad-value',
+ status_color_text: '#fed'
});
assert.deepEqual(custom, {
started: '#aabbcc',
paused: '#123456',
- stopped: '#ff4d4d'
+ stopped: '#ff4d4d',
+ text: '#ffeedd'
});
});
@@ -931,7 +958,11 @@ test('buildImportDiffRows reports row-level changed fields', () => {
test('export/import roundtrip smoke works for full payload', () => {
const original = {
- abc: { name: 'One', containers: ['x'] },
+ abc: {
+ name: 'One',
+ containers: ['x'],
+ settings: { webui_profiles: [{ id: 'tools', name: 'Tools', containers: ['x'] }] }
+ },
def: { name: 'Two', containers: [] }
};
const exported = utils.buildFullExportPayload({
@@ -945,6 +976,7 @@ test('export/import roundtrip smoke works for full payload', () => {
assert.deepEqual(Object.keys(parsed.folders), ['abc', 'def']);
assert.equal(parsed.folders.abc.name, 'One');
assert.deepEqual(parsed.folders.abc.containers, ['x']);
+ assert.deepEqual(parsed.folders.abc.settings.webui_profiles, original.abc.settings.webui_profiles);
assert.equal(parsed.folders.def.name, 'Two');
assert.deepEqual(parsed.folders.def.containers, []);
@@ -986,12 +1018,14 @@ test('getConflictReport detects multi-folder assignment conflicts', () => {
assert.equal(plex.matchedFolderCount, 2);
});
-test('normalizePrefs keeps pinned folders and hide-empty toggle', () => {
+test('normalizePrefs keeps pinned, hidden, and hide-empty folder preferences', () => {
const prefs = utils.normalizePrefs({
pinnedFolderIds: ['a', 'b', 'a', '', 'c'],
+ hiddenFolderIds: ['hidden-a', 'hidden-b', 'hidden-a', ''],
hideEmptyFolders: true
});
assert.deepEqual(prefs.pinnedFolderIds, ['a', 'b', 'c']);
+ assert.deepEqual(prefs.hiddenFolderIds, ['hidden-a', 'hidden-b']);
assert.equal(prefs.hideEmptyFolders, true);
});
diff --git a/tests/localization-roadmap.test.mjs b/tests/localization-roadmap.test.mjs
index ef860eb0..1beb3001 100644
--- a/tests/localization-roadmap.test.mjs
+++ b/tests/localization-roadmap.test.mjs
@@ -75,7 +75,7 @@ test('catalog report exposes honest legacy and namespace coverage for every regi
assert.ok(report.sourceMessageCount > 1900);
assert.equal(report.namespaceCount, 10);
assert.equal(report.extraction.candidateCount, 0);
- assert.equal(report.extraction.autoBoundMessageCount, 1574);
+ assert.equal(report.extraction.autoBoundMessageCount, 1579);
assert.equal(report.extraction.catalogMessageCount, report.sourceMessageCount);
assert.equal(Object.keys(report.locales).length, 27);
assert.equal(report.locales.en.coveragePercent, 100);
diff --git a/tests/localization-surface-coverage.test.mjs b/tests/localization-surface-coverage.test.mjs
index 060c7cba..e038ae03 100644
--- a/tests/localization-surface-coverage.test.mjs
+++ b/tests/localization-surface-coverage.test.mjs
@@ -19,7 +19,7 @@ test('every detected legacy UI phrase is represented by one stable generated key
const english = messagesOnly(readJson(path.join(namespacesRoot, 'en/legacy-surface.json')));
const expected = Object.fromEntries([...surface.byPhrase.keys()].sort().map((phrase) => [surfaceTools.keyForPhrase(phrase), phrase]));
- assert.equal(surface.byPhrase.size, 1574);
+ assert.equal(surface.byPhrase.size, 1579);
assert.deepEqual(english, expected);
assert.equal(new Set(Object.keys(english)).size, surface.byPhrase.size);
});
@@ -49,8 +49,8 @@ test('the extraction report and runtime enforce zero-debt initial and dynamic co
assert.equal(report['catalog-version'], '2026.08.10.1');
assert.equal(report['candidate-count'], 0);
- assert.equal(report['auto-bound-message-count'], 1574);
- assert.equal(report['catalog-message-count'], 2122);
+ assert.equal(report['auto-bound-message-count'], 1579);
+ assert.equal(report['catalog-message-count'], 2168);
assert.match(runtime, /rebuildAutoPhraseIndex/);
assert.match(runtime, /resolveAutoTranslation/);
assert.match(runtime, /observeDynamicTranslations/);
diff --git a/tests/member-identity-reconciliation.test.mjs b/tests/member-identity-reconciliation.test.mjs
index 0795b43a..08028851 100644
--- a/tests/member-identity-reconciliation.test.mjs
+++ b/tests/member-identity-reconciliation.test.mjs
@@ -23,7 +23,10 @@ test('a uniquely identified renamed Docker member keeps folder state and action
mountDestinations: ['/config', '/tv']
}
},
- actions: [{ type: 0, containers: ['old-name'], conatiners: ['old-name'] }]
+ actions: [{ type: 0, containers: ['old-name'], conatiners: ['old-name'] }],
+ settings: {
+ webui_profiles: [{ id: 'media', name: 'Media tools', containers: ['old-name'] }]
+ }
}
};
const runtime = {
@@ -41,6 +44,7 @@ test('a uniquely identified renamed Docker member keeps folder state and action
assert.deepEqual(result.folders.media.hiddenPreviewMembers, ['new-name']);
assert.deepEqual(result.folders.media.actions[0].containers, ['new-name']);
assert.deepEqual(result.folders.media.actions[0].conatiners, ['new-name']);
+ assert.deepEqual(result.folders.media.settings.webui_profiles[0].containers, ['new-name']);
assert.equal(result.diagnostics.renamed, 1);
assert.equal(result.patches.media.renames['old-name'], 'new-name');
});
diff --git a/tests/package-trust-security.test.mjs b/tests/package-trust-security.test.mjs
index 9962e28c..75f81936 100644
--- a/tests/package-trust-security.test.mjs
+++ b/tests/package-trust-security.test.mjs
@@ -29,7 +29,9 @@ test('manifest and sidecar bind the current core package with SHA-256', () => {
});
test('stable release publishes pinned provenance and SBOM attestations', () => {
- assert.match(workflow, /permissions:\s*\n\s*contents:\s*write\s*\n\s*id-token:\s*write\s*\n\s*attestations:\s*write/);
+ assert.match(workflow, /^permissions:\s*\n contents:\s*read\s*$/m);
+ const releaseJob = workflow.match(/^ release:\s*$([\s\S]*?)(?=^ [A-Za-z0-9_-]+:\s*$|(?![\s\S]))/m)?.[1] || '';
+ assert.match(releaseJob, /permissions:\s*\n\s*contents:\s*write\s*\n\s*id-token:\s*write\s*\n\s*attestations:\s*write/);
const attestUses = workflow.match(/uses:\s*actions\/attest@[0-9a-f]{40}\s+# v4\.2\.0/g) || [];
assert.equal(attestUses.length, 2);
assert.match(workflow, /Attest release archive provenance[\s\S]*subject-path:[\s\S]*archive[\s\S]*checksum/);
diff --git a/tests/performance-optimizations.test.mjs b/tests/performance-optimizations.test.mjs
index 7cc17f3b..5fd59220 100644
--- a/tests/performance-optimizations.test.mjs
+++ b/tests/performance-optimizations.test.mjs
@@ -400,7 +400,8 @@ test('docker preview popup runtime stays enabled behind lazy advanced-preview in
assert.match(dockerJs, /initializeDockerTooltipOnDemand\(\$\(tooltip_trigger_element\), \(\) => \$\(tooltip_trigger_element\)\.tooltipster\(\{/);
assert.match(dockerJs, /\}\), triggerMode === 'hover'\);/);
assert.match(dockerJs, /if \(DOCKER_PREVIEW_POPUP_ENABLED !== true\) \{\s*return;\s*\}/);
- assert.match(dockerJs, /if\(DOCKER_PREVIEW_POPUP_ENABLED && tooltip_trigger_element && tooltip_trigger_element\.length > 0\) \{/);
+ assert.match(dockerJs, /const bindAdvancedPreviewContext = \(\$contextTrigger, context = \{\}\) =>/);
+ assert.match(dockerJs, /if\(DOCKER_PREVIEW_POPUP_ENABLED && tooltipTarget\.length > 0\) \{/);
});
test('docker first paint keeps a lightweight loading shell and enriches state payload fields', () => {
diff --git a/tests/phase6-php-decomposition.test.mjs b/tests/phase6-php-decomposition.test.mjs
index dea83e82..43c51797 100644
--- a/tests/phase6-php-decomposition.test.mjs
+++ b/tests/phase6-php-decomposition.test.mjs
@@ -40,7 +40,7 @@ test('Phase 6 preserves the complete public endpoint manifest', () => {
});
test('facades load every contracted PHP module without retaining extracted implementations', () => {
- assert.equal(architecture.serverModuleContracts.length, 29);
+ assert.equal(architecture.serverModuleContracts.length, 30);
for (const contract of architecture.serverModuleContracts) {
const loader = contract.loadedBy === 'server/lib.php'
? coreFacade
@@ -56,7 +56,7 @@ test('facades load every contracted PHP module without retaining extracted imple
test('decomposition preserves every historical public PHP function name', () => {
const expected = {
- 'server/lib.php': { count: 332, sha256: '3402a8afdb4a90878b5a5cc26284075606051f35819e2859df9bc23a2b8612c3' },
+ 'server/lib.php': { count: 337, sha256: 'bfa36d3deb8611f25234f639c900b8a97d50c3567a11d3b6f1c70339f4d93d04' },
'server/lib.diagnostics.php': { count: 74, sha256: 'a1d008eb74affc973be697a63837347f992ff932591d6aa630b2a4d022a24b1a' },
'server/upload_custom_icon.php': { count: 56, sha256: '825b3fbb5288c76f83a4976a55967e8a9a205e5496581f3a0c842789083f530e' }
};
diff --git a/tests/phase8-test-runner-decomposition.test.mjs b/tests/phase8-test-runner-decomposition.test.mjs
index 602aa972..f726e308 100644
--- a/tests/phase8-test-runner-decomposition.test.mjs
+++ b/tests/phase8-test-runner-decomposition.test.mjs
@@ -20,8 +20,8 @@ test('Phase 8 runner contract preserves deterministic fixture intent inventory',
cwd: rootDir,
encoding: 'utf8'
});
- assert.match(output, /43 ordered fixture cases/);
- assert.equal(contract.intent.fixture.assertionCount, 557);
+ assert.match(output, /49 ordered fixture cases/);
+ assert.equal(contract.intent.fixture.assertionCount, 617);
});
test('Phase 8 change classification covers every extracted runner family', async () => {
diff --git a/tests/runtime-page-diagnostics.test.mjs b/tests/runtime-page-diagnostics.test.mjs
index b7374f18..c141adaf 100644
--- a/tests/runtime-page-diagnostics.test.mjs
+++ b/tests/runtime-page-diagnostics.test.mjs
@@ -18,13 +18,24 @@ const createFixture = () => {
const nodes = {
'tr': [{}, {}],
'.folder, .folder-showcase-outer': [{}],
+ '.folder.fv-folder-hidden-revealed': [{}, {}],
'.folder[expanded="true"], .folder-showcase-outer[expanded="true"]': [{}],
'.folder-preview-wrapper, .folder-element-docker, .folder-element-vm': [{}, {}, {}],
'.spinner, .fv-runtime-loading-row, [aria-busy="true"]': [],
'.fa-spin, .fa-spinner, .fa-circle-o-notch': [{}],
'.error, .invalid, [aria-invalid="true"]': []
};
- const host = { clientWidth: 100, scrollWidth: 120, querySelectorAll: (selector) => nodes[selector] || [] };
+ const bodyAttributes = new Map([
+ ['data-fvplus-docker-hidden-explicit', '2'],
+ ['data-fvplus-docker-hidden-effective', '3'],
+ ['data-fvplus-docker-hidden-reveal', 'true']
+ ]);
+ const host = {
+ clientWidth: 100,
+ scrollWidth: 120,
+ querySelectorAll: (selector) => nodes[selector] || [],
+ getAttribute: (name) => bodyAttributes.get(name) || null
+ };
const document = {
body: host,
documentElement: { clientWidth: 1200, scrollWidth: 1200 },
@@ -55,6 +66,10 @@ test('runtime page diagnostics captures allowlisted aggregate state only', () =>
});
assert.equal(snapshot.state.visibleRows, 2);
assert.equal(snapshot.state.spinningControls, 1);
+ assert.equal(snapshot.state.hiddenFolderSelections, 2);
+ assert.equal(snapshot.state.effectivelyHiddenFolders, 3);
+ assert.equal(snapshot.state.revealedHiddenFolderRows, 2);
+ assert.equal(snapshot.state.revealHiddenFolders, true);
assert.equal(snapshot.state.horizontalOverflow, true);
assert.equal(snapshot.viewport.widthBucket, '1025-1440');
const serialized = JSON.stringify(snapshot);
diff --git a/tests/runtime-theme-token-guard.test.mjs b/tests/runtime-theme-token-guard.test.mjs
index 8c42868c..dbe1c559 100644
--- a/tests/runtime-theme-token-guard.test.mjs
+++ b/tests/runtime-theme-token-guard.test.mjs
@@ -49,9 +49,9 @@ test('runtime css defines canonical fvplus status tokens and legacy graph aliase
});
test('status state classes resolve through css variables instead of hardcoded runtime values', () => {
- assert.match(dockerCss, /span\.folder-state\.fv-folder-state-started\s*\{[\s\S]*var\(--fvplus-folder-status-started,\s*var\(--fvplus-status-started\)\)/);
+ assert.match(dockerCss, /span\.folder-state\.fv-folder-state-started\s*\{[\s\S]*var\(--fvplus-folder-status-text,\s*#ffffff\)/);
assert.match(dockerCss, /i\.folder-load-status\.started\s*\{[\s\S]*var\(--fvplus-folder-status-started,\s*var\(--fvplus-status-started\)\)/);
- assert.match(vmCss, /span\.folder-state\.fv-folder-state-started\s*\{[\s\S]*var\(--fvplus-folder-status-started,\s*var\(--fvplus-status-started\)\)/);
+ assert.match(vmCss, /span\.folder-state\.fv-folder-state-started\s*\{[\s\S]*var\(--fvplus-folder-status-text,\s*#ffffff\)/);
assert.match(vmCss, /i\.folder-load-status\.started\s*\{[\s\S]*var\(--fvplus-folder-status-started,\s*var\(--fvplus-status-started\)\)/);
});
@@ -95,6 +95,8 @@ test('runtime context menus follow resolved dark and light theme tokens', () =>
test('runtime scripts avoid inline status color painting and use row-level css variable overrides', () => {
assert.match(sharedRuntimeJs, /const FOLDER_STATUS_COLOR_STYLE_PROPS = Object\.freeze/);
+ assert.match(sharedRuntimeJs, /text:\s*'--fvplus-folder-status-text'/);
+ assert.match(sharedRuntimeJs, /text:\s*normalizeStatusHexColor\(source\.status_color_text,\s*DEFAULT_FOLDER_STATUS_COLORS\.text\)/);
assert.match(sharedRuntimeJs, /const applyFolderStatusColorOverrides = \(\$folderRow, settings\) =>/);
assert.match(dockerJs, /applyFolderStatusColorOverrides\(\$folderRow,\s*folder\.settings\)/);
assert.match(vmJs, /const applyFolderStatusColorOverrides = typeof runtimeShared\.applyFolderStatusColorOverrides === 'function'/);
@@ -104,6 +106,7 @@ test('runtime scripts avoid inline status color painting and use row-level css v
assert.match(dashboardJs, /const resolveDashboardFolderStatusColors = \(settings\) => \{/);
assert.match(dashboardJs, /started:\s*'var\(--fvplus-folder-status-started,\s*var\(--fvplus-status-started,\s*var\(--fvplus-theme-foreground,\s*currentColor\)\)\)'/);
assert.match(dashboardJs, /const statusColors = resolveDashboardFolderStatusColors\(folder\.settings\);/);
+ assert.match(dashboardJs, /\$statusText\.text\([^;]+\)\.css\('color',\s*statusColors\.text\)/);
});
test('theme-change observers trigger deterministic reflow across runtime and settings surfaces', () => {
@@ -253,6 +256,7 @@ test('runtime and settings overlays resolve through theme tokens instead of hard
assert.match(dockerCss, /\.fv-preview-status-started\s*\{[^}]*var\(--fvplus-folder-status-started,\s*var\(--fvplus-status-started\)\)/);
assert.match(dockerCss, /\.fv-preview-status-paused\s*\{[^}]*var\(--fvplus-folder-status-paused,\s*var\(--fvplus-status-paused\)\)/);
assert.match(dockerCss, /\.fv-preview-status-stopped\s*\{[^}]*var\(--fvplus-folder-status-stopped,\s*var\(--fvplus-status-stopped\)\)/);
+ assert.match(dockerCss, /\.folder-preview \.fv-preview-status-compact \.state,[\s\S]*var\(--fvplus-folder-status-text,\s*#ffffff\)/);
assert.match(cspUtilitiesCss, /\.fv-popup-guide\s*\{[^}]*color:\s*var\(--fvplus-runtime-menu-fg,\s*var\(--fvplus-theme-foreground,\s*currentColor\)\)/);
assert.match(cspUtilitiesCss, /\.fv-popup-panel\s*\{[^}]*background:\s*var\(--fvplus-runtime-menu-header-bg,\s*transparent\)/);
assert.doesNotMatch(dockerRuntimeActionsJs, /color:\s*#e8edf7/);
diff --git a/tests/security-property-fuzz.test.mjs b/tests/security-property-fuzz.test.mjs
new file mode 100644
index 00000000..2cf6e131
--- /dev/null
+++ b/tests/security-property-fuzz.test.mjs
@@ -0,0 +1,143 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { createRequire } from 'node:module';
+import fc from 'fast-check';
+import {
+ compareSanitizedSupportBundles,
+ renderSupportBundleComparisonMarkdown
+} from '../scripts/lib/support_bundle_compare.mjs';
+
+const require = createRequire(import.meta.url);
+const imageFallbacks = require('../src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/runtime.image-fallbacks.js');
+globalThis.FolderViewPlusFoundationModules = { imageFallbacks };
+const utils = require('../src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.utils.js');
+const containerModel = require('../src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.container-model.js');
+const hierarchy = require('../src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.hierarchy.js').createApi();
+
+const FUZZ_OPTIONS = Object.freeze({ numRuns: 250 });
+
+const folderRecordArbitrary = fc.record({
+ name: fc.oneof(fc.string({ maxLength: 80 }), fc.jsonValue()),
+ icon: fc.oneof(fc.string({ maxLength: 9000 }), fc.jsonValue()),
+ parentId: fc.oneof(fc.string({ maxLength: 80 }), fc.jsonValue()),
+ containers: fc.oneof(
+ fc.array(fc.jsonValue(), { maxLength: 40 }),
+ fc.dictionary(fc.string({ maxLength: 40 }), fc.boolean(), { maxKeys: 40 }),
+ fc.jsonValue()
+ ),
+ settings: fc.jsonValue(),
+ actions: fc.oneof(fc.array(fc.jsonValue(), { maxLength: 240 }), fc.jsonValue())
+});
+
+test('fast-check: folder normalization preserves identifier and collection safety invariants', () => {
+ fc.assert(fc.property(
+ fc.dictionary(fc.string({ maxLength: 80 }), folderRecordArbitrary, { maxKeys: 50 }),
+ (source) => {
+ const normalized = utils.normalizeFolderMap(source);
+ assert.equal(Object.getPrototypeOf(normalized), Object.prototype);
+ for (const [id, folder] of Object.entries(normalized)) {
+ assert.equal(utils.normalizeFolderId(id), id);
+ assert.notEqual(id, '__proto__');
+ assert.notEqual(id, 'constructor');
+ assert.equal(folder.name, folder.name.trim());
+ assert.notEqual(folder.name, '');
+ assert.ok(Array.isArray(folder.containers));
+ assert.deepEqual(folder.containers, [...new Set(folder.containers)]);
+ assert.ok(folder.containers.every((value) => typeof value === 'string' && value.trim() !== ''));
+ assert.ok(Array.isArray(folder.actions));
+ assert.ok(folder.actions.length <= 200);
+ assert.equal(typeof folder.settings, 'object');
+ assert.equal(Array.isArray(folder.settings), false);
+ }
+ }
+ ), FUZZ_OPTIONS);
+});
+
+test('fast-check: import parsing is total for arbitrary JSON and returns a bounded contract', () => {
+ fc.assert(fc.property(
+ fc.jsonValue(),
+ fc.constantFrom('docker', 'vm'),
+ (payload, expectedType) => {
+ const parsed = utils.parseImportPayload(payload, expectedType);
+ assert.equal(typeof parsed, 'object');
+ assert.equal(typeof parsed.ok, 'boolean');
+ if (parsed.ok) {
+ assert.equal(typeof parsed.folders, 'object');
+ assert.equal(Array.isArray(parsed.folders), false);
+ assert.ok(Object.keys(parsed.folders).every((id) => utils.normalizeFolderId(id) === id));
+ } else {
+ assert.equal(typeof parsed.error, 'string');
+ assert.notEqual(parsed.error.trim(), '');
+ }
+ }
+ ), FUZZ_OPTIONS);
+});
+
+test('fast-check: cyclic folder graphs produce bounded descendant sets', () => {
+ fc.assert(fc.property(
+ fc.array(fc.integer({ min: -1, max: 40 }), { minLength: 1, maxLength: 40 }),
+ fc.nat(),
+ (parentIndexes, rootSeed) => {
+ const ids = parentIndexes.map((_value, index) => `folder-${index}`);
+ const folders = Object.fromEntries(ids.map((id, index) => {
+ const parentIndex = parentIndexes[index];
+ const parentId = parentIndex >= 0 ? ids[parentIndex % ids.length] : '';
+ return [id, { name: id, parentId }];
+ }));
+ const rootId = ids[rootSeed % ids.length];
+ const descendants = hierarchy.computeFolderDescendantIds(folders, rootId);
+ assert.ok(descendants instanceof Set);
+ assert.equal(descendants.has(rootId), false);
+ assert.ok(descendants.size <= ids.length - 1);
+ assert.ok([...descendants].every((id) => Object.hasOwn(folders, id)));
+ }
+ ), FUZZ_OPTIONS);
+});
+
+test('fast-check: Docker container normalization returns immutable bounded structures', () => {
+ fc.assert(fc.property(
+ fc.dictionary(fc.string({ maxLength: 40 }), fc.jsonValue(), { maxKeys: 50 }),
+ fc.string({ maxLength: 40 }),
+ (entry, source) => {
+ const normalized = containerModel.normalizeContainer(entry, { source });
+ assert.equal(normalized.schemaVersion, 1);
+ assert.ok(Object.isFrozen(normalized));
+ assert.ok(Object.isFrozen(normalized.names));
+ assert.ok(Object.isFrozen(normalized.ports));
+ assert.ok(Object.isFrozen(normalized.mounts));
+ assert.equal(normalized.name.startsWith('/'), false);
+ assert.ok(normalized.ports.every((port) => Object.isFrozen(port)));
+ assert.ok(normalized.mounts.every((mount) => Object.isFrozen(mount)));
+ }
+ ), FUZZ_OPTIONS);
+});
+
+test('fast-check: support-bundle comparison omits values behind sensitive keys', () => {
+ fc.assert(fc.property(
+ fc.stringMatching(/^[a-zA-Z0-9]{1,32}$/),
+ fc.nat({ max: 10000 }),
+ fc.nat({ max: 10000 }),
+ (suffix, leftCount, rightCount) => {
+ const marker = `private-${suffix}`;
+ const makeBundle = (folderCount) => ({
+ bundleMeta: { privacyMode: 'sanitized', schemaVersion: 2 },
+ pluginState: {
+ folderCount,
+ folderName: marker,
+ configPath: marker,
+ sourceUrl: marker,
+ ipAddress: marker,
+ accessToken: marker,
+ sessionCookie: marker,
+ machineUuid: marker
+ },
+ redactionManifest: { mode: 'sanitized', hashedCount: 8 }
+ });
+ const report = compareSanitizedSupportBundles(makeBundle(leftCount), makeBundle(rightCount));
+ const rendered = renderSupportBundleComparisonMarkdown(report);
+ assert.doesNotMatch(JSON.stringify(report), new RegExp(marker));
+ assert.doesNotMatch(rendered, new RegExp(marker));
+ assert.ok(report.differences.every((row) => !/(name|path|url|ip|token|cookie|uuid)/i.test(row.path)));
+ }
+ ), FUZZ_OPTIONS);
+});
diff --git a/tests/security-release-contract.test.mjs b/tests/security-release-contract.test.mjs
index 380d222d..ab880ccc 100644
--- a/tests/security-release-contract.test.mjs
+++ b/tests/security-release-contract.test.mjs
@@ -16,6 +16,52 @@ test('CodeQL scans dev and main for pushes and pull requests', () => {
assert.match(workflow, /workflow_dispatch:/);
assert.match(workflow, /queries: security-extended,security-and-quality/);
assert.equal((workflow.match(/github\/codeql-action\/(?:init|autobuild|analyze)@[0-9a-f]{40}\s+# v4/g) || []).length, 3);
+ assert.match(workflow, /^permissions:\s*\n actions:\s*read\s*\n contents:\s*read\s*$/m);
+ const analyzeJob = workflow.match(/^ analyze:\s*$([\s\S]*?)(?=^ [A-Za-z0-9_-]+:\s*$|(?![\s\S]))/m)?.[1] || '';
+ assert.match(analyzeJob, /permissions:\s*\n\s*actions:\s*read\s*\n\s*contents:\s*read\s*\n\s*security-events:\s*write/);
+});
+
+test('write-capable workflows keep top-level permissions read-only and scope writes to jobs', () => {
+ const contracts = [
+ {
+ file: 'backmerge-main-to-dev.yml',
+ job: 'backmerge',
+ permissionPattern: /permissions:\s*\n\s*contents:\s*write\s*\n\s*pull-requests:\s*write/
+ },
+ {
+ file: 'release-on-main.yml',
+ job: 'release',
+ permissionPattern: /permissions:\s*\n\s*contents:\s*write\s*\n\s*id-token:\s*write\s*\n\s*attestations:\s*write/
+ },
+ {
+ file: 'clone-traffic-badge.yml',
+ job: 'publish',
+ permissionPattern: /permissions:\s*\n\s*contents:\s*write/
+ }
+ ];
+ for (const contract of contracts) {
+ const workflow = read(path.join('.github', 'workflows', contract.file));
+ assert.match(workflow, /^permissions:\s*\n contents:\s*read\s*$/m, contract.file);
+ const job = workflow.match(new RegExp(`^ ${contract.job}:\\s*$([\\s\\S]*?)(?=^ [A-Za-z0-9_-]+:\\s*$|(?![\\s\\S]))`, 'm'))?.[1] || '';
+ assert.match(job, contract.permissionPattern, contract.file);
+ }
+});
+
+test('clone traffic credential is isolated from metrics branch publication', () => {
+ const workflow = read('.github/workflows/clone-traffic-badge.yml');
+ const collectJob = workflow.match(/^ collect:\s*$([\s\S]*?)(?=^ [A-Za-z0-9_-]+:\s*$|(?![\s\S]))/m)?.[1] || '';
+ const publishJob = workflow.match(/^ publish:\s*$([\s\S]*?)(?=^ [A-Za-z0-9_-]+:\s*$|(?![\s\S]))/m)?.[1] || '';
+ assert.match(collectJob, /secrets\.FVPLUS_TRAFFIC_TOKEN/);
+ assert.doesNotMatch(collectJob, /github\.token/);
+ assert.match(publishJob, /github\.token/);
+ assert.doesNotMatch(publishJob, /secrets\.FVPLUS_TRAFFIC_TOKEN/);
+ assert.match(publishJob, /needs:\s*collect/);
+});
+
+test('security policy links directly to private vulnerability reporting', () => {
+ const policy = read('.github/SECURITY.md');
+ const policyLines = new Set(policy.split(/\r?\n/));
+ assert.ok(policyLines.has('[Report a vulnerability](https://github.com/alexphillips-dev/FolderView-Plus/security/advisories/new):'));
});
test('dependency review blocks vulnerable or unapproved dependency changes', () => {
diff --git a/tests/settings-bindings.test.mjs b/tests/settings-bindings.test.mjs
index 2bf4b9c8..9a438daa 100644
--- a/tests/settings-bindings.test.mjs
+++ b/tests/settings-bindings.test.mjs
@@ -459,7 +459,8 @@ test('empty-state actions are delegated and create-folder uses modal input inste
assert.match(script, /STARTER_TEMPLATE_BLUEPRINTS = Object\.freeze/);
assert.match(script, /settings:\s*\{[\s\S]*preview:\s*1/);
assert.match(script, /preview_border:\s*true/);
- assert.match(script, /status_color_started:\s*'#ffffff'/);
+ assert.match(script, /status_color_started:\s*'#55b72d'/);
+ assert.match(script, /status_color_text:\s*'#ffffff'/);
assert.match(script, /dashboard_overflow:\s*'default'/);
assert.doesNotMatch(script, /window\.prompt\('Folder name:'/);
});
diff --git a/tests/support-bundle-browser-telemetry.test.mjs b/tests/support-bundle-browser-telemetry.test.mjs
index e3b98e48..274c0969 100644
--- a/tests/support-bundle-browser-telemetry.test.mjs
+++ b/tests/support-bundle-browser-telemetry.test.mjs
@@ -823,6 +823,16 @@ test('support bundle telemetry exports privacy-safe persisted preview context br
counters: { handlerIntegrityFailures: 0, dispatchAttempts: 2, dispatchSuccesses: 2 },
rowModes: { '2': { bindings: 6 }, unlimited: { bindings: 6 } },
rowIndexes: { '1': { bound: 6 }, '2': { bound: 6 } },
+ childFolderPreview: {
+ counters: { chipsRendered: 1, bindings: 1, menuOpenAttempts: 3, menuOpens: 3, menuOpenFailures: 0 },
+ inputMethods: { mouse: 1, keyboard: 1, contextmenu: 1, touch: 0, unknown: 0 },
+ lastEvent: {
+ type: 'menu-open',
+ outcome: 'success',
+ inputMethod: 'contextmenu',
+ folderName: 'private-folder'
+ }
+ },
lastEvent: {
type: 'dispatch',
outcome: 'success',
@@ -847,6 +857,9 @@ test('support bundle telemetry exports privacy-safe persisted preview context br
assert.equal(evidence.lastEvent.rowIndex, 2);
assert.equal(evidence.lastEvent.triggerSource, 'status');
assert.equal(evidence.lastEvent.inputMethod, 'keyboard');
+ assert.equal(evidence.childFolderPreview.counters.menuOpens, 3);
+ assert.equal(evidence.childFolderPreview.inputMethods.contextmenu, 1);
+ assert.match(evidence.childFolderPreview.lastEvent.folderName, /^ui-[0-9a-f]{16}$/);
assert.match(evidence.lastEvent.containerName, /^ui-[0-9a-f]{16}$/);
- assert.doesNotMatch(JSON.stringify(evidence), /private-container/);
+ assert.doesNotMatch(JSON.stringify(evidence), /private-container|private-folder/);
});
diff --git a/tests/support-bundle-v2-contract.test.mjs b/tests/support-bundle-v2-contract.test.mjs
index 3efe2bbc..f0258897 100644
--- a/tests/support-bundle-v2-contract.test.mjs
+++ b/tests/support-bundle-v2-contract.test.mjs
@@ -23,7 +23,8 @@ const FVPLUS_API_ERROR_LOG = ${phpSingleQuote(apiErrorLogPath)};
const FVPLUS_DEFAULT_FOLDER_STATUS_COLORS = [
'started' => '#00ff00',
'paused' => '#f5c100',
- 'stopped' => '#ff4d4f'
+ 'stopped' => '#ff4d4f',
+ 'text' => '#ffffff'
];
function readInstalledManifestPathCandidates(): array {
diff --git a/tests/webui-profile-server-contract.test.mjs b/tests/webui-profile-server-contract.test.mjs
new file mode 100644
index 00000000..c49f3d5f
--- /dev/null
+++ b/tests/webui-profile-server-contract.test.mjs
@@ -0,0 +1,44 @@
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import path from 'node:path';
+import test from 'node:test';
+
+const phpPath = path.resolve('src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.webui-profiles.php');
+const phpQuote = (value) => `'${String(value).replaceAll('\\', '/').replaceAll("'", "\\'")}'`;
+const runPhp = (expression) => JSON.parse(execFileSync('php', ['-r',
+ `require ${phpQuote(phpPath)}; echo json_encode(${expression}, JSON_UNESCAPED_SLASHES);`
+], { encoding: 'utf8' }));
+
+test('server normalizes WebUI profiles and enforces unique identities and names', () => {
+ const result = runPhp(`fvplusNormalizeWebuiProfiles([
+ ['id'=>'media','name'=>'Media','containers'=>['Plex','Plex','Tautulli']],
+ ['id'=>'media','name'=>'Media','members'=>['Overseerr']]
+ ])`);
+ assert.deepEqual(result, [
+ { id: 'media', name: 'Media', containers: ['Plex', 'Tautulli'] },
+ { id: 'media-2', name: 'Media 2', containers: ['Overseerr'] }
+ ]);
+});
+
+test('server diagnostics expose aggregate counts without profile or member values', () => {
+ const result = runPhp(`fvplusBuildWebuiProfileDiagnostics([
+ 'webui_profiles'=>[['id'=>'media','name'=>'Media','containers'=>['Plex','Missing']]]
+ ], ['Plex'])`);
+ assert.deepEqual(result, {
+ profileCount: 1,
+ selectedReferenceCount: 2,
+ unavailableReferenceCount: 1,
+ duplicateProfileIdCount: 0,
+ invalidProfileCount: 0
+ });
+ assert.doesNotMatch(JSON.stringify(result), /Plex|Missing|Media/);
+});
+
+test('generic settings transfer strips member-bound WebUI profiles', () => {
+ const result = runPhp(`fvplusStripWebuiProfilesFromSettings([
+ 'preview'=>2,
+ 'webui_profiles'=>[['id'=>'media']],
+ 'webuiProfiles'=>[['id'=>'legacy']]
+ ])`);
+ assert.deepEqual(result, { preview: 2 });
+});
| 
|
+### Custom WebUI profiles
+
+Docker folders can keep multiple named WebUI launch profiles (up to 100 per folder), such as `Media Admin`, `Monitoring`, or `Daily Tools`. Each profile selects direct members of that folder; launching it opens only selected containers that are currently running and have a safe WebUI available. The original **Open all WebUIs** action remains available.
+
+Create and maintain profiles from the folder editor's **WebUI Profiles** section, then launch them from the folder menu under **Open WebUI profile**. Profiles are included with folder clone, export, import, backup, and restore operations, but are intentionally excluded from generic settings copy/paste, templates, and saved defaults because their member selections belong to one specific folder.
+
+> Screenshot placeholder: WebUI Profiles editor and Docker folder profile submenu.
+
## Install
Install from Unraid:
diff --git a/archive/folderview.plus-2026.08.12.02.txz b/archive/folderview.plus-2026.08.12.02.txz
deleted file mode 100644
index 779d2f35..00000000
Binary files a/archive/folderview.plus-2026.08.12.02.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.12.02.txz.sha256 b/archive/folderview.plus-2026.08.12.02.txz.sha256
deleted file mode 100644
index 640879f3..00000000
--- a/archive/folderview.plus-2026.08.12.02.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-f87ce77ad94ca0c320b74ce37ddfad46d1c3b956accaab260fa5b52c0b83696c folderview.plus-2026.08.12.02.txz
diff --git a/archive/folderview.plus-2026.08.12.03.txz b/archive/folderview.plus-2026.08.12.03.txz
deleted file mode 100644
index fc859033..00000000
Binary files a/archive/folderview.plus-2026.08.12.03.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.12.03.txz.sha256 b/archive/folderview.plus-2026.08.12.03.txz.sha256
deleted file mode 100644
index 5ee374e8..00000000
--- a/archive/folderview.plus-2026.08.12.03.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-67b7eb711c29b0ab902701106e535f9abc7743f1acd9a4c56d778c525d313f09 folderview.plus-2026.08.12.03.txz
diff --git a/archive/folderview.plus-2026.08.12.04.txz b/archive/folderview.plus-2026.08.12.04.txz
deleted file mode 100644
index 7050cf56..00000000
Binary files a/archive/folderview.plus-2026.08.12.04.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.12.04.txz.sha256 b/archive/folderview.plus-2026.08.12.04.txz.sha256
deleted file mode 100644
index 0f145f5e..00000000
--- a/archive/folderview.plus-2026.08.12.04.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-3f6f3af6655e2587b59badffcaa6b7211f4f5790ae760fa12d53fa6e98685d8a folderview.plus-2026.08.12.04.txz
diff --git a/archive/folderview.plus-2026.08.12.05.txz b/archive/folderview.plus-2026.08.12.05.txz
deleted file mode 100644
index fa058098..00000000
Binary files a/archive/folderview.plus-2026.08.12.05.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.12.05.txz.sha256 b/archive/folderview.plus-2026.08.12.05.txz.sha256
deleted file mode 100644
index 5a5d9838..00000000
--- a/archive/folderview.plus-2026.08.12.05.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-4ad7e0839e54e948181bd7d415a7df5bdf51fd11663ac533756ac71287065c79 folderview.plus-2026.08.12.05.txz
diff --git a/archive/folderview.plus-2026.08.12.06.txz b/archive/folderview.plus-2026.08.12.06.txz
deleted file mode 100644
index 161ec70a..00000000
Binary files a/archive/folderview.plus-2026.08.12.06.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.12.06.txz.sha256 b/archive/folderview.plus-2026.08.12.06.txz.sha256
deleted file mode 100644
index cfb04e77..00000000
--- a/archive/folderview.plus-2026.08.12.06.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-6cc76433f0dd221c9fc2af4667bbffc0e8a30c0544ce01b5afd44194f0ff73c4 folderview.plus-2026.08.12.06.txz
diff --git a/archive/folderview.plus-2026.08.12.07.txz b/archive/folderview.plus-2026.08.12.07.txz
deleted file mode 100644
index 944f5032..00000000
Binary files a/archive/folderview.plus-2026.08.12.07.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.12.07.txz.sha256 b/archive/folderview.plus-2026.08.12.07.txz.sha256
deleted file mode 100644
index 596ab8ca..00000000
--- a/archive/folderview.plus-2026.08.12.07.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-1ff4f2820ca614b560d7ac1a3738f2eef2f5f87098508118bd43828a11bae58a folderview.plus-2026.08.12.07.txz
diff --git a/archive/folderview.plus-2026.08.17.01.txz b/archive/folderview.plus-2026.08.17.01.txz
deleted file mode 100644
index 3d55d969..00000000
Binary files a/archive/folderview.plus-2026.08.17.01.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.17.01.txz.sha256 b/archive/folderview.plus-2026.08.17.01.txz.sha256
deleted file mode 100644
index 1ce70b81..00000000
--- a/archive/folderview.plus-2026.08.17.01.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-693b647ab14c2f8389defe3b9ec348b611ca8e203df2a4057f6e75b1fc86a12d folderview.plus-2026.08.17.01.txz
diff --git a/archive/folderview.plus-2026.08.18.02.txz b/archive/folderview.plus-2026.08.18.02.txz
deleted file mode 100644
index cdf86fe8..00000000
Binary files a/archive/folderview.plus-2026.08.18.02.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.18.02.txz.sha256 b/archive/folderview.plus-2026.08.18.02.txz.sha256
deleted file mode 100644
index 621efc9d..00000000
--- a/archive/folderview.plus-2026.08.18.02.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b7219d6df88f40c42353417e59c7512895ff9851a0d6fdc758006ca8cf703537 folderview.plus-2026.08.18.02.txz
diff --git a/archive/folderview.plus-2026.08.18.03.txz b/archive/folderview.plus-2026.08.18.03.txz
deleted file mode 100644
index ed7ca5e1..00000000
Binary files a/archive/folderview.plus-2026.08.18.03.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.18.03.txz.sha256 b/archive/folderview.plus-2026.08.18.03.txz.sha256
deleted file mode 100644
index c0507679..00000000
--- a/archive/folderview.plus-2026.08.18.03.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-f09dbae6c0a2f31260872171dfba1d06248a7c2ce0acfd8041c33667de26087f folderview.plus-2026.08.18.03.txz
diff --git a/archive/folderview.plus-2026.08.18.04.txz b/archive/folderview.plus-2026.08.18.04.txz
deleted file mode 100644
index 754a543e..00000000
Binary files a/archive/folderview.plus-2026.08.18.04.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.18.04.txz.sha256 b/archive/folderview.plus-2026.08.18.04.txz.sha256
deleted file mode 100644
index b0e2bb35..00000000
--- a/archive/folderview.plus-2026.08.18.04.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-0ef5f9830453c1a4ed8563c453c4122b134cf51bdbbc6880303910759d58e433 folderview.plus-2026.08.18.04.txz
diff --git a/archive/folderview.plus-2026.08.24.04.txz b/archive/folderview.plus-2026.08.24.04.txz
deleted file mode 100644
index 022cd5ca..00000000
Binary files a/archive/folderview.plus-2026.08.24.04.txz and /dev/null differ
diff --git a/archive/folderview.plus-2026.08.24.04.txz.sha256 b/archive/folderview.plus-2026.08.24.04.txz.sha256
deleted file mode 100644
index aad7e493..00000000
--- a/archive/folderview.plus-2026.08.24.04.txz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-9f4eca819eddf4f5a501137f13b743a259a52fff7a35d6e74278b797641ff259 folderview.plus-2026.08.24.04.txz
diff --git a/archive/folderview.plus-2026.08.25.01.txz b/archive/folderview.plus-2026.08.25.01.txz
new file mode 100644
index 00000000..6dd425f6
Binary files /dev/null and b/archive/folderview.plus-2026.08.25.01.txz differ
diff --git a/archive/folderview.plus-2026.08.25.01.txz.sha256 b/archive/folderview.plus-2026.08.25.01.txz.sha256
new file mode 100644
index 00000000..d4a96673
--- /dev/null
+++ b/archive/folderview.plus-2026.08.25.01.txz.sha256
@@ -0,0 +1 @@
+7dfd5e03ee5f8624f75c3174cea43b9572ce4cb308cc7a6b25dc4762fa4fcd20 folderview.plus-2026.08.25.01.txz
diff --git a/archive/folderview.plus-2026.08.27.01.txz b/archive/folderview.plus-2026.08.27.01.txz
new file mode 100644
index 00000000..84a4186b
Binary files /dev/null and b/archive/folderview.plus-2026.08.27.01.txz differ
diff --git a/archive/folderview.plus-2026.08.27.01.txz.sha256 b/archive/folderview.plus-2026.08.27.01.txz.sha256
new file mode 100644
index 00000000..610ddc2c
--- /dev/null
+++ b/archive/folderview.plus-2026.08.27.01.txz.sha256
@@ -0,0 +1 @@
+500d264b9e8d2e0a2121296be776c27832197bd414bd6dd600cb2d0cddb15b65 folderview.plus-2026.08.27.01.txz
diff --git a/archive/folderview.plus-2026.08.27.02.txz b/archive/folderview.plus-2026.08.27.02.txz
new file mode 100644
index 00000000..5b476c4e
Binary files /dev/null and b/archive/folderview.plus-2026.08.27.02.txz differ
diff --git a/archive/folderview.plus-2026.08.27.02.txz.sha256 b/archive/folderview.plus-2026.08.27.02.txz.sha256
new file mode 100644
index 00000000..2a3d81f0
--- /dev/null
+++ b/archive/folderview.plus-2026.08.27.02.txz.sha256
@@ -0,0 +1 @@
+6216f87629e3f83e211cd2b795c72fd36d60271bbc5208ba5d602626651768bf folderview.plus-2026.08.27.02.txz
diff --git a/archive/folderview.plus-2026.08.27.03.txz b/archive/folderview.plus-2026.08.27.03.txz
new file mode 100644
index 00000000..ae3ed23a
Binary files /dev/null and b/archive/folderview.plus-2026.08.27.03.txz differ
diff --git a/archive/folderview.plus-2026.08.27.03.txz.sha256 b/archive/folderview.plus-2026.08.27.03.txz.sha256
new file mode 100644
index 00000000..68c2a2f3
--- /dev/null
+++ b/archive/folderview.plus-2026.08.27.03.txz.sha256
@@ -0,0 +1 @@
+e5016eb8b88748c8f45540564b35a54af49c559c6ad9d038ec14e389e52de7d0 folderview.plus-2026.08.27.03.txz
diff --git a/archive/folderview.plus-2026.08.27.04.txz b/archive/folderview.plus-2026.08.27.04.txz
new file mode 100644
index 00000000..d16ab8b7
Binary files /dev/null and b/archive/folderview.plus-2026.08.27.04.txz differ
diff --git a/archive/folderview.plus-2026.08.27.04.txz.sha256 b/archive/folderview.plus-2026.08.27.04.txz.sha256
new file mode 100644
index 00000000..0454e830
--- /dev/null
+++ b/archive/folderview.plus-2026.08.27.04.txz.sha256
@@ -0,0 +1 @@
+ae96ef201042e51fcdecfd3b05cb49215cd1a5b523f3a70c5bf3411760c31af9 folderview.plus-2026.08.27.04.txz
diff --git a/archive/folderview.plus-2026.08.27.05.txz b/archive/folderview.plus-2026.08.27.05.txz
new file mode 100644
index 00000000..8ba18375
Binary files /dev/null and b/archive/folderview.plus-2026.08.27.05.txz differ
diff --git a/archive/folderview.plus-2026.08.27.05.txz.sha256 b/archive/folderview.plus-2026.08.27.05.txz.sha256
new file mode 100644
index 00000000..20d64043
--- /dev/null
+++ b/archive/folderview.plus-2026.08.27.05.txz.sha256
@@ -0,0 +1 @@
+5fba9f842534e82d8fc9e7cf69d68d67e737a2448fbf6e8760994dc05f07fca2 folderview.plus-2026.08.27.05.txz
diff --git a/archive/folderview.plus-2026.08.28.01.txz b/archive/folderview.plus-2026.08.28.01.txz
new file mode 100644
index 00000000..2df2bccb
Binary files /dev/null and b/archive/folderview.plus-2026.08.28.01.txz differ
diff --git a/archive/folderview.plus-2026.08.28.01.txz.sha256 b/archive/folderview.plus-2026.08.28.01.txz.sha256
new file mode 100644
index 00000000..1b382c68
--- /dev/null
+++ b/archive/folderview.plus-2026.08.28.01.txz.sha256
@@ -0,0 +1 @@
+e3ed087328f3bec0d5d34d64660eed99359f2cb28c925718d052d5f4084febca folderview.plus-2026.08.28.01.txz
diff --git a/archive/folderview.plus-2026.08.28.02.txz b/archive/folderview.plus-2026.08.28.02.txz
new file mode 100644
index 00000000..6107753e
Binary files /dev/null and b/archive/folderview.plus-2026.08.28.02.txz differ
diff --git a/archive/folderview.plus-2026.08.28.02.txz.sha256 b/archive/folderview.plus-2026.08.28.02.txz.sha256
new file mode 100644
index 00000000..a55e5616
--- /dev/null
+++ b/archive/folderview.plus-2026.08.28.02.txz.sha256
@@ -0,0 +1 @@
+451ee2fa011a7f5c867c9b8f46bc9d5e6783795a637ba72e61e0f0e75fd299d4 folderview.plus-2026.08.28.02.txz
diff --git a/archive/folderview.plus-2026.08.28.03.txz b/archive/folderview.plus-2026.08.28.03.txz
new file mode 100644
index 00000000..052db11e
Binary files /dev/null and b/archive/folderview.plus-2026.08.28.03.txz differ
diff --git a/archive/folderview.plus-2026.08.28.03.txz.sha256 b/archive/folderview.plus-2026.08.28.03.txz.sha256
new file mode 100644
index 00000000..cf81a9e1
--- /dev/null
+++ b/archive/folderview.plus-2026.08.28.03.txz.sha256
@@ -0,0 +1 @@
+255a697535c6b14f95631fa836889a0ddda0c11c388ee2bd313ed21d779e0093 folderview.plus-2026.08.28.03.txz
diff --git a/archive/folderview.plus-2026.08.28.04.txz b/archive/folderview.plus-2026.08.28.04.txz
new file mode 100644
index 00000000..0782d3ba
Binary files /dev/null and b/archive/folderview.plus-2026.08.28.04.txz differ
diff --git a/archive/folderview.plus-2026.08.28.04.txz.sha256 b/archive/folderview.plus-2026.08.28.04.txz.sha256
new file mode 100644
index 00000000..e7ebd488
--- /dev/null
+++ b/archive/folderview.plus-2026.08.28.04.txz.sha256
@@ -0,0 +1 @@
+4c9da7f4379224d2b65ff9957c08ab5e996d6c8d7082762504f7415ef1f95194 folderview.plus-2026.08.28.04.txz
diff --git a/archive/folderview.plus-2026.08.28.05.txz b/archive/folderview.plus-2026.08.28.05.txz
new file mode 100644
index 00000000..3a2cd91f
Binary files /dev/null and b/archive/folderview.plus-2026.08.28.05.txz differ
diff --git a/archive/folderview.plus-2026.08.28.05.txz.sha256 b/archive/folderview.plus-2026.08.28.05.txz.sha256
new file mode 100644
index 00000000..952d2ef3
--- /dev/null
+++ b/archive/folderview.plus-2026.08.28.05.txz.sha256
@@ -0,0 +1 @@
+f71ee236840caadc58c6e22630a311670fa39d39f48293d086182cf0bb4dae88 folderview.plus-2026.08.28.05.txz
diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
index 4d6212f5..2552eb41 100644
--- a/docs/USER_GUIDE.md
+++ b/docs/USER_GUIDE.md
@@ -61,15 +61,39 @@ The Docker page View menu provides three supported modes:
Changing views does not delete folder configuration. Use `Reset view` to clear temporary toolbar filters and return to the normal unfiltered state.
+Each Docker folder menu includes four quick actions: focus, pin, lock, and hide. Hiding a parent hides its complete nested branch and member rows from FolderView without deleting configuration or changing assignments. Use the temporary `Undo` notice immediately after hiding, or open `View -> Hidden folders` to reveal hidden rows. Revealed rows are dimmed and labeled `Hidden`; restore one from its folder menu or choose `Restore all hidden folders`. Hidden folders remain visible in Host list mode because that mode intentionally restores Unraid's native table.
+
VM and Dashboard surfaces use the same saved Docker or VM folder configuration where applicable. Runtime state is reconciled incrementally so start, stop, pause, resume, and update results can update without rebuilding the entire page.
## Folder actions
+### Custom WebUI profiles for Docker folders
+
+Use a custom WebUI profile when you regularly open only part of a Docker folder. Profiles do not store URLs. They store selected direct-member names and resolve each container's current safe WebUI address and running state at launch time.
+
+To create a profile:
+
+1. Edit a Docker folder and open **WebUI Profiles**.
+2. Select **Add profile** and enter a unique name.
+3. Select one or more direct folder members. Search, **Select all with WebUI**, and **Clear selection** are available for larger folders.
+4. Save the folder. Empty profiles and duplicate names are rejected.
+5. Open the folder menu on the Docker page, choose **Open WebUI profile**, and select the profile. Its ready count shows how many selected WebUIs can open now.
+
+Only selected containers that are running, not paused, and expose a safe WebUI are opened. Stopped, paused, removed, or currently unavailable members remain selected for later but are skipped. If a browser blocks one or more tabs, allow popups for the Unraid host and retry the same profile. The original **Open all WebUIs** action still opens every ready WebUI in that folder.
+
+Use **Manage WebUI profiles** in the folder menu to return directly to the editor section. Profiles can be duplicated, reordered, or deleted. Each folder supports up to 100 profiles with up to 250 selected members per profile. Container renames are reconciled automatically when FolderView Plus can uniquely identify the renamed container; unresolved members are labeled unavailable so the selection can be corrected manually.
+
+Profiles follow a full folder clone and are preserved by folder export/import and backup/restore. Generic **Copy Folder Settings**, reusable templates, smart defaults, and saved folder defaults omit them so container-specific selections are not applied to unrelated folders.
+
+> Screenshot placeholder: WebUI Profiles editor showing named profiles and selected members.
+
+> Screenshot placeholder: Docker folder menu showing Open all WebUIs, Open WebUI profile, ready counts, and Manage WebUI profiles.
+
The folder action sheet groups actions by purpose rather than placing every operation in one flat menu. Available actions depend on folder type, hierarchy position, lock state, and current member state.
Common actions include:
-- Edit, pin, focus, lock, expand, or collapse a folder or branch.
+- Edit, pin, focus, lock, hide, expand, or collapse a folder or branch.
- Start, stop, pause, resume, restart, or update eligible members.
- Move a folder within its current level, under another folder, or back to the root.
- Clone, export, import into, scan, repair, or delete a folder branch.
diff --git a/docs/docker-runtime-architecture.md b/docs/docker-runtime-architecture.md
index 778b1a4f..f3731c0b 100644
--- a/docs/docker-runtime-architecture.md
+++ b/docs/docker-runtime-architecture.md
@@ -87,7 +87,7 @@ The runtime still uses an internal threshold state while resolving Adaptive and
- Bootstrap repeats host detection after parsing, then enables legacy styles, loads legacy custom overrides in sequence, and finally loads `docker.js` only for a confirmed complete table contract.
- Native and unknown generations keep every legacy stylesheet inert and return before custom overrides, adapters, hooks, requests, observers, or jQuery prefilters are created.
- Unraid lifecycle globals (`loadlist`, `listview`, `openDocker`, `eventControl`, and `addDockerContainerContext`) are wrapped idempotently by the adapter, with compatibility aliases retained for host/plugin interoperability.
-- Context menu quick actions (Focus/Pin/Lock) are enhanced through the adapter rather than ad-hoc DOM logic.
+- Context menu quick actions (Focus/Pin/Lock/Hide) are enhanced through the adapter rather than ad-hoc DOM logic. Hidden folder IDs persist in normalized Docker preferences, parent visibility applies to the complete branch, and the View menu provides temporary reveal and restore-all recovery paths.
- CSS layout constants use tokenized variables with hard-coded fallback values to preserve legacy contracts.
- Preview hydration diagnostics record unavailable WebUI slots, disconnected targets, absolute movement, row movement, and movement relative to the owning row without retaining container or folder identities.
- The main Docker runtime line budget is ratcheted from 8,839 to 8,028 lines. Column layout/control moved behind a lifecycle-owned factory, while reusable ordering and live-refresh seams reduced duplicate ownership across Docker, VM, and Dashboard.
diff --git a/docs/releases/2026.08.25.01.md b/docs/releases/2026.08.25.01.md
new file mode 100644
index 00000000..8d611972
--- /dev/null
+++ b/docs/releases/2026.08.25.01.md
@@ -0,0 +1,5 @@
+- Fix: Open the same child-folder action menu from a collapsed parent preview when using a normal click, right-click, touch activation, Enter, or Space.
+- Accessibility: Position keyboard-opened menus beside the child-folder preview chip, focus the first menu action, and retain the existing Expand, Edit, and Open folder actions.
+- Diagnostics: Add bounded child-folder preview render, binding, menu-attempt, success, failure, and input-method counters to sanitized support bundles.
+- Privacy: Keep child-folder preview diagnostics free of folder names, identifiers, selectors, URLs, and pointer coordinates.
+- Test: Cover child-folder menu activation after repeated multi-row preview reconciliation and verify mouse, keyboard, context-menu, touch, focus, geometry, and diagnostic behavior in the browser fixture suite.
diff --git a/docs/releases/2026.08.27.01.md b/docs/releases/2026.08.27.01.md
new file mode 100644
index 00000000..919238f7
--- /dev/null
+++ b/docs/releases/2026.08.27.01.md
@@ -0,0 +1,6 @@
+- Fix: Use green as the default started-status color in the folder editor and across Docker, VM, and Dashboard folder surfaces.
+- Compatibility: Migrate the previous unmodified white started-status default to green while preserving white when it is explicitly selected and saved in the modern folder editor.
+- Fix: Show a visible pending spinner on compact multi-row Docker previews while a container lifecycle action, including Restart, is in progress.
+- Fix: Keep Restart pending through the initial already-running snapshot, then restore the container preview to its current started, paused, or stopped state after reconciliation.
+- Diagnostics: Record privacy-safe counts for lifecycle preview surfaces and pending or restored status icons without exporting container identities.
+- Test: Cover legacy and explicit status-color behavior, compact-preview lifecycle feedback, restart timing, browser fixtures, responsive themes, and large-runtime performance budgets.
diff --git a/docs/releases/2026.08.27.02.md b/docs/releases/2026.08.27.02.md
new file mode 100644
index 00000000..c0de9457
--- /dev/null
+++ b/docs/releases/2026.08.27.02.md
@@ -0,0 +1,6 @@
+- Fix: Restore native-style folder status presentation with green started indicators and independently white status text by default.
+- Feature: Add a Text color picker to the modern folder editor Status section so status labels can be customized separately from Started, Paused, and Stopped indicators.
+- Compatibility: Apply the independent status text color across Docker folders and previews, VM folders, Dashboard folders, inherited defaults, starter templates, and existing folders without requiring migration.
+- Diagnostics: Include the normalized status text color in privacy-safe folder integrity diagnostics.
+- Localization: Translate the new status text control and updated guidance across all 27 supported locales.
+- Test: Cover status text normalization, editor persistence, runtime theme separation, localization, browser fixtures, responsive themes, and large-runtime performance budgets.
diff --git a/docs/releases/2026.08.27.03.md b/docs/releases/2026.08.27.03.md
new file mode 100644
index 00000000..9a2ba3dc
--- /dev/null
+++ b/docs/releases/2026.08.27.03.md
@@ -0,0 +1,4 @@
+- Fix: Show the same pending lifecycle spinner for Docker containers in single-row and multi-row folder previews.
+- Fix: Keep Start, Resume, and Restart feedback on the folder's Started color instead of temporarily using the Paused color; Pause and Stop continue to use their matching status colors.
+- Compatibility: Honor each folder's customized Started, Paused, and Stopped indicator colors while lifecycle actions are pending.
+- Test: Cover single-row lifecycle identity, action-specific pending colors, spinner cleanup, browser fixtures, responsive themes, and large-runtime performance budgets.
diff --git a/docs/releases/2026.08.27.04.md b/docs/releases/2026.08.27.04.md
new file mode 100644
index 00000000..60532ae2
--- /dev/null
+++ b/docs/releases/2026.08.27.04.md
@@ -0,0 +1,4 @@
+- Fix: Restore container context actions in collapsed parent-folder previews when the folder contains child folders.
+- Compatibility: Apply the correct Default or Advanced context behavior after nested previews are rebuilt, including Preview Rows 1+, Unlimited, and Unraid Basic or Advanced View.
+- Compatibility: Preserve the parent folder's popup settings and keep child-folder preview actions independent.
+- Test: Cover nested parent container actions in both context modes with Unraid Advanced View enabled, plus child-folder actions, browser fixtures, and large-runtime performance budgets.
diff --git a/docs/releases/2026.08.27.05.md b/docs/releases/2026.08.27.05.md
new file mode 100644
index 00000000..1b0148f0
--- /dev/null
+++ b/docs/releases/2026.08.27.05.md
@@ -0,0 +1,7 @@
+- Feature: Add a fourth **Hide** quick action to Docker folder menus. Hiding a parent folder temporarily removes its complete nested branch from FolderView without deleting folders, assignments, rules, or settings.
+- UX: Add a hidden-folder count, temporary **Show hidden folders** view, **Restore all hidden folders** action, and a 10-second **Undo** notice so hidden rows always remain recoverable.
+- UX: Dim temporarily revealed folders and mark them as hidden while leaving Unraid's native Host list unchanged.
+- Reliability: Persist hidden-folder choices through the existing conflict-safe preference flow, preserve the newest choice during rapid or cross-tab updates, clear focus when its folder is hidden, and prune references to deleted folders.
+- Diagnostics: Add privacy-safe hidden-folder counts, hashed identifiers, integrity checks, and effective visibility state to runtime diagnostics and support bundles.
+- Localization: Add the hidden-folder interface text to all 27 supported locale catalogs.
+- Test: Cover nested branch hiding, reveal, restore-all, undo, preference conflicts, diagnostics, accessibility, browser rendering, themes, and runtime performance.
diff --git a/docs/releases/2026.08.28.01.md b/docs/releases/2026.08.28.01.md
new file mode 100644
index 00000000..87853ce6
--- /dev/null
+++ b/docs/releases/2026.08.28.01.md
@@ -0,0 +1,4 @@
+- Fix: Show the 10-second Docker folder **Undo** notice immediately when a folder is hidden instead of waiting for preference persistence to finish.
+- Reliability: Keep the optimistic hide and Undo actions conflict-safe, dismiss only the matching notice during restoration, and remove a failed hide notice before rolling the folder state back.
+- UI/UX: Style Undo, Show hidden folders, and Restore all hidden folders with scoped theme tokens so Unraid host button rules cannot force an orange outline.
+- Test: Cover deferred preference saves, save failure rollback, folder-aware notice dismissal, and 552 browser combinations across light and dark themes, desktop and mobile viewports, and Chromium, Firefox, and WebKit.
diff --git a/docs/releases/2026.08.28.02.md b/docs/releases/2026.08.28.02.md
new file mode 100644
index 00000000..f7139d37
--- /dev/null
+++ b/docs/releases/2026.08.28.02.md
@@ -0,0 +1,8 @@
+- Feature: Add reusable custom WebUI profiles to each Docker folder so one menu action can open only the selected container WebUIs.
+- UI/UX: Add profile creation, naming, duplication, ordering, search, WebUI-aware selection, unavailable-member visibility, and deletion to the modern Docker folder editor, with responsive keyboard-accessible controls.
+- Reliability: Resolve each selected container's current WebUI only when a profile is launched, open direct running and unpaused members only, retain renamed members through identity reconciliation, and fail closed when a profile no longer exists.
+- Compatibility: Preserve folder-specific profiles through clone, full export/import, backup, and restore while excluding them from generic settings copy/paste, templates, and saved defaults that may target different containers.
+- Privacy: Add support-bundle profile health counts without exporting profile names, container names, or WebUI addresses.
+- Localization: Translate the custom WebUI profile editor and Docker menu across every supported locale.
+- Docs: Document profile setup, launch behavior, popup handling, migration behavior, and current screenshot placeholders in the README and user guide.
+- Test: Cover browser, mobile, keyboard, theme, persistence, launch eligibility, popup safety, rename, transfer, diagnostics, localization, and large-library performance behavior using isolated fixtures.
diff --git a/docs/releases/2026.08.28.03.md b/docs/releases/2026.08.28.03.md
new file mode 100644
index 00000000..109763ac
--- /dev/null
+++ b/docs/releases/2026.08.28.03.md
@@ -0,0 +1,3 @@
+- UI/UX: Style every custom WebUI profile editor action with FolderView Plus controls instead of Unraid's default orange button treatment.
+- Accessibility: Preserve visible keyboard focus and use the plugin's theme-aware text, surface, hover, active, disabled, and shadow tokens across dark and light themes.
+- Test: Verify custom WebUI profile buttons override hostile host defaults and follow the final dark and light theme palettes in an isolated browser fixture.
diff --git a/docs/releases/2026.08.28.04.md b/docs/releases/2026.08.28.04.md
new file mode 100644
index 00000000..497ce29a
--- /dev/null
+++ b/docs/releases/2026.08.28.04.md
@@ -0,0 +1,4 @@
+- Fix: Keep hidden-folder restore labels and custom WebUI profile warnings registered as active localized UI text.
+- Reliability: Prevent strict localization validation and main-to-dev back-merges from rejecting those live Docker translation keys.
+- Security: Reject malformed non-string folder names and container identifiers without invoking attacker-controlled coercion hooks.
+- Test: Rebuild all 27 locale catalogs and verify hidden-folder behavior, localization coverage, and security workflow contracts.
diff --git a/docs/releases/2026.08.28.05.md b/docs/releases/2026.08.28.05.md
new file mode 100644
index 00000000..cbb8dcad
--- /dev/null
+++ b/docs/releases/2026.08.28.05.md
@@ -0,0 +1,15 @@
+- Feature: Add a fourth **Hide** quick action to Docker folder menus, including nested-branch hiding, a temporary **Show hidden folders** view, **Restore all hidden folders**, and an immediate 10-second **Undo** action without deleting folder configuration or changing Unraid's native Host list.
+- Feature: Add reusable custom WebUI profiles to each Docker folder so any number of named profiles can open only the selected running, unpaused container WebUIs, with create, duplicate, reorder, search, unavailable-member, and delete controls in the modern folder editor.
+- Fix: Restore reliable container and child-folder context menus across single-row, multi-row, nested, collapsed, Preview Rows 1+, Unlimited, and Unraid Basic or Advanced View layouts, including mouse, right-click, touch, Enter, and Space activation.
+- Fix: Show consistent lifecycle progress on single-row and multi-row Docker previews, keep Restart pending through its initial running snapshot, and use the action's destination status color until reconciliation completes.
+- UI/UX: Use Unraid's native green started indicator with white status text by default, add a separate **Text** color picker, and apply customized Started, Paused, Stopped, and Text colors consistently across Docker, VM, Dashboard, inherited defaults, and starter templates.
+- UI/UX: Make hidden-folder recovery, Undo, and custom WebUI profile controls theme-aware, responsive, and keyboard accessible instead of inheriting Unraid's orange button treatment.
+- Reliability: Persist hidden-folder choices through conflict-safe preference updates, preserve profiles through clone, export/import, backup, restore, and unique member renames, and keep folder-specific profiles out of generic settings transfers and defaults that may target unrelated containers.
+- Compatibility: Preserve explicitly selected white started indicators while migrating only the old unmodified white default to green, and acknowledge Unraid API v4.37.3 while keeping current legacy Docker behavior and future API capability monitoring bounded and fail-closed.
+- Security: Reject malformed non-string folder names and container identifiers without invoking attacker-controlled coercion hooks, strengthen property-based input coverage, and tighten repository security-policy, CodeQL, workflow-permission, package-trust, and release contracts.
+- Privacy: Extend sanitized diagnostics with aggregate context-menu, lifecycle, hidden-folder, and WebUI-profile health evidence while withholding folder names, container names, profile names, URLs, selectors, coordinates, and other runtime identities.
+- Localization: Translate the new hidden-folder, WebUI-profile, and status-text interfaces across all 27 supported locales and keep dynamic Docker menu labels covered by strict localization validation.
+- UX: Improve GitHub bug, support, feature, and translation intake forms with clearer reproduction, version, branch, diagnostics, privacy, compatibility, and testing fields.
+- Maintenance: Add proactive Unraid/API compatibility checks, dependency and SBOM vulnerability monitoring, scheduled workflow watchdogs, manual CodeQL recovery checks, exact-tool CodeQL alert filtering, and validated main-to-dev back-merge ordering without introducing live-Unraid automation.
+- Compatibility: No manual migration is required. Existing folders, assignments, rules, colors, backups, and imports remain compatible; hidden-folder state is reversible, and custom WebUI profiles remain scoped to their Docker folder.
+- Test: Expand isolated browser, mobile, keyboard, theme, localization, fuzz, security, diagnostics, workflow, and large-library performance coverage for every behavior in this release.
diff --git a/docs/sbom.cdx.json b/docs/sbom.cdx.json
index 723bcb79..6a2f0fd5 100644
--- a/docs/sbom.cdx.json
+++ b/docs/sbom.cdx.json
@@ -1,13 +1,13 @@
{
"bomFormat": "CycloneDX",
"specVersion": "1.5",
- "serialNumber": "urn:uuid:8d6ef646-c87b-8601-8d30-57908769da9d",
+ "serialNumber": "urn:uuid:e1de95ce-ed49-8928-999c-a260ac5c59c3",
"version": 1,
"metadata": {
"component": {
"type": "application",
"name": "FolderView Plus",
- "version": "2026.08.24.04",
+ "version": "2026.08.28.05",
"properties": [
{
"name": "folderview-plus:runtime-dependencies",
@@ -569,6 +569,20 @@
],
"purl": "pkg:npm/escalade@3.2.0"
},
+ {
+ "type": "library",
+ "name": "fast-check",
+ "version": "4.9.0",
+ "scope": "optional",
+ "licenses": [
+ {
+ "license": {
+ "id": "MIT"
+ }
+ }
+ ],
+ "purl": "pkg:npm/fast-check@4.9.0"
+ },
{
"type": "library",
"name": "find-up",
@@ -1099,6 +1113,20 @@
],
"purl": "pkg:npm/playwright@1.62.1"
},
+ {
+ "type": "library",
+ "name": "pure-rand",
+ "version": "8.4.2",
+ "scope": "optional",
+ "licenses": [
+ {
+ "license": {
+ "id": "MIT"
+ }
+ }
+ ],
+ "purl": "pkg:npm/pure-rand@8.4.2"
+ },
{
"type": "library",
"name": "semver",
diff --git a/docs/security/csp-readiness.json b/docs/security/csp-readiness.json
index f93b851e..0c690a25 100644
--- a/docs/security/csp-readiness.json
+++ b/docs/security/csp-readiness.json
@@ -3,7 +3,7 @@
"mode": "report-only-shared-unraid-document",
"scope": {
"scannedRoot": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus",
- "scannedFiles": 234,
+ "scannedFiles": 238,
"exclusions": [
"third-party icon asset pack",
"vendored scripts",
@@ -21,7 +21,7 @@
"totals": {
"inlineEventAttributes": 0,
"inlineScriptBlocks": 0,
- "externalScriptTags": 205,
+ "externalScriptTags": 211,
"inlineStyleBlocks": 0,
"inlineStyleAttributes": 0,
"evalCalls": 0,
@@ -72,7 +72,7 @@
"htmlStringSinkInventory": [
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js",
- "line": 1238,
+ "line": 1257,
"sink": ".innerHTML =",
"risk": "high",
"dataClass": "persisted-or-runtime-data",
@@ -82,7 +82,7 @@
},
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js",
- "line": 1249,
+ "line": 1268,
"sink": ".innerHTML =",
"risk": "reviewed",
"dataClass": "static-or-controlled-ui-template",
@@ -92,7 +92,7 @@
},
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js",
- "line": 1294,
+ "line": 1313,
"sink": ".innerHTML =",
"risk": "high",
"dataClass": "persisted-or-runtime-data",
@@ -102,7 +102,7 @@
},
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js",
- "line": 3395,
+ "line": 3443,
"sink": ".innerHTML =",
"risk": "high",
"dataClass": "persisted-or-runtime-data",
@@ -112,7 +112,7 @@
},
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.runtime.action-bar.js",
- "line": 274,
+ "line": 312,
"sink": ".innerHTML =",
"risk": "high",
"dataClass": "persisted-or-runtime-data",
@@ -152,7 +152,7 @@
},
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.chrome.js",
- "line": 471,
+ "line": 470,
"sink": "insertAdjacentHTML(",
"risk": "reviewed",
"dataClass": "static-or-controlled-ui-template",
@@ -162,7 +162,7 @@
},
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.chrome.js",
- "line": 485,
+ "line": 484,
"sink": ".innerHTML =",
"risk": "high",
"dataClass": "persisted-or-runtime-data",
@@ -442,7 +442,7 @@
},
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.ui.js",
- "line": 85,
+ "line": 87,
"sink": "insertAdjacentHTML(",
"risk": "reviewed",
"dataClass": "static-or-controlled-ui-template",
@@ -452,7 +452,7 @@
},
{
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folderviewplus.ui.js",
- "line": 273,
+ "line": 275,
"sink": ".innerHTML =",
"risk": "high",
"dataClass": "persisted-or-runtime-data",
@@ -486,7 +486,7 @@
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/Folder.page",
"inlineEventAttributes": 0,
"inlineScriptBlocks": 0,
- "externalScriptTags": 31,
+ "externalScriptTags": 32,
"inlineStyleBlocks": 0,
"inlineStyleAttributes": 0,
"evalCalls": 0,
@@ -510,7 +510,7 @@
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/folderview.plus.Dashboard.page",
"inlineEventAttributes": 0,
"inlineScriptBlocks": 0,
- "externalScriptTags": 46,
+ "externalScriptTags": 47,
"inlineStyleBlocks": 0,
"inlineStyleAttributes": 0,
"evalCalls": 0,
@@ -522,7 +522,7 @@
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/folderview.plus.Docker.page",
"inlineEventAttributes": 0,
"inlineScriptBlocks": 0,
- "externalScriptTags": 64,
+ "externalScriptTags": 67,
"inlineStyleBlocks": 0,
"inlineStyleAttributes": 0,
"evalCalls": 0,
@@ -534,7 +534,7 @@
"path": "src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/folderview.plus.VMs.page",
"inlineEventAttributes": 0,
"inlineScriptBlocks": 0,
- "externalScriptTags": 38,
+ "externalScriptTags": 39,
"inlineStyleBlocks": 0,
"inlineStyleAttributes": 0,
"evalCalls": 0,
diff --git a/folderview.plus.plg b/folderview.plus.plg
index a2ad93b3..9e179046 100644
--- a/folderview.plus.plg
+++ b/folderview.plus.plg
@@ -6,9 +6,9 @@
-
-
-
+
+
+
@@ -18,17 +18,103 @@