watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 06:37:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactored referrer logic. Display stats for no referrers.

Browse source
This commit is contained in:
Mike Cao 2022-07-21 01:11:10 -07:00
parent 0026b4b1ea
commit be8291c856
92 changed files with 687 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/metrics/PagesTable.js
View file

@ -1,5 +1,5 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { useIntl, defineMessage } from 'react-intl';
import FilterLink from 'components/common/FilterLink';
import FilterButtons from 'components/common/FilterButtons';
import { urlFilter } from 'lib/filters';
@ -8,15 +8,26 @@ import MetricsTable from './MetricsTable';
export const FILTER_COMBINED = 0;
export const FILTER_RAW = 1;
export default function PagesTable({ websiteId, websiteDomain, showFilters, ...props }) {
const messages = defineMessage({
combined: { id: 'metrics.filter.combined', defaultMessage: 'Combined' },
raw: { id: 'metrics.filter.raw', defaultMessage: 'Raw' },
pages: { id: 'metrics.pages', defaultMessage: 'Pages' },
views: { id: 'metrics.views', defaultMessage: 'View' },
});
export default function PagesTable({ websiteId, showFilters, ...props }) {
const [filter, setFilter] = useState(FILTER_COMBINED);
const { formatMessage } = useIntl();
const buttons = [
{
label: <FormattedMessage id="metrics.filter.combined" defaultMessage="Combined" />,
label: formatMessage(messages.combined),
value: FILTER_COMBINED,
},
{ label: <FormattedMessage id="metrics.filter.raw" defaultMessage="Raw" />, value: FILTER_RAW },
{
label: formatMessage(messages.raw),
value: FILTER_RAW,
},
];
const renderLink = ({ x: url }) => {
@ -27,12 +38,11 @@ export default function PagesTable({ websiteId, websiteDomain, showFilters, ...p
<>
{showFilters && <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />}
<MetricsTable
title={<FormattedMessage id="metrics.pages" defaultMessage="Pages" />}
title={formatMessage(messages.pages)}
type="url"
metric={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
metric={formatMessage(messages.views)}
websiteId={websiteId}
dataFilter={urlFilter}
filterOptions={{ domain: websiteDomain, raw: filter === FILTER_RAW }}
dataFilter={filter !== FILTER_RAW ? urlFilter : null}
renderLabel={renderLink}
{...props}
/>

44
components/metrics/ReferrersTable.js
View file

@ -1,31 +1,40 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import { useIntl, defineMessages } from 'react-intl';
import MetricsTable from './MetricsTable';
import FilterButtons from 'components/common/FilterButtons';
import FilterLink from 'components/common/FilterLink';
import { refFilter } from 'lib/filters';
export const FILTER_DOMAIN_ONLY = 0;
export const FILTER_COMBINED = 1;
export const FILTER_RAW = 2;
export const FILTER_COMBINED = 0;
export const FILTER_RAW = 1;
export default function ReferrersTable({ websiteId, websiteDomain, showFilters, ...props }) {
const messages = defineMessages({
combined: { id: 'metrics.filter.combined', defaultMessage: 'Combined' },
raw: { id: 'metrics.filter.raw', defaultMessage: 'Raw' },
referrers: { id: 'metrics.referrers', defaultMessage: 'Referrers' },
views: { id: 'metrics.views', defaultMessage: 'Views' },
none: { id: 'label.none', defaultMessage: 'None' },
});
export default function ReferrersTable({ websiteId, showFilters, ...props }) {
const [filter, setFilter] = useState(FILTER_COMBINED);
const { formatMessage } = useIntl();
const none = formatMessage(messages.none);
const buttons = [
{
label: <FormattedMessage id="metrics.filter.domain-only" defaultMessage="Domain only" />,
value: FILTER_DOMAIN_ONLY,
},
{
label: <FormattedMessage id="metrics.filter.combined" defaultMessage="Combined" />,
label: formatMessage(messages.combined),
value: FILTER_COMBINED,
},
{ label: <FormattedMessage id="metrics.filter.raw" defaultMessage="Raw" />, value: FILTER_RAW },
{ label: formatMessage(messages.raw), value: FILTER_RAW },
];
const renderLink = ({ w: link, x: referrer }) => {
return <FilterLink id="referrer" value={referrer} externalUrl={link} />;
return referrer ? (
<FilterLink id="referrer" value={referrer} externalUrl={link} />
) : (
`(${none})`
);
};
return (
@ -33,16 +42,11 @@ export default function ReferrersTable({ websiteId, websiteDomain, showFilters,
{showFilters && <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />}
<MetricsTable
{...props}
title={<FormattedMessage id="metrics.referrers" defaultMessage="Referrers" />}
title={formatMessage(messages.referrers)}
type="referrer"
metric={<FormattedMessage id="metrics.views" defaultMessage="Views" />}
metric={formatMessage(messages.views)}
websiteId={websiteId}
dataFilter={refFilter}
filterOptions={{
domain: websiteDomain,
domainOnly: filter === FILTER_DOMAIN_ONLY,
raw: filter === FILTER_RAW,
}}
dataFilter={filter !== FILTER_RAW ? refFilter : null}
renderLabel={renderLink}
/>
</>