Merge remote-tracking branch 'origin/dev' into dev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",

src/app/(main)/websites/[id]/WebsiteMenuView.js

@@ -116,7 +116,7 @@ export default function WebsiteMenuView({ websiteId, websiteDomain }) {
   return (
     <div className={styles.layout}>
       <div className={styles.menu}>
-        <LinkButton href={pathname} className={styles.back} variant="quiet">
+        <LinkButton href={pathname} className={styles.back} variant="quiet" scroll={false}>
           <Icon rotate={180}>
             <Icons.ArrowRight />
           </Icon>

src/components/common/LinkButton.js

@@ -3,7 +3,7 @@ import Link from 'next/link';
 import { useLocale } from 'components/hooks';
 import styles from './LinkButton.module.css';
 
-export function LinkButton({ href, className, variant, children }) {
+export function LinkButton({ href, className, variant, scroll = true, children }) {
   const { dir } = useLocale();
 
   return (
@@ -11,6 +11,7 @@ export function LinkButton({ href, className, variant, children }) {
       className={classNames(styles.button, className, { [styles[variant]]: true })}
       href={href}
       dir={dir}
+      scroll={scroll}
     >
       {children}
     </Link>

src/queries/analytics/eventData/getEventDataEvents.ts

@@ -91,6 +91,7 @@ async function clickhouseQuery(
           eventName: a.eventName,
           fieldName: a.fieldName,
           dataType: Number(a.dataType),
+          fieldValue: a.fieldValue,
           total: Number(a.total),
         };
       });

src/queries/analytics/getActiveVisitors.ts

@@ -24,10 +24,10 @@ async function relationalQuery(websiteId: string) {
   );
 }
 
-async function clickhouseQuery(websiteId: string): Promise<{ x: number }[]> {
+async function clickhouseQuery(websiteId: string): Promise<{ x: number }> {
   const { rawQuery } = clickhouse;
 
-  return rawQuery(
+  const result = rawQuery(
     `
     select
       count(distinct session_id) x
@@ -41,4 +41,6 @@ async function clickhouseQuery(websiteId: string): Promise<{ x: number }[]> {
       return { x: Number(a.x) };
     });
   });
+
+  return result[0] ?? null;
 }

src/queries/analytics/sessions/getSessionMetrics.ts

@@ -78,7 +78,7 @@ async function clickhouseQuery(
     params,
   ).then(a => {
     return Object.values(a).map(a => {
-      return { ...a, x: a.x, y: Number(a.y) };
+      return { x: a.x, y: Number(a.y), country: a.country };
     });
   });
 }