# HG changeset patch # User Andrew Azores # Date 1507909191 14400 # Node ID 63df0ca94b6b15c5cabbd4a4b90f6044a10a7c10 # Parent e73fafd4a1a6b7633b6a10acf90c83320b088af6 Fix system-memory data format inconsistencies for multicharts Reviewed-by: jkang Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-October/025384.html diff -r e73fafd4a1a6 -r 63df0ca94b6b src/app/components/system-info/system-memory/system-memory.controller.js --- a/src/app/components/system-info/system-memory/system-memory.controller.js Wed Oct 11 14:57:28 2017 -0400 +++ b/src/app/components/system-info/system-memory/system-memory.controller.js Fri Oct 13 11:39:51 2017 -0400 @@ -230,8 +230,8 @@ return new Promise(resolve => this._svc.getMemoryInfo(this.systemId).then(resp => { let data = resp.data.response[0]; - let free = data.free; - let total = data.total; + let free = this._metricToNumber(data.free); + let total = this._metricToNumber(data.total); let used = total - free; let usage = Math.round(used / total * 100); resolve(usage); diff -r e73fafd4a1a6 -r 63df0ca94b6b src/app/components/system-info/system-memory/system-memory.controller.spec.js --- a/src/app/components/system-info/system-memory/system-memory.controller.spec.js Wed Oct 11 14:57:28 2017 -0400 +++ b/src/app/components/system-info/system-memory/system-memory.controller.spec.js Fri Oct 13 11:39:51 2017 -0400 @@ -175,8 +175,8 @@ data: { response: [ { - total: tup[0], - free: tup[1] + total: { $numberLong: tup[0].toString() }, + free: { $numberLong: tup[1].toString() } } ] }