diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index eca58dc2..75fd579c 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -99,7 +99,7 @@ export default function MetricsTable({
)}
- {limit && data.length > limit && (
+ {limit && (
} size="xsmall" onClick={() => onExpand(type)}>
diff --git a/lib/date.js b/lib/date.js
index 63bad45e..cdfe322c 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;
diff --git a/lib/filters.js b/lib/filters.js
index ee0a1759..acdab7a3 100644
--- a/lib/filters.js
+++ b/lib/filters.js
@@ -13,17 +13,13 @@ export const urlFilter = (data, { raw }) => {
const cleanUrl = url => {
try {
- const { pathname, search, searchParams } = new URL(url);
+ const { pathname, search } = new URL(url);
if (search.startsWith('?/')) {
return `${pathname}${search}`;
}
- const path = removeTrailingSlash(pathname);
- const ref = searchParams.get('ref');
- const query = ref ? `?ref=${ref}` : '';
-
- return `${path}${query}`;
+ return removeTrailingSlash(pathname);
} catch {
return null;
}
diff --git a/lib/web.js b/lib/web.js
index 4081b3ab..82c1e75b 100644
--- a/lib/web.js
+++ b/lib/web.js
@@ -2,6 +2,7 @@ export const apiRequest = (method, url, body) =>
fetch(url, {
method,
cache: 'no-cache',
+ credentials: 'same-origin',
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
diff --git a/package.json b/package.json
index 543e201b..639a5bc5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "umami",
- "version": "0.49.0",
+ "version": "0.50.0",
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
"author": "Mike Cao ",
"license": "MIT",