Skip to content

Commit 060e29b

Browse files
author
FolderView Plus Test
committed
Remove docker service map and tighten tree explorer
1 parent 8c205b2 commit 060e29b

18 files changed

Lines changed: 82 additions & 1310 deletions

archive/folderview.plus-2026.04.15.09.txz.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4d3e533440a888bf14632161b3d61c225609be62dd4ffc5330382b75b2d6ef09 folderview.plus-2026.04.15.39.txz

folderview.plus.plg

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@
66
<!ENTITY launch "Settings/FolderViewPlus">
77
<!ENTITY plugdir "/usr/local/emhttp/plugins/&name;">
88
<!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/dev/folderview.plus.plg">
9-
<!ENTITY version "2026.04.15.38">
10-
<!ENTITY md5 "69c566dbe8620a68d342a0c94dd62440">
9+
<!ENTITY version "2026.04.15.39">
10+
<!ENTITY md5 "a51bab5b4caf9fd975a19ec8283f5ff6">
1111
]>
1212

1313
<PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" icon="folder-icon.png" support="https://forums.unraid.net/topic/197631-plugin-folderview-plus/" min="7.0.0">
1414
<CHANGES>
1515

16+
###2026.04.15.39
17+
- UX: Remove the Docker Service Map view and tighten Tree Explorer folder rows and child-folder cards.
18+
19+
1620
###2026.04.15.38
1721
- Fix: Preserve Docker update status across post-update runtime refreshes so folder rows clear after Update All.
1822

