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

Merge branch 'dev' into feature/table-view-events

Browse source
This commit is contained in:
Mike Cao 2025-07-13 22:03:52 -07:00 • committed by GitHub
commit 31f9b17942
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
60 changed files with 2522 additions and 1972 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/hooks/useFields.ts
View file

@ -4,6 +4,8 @@ export function useFields() {
const { formatMessage, labels } = useMessages();
const fields = [
// { name: 'cohort', type: 'string', label: formatMessage(labels.cohort) },
// { name: 'segment', type: 'string', label: formatMessage(labels.segment) },
{ name: 'url', type: 'string', label: formatMessage(labels.url) },
{ name: 'title', type: 'string', label: formatMessage(labels.pageTitle) },
{ name: 'referrer', type: 'string', label: formatMessage(labels.referrer) },

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

@ -21,6 +21,8 @@ export function useFilterParams(websiteId: string) {
city,
event,
tag,
segment,
cohort,
},
} = useNavigation();
@ -42,5 +44,7 @@ export function useFilterParams(websiteId: string) {
city,
event,
tag,
segment,
cohort,
};
}

4
src/components/messages.ts
View file

@ -99,6 +99,8 @@ export const labels = defineMessages({
countries: { id: 'label.countries', defaultMessage: 'Countries' },
languages: { id: 'label.languages', defaultMessage: 'Languages' },
tags: { id: 'label.tags', defaultMessage: 'Tags' },
segments: { id: 'label.segments', defaultMessage: 'Segments' },
cohorts: { id: 'label.cohorts', defaultMessage: 'Cohorts' },
count: { id: 'label.count', defaultMessage: 'Count' },
average: { id: 'label.average', defaultMessage: 'Average' },
sum: { id: 'label.sum', defaultMessage: 'Sum' },
@ -229,6 +231,8 @@ export const labels = defineMessages({
device: { id: 'label.device', defaultMessage: 'Device' },
pageTitle: { id: 'label.pageTitle', defaultMessage: 'Page title' },
tag: { id: 'label.tag', defaultMessage: 'Tag' },
segment: { id: 'label.segment', defaultMessage: 'Segment' },
cohort: { id: 'label.cohort', defaultMessage: 'Cohort' },
day: { id: 'label.day', defaultMessage: 'Day' },
date: { id: 'label.date', defaultMessage: 'Date' },
pageOf: { id: 'label.page-of', defaultMessage: 'Page {current} of {total}' },