Fix Docker folder order persistence

Author: alexphillips-dev

archive/folderview.plus-2026.03.29.07.txz

@@ -0,0 +1 @@
+564dfcf82f3f63dfbe2e887f29e0e1f3a000fd49a5c69c7612634c4b39bb7067  folderview.plus-2026.03.29.07.txz

archive/folderview.plus-2026.03.29.07.txz.sha256

@@ -6,13 +6,18 @@
 <!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.29.06">
-<!ENTITY md5 "fbcbf84f31aa881f80a8d6e684f0b075">
+<!ENTITY version "2026.03.29.07">
+<!ENTITY md5 "0d0c50ec4da1ed297a6d44ac6107bebf">
 ]>
 
 <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.29.07
+- Fix: Preserve dragged Docker folder order across refreshes instead of re-sorting folder placeholders back to folder definition order.
+- Quality: Add regression coverage for Docker runtime folder-slot repair and server-side order sync placeholder preservation.
+
+
 ###2026.03.29.06
 - Fix: Stop Docker WebUI buttons and Open all WebUIs from using unresolved template URLs like http://[IP]:[PORT:80] during the lightweight runtime pass.
 - Maintenance: Rebuild folder runtime WebUI targets after full Docker detail hydration so resolved ports replace stale placeholder values.

folderview.plus.plg

