Sync Docker order after sort preference changes

Author: FolderView Plus Test

archive/folderview.plus-2026.04.05.03.txz.sha256

@@ -0,0 +1 @@
+bac31f4034bc2facdf47d51c71d0fb3078f56735b807b5ff06b17c851e3ee4a6  folderview.plus-2026.04.06.14.txz

archive/folderview.plus-2026.04.05.03.txz archive/folderview.plus-2026.04.06.14.txzarchive/folderview.plus-2026.04.05.03.txz renamed to archive/folderview.plus-2026.04.06.14.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.04.06.13">
-<!ENTITY md5 "7e2d4646de359a5ed8e089fa77d2bc09">
+<!ENTITY version "2026.04.06.14">
+<!ENTITY md5 "9c500e0ccf32fadb3200ad864b7ba84a">
 ]>
 
 <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.04.06.14
+- Fix: Docker runtime rows, folder state, and container interactions.
+- UX: Folder editor flows, previews, and bootstrap behavior.
+- Fix: Server endpoints, runtime payloads, and persistence or validation paths.
+
+
 ###2026.04.06.13
 - Fix: Docker runtime rows, folder state, and container interactions.
 

archive/folderview.plus-2026.04.06.14.txz.sha256

@@ -3490,9 +3490,10 @@ function syncContainerOrderUnlocked(): void {
             $labelTargetByName[$name] = getFolderLabelValueFromLabels($labels);
         }
 
+        $orderedFolders = reorderFolderMapByPrefs('docker', $folders);
         $folderContainers = [];
         $assignedContainers = [];
-        foreach ($folders as $folderId => $folder) {
+        foreach ($orderedFolders as $folderId => $folder) {
             $members = normalizeFolderMembers($folder['containers'] ?? []);
             if (!empty($folder['regex'])) {
                 $regex = '/' . str_replace('/', '\/', $folder['regex']) . '/';
@@ -3525,11 +3526,14 @@ function syncContainerOrderUnlocked(): void {
         $newOrder = [];
         $seen = [];
         $folderPlaceholders = array_keys($folderContainers);
+        $sortMode = (string)($prefs['sortMode'] ?? 'created');
+        $pinnedIds = normalizeStringIdList($prefs['pinnedFolderIds'] ?? []);
+        $preserveCurrentPlaceholderOrder = $sortMode === 'created' && count($pinnedIds) === 0;
         $orderedFolderPlaceholders = [];
 
         foreach ($currentOrder as $item) {
             if (in_array($item, $folderPlaceholders, true)) {
-                if (!in_array($item, $orderedFolderPlaceholders, true)) {
+                if ($preserveCurrentPlaceholderOrder && !in_array($item, $orderedFolderPlaceholders, true)) {
                     $orderedFolderPlaceholders[] = $item;
                 }
                 continue;
@@ -3550,10 +3554,14 @@ function syncContainerOrderUnlocked(): void {
             }
         }
 
-        foreach ($folderPlaceholders as $placeholder) {
-            if (!in_array($placeholder, $orderedFolderPlaceholders, true)) {
-                $orderedFolderPlaceholders[] = $placeholder;
+        if ($preserveCurrentPlaceholderOrder) {
+            foreach ($folderPlaceholders as $placeholder) {
+                if (!in_array($placeholder, $orderedFolderPlaceholders, true)) {
+                    $orderedFolderPlaceholders[] = $placeholder;
+                }
             }
+        } else {
+            $orderedFolderPlaceholders = $folderPlaceholders;
         }
 
         // Preserve existing folder placeholder order from userprefs and only

folderview.plus.plg

@@ -36,6 +36,14 @@
 
     $saved = writeTypePrefs($type, $next);
     syncManualOrderWithFolders($type, readRawFolderMap($type));
+    $dockerOrderChanged = $type === 'docker' && (
+        (string)($current['sortMode'] ?? 'created') !== (string)($saved['sortMode'] ?? 'created')
+        || normalizeStringIdList($current['manualOrder'] ?? []) !== normalizeStringIdList($saved['manualOrder'] ?? [])
+        || normalizeStringIdList($current['pinnedFolderIds'] ?? []) !== normalizeStringIdList($saved['pinnedFolderIds'] ?? [])
+    );
+    if ($dockerOrderChanged) {
+        syncContainerOrder('docker');
+    }
     try {
         appendDiagnosticsHistoryEvent('prefs_update', $type, [
             'traceId' => getRequestTraceId(),

src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.php

@@ -109,11 +109,16 @@ test('docker runtime only backfills missing folder placeholders when sort mode r
 test('docker order sync preserves current folder placeholder sequence before appending missing placeholders', () => {
     assert.match(
         libPhp,
-        /\$orderedFolderPlaceholders = \[\];[\s\S]*?foreach \(\$currentOrder as \$item\) \{[\s\S]*?if \(in_array\(\$item, \$folderPlaceholders, true\)\) \{[\s\S]*?\$orderedFolderPlaceholders\[\] = \$item;[\s\S]*?continue;[\s\S]*?\}/
+        /\$preserveCurrentPlaceholderOrder = \$sortMode === 'created' && count\(\$pinnedIds\) === 0;/
     );
     assert.match(
         libPhp,
-        /foreach \(\$folderPlaceholders as \$placeholder\) \{[\s\S]*?if \(!in_array\(\$placeholder, \$orderedFolderPlaceholders, true\)\) \{[\s\S]*?\$orderedFolderPlaceholders\[\] = \$placeholder;[\s\S]*?\}[\s\S]*?\}/
+        /if \(\$preserveCurrentPlaceholderOrder\) \{[\s\S]*?foreach \(\$folderPlaceholders as \$placeholder\) \{[\s\S]*?\$orderedFolderPlaceholders\[\] = \$placeholder;[\s\S]*?\}[\s\S]*?\} else \{[\s\S]*?\$orderedFolderPlaceholders = \$folderPlaceholders;[\s\S]*?\}/
     );
     assert.match(libPhp, /foreach \(\$orderedFolderPlaceholders as \$placeholder\) \{/);
 });
+
+test('docker order sync uses prefs-ordered folders when explicit sort or pinning is active', () => {
+    assert.match(libPhp, /\$orderedFolders = reorderFolderMapByPrefs\('docker', \$folders\);/);
+    assert.match(libPhp, /foreach \(\$orderedFolders as \$folderId => \$folder\) \{/);
+});

src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/prefs.php

@@ -671,6 +671,8 @@ test('prefs endpoint no longer rewrites retired folder editor mode flags', () =>
     );
     assert.doesNotMatch(prefsPhp, /array_key_exists\('folderEditorMode', \$decoded\)/);
     assert.doesNotMatch(prefsPhp, /\$decoded\['folderEditorModeExplicit'\] = true;/);
+    assert.match(prefsPhp, /\$dockerOrderChanged = \$type === 'docker' && \(/);
+    assert.match(prefsPhp, /if \(\$dockerOrderChanged\) \{\s*syncContainerOrder\('docker'\);\s*\}/);
 });
 
 test('runtime folder editor routes defer editor mode resolution to Folder.page server prefs', () => {