@@ -747,7 +1832,7 @@ PulseApp.ui.alertManagementModal = (() => {
acknowledgeAllBtn.addEventListener('click', () => {
if (PulseApp.alerts && PulseApp.alerts.markAllAsAcknowledged) {
PulseApp.alerts.markAllAsAcknowledged();
- setTimeout(loadCurrentAlerts, 500); // Refresh after acknowledging
+ // Socket events will handle the real-time updates
}
});
}
@@ -896,7 +1981,7 @@ PulseApp.ui.alertManagementModal = (() => {
autoDetectEmailProvider(emailFromInput.value);
// Auto-fill username with email address for common providers
- const usernameInput = document.querySelector('input[name="ALERT_SMTP_USER"]');
+ const usernameInput = document.querySelector('input[name="SMTP_USER"]');
if (usernameInput && emailFromInput.value && emailFromInput.value.includes('@')) {
const domain = emailFromInput.value.split('@')[1].toLowerCase();
const commonProviders = ['gmail.com', 'googlemail.com', 'outlook.com', 'hotmail.com', 'live.com', 'msn.com', 'yahoo.com', 'yahoo.co.uk', 'yahoo.ca', 'ymail.com'];
@@ -1401,94 +2486,108 @@ PulseApp.ui.alertManagementModal = (() => {
}
function loadEmailConfiguration() {
- const emailConfigSection = document.getElementById('primary-email-config');
- if (!emailConfigSection) return;
+ console.log('[Email Config] loadEmailConfiguration called');
+
+ // Check if we're in the configure tab (different structure)
+ const isConfigureTab = document.getElementById('email-config-section');
+ if (!isConfigureTab) {
+ console.log('[Email Config] Not in configure tab, looking for primary-email-config');
+ const emailConfigSection = document.getElementById('primary-email-config');
+ if (!emailConfigSection) {
+ console.log('[Email Config] primary-email-config not found either, returning');
+ return;
+ }
+ } else {
+ console.log('[Email Config] In configure tab');
+ }
// Get email configuration from currentConfig
const config = currentConfig || {};
const smtp = config.advanced?.smtp || {};
+ console.log('[Email Config] Loading email configuration:', smtp);
+ console.log('[Email Config] Full config:', config);
+ console.log('[Email Config] Direct config keys:', {
+ SMTP_HOST: config.SMTP_HOST,
+ SMTP_PORT: config.SMTP_PORT,
+ SMTP_USER: config.SMTP_USER,
+ ALERT_FROM_EMAIL: config.ALERT_FROM_EMAIL,
+ ALERT_TO_EMAIL: config.ALERT_TO_EMAIL,
+ GLOBAL_EMAIL_ENABLED: config.GLOBAL_EMAIL_ENABLED
+ });
+
// Set toggle states based on current config
- const emailToggle = document.getElementById('email-enabled');
+ const emailToggle = document.getElementById('email-enabled') || document.getElementById('global-email-toggle');
if (emailToggle) {
const emailEnabled = config.GLOBAL_EMAIL_ENABLED === 'true' || config.GLOBAL_EMAIL_ENABLED === true;
emailToggle.checked = emailEnabled;
+ console.log('[Email Config] Email toggle set to:', emailEnabled);
+ } else {
+ console.log('[Email Config] Email toggle not found (looking for email-enabled or global-email-toggle)');
}
- const webhookToggle = document.getElementById('webhook-enabled');
+ const webhookToggle = document.getElementById('webhook-enabled') || document.getElementById('global-webhook-toggle');
if (webhookToggle) {
const webhookEnabled = config.GLOBAL_WEBHOOK_ENABLED === 'true' || config.GLOBAL_WEBHOOK_ENABLED === true;
webhookToggle.checked = webhookEnabled;
}
// Populate email fields with values from configuration
+ // Check both nested (smtp) and direct config locations
const emailFromInput = document.querySelector('input[name="ALERT_FROM_EMAIL"]');
- if (emailFromInput && smtp.from) {
- emailFromInput.value = smtp.from;
+ const fromValue = config.ALERT_FROM_EMAIL || smtp.from;
+ console.log('[Email Config] From input found:', !!emailFromInput, 'Value to set:', fromValue);
+ if (emailFromInput && fromValue) {
+ emailFromInput.value = fromValue;
}
const emailToInput = document.querySelector('input[name="ALERT_TO_EMAIL"]');
- if (emailToInput && smtp.to) {
- emailToInput.value = smtp.to;
+ const toValue = config.ALERT_TO_EMAIL || smtp.to;
+ console.log('[Email Config] To input found:', !!emailToInput, 'Value to set:', toValue);
+ if (emailToInput && toValue) {
+ emailToInput.value = toValue;
}
- const smtpHostInput = document.querySelector('input[name="ALERT_SMTP_HOST"]');
- if (smtpHostInput && smtp.host) {
- smtpHostInput.value = smtp.host;
+ // Populate SMTP fields
+ const smtpHostInput = document.querySelector('input[name="SMTP_HOST"]');
+ const hostValue = config.SMTP_HOST || smtp.host;
+ console.log('[Email Config] Host input found:', !!smtpHostInput, 'Value to set:', hostValue);
+ if (smtpHostInput && hostValue) {
+ smtpHostInput.value = hostValue;
}
- const smtpPortInput = document.querySelector('input[name="ALERT_SMTP_PORT"]');
- if (smtpPortInput && smtp.port) {
- smtpPortInput.value = smtp.port;
+ const smtpPortInput = document.querySelector('input[name="SMTP_PORT"]');
+ const portValue = config.SMTP_PORT || smtp.port;
+ console.log('[Email Config] Port input found:', !!smtpPortInput, 'Value to set:', portValue);
+ if (smtpPortInput && portValue) {
+ smtpPortInput.value = portValue;
}
- const smtpUserInput = document.querySelector('input[name="ALERT_SMTP_USER"]');
- if (smtpUserInput && smtp.user) {
- smtpUserInput.value = smtp.user;
+ const smtpUserInput = document.querySelector('input[name="SMTP_USER"]');
+ const userValue = config.SMTP_USER || smtp.user;
+ console.log('[Email Config] User input found:', !!smtpUserInput, 'Value to set:', userValue);
+ if (smtpUserInput && userValue) {
+ smtpUserInput.value = userValue;
}
- const smtpSecureInput = document.querySelector('input[name="ALERT_SMTP_SECURE"]');
- if (smtpSecureInput && smtp.secure !== undefined) {
- smtpSecureInput.checked = smtp.secure;
+ const smtpSecureCheckbox = document.querySelector('input[name="SMTP_SECURE"]');
+ const secureValue = config.SMTP_SECURE || smtp.secure;
+ if (smtpSecureCheckbox) {
+ smtpSecureCheckbox.checked = secureValue === true || secureValue === 'true';
}
- const smtpPassInput = document.querySelector('input[name="ALERT_EMAIL_PASSWORD"]');
-
- // Check if SMTP config exists (indicating password is saved)
- const hasSmtpConfig = smtp.host && smtp.user && smtp.from;
-
+ // Note: SMTP_PASS is not returned by the API for security reasons
+ // Show a placeholder to indicate it's already set
+ const smtpPassInput = document.querySelector('input[name="SMTP_PASS"]');
+ const hasSmtpConfig = hostValue || smtp.host;
if (smtpPassInput && hasSmtpConfig) {
- // Don't set a value, but update placeholder to indicate password is saved
- smtpPassInput.placeholder = 'Password saved (click to change)';
+ smtpPassInput.placeholder = '••••••••• (configured)';
}
- // Auto-detect email provider if from email is set
- if (emailFromInput && emailFromInput.value) {
- autoDetectEmailProvider(emailFromInput.value);
- }
-
- // Use existing email configuration from settings if available
- if (PulseApp.ui.settings && PulseApp.ui.settings.renderAlertsTab) {
- const fullContent = PulseApp.ui.settings.renderAlertsTab(config.alerts || {}, config);
-
- // Extract just the email configuration section
- const tempDiv = document.createElement('div');
- tempDiv.innerHTML = fullContent;
- const emailSection = tempDiv.querySelector('.bg-gray-50:nth-child(2)'); // Email section
-
- if (emailSection) {
- // Remove the outer container and just show the inner content
- const emailContent = emailSection.innerHTML;
- emailConfigSection.innerHTML = emailContent;
-
- // Initialize email functionality
- if (PulseApp.ui.settings.setupEmailProviderSelection) {
- setTimeout(() => PulseApp.ui.settings.setupEmailProviderSelection(), 100);
- }
- if (PulseApp.ui.settings.setupEmailTestButton) {
- setTimeout(() => PulseApp.ui.settings.setupEmailTestButton(), 100);
- }
- }
+ // Populate webhook configuration
+ const webhookUrlInput = document.querySelector('input[name="WEBHOOK_URL"]');
+ if (webhookUrlInput && config.WEBHOOK_URL) {
+ webhookUrlInput.value = config.WEBHOOK_URL;
}
}
@@ -1537,7 +2636,7 @@ PulseApp.ui.alertManagementModal = (() => {
function updateSSLHelp(provider, config) {
const sslLabel = document.querySelector('label[for="smtp-secure"]');
- const sslCheckbox = document.querySelector('input[name="ALERT_SMTP_SECURE"]');
+ const sslCheckbox = document.querySelector('input[name="SMTP_SECURE"]');
const advancedSettings = document.getElementById('advanced-smtp-settings');
if (sslLabel && sslCheckbox) {
@@ -1553,7 +2652,7 @@ PulseApp.ui.alertManagementModal = (() => {
}
function updatePasswordPlaceholder(provider) {
- const smtpPassInput = document.querySelector('input[name="ALERT_EMAIL_PASSWORD"]');
+ const smtpPassInput = document.querySelector('input[name="SMTP_PASS"]');
if (!smtpPassInput) return;
// Get current SMTP configuration
@@ -1651,9 +2750,9 @@ PulseApp.ui.alertManagementModal = (() => {
const passwordHelp = document.getElementById('smtp-password-help');
const usernameLabel = document.getElementById('smtp-username-label');
const usernameHelp = document.getElementById('smtp-username-help');
- const hostInput = document.querySelector('input[name="ALERT_SMTP_HOST"]');
- const portInput = document.querySelector('input[name="ALERT_SMTP_PORT"]');
- const secureCheckbox = document.querySelector('input[name="ALERT_SMTP_SECURE"]');
+ const hostInput = document.querySelector('input[name="SMTP_HOST"]');
+ const portInput = document.querySelector('input[name="SMTP_PORT"]');
+ const secureCheckbox = document.querySelector('input[name="SMTP_SECURE"]');
const providers = {
gmail: {
@@ -1736,7 +2835,7 @@ PulseApp.ui.alertManagementModal = (() => {
updatePasswordPlaceholder(provider);
// Update username placeholder and auto-fill
- const usernameInput = document.querySelector('input[name="ALERT_SMTP_USER"]');
+ const usernameInput = document.querySelector('input[name="SMTP_USER"]');
const fromEmailInput = document.getElementById('email-from-input');
if (usernameInput) {
@@ -1829,11 +2928,11 @@ PulseApp.ui.alertManagementModal = (() => {
const emailConfig = {
from: document.querySelector('input[name="ALERT_FROM_EMAIL"]')?.value,
to: document.querySelector('input[name="ALERT_TO_EMAIL"]')?.value,
- pass: document.querySelector('input[name="ALERT_EMAIL_PASSWORD"]')?.value, // Backend expects 'pass' not 'password'
- host: document.querySelector('input[name="ALERT_SMTP_HOST"]')?.value,
- port: document.querySelector('input[name="ALERT_SMTP_PORT"]')?.value,
- user: document.querySelector('input[name="ALERT_SMTP_USER"]')?.value,
- secure: document.querySelector('input[name="ALERT_SMTP_SECURE"]')?.checked
+ pass: document.querySelector('input[name="SMTP_PASS"]')?.value, // Backend expects 'pass' not 'password'
+ host: document.querySelector('input[name="SMTP_HOST"]')?.value,
+ port: document.querySelector('input[name="SMTP_PORT"]')?.value,
+ user: document.querySelector('input[name="SMTP_USER"]')?.value,
+ secure: document.querySelector('input[name="SMTP_SECURE"]')?.checked
};
if (!emailConfig.from || !emailConfig.to) {
@@ -1866,10 +2965,130 @@ PulseApp.ui.alertManagementModal = (() => {
}
async function saveEmailConfiguration() {
- // This function is called by the specific save button in the email section
- // It will trigger the main saveConfiguration function
- await saveConfiguration();
- PulseApp.ui.toast.success('Email configuration saved successfully!');
+ const saveBtn = document.getElementById('save-email-config-btn');
+ if (!saveBtn) return;
+
+ const originalText = saveBtn.textContent;
+ saveBtn.disabled = true;
+ saveBtn.textContent = 'Saving...';
+
+ try {
+ // Validate SMTP configuration
+ const validationErrors = validateSMTPConfiguration();
+ if (validationErrors.length > 0) {
+ const errorMessage = 'Please fix the following errors:\n\n• ' + validationErrors.join('\n• ');
+ alert(errorMessage);
+ saveBtn.textContent = originalText;
+ saveBtn.disabled = false;
+ return;
+ }
+
+ // Collect email configuration
+ const configToSave = {};
+ const smtpHost = document.querySelector('input[name="SMTP_HOST"]')?.value;
+ const smtpPort = document.querySelector('input[name="SMTP_PORT"]')?.value;
+ const smtpUser = document.querySelector('input[name="SMTP_USER"]')?.value;
+ const smtpPass = document.querySelector('input[name="SMTP_PASS"]')?.value;
+ const fromEmail = document.querySelector('input[name="ALERT_FROM_EMAIL"]')?.value;
+ const toEmail = document.querySelector('input[name="ALERT_TO_EMAIL"]')?.value;
+ const smtpSecure = document.querySelector('input[name="SMTP_SECURE"]')?.checked;
+ const emailEnabled = (document.getElementById('email-enabled') || document.getElementById('global-email-toggle'))?.checked;
+
+ // Only include values that are set
+ if (smtpHost) configToSave.SMTP_HOST = smtpHost;
+ if (smtpPort) configToSave.SMTP_PORT = smtpPort;
+ if (smtpUser) configToSave.SMTP_USER = smtpUser;
+ if (smtpPass) configToSave.SMTP_PASS = smtpPass;
+ if (fromEmail) configToSave.ALERT_FROM_EMAIL = fromEmail;
+ if (toEmail) configToSave.ALERT_TO_EMAIL = toEmail;
+ configToSave.SMTP_SECURE = smtpSecure ? 'true' : 'false';
+ configToSave.GLOBAL_EMAIL_ENABLED = emailEnabled ? 'true' : 'false';
+
+ // Save via API
+ const response = await fetch('/api/config', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(configToSave)
+ });
+
+ const result = await response.json();
+
+ if (response.ok && result.success) {
+ PulseApp.ui.toast.success('Email configuration saved successfully!');
+ await loadConfiguration(); // Reload to reflect changes
+
+ // Update button to show success
+ saveBtn.textContent = 'Saved!';
+ saveBtn.classList.remove('bg-blue-600', 'hover:bg-blue-700');
+ saveBtn.classList.add('bg-green-600');
+
+ setTimeout(() => {
+ saveBtn.textContent = originalText;
+ saveBtn.classList.remove('bg-green-600');
+ saveBtn.classList.add('bg-blue-600', 'hover:bg-blue-700');
+ saveBtn.disabled = false;
+ }, 2000);
+ } else {
+ throw new Error(result.error || 'Failed to save configuration');
+ }
+ } catch (error) {
+ console.error('Error saving email configuration:', error);
+ PulseApp.ui.toast.error('Failed to save email configuration');
+ saveBtn.textContent = originalText;
+ saveBtn.disabled = false;
+ }
+ }
+
+ async function saveWebhookConfiguration() {
+ const saveBtn = document.getElementById('save-webhook-btn');
+ if (!saveBtn) return;
+
+ const originalText = saveBtn.textContent;
+ saveBtn.disabled = true;
+ saveBtn.textContent = 'Saving...';
+
+ try {
+ // Collect webhook configuration
+ const configToSave = {};
+ const webhookUrl = document.querySelector('input[name="WEBHOOK_URL"]')?.value;
+ const webhookEnabled = (document.getElementById('webhook-enabled') || document.getElementById('global-webhook-toggle'))?.checked;
+
+ configToSave.WEBHOOK_URL = webhookUrl || '';
+ configToSave.GLOBAL_WEBHOOK_ENABLED = webhookEnabled ? 'true' : 'false';
+
+ // Save via API
+ const response = await fetch('/api/config', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(configToSave)
+ });
+
+ const result = await response.json();
+
+ if (response.ok && result.success) {
+ PulseApp.ui.toast.success('Webhook configuration saved successfully!');
+ await loadConfiguration(); // Reload to reflect changes
+
+ // Update button to show success
+ saveBtn.textContent = 'Saved!';
+ saveBtn.classList.remove('bg-blue-600', 'hover:bg-blue-700');
+ saveBtn.classList.add('bg-green-600');
+
+ setTimeout(() => {
+ saveBtn.textContent = originalText;
+ saveBtn.classList.remove('bg-green-600');
+ saveBtn.classList.add('bg-blue-600', 'hover:bg-blue-700');
+ saveBtn.disabled = false;
+ }, 2000);
+ } else {
+ throw new Error(result.error || 'Failed to save configuration');
+ }
+ } catch (error) {
+ console.error('Error saving webhook configuration:', error);
+ PulseApp.ui.toast.error('Failed to save webhook configuration');
+ saveBtn.textContent = originalText;
+ saveBtn.disabled = false;
+ }
}
function editSystemAlert(alertType) {
@@ -2746,20 +3965,31 @@ ${isEditing ? 'Update Alert' : 'Create Alert'}
}
function loadCurrentAlerts() {
- const contentDiv = document.getElementById('current-alerts-list');
+ // Try both old and new alert list containers for compatibility
+ let contentDiv = document.getElementById('active-alerts-list');
+ if (!contentDiv) {
+ contentDiv = document.getElementById('current-alerts-list');
+ }
if (!contentDiv) return;
// Get alerts from the alerts handler
if (PulseApp.alerts && PulseApp.alerts.getActiveAlerts) {
const activeAlerts = PulseApp.alerts.getActiveAlerts();
- renderCurrentAlerts(activeAlerts);
+ renderCurrentAlerts(activeAlerts, contentDiv);
+
+ // Update alert summary if we're in monitor tab
+ if (activeTab === 'monitor') {
+ updateAlertSummary();
+ }
} else {
- contentDiv.innerHTML = '
Alert system not initialized
';
+ contentDiv.innerHTML = '
Alert system not initialized
';
}
}
- function renderCurrentAlerts(alerts) {
- const contentDiv = document.getElementById('current-alerts-list');
+ function renderCurrentAlerts(alerts, contentDiv = null) {
+ if (!contentDiv) {
+ contentDiv = document.getElementById('active-alerts-list') || document.getElementById('current-alerts-list');
+ }
if (!contentDiv) return;
if (!alerts || alerts.length === 0) {
@@ -2916,7 +4146,7 @@ ${isEditing ? 'Update Alert' : 'Create Alert'}
${!acknowledged ? `
-
@@ -2967,18 +4197,36 @@ ${isEditing ? 'Update Alert' : 'Create Alert'}
`;
}
- function loadAlertHistory() {
+ async function loadAlertHistory() {
const contentDiv = document.getElementById('alert-history-list');
if (!contentDiv) return;
- // Get historical alerts from the alerts handler
- if (PulseApp.alerts && PulseApp.alerts.getAlertHistory) {
- const historicalAlerts = PulseApp.alerts.getAlertHistory();
+ try {
+ // Show loading state
+ contentDiv.innerHTML = '
Loading alert history...
';
+
+ // Fetch actual alert history from the backend
+ const response = await fetch('/api/alerts/history?limit=100');
+ if (!response.ok) {
+ throw new Error('Failed to fetch alert history');
+ }
+
+ const data = await response.json();
+ const historicalAlerts = data.history || [];
+
renderAlertHistory(historicalAlerts);
- } else {
- // Mock historical data for now
- const mockHistory = generateMockAlertHistory();
- renderAlertHistory(mockHistory);
+
+ } catch (error) {
+ console.error('Error loading alert history:', error);
+ contentDiv.innerHTML = `
+
+
+
Error Loading History
+
Failed to load alert history: ${error.message}
+
+ `;
}
}
@@ -3185,6 +4433,75 @@ ${isEditing ? 'Update Alert' : 'Create Alert'}
}
}
+ function validateSMTPConfiguration() {
+ const errors = [];
+
+ // Get SMTP configuration values
+ const smtpHost = document.querySelector('input[name="SMTP_HOST"]')?.value?.trim();
+ const smtpPort = document.querySelector('input[name="SMTP_PORT"]')?.value?.trim();
+ const smtpUser = document.querySelector('input[name="SMTP_USER"]')?.value?.trim();
+ const smtpPass = document.querySelector('input[name="SMTP_PASS"]')?.value?.trim();
+ const fromEmail = document.querySelector('input[name="ALERT_FROM_EMAIL"]')?.value?.trim();
+ const toEmail = document.querySelector('input[name="ALERT_TO_EMAIL"]')?.value?.trim();
+
+ // Check if there's already a saved SMTP configuration
+ const existingSmtpConfig = currentConfig?.advanced?.smtp;
+ const hasExistingConfig = existingSmtpConfig?.host && existingSmtpConfig?.user;
+
+ // If all fields are empty and we have an existing config, skip validation
+ // This handles the case where the form hasn't been populated yet
+ const allFieldsEmpty = !smtpHost && !smtpPort && !smtpUser && !smtpPass && !fromEmail && !toEmail;
+ if (allFieldsEmpty && hasExistingConfig) {
+ return errors; // No errors, using existing config
+ }
+
+ // Validate required fields if any SMTP field is filled (partial configuration check)
+ const hasAnySMTPField = smtpHost || smtpPort || smtpUser || smtpPass || fromEmail || toEmail;
+
+ if (hasAnySMTPField) {
+ if (!smtpHost) {
+ errors.push('SMTP Host is required when configuring email');
+ }
+
+ if (!smtpPort) {
+ errors.push('SMTP Port is required when configuring email');
+ } else {
+ const port = parseInt(smtpPort);
+ if (isNaN(port) || port < 1 || port > 65535) {
+ errors.push('SMTP Port must be a valid port number (1-65535)');
+ }
+ }
+
+ if (!smtpUser) {
+ errors.push('SMTP Username is required when configuring email');
+ }
+
+ // Only require password for new configurations or if user is trying to change it
+ if (!smtpPass && !hasExistingConfig) {
+ errors.push('SMTP Password is required when configuring email');
+ }
+
+ if (!fromEmail) {
+ errors.push('From Email address is required when configuring email');
+ } else if (!isValidEmail(fromEmail)) {
+ errors.push('From Email must be a valid email address');
+ }
+
+ if (!toEmail) {
+ errors.push('To Email address is required when configuring email');
+ } else if (!isValidEmail(toEmail)) {
+ errors.push('To Email must be a valid email address');
+ }
+ }
+
+ return errors;
+ }
+
+ function isValidEmail(email) {
+ const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+ return emailRegex.test(email);
+ }
+
async function saveConfiguration() {
// The save configuration button in the alert management modal should
// save any pending changes. Since individual system alerts are edited
@@ -3204,17 +4521,46 @@ ${isEditing ? 'Update Alert' : 'Create Alert'}
try {
let configToSave = {};
let hasChanges = false;
-
- // Check for email configuration changes
+
+ // First check if we have any changes to save
const emailConfigSection = document.getElementById('primary-email-config');
+ let hasEmailChanges = false;
+
if (emailConfigSection) {
- const smtpHost = document.querySelector('input[name="ALERT_SMTP_HOST"]')?.value;
- const smtpPort = document.querySelector('input[name="ALERT_SMTP_PORT"]')?.value;
- const smtpUser = document.querySelector('input[name="ALERT_SMTP_USER"]')?.value;
- const smtpPass = document.querySelector('input[name="ALERT_EMAIL_PASSWORD"]')?.value;
+ const smtpHost = document.querySelector('input[name="SMTP_HOST"]')?.value;
+ const smtpPort = document.querySelector('input[name="SMTP_PORT"]')?.value;
+ const smtpUser = document.querySelector('input[name="SMTP_USER"]')?.value;
+ const smtpPass = document.querySelector('input[name="SMTP_PASS"]')?.value;
const fromEmail = document.querySelector('input[name="ALERT_FROM_EMAIL"]')?.value;
const toEmail = document.querySelector('input[name="ALERT_TO_EMAIL"]')?.value;
- const smtpSecure = document.querySelector('input[name="ALERT_SMTP_SECURE"]')?.checked;
+
+ // Check if any email field has a value (indicating user wants to save email config)
+ hasEmailChanges = smtpHost || smtpPort || smtpUser || smtpPass || fromEmail || toEmail;
+ }
+
+ // Only validate SMTP configuration if there are email changes
+ if (hasEmailChanges) {
+ const validationErrors = validateSMTPConfiguration();
+ if (validationErrors.length > 0) {
+ const errorMessage = 'Please fix the following errors:\n\n• ' + validationErrors.join('\n• ');
+ alert(errorMessage);
+
+ // Re-enable save button since validation failed
+ saveButton.disabled = false;
+ saveButton.textContent = originalText;
+ return;
+ }
+ }
+
+ // Process email configuration changes
+ if (emailConfigSection && hasEmailChanges) {
+ const smtpHost = document.querySelector('input[name="SMTP_HOST"]')?.value;
+ const smtpPort = document.querySelector('input[name="SMTP_PORT"]')?.value;
+ const smtpUser = document.querySelector('input[name="SMTP_USER"]')?.value;
+ const smtpPass = document.querySelector('input[name="SMTP_PASS"]')?.value;
+ const fromEmail = document.querySelector('input[name="ALERT_FROM_EMAIL"]')?.value;
+ const toEmail = document.querySelector('input[name="ALERT_TO_EMAIL"]')?.value;
+ const smtpSecure = document.querySelector('input[name="SMTP_SECURE"]')?.checked;
if (smtpHost) { configToSave.SMTP_HOST = smtpHost; hasChanges = true; }
if (smtpPort) { configToSave.SMTP_PORT = smtpPort; hasChanges = true; }
@@ -3287,7 +4633,12 @@ ${isEditing ? 'Update Alert' : 'Create Alert'}
'memory_usage_warning': 'memory',
'disk_space_warning': 'disk',
'disk_space_critical': 'disk', // Both disk alerts use same config
- 'guest_down': 'down'
+ 'guest_down': 'down',
+ // Also handle short form IDs that come from UI
+ 'cpu': 'cpu',
+ 'memory': 'memory',
+ 'disk': 'disk',
+ 'down': 'down'
};
const alertType = alertTypeMap[alertId];
@@ -3330,28 +4681,7 @@ ${isEditing ? 'Update Alert' : 'Create Alert'}
}
}
- async function editCustomAlert(alertId) {
- try {
- // First, fetch the current alert data
- const response = await fetch('/api/alerts/rules');
- if (!response.ok) {
- throw new Error(`Failed to fetch alert rules: ${response.status}`);
- }
-
- const data = await response.json();
- const alert = data.rules ? data.rules.find(rule => rule.id === alertId) : null;
-
- if (!alert) {
- throw new Error('Alert not found');
- }
-
- // Open the custom alert modal with pre-filled data
- openCustomAlertModal(alert.thresholds || [], alert);
-
- } catch (error) {
- console.error('Failed to load alert for editing:', error);
- }
- }
+ // editCustomAlert function removed - now using unified editAlertRule
async function deleteCustomAlert(alertId) {
try {
@@ -3574,17 +4904,17 @@ ${isEditing ? 'Update Alert' : 'Create Alert'}
closeModal,
switchTab: switchTab,
openCustomAlertModal,
- editCustomAlert,
+ editAlertRule,
toggleCustomAlert,
toggleAlert,
- toggleSystemAlert,
+ toggleAlertRule,
deleteCustomAlert,
showAlertDetails,
addWebhookEndpoint,
removeWebhookEndpoint,
handleEmailProviderSelection,
loadCurrentAlerts: () => {
- if (activeTab === 'alerts') {
+ if (activeTab === 'monitor' || activeTab === 'alerts') {
loadCurrentAlerts();
}
}
@@ -3598,5 +4928,4 @@ if (document.readyState === 'loading') {
PulseApp.ui.alertManagementModal.init();
}
-// Make toggleSystemAlert available globally for HTML onclick handlers
-window.toggleSystemAlert = PulseApp.ui.alertManagementModal.toggleSystemAlert;
\ No newline at end of file
+// Global functions are now exposed in the init() function to prevent timing issues
\ No newline at end of file