summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkushalpandya <kushal@gitlab.com>2017-05-29 17:52:43 +0530
committerkushalpandya <kushal@gitlab.com>2017-05-29 17:52:43 +0530
commit35671a2388f89301f7afef11f47a9f2ff68dcd80 (patch)
tree364787203eb6bd7d1011e7ea01eb97184cb4d081
parentd4eb5dc629f11e5766bce8617b49b0f9cebe15fe (diff)
downloadgitlab-ce-27439-memory-usage-info.tar.gz
Use `bytesToMiB` to convert bytes into MB, add comments for array accessor27439-memory-usage-info
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
index dea09d68224..8155218681c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
@@ -1,4 +1,6 @@
import statusCodes from '~/lib/utils/http_status';
+import { bytesToMiB } from '~/lib/utils/number_utils';
+
import MemoryGraph from '../../vue_shared/components/memory_graph';
import MRWidgetService from '../services/mr_widget_service';
@@ -36,9 +38,12 @@ export default {
return !this.loadingMetrics && !this.hasMetrics && !this.loadFailed;
},
memoryChangeType() {
- if (this.memoryTo > this.memoryFrom) {
+ const memoryTo = Number(this.memoryTo);
+ const memoryFrom = Number(this.memoryFrom);
+
+ if (memoryTo > memoryFrom) {
return 'increased';
- } else if (this.memoryTo < this.memoryFrom) {
+ } else if (memoryTo < memoryFrom) {
return 'decreased';
}
@@ -48,12 +53,15 @@ export default {
methods: {
getMegabytes(bytesString) {
const valueInBytes = Number(bytesString).toFixed(2);
- return (valueInBytes / (1024 * 1024)).toFixed(2);
+ return (bytesToMiB(valueInBytes)).toFixed(2);
},
computeGraphData(metrics, deploymentTime) {
this.loadingMetrics = false;
const { memory_before, memory_after, memory_values } = metrics;
+ // Both `memory_before` and `memory_after` objects
+ // have peculiar structure where accessing only a specific
+ // index yeilds correct value that we can use to show memory delta.
if (memory_before.length > 0) {
this.memoryFrom = this.getMegabytes(memory_before[0].value[1]);
}