Fix folder editor bulk move post-apply lockup

Author: alexphillips-dev

archive/folderview.plus-2026.04.04.14.txz.sha256

@@ -0,0 +1 @@
+1298d40b68ffaa64600cc049530b05a964ba16cabffc6271db23b1e64283067d  folderview.plus-2026.04.05.10.txz

archive/folderview.plus-2026.04.04.14.txz archive/folderview.plus-2026.04.05.10.txzarchive/folderview.plus-2026.04.04.14.txz renamed to archive/folderview.plus-2026.04.05.10.txz

@@ -6,13 +6,17 @@
 <!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.05.09">
-<!ENTITY md5 "9ec5159372e5b36652993d96c01ea953">
+<!ENTITY version "2026.04.05.10">
+<!ENTITY md5 "3a4004b27877f1a3bc0698d9d12f9329">
 ]>
 
 <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.05.10
+- UX: Folder editor flows, previews, and bootstrap behavior.
+
+
 ###2026.04.05.09
 - Quality: Release automation, CI smoke coverage, and packaging guards.
 - Docs: Project documentation and support guidance.

archive/folderview.plus-2026.04.05.10.txz.sha256

@@ -388,6 +388,8 @@ let editorMode = 'basic';
 let activeEditorSection = 'general';
 let advancedSectionCollapsedState = {};
 let memberBulkMoveInFlight = false;
