prismcast 1.13.0 → 1.14.0

package/dist/routes/root/scripts/config.js

@@ -2,12 +2,13 @@
  *
  * config.ts: Client-side JavaScript generator for the PrismCast configuration subtab.
  */
+import { PENDING_PATH_ATTRIBUTE, RESTART_SETTINGS_SENTENCE, SAVE_SETTINGS_LABEL } from "../../config/vocabulary.js";
 import { ACTIONS } from "../../clientActions.js";
+import { ICON_FILTER } from "../../icons.js";
 import { VIDEO_QUALITY_PRESETS } from "../../../config/presets.js";
-import { isRunningAsService } from "../../../utils/index.js";
 /**
  * Generates the configuration subtab script block containing the form handling, preset auto-fill, and import/export client-side logic. Functions are exposed on
- * window so inline event handlers and other tab scripts can invoke them.
+ * window so the action dispatcher's registerAction handlers and the other tab scripts (status.ts, channels.ts) can call them.
  * @returns HTML script block with configuration subtab functions.
  */
 export function generateConfigSubtabScript() {
@@ -26,18 +27,18 @@ export function generateConfigSubtabScript() {
         ].join("\n");
         presetBlocks.push(block);
     }
-    // Pass service status to JavaScript for conditional messaging.
-    const isService = isRunningAsService();
     return [
         "<script>",
         "(function() {",
-        // Service mode flag for conditional UI behavior.
-        "  const isServiceMode = " + String(isService) + ";",
+        // The words this script shares with the page, each emitted once through JSON.stringify so no constant carries a quoting rule of its own.
+        "  const PENDING_PATH_ATTRIBUTE = " + JSON.stringify(PENDING_PATH_ATTRIBUTE) + ";",
+        "  const RESTART_SETTINGS_SENTENCE = " + JSON.stringify(RESTART_SETTINGS_SENTENCE) + ";",
+        "  const SAVE_SETTINGS_LABEL = " + JSON.stringify(SAVE_SETTINGS_LABEL) + ";",
         // Preset values for auto-filling bitrate and frame rate.
         "  const presetValues = {",
         presetBlocks.join(",\n"),
         "  };",
-        // When quality preset changes, auto-fill bitrate and frame rate with preset values.
+        // When quality preset changes, auto-fill bitrate and frame rate with preset values. This is attached as a change listener on the preset select.
         "  function onPresetChange(presetId) {",
         "    const values = presetValues[presetId];",
         "    if(!values) return;",
@@ -72,11 +73,14 @@ export function generateConfigSubtabScript() {
         "  }",
         // Interval handle for restart polling.
         "  let restartPollInterval = null;",
-        // Track whether a restart is pending (deferred due to active streams).
-        "  let pendingRestart = false;",
-        // Show the pending restart dialog when streams are active.
-        "  function showPendingRestartDialog(streamCount) {",
-        "    pendingRestart = true;",
+        /* The restart dialog's one piece of state: null while no dialog is open, otherwise the settle step of the save or import that opened it. The dialog's
+         * cancel, its forced restart and the automatic restart at zero streams each read the step and clear the state before acting, so every way the dialog ends
+         * settles as its opener would: a save's in place, an import's by a reload.
+         */
+        "  let pendingRestart = null;",
+        // Show the pending restart dialog when streams are active, holding the opener's settle step for whichever way the dialog ends.
+        "  function showPendingRestartDialog(streamCount, settle) {",
+        "    pendingRestart = { settle: settle };",
         "    document.getElementById('restart-stream-count').textContent = streamCount;",
         "    document.getElementById('restart-dialog').style.display = 'flex';",
         "    updateRestartDialogStatus();",
@@ -93,47 +97,56 @@ export function generateConfigSubtabScript() {
         "    const count = activeStreamCount;",
         "    document.getElementById('restart-stream-count').textContent = count;",
         "    if((count === 0) && pendingRestart) {",
-        "      pendingRestart = false;",
+        "      const settle = pendingRestart.settle;",
+        "      pendingRestart = null;",
         "      document.getElementById('restart-dialog').style.display = 'none';",
-        "      triggerRestart();",
+        "      triggerRestart(settle);",
         "    }",
         "  }",
         "  window.updateRestartDialogStatus = updateRestartDialogStatus;",
-        // Cancel the pending restart.
+        // Cancel the pending restart. The settings marked Restart wait for the next restart, and the opener's settle step carries the sentence that says so.
         "  window.cancelPendingRestart = () => {",
-        "    pendingRestart = false;",
+        "    if(!pendingRestart) return;",
+        "    const settle = pendingRestart.settle;",
+        "    pendingRestart = null;",
         "    document.getElementById('restart-dialog').style.display = 'none';",
-        "    showToast('Restart cancelled. Changes will apply on next restart.', 'info');",
+        "    settle('Restart cancelled. ' + RESTART_SETTINGS_SENTENCE, 'info');",
         "  };",
         // Force immediate restart despite active streams.
         "  window.forceRestart = async () => {",
-        "    pendingRestart = false;",
+        "    if(!pendingRestart) return;",
+        "    const settle = pendingRestart.settle;",
+        "    pendingRestart = null;",
         "    document.getElementById('restart-dialog').style.display = 'none';",
         "    try {",
         "      const res = await fetch('/config/restart-now', { method: 'POST' });",
         "      if(res.ok) {",
-        "        waitForServerRestart();",
+        "        waitForServerRestart(settle);",
         "      } else {",
         "        const data = await res.json();",
         "        throw new Error(data.message || 'Restart failed');",
         "      }",
         "    } catch(err) {",
-        "      showToast('Failed to restart: ' + err.message, 'error');",
+        "      console.error('Forced restart request failed.', err);",
+        "      settle('Failed to restart: ' + err.message, 'error');",
         "    }",
         "  };",
-        // Trigger restart (called when streams reach 0).
-        "  async function triggerRestart() {",
+        // Trigger restart (called when streams reach 0). A refused request settles as a failed one does, so the user learns the restart did not happen.
+        "  async function triggerRestart(settle) {",
         "    try {",
         "      const res = await fetch('/config/restart-now', { method: 'POST' });",
-        "      if(res.ok) {",
-        "        waitForServerRestart();",
+        "      if(!res.ok) {",
+        "        throw new Error('The restart request was refused.');",
         "      }",
+        "      waitForServerRestart(settle);",
         "    } catch(err) {",
-        "      showToast('Failed to trigger restart. Please restart manually.', 'error');",
+        "      console.error('Restart request failed.', err);",
+        "      settle('Failed to trigger restart. Please restart manually.', 'error');",
         "    }",
         "  }",
-        // Wait for server restart by polling /health, then reload.
-        "  function waitForServerRestart() {",
+        // Wait for server restart by polling /health, then reload. A wait that times out settles through its caller's step, and a wait started while another polls
+        // replaces the earlier interval and its step.
+        "  function waitForServerRestart(settle) {",
         "    let attempts = 0;",
         "    const maxAttempts = 30;",
         "    showToast('Restarting server...', 'info', 0);",
@@ -151,11 +164,37 @@ export function generateConfigSubtabScript() {
         "        if(attempts >= maxAttempts) {",
         "          clearInterval(restartPollInterval);",
         "          restartPollInterval = null;",
-        "          showToast('Server did not restart within 30 seconds. Please check the server manually.', 'error');",
+        "          settle('Server did not restart within 30 seconds. Please check the server manually.', 'error');",
         "        }",
         "      }",
         "    }, 1000);",
         "  }",
+        /* The server composes every pending-marker sentence and the client only places it. A response carries the whole pending view after the save, so every slot
+         * is rewritten from it: a marker the save cleared is emptied and hidden, and nothing the page showed before survives. A save settles in place, because the
+         * form already holds what it posted; an import settles by a reload carrying its toast, because it can change every field, the grey-outs and the channel
+         * table at once, and a form left showing the pre-import values would post them back on the next save. Green is kept for a save that refused nothing and
+         * left nothing waiting, so a blue toast tells the user to look at the markers.
+         */
+        "  function renderPendingSettings(pending) {",
+        "    const texts = new Map(pending.map((entry) => [ entry.path, entry.text ]));",
+        "    for(const slot of document.querySelectorAll('[' + PENDING_PATH_ATTRIBUTE + ']')) {",
+        "      const text = texts.get(slot.getAttribute(PENDING_PATH_ATTRIBUTE)) ?? '';",
+        "      slot.textContent = text;",
+        "      slot.hidden = (text === '');",
+        "    }",
+        "  }",
+        "  function applyConfigurationOutcome(data, options) {",
+        "    if(data.willRestart) {",
+        "      if(data.deferred) {",
+        "        showPendingRestartDialog(data.activeStreams, options.settle);",
+        "      } else {",
+        "        waitForServerRestart(options.settle);",
+        "      }",
+        "      return;",
+        "    }",
+        "    const type = ((data.changes.rejected.length === 0) && (data.pending.length === 0)) ? 'success' : 'info';",
+        "    options.settle(data.message || options.fallbackMessage, type);",
+        "  }",
         // Open the changelog modal and fetch content dynamically. Also checks whether an upgrade button should be shown. Changelog items are escaped through the shared
         // window.escapeHtml SSOT installed by the shared utilities script, which loads before this one.
         "  window.openChangelogModal = async () => {",
@@ -189,6 +228,7 @@ export function generateConfigSubtabScript() {
         "      }",
         "      if(data.updateAvailable && upgradeBtn) { upgradeBtn.style.display = ''; }",
         "    } catch(err) {",
+        "      console.error('Changelog request failed.', err);",
         "      loading.style.display = 'none';",
         "      error.style.display = 'block';",
         "    }",
@@ -225,7 +265,7 @@ export function generateConfigSubtabScript() {
         "      const upgradeRes = await fetch('/upgrade', { method: 'POST' });",
         "      const result = await upgradeRes.json();",
         "      if(result.success && result.willRestart) {",
-        "        waitForServerRestart();",
+        "        waitForServerRestart(showToast);",
         // A success that did not ask us to poll can still mean the upgrade is unfinished, and the server's message is what tells those outcomes apart. An upgrade
         // handed to a detached helper is still running when the response lands, and it names the helper's log file so the user can follow it; an upgrade that ran
         // here is done. We render whatever the server said, keep a fallback sentence for a response that carries no message, and show the still-running case as an
@@ -238,6 +278,7 @@ export function generateConfigSubtabScript() {
         "        showToast('Upgrade failed: ' + result.error, 'error');",
         "      }",
         "    } catch(err) {",
+        "      console.error('Upgrade request failed.', err);",
         "      showToast('Upgrade failed: ' + err.message, 'error');",
         "    }",
         "  };",
@@ -261,6 +302,7 @@ export function generateConfigSubtabScript() {
         "        setTimeout(() => { btn.classList.remove('up-to-date'); }, 2000);",
         "      }",
         "    } catch(err) {",
+        "      console.error('Update check failed.', err);",
         "      btn.classList.remove('checking');",
         "      btn.classList.add('check-error');",
         "      setTimeout(() => { btn.classList.remove('check-error'); }, 2000);",
@@ -331,13 +373,21 @@ export function generateConfigSubtabScript() {
         "      }",
         "    }",
         "  }",
-        // Update modified indicators for a single input.
+        // A checkbox list's hidden input lists its members in grid order once a checkbox changes and in the stored order before, so order carries no meaning: lists
+        // are equal when their sorted members are, the reading the server gives a list setting.
+        "  function listMembersEqual(a, b) {",
+        "    const left = JSON.parse(a || '[]').toSorted();",
+        "    const right = JSON.parse(b || '[]').toSorted();",
+        "    return (left.length === right.length) && left.every((member, index) => member === right[index]);",
+        "  }",
+        // Update modified indicators for a single input. A checkbox list compares its members with its default's in any order, and every other input compares its
+        // value with its default as a string.
         "  function updateModifiedIndicator(input) {",
         "    const defaultVal = input.getAttribute('data-default');",
         "    const currentVal = getInputValue(input);",
         "    const formGroup = input.closest('.form-group');",
         "    if(!formGroup) return;",
-        "    const isModified = currentVal !== defaultVal;",
+        "    const isModified = input.hasAttribute('data-checkbox-list') ? !listMembersEqual(currentVal, defaultVal) : (currentVal !== defaultVal);",
         "    const dot = formGroup.querySelector('.modified-dot');",
         "    const resetBtn = formGroup.querySelector('.btn-reset');",
         "    if(isModified) {",
@@ -404,7 +454,7 @@ export function generateConfigSubtabScript() {
         "        updateDependentFields(cbInput.id);",
         "      }",
         "    }",
-        "    showToast('Settings reset to defaults. Click ' + (isServiceMode ? 'Save & Restart' : 'Save Settings') + ' to apply changes.', 'info');",
+        "    showToast('Settings reset to defaults. Click ' + SAVE_SETTINGS_LABEL + ' to apply changes.', 'info');",
         "  };",
         // Read the advanced section expansion state from localStorage. Returns the parsed object or {} if missing or corrupted. Single source of truth for
         // reading this key - used by both toggleSection (read-modify-write) and initSections (read-only).
@@ -449,7 +499,7 @@ export function generateConfigSubtabScript() {
         "  initSections();",
         // Reset all settings to defaults (client-side only).
         "  window.resetAllToDefaults = () => {",
-        "    if(!confirm('Reset ALL settings to defaults? Click ' + (isServiceMode ? 'Save & Restart' : 'Save Settings') + ' after to apply.')) return;",
+        "    if(!confirm('Reset ALL settings to defaults? Click ' + SAVE_SETTINGS_LABEL + ' after to apply.')) return;",
         "    const form = document.getElementById('settings-form');",
         "    if(!form) return;",
         "    const inputs = form.querySelectorAll('input[data-default], select[data-default]');",
@@ -465,7 +515,7 @@ export function generateConfigSubtabScript() {
         "        updateDependentFields(cbInput.id);",
         "      }",
         "    }",
-        "    showToast('All settings reset to defaults. Click ' + (isServiceMode ? 'Save & Restart' : 'Save Settings') + ' to apply changes.', 'info');",
+        "    showToast('All settings reset to defaults. Click ' + SAVE_SETTINGS_LABEL + ' to apply changes.', 'info');",
         "  };",
         // Submit settings form via AJAX.
         "  window.submitSettingsForm = async (event) => {",
@@ -497,15 +547,8 @@ export function generateConfigSubtabScript() {
         "      const data = await res.json();",
         "      if(saveBtn) saveBtn.classList.remove('loading');",
         "      if(res.ok && data.success) {",
-        "        if(data.willRestart) {",
-        "          if(data.deferred) {",
-        "            showPendingRestartDialog(data.activeStreams);",
-        "          } else {",
-        "            waitForServerRestart();",
-        "          }",
-        "        } else {",
-        "          showToast(data.message || 'Configuration saved.', 'info');",
-        "        }",
+        "        renderPendingSettings(data.pending);",
+        "        applyConfigurationOutcome(data, { fallbackMessage: 'Configuration saved.', settle: showToast });",
         "      } else if(data.errors) {",
         "        displayFieldErrors(data.errors);",
         "        showToast('Please correct the errors below.', 'error');",
@@ -513,6 +556,7 @@ export function generateConfigSubtabScript() {
         "        showToast(extractErrorMessage(data, 'Failed to save configuration.'), 'error');",
         "      }",
         "    } catch(err) {",
+        "      console.error('Settings save request failed.', err);",
         "      if(saveBtn) saveBtn.classList.remove('loading');",
         "      showToast('Failed to save configuration: ' + err.message, 'error');",
         "    }",
@@ -532,6 +576,7 @@ export function generateConfigSubtabScript() {
         "      document.body.removeChild(a);",
         "      window.URL.revokeObjectURL(url);",
         "    } catch(err) {",
+        "      console.error('Configuration export failed.', err);",
         "      showToast('Failed to export configuration: ' + err.message, 'error');",
         "    }",
         "  };",
@@ -543,7 +588,7 @@ export function generateConfigSubtabScript() {
         "    reader.onload = async (e) => {",
         "      try {",
         "        const config = JSON.parse(e.target.result);",
-        "        if(confirm('Import this configuration? The server may restart to apply changes.')) {",
+        "        if(confirm('Import this configuration? ' + RESTART_SETTINGS_SENTENCE)) {",
         "          const res = await fetch('/config/import', {",
         "            body: JSON.stringify(config),",
         "            headers: { 'Content-Type': 'application/json' },",
@@ -551,21 +596,13 @@ export function generateConfigSubtabScript() {
         "          });",
         "          const data = await res.json();",
         "          if(res.ok && data.success) {",
-        // A rejected change means the import was written to disk but a handler refused to apply it live, so the message carries a rejection notice. Demote the toast
-        // from green success to an informational notice in that case - reserving green for a clean import keeps the positive signal accurate.
-        "            showToast(data.message || 'Configuration imported.', (data.rejectedCount > 0) ? 'info' : 'success');",
-        "            if(data.willRestart) {",
-        "              if(data.deferred) {",
-        "                showPendingRestartDialog(data.activeStreams);",
-        "              } else {",
-        "                waitForServerRestart();",
-        "              }",
-        "            }",
+        "            applyConfigurationOutcome(data, { fallbackMessage: 'Configuration imported.', settle: showToastAfterReload });",
         "          } else {",
         "            throw new Error(extractErrorMessage(data, 'Import failed'));",
         "          }",
         "        }",
         "      } catch(err) {",
+        "        console.error('Configuration import failed.', err);",
         "        showToast('Failed to import configuration: ' + err.message, 'error');",
         "      }",
         "      fileInput.value = '';",
@@ -586,6 +623,7 @@ export function generateConfigSubtabScript() {
         "      document.body.removeChild(a);",
         "      window.URL.revokeObjectURL(url);",
         "    } catch(err) {",
+        "      console.error('Channel export failed.', err);",
         "      showToast('Failed to export channels: ' + err.message, 'error');",
         "    }",
         "  };",
@@ -612,6 +650,7 @@ export function generateConfigSubtabScript() {
         "          }",
         "        }",
         "      } catch(err) {",
+        "        console.error('Channel import failed.', err);",
         "        showToast('Failed to import channels: ' + err.message, 'error');",
         "      }",
         "      fileInput.value = '';",
@@ -792,9 +831,10 @@ export function generateConfigSubtabScript() {
         "      ref.style.display = ref.style.display === 'none' ? 'block' : 'none';",
         "    }",
         "  };",
-        // Inline cell editing for channel number and station ID. Clicking an editable cell replaces its content with a text input. Enter or blur PATCHes the channel
-        // record at /config/channels/:key with a typed partial update. Escape cancels and restores the original value. The cell's data attributes carry the field
-        // name, channel key, and current value so the handler is generic across both fields.
+        // Inline cell editing for channel number and station ID. Clicking an editable cell replaces its content with an input, a number input for the channel number
+        // and a text input for the station ID. Enter or blur PATCHes the channel record at /config/channels/:key with a typed partial update. Escape cancels and
+        // restores the original value. The cell's data attributes carry the field name, channel key, and current value so one handler serves the channel number and
+        // station ID cells alike.
         "  window.startInlineEdit = (td) => {",
         "    if(td.querySelector('input.inline-edit')) return;",
         "    const field = td.getAttribute('data-field');",
@@ -815,7 +855,7 @@ export function generateConfigSubtabScript() {
         "      saving = true;",
         "      const newValue = input.value.trim();",
         "      if(newValue === value) { cancel(); return; }",
-        // Build a typed partial-update body. channelNumber is parsed as an integer (null clears). stationId uses "" for empty converted to null.
+        // Build a typed partial-update body. channelNumber is parsed as an integer, and an empty stationId or channelNumber is sent as null to clear the field.
         "      const body = {};",
         "      if(field === 'channelNumber') body.channelNumber = newValue ? parseInt(newValue, 10) : null;",
         "      else if(field === 'stationId') body.stationId = newValue || null;",
@@ -863,6 +903,7 @@ export function generateConfigSubtabScript() {
         "        showToast(extractErrorMessage(d, 'Failed to update HDHR setting.'), 'error');",
         "      }",
         "    } catch(err) {",
+        "      console.error('HDHR setting update failed.', err);",
         "      checkbox.checked = !checkbox.checked;",
         "      showToast('Failed to update HDHR setting: ' + err.message, 'error');",
         "    }",
@@ -934,6 +975,7 @@ export function generateConfigSubtabScript() {
         "      if(result.success) {",
         "        showToast('Channel ' + key + ' ' + (enable ? 'enabled' : 'disabled') + '.' + PLAYLIST_HINT, 'success');",
         "        if(result.patch) { channelTable.applyPatch(result.patch); }",
+        "        if(result.persistenceWarning) { showToast(result.persistenceWarning, 'warning'); }",
         "      } else {",
         "        showToast(extractErrorMessage(result, 'Failed to toggle channel.'), 'error');",
         "      }",
@@ -977,6 +1019,7 @@ export function generateConfigSubtabScript() {
         "        const labels = { all: 'All predefined', pacific: 'Pacific predefined', east: 'East predefined' };",
         "        showToast((labels[scope] || 'Predefined') + ' channels ' + (enable ? 'enabled' : 'disabled') + '.' + PLAYLIST_HINT, 'success');",
         "        if(result.patch) { channelTable.applyPatch(result.patch); }",
+        "        if(result.persistenceWarning) { showToast(result.persistenceWarning, 'warning'); }",
         "      } else {",
         "        showToast(extractErrorMessage(result, 'Failed to toggle channels.'), 'error');",
         "      }",
@@ -986,7 +1029,9 @@ export function generateConfigSubtabScript() {
         "    }",
         "  };",
         // Auto-number visible channels sequentially based on the current sort order. Reads the starting number from the input in the Quick Actions dropdown. When
-        // the input is empty, clears all channel numbers from visible channels instead of assigning them.
+        // the input is empty, clears all channel numbers from visible channels instead of assigning them. "Visible" here and in the HDHR and tag bulk actions below
+        // means the server's set - channels that are enabled and available under the service filter - because these requests send no row list. The client-side tag
+        // column filter does not narrow that set, so rows it hides are still numbered, toggled or tagged.
         "  window.autoNumberChannels = async () => {",
         "    const startInput = document.getElementById('auto-number-start');",
         "    const raw = startInput ? startInput.value.trim() : '1';",
@@ -1073,6 +1118,8 @@ export function generateConfigSubtabScript() {
         "    if(!tagPortal) { tagPortal = document.getElementById('inline-tag-portal'); }",
         "    return tagPortal;",
         "  }",
+        // We save the inline tag dropdown's edits in this before-close hook. Every checkbox toggle is batched into a single PATCH when the dropdown closes,
+        // and comparing the sorted tag list against the sorted list captured at open skips the request when the toggles net out to no change.
         "  async function saveTagDropdownIfChanged() {",
         "    if(!activeTagDropdown) return;",
         "    const portal = getTagPortal();",
@@ -1145,6 +1192,7 @@ export function generateConfigSubtabScript() {
         "        showToast(extractErrorMessage(d, 'Failed to revert channel.'), 'error');",
         "      }",
         "    } catch(err) {",
+        "      console.error('Channel revert request failed.', err);",
         "      showToast('Failed to revert channel: ' + err.message, 'error');",
         "    }",
         "  };",
@@ -1164,6 +1212,7 @@ export function generateConfigSubtabScript() {
         "        updateServiceFilterButton(enabledTags);",
         "        if(result.patch) { channelTable.applyPatch(result.patch); }",
         "        showToast('Service filter updated.' + PLAYLIST_HINT, 'success');",
+        "        if(result.persistenceWarning) { showToast(result.persistenceWarning, 'warning'); }",
         "      }",
         "    } catch(err) {",
         "      console.error('Service filter update failed.', err);",
@@ -1202,9 +1251,8 @@ export function generateConfigSubtabScript() {
         "    }",
         "    saveServiceFilter(enabledTags);",
         "  };",
-        // Update the service filter button text. The filter icon SVG is inlined here because this runs client-side where the server's icon module is not available.
-        "  const filterIcon = '<svg width=\"14\" height=\"14\" viewBox=\"0 0 16 16\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"1.5\" " +
-            "stroke-linecap=\"round\" stroke-linejoin=\"round\"><path d=\"M1 2h14l-5 6v5l-4 2V8z\"/></svg>';",
+        // Update the service filter button text, led by the server's own filter icon.
+        "  const filterIcon = " + JSON.stringify(ICON_FILTER) + ";",
         "  function updateServiceFilterButton(enabledTags) {",
         "    const btn = document.getElementById('provider-filter-btn');",
         "    if(!btn) return;",
@@ -1247,17 +1295,10 @@ export function generateConfigSubtabScript() {
         "    }",
         "    processServiceDisplays();",
         "  };",
-        // Update bulk assign options in the Quick Actions select to only show enabled services. Toggles the hidden attribute on option elements based on the filter.
+        // Update bulk assign options in the Quick Actions select to only show enabled services, through the option filter the row selects share.
         "  function updateBulkAssignOptions(enabledTags) {",
         "    const select = document.getElementById('bulk-assign-select');",
-        "    if(!select) return;",
-        "    const options = select.querySelectorAll('option[data-provider-tag]');",
-        "    for(const option of options) {",
-        "      const tag = option.getAttribute('data-provider-tag');",
-        "      const show = (enabledTags.length === 0) || (tag === 'direct') || enabledTags.includes(tag);",
-        "      if(show) option.removeAttribute('hidden');",
-        "      else option.setAttribute('hidden', '');",
-        "    }",
+        "    if(select) channelTable.filterSelectOptions(select, enabledTags);",
         "  };",
         // Bulk assign all channels to a specific service. The response carries the channel-table patch that re-renders every reassigned row, along with the snapshot
         // of prior selections that backs the undo action on the toast.
@@ -1283,6 +1324,7 @@ export function generateConfigSubtabScript() {
         "        showToast(extractErrorMessage(result, 'Failed to assign.'), 'error');",
         "      }",
         "    } catch(err) {",
+        "      console.error('Bulk service assignment failed.', err);",
         "      showToast('Failed to assign: ' + err.message, 'error');",
         "    }",
         "  };",
@@ -1302,6 +1344,7 @@ export function generateConfigSubtabScript() {
         "        showToast(extractErrorMessage(result, 'Failed to revert.'), 'error');",
         "      }",
         "    } catch(err) {",
+        "      console.error('Bulk service restore failed.', err);",
         "      showToast('Failed to revert: ' + err.message, 'error');",
         "    }",
         "  }",
@@ -1477,7 +1520,7 @@ export function generateConfigSubtabScript() {
         "    const tagToggles = document.querySelectorAll('.tag-bulk-toggle[data-indeterminate=\"true\"]');",
         "    for(const tagToggle of tagToggles) tagToggle.indeterminate = true;",
         // Run channelTable.filter() on page load when a service filter is active. The server renders filtered options with the hidden attribute, but Safari ignores it on
-        // option elements. This initial pass removes those options from the DOM to enforce the filter.
+        // option elements. This initial pass removes those options from the channel rows' selects and from the bulk assign select to enforce the filter.
         "    const initFilterTags = channelTable.getEnabledFilterTags();",
         "    if(initFilterTags.length > 0) { channelTable.filter(initFilterTags); updateBulkAssignOptions(initFilterTags); }",
         "    const addUrlInput = document.getElementById('add-url');",
@@ -1557,6 +1600,7 @@ export function generateConfigSubtabScript() {
         "        showToast(extractErrorMessage(result, 'Failed to start login.'), 'error');",
         "      }",
         "    } catch(err) {",
+        "      console.error('Channel login request failed.', err);",
         "      showToast('Failed to start login: ' + err.message, 'error');",
         "    }",
         "  };",
@@ -1568,6 +1612,7 @@ export function generateConfigSubtabScript() {
         "      hideLoginModal();",
         "      showToast('Authentication complete.', 'success');",
         "    } catch(err) {",
+        "      console.error('Login end request failed.', err);",
         "      showToast('Error ending login: ' + err.message, 'error');",
         "      hideLoginModal();",
         "    }",
@@ -1582,8 +1627,9 @@ export function generateConfigSubtabScript() {
         "    const modal = document.getElementById('login-modal');",
         "    if(modal) modal.style.display = 'none';",
         "  }",
-        // Start polling login status to detect when tab is closed externally. Errors are logged only on the first failure per polling session - a dead endpoint
-        // would otherwise spam the console at 1Hz. The flag resets at each startLoginStatusPolling() call so subsequent sessions get a fresh log.
+        // Start polling login status to detect when tab is closed externally. Errors are logged only on the first failure of each run of consecutive failures - a
+        // dead endpoint would otherwise spam the console at 1Hz. Both a successful poll and a new startLoginStatusPolling() call reset the flag, so the next failure
+        // after either is logged again.
         "  function startLoginStatusPolling() {",
         "    stopLoginStatusPolling();",
         "    let errorLogged = false;",
@@ -1631,8 +1677,8 @@ export function generateConfigSubtabScript() {
         "      presetSelect.addEventListener('change', function() { onPresetChange(this.value); });",
         "    }",
         "  }",
-        // Checkbox list: collect checked values into the hidden input and update the modified indicator. Called by onchange on individual checkboxes within a
-        // checkbox-list-grid. The hidden input holds the JSON-encoded array and participates in the standard form submission.
+        // Checkbox list: collect checked values into the hidden input and update the modified indicator. Called through the data-change-action dispatcher for each
+        // checkbox within a checkbox-list-grid. The hidden input holds the JSON-encoded array and participates in the standard form submission.
         "  window.updateCheckboxList = (checkbox) => {",
         "    const group = checkbox.closest('.form-group');",
         "    if(!group) return;",
@@ -1657,9 +1703,11 @@ export function generateConfigSubtabScript() {
         "    switchFn: switchSubtab",
         "  });",
         /* Action registrations. Each binds an ACTIONS name to a window-exposed handler defined above; the project-wide dispatcher in shared.ts looks up the handler
-         * by name when a click / change / keydown / submit event lands on a matching [data-<event>-action] element. Handlers express only the action's intent -
-         * event mechanics (default prevention and dropdown close) live declaratively on the trigger element via the event-type-scoped
-         * data-<event>-prevent-default and data-<event>-close-dropdown attributes that the dispatcher processes before the handler runs.
+         * by name when a click / change / keydown / submit event lands on a matching [data-<event>-action] element. The event mechanics a trigger always needs
+         * (default prevention and dropdown close) live declaratively on the trigger element via the event-type-scoped data-<event>-prevent-default and
+         * data-<event>-close-dropdown attributes that the dispatcher processes before the handler runs. A mechanic that depends on the event stays in its handler...the
+         * service picker closes the dropdown only once a service is chosen. The form submit functions also call preventDefault themselves, repeating what their
+         * forms' data-submit-prevent-default already does.
          */
         "  window.registerAction('" + ACTIONS.autoNumberChannels + "', () => autoNumberChannels());",
         "  window.registerAction('" + ACTIONS.bulkAssignService + "', (target) => {",