Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix devicestatus Client Merge to Retro Data #5193

Merged
merged 1 commit into from
Nov 10, 2019
Merged

Fix devicestatus Client Merge to Retro Data #5193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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);
Expand Down