+let memberBulkMoveUndoState = null;
+let memberBulkMoveUndoInFlight = false;
 const SMART_DEFAULT_FIELD_NAMES = new Set([
     'icon',
     'preview',
@@ -4383,6 +4385,11 @@ function syncMemberSnapshotBaseline() {
     updateChangeSummaryPanel();
 }
 
+function clearMemberBulkMoveUndoState() {
+    memberBulkMoveUndoState = null;
+    memberBulkMoveUndoInFlight = false;
+}
+
 const applyMemberBulkMoveResultLocally = (targetFolderId, movedNames = []) => {
     const safeTargetFolderId = String(targetFolderId || '').trim();
     const uniqueNames = Array.from(new Set((Array.isArray(movedNames) ? movedNames : []).map((name) => String(name || '').trim()).filter(Boolean)));
@@ -4451,42 +4458,37 @@ const restoreEditorBulkMoveBackup = async (backupName) => {
     return response.restore || {};
 };
 
-const offerMemberBulkMoveUndo = async (backup, successMessage) => {
-    const backupName = String(backup?.name || '').trim();
-    if (!backupName) {
+function setMemberBulkMoveUndoState(backup, successMessage) {
+    memberBulkMoveUndoState = {
+        backupName: String(backup?.name || '').trim(),
+        message: String(successMessage || '').trim() || 'Bulk move complete.'
+    };
+    memberBulkMoveUndoInFlight = false;
+}
+
+async function undoEditorMemberBulkMove() {
+    const backupName = String(memberBulkMoveUndoState?.backupName || '').trim();
+    if (!backupName || memberBulkMoveUndoInFlight) {
+        return false;
+    }
+    memberBulkMoveUndoInFlight = true;
+    updateMemberBulkMoveUi();
+    try {
+        await restoreEditorBulkMoveBackup(backupName);
+        suppressUnloadPrompt = true;
+        location.reload();
+        return true;
+    } catch (error) {
+        memberBulkMoveUndoInFlight = false;
+        updateMemberBulkMoveUi();
         swal({
-            title: 'Bulk move complete',
-            text: successMessage,
-            type: 'success'
+            title: 'Undo failed',
+            text: extractAjaxErrorMessage(error, 'bulk move undo'),
+            type: 'error'
         });
-        return;
+        return false;
     }
-    swal({
-        title: 'Bulk move complete',
-        text: `${successMessage}\n\nBackup created: ${backupName}\nUndo will reload this editor.`,
-        type: 'success',
-        showCancelButton: true,
-        confirmButtonText: 'Undo',
-        cancelButtonText: 'Close',
-        closeOnConfirm: false,
-        showLoaderOnConfirm: true
-    }, async (confirmed) => {
-        if (!confirmed) {
-            return;
-        }
-        try {
-            await restoreEditorBulkMoveBackup(backupName);
-            suppressUnloadPrompt = true;
-            location.reload();
-        } catch (error) {
-            swal({
-                title: 'Undo failed',
-                text: extractAjaxErrorMessage(error, 'bulk move undo'),
-                type: 'error'
-            });
-        }
-    });
-};
+}
 
 async function applyEditorMemberBulkMove() {
     if (memberBulkMoveInFlight) {
@@ -4573,6 +4575,7 @@ async function applyEditorMemberBulkMove() {
             return;
         }
         memberBulkMoveInFlight = true;
+        clearMemberBulkMoveUndoState();
         updateMemberBulkMoveUi();
         try {
             const preludeLines = sharedApi.buildBulkAssignmentPreludeLines(plan, {
@@ -4596,13 +4599,14 @@ async function applyEditorMemberBulkMove() {
             });
             if (executionResult?.cancelled) {
                 $('#fvMemberBulkSummary').text(executionResult.summary || 'Bulk move is already running.');
+                swal.close();
                 return;
             }
+            swal.close();
             applyMemberBulkMoveResultLocally(plan.targetFolderId, executionResult?.lines?.filter((entry) => entry.status === 'success').map((entry) => entry.name) || []);
             const successMessage = executionResult?.summary || `Moved ${plan.actionableNames.length} item${plan.actionableNames.length === 1 ? '' : 's'}.`;
-            $('#fvMemberBulkSummary').text(successMessage);
-            swal.close();
-            await offerMemberBulkMoveUndo(executionResult?.backup || null, successMessage);
+            setMemberBulkMoveUndoState(executionResult?.backup || null, successMessage);
+            updateMemberBulkMoveUi();
         } catch (error) {
             $('#fvMemberBulkSummary').text('Bulk move failed.');
             swal({
@@ -4636,6 +4640,26 @@ function updateMemberBulkMoveUi() {
     if (memberBulkMoveInFlight) {
         return;
     }
+    if (memberBulkMoveUndoState) {
+        const successText = escapeHtml(String(memberBulkMoveUndoState.message || 'Bulk move complete.'));
+        const backupName = escapeHtml(String(memberBulkMoveUndoState.backupName || '').trim());
+        if (memberBulkMoveUndoInFlight && backupName) {
+            summaryNode.html(`<span class="fv-member-bulk-summary-text">${successText} Restoring backup ${backupName}...</span>`);
+            return;
+        }
+        if (backupName) {
+            summaryNode.html(`
+                <span class="fv-member-bulk-summary-text">${successText} Backup created: ${backupName}.</span>
+                <button type="button" id="fvMemberBulkUndo" class="fv-member-bulk-inline-action">Undo</button>
+            `);
+            $('#fvMemberBulkUndo').off('click').on('click', () => {
+                void undoEditorMemberBulkMove();
+            });
+            return;
+        }
+        summaryNode.html(`<span class="fv-member-bulk-summary-text">${successText}</span>`);
+        return;
+    }
     if ((scopeDetails.movableCount || 0) <= 0) {
         summaryNode.text(scopeDetails.skippedRegexNames.length > 0
             ? 'Current scope only contains regex-controlled members. Those stay controlled by rules.'

folderview.plus.plg

@@ -1963,11 +1963,32 @@ body[data-fvplus-host-theme="white"] #fvEditorActionBar,
 }
 
 .fv-member-bulk-summary {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 0.55em;
     color: var(--fv-editor-muted);
     font-size: 0.96rem;
     line-height: 1.35;
 }
 
+.fv-member-bulk-summary-text {
+    min-width: 0;
+}
+
+.fv-member-bulk-inline-action {
+    border: 0;
+    border-radius: 999px;
+    padding: 0.28em 0.9em;
+    background: linear-gradient(180deg, var(--fv-editor-button-bg-top), var(--fv-editor-button-bg-bottom));
+    color: var(--fv-editor-button-fg);
+    box-shadow: var(--fv-editor-button-shadow);
+    font-size: 0.86rem;
+    font-weight: 700;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+}
+
 .fv-member-chip {
     display: inline-flex;
     align-items: center;

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

@@ -36,10 +36,15 @@ test('folder editor members tab renders compact bulk move controls and blocks un
     assert.match(folderJs, /renderMemberBulkMoveTargets\(\);/);
     assert.match(folderJs, /applyMemberBulkMoveResultLocally\(plan\.targetFolderId/);
     assert.match(folderJs, /syncMemberSnapshotBaseline\(\);/);
+    assert.match(folderJs, /memberBulkMoveUndoState = \{/);
+    assert.match(folderJs, /id="fvMemberBulkUndo"/);
+    assert.match(folderJs, /void undoEditorMemberBulkMove\(\);/);
+    assert.doesNotMatch(folderJs, /title: 'Bulk move complete'/);
 });
 
 test('folder editor styles include dedicated member bulk move layout hooks', () => {
     assert.match(folderCss, /\.fv-member-bulk-row\s*\{/);
     assert.match(folderCss, /\.fv-member-bulk-controls\s*\{/);
     assert.match(folderCss, /\.fv-member-bulk-summary\s*\{/);
+    assert.match(folderCss, /\.fv-member-bulk-inline-action\s*\{/);
 });