Merge dev into main for 2026.03.30.19 release

Author: alexphillips-dev

archive/folderview.plus-2026.03.29.19.txz.sha256

@@ -0,0 +1 @@
+5cadfaa0509cb1d395137b3fe1533148619b7b4611ae3071bd963eaa4a0b612d  folderview.plus-2026.03.30.19.txz

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

@@ -6,13 +6,19 @@
 <!ENTITY launch "Settings/FolderViewPlus">
 <!ENTITY plugdir "/usr/local/emhttp/plugins/&name;">
 <!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/main/folderview.plus.plg">
-<!ENTITY version "2026.03.30.18">
-<!ENTITY md5 "f97e5b9f93849f7058f56b986536b224">
+<!ENTITY version "2026.03.30.19">
+<!ENTITY md5 "b40c1ce2317f502819d859321fabe642">
 ]>
 
 <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: Resolve the remaining Docker page double-reload path during initial bootstrap when Unraid refreshes the staged request bundle while FolderView Plus is still rendering folders.
+- Fix: Replay queued Docker folder renders in place against the newest staged request bundle instead of forcing a second host `loadlist()` cycle after the page has already refreshed.
+- UX: Suppress the extra Docker runtime loading shell during that in-place replay so the Docker 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.18
 - Feature: Add optional per-folder `Accent color` support across Docker folders, VM folders, Dashboard cards, and the folder editor live preview, including smart-default and template inheritance plus the consolidated Accent card and live swatch UX.
 - Fix: Remove the extra Docker reload cycle during deferred runtime hydration by updating preview actions and tooltip payloads in place, suppressing the duplicate FolderView Plus loading shell, and routing runtime info reads through no-cache helpers so fresh state and WebUI metadata stay in sync.
@@ -23,7 +29,6 @@
 - Fix: Stop Docker advanced preview context popups configured for click from opening on the first hover interaction.
 - Quality: Add the dev version-bump push guard and expand regression coverage for hydration, accent color, folder actions, layout, and tooltip trigger mode changes.
 
-
 ###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.30.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();
             }
         });
 };

folderview.plus.plg

@@ -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]*?\};/);
+});

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

@@ -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', () => {

tests/docker-double-reload-regression.test.mjs

@@ -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', () => {

tests/docker-folder-row-quick-actions.test.mjs

@@ -126,13 +126,15 @@ test('runtime refresh uses lightweight state mode checks before re-rendering', (
     assert.match(dockerJs, /const queueCreateFoldersRender = \(\) =>/);
     assert.match(vmJs, /const queueCreateFoldersRender = \(\) =>/);
     assert.match(dashboardJs, /const queueCreateFoldersRender = \(\) =>/);
+    assert.match(dockerJs, /if \(createFoldersQueued\) \{\s*createFoldersQueued = false;[\s\S]*?nextDockerRenderSuppressLoadingUi = true;\s*queueCreateFoldersRender\(\);\s*\}/s);
+    assert.doesNotMatch(dockerJs, /if \(createFoldersQueued\) \{\s*createFoldersQueued = false;\s*queueLoadlistRefresh\(\);\s*\}/s);
     assert.match(dockerJs, /const readDockerHostOrderFromDom = \(\) =>/);
     assert.match(dockerJs, /const queueDockerDeferredRuntimeInfoHydration = \(generation,\s*stateSignature,\s*fullInfoPromise = null\) =>/);
     assert.match(dockerJs, /let dockerHostLoadOwnsLoadingUi = false;/);
     assert.match(dockerJs, /const shouldSuppressDockerRuntimeLoadingUi = \(\) => dockerHostLoadOwnsLoadingUi \|\| nextDockerRenderSuppressLoadingUi \|\| activeDockerRenderSuppressLoadingUi;/);
-    assert.match(dockerJs, /const buildDockerWebuiSignature = \(source\) =>/);
-    assert.match(dockerJs, /\|\$\{state\.Updated === false \? 'u' : \(state\.Updated === true \? 'c' : '\?'\)\}/);
-    assert.match(dockerJs, /if \(previousWebuiSignature !== nextWebuiSignature\) \{\s*queueLoadlistRefresh\(\);\s*return;\s*\}/s);
+    assert.match(dockerJs, /dockerRuntimeInfoByName = normalizeDockerRuntimeInfoMap\(parsed,\s*dockerRuntimeInfoByName\);[\s\S]*syncDockerVisibleFoldersFromRuntimeCache\(\);/);
+    assert.doesNotMatch(dockerJs, /const buildDockerWebuiSignature = \(source\) =>/);
+    assert.doesNotMatch(dockerJs, /if \(previousWebuiSignature !== nextWebuiSignature\) \{\s*queueLoadlistRefresh\(\);\s*return;\s*\}/s);
     assert.doesNotMatch(dockerJs, /applyDockerPinnedFolderIds\(Array\.isArray\(response\?\.prefs\?\.pinnedFolderIds\) \? response\.prefs\.pinnedFolderIds : nextPinned\);\s*syncDockerPinnedFolderUi\(\);\s*queueLoadlistRefresh\(/s);
     assert.match(dockerJs, /const yieldDockerRenderLoop = async \(processedCount,\s*totalCount\) =>/);
     assert.match(dockerJs, /dockerHostLoadOwnsLoadingUi = true;\s*if \(FOLDER_VIEW_DEBUG_MODE\) console\.log\('\[FV3_DEBUG\] Patched listview: loadedFolder is false\. Queueing createFolders render\.'/);