Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Updated filter tags.
Mike Cao6ba00152c283
diff --git a/components/metrics/FilterTags.js b/components/metrics/FilterTags.jsindex 37f5981cc..637ea0666 100644--- a/components/metrics/FilterTags.js+++ b/components/metrics/FilterTags.js@@ -32,15 +32,13 @@ export default function FilterTags({ websiteId, params, onClick }) {return null;}return (- <div key={key} className={styles.tag}>- <Button onClick={() => handleCloseFilter(key)} variant="primary" size="sm">- <Text>- <b>{`${key}`}</b> — {`${safeDecodeURI(params[key])}`}- </Text>- <Icon>- <Icons.Close />- </Icon>- </Button>+ <div key={key} className={styles.tag} onClick={() => handleCloseFilter(key)}>+ <Text>+ <b>{`${key}`}</b> = {`${safeDecodeURI(params[key])}`}+ </Text>+ <Icon>+ <Icons.Close />+ </Icon></div>);})}diff --git a/components/metrics/FilterTags.module.css b/components/metrics/FilterTags.module.cssindex 50ae60a0c..1c8458acd 100644--- a/components/metrics/FilterTags.module.css+++ b/components/metrics/FilterTags.module.css@@ -1,11 +1,22 @@.filters {display: flex;- justify-content: flex-start;- align-items: flex-start;+ align-items: center;+ gap: 10px;}.tag {- text-align: center;- margin-bottom: 10px;- margin-right: 20px;+ display: flex;+ flex-direction: row;+ align-items: center;+ gap: 10px;+ font-size: var(--font-size-sm);+ border: 1px solid var(--base600);+ border-radius: var(--border-radius);+ line-height: 30px;+ padding: 0 8px;+ cursor: pointer;+}++.tag:hover {+ background: var(--base75);}diff --git a/components/pages/settings/teams/TeamWebsitesTable.js b/components/pages/settings/teams/TeamWebsitesTable.jsindex a596204ce..521415237 100644--- a/components/pages/settings/teams/TeamWebsitesTable.js+++ b/components/pages/settings/teams/TeamWebsitesTable.js@@ -17,14 +17,14 @@ import { labels } from 'components/messages';import useUser from 'hooks/useUser';import useApi from 'hooks/useApi';-export default function TeamWebsitesTable({ teamId, data = [], onSave }) {+export default function TeamWebsitesTable({ data = [], onSave }) {const { formatMessage } = useIntl();const { user } = useUser();const { del, useMutation } = useApi();- const { mutate } = useMutation(data => del(`/teamWebsites/${data.teamWebsiteId}`));+ const { mutate } = useMutation(({ teamWebsiteId }) => del(`/teamWebsites/${teamWebsiteId}`));const columns = [- { name: 'name', label: formatMessage(labels.name), style: { flex: 2 } },+ { name: 'name', label: formatMessage(labels.name) },{ name: 'domain', label: formatMessage(labels.domain) },{ name: 'action', label: ' ' },];diff --git a/lib/filters.js b/lib/filters.jsindex 7e2472203..9681a8028 100644--- a/lib/filters.js+++ b/lib/filters.js@@ -1,30 +1,10 @@export const urlFilter = data => {- const isValidUrl = url => {- return url !== '' && url !== null;- };-- const cleanUrl = url => {- try {- const { pathname } = new URL(url, location.origin);-- return pathname;- } catch {- return null;- }- };-const map = data.reduce((obj, { x, y }) => {- if (!isValidUrl(x)) {- return obj;- }-- const url = cleanUrl(x);-- if (url) {- if (!obj[url]) {- obj[url] = y;+ if (x) {+ if (!obj[x]) {+ obj[x] = y;} else {- obj[url] += y;+ obj[x] += y;}}