@@ -1779,15 +1779,32 @@ const reorderFolderSlotsInBaseOrder = (baseOrder, folders, prefs) => {
     if (!desiredFolderTokens.length) {
         return order;
     }
-    let desiredIndex = 0;
+    const liveFolderTokens = new Set();
+    order.forEach((entry) => {
+        if (!folderRegex.test(entry)) {
+            return;
+        }
+        const folderId = entry.replace(folderRegex, '');
+        if (Object.prototype.hasOwnProperty.call(folderMap, folderId)) {
+            liveFolderTokens.add(entry);
+        }
+    });
+    const missingDesiredTokens = desiredFolderTokens.filter((token) => !liveFolderTokens.has(token));
+    const usedFolderTokens = new Set();
+    let missingIndex = 0;
     return order.map((entry) => {
         if (!folderRegex.test(entry)) {
             return entry;
         }
-        while (desiredIndex < desiredFolderTokens.length) {
-            const candidate = desiredFolderTokens[desiredIndex++];
-            const candidateId = candidate.replace(folderRegex, '');
-            if (Object.prototype.hasOwnProperty.call(folderMap, candidateId)) {
+        const folderId = entry.replace(folderRegex, '');
+        if (Object.prototype.hasOwnProperty.call(folderMap, folderId) && !usedFolderTokens.has(entry)) {
+            usedFolderTokens.add(entry);
+            return entry;
+        }
+        while (missingIndex < missingDesiredTokens.length) {
+            const candidate = missingDesiredTokens[missingIndex++];
+            if (!usedFolderTokens.has(candidate)) {
+                usedFolderTokens.add(candidate);
                 return candidate;
             }
         }

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

@@ -5183,11 +5183,13 @@ function syncContainerOrder(string $type): void {
         $newOrder = [];
         $seen = [];
         $folderPlaceholders = array_keys($folderContainers);
+        $orderedFolderPlaceholders = [];
 
-        // Preserve non-folder container order from userprefs, but always rebuild
-        // folder placeholder order from docker.json to avoid stale/reversed order.
         foreach ($currentOrder as $item) {
             if (in_array($item, $folderPlaceholders, true)) {
+                if (!in_array($item, $orderedFolderPlaceholders, true)) {
+                    $orderedFolderPlaceholders[] = $item;
+                }
                 continue;
             }
             if (in_array($item, $assignedContainers, true)) {
@@ -5206,8 +5208,15 @@ function syncContainerOrder(string $type): void {
             }
         }
 
-        // Append folders in folder definition order.
         foreach ($folderPlaceholders as $placeholder) {
+            if (!in_array($placeholder, $orderedFolderPlaceholders, true)) {
+                $orderedFolderPlaceholders[] = $placeholder;
+            }
+        }
+
+        // Preserve existing folder placeholder order from userprefs and only
+        // fall back to folder definition order for placeholders that are missing.
+        foreach ($orderedFolderPlaceholders as $placeholder) {
             foreach ($folderContainers[$placeholder] as $ct) {
                 if (!in_array($ct, $seen, true)) {
                     $newOrder[] = $ct;

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

@@ -0,0 +1,90 @@
+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'
+);
+const libPhp = fs.readFileSync(
+    path.join(repoRoot, 'src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/server/lib.php'),
+    'utf8'
+);
+
+const reorderFolderSlotsMatch = dockerJs.match(/const reorderFolderSlotsInBaseOrder = \(baseOrder, folders, prefs\) => \{([\s\S]*?)\n\};/);
+
+test('docker runtime preserves live folder placeholder order from host order on refresh', () => {
+    assert.ok(reorderFolderSlotsMatch, 'reorderFolderSlotsInBaseOrder definition should exist');
+    const reorderFolderSlotsInBaseOrder = new Function(
+        'baseOrder',
+        'folders',
+        'prefs',
+        'folderRegex',
+        'getPrefsOrderedFolderMap',
+        `${reorderFolderSlotsMatch[1]}`
+    );
+
+    const folderRegex = /^folder-/;
+    const folders = {
+        a: { name: '07' },
+        b: { name: '08' },
+        c: { name: '09' }
+    };
+    const prefs = {
+        sortMode: 'created',
+        manualOrder: []
+    };
+    const getPrefsOrderedFolderMap = () => ({
+        a: folders.a,
+        b: folders.b,
+        c: folders.c
+    });
+
+    const baseOrder = ['folder-a', 'folder-c', 'folder-b'];
+    const nextOrder = reorderFolderSlotsInBaseOrder(baseOrder, folders, prefs, folderRegex, getPrefsOrderedFolderMap);
+
+    assert.deepEqual(nextOrder, ['folder-a', 'folder-c', 'folder-b']);
+});
+
+test('docker runtime only backfills missing folder placeholders instead of reordering valid ones', () => {
+    assert.ok(reorderFolderSlotsMatch, 'reorderFolderSlotsInBaseOrder definition should exist');
+    const reorderFolderSlotsInBaseOrder = new Function(
+        'baseOrder',
+        'folders',
+        'prefs',
+        'folderRegex',
+        'getPrefsOrderedFolderMap',
+        `${reorderFolderSlotsMatch[1]}`
+    );
+
+    const folderRegex = /^folder-/;
+    const folders = {
+        a: { name: '07' },
+        b: { name: '08' },
+        c: { name: '09' }
+    };
+    const getPrefsOrderedFolderMap = () => ({
+        a: folders.a,
+        b: folders.b,
+        c: folders.c
+    });
+
+    const baseOrder = ['folder-stale', 'folder-c', 'folder-a'];
+    const nextOrder = reorderFolderSlotsInBaseOrder(baseOrder, folders, { sortMode: 'created' }, folderRegex, getPrefsOrderedFolderMap);
+
+    assert.deepEqual(nextOrder, ['folder-b', 'folder-c', 'folder-a']);
+});
+
+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]*?\}/
+    );
+    assert.match(
+        libPhp,
+        /foreach \(\$folderPlaceholders as \$placeholder\) \{[\s\S]*?if \(!in_array\(\$placeholder, \$orderedFolderPlaceholders, true\)\) \{[\s\S]*?\$orderedFolderPlaceholders\[\] = \$placeholder;[\s\S]*?\}[\s\S]*?\}/
+    );
+    assert.match(libPhp, /foreach \(\$orderedFolderPlaceholders as \$placeholder\) \{/);
+});