gsadmin/pulse
1
0
Fork 0
mirror of https://github.com/rcourtman/Pulse.git synced 2026-09-10 18:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dataFetcher): Use endpointId for consistent data association

Browse Source
This commit is contained in:
courtmanr@gmail.com
2025-05-08 14:59:58 +01:00
parent 95234252fe
commit 5ccfcee793
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/dataFetcher.js
+7 -6
View File
@@ -61,7 +61,8 @@ async function fetchDataForPveEndpoint(endpointId, apiClientInstance, config) {
return { nodes: [], vms: [], containers: [] };
}
const guestPromises = nodes.map(node => fetchDataForNode(apiClientInstance, endpointName, node.node));
// Pass the correct endpointId to fetchDataForNode
const guestPromises = nodes.map(node => fetchDataForNode(apiClientInstance, endpointId, node.node));
const guestResults = await Promise.allSettled(guestPromises);
let endpointVms = [];
@@ -79,15 +80,15 @@ async function fetchDataForPveEndpoint(endpointId, apiClientInstance, config) {
maxmem: correspondingNodeInfo.maxmem,
level: correspondingNodeInfo.level,
status: correspondingNodeInfo.status || 'unknown',
id: `${endpointName}-${correspondingNodeInfo.node}`,
endpointId: endpointName, // Use the actual endpointName here
id: `${endpointId}-${correspondingNodeInfo.node}`, // Use endpointId for node ID
endpointId: endpointId, // Use endpointId for tagging node
};
if (result.status === 'fulfilled' && result.value) {
const nodeData = result.value;
// Use endpointName for constructing IDs
endpointVms.push(...(nodeData.vms || []).map(vm => ({ ...vm, endpointId: endpointName, id: `${endpointName}-${vm.node}-${vm.vmid}` })));
endpointContainers.push(...(nodeData.containers || []).map(ct => ({ ...ct, endpointId: endpointName, id: `${endpointName}-${ct.node}-${ct.vmid}` })));
// Use endpointId (the actual key) for constructing IDs and tagging
endpointVms.push(...(nodeData.vms || []).map(vm => ({ ...vm, endpointId: endpointId, id: `${endpointId}-${vm.node}-${vm.vmid}` })));
endpointContainers.push(...(nodeData.containers || []).map(ct => ({ ...ct, endpointId: endpointId, id: `${endpointId}-${ct.node}-${ct.vmid}` })));
if (nodeData.nodeStatus && Object.keys(nodeData.nodeStatus).length > 0) {
const statusData = nodeData.nodeStatus;