Revert VM detail-row regrouping and restore rules workspace binding

Author: FolderView Plus Test

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

@@ -4044,6 +4044,7 @@ const downloadSelectedActiveRecoveryBackup = (...args) => getSettingsWorkspacesA
 const deleteSelectedActiveRecoveryBackup = (...args) => getSettingsWorkspacesApi().deleteSelectedActiveRecoveryBackup(...args);
 const runActiveRecoveryScheduler = (...args) => getSettingsWorkspacesApi().runActiveRecoveryScheduler(...args);
 const compareActiveRecoverySnapshots = (...args) => getSettingsWorkspacesApi().compareActiveRecoverySnapshots(...args);
+const setRulesWorkspaceType = (...args) => getSettingsWorkspacesApi().setRulesWorkspaceType(...args);
 const changeActiveBackupSchedulePref = (...args) => getSettingsWorkspacesApi().changeActiveBackupSchedulePref(...args);
 const undoActiveRecoveryChange = (...args) => getSettingsWorkspacesApi().undoActiveRecoveryChange(...args);
 const syncRulesWorkspaceUi = (...args) => getSettingsWorkspacesApi().syncRulesWorkspaceUi(...args);
@@ -9319,4 +9320,3 @@ settingsActionSupportModule.registerWindowActions(window, {
 
 
 
-

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

@@ -692,56 +692,6 @@ const readFolderOwnerFromRow = (row) => {
     }
     return '';
 };
-const isVmFolderMemberPrimaryRow = (row) => !!(row && row.nodeType === 1 && row.matches('tr.fv-vm-member-row'));
-const isVmFolderBoundaryRow = (row) => !!(row && row.nodeType === 1 && (row.matches('tr.folder') || isVmFolderMemberPrimaryRow(row)));
-const collectVmMemberRowGroup = (row) => {
-    if (!isVmFolderMemberPrimaryRow(row)) {
-        return [];
-    }
-    const group = [row];
-    let cursor = row.nextElementSibling;
-    while (cursor && !isVmFolderBoundaryRow(cursor)) {
-        group.push(cursor);
-        cursor = cursor.nextElementSibling;
-    }
-    return group;
-};
-const applyVmMemberRowGroupOwnership = (row, folderId) => {
-    const id = String(folderId || '').trim();
-    if (!id || !isVmFolderMemberPrimaryRow(row)) {
-        return [];
-    }
-    const ownerClass = `folder-${id}-element`;
-    const group = collectVmMemberRowGroup(row);
-    group.forEach((entry, index) => {
-        if (!entry || entry.nodeType !== 1) {
-            return;
-        }
-        entry.classList.add(ownerClass);
-        if (index > 0) {
-            entry.classList.add('fv-vm-member-detail-row');
-        }
-    });
-    return group;
-};
-const placeVmManagedDetailRowsAfterOwner = (ownerRow, detailRows, folderId) => {
-    if (!isVmFolderMemberPrimaryRow(ownerRow)) {
-        return;
-    }
-    const id = String(folderId || readFolderOwnerFromRow(ownerRow) || '').trim();
-    if (!id) {
-        return;
-    }
-    let insertAfter = collectVmMemberRowGroup(ownerRow).slice(-1)[0] || ownerRow;
-    for (const detailRow of detailRows) {
-        if (!detailRow || detailRow.nodeType !== 1 || isVmFolderBoundaryRow(detailRow)) {
-            continue;
-        }
-        detailRow.classList.add(`folder-${id}-element`, 'fv-vm-member-detail-row');
-        $(insertAfter).after(detailRow);
-        insertAfter = detailRow;
-    }
-};
 const getFocusedFolderVisibleSet = (folderId) => {
     const id = String(folderId || '').trim();
     if (!id || !globalFolders[id]) {
@@ -1158,73 +1108,6 @@ const hideVmRuntimeLoadingRow = () => {
     $('tbody#kvm_list tr.fv-runtime-loading-row').remove();
 };
 
-const rememberPendingVmDetailOwner = (row) => {
-    if (!isVmFolderMemberPrimaryRow(row)) {
-        vmPendingExpandedDetailOwner = null;
-        return;
-    }
-    vmPendingExpandedDetailOwner = {
-        row,
-        folderId: readFolderOwnerFromRow(row),
-        expiresAt: Date.now() + 1500
-    };
-};
-
-const readPendingVmDetailOwner = () => {
-    if (!vmPendingExpandedDetailOwner) {
-        return null;
-    }
-    if (vmPendingExpandedDetailOwner.expiresAt < Date.now()) {
-        vmPendingExpandedDetailOwner = null;
-        return null;
-    }
-    const row = vmPendingExpandedDetailOwner.row;
-    if (!isVmFolderMemberPrimaryRow(row) || !document.body.contains(row)) {
-        vmPendingExpandedDetailOwner = null;
-        return null;
-    }
-    return vmPendingExpandedDetailOwner;
-};
-
-const ensureVmFolderDetailObserver = () => {
-    if (vmFolderDetailObserver || typeof MutationObserver !== 'function') {
-        return;
-    }
-    const tbody = document.querySelector('tbody#kvm_list');
-    if (!tbody) {
-        return;
-    }
-    $(tbody)
-        .off('click.fvVmMemberDetailOwner')
-        .on('click.fvVmMemberDetailOwner', 'tr.fv-vm-member-row td.vm-name, tr.fv-vm-member-row td.vm-name a, tr.fv-vm-member-row td.vm-name button, tr.fv-vm-member-row td.vm-name span', function() {
-            rememberPendingVmDetailOwner(this.closest('tr'));
-        });
-    vmFolderDetailObserver = new MutationObserver((mutations) => {
-        const pendingOwner = readPendingVmDetailOwner();
-        if (!pendingOwner || !pendingOwner.folderId) {
-            return;
-        }
-        const addedRows = [];
-        for (const mutation of mutations) {
-            for (const node of mutation.addedNodes || []) {
-                if (!node || node.nodeType !== 1 || node.tagName !== 'TR') {
-                    continue;
-                }
-                if (isVmFolderBoundaryRow(node) || readFolderOwnerFromRow(node)) {
-                    continue;
-                }
-                addedRows.push(node);
-            }
-        }
-        if (!addedRows.length) {
-            return;
-        }
-        placeVmManagedDetailRowsAfterOwner(pendingOwner.row, addedRows, pendingOwner.folderId);
-        vmPendingExpandedDetailOwner = null;
-    });
-    vmFolderDetailObserver.observe(tbody, { childList: true });
-};
-
 let createFoldersInFlight = false;
 let createFoldersQueued = false;
 
@@ -1236,7 +1119,6 @@ const createFolders = async () => {
     showVmRuntimeLoadingRow();
     setVmFatalBannerPhase('bootstrap-data');
     try {
-    ensureVmFolderDetailObserver();
     ensureVmExpandedStateLifecycleHooks();
     markVmFatalBannerStep('VM runtime lifecycle hooks ready');
     persistVmExpandedStateFromDom();
@@ -1682,9 +1564,7 @@ const createFolder = (folder, id, position, order, vmInfo, foldersDone, matchCac
             let $vmTR = $('#kvm_list > tr.sortable').filter(function() {
                 return $(this).find('td.vm-name span.outer span.inner a').first().text().trim() === container;
             }).first();
-            $vmTR.addClass('fv-vm-member-row').addClass(`folder-${id}-element`).addClass('folder-element').removeClass('sortable');
-            const vmRowGroup = applyVmMemberRowGroupOwnership($vmTR.get(0), id);
-            $(`tr.folder-id-${id} div.folder-storage`).append(vmRowGroup.length ? $(vmRowGroup) : $vmTR);
+            $(`tr.folder-id-${id} div.folder-storage`).append($vmTR.addClass(`folder-${id}-element`).addClass(`folder-element`).removeClass('sortable'));
 
             if(folderDebugMode) {
                 vmDebugLog(`${newFolder[container].id}(${offsetIndex}, ${index}) => ${id}`);
@@ -2816,8 +2696,6 @@ let folderDebugMode  = false;
 let folderDebugModeWindow = [];
 let folderReq = [];
 let folderTypePrefs = utils.normalizePrefs({});
-let vmPendingExpandedDetailOwner = null;
-let vmFolderDetailObserver = null;
 let liveRefreshTimer = null;
 let liveRefreshMs = 0;
 let liveRefreshInFlight = false;

tests/vm-runtime-docker-parity-guard.test.mjs

@@ -22,19 +22,6 @@ test('vm runtime includes docker-parity quick state actions and branch-aware fol
     assert.match(vmJs, /const cloneVmFolderFromMenu = async/);
 });
 
-test('vm runtime keeps native expanded detail rows attached to their folder-managed VM rows', () => {
-    assert.match(vmJs, /const collectVmMemberRowGroup = \(row\) => \{/);
-    assert.match(vmJs, /const applyVmMemberRowGroupOwnership = \(row,\s*folderId\) => \{/);
-    assert.match(vmJs, /const placeVmManagedDetailRowsAfterOwner = \(ownerRow,\s*detailRows,\s*folderId\) => \{/);
-    assert.match(vmJs, /let vmPendingExpandedDetailOwner = null;/);
-    assert.match(vmJs, /let vmFolderDetailObserver = null;/);
-    assert.match(vmJs, /const ensureVmFolderDetailObserver = \(\) => \{/);
-    assert.match(vmJs, /rememberPendingVmDetailOwner\(this\.closest\('tr'\)\);/);
-    assert.match(vmJs, /placeVmManagedDetailRowsAfterOwner\(pendingOwner\.row,\s*addedRows,\s*pendingOwner\.folderId\);/);
-    assert.match(vmJs, /\$vmTR\.addClass\('fv-vm-member-row'\)/);
-    assert.match(vmJs, /const vmRowGroup = applyVmMemberRowGroupOwnership\(\$vmTR\.get\(0\),\s*id\);/);
-});
-
 test('vm runtime context menu keeps focus/pin/lock and clone actions in vm folder menu', () => {
     assert.match(vmJs, /Focus folder/);
     assert.match(vmJs, /Pin folder/);