Fix docker bootstrap double reload

Author: alexphillips-dev

archive/folderview.plus-2026.03.29.18.txz.sha256

@@ -0,0 +1 @@
+6c7db1b00df931a36548119b76b133e0937729bd89902172674603c866031138  folderview.plus-2026.03.30.19.txz

archive/folderview.plus-2026.03.29.19.txz

@@ -6,13 +6,19 @@
 <!ENTITY launch "Settings/FolderViewPlus">
 <!ENTITY plugdir "/usr/local/emhttp/plugins/&name;">
 <!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/dev/folderview.plus.plg">
-<!ENTITY version "2026.03.30.17">
-<!ENTITY md5 "b08a5b0aa4659eef6a3e4eafd57de99c">
+<!ENTITY version "2026.03.30.19">
+<!ENTITY md5 "333b926b727ed81bb85f4140c142f060">
 ]>
 
 <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">
     <CHANGES>
 
+###2026.03.30.19
+- Fix: Stop Docker bootstrap from forcing a second host reload when Unraid stages a newer request bundle while FolderView Plus is still rendering folders.
+- Fix: Drain queued Docker folder renders in place against the latest staged request bundle instead of scheduling another `loadlist()` cycle after the page has already refreshed.
+- UX: Suppress the extra Docker runtime loading shell when a queued bootstrap render replays in place so the page no longer flashes a second reload.
+- Regression guard: Cover the primed-request `listview()`/`loadlist()` bootstrap path and the deferred runtime hydration path so Docker refreshes stay in-place.
+
 ###2026.03.30.17
 - Fix: Stop Docker advanced preview context popups configured for click from eager-opening on the first hover interaction.
 - Quality: Trim the lazy tooltip trigger-mode fix so the Docker runtime stays inside the repo perf budget while preserving hover-mode eager-open behavior.

archive/folderview.plus-2026.03.29.19.txz.sha256

@@ -2812,18 +2812,6 @@ const syncDockerVisibleFoldersFromRuntimeCache = () => {
     applyDockerFocusedFolderState();
 };
 
-const buildDockerWebuiSignature = (source) => {
-    const map = source && typeof source === 'object' ? source : {};
-    const names = Object.keys(map).sort((a, b) => a.localeCompare(b));
-    if (!names.length) {
-        return '';
-    }
-    return names.map((name) => {
-        const state = map[name]?.info?.State && typeof map[name].info.State === 'object' ? map[name].info.State : {};
-        return `${name}:${getSafeWebuiUrl(state.WebUi)}|${getSafeWebuiUrl(state.TSWebUi)}|${state.Updated === false ? 'u' : (state.Updated === true ? 'c' : '?')}`;
-    }).join('|');
-};
-
 const queueDockerDeferredRuntimeInfoHydration = (generation, stateSignature, fullInfoPromise = null) => {
     const requestPromise = fullInfoPromise && typeof fullInfoPromise.then === 'function'
         ? fullInfoPromise
@@ -2846,18 +2834,12 @@ const queueDockerDeferredRuntimeInfoHydration = (generation, stateSignature, ful
             if (!parsed || Object.keys(parsed).length <= 0) {
                 return;
             }
-            const previousWebuiSignature = buildDockerWebuiSignature(dockerRuntimeInfoByName);
             dockerRuntimeInfoByName = normalizeDockerRuntimeInfoMap(parsed, dockerRuntimeInfoByName);
-            const nextWebuiSignature = buildDockerWebuiSignature(dockerRuntimeInfoByName);
             if (stateSignature) {
                 lastLiveRefreshStateSignature = stateSignature;
             }
             markDockerFatalBannerStep('Docker runtime details hydrated');
             recordDockerFatalBannerAction('Docker runtime details hydrated');
-            if (previousWebuiSignature !== nextWebuiSignature) {
-                queueLoadlistRefresh();
-                return;
-            }
             syncDockerVisibleFoldersFromRuntimeCache();
         })
         .catch(() => {});
@@ -3185,7 +3167,10 @@ const queueCreateFoldersRender = () => {
             createFoldersInFlight = false;
             if (createFoldersQueued) {
                 createFoldersQueued = false;
-                queueLoadlistRefresh();
+                // If Unraid queued a newer request bundle mid-render, replay FolderView Plus
+                // against the current DOM instead of forcing another host loadlist() cycle.
+                nextDockerRenderSuppressLoadingUi = true;
+                queueCreateFoldersRender();
             }
         });
 };

archive/folderview.plus-2026.03.29.18.txz archive/folderview.plus-2026.03.30.19.txzarchive/folderview.plus-2026.03.29.18.txz renamed to archive/folderview.plus-2026.03.30.19.txz

