Merge pull request #210 from mikecao/dev

v0.50.0 - Bug fixes

components/metrics/MetricsTable.js

@@ -99,7 +99,7 @@ export default function MetricsTable({
                 )}
           </div>
           <div className={styles.footer}>
-            {limit && data.length > limit && (
+            {limit && (
               <Button icon={<Arrow />} size="xsmall" onClick={() => onExpand(type)}>
                 <div>
                   <FormattedMessage id="button.more" defaultMessage="More" />

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(getDateFromString(e.t)).getTime() === t.getTime();
-        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 x?.y || 0;

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);
+      return removeTrailingSlash(pathname);
-      const ref = searchParams.get('ref');
-      const query = ref ? `?ref=${ref}` : '';
-
-      return `${path}${query}`;
     } catch {
       return null;
     }

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',

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 <mike@mikecao.com>",
   "license": "MIT",