Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fix display of years.
Mike Caoa0cb27846367
diff --git a/lib/date.js b/lib/date.jsindex c8d092d4e..e7e280362 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.jsonindex e87212c3a..f9541179a 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 <[email protected]>","license": "MIT",diff --git a/pages/api/website/[id]/pageviews.js b/pages/api/website/[id]/pageviews.jsindex ff3b731ee..398e52e44 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);