Extract folder editor type layer batch 3

FolderView Plus Test · FolderView Plus Test · commit e05e7e8a4de0 · 2026-04-17T10:38:55.000-04:00
diff --git a/archive/folderview.plus-2026.04.15.18.txz.sha256 b/archive/folderview.plus-2026.04.15.18.txz.sha256
diff --git a/archive/folderview.plus-2026.04.17.01.txz b/archive/folderview.plus-2026.04.17.01.txz
diff --git a/archive/folderview.plus-2026.04.17.01.txz.sha256 b/archive/folderview.plus-2026.04.17.01.txz.sha256
@@ -0,0 +1 @@
+6bb4e35d97c1da70bc7a3110aa06caf0acb9bae5af7f5a8d23fcda0afc5a8e19  folderview.plus-2026.04.17.01.txz
diff --git a/folderview.plus.plg b/folderview.plus.plg
@@ -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.04.16.07">
-<!ENTITY md5 "e72c825a64d544dacf3b1a13054881a7">
+<!ENTITY version "2026.04.17.01">
+<!ENTITY md5 "610fc9335e10973e0401c1bf032b0b02">
 ]>
 
 <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.17.01
+- UX: Folder editor flows, previews, and bootstrap behavior.
+- Refactor: Shared runtime contracts, request plumbing, and cross-page foundations.
+
+
 ###2026.04.16.07
 - Refactor: Moved Docker-only folder editor row registration into the Docker type module so VM no longer inherits Docker field grouping from the shared editor chrome.
 - Refactor: Moved Docker preview signal assembly and runtime member normalization into type modules, keeping the shared editor preview/runtime type-agnostic.
diff --git a/folderview.plus.xml b/folderview.plus.xml
@@ -10,7 +10,7 @@
 <Description>
 FolderView Plus organizes Docker, VM, and Dashboard views into folders in Unraid, with starter setup tools, rules, bulk assignment, recovery, templates, and diagnostics.
 </Description>
-<Date>2026-04-16</Date>
+<Date>2026-04-17</Date>
 <MinVer>7.0.0</MinVer>
 <ExtraSearchTerms>folder view docker vm dashboard organization groups sorting import export backup recovery rules templates diagnostics</ExtraSearchTerms>
 <Support>https://forums.unraid.net/topic/197631-plugin-folderview-plus/</Support>
