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

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

Browse source
This commit is contained in:
Mike Cao 2026-01-28 20:14:43 -08:00
commit 9d3f5ad0fd
6 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/input/WebsiteDateFilter.tsx
View file

@ -31,9 +31,11 @@ export function WebsiteDateFilter({
const showCompare = allowCompare && !isAllTime; const showCompare = allowCompare && !isAllTime;
const websiteDateRange = useDateRangeQuery(websiteId); const websiteDateRange = useDateRangeQuery(websiteId);
const { startDate, endDate } = websiteDateRange;
const hasData = startDate && endDate;
const handleChange = (date: string) => { const handleChange = (date: string) => {
if (date === 'all') { if (date === 'all' && hasData) {
router.push( router.push(
updateParams({ updateParams({
date: `${getDateRangeValue(websiteDateRange.startDate, websiteDateRange.endDate)}:all`, date: `${getDateRangeValue(websiteDateRange.startDate, websiteDateRange.endDate)}:all`,
@ -78,7 +80,7 @@ export function WebsiteDateFilter({
<DateFilter <DateFilter
value={dateValue} value={dateValue}
onChange={handleChange} onChange={handleChange}
showAllTime={showAllTime} showAllTime={hasData && showAllTime}
renderDate={+offset !== 0} renderDate={+offset !== 0}
/> />
</Row> </Row>

2
src/lib/prisma.ts
View file

@ -108,7 +108,7 @@ function getFilterQuery(filters: Record<string, any>, options: QueryOptions = {}
if (name === 'referrer') { if (name === 'referrer') {
arr.push( arr.push(
`and (website_event.referrer_domain != website_event.hostname or website_event.referrer_domain is null)`, `and (website_event.referrer_domain != regexp_replace(website_event.hostname, '^www.', '') or website_event.referrer_domain is null)`,
); );
} }
} }

2
src/queries/sql/getValues.ts
View file

@ -23,7 +23,7 @@ async function relationalQuery(websiteId: string, column: string, filters: Query
let excludeDomain = ''; let excludeDomain = '';
if (column === 'referrer_domain') { if (column === 'referrer_domain') {
excludeDomain = `and website_event.referrer_domain != website_event.hostname excludeDomain = `and website_event.referrer_domain != regexp_replace(website_event.hostname, '^www.', '')
and website_event.referrer_domain != ''`; and website_event.referrer_domain != ''`;
} }

2
src/queries/sql/pageviews/getPageviewExpandedMetrics.ts
View file

@ -50,7 +50,7 @@ async function relationalQuery(
let excludeDomain = ''; let excludeDomain = '';
if (column === 'referrer_domain') { if (column === 'referrer_domain') {
excludeDomain = `and website_event.referrer_domain != website_event.hostname excludeDomain = `and website_event.referrer_domain != regexp_replace(website_event.hostname, '^www.', '')
and website_event.referrer_domain != ''`; and website_event.referrer_domain != ''`;
if (type === 'domain') { if (type === 'domain') {
column = toPostgresGroupedReferrer(GROUPED_DOMAINS); column = toPostgresGroupedReferrer(GROUPED_DOMAINS);

2
src/queries/sql/pageviews/getPageviewMetrics.ts
View file

@ -46,7 +46,7 @@ async function relationalQuery(
let excludeDomain = ''; let excludeDomain = '';
if (column === 'referrer_domain') { if (column === 'referrer_domain') {
excludeDomain = `and website_event.referrer_domain != website_event.hostname excludeDomain = `and website_event.referrer_domain != regexp_replace(website_event.hostname, '^www.', '')
and website_event.referrer_domain != ''`; and website_event.referrer_domain != ''`;
} }

2
src/queries/sql/reports/getAttribution.ts
View file

@ -142,7 +142,7 @@ async function relationalQuery(
${ ${
currency currency
? '' ? ''
: `and we.referrer_domain != hostname : `and we.referrer_domain != regexp_replace(we.hostname, '^www.', '')
and we.referrer_domain != ''` and we.referrer_domain != ''`
} }
group by 1 group by 1