From a0cb27846367360a12f5ec316cc590dc299f262a Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 13 Sep 2020 01:38:14 -0700
Subject: [PATCH] Fix display of years.

---
 lib/date.js                         | 5 ++++-
 package.json                        | 2 +-
 pages/api/website/[id]/pageviews.js | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/date.js b/lib/date.js
index c8d092d4..e7e28036 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -4,6 +4,7 @@ import {
   addHours,
   addDays,
   addMonths,
+  addYears,
   subHours,
   subDays,
   startOfHour,
@@ -19,6 +20,7 @@ import {
   differenceInHours,
   differenceInCalendarDays,
   differenceInCalendarMonths,
+  differenceInCalendarYears,
 } from 'date-fns';
 
 export function getTimezone() {
@@ -90,7 +92,7 @@ export function getDateRangeValues(startDate, endDate) {
     return { startDate: startOfHour(startDate), endDate: endOfHour(endDate), unit: 'hour' };
   } else if (differenceInCalendarDays(endDate, startDate) <= 90) {
     return { startDate: startOfDay(startDate), endDate: endOfDay(endDate), unit: 'day' };
-  } else if (differenceInCalendarMonths(endDate, startDate) <= 12) {
+  } else if (differenceInCalendarMonths(endDate, startDate) <= 24) {
     return { startDate: startOfMonth(startDate), endDate: endOfMonth(endDate), unit: 'month' };
   }
   return { startDate: startOfYear(startDate), endDate: endOfYear(endDate), unit: 'year' };
@@ -100,6 +102,7 @@ const dateFuncs = {
   hour: [differenceInHours, addHours, startOfHour],
   day: [differenceInCalendarDays, addDays, startOfDay],
   month: [differenceInCalendarMonths, addMonths, startOfMonth],
+  year: [differenceInCalendarYears, addYears, startOfYear],
 };
 
 export function getDateArray(data, startDate, endDate, unit) {
diff --git a/package.json b/package.json
index e87212c3..f9541179 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",
diff --git a/pages/api/website/[id]/pageviews.js b/pages/api/website/[id]/pageviews.js
index ff3b731e..398e52e4 100644
--- a/pages/api/website/[id]/pageviews.js
+++ b/pages/api/website/[id]/pageviews.js
@@ -3,7 +3,7 @@ import { getPageviews } from 'lib/queries';
 import { ok, badRequest, methodNotAllowed } from 'lib/response';
 import { useAuth } from 'lib/middleware';
 
-const unitTypes = ['month', 'hour', 'day'];
+const unitTypes = ['year', 'month', 'hour', 'day'];
 
 export default async (req, res) => {
   await useAuth(req, res);