url/checkcle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Persist multiple notification channels

Browse Source 
- The notification channels field in the service dialog form was not saving or applying multiple selections
This commit is contained in:
Tola Leng
2025-07-11 17:57:32 +07:00
parent 35e161e40d
commit 59dcdcb5df
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/src/services/serviceService.ts
+24 -10
View File
@@ -1,3 +1,4 @@
import { pb } from '@/lib/pocketbase'; import { pb } from '@/lib/pocketbase';
import { Service, CreateServiceParams, UptimeData } from '@/types/service.types'; import { Service, CreateServiceParams, UptimeData } from '@/types/service.types';
import { monitoringService } from './monitoring'; import { monitoringService } from './monitoring';
@@ -27,6 +28,7 @@ export const serviceService = {
interval: item.heartbeat_interval || item.interval || 60, interval: item.heartbeat_interval || item.interval || 60,
retries: item.max_retries || item.retries || 3, retries: item.max_retries || item.retries || 3,
notificationChannel: item.notification_id, notificationChannel: item.notification_id,
notification_channel: item.notification_channel, // Add this field for multiple channels support
notification_status: item.notification_status || "disabled", notification_status: item.notification_status || "disabled",
alertTemplate: item.template_id, alertTemplate: item.template_id,
muteAlerts: item.alerts === "muted", // Convert string to boolean for compatibility muteAlerts: item.alerts === "muted", // Convert string to boolean for compatibility
@@ -50,7 +52,7 @@ export const serviceService = {
const serviceType = params.type.toLowerCase(); const serviceType = params.type.toLowerCase();
// Debug log to check what we're sending // Debug log to check what we're sending
console.log("Creating service with params:", params); // console.log("Creating service with params:", params);
const data = { const data = {
name: params.name, name: params.name,
@@ -62,8 +64,13 @@ export const serviceService = {
heartbeat_interval: params.interval, heartbeat_interval: params.interval,
max_retries: params.retries, max_retries: params.retries,
notification_status: params.notificationStatus || "disabled", notification_status: params.notificationStatus || "disabled",
// Store multiple notification channels as JSON string
notification_channel: params.notificationChannels && params.notificationChannels.length > 0
? JSON.stringify(params.notificationChannels)
: null,
// Store multiple notification IDs as comma-separated string in notification_id field
notification_id: params.notificationChannels && params.notificationChannels.length > 0 notification_id: params.notificationChannels && params.notificationChannels.length > 0
? params.notificationChannels[0] // Store first channel for backward compatibility ? params.notificationChannels.join(',')
: null, : null,
template_id: params.alertTemplate, template_id: params.alertTemplate,
// Regional monitoring fields - use regional_status // Regional monitoring fields - use regional_status
@@ -81,9 +88,9 @@ export const serviceService = {
) )
}; };
console.log("Creating service with data:", data); // console.log("Creating service with data:", data);
const record = await pb.collection('services').create(data); const record = await pb.collection('services').create(data);
console.log("Service created, returned record:", record); // console.log("Service created, returned record:", record);
// Return the newly created service // Return the newly created service
const newService = { const newService = {
@@ -101,6 +108,7 @@ export const serviceService = {
interval: record.heartbeat_interval || 60, interval: record.heartbeat_interval || 60,
retries: record.max_retries || 3, retries: record.max_retries || 3,
notificationChannel: record.notification_id, notificationChannel: record.notification_id,
notification_channel: record.notification_channel,
notification_status: record.notification_status || "disabled", notification_status: record.notification_status || "disabled",
alertTemplate: record.template_id, alertTemplate: record.template_id,
regional_status: record.regional_status || "disabled", regional_status: record.regional_status || "disabled",
@@ -114,7 +122,7 @@ export const serviceService = {
return newService; return newService;
} catch (error) { } catch (error) {
console.error("Error creating service:", error); // console.error("Error creating service:", error);
throw new Error('Failed to create service.'); throw new Error('Failed to create service.');
} }
}, },
@@ -125,7 +133,7 @@ export const serviceService = {
const serviceType = params.type.toLowerCase(); const serviceType = params.type.toLowerCase();
// Debug log to check what we're updating // Debug log to check what we're updating
console.log("Updating service with params:", params); // console.log("Updating service with params:", params);
const data = { const data = {
name: params.name, name: params.name,
@@ -133,8 +141,13 @@ export const serviceService = {
heartbeat_interval: params.interval, heartbeat_interval: params.interval,
max_retries: params.retries, max_retries: params.retries,
notification_status: params.notificationStatus || "disabled", notification_status: params.notificationStatus || "disabled",
// Store multiple notification channels as JSON string
notification_channel: params.notificationChannels && params.notificationChannels.length > 0
? JSON.stringify(params.notificationChannels)
: null,
// Store multiple notification IDs as comma-separated string in notification_id field
notification_id: params.notificationChannels && params.notificationChannels.length > 0 notification_id: params.notificationChannels && params.notificationChannels.length > 0
? params.notificationChannels[0] // Store first channel for backward compatibility ? params.notificationChannels.join(',')
: null, : null,
template_id: params.alertTemplate || null, template_id: params.alertTemplate || null,
// Regional monitoring fields - use regional_status // Regional monitoring fields - use regional_status
@@ -152,7 +165,7 @@ export const serviceService = {
) )
}; };
console.log("Updating service with data:", data); // console.log("Updating service with data:", data);
// Use timeout to ensure the request doesn't hang // Use timeout to ensure the request doesn't hang
const timeoutPromise = new Promise<never>((_, reject) => { const timeoutPromise = new Promise<never>((_, reject) => {
@@ -161,7 +174,7 @@ export const serviceService = {
const updatePromise = pb.collection('services').update(id, data); const updatePromise = pb.collection('services').update(id, data);
const record = await Promise.race([updatePromise, timeoutPromise]) as any; const record = await Promise.race([updatePromise, timeoutPromise]) as any;
console.log("Service updated, returned record:", record); // console.log("Service updated, returned record:", record);
// Return the updated service // Return the updated service
const updatedService = { const updatedService = {
@@ -179,6 +192,7 @@ export const serviceService = {
interval: record.heartbeat_interval || 60, interval: record.heartbeat_interval || 60,
retries: record.max_retries || 3, retries: record.max_retries || 3,
notificationChannel: record.notification_id, notificationChannel: record.notification_id,
notification_channel: record.notification_channel,
notification_status: record.notification_status || "disabled", notification_status: record.notification_status || "disabled",
alertTemplate: record.template_id, alertTemplate: record.template_id,
regional_status: record.regional_status || "disabled", regional_status: record.regional_status || "disabled",
@@ -189,7 +203,7 @@ export const serviceService = {
return updatedService; return updatedService;
} catch (error) { } catch (error) {
console.error("Error updating service:", error); //console.error("Error updating service:", error);
throw new Error(`Failed to update service: ${error instanceof Error ? error.message : 'Unknown error'}`); throw new Error(`Failed to update service: ${error instanceof Error ? error.message : 'Unknown error'}`);
} }
}, },