watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 13:47:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source 
# Conflicts:
#	src/lib/constants.ts
This commit is contained in:
Mike Cao 2024-06-19 21:48:49 -07:00
commit 19d5ac0a4c
23 changed files with 500 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/hooks/queries/useReport.ts
View file

@ -6,7 +6,7 @@ import { useMessages } from '../useMessages';
export function useReport(
reportId: string,
defaultParameters: { type: string; parameters: { [key: string]: any } },
defaultParameters?: { type: string; parameters: { [key: string]: any } },
) {
const [report, setReport] = useState(null);
const [isRunning, setIsRunning] = useState(false);

3
src/components/hooks/useFilterParams.ts
View file

@ -8,7 +8,7 @@ export function useFilterParams(websiteId: string) {
const { startDate, endDate, unit } = dateRange;
const { timezone } = useTimezone();
const {
query: { url, referrer, title, query, os, browser, device, country, region, city, event },
query: { url, referrer, title, query, host, os, browser, device, country, region, city, event },
} = useNavigation();
return {
@ -20,6 +20,7 @@ export function useFilterParams(websiteId: string) {
referrer,
title,
query,
host,
os,
browser,
device,

9
src/components/messages.ts
View file

@ -114,6 +114,8 @@ export const labels = defineMessages({
none: { id: 'label.none', defaultMessage: 'None' },
clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },
property: { id: 'label.property', defaultMessage: 'Property' },
revenueProperty: { id: 'label.revenue-property', defaultMessage: 'Revenue Property' },
userProperty: { id: 'label.user-property', defaultMessage: 'User Property' },
today: { id: 'label.today', defaultMessage: 'Today' },
lastHours: { id: 'label.last-hours', defaultMessage: 'Last {x} hours' },
yesterday: { id: 'label.yesterday', defaultMessage: 'Yesterday' },
@ -155,6 +157,11 @@ export const labels = defineMessages({
id: 'label.funnel-description',
defaultMessage: 'Understand the conversion and drop-off rate of users.',
},
revenue: { id: 'label.revenue', defaultMessage: 'Revenue' },
revenueDescription: {
id: 'label.revenue-description',
defaultMessage: 'Look into your revenue across time.',
},
url: { id: 'label.url', defaultMessage: 'URL' },
urls: { id: 'label.urls', defaultMessage: 'URLs' },
add: { id: 'label.add', defaultMessage: 'Add' },
@ -222,6 +229,8 @@ export const labels = defineMessages({
select: { id: 'label.select', defaultMessage: 'Select' },
myAccount: { id: 'label.my-account', defaultMessage: 'My account' },
transfer: { id: 'label.transfer', defaultMessage: 'Transfer' },
transactions: { id: 'label.transactions', defaultMessage: 'Transactions' },
uniqueCustomers: { id: 'label.uniqueCustomers', defaultMessage: 'Unique Customers' },
viewedPage: {
id: 'message.viewed-page',
defaultMessage: 'Viewed page',