From 3a86e69f8cf773a1306828e9ab41150105a8336d Mon Sep 17 00:00:00 2001
From: Brenda Sukh <brendasukh@gmail.com>
Date: Fri, 13 Nov 2020 15:16:15 -0500
Subject: [PATCH] Fix cost chart tooltip date label

---
 .../src/components/CostOverviewCard/CostOverviewChart.tsx  | 7 +++++--
 plugins/cost-insights/src/utils/change.test.ts             | 7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewChart.tsx b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewChart.tsx
index 6ed72923ff..1910013581 100644
--- a/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewChart.tsx
+++ b/plugins/cost-insights/src/components/CostOverviewCard/CostOverviewChart.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import React from 'react';
-import moment from 'moment';
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
 import { useTheme } from '@material-ui/core';
 import {
   ComposedChart,
@@ -50,6 +51,8 @@ import { useCostOverviewStyles as useStyles } from '../../utils/styles';
 import { groupByDate, toDataMax, trendFrom } from '../../utils/charts';
 import { aggregationSort } from '../../utils/sort';
 
+dayjs.extend(utc);
+
 type CostOverviewChartProps = {
   metric: Maybe<Metric>;
   metricData: Maybe<MetricData>;
@@ -104,7 +107,7 @@ export const CostOverviewChart = ({
     if (isInvalid({ label, payload })) return null;
 
     const dataKeys = [data.dailyCost.dataKey, data.metric.dataKey];
-    const title = moment(label).format(DEFAULT_DATE_FORMAT);
+    const title = dayjs(label).utc().format(DEFAULT_DATE_FORMAT);
     const items = payload
       .filter(p => dataKeys.includes(p.dataKey as string))
       .map(p => ({
diff --git a/plugins/cost-insights/src/utils/change.test.ts b/plugins/cost-insights/src/utils/change.test.ts
index 709f2dd882..94adc25f64 100644
--- a/plugins/cost-insights/src/utils/change.test.ts
+++ b/plugins/cost-insights/src/utils/change.test.ts
@@ -76,8 +76,13 @@ describe('getPreviousPeriodTotalCost', () => {
       change: changeOf(MockAggregatedDailyCosts),
       trendline: trendlineOf(MockAggregatedDailyCosts),
     };
+    const exclusiveEndDate = '2020-10-01';
     expect(
-      getPreviousPeriodTotalCost(mockGroupDailyCost, Duration.P1M),
+      getPreviousPeriodTotalCost(
+        mockGroupDailyCost,
+        Duration.P1M,
+        exclusiveEndDate,
+      ),
     ).toEqual(100_000);
   });
 });