From 82e572728712ce8a2821b4b2b07e016455dbfe52 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 28 May 2018 10:55:42 +0200
Subject: [PATCH] UX: -2/+2% change in stats should be no-change in dashboard

---
 .../javascripts/admin/models/report.js.es6    | 33 +++++++++----------
 test/javascripts/models/report-test.js.es6    | 21 +++++++++---
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index d52d3ad06e6..80c160a8d90 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -60,14 +60,14 @@ const Report = Discourse.Model.extend({
     return this.get("average") ? value / count : value;
   },
 
-  @computed("yesterdayCount")
-  yesterdayTrend(yesterdayCount) {
-    return this._computeTrend(this.valueAt(2), yesterdayCount);
+  @computed("yesterdayCount", "higher_is_better")
+  yesterdayTrend(yesterdayCount, higherIsBetter) {
+    return this._computeTrend(this.valueAt(2), yesterdayCount, higherIsBetter);
   },
 
-  @computed("lastSevenDaysCount")
-  sevenDaysTrend(lastSevenDaysCount) {
-    return this._computeTrend(this.valueFor(8, 14), lastSevenDaysCount);
+  @computed("lastSevenDaysCount", "higher_is_better")
+  sevenDaysTrend(lastSevenDaysCount, higherIsBetter) {
+    return this._computeTrend(this.valueFor(8, 14), lastSevenDaysCount, higherIsBetter);
   },
 
   @computed("data")
@@ -100,15 +100,15 @@ const Report = Discourse.Model.extend({
     return this._iconForTrend(yesterdayTrend, higherIsBetter);
   },
 
-  @computed("prev_period", "currentTotal", "currentAverage")
-  trend(prev, currentTotal, currentAverage) {
+  @computed("prev_period", "currentTotal", "currentAverage", "higher_is_better")
+  trend(prev, currentTotal, currentAverage, higherIsBetter) {
     const total = this.get("average") ? currentAverage : currentTotal;
-    return this._computeTrend(prev, total);
+    return this._computeTrend(prev, total, higherIsBetter);
   },
 
-  @computed("prev30Days", "lastThirtyDaysCount")
-  thirtyDaysTrend(prev30Days, lastThirtyDaysCount) {
-    return this._computeTrend(prev30Days, lastThirtyDaysCount);
+  @computed("prev30Days", "lastThirtyDaysCount", "higher_is_better")
+  thirtyDaysTrend(prev30Days, lastThirtyDaysCount, higherIsBetter) {
+    return this._computeTrend(prev30Days, lastThirtyDaysCount, higherIsBetter);
   },
 
   @computed("type")
@@ -205,19 +205,18 @@ const Report = Discourse.Model.extend({
     return ((valAtT2 - valAtT1) / valAtT1) * 100;
   },
 
-  _computeTrend(valAtT1, valAtT2) {
+  _computeTrend(valAtT1, valAtT2, higherIsBetter) {
     const change = this._computeChange(valAtT1, valAtT2);
-    const higherIsBetter = this.get("higher_is_better");
 
     if (change > 50) {
       return higherIsBetter ? "high-trending-up" : "high-trending-down";
-    } else if (change > 0) {
+    } else if (change > 2) {
       return higherIsBetter ? "trending-up" : "trending-down";
-    } else if (change === 0) {
+    } else if (change <= 2 && change >= -2) {
       return "no-change";
     } else if (change < -50) {
       return higherIsBetter ? "high-trending-down" : "high-trending-up";
-    } else if (change < 0) {
+    } else if (change < -2) {
       return higherIsBetter ? "trending-down" : "trending-up";
     }
   },
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js.es6
index a2544836e09..6af13105731 100644
--- a/test/javascripts/models/report-test.js.es6
+++ b/test/javascripts/models/report-test.js.es6
@@ -84,7 +84,7 @@ QUnit.test("sevenDaysTrend", assert => {
 
   report = reportWithData([0, 1,1,1,1,1,1,0, 1,1,1,1,1,1,1]);
   trend = report.get("sevenDaysTrend");
-  assert.ok(trend === "trending-down");;
+  assert.ok(trend === "trending-down");
 });
 
 QUnit.test("yesterdayTrend", assert => {
@@ -109,7 +109,7 @@ QUnit.test("yesterdayTrend", assert => {
 
   report = reportWithData([0, 1, 1.1]);
   trend = report.get("yesterdayTrend");
-  assert.ok(trend === "trending-down");;
+  assert.ok(trend === "trending-down");
 });
 
 QUnit.test("thirtyDaysTrend", assert => {
@@ -139,7 +139,7 @@ QUnit.test("thirtyDaysTrend", assert => {
   report = reportWithData([0, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0]);
   report.set("prev30Days", 35);
   trend = report.get("thirtyDaysTrend");
-  assert.ok(trend === "trending-down");;
+  assert.ok(trend === "trending-down");
 });
 
 QUnit.test("higher is better false", assert => {
@@ -164,7 +164,20 @@ QUnit.test("higher is better false", assert => {
   report = reportWithData([0, 1, 1.1]);
   report.set("higher_is_better", false);
   trend = report.get("yesterdayTrend");
-  assert.ok(trend === "trending-up");;
+  assert.ok(trend === "trending-up");
+});
+
+QUnit.test("small variation (-2/+2% change) is no-change", assert => {
+  let report;
+  let trend;
+
+  report = reportWithData([0, 1,1,1,1,1,1,0.9, 1,1,1,1,1,1,1]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "no-change");
+
+  report = reportWithData([0, 1,1,1,1,1,1,1.1, 1,1,1,1,1,1,1]);
+  trend = report.get("sevenDaysTrend");
+  assert.ok(trend === "no-change");
 });
 
 QUnit.test("average", assert => {