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

Refactored queries.

Browse source
This commit is contained in:
Mike Cao 2024-01-30 00:10:25 -08:00
parent 18e36aa7b3
commit b16f5cc067
67 changed files with 523 additions and 576 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/metrics/FilterTags.tsx
View file

@ -10,7 +10,7 @@ export function FilterTags({ params }) {
const { formatValue } = useFormat();
const {
router,
makeUrl,
renderUrl,
query: { view },
} = useNavigation();
@ -19,11 +19,11 @@ export function FilterTags({ params }) {
}
function handleCloseFilter(param?: string) {
router.push(makeUrl({ [param]: undefined }));
router.push(renderUrl({ [param]: undefined }));
}
function handleResetFilter() {
router.push(makeUrl({ view }, true));
router.push(renderUrl({ view }, true));
}
return (

4
src/components/metrics/MetricsTable.tsx
View file

@ -45,7 +45,7 @@ export function MetricsTable({
const { formatValue } = useFormat();
const [{ startDate, endDate, modified }] = useDateRange(websiteId);
const {
makeUrl,
renderUrl,
query: { url, referrer, title, os, browser, device, country, region, city },
} = useNavigation();
const { formatMessage, labels } = useMessages();
@ -142,7 +142,7 @@ export function MetricsTable({
{!data && isLoading && !isFetched && <Loading icon="dots" />}
<div className={styles.footer}>
{data && !error && limit && (
<LinkButton href={makeUrl({ view: type })} variant="quiet">
<LinkButton href={renderUrl({ view: type })} variant="quiet">
<Text>{formatMessage(labels.more)}</Text>
<Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>
<Icons.ArrowRight />

4
src/components/metrics/PagesTable.tsx
View file

@ -12,13 +12,13 @@ export interface PagesTableProps extends MetricsTableProps {
export function PagesTable({ allowFilter, domainName, ...props }: PagesTableProps) {
const {
router,
makeUrl,
renderUrl,
query: { view = 'url' },
} = useNavigation();
const { formatMessage, labels } = useMessages();
const handleSelect = (key: any) => {
router.push(makeUrl({ view: key }), { scroll: true });
router.push(renderUrl({ view: key }), { scroll: true });
};
const buttons = [