diff --git a/ui/app/components/http-requests-container.js b/ui/app/components/http-requests-container.js index 4aff4c7ba4..f58b01fce8 100644 --- a/ui/app/components/http-requests-container.js +++ b/ui/app/components/http-requests-container.js @@ -34,9 +34,9 @@ export default Component.extend({ let filteredCounters = []; if (timeWindow === 'Last 12 Months') { const today = new Date(); - const TwelveMonthsAgo = addMonths(today, -12); + const twelveMonthsAgo = addMonths(today, -12); filteredCounters = counters.filter(counter => { - return isWithinRange(counter.start_time, TwelveMonthsAgo, today); + return isWithinRange(counter.start_time, twelveMonthsAgo, today); }); return filteredCounters; diff --git a/ui/app/components/http-requests-dropdown.js b/ui/app/components/http-requests-dropdown.js index db8e2e9bc8..7247c72961 100644 --- a/ui/app/components/http-requests-dropdown.js +++ b/ui/app/components/http-requests-dropdown.js @@ -27,7 +27,12 @@ export default Component.extend({ let counters = this.counters || []; let options = []; if (counters.length) { - const years = counters.map(counter => counter.start_time.substr(0, 4)).uniq(); + const years = counters + .map(counter => { + const year = new Date(counter.start_time); + return year.getUTCFullYear(); + }) + .uniq(); years.sort().reverse(); options = options.concat(years); } diff --git a/ui/app/styles/components/http-requests-bar-chart.scss b/ui/app/styles/components/http-requests-bar-chart.scss index 2c62196684..62570d1f9b 100644 --- a/ui/app/styles/components/http-requests-bar-chart.scss +++ b/ui/app/styles/components/http-requests-bar-chart.scss @@ -44,6 +44,7 @@ background: $grey; color: $ui-gray-010; border-radius: 2px; + pointer-events: none !important; } /* Creates a small triangle extender for the tooltip */