src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/FolderViewPlus.page

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ if (!empty($fvplusRuntimeConflicts)) {
216216
<option value="folderview">FolderView</option>
217217
<option value="host">No FolderView (host list only)</option>
218218
<option value="command">Command view</option>
219-
<option value="service-map">Service map</option>
220219
<option value="tree-explorer">Tree explorer</option>
221220
</select>
222221
</label>

src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/folderview.plus.Docker.page

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,11 @@ $fvplusRuntimePreflightHasFatal = runtimePreflightHasFatal($fvplusRuntimePreflig
6868
<script src="<?php fvplus_asset('/plugins/folderview.plus/scripts/docker.runtime.diagnostics.js')?>"></script>
6969
<script src="<?php fvplus_asset('/plugins/folderview.plus/scripts/docker.runtime.reconcile.js')?>"></script>
7070
<script src="<?php fvplus_asset('/plugins/folderview.plus/scripts/docker.runtime.command-view.js')?>"></script>
71-
<script src="<?php fvplus_asset('/plugins/folderview.plus/scripts/docker.runtime.service-map.js')?>"></script>
7271
<script src="<?php fvplus_asset('/plugins/folderview.plus/scripts/docker.runtime.tree-explorer.js')?>"></script>
7372
<script defer src="<?php fvplus_asset('/plugins/folderview.plus/scripts/docker.js')?>"></script>
7473

7574
<link rel="stylesheet" href="<?php fvplus_asset('/plugins/folderview.plus/styles/runtime.shared.css')?>">
7675
<link rel="stylesheet" href="<?php fvplus_asset('/plugins/folderview.plus/styles/docker.command-view.css')?>">
77-
<link rel="stylesheet" href="<?php fvplus_asset('/plugins/folderview.plus/styles/docker.service-map.css')?>">
7876
<link rel="stylesheet" href="<?php fvplus_asset('/plugins/folderview.plus/styles/docker.tree-explorer.css')?>">
7977
<link rel="stylesheet" href="<?php fvplus_asset('/plugins/folderview.plus/styles/docker.css')?>">
8078
<?php require_once('/usr/local/emhttp/plugins/folderview.plus/styles/custom.php') ?>

src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const dockerHostGuardsModule = window.FolderViewPlusDockerHostGuards || null;
1414
const dockerRuntimeDiagnosticsModule = window.FolderViewPlusDockerRuntimeDiagnostics || null;
1515
const dockerRuntimeReconcileModule = window.FolderViewPlusDockerRuntimeReconcile || null;
1616
const dockerCommandViewModule = window.FolderViewPlusDockerCommandView || null;
17-
const dockerServiceMapModule = window.FolderViewPlusDockerServiceMap || null;
1817
const dockerTreeExplorerModule = window.FolderViewPlusDockerTreeExplorer || null;
1918
const applyDockerThemeResolverTokens = (reason = 'docker-runtime:initial', options = {}) => (
2019
themeResolver && typeof themeResolver.applyResolvedThemeTokens === 'function'
@@ -503,7 +502,6 @@ let dockerPreviewActionsApi = null;
503502
let dockerRuntimeHierarchyApi = null;
504503
let dockerRuntimeActionsApi = null;
505504
let dockerCommandViewApi = null;
506-
let dockerServiceMapApi = null;
507505
let dockerTreeExplorerApi = null;
508506
const DOCKER_RUNTIME_WIDTH_PHASES = Object.freeze({
509507
idle: 'idle',
@@ -743,17 +741,6 @@ const getDockerCommandViewApi = () => {
743741
}
744742
return dockerCommandViewApi;
745743
};
746-
const getDockerServiceMapApi = () => {
747-
if (
748-
!dockerServiceMapApi
749-
&& dockerServiceMapModule
750-
&& window.FolderViewPlusDockerServiceMapModuleLoaded === true
751-
&& typeof dockerServiceMapModule.createApi === 'function'
752-
) {
753-
dockerServiceMapApi = dockerServiceMapModule.createApi(buildDockerIsolatedViewDeps());
754-
}
755-
return dockerServiceMapApi;
756-
};
757744
const getDockerTreeExplorerApi = () => {
758745
if (
759746
!dockerTreeExplorerApi
@@ -3034,7 +3021,7 @@ const scheduleDockerPostRenderPolish = (folderIds = []) => {
30343021
const normalizeDockerPageViewMode = (value) => (
30353022
typeof utils.normalizeRuntimePageViewMode === 'function'
30363023
? utils.normalizeRuntimePageViewMode(value)
3037-
: (['host', 'command', 'service-map', 'tree-explorer'].includes(String(value || '').trim().toLowerCase()) ? String(value || '').trim().toLowerCase() : 'folderview')
3024+
: (['host', 'command', 'tree-explorer'].includes(String(value || '').trim().toLowerCase()) ? String(value || '').trim().toLowerCase() : 'folderview')
30383025
);
30393026

30403027
const resolveDockerPageViewMode = (prefs = folderTypePrefs) => normalizeDockerPageViewMode(
@@ -3101,13 +3088,6 @@ const unmountDockerCommandView = () => {
31013088
}
31023089
};
31033090

3104-
const unmountDockerServiceMap = () => {
3105-
const serviceMapApi = getDockerServiceMapApi();
3106-
if (serviceMapApi && typeof serviceMapApi.unmount === 'function') {
3107-
serviceMapApi.unmount();
3108-
}
3109-
};
3110-
31113091
const unmountDockerTreeExplorer = () => {
31123092
const treeExplorerApi = getDockerTreeExplorerApi();
31133093
if (treeExplorerApi && typeof treeExplorerApi.unmount === 'function') {
@@ -3119,9 +3099,6 @@ const unmountDockerIsolatedViews = (exceptMode = '') => {
31193099
if (exceptMode !== 'command') {
31203100
unmountDockerCommandView();
31213101
}
3122-
if (exceptMode !== 'service-map') {
3123-
unmountDockerServiceMap();
3124-
}
31253102
if (exceptMode !== 'tree-explorer') {
31263103
unmountDockerTreeExplorer();
31273104
}
@@ -3152,20 +3129,6 @@ const queueDockerRuntimeRenderForPageViewMode = () => {
31523129
recordDockerFatalBannerAction('Docker command view unavailable');
31533130
return;
31543131
}
3155-
if (mode === 'service-map') {
3156-
unmountDockerIsolatedViews('service-map');
3157-
markDockerFatalBannerStep('Docker service map active');
3158-
recordDockerFatalBannerAction('Docker service map active');
3159-
const serviceMapApi = getDockerServiceMapApi();
3160-
if (serviceMapApi && typeof serviceMapApi.mount === 'function') {
3161-
return serviceMapApi.mount({
3162-
suppressLoadingUi: isDockerHostUpdateSyncSuspended()
3163-
});
3164-
}
3165-
markDockerFatalBannerStep('Docker service map unavailable, falling back to host list');
3166-
recordDockerFatalBannerAction('Docker service map unavailable');
3167-
return;
3168-
}
31693132
if (mode === 'tree-explorer') {
31703133
unmountDockerIsolatedViews('tree-explorer');
31713134
markDockerFatalBannerStep('Docker tree explorer active');

0 commit comments

Comments
 (0)