From 8a9d2abc4d741e42c0ab4b9282d29db6a6f8d08e Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 8 Mar 2021 21:01:57 -0800
Subject: [PATCH] No longer include an automatic tooltip in LineChart

It is now required to use the one yielded by the :after named block.
---
 ui/app/components/line-chart.js                    |  2 +-
 ui/app/templates/components/line-chart.hbs         | 13 -------------
 ui/app/templates/components/scale-events-chart.hbs |  6 ++++++
 ui/app/templates/components/stats-time-series.hbs  |  8 ++++++++
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ui/app/components/line-chart.js b/ui/app/components/line-chart.js
index 5637e50c4..995df3f81 100644
--- a/ui/app/components/line-chart.js
+++ b/ui/app/components/line-chart.js
@@ -293,7 +293,7 @@ export default class LineChart extends Component {
       return {
         series,
         datum: {
-          formattedX: this.xFormat()(datum[xProp]),
+          formattedX: this.xFormat(this.args.timeseries)(datum[xProp]),
           formattedY: this.yFormat()(datum[yProp]),
           datum,
         },
diff --git a/ui/app/templates/components/line-chart.hbs b/ui/app/templates/components/line-chart.hbs
index c97e2a986..7927fe2c6 100644
--- a/ui/app/templates/components/line-chart.hbs
+++ b/ui/app/templates/components/line-chart.hbs
@@ -51,17 +51,4 @@
         data=this.activeData)
     ) to="after"}}
   {{/if}}
-  {{#unless @dataProp}}
-    <div class="chart-tooltip is-snappy {{if this.isActive "active" "inactive"}}" style={{this.tooltipStyle}}>
-      <ol>
-        <li>
-          <span class="label">
-            <span class="color-swatch {{this.chartClass}}" />
-            {{this.activeDatumLabel}}
-          </span>
-          <span class="value">{{this.activeDatumValue}}</span>
-        </li>
-      </ol>
-    </div>
-  {{/unless}}
 </div>
diff --git a/ui/app/templates/components/scale-events-chart.hbs b/ui/app/templates/components/scale-events-chart.hbs
index 7a60a1803..20d188d52 100644
--- a/ui/app/templates/components/scale-events-chart.hbs
+++ b/ui/app/templates/components/scale-events-chart.hbs
@@ -9,6 +9,12 @@
       @data={{this.data}} />
   </:svg>
   <:after as |c|>
+    <c.Tooltip class="is-snappy" as |series datum|>
+      <li>
+        <span class="label"><span class="color-swatch is-primary" />{{datum.formattedX}}</span>
+        <span class="value">{{datum.formattedY}}</span>
+      </li>
+    </c.Tooltip>
     <c.VAnnotations
       @annotations={{this.annotations}}
       @key="event.uid"
diff --git a/ui/app/templates/components/stats-time-series.hbs b/ui/app/templates/components/stats-time-series.hbs
index 461efc3d8..c9fd15cfd 100644
--- a/ui/app/templates/components/stats-time-series.hbs
+++ b/ui/app/templates/components/stats-time-series.hbs
@@ -13,4 +13,12 @@
   <:svg as |c|>
     <c.Area @data={{@data}} @colorClass={{@chartClass}} />
   </:svg>
+  <:after as |c|>
+    <c.Tooltip class="is-snappy" as |series datum|>
+      <li>
+        <span class="label"><span class="color-swatch {{@chartClass}}" />{{datum.formattedX}}</span>
+        <span class="value">{{datum.formattedY}}</span>
+      </li>
+    </c.Tooltip>
+  </:after>
 </LineChart>