Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Fix date issue in Safari.

Mike Cao15ea2ba913cd
diff --git a/lib/date.js b/lib/date.js
index 63bad45ee..cdfe322cc 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -100,6 +100,19 @@ export function getDateRangeValues(startDate, endDate) {
return { startDate: startOfDay(startDate), endDate: endOfDay(endDate), unit };
}
+export function getDateFromString(str) {
+ const [ymd, hms] = str.split(' ');
+ const [year, month, day] = ymd.split('-');
+
+ if (hms) {
+ const [hour, min, sec] = hms.split(':');
+
+ return new Date(year, month - 1, day, hour, min, sec);
+ }
+
+ return new Date(year, month - 1, day);
+}
+
const dateFuncs = {
hour: [differenceInHours, addHours, startOfHour],
day: [differenceInCalendarDays, addDays, startOfDay],
@@ -114,12 +127,7 @@ export function getDateArray(data, startDate, endDate, unit) {
function findData(t) {
const x = data.find(e => {
- if (unit === 'hour') {
- return normalize(new Date(e.t)).getTime() === t.getTime();
- }
-
- const [year, month, day] = e.t.split('-');
- return normalize(new Date(year, month - 1, day)).getTime() === t.getTime();
+ return normalize(getDateFromString(e.t)).getTime() === t.getTime();
});
return x?.y || 0;