From f9268b8d0923f9e66ff33c93396da2c9ff7def8d Mon Sep 17 00:00:00 2001
From: Noelle Daley <noelledaley@users.noreply.github.com>
Date: Tue, 16 Jul 2019 16:26:49 -0700
Subject: [PATCH] Ui/http request fixes (#7128)

* ensure dropdown updates selected item

* ensure no duplicate ticks

* handle case where counters are Dates instead of strings so bar chart filters in Storybook
---
 ui/app/components/http-requests-bar-chart.js           | 2 +-
 ui/app/components/http-requests-container.js           | 4 ++--
 ui/app/templates/components/http-requests-dropdown.hbs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/app/components/http-requests-bar-chart.js b/ui/app/components/http-requests-bar-chart.js
index 0b4b8c9033..9d0ac9dc65 100644
--- a/ui/app/components/http-requests-bar-chart.js
+++ b/ui/app/components/http-requests-bar-chart.js
@@ -120,7 +120,7 @@ export default Component.extend({
     // scale and render the axes
     const yAxis = d3Axis
       .axisRight(yScale)
-      .ticks(3, '.0s')
+      .ticks(3, '~s')
       .tickSizeOuter(0);
     const xAxis = d3Axis
       .axisBottom(xScale)
diff --git a/ui/app/components/http-requests-container.js b/ui/app/components/http-requests-container.js
index f58b01fce8..962e139649 100644
--- a/ui/app/components/http-requests-container.js
+++ b/ui/app/components/http-requests-container.js
@@ -43,8 +43,8 @@ export default Component.extend({
     }
 
     filteredCounters = counters.filter(counter => {
-      const year = counter.start_time.substr(0, 4);
-      return year === timeWindow;
+      const year = new Date(counter.start_time).getUTCFullYear();
+      return year.toString() === timeWindow;
     });
     return filteredCounters;
   }),
diff --git a/ui/app/templates/components/http-requests-dropdown.hbs b/ui/app/templates/components/http-requests-dropdown.hbs
index 97432a5a70..02b9420807 100644
--- a/ui/app/templates/components/http-requests-dropdown.hbs
+++ b/ui/app/templates/components/http-requests-dropdown.hbs
@@ -6,7 +6,7 @@
       <option value="All" selected={{eq timeWindow "All"}}>All</option>/>
       <option value="Last 12 Months" selected={{eq timeWindow "Last 12 Months"}}>Last 12 Months</option>
     {{#each options as |op|}}
-      <option value={{op}} selected={{eq timeWindow op}}>{{op}}</option>
+      <option value={{op}} selected={{eq timeWindow.value op}}>{{op}}</option>
     {{/each}}
   </select>
 </div>