@@ -0,0 +1,18 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const repoRoot = path.resolve(process.cwd());
+const dockerJs = fs.readFileSync(
+    path.join(repoRoot, 'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js'),
+    'utf8'
+);
+
+test('docker queued bootstrap renders replay in place instead of forcing a second host loadlist', () => {
+    assert.match(dockerJs, /\/\/ Prime requests for environments where loadlist isn't called first\.\s*folderReq = buildDockerFolderReq\(\);/);
+    assert.match(dockerJs, /window\.loadlist = \(\) => \{[\s\S]*?loadedFolder = false;[\s\S]*?folderReq = buildDockerFolderReq\(\);/);
+    assert.match(dockerJs, /window\.listview = \(\) => \{[\s\S]*?if \(!loadedFolder\) \{[\s\S]*?queueCreateFoldersRender\(\);[\s\S]*?loadedFolder = true;/);
+    assert.match(dockerJs, /const queueCreateFoldersRender = \(\) => \{[\s\S]*?if \(createFoldersQueued\) \{\s*createFoldersQueued = false;[\s\S]*?nextDockerRenderSuppressLoadingUi = true;\s*queueCreateFoldersRender\(\);\s*\}[\s\S]*?\};/);
+    assert.doesNotMatch(dockerJs, /const queueCreateFoldersRender = \(\) => \{[\s\S]*?if \(createFoldersQueued\) \{\s*createFoldersQueued = false;\s*queueLoadlistRefresh\(\);\s*\}[\s\S]*?\};/);
+});

archive/folderview.plus-2026.03.30.19.txz.sha256

@@ -39,6 +39,8 @@ test('docker hydration refreshes existing preview actions in place instead of re
     assert.match(dockerScript, /const syncDockerLeafFolderPreviewActions = \(id,\s*folder,\s*runtimeContainers\) =>/);
     assert.match(dockerScript, /syncDockerLeafFolderPreviewActions\(id,\s*folder,\s*runtimeContainers\);/);
     assert.match(dockerScript, /\$preview\.find\('\[id\^="folder-preview-"\]'\)\.each\(\(_,\s*node\) => \{\s*\$\(node\)\.data\('fvTooltipLazyBuilt', false\);/s);
+    assert.match(dockerScript, /const queueDockerDeferredRuntimeInfoHydration = \(generation,\s*stateSignature,\s*fullInfoPromise = null\) => \{[\s\S]*?syncDockerVisibleFoldersFromRuntimeCache\(\);[\s\S]*?\}\)\s*\.catch\(\(\) => \{\}\);/);
+    assert.doesNotMatch(dockerScript, /const queueDockerDeferredRuntimeInfoHydration = \(generation,\s*stateSignature,\s*fullInfoPromise = null\) => \{[\s\S]*?const previousWebuiSignature/);
 });
 
 test('docker hydration refresh updates collapsed folder update columns from runtime cache', () => {

folderview.plus.plg

@@ -13,12 +13,10 @@ test('docker runtime preserves hydrated update flags when normalizing partial ru
     assert.match(dockerJs, /Updated:\s*sourceState\.Updated \?\? previousState\.Updated \?\? null/);
 });
 
-test('deferred docker runtime hydration rerenders when update availability changes', () => {
-    assert.match(dockerJs, /\|\$\{state\.Updated === false \? 'u' : \(state\.Updated === true \? 'c' : '\?'\)\}/);
-    assert.match(dockerJs, /const previousWebuiSignature = buildDockerWebuiSignature\(dockerRuntimeInfoByName\);/);
-    assert.match(dockerJs, /const nextWebuiSignature = buildDockerWebuiSignature\(dockerRuntimeInfoByName\);/);
-    assert.match(dockerJs, /previousWebuiSignature !== nextWebuiSignature/);
-    assert.match(dockerJs, /queueLoadlistRefresh\(\);\s*return;/);
+test('deferred docker runtime hydration refreshes visible folder state in place instead of reloading the page', () => {
+    assert.match(dockerJs, /const queueDockerDeferredRuntimeInfoHydration = \(generation,\s*stateSignature,\s*fullInfoPromise = null\) => \{[\s\S]*?dockerRuntimeInfoByName = normalizeDockerRuntimeInfoMap\(parsed,\s*dockerRuntimeInfoByName\);[\s\S]*?markDockerFatalBannerStep\('Docker runtime details hydrated'\);[\s\S]*?recordDockerFatalBannerAction\('Docker runtime details hydrated'\);[\s\S]*?syncDockerVisibleFoldersFromRuntimeCache\(\);[\s\S]*?\}\)\s*\.catch\(\(\) => \{\}\);/);
+    assert.doesNotMatch(dockerJs, /const queueDockerDeferredRuntimeInfoHydration = \(generation,\s*stateSignature,\s*fullInfoPromise = null\) => \{[\s\S]*?const previousWebuiSignature/);
+    assert.doesNotMatch(dockerJs, /const queueDockerDeferredRuntimeInfoHydration = \(generation,\s*stateSignature,\s*fullInfoPromise = null\) => \{[\s\S]*?const nextWebuiSignature/);
 });
 
 test('folder update-column renderer is reused across initial and synced folder state', () => {