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

Support contains queries in overview page.

Browse source
This commit is contained in:
Mike Cao 2024-03-27 02:17:55 -07:00
commit d945ed3a23
12 changed files with 75 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx
View file

@ -211,7 +211,7 @@ const ResultsMenu = ({ values, type, isLoading, onSelect }) => {
}
if (!values?.length) {
return <h1>poop</h1>;
return null;
}
return (

1
src/app/(main)/reports/[reportId]/PopupForm.module.css
View file

@ -1,5 +1,4 @@
.form {
position: absolute;
background: var(--base50);
min-width: 300px;
padding: 20px;

2
src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx
View file

@ -35,7 +35,7 @@ export function ShareUrl({
const url = `${hostUrl || process.env.hostUrl || window?.location.origin}${
process.env.basePath
}/share/${id}/${encodeURIComponent(domain)}`;
}/share/${id}/${domain}`;
const handleGenerate = () => {
setId(generateId());

18
src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
View file

@ -2,6 +2,7 @@ import { Button, Icon, Icons, Popup, PopupTrigger, Text } from 'react-basics';
import PopupForm from 'app/(main)/reports/[reportId]/PopupForm';
import FilterSelectForm from 'app/(main)/reports/[reportId]/FilterSelectForm';
import { useFields, useMessages, useNavigation } from 'components/hooks';
import { OPERATORS } from 'lib/constants';
export function WebsiteFilterButton({
websiteId,
@ -14,8 +15,18 @@ export function WebsiteFilterButton({
const { renderUrl, router } = useNavigation();
const { fields } = useFields();
const handleAddFilter = ({ name, value }) => {
router.push(renderUrl({ [name]: value }));
const handleAddFilter = ({ name, operator, value }) => {
let prefix = '';
if (operator === OPERATORS.notEquals) {
prefix = '!';
} else if (operator === OPERATORS.contains) {
prefix = '~';
} else if (operator === OPERATORS.doesNotContain) {
prefix = '!~';
}
router.push(renderUrl({ [name]: prefix + value }));
};
return (
@ -26,7 +37,7 @@ export function WebsiteFilterButton({
</Icon>
<Text>{formatMessage(labels.filter)}</Text>
</Button>
<Popup position="bottom" alignment="start">
<Popup position="bottom" alignment="end">
{(close: () => void) => {
return (
<PopupForm>
@ -37,7 +48,6 @@ export function WebsiteFilterButton({
handleAddFilter(value);
close();
}}
allowFilterSelect={false}
/>
</PopupForm>
);

15
src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
View file

@ -47,24 +47,15 @@ export function WebsiteMetricsBar({
value={views.value}
change={views.change}
/>
<MetricCard
label={formatMessage(labels.visitors)}
value={visitors.value}
change={visitors.change}
/>
<MetricCard
label={formatMessage(labels.visits)}
value={visits.value}
change={visits.change}
/>
<MetricCard
label={formatMessage(labels.viewsPerVisit)}
value={visits.value ? views.value / visits.value : 0}
change={
visits.value && visits.change
? views.value / visits.value - diffs.views / diffs.visits
: 0
}
label={formatMessage(labels.visitors)}
value={visitors.value}
change={visitors.change}
/>
<MetricCard
label={formatMessage(labels.bounceRate)}