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

implement sessions metric expanded queries

Browse source
This commit is contained in:
Francis Cao 2025-08-04 18:27:31 -07:00
parent c8b4ee8ca5
commit c1cad16cb9
10 changed files with 352 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,20 @@
import { ReactNode, useMemo, useState } from 'react';
import { Icon, Text, SearchField, Row, Column } from '@umami/react-zen';
import { LinkButton } from '@/components/common/LinkButton';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import {
useFormat,
useMessages,
useNavigation,
useWebsiteExpandedMetricsQuery,
useWebsiteMetricsQuery,
} from '@/components/hooks';
import { Arrow } from '@/components/icons';
import { DownloadButton } from '@/components/input/DownloadButton';
import { DEFAULT_ANIMATION_DURATION } from '@/lib/constants';
import { percentFilter } from '@/lib/filters';
import { useNavigation, useWebsiteMetricsQuery, useMessages, useFormat } from '@/components/hooks';
import { Arrow } from '@/components/icons';
import { Column, Icon, Row, SearchField, Text } from '@umami/react-zen';
import { ReactNode, useMemo, useState } from 'react';
import { ListExpandedTable, ListExpandedTableProps } from './ListExpandedTable';
import { ListTable, ListTableProps } from './ListTable';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import { DownloadButton } from '@/components/input/DownloadButton';
export interface MetricsTableProps extends ListTableProps {
websiteId: string;
@ -21,6 +28,7 @@ export interface MetricsTableProps extends ListTableProps {
showMore?: boolean;
params?: { [key: string]: any };
allowDownload?: boolean;
expanded?: boolean;
children?: ReactNode;
}
@ -35,6 +43,7 @@ export function MetricsTable({
showMore = true,
params,
allowDownload = true,
expanded = false,
children,
...props
}: MetricsTableProps) {
@ -43,7 +52,21 @@ export function MetricsTable({
const { updateParams } = useNavigation();
const { formatMessage, labels } = useMessages();
const { data, isLoading, isFetching, error } = useWebsiteMetricsQuery(
const expandedQuery = useWebsiteExpandedMetricsQuery(
websiteId,
{
type,
limit: 30,
search: searchFormattedValues ? undefined : search,
...params,
},
{
retryDelay: delay || DEFAULT_ANIMATION_DURATION,
enabled: expanded,
},
);
const query = useWebsiteMetricsQuery(
websiteId,
{
type,
@ -53,9 +76,12 @@ export function MetricsTable({
},
{
retryDelay: delay || DEFAULT_ANIMATION_DURATION,
enabled: !expanded,
},
);
const { data, isLoading, isFetching, error } = expanded ? expandedQuery : query;
const filteredData = useMemo(() => {
if (data) {
let items = data as any[];
@ -95,7 +121,12 @@ export function MetricsTable({
{allowDownload && <DownloadButton filename={type} data={filteredData} />}
</Row>
</Row>
{data && <ListTable {...(props as ListTableProps)} data={filteredData} />}
{data &&
(expanded ? (
<ListExpandedTable {...(props as ListExpandedTableProps)} data={data} />
) : (
<ListTable {...(props as ListTableProps)} data={filteredData} />
))}
<Row justifyContent="center">
{showMore && data && !error && limit && (
<LinkButton href={updateParams({ view: type })} variant="quiet">