ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated filter tags.

pull/1838/head
Mike Cao 2023-03-10 17:49:19 -08:00
parent fd83b63a30
commit 6ba00152c2
4 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/metrics/FilterTags.js
View File

@ -32,15 +32,13 @@ export default function FilterTags({ websiteId, params, onClick }) {
return null; return null;
} }
return ( return (
<div key={key} className={styles.tag}> <div key={key} className={styles.tag} onClick={() => handleCloseFilter(key)}>
<Button onClick={() => handleCloseFilter(key)} variant="primary" size="sm"> <Text>
<Text> <b>{`${key}`}</b> = {`${safeDecodeURI(params[key])}`}
<b>{`${key}`}</b> — {`${safeDecodeURI(params[key])}`} </Text>
</Text> <Icon>
<Icon> <Icons.Close />
<Icons.Close /> </Icon>
</Icon>
</Button>
</div> </div>
); );
})} })}

21
components/metrics/FilterTags.module.css
View File

@ -1,11 +1,22 @@
.filters { .filters {
display: flex; display: flex;
justify-content: flex-start; align-items: center;
align-items: flex-start; gap: 10px;
} }
.tag { .tag {
text-align: center; display: flex;
margin-bottom: 10px; flex-direction: row;
margin-right: 20px; 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);
} }

6
components/pages/settings/teams/TeamWebsitesTable.js
View File

@ -17,14 +17,14 @@ import { labels } from 'components/messages';
import useUser from 'hooks/useUser'; import useUser from 'hooks/useUser';
import useApi from 'hooks/useApi'; import useApi from 'hooks/useApi';
export default function TeamWebsitesTable({ teamId, data = [], onSave }) { export default function TeamWebsitesTable({ data = [], onSave }) {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const { user } = useUser(); const { user } = useUser();
const { del, useMutation } = useApi(); const { del, useMutation } = useApi();
const { mutate } = useMutation(data => del(`/teamWebsites/${data.teamWebsiteId}`)); const { mutate } = useMutation(({ teamWebsiteId }) => del(`/teamWebsites/${teamWebsiteId}`));
const columns = [ const columns = [
{ name: 'name', label: formatMessage(labels.name), style: { flex: 2 } }, { name: 'name', label: formatMessage(labels.name) },
{ name: 'domain', label: formatMessage(labels.domain) }, { name: 'domain', label: formatMessage(labels.domain) },
{ name: 'action', label: ' ' }, { name: 'action', label: ' ' },
]; ];

28
lib/filters.js
View File

@ -1,30 +1,10 @@
export const urlFilter = data => { 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 }) => { const map = data.reduce((obj, { x, y }) => {
if (!isValidUrl(x)) { if (x) {
return obj; if (!obj[x]) {
} obj[x] = y;
const url = cleanUrl(x);
if (url) {
if (!obj[url]) {
obj[url] = y;
} else { } else {
obj[url] += y; obj[x] += y;
} }
} }