bckelley/cgm-remote-monitor
1
0
Fork 0
mirror of https://github.com/bckelley/cgm-remote-monitor.git synced 2026-08-24 03:14:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix devicestatus retro merge (#5193)

Browse Source
This commit is contained in:
Jeremy Cunningham
2019-11-10 19:18:05 +00:00
committed by Sulka Haro
parent 9c42fed941
commit c4ee62b495
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/client/index.js
+11 -1
View File
@@ -468,6 +468,16 @@ client.load = function load (serverSettings, callback) {
adjustCurrentSGVClasses(value, isCurrent);
}
function mergeDeviceStatus (retro, ddata) {
var result = retro.map(x => Object.assign(x, ddata.find(y => y._id == x._id)));
var missingInRetro = ddata.filter(y => !retro.find(x => x._id == y._id));
result.push(...missingInRetro);
return result;
}
function updatePlugins (time) {
//TODO: doing a clone was slow, but ok to let plugins muck with data?
@@ -482,7 +492,7 @@ client.load = function load (serverSettings, callback) {
var mergedStatuses = client.ddata.devicestatus;
if (client.retro.data) {
mergedStatuses = _.merge({}, client.retro.data.devicestatus, client.ddata.devicestatus);
mergedStatuses = mergeDeviceStatus(client.retro.data.devicestatus, client.ddata.devicestatus);
}
var clonedData = _.clone(client.ddata);