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

Fixed filter tags. Added clear all option.

Browse source
This commit is contained in:
Mike Cao 2023-02-11 22:10:14 -08:00
parent 4a689bf294
commit 638a674e99
4 changed files with 50 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/metrics/WebsiteChart.js
View file

@ -34,7 +34,7 @@ export default function WebsiteChart({
const {
router,
resolve,
query: { url, referrer, os, browser, device, country },
query: { view, url, referrer, os, browser, device, country },
} = usePageQuery();
const { get, useQuery } = useApi();
@ -67,7 +67,11 @@ export default function WebsiteChart({
}, [data, startDate, endDate, unit]);
function handleCloseFilter(param) {
router.push(resolve({ [param]: undefined }));
if (param === null) {
router.push(`/websites/${websiteId}/?view=${view}`);
} else {
router.push(resolve({ [param]: undefined }));
}
}
async function handleDateChange(value) {
@ -97,11 +101,11 @@ export default function WebsiteChart({
</a>
</Link>
)}
<FilterTags
params={{ url, referrer, os, browser, device, country }}
onClick={handleCloseFilter}
/>
</WebsiteHeader>
<FilterTags
params={{ url, referrer, os, browser, device, country }}
onClick={handleCloseFilter}
/>
<StickyHeader stickyClassName={styles.sticky} enabled={stickyHeader}>
<Row className={styles.header}>
<Column xs={12} sm={12} md={12} defaultSize={10}>