Fix docker folder row regression and move quick actions to context menu top

alexphillips-dev · alexphillips-dev · commit 37cc702f5db3 · 2026-03-20T14:19:49.000-04:00
diff --git a/archive/folderview.plus-2026.03.19.15.txz.sha256 b/archive/folderview.plus-2026.03.19.15.txz.sha256
diff --git a/archive/folderview.plus-2026.03.20.11.txz b/archive/folderview.plus-2026.03.20.11.txz
diff --git a/archive/folderview.plus-2026.03.20.11.txz.sha256 b/archive/folderview.plus-2026.03.20.11.txz.sha256
@@ -0,0 +1 @@
+f76c1f6d11b314a54bd0c3b4bd4506ad38a9ce085139b7e8d542815d377dc95b  folderview.plus-2026.03.20.11.txz
diff --git a/folderview.plus.plg b/folderview.plus.plg
@@ -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.20.10">
-<!ENTITY md5 "aa32b9e8cb8c6f3139a9c124e8779d9e">
+<!ENTITY version "2026.03.20.11">
+<!ENTITY md5 "fce4cb8d9ae6540de09ea38d87ecf076">
 ]>
 
 <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.20.11
+- Fix: Restored Docker folder rows after row-action regression that hid folder names.
+- UX: Moved `Focus`, `Pin/Unpin`, and `Lock/Unlock` into the top of the existing folder click menu.
+- Regression guard: Restored right-side dropdown gutter/padding contract to prevent Version column clipping.
+
+
 ###2026.03.20.10
 - Feature: Added one-click folder-row quick actions for `Focus`, `Pin/Unpin`, and `Lock/Unlock` in Docker tab.
 - UX: Added focused-folder mode to isolate a selected folder branch (with nested-aware visibility handling).
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/docker.js
@@ -2358,16 +2358,10 @@ const createFolder = (folder, id, positionInMainOrder, liveOrderArray, container
     const pinned = isDockerFolderPinned(id);
     const locked = isDockerFolderLocked(id);
     const focused = dockerFocusedFolderId === id;
-    const focusTitle = focused ? 'Clear focus' : 'Focus folder';
-    const pinTitle = pinned ? 'Unpin folder' : 'Pin folder';
-    const lockTitle = locked ? 'Unlock folder' : 'Lock folder';
-    const focusIcon = focused ? 'fa-dot-circle-o' : 'fa-bullseye';
-    const pinIcon = pinned ? 'fa-star' : 'fa-star-o';
-    const lockIcon = locked ? 'fa-lock' : 'fa-unlock-alt';
     const lockedClass = locked ? 'fv-folder-locked' : '';
     const pinnedClass = pinned ? 'fv-folder-pinned' : '';
     const focusedClass = focused ? 'fv-folder-focused' : '';
-    const fld = `<tr class="sortable folder-id-${id} ${hoverClass} ${lockedClass} ${pinnedClass} ${focusedClass} folder"><td class="ct-name folder-name"><div class="folder-name-sub"><i class="fa fa-arrows-v mover orange-text"></i><span class="outer folder-outer"><span id="${id}" onclick="addDockerFolderContext('${id}')" class="hand folder-hand"><img src="${safeFolderIcon}" class="img folder-img" onerror='this.src="/plugins/dynamix.docker.manager/images/question.png"'></span><span class="inner folder-inner"><span class="appname" style="display: none;"><a>folder-${id}</a></span><a class="exec folder-appname" onclick='editFolder("${id}")'>${safeFolderName}</a><br><i id="load-folder-${id}" class="fa fa-square stopped folder-load-status"></i><span class="state folder-state fv-folder-state-stopped"> ${$.i18n('stopped')}</span></span></span><span class="fv-folder-row-actions"><button type="button" class="fv-folder-row-action fv-folder-row-action-focus ${focused ? 'is-active' : ''}" data-folder-id="${id}" title="${focusTitle}" aria-label="${focusTitle}" onclick="event.preventDefault();event.stopPropagation();toggleDockerFolderFocus('${id}')"><i class="fa ${focusIcon}" aria-hidden="true"></i></button><button type="button" class="fv-folder-row-action fv-folder-row-action-pin ${pinned ? 'is-active' : ''}" data-folder-id="${id}" title="${pinTitle}" aria-label="${pinTitle}" onclick="event.preventDefault();event.stopPropagation();toggleDockerFolderPin('${id}')"><i class="fa ${pinIcon}" aria-hidden="true"></i></button><button type="button" class="fv-folder-row-action fv-folder-row-action-lock ${locked ? 'is-active' : ''}" data-folder-id="${id}" title="${lockTitle}" aria-label="${lockTitle}" onclick="event.preventDefault();event.stopPropagation();toggleDockerFolderLock('${id}')"><i class="fa ${lockIcon}" aria-hidden="true"></i></button></span><button class="dropDown-${id} folder-dropdown" onclick="dropDownButton('${id}')" ><i class="fa fa-chevron-down" aria-hidden="true"></i></button></div></td><td class="updatecolumn folder-update"><span class="green-text folder-update-text"><i class="fa fa-check fa-fw"></i> ${$.i18n('up-to-date')}</span><div class="advanced" style="display: ${advanced ? 'block' : 'none'};"><a class="exec" onclick="forceUpdateFolder('${id}');"><span style="white-space:nowrap;"><i class="fa fa-cloud-download fa-fw"></i> ${$.i18n('force-update')}</span></a></div></td><td colspan="${colspan}"><div class="folder-storage"></div><div class="folder-preview"></div></td><td class="advanced folder-advanced" ${advanced ? 'style="display: table-cell;"' : ''}><span class="cpu-folder-${id} folder-cpu">0%</span><div class="usage-disk mm folder-load"><span id="cpu-folder-${id}" class="folder-cpu-bar" style="width:0%"></span><span></span></div><br><span class="mem-folder-${id} folder-mem">0 / 0</span></td><td class="folder-autostart"><input type="checkbox" id="folder-${id}-auto" class="autostart" style="display:none"><div style="clear:left"></div></td><td></td></tr>`;
+    const fld = `<tr class="sortable folder-id-${id} ${hoverClass} ${lockedClass} ${pinnedClass} ${focusedClass} folder"><td class="ct-name folder-name"><div class="folder-name-sub"><i class="fa fa-arrows-v mover orange-text"></i><span class="outer folder-outer"><span id="${id}" onclick="addDockerFolderContext('${id}')" class="hand folder-hand"><img src="${safeFolderIcon}" class="img folder-img" onerror='this.src="/plugins/dynamix.docker.manager/images/question.png"'></span><span class="inner folder-inner"><span class="appname" style="display: none;"><a>folder-${id}</a></span><a class="exec folder-appname" onclick='editFolder("${id}")'>${safeFolderName}</a><br><i id="load-folder-${id}" class="fa fa-square stopped folder-load-status"></i><span class="state folder-state fv-folder-state-stopped"> ${$.i18n('stopped')}</span></span></span><button class="dropDown-${id} folder-dropdown" onclick="dropDownButton('${id}')" ><i class="fa fa-chevron-down" aria-hidden="true"></i></button></div></td><td class="updatecolumn folder-update"><span class="green-text folder-update-text"><i class="fa fa-check fa-fw"></i> ${$.i18n('up-to-date')}</span><div class="advanced" style="display: ${advanced ? 'block' : 'none'};"><a class="exec" onclick="forceUpdateFolder('${id}');"><span style="white-space:nowrap;"><i class="fa fa-cloud-download fa-fw"></i> ${$.i18n('force-update')}</span></a></div></td><td colspan="${colspan}"><div class="folder-storage"></div><div class="folder-preview"></div></td><td class="advanced folder-advanced" ${advanced ? 'style="display: table-cell;"' : ''}><span class="cpu-folder-${id} folder-cpu">0%</span><div class="usage-disk mm folder-load"><span id="cpu-folder-${id}" class="folder-cpu-bar" style="width:0%"></span><span></span></div><br><span class="mem-folder-${id} folder-mem">0 / 0</span></td><td class="folder-autostart"><input type="checkbox" id="folder-${id}-auto" class="autostart" style="display:none"><div style="clear:left"></div></td><td></td></tr>`;
     if (FOLDER_VIEW_DEBUG_MODE) console.log(`[FV3_DEBUG] createFolder (id: ${id}): colspan=${colspan}. Generated folder HTML (fld).`);
 
     if (positionInMainOrder === 0) {
@@ -4169,12 +4163,41 @@ const addDockerFolderContext = (id) => {
     }
     const folderData = globalFolders[id];
     const hasChildren = folderHasChildren(id);
+    const focused = dockerFocusedFolderId === id;
+    const pinned = isDockerFolderPinned(id);
+    const locked = isDockerFolderLocked(id);
     const directScopeContainers = getScopedRuntimeContainersForFolder(id, false);
     const branchScopeContainers = getScopedRuntimeContainersForFolder(id, true);
     const directCounts = summarizeFolderActionCounts(directScopeContainers);
     const branchCounts = summarizeFolderActionCounts(branchScopeContainers);
     if (FOLDER_VIEW_DEBUG_MODE) console.log(`[FV3_DEBUG] addDockerFolderContext (id: ${id}): Folder data:`, {...folderData});
 
+    opts.push({
+        text: focused ? 'Clear focus' : 'Focus folder',
+        icon: focused ? 'fa-dot-circle-o' : 'fa-bullseye',
+        action: (evt) => {
+            evt.preventDefault();
+            toggleDockerFolderFocus(id);
+        }
+    });
+    opts.push({
+        text: pinned ? 'Unpin folder' : 'Pin folder',
+        icon: pinned ? 'fa-star' : 'fa-star-o',
+        action: (evt) => {
+            evt.preventDefault();
+            toggleDockerFolderPin(id);
+        }
+    });
+    opts.push({
+        text: locked ? 'Unlock folder' : 'Lock folder',
+        icon: locked ? 'fa-lock' : 'fa-unlock-alt',
+        action: (evt) => {
+            evt.preventDefault();
+            toggleDockerFolderLock(id);
+        }
+    });
+    appendDivider();
+
 
     if (folderData.settings.folder_webui && folderData.settings.folder_webui_url) {
         opts.push({
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/docker.css b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/styles/docker.css
@@ -162,7 +162,7 @@ td.ct-name.folder-name > .folder-name-sub {
     position: absolute;
     top: 50%;
     left: 8px;
-    right: 8px;
+    right: 28px;
     transform: translateY(-50%);
     min-height: 0;
     width: auto;
@@ -176,7 +176,7 @@ td.ct-name.folder-name > .folder-name-sub {
     gap: 6px;
     min-width: 0;
     flex: 1 1 auto;
-    max-width: calc(var(--fvplus-docker-app-column-width) - 170px);
+    max-width: calc(var(--fvplus-docker-app-column-width) - 106px);
 }
 
 .folder-hand {
@@ -203,7 +203,7 @@ td.ct-name.folder-name > .folder-name-sub {
     padding: 0 4px;
     min-width: 18px;
     height: 18px;
-    margin: 0 12px 0 4px;
+    margin: 0 16px 0 auto;
     flex: 0 0 auto;
     display: inline-flex;
     align-items: center;
@@ -214,48 +214,6 @@ td.ct-name.folder-name > .folder-name-sub {
     box-shadow: none !important;
 }
 
-.fv-folder-row-actions {
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-    margin-left: auto;
-    flex: 0 0 auto;
-}
-
-.fv-folder-row-action {
-    width: 17px;
-    height: 17px;
-    min-width: 17px;
-    border: 0 !important;
-    border-radius: 3px;
-    background: transparent !important;
-    color: var(--orange) !important;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    padding: 0;
-    line-height: 1;
-    box-shadow: none !important;
-    opacity: 0.86;
-}
-
-.fv-folder-row-action:hover,
-.fv-folder-row-action:focus,
-.fv-folder-row-action:active {
-    background: rgba(255, 138, 36, 0.18) !important;
-    box-shadow: none !important;
-    opacity: 1;
-}
-
-.fv-folder-row-action.is-active {
-    background: rgba(255, 138, 36, 0.2) !important;
-    opacity: 1;
-}
-
-.fv-folder-row-action > i {
-    font-size: 10px;
-}
-
 tr.fv-folder-focused td.ct-name.folder-name {
     box-shadow: inset 2px 0 0 rgba(0, 170, 255, 0.85);
 }
@@ -270,10 +228,6 @@ tr.fv-folder-locked .folder-appname {
     pointer-events: none;
 }
 
-tr.fv-folder-locked .fv-folder-row-action-lock {
-    opacity: 1;
-}
-
 .fv-folder-focus-hidden {
     display: none !important;
 }
diff --git a/tests/docker-folder-row-quick-actions.test.mjs b/tests/docker-folder-row-quick-actions.test.mjs
@@ -9,13 +9,14 @@ const dockerScript = fs.readFileSync(
     'utf8'
 );
 
-test('docker runtime renders one-click focus/pin/lock row actions', () => {
-    assert.match(dockerScript, /fv-folder-row-action-focus/);
-    assert.match(dockerScript, /fv-folder-row-action-pin/);
-    assert.match(dockerScript, /fv-folder-row-action-lock/);
-    assert.match(dockerScript, /toggleDockerFolderFocus\('/);
-    assert.match(dockerScript, /toggleDockerFolderPin\('/);
-    assert.match(dockerScript, /toggleDockerFolderLock\('/);
+test('docker context menu keeps focus/pin/lock quick actions at the top', () => {
+    assert.match(dockerScript, /text:\s*focused \? 'Clear focus' : 'Focus folder'/);
+    assert.match(dockerScript, /text:\s*pinned \? 'Unpin folder' : 'Pin folder'/);
+    assert.match(dockerScript, /text:\s*locked \? 'Unlock folder' : 'Lock folder'/);
+    assert.match(dockerScript, /toggleDockerFolderFocus\(id\)/);
+    assert.match(dockerScript, /toggleDockerFolderPin\(id\)/);
+    assert.match(dockerScript, /toggleDockerFolderLock\(id\)/);
+    assert.doesNotMatch(dockerScript, /fv-folder-row-actions/);
 });
 
 test('docker runtime exposes and applies focus\/lock state guards', () => {
diff --git a/tests/docker-mobile-name-alignment-guard.test.mjs b/tests/docker-mobile-name-alignment-guard.test.mjs
@@ -25,8 +25,8 @@ test('docker mobile app-name width contract keeps long names visible before elli
 
 test('docker folder dropdown keeps right gutter to avoid version-column clipping', () => {
     assert.match(dockerCss, /\.folder-dropdown\s*\{[\s\S]*min-width:\s*18px/);
-    assert.match(dockerCss, /\.folder-dropdown\s*\{[\s\S]*margin:\s*0 12px 0 4px/);
-    assert.match(dockerCss, /\.fv-folder-row-actions\s*\{[\s\S]*margin-left:\s*auto/);
+    assert.match(dockerCss, /\.folder-dropdown\s*\{[\s\S]*margin:\s*0 16px 0 auto/);
+    assert.match(dockerCss, /td\.ct-name\.folder-name > \.folder-name-sub\s*\{[\s\S]*right:\s*28px/);
     assert.match(dockerCss, /\.folder-dropdown > i\s*\{[\s\S]*font-size:\s*12px/);
 });
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+f76c1f6d11b314a54bd0c3b4bd4506ad38a9ce085139b7e8d542815d377dc95b folderview.plus-2026.03.20.11.txz`