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
Fixed font.
Mike Cao2713e3316ada
diff --git a/components/metrics/PagesTable.js b/components/metrics/PagesTable.jsindex e3a5bc14c..fdd056568 100644--- a/components/metrics/PagesTable.js+++ b/components/metrics/PagesTable.js@@ -3,6 +3,7 @@ import FilterButtons from 'components/common/FilterButtons';import MetricsTable from './MetricsTable';import useMessages from 'hooks/useMessages';import usePageQuery from 'hooks/usePageQuery';+import { emptyFilter } from '../../lib/filters';export default function PagesTable({ websiteId, showFilters, ...props }) {const {@@ -28,7 +29,7 @@ export default function PagesTable({ websiteId, showFilters, ...props }) {];const renderLink = ({ x }) => {- return <FilterLink id={view} value={x || formatMessage(labels.none)} />;+ return <FilterLink id={view} value={x} label={!x && formatMessage(labels.none)} />;};return (@@ -40,6 +41,7 @@ export default function PagesTable({ websiteId, showFilters, ...props }) {type={view}metric={formatMessage(labels.views)}websiteId={websiteId}+ dataFilter={emptyFilter}renderLabel={renderLink}/></>diff --git a/components/metrics/QueryParametersTable.js b/components/metrics/QueryParametersTable.jsindex e8404bb4c..9d4c1d2da 100644--- a/components/metrics/QueryParametersTable.js+++ b/components/metrics/QueryParametersTable.js@@ -1,14 +1,14 @@import { useState } from 'react';import { safeDecodeURI } from 'next-basics';import FilterButtons from 'components/common/FilterButtons';-import { paramFilter } from 'lib/filters';+import { emptyFilter, paramFilter } from 'lib/filters';import { FILTER_RAW, FILTER_COMBINED } from 'lib/constants';import MetricsTable from './MetricsTable';import useMessages from 'hooks/useMessages';import styles from './QueryParametersTable.module.css';const filters = {- [FILTER_RAW]: null,+ [FILTER_RAW]: emptyFilter,[FILTER_COMBINED]: paramFilter,};diff --git a/components/metrics/QueryParametersTable.module.css b/components/metrics/QueryParametersTable.module.cssindex ba5ca54a0..47b20a90c 100644--- a/components/metrics/QueryParametersTable.module.css+++ b/components/metrics/QueryParametersTable.module.css@@ -1,7 +1,7 @@.item {display: inline-flex;align-items: center;- margin-bottom: 1px;+ line-height: 26px;}.param {diff --git a/lib/filters.js b/lib/filters.jsindex 8bc6229d2..2b8fbcf16 100644--- a/lib/filters.js+++ b/lib/filters.js@@ -42,6 +42,10 @@ export const refFilter = data => {return Object.keys(map).map(key => ({ x: key, y: map[key], w: links[key] }));};+export const emptyFilter = data => {+ return data.map(item => (item.x ? item : null)).filter(n => n);+};+export const percentFilter = data => {const total = data.reduce((n, { y }) => n + y, 0);return data.map(({ x, y, ...props }) => ({ x, y, z: total ? (y / total) * 100 : 0, ...props }));diff --git a/pages/_app.js b/pages/_app.jsindex e6df83d55..19182c406 100644--- a/pages/_app.js+++ b/pages/_app.js@@ -53,10 +53,13 @@ export default function App({ Component, pageProps }) {<meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" /><meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" /><meta name="viewport" content="width=device-width, initial-scale=1" />+ <style>{`+ html {+ font-family: ${inter.style.fontFamily};+ }+ `}</style></Head>- <div className={inter.className}>- <Component {...pageProps} />- </div>+ <Component {...pageProps} />{!pathname.includes('/share/') && <Script src={`${basePath}/telemetry.js`} />}</IntlProvider></QueryClientProvider>diff --git a/queries/analytics/pageview/getPageviewMetrics.ts b/queries/analytics/pageview/getPageviewMetrics.tsindex e3991bd22..8f1b6ca7e 100644--- a/queries/analytics/pageview/getPageviewMetrics.ts+++ b/queries/analytics/pageview/getPageviewMetrics.ts@@ -1,7 +1,7 @@import prisma from 'lib/prisma';import clickhouse from 'lib/clickhouse';import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';-import { EVENT_TYPE, FILTER_COLUMNS } from 'lib/constants';+import { EVENT_TYPE } from 'lib/constants';import { loadWebsite } from 'lib/query';export async function getPageviewMetrics(@@ -42,10 +42,10 @@ async function relationalQuery(column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,];- let domainFilter = '';+ let excludeDomain = '';if (column === 'referrer_domain') {- domainFilter = 'and website_event.referrer_domain != $6';+ excludeDomain = 'and website_event.referrer_domain != $6';params.push(website.domain);}@@ -59,7 +59,7 @@ async function relationalQuery(and website_event.created_at >= $2and website_event.created_at between $3 and $4and event_type = $5- ${domainFilter}+ ${excludeDomain}${filterQuery}group by 1order by 2 desc