diff --git a/pkg_build.sh b/pkg_build.sh
@@ -270,7 +270,7 @@ sync_ca_template_metadata() {
 
 acquire_build_lock() {
     mkdir -p "$(dirname "$lockfile")"
-    if command -v flock >/dev/null 2>&1; then
+    if command -v flock >/dev/null 2>&1 && [ "${FVPLUS_PKG_BUILD_DISABLE_FLOCK:-0}" != "1" ]; then
         exec 9>"$lockfile"
         if ! flock -n 9; then
             echo "ERROR: Another pkg_build.sh instance is already running (lock: $lockfile)." >&2
diff --git a/scripts/repro_build_guard.sh b/scripts/repro_build_guard.sh
@@ -68,6 +68,7 @@ build_once() {
     TZ=UTC \
     LC_ALL=C \
     LANG=C \
+    FVPLUS_PKG_BUILD_DISABLE_FLOCK=1 \
     FVPLUS_VERSION_OVERRIDE="${VERSION_OVERRIDE}" \
     bash "${PKG_BUILD_SCRIPT}" --output-dir "${output_dir}" --no-validate
   )
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.rules.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.rules.js
@@ -31,9 +31,37 @@
                 ? utils.normalizePrefs(prefs)
                 : (prefs && typeof prefs === 'object' ? prefs : {})
         );
-        const ruleRegexKinds = type === 'docker'
-            ? Object.freeze(['name_regex', 'image_regex', 'compose_project_regex'])
-            : Object.freeze(['name_regex']);
+        const defaultRulesConfig = type === 'docker'
+            ? Object.freeze({
+                regexKinds: Object.freeze(['name_regex', 'image_regex', 'compose_project_regex']),
+                subjectLabel: 'container',
+                nameRegexExample: '^media-',
+                patternPlaceholders: Object.freeze({
+                    image_regex: 'Regex pattern (example: linuxserver/)',
+                    compose_project_regex: 'Regex pattern (example: ^media$)'
+                })
+            })
+            : Object.freeze({
+                regexKinds: Object.freeze(['name_regex']),
+                subjectLabel: 'VM',
+                nameRegexExample: '^Windows-',
+                patternPlaceholders: Object.freeze({})
+            });
+        const rawRulesConfig = deps.ruleConfig && typeof deps.ruleConfig === 'object' ? deps.ruleConfig : defaultRulesConfig;
+        const ruleRegexKindsSource = Array.isArray(rawRulesConfig.regexKinds) && rawRulesConfig.regexKinds.length > 0
+            ? rawRulesConfig.regexKinds
+            : defaultRulesConfig.regexKinds;
+        const normalizedRuleRegexKinds = ruleRegexKindsSource
+            .map((kind) => String(kind || '').trim().toLowerCase())
+            .filter((kind) => Object.prototype.hasOwnProperty.call(RULE_KIND_LABELS, kind));
+        const ruleRegexKinds = Object.freeze(normalizedRuleRegexKinds.length > 0
+            ? normalizedRuleRegexKinds
+            : defaultRulesConfig.regexKinds);
+        const ruleSubjectLabel = String(rawRulesConfig.subjectLabel || defaultRulesConfig.subjectLabel || 'item').trim() || 'item';
+        const nameRegexExample = String(rawRulesConfig.nameRegexExample || defaultRulesConfig.nameRegexExample || '^item-').trim() || '^item-';
+        const rulePatternPlaceholders = rawRulesConfig.patternPlaceholders && typeof rawRulesConfig.patternPlaceholders === 'object'
+            ? rawRulesConfig.patternPlaceholders
+            : defaultRulesConfig.patternPlaceholders;
 
         let folderEditorPrefs = normalizePrefs({});
         let folderEditorPrefsLoaded = false;
@@ -68,13 +96,11 @@
 
         const getFolderEditorRulePatternPlaceholder = (kind) => {
             const normalized = normalizeFolderEditorRuleKind(kind);
-            if (normalized === 'image_regex') {
-                return 'Regex pattern (example: linuxserver/)';
-            }
-            if (normalized === 'compose_project_regex') {
-                return 'Regex pattern (example: ^media$)';
+            const configuredPlaceholder = String(rulePatternPlaceholders?.[normalized] || '').trim();
+            if (configuredPlaceholder) {
+                return configuredPlaceholder;
             }
-            return `Regex pattern (example: ${type === 'docker' ? '^media-' : '^Windows-'})`;
+            return `Regex pattern (example: ${nameRegexExample})`;
         };
 
         const buildFolderEditorRuleDescription = (rule) => {
@@ -98,7 +124,7 @@
             if (kind === 'label_starts_with') {
                 return `${effect} when label ${labelKey || '(missing key)'} starts with "${labelValue || ''}".`;
             }
-            return `${effect} when the ${type === 'docker' ? 'container' : 'VM'} name matches "${pattern || '(missing regex)'}".`;
+            return `${effect} when the ${ruleSubjectLabel} name matches "${pattern || '(missing regex)'}".`;
         };
 
         const getFolderEditorRuleIssues = (rule) => {
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.type-docker.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.type-docker.js
@@ -30,6 +30,15 @@
         const isDockerUpdateAvailableInEditor = typeof deps.isDockerUpdateAvailableInEditor === 'function'
             ? deps.isDockerUpdateAvailableInEditor
             : ((member) => member?.UpdateAvailable === true || member?.update === true);
+        const DOCKER_RULES_CONFIG = Object.freeze({
+            regexKinds: Object.freeze(['name_regex', 'image_regex', 'compose_project_regex']),
+            subjectLabel: 'container',
+            nameRegexExample: '^media-',
+            patternPlaceholders: Object.freeze({
+                image_regex: 'Regex pattern (example: linuxserver/)',
+                compose_project_regex: 'Regex pattern (example: ^media$)'
+            })
+        });
 
         const buildComparableFolder = (folderRecord) => {
             const normalized = normalizeFolderRecordForEditor(folderRecord || {});
@@ -169,6 +178,38 @@
             };
         };
 
+        const getRulesConfig = () => DOCKER_RULES_CONFIG;
+
+        const buildSmartDefaultSuggestions = ({ selectedMembers = [], form } = {}) => {
+            const members = Array.isArray(selectedMembers) ? selectedMembers : [];
+            const suggestions = [];
+            const composeProjects = Array.from(new Set(
+                members
+                    .map((member) => String(member?.ComposeProject || '').trim())
+                    .filter((value) => value !== '')
+            ));
+            if (composeProjects.length === 1) {
+                suggestions.push({
+                    key: 'compose',
+                    label: 'Compose project',
+                    value: composeProjects[0],
+                    apply: () => {}
+                });
+            }
+            const updateCount = members.filter((member) => isDockerUpdateAvailableInEditor(member)).length;
+            suggestions.push({
+                key: 'updates',
+                label: 'Update-aware preview',
+                value: `${updateCount}/${members.length} with updates`,
+                apply: () => {
+                    if (form?.preview_update) {
+                        form.preview_update.checked = updateCount > 0;
+                    }
+                }
+            });
+            return suggestions;
+        };
+
         const applyPreviewConstraints = () => {};
 
         return Object.freeze({
@@ -179,6 +220,8 @@
             collectSectionRows,
             applySectionTags,
             getPreviewSignals,
+            getRulesConfig,
+            buildSmartDefaultSuggestions,
             applyPreviewConstraints
         });
     };
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.type-vm.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.editor.type-vm.js
@@ -11,6 +11,12 @@
 
     const createApi = (deps = {}) => {
         const jq = deps.$ || (typeof globalThis !== 'undefined' ? globalThis.jQuery || globalThis.$ : null);
+        const VM_RULES_CONFIG = Object.freeze({
+            regexKinds: Object.freeze(['name_regex']),
+            subjectLabel: 'VM',
+            nameRegexExample: '^Windows-',
+            patternPlaceholders: Object.freeze({})
+        });
 
         const mapRuntimeMember = (entry = {}) => {
             const memberName = String(entry?.name || entry?.Name || '').trim();
@@ -24,13 +30,17 @@
             };
         };
 
+        const getRulesConfig = () => VM_RULES_CONFIG;
+
         return Object.freeze({
             shouldSyncAfterSave: () => false,
             flushPostSaveSync: async () => {},
             mapRuntimeMember,
             collectSectionRows: () => EMPTY_SECTION_ROWS,
             applySectionTags: () => {},
             getPreviewSignals: () => null,
+            getRulesConfig,
+            buildSmartDefaultSuggestions: () => [],
             applyPreviewConstraints: ({ $, form } = {}) => {
                 const activeJq = $ || jq;
                 if (!activeJq || !form) {
diff --git a/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.js b/src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/scripts/folder.js
@@ -1035,7 +1035,8 @@ const getFolderEditorRulesApi = () => {
         escapeHtml,
         extractAjaxErrorMessage,
         shouldRender: () => modernFolderEditorEnabled,
-        getActiveFolderId: () => activeFolderEditorFolderId
+        getActiveFolderId: () => activeFolderEditorFolderId,
+        ruleConfig: getFolderEditorTypeApi()?.getRulesConfig?.() || null
     });
     return folderEditorRulesApi;
 };
@@ -1836,7 +1837,9 @@ const normalizeFolderRecordForEditor = (folder) => {
 
 const createNoopFolderEditorTypeApi = () => Object.freeze({
     shouldSyncAfterSave: () => false,
-    flushPostSaveSync: async () => {}
+    flushPostSaveSync: async () => {},
+    getRulesConfig: () => null,
+    buildSmartDefaultSuggestions: () => []
 });
 
 const resolveFolderEditorTypeModule = () => {
@@ -2566,27 +2569,14 @@ const suggestDefaultsFromMembers = () => {
         });
     }
 
-    if (type === 'docker') {
-        const composeProjects = Array.from(new Set(
-            selectedMembers
-                .map((member) => String(member?.ComposeProject || '').trim())
-                .filter((value) => value !== '')
-        ));
-        if (composeProjects.length === 1) {
-            suggestions.push({
-                key: 'compose',
-                label: 'Compose project',
-                value: composeProjects[0],
-                apply: () => { /* display-only advisory */ }
-            });
-        }
-        const updateCount = selectedMembers.filter((member) => isDockerUpdateAvailableInEditor(member)).length;
-        suggestions.push({
-            key: 'updates',
-            label: 'Update-aware preview',
-            value: `${updateCount}/${selectedMembers.length} with updates`,
-            apply: () => { form.preview_update.checked = updateCount > 0; }
-        });
+    const typeSuggestions = getFolderEditorTypeApi()?.buildSmartDefaultSuggestions?.({
+        selectedMembers,
+        memberNames,
+        form,
+        buildRegexSuggestionFromNames
+    });
+    if (Array.isArray(typeSuggestions) && typeSuggestions.length) {
+        suggestions.push(...typeSuggestions.filter((entry) => entry && typeof entry === 'object'));
     }
 
     if (!suggestions.length) {
diff --git a/tests/folder-contract-shared-architecture.test.mjs b/tests/folder-contract-shared-architecture.test.mjs
@@ -105,11 +105,14 @@ test('shared folder editor schema and preview modules publish the editor-facing
     assert.match(folderEditorTypeDockerJs, /const collectSectionRows = \(\{ form,\s*findBasicByFieldName \} = \{\}\) =>/);
     assert.match(folderEditorTypeDockerJs, /const applySectionTags = \(\{ markSection,\s*markAdvanced \} = \{\}\) =>/);
     assert.match(folderEditorTypeDockerJs, /const getPreviewSignals = \(\{ selectedMembers = \[\] \} = \{\}\) =>/);
+    assert.match(folderEditorTypeDockerJs, /const getRulesConfig = \(\) => DOCKER_RULES_CONFIG;/);
+    assert.match(folderEditorTypeDockerJs, /const buildSmartDefaultSuggestions = \(\{ selectedMembers = \[\],\s*form \} = \{\}\) =>/);
     assert.match(folderEditorTypeDockerJs, /root\.FolderViewPlusFolderEditorTypeDockerModuleLoaded = true/);
     assert.match(folderEditorTypeVmJs, /^\/\/ @ts-check/m);
     assert.match(folderEditorTypeVmJs, /root\.FolderViewPlusFolderEditorTypeVm = factory\(\);/);
     assert.match(folderEditorTypeVmJs, /const createApi = \(deps = \{\}\) =>/);
     assert.match(folderEditorTypeVmJs, /const mapRuntimeMember = \(entry = \{\}\) =>/);
+    assert.match(folderEditorTypeVmJs, /const getRulesConfig = \(\) => VM_RULES_CONFIG;/);
     assert.match(folderEditorTypeVmJs, /applyPreviewConstraints:/);
     assert.match(folderEditorTypeVmJs, /root\.FolderViewPlusFolderEditorTypeVmModuleLoaded = true/);
     assert.match(folderSettingsTransferJs, /^\/\/ @ts-check/m);
diff --git a/tests/folder-editor-docker-update-summary.test.mjs b/tests/folder-editor-docker-update-summary.test.mjs
@@ -26,6 +26,8 @@ test('modern folder editor update summary accepts normalized update flags from m
     assert.match(folderJs, /const state = source\?\.State \|\| source\?\.RawState \|\| source\?\.info\?\.State \|\| \{\};/);
     assert.match(folderTypeDockerJs, /const getPreviewSignals = \(\{ selectedMembers = \[\] \} = \{\}\) =>/);
     assert.match(folderTypeDockerJs, /const updateCount = members\.filter\(\(member\) => isDockerUpdateAvailableInEditor\(member\)\)\.length;/);
+    assert.match(folderTypeDockerJs, /const buildSmartDefaultSuggestions = \(\{ selectedMembers = \[\],\s*form \} = \{\}\) =>/);
+    assert.match(folderJs, /const typeSuggestions = getFolderEditorTypeApi\(\)\?\.buildSmartDefaultSuggestions\?\.\(\{/);
 });
 
 test('shared docker update helper accepts normalized update flags outside the Docker page runtime', () => {
diff --git a/tests/ui-smoke-layout.test.mjs b/tests/ui-smoke-layout.test.mjs
@@ -588,7 +588,8 @@ test('folder editor exposes folder-scoped advanced auto-rules for saved folders'
     assert.match(folderJs, /const getFolderEditorRulesApi = \(\) =>/);
     assert.match(folderJs, /folderEditorRulesModule\?\.createApi/);
     assert.match(folderJs, /refreshFolderAutoRulesPanel = \(options = \{\}\) =>/);
-    assert.match(folderRulesJs, /const ruleRegexKinds = type === 'docker'/);
+    assert.match(folderRulesJs, /const rawRulesConfig = deps\.ruleConfig && typeof deps\.ruleConfig === 'object' \? deps\.ruleConfig : defaultRulesConfig;/);
+    assert.match(folderJs, /ruleConfig: getFolderEditorTypeApi\(\)\?\.getRulesConfig\?\.\(\) \|\| null/);
     assert.match(folderRulesJs, /panel\.id = 'fvFolderAutoRulesPanel';/);
     assert.match(folderRulesJs, /panel\.className = 'basic fv-modern-field-row is-rules-row fv-folder-auto-rules-panel';/);
     assert.match(folderRulesJs, /Save this folder first to create advanced rules\./);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+6bb4e35d97c1da70bc7a3110aa06caf0acb9bae5af7f5a8d23fcda0afc5a8e19 folderview.plus-2026.04.17.01.txz`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ build_once() {`
`68`	`68`	`TZ=UTC \`
`69`	`69`	`LC_ALL=C \`
`70`	`70`	`LANG=C \`
	`71`	`+ FVPLUS_PKG_BUILD_DISABLE_FLOCK=1 \`
`71`	`72`	`FVPLUS_VERSION_OVERRIDE="${VERSION_OVERRIDE}" \`
`72`	`73`	`bash "${PKG_BUILD_SCRIPT}" --output-dir "${output_dir}" --no-validate`
`73`	`74`	`)`