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
Added website menu view. Fixed pages filter.
Mike Cao4a689bf2943c
diff --git a/components/common/FilterButtons.js b/components/common/FilterButtons.jsindex ba985110a..4d08a1322 100644--- a/components/common/FilterButtons.js+++ b/components/common/FilterButtons.js@@ -1,9 +1,9 @@import { ButtonGroup, Button, Flexbox } from 'react-basics';-export default function FilterButtons({ items, selected, onSelect }) {+export default function FilterButtons({ items, selectedKey, onSelect }) {return (<Flexbox justifyContent="center">- <ButtonGroup items={items} selectedKey={selected} onSelect={onSelect}>+ <ButtonGroup items={items} selectedKey={selectedKey} onSelect={onSelect}>{({ key, label }) => <Button key={key}>{label}</Button>}</ButtonGroup></Flexbox>diff --git a/components/metrics/DatePickerForm.js b/components/metrics/DatePickerForm.jsindex d5a6533ba..17c7b5e52 100644--- a/components/metrics/DatePickerForm.js+++ b/components/metrics/DatePickerForm.js@@ -7,9 +7,7 @@ import { getDateRangeValues } from 'lib/date';import { getDateLocale } from 'lib/lang';import { labels } from 'components/messages';import styles from './DatePickerForm.module.css';--const FILTER_DAY = 'day';-const FILTER_RANGE = 'range';+import { FILTER_DAY, FILTER_RANGE } from 'lib/constants';export default function DatePickerForm({startDate: defaultStartDate,diff --git a/components/metrics/PagesTable.js b/components/metrics/PagesTable.jsindex fab22993a..5f704318b 100644--- a/components/metrics/PagesTable.js+++ b/components/metrics/PagesTable.js@@ -5,9 +5,12 @@ import FilterButtons from 'components/common/FilterButtons';import { urlFilter } from 'lib/filters';import { labels } from 'components/messages';import MetricsTable from './MetricsTable';+import { FILTER_COMBINED, FILTER_RAW } from 'lib/constants';-export const FILTER_COMBINED = 0;-export const FILTER_RAW = 1;+const filters = {+ [FILTER_RAW]: null,+ [FILTER_COMBINED]: urlFilter,+};export default function PagesTable({ websiteId, showFilters, ...props }) {const [filter, setFilter] = useState(FILTER_COMBINED);@@ -16,11 +19,11 @@ export default function PagesTable({ websiteId, showFilters, ...props }) {const buttons = [{label: formatMessage(labels.filterCombined),- value: FILTER_COMBINED,+ key: FILTER_COMBINED,},{label: formatMessage(labels.filterRaw),- value: FILTER_RAW,+ key: FILTER_RAW,},];@@ -30,13 +33,13 @@ export default function PagesTable({ websiteId, showFilters, ...props }) {return (<>- {showFilters && <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />}+ {showFilters && <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />}<MetricsTabletitle={formatMessage(labels.pages)}type="url"metric={formatMessage(labels.views)}websiteId={websiteId}- dataFilter={filter !== FILTER_RAW ? urlFilter : null}+ dataFilter={filters[filter]}renderLabel={renderLink}{...props}/>diff --git a/components/metrics/QueryParametersTable.js b/components/metrics/QueryParametersTable.jsindex 6743e6c6e..ba6ad7cf4 100644--- a/components/metrics/QueryParametersTable.js+++ b/components/metrics/QueryParametersTable.js@@ -1,21 +1,17 @@import { useState } from 'react';-import { useIntl, defineMessages } from 'react-intl';+import { useIntl } from 'react-intl';import { safeDecodeURI } from 'next-basics';import Tag from 'components/common/Tag';import FilterButtons from 'components/common/FilterButtons';import { paramFilter } from 'lib/filters';+import { FILTER_RAW, FILTER_COMBINED } from 'lib/constants';+import { labels } from 'components/messages';import MetricsTable from './MetricsTable';-const FILTER_COMBINED = 0;-const FILTER_RAW = 1;--const messages = defineMessages({- combined: { id: 'metrics.filter.combined', defaultMessage: 'Combined' },- raw: { id: 'metrics.filter.raw', defaultMessage: 'Raw' },- views: { id: 'metrics.views', defaultMessage: 'Views' },- none: { id: 'label.none', defaultMessage: 'None' },- query: { id: 'metrics.query-parameters', defaultMessage: 'Query parameters' },-});+const filters = {+ [FILTER_RAW]: null,+ [FILTER_COMBINED]: paramFilter,+};export default function QueryParametersTable({ websiteId, showFilters, ...props }) {const [filter, setFilter] = useState(FILTER_COMBINED);@@ -23,22 +19,22 @@ export default function QueryParametersTable({ websiteId, showFilters, ...propsconst buttons = [{- label: formatMessage(messages.combined),- value: FILTER_COMBINED,+ label: formatMessage(labels.filterCombined),+ key: FILTER_COMBINED,},- { label: formatMessage(messages.raw), value: FILTER_RAW },+ { label: formatMessage(labels.filterRaw), key: FILTER_RAW },];return (<>- {showFilters && <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />}+ {showFilters && <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />}<MetricsTable{...props}- title={formatMessage(messages.query)}+ title={formatMessage(labels.query)}type="query"- metric={formatMessage(messages.views)}+ metric={formatMessage(labels.views)}websiteId={websiteId}- dataFilter={filter !== FILTER_RAW ? paramFilter : null}+ dataFilter={filters[filter]}renderLabel={({ x, p, v }) =>filter === FILTER_RAW ? (xdiff --git a/components/metrics/RealtimeLog.js b/components/metrics/RealtimeLog.jsindex c2dbd2028..d7a71ac88 100644--- a/components/metrics/RealtimeLog.js+++ b/components/metrics/RealtimeLog.js@@ -54,19 +54,19 @@ export default function RealtimeLog({ data, websites, websiteId }) {const buttons = [{label: <FormattedMessage id="label.all" defaultMessage="All" />,- value: TYPE_ALL,+ key: TYPE_ALL,},{label: <FormattedMessage id="metrics.views" defaultMessage="Views" />,- value: TYPE_PAGEVIEW,+ key: TYPE_PAGEVIEW,},{label: <FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />,- value: TYPE_SESSION,+ key: TYPE_SESSION,},{label: <FormattedMessage id="metrics.events" defaultMessage="Events" />,- value: TYPE_EVENT,+ key: TYPE_EVENT,},];@@ -165,7 +165,7 @@ export default function RealtimeLog({ data, websites, websiteId }) {return (<div className={styles.table}>- <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />+ <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} /><div className={styles.header}><FormattedMessage id="label.realtime-logs" defaultMessage="Realtime logs" /></div>diff --git a/components/metrics/RealtimeViews.js b/components/metrics/RealtimeViews.jsindex 155c2f075..19054837b 100644--- a/components/metrics/RealtimeViews.js+++ b/components/metrics/RealtimeViews.js@@ -4,9 +4,7 @@ import firstBy from 'thenby';import { percentFilter } from 'lib/filters';import DataTable from './DataTable';import FilterButtons from 'components/common/FilterButtons';--const FILTER_REFERRERS = 0;-const FILTER_PAGES = 1;+import { FILTER_PAGES, FILTER_REFERRERS } from 'lib/constants';export default function RealtimeViews({ websiteId, data, websites }) {const { pageviews } = data;@@ -23,11 +21,11 @@ export default function RealtimeViews({ websiteId, data, websites }) {const buttons = [{label: <FormattedMessage id="metrics.referrers" defaultMessage="Referrers" />,- value: FILTER_REFERRERS,+ key: FILTER_REFERRERS,},{label: <FormattedMessage id="metrics.pages" defaultMessage="Pages" />,- value: FILTER_PAGES,+ key: FILTER_PAGES,},];@@ -90,7 +88,7 @@ export default function RealtimeViews({ websiteId, data, websites }) {return (<>- <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />+ <FilterButtons items={buttons} selectedKey={filter} onSelect={setFilter} />{filter === FILTER_REFERRERS && (<DataTabletitle={<FormattedMessage id="metrics.referrers" defaultMessage="Referrers" />}diff --git a/components/metrics/ReferrersTable.js b/components/metrics/ReferrersTable.jsindex afc456d1e..afbdecc0f 100644--- a/components/metrics/ReferrersTable.js+++ b/components/metrics/ReferrersTable.js@@ -5,9 +5,12 @@ import FilterButtons from 'components/common/FilterButtons';import FilterLink from 'components/common/FilterLink';import { refFilter } from 'lib/filters';import { labels } from 'components/messages';+import { FILTER_COMBINED, FILTER_RAW } from 'lib/constants';-const FILTER_COMBINED = 0;-const FILTER_RAW = 1;+const filters = {+ [FILTER_RAW]: null,+ [FILTER_COMBINED]: refFilter,+};export default function ReferrersTable({ websiteId, showFilters, ...props }) {const [filter, setFilter] = useState(FILTER_COMBINED);@@ -16,9 +19,9 @@ export default function ReferrersTable({ websiteId, showFilters, ...props }) {const items = [{label: formatMessage(labels.filterCombined),- value: FILTER_COMBINED,+ key: FILTER_COMBINED,},- { label: formatMessage(labels.filterRaw), value: FILTER_RAW },+ { label: formatMessage(labels.filterRaw), key: FILTER_RAW },];const renderLink = ({ w: link, x: referrer }) => {@@ -31,14 +34,14 @@ export default function ReferrersTable({ websiteId, showFilters, ...props }) {return (<>- {showFilters && <FilterButtons items={items} selected={filter} onSelect={setFilter} />}+ {showFilters && <FilterButtons items={items} selectedKey={filter} onSelect={setFilter} />}<MetricsTable{...props}title={formatMessage(labels.referrers)}type="referrer"metric={formatMessage(labels.views)}websiteId={websiteId}- dataFilter={filter !== FILTER_RAW ? refFilter : null}+ dataFilter={filters[filter]}renderLabel={renderLink}/></>diff --git a/components/pages/websites/WebsiteMenuView.js b/components/pages/websites/WebsiteMenuView.jsindex 464b3c1e8..07a932685 100644--- a/components/pages/websites/WebsiteMenuView.js+++ b/components/pages/websites/WebsiteMenuView.js@@ -1,4 +1,4 @@-import { Row, Column, Menu, Item, Icon, Button } from 'react-basics';+import { Row, Column, Menu, Item, Icon, Button, Flexbox, Text } from 'react-basics';import { useIntl } from 'react-intl';import Link from 'next/link';import classNames from 'classnames';@@ -39,44 +39,44 @@ export default function WebsiteMenuView({ websiteId, websiteDomain }) {const items = [{+ key: 'url',label: formatMessage(labels.pages),- value: resolve({ view: 'url' }),},{+ key: 'referrer',label: formatMessage(labels.referrers),- value: resolve({ view: 'referrer' }),},{+ key: 'browser',label: formatMessage(labels.browsers),- value: resolve({ view: 'browser' }),},{+ key: 'os',label: formatMessage(labels.os),- value: resolve({ view: 'os' }),},{+ key: 'device',label: formatMessage(labels.devices),- value: resolve({ view: 'device' }),},{+ key: 'country',label: formatMessage(labels.countries),- value: resolve({ view: 'country' }),},{+ key: 'language',label: formatMessage(labels.languages),- value: resolve({ view: 'language' }),},{+ key: 'screen',label: formatMessage(labels.screens),- value: resolve({ view: 'screen' }),},{+ key: 'event',label: formatMessage(labels.events),- value: resolve({ view: 'event' }),},{+ key: 'query',label: formatMessage(labels.query),- value: resolve({ view: 'query' }),},];@@ -85,31 +85,37 @@ export default function WebsiteMenuView({ websiteId, websiteDomain }) {return (<Row className={styles.row}><Column defaultSize={3} className={classNames(styles.col, styles.menu)}>- <Button>- <Icon rotate={180}>- <Icons.ArrowRight />- </Icon>- {formatMessage(labels.back)}- </Button>- <Menu items={items}>- {({ value, label }) => (- <Item key={value}>- <Link href={resolve()}>+ <Link href={resolve({ view: undefined })}>+ <a>+ <Flexbox justifyContent="center">+ <Button variant="quiet">+ <Icon rotate={180}>+ <Icons.ArrowRight />+ </Icon>+ <Text>{formatMessage(labels.back)}</Text>+ </Button>+ </Flexbox>+ </a>+ </Link>+ <Menu items={items} selectedKey={view}>+ {({ key, label }) => (+ <Item key={key} className={styles.item}>+ <Link href={resolve({ view: key })} shallow={true}><a>{label}</a></Link></Item>)}</Menu></Column>- <Column defaultSize={9} className={styles.col}>+ <Column defaultSize={9} className={classNames(styles.col, styles.data)}><DetailsComponentwebsiteId={websiteId}websiteDomain={websiteDomain}height={500}limit={false}animate={false}- showFilters- virtualize+ showFilters={true}+ virtualize={true}/></Column></Row>diff --git a/components/pages/websites/WebsiteMenuView.module.css b/components/pages/websites/WebsiteMenuView.module.cssindex 6084a12c7..00e451c68 100644--- a/components/pages/websites/WebsiteMenuView.module.css+++ b/components/pages/websites/WebsiteMenuView.module.css@@ -13,10 +13,19 @@}.menu {- display: flex;gap: 20px;}-.menu a {+.item a {color: var(--font-color100);+ flex: 1;+ padding: var(--size300) var(--size600);+}++.item {+ padding: 0;+}++.data {+ min-height: 600px;}diff --git a/lib/constants.ts b/lib/constants.tsindex 819fdff83..90f213883 100644--- a/lib/constants.ts+++ b/lib/constants.ts@@ -25,6 +25,14 @@ export const REALTIME_INTERVAL = 3000;export const UI_LAYOUT_BODY = 'ui-layout-body';+export const FILTER_COMBINED = 'filter-combined';+export const FILTER_RAW = 'filter-raw';+export const FILTER_IGNORED = 'filter-ignored';+export const FILTER_DAY = 'filter-day';+export const FILTER_RANGE = 'filter-range';+export const FILTER_REFERRERS = 'filter-referrers';+export const FILTER_PAGES = 'filter-pages';+export const EVENT_TYPE = {pageView: 1,customEvent: 2,@@ -105,8 +113,6 @@ export const EVENT_COLORS = ['#ffec16',];-export const FILTER_IGNORED = Symbol.for('filter-ignored');-export const DOMAIN_REGEX =/^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63})$/;diff --git a/lib/filters.js b/lib/filters.jsindex 4e7773f48..7e2472203 100644--- a/lib/filters.js+++ b/lib/filters.js@@ -1,15 +1,11 @@export const urlFilter = data => {const isValidUrl = url => {- return url !== '' && url !== null && !url.startsWith('#');+ return url !== '' && url !== null;};const cleanUrl = url => {try {- const { pathname, search } = new URL(url, location.origin);-- if (search.startsWith('?')) {- return `${pathname}${search}`;- }+ const { pathname } = new URL(url, location.origin);return pathname;} catch {diff --git a/package.json b/package.jsonindex 31f25fcd1..a9cb51b03 100644--- a/package.json+++ b/package.json@@ -93,7 +93,7 @@"node-fetch": "^3.2.8","npm-run-all": "^4.1.5","react": "^18.2.0",- "react-basics": "^0.64.0",+ "react-basics": "^0.66.0","react-beautiful-dnd": "^13.1.0","react-dom": "^18.2.0","react-intl": "^5.24.7",diff --git a/yarn.lock b/yarn.lockindex 96e53d7fc..2a8d50c71 100644--- a/yarn.lock+++ b/yarn.lock@@ -6676,10 +6676,10 @@ rc@^1.2.7:minimist "^1.2.0"strip-json-comments "~2.0.1"-react-basics@^0.64.0:- version "0.64.0"- resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.64.0.tgz#b921dab7e437db6655f033cae15b8c963b93b7b2"- integrity sha512-MY/F5+VBqqi+Hx58PdRONoeu3W0sitPOFbvAGxiM9vpajQL1DD//0Xgl/MahW8sIDbMy00lFghouex5JS93C8Q==+react-basics@^0.66.0:+ version "0.66.0"+ resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.66.0.tgz#c9d756936e9e996cbd70fb83e164fc673932fa0d"+ integrity sha512-VKndXhIyWb/e080/TUXB2WnEfF/DSFSExer8AcxXJk58Illbg6bqMLjGuP2gtJ/dvr5skSPqm8b9gLVFU9C1ig==dependencies:classnames "^2.3.1"date-fns "^2.29.3"