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 Goal loading.
Mike Cao96fcdefeedc3
diff --git a/src/app/(main)/websites/[websiteId]/reports/goals/Goal.tsx b/src/app/(main)/websites/[websiteId]/reports/goals/Goal.tsxindex a3ef7515e..e1480491d 100644--- a/src/app/(main)/websites/[websiteId]/reports/goals/Goal.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/goals/Goal.tsx@@ -24,7 +24,7 @@ export type GoalData = { num: number; total: number };export function Goal({ id, name, type, parameters, websiteId, startDate, endDate }: GoalProps) {const { formatMessage, labels } = useMessages();- const { data, error, isLoading } = useResultQuery<GoalData>(type, {+ const { data, error, isLoading, isFetching } = useResultQuery<GoalData>(type, {websiteId,dateRange: {startDate,@@ -35,64 +35,66 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDateconst isPage = parameters?.type === 'page';return (- <LoadingPanel data={data} isLoading={isLoading} error={error}>- <Grid gap>- <Grid columns="1fr auto" gap>- <Column gap>- <Row>- <Text size="4" weight="bold">- {name}- </Text>+ <LoadingPanel data={data} isLoading={isLoading} isFetching={isFetching} error={error}>+ {data && (+ <Grid gap>+ <Grid columns="1fr auto" gap>+ <Column gap>+ <Row>+ <Text size="4" weight="bold">+ {name}+ </Text>+ </Row>+ </Column>+ <Column>+ <ReportEditButton id={id} name={name} type={type}>+ {({ close }) => {+ return (+ <Dialog+ title={formatMessage(labels.goal)}+ variant="modal"+ style={{ minHeight: 300, minWidth: 400 }}+ >+ <GoalEditForm id={id} websiteId={websiteId} onClose={close} />+ </Dialog>+ );+ }}+ </ReportEditButton>+ </Column>+ </Grid>+ <Row alignItems="center" justifyContent="space-between" gap>+ <Text color="muted">+ {formatMessage(isPage ? labels.viewedPage : labels.triggeredEvent)}+ </Text>+ <Text color="muted">{formatMessage(labels.conversionRate)}</Text>+ </Row>+ <Row alignItems="center" justifyContent="space-between" gap>+ <Row alignItems="center" gap>+ <Icon>{parameters.type === 'page' ? <File /> : <Lightning />}</Icon>+ <Text>{parameters.value}</Text>+ </Row>+ <Row alignItems="center" gap>+ <Icon>+ <User />+ </Icon>+ <Text title={`${data?.num} / ${data?.total}`}>{`${formatLongNumber(+ data?.num,+ )} / ${formatLongNumber(data?.total)}`}</Text></Row>- </Column>- <Column>- <ReportEditButton id={id} name={name} type={type}>- {({ close }) => {- return (- <Dialog- title={formatMessage(labels.goal)}- variant="modal"- style={{ minHeight: 300, minWidth: 400 }}- >- <GoalEditForm id={id} websiteId={websiteId} onClose={close} />- </Dialog>- );- }}- </ReportEditButton>- </Column>- </Grid>- <Row alignItems="center" justifyContent="space-between" gap>- <Text color="muted">- {formatMessage(isPage ? labels.viewedPage : labels.triggeredEvent)}- </Text>- <Text color="muted">{formatMessage(labels.conversionRate)}</Text>- </Row>- <Row alignItems="center" justifyContent="space-between" gap>- <Row alignItems="center" gap>- <Icon>{parameters.type === 'page' ? <File /> : <Lightning />}</Icon>- <Text>{parameters.value}</Text></Row>- <Row alignItems="center" gap>- <Icon>- <User />- </Icon>- <Text title={`${data?.num} / ${data?.total}`}>{`${formatLongNumber(- data?.num,- )} / ${formatLongNumber(data?.total)}`}</Text>+ <Row alignItems="center" gap="6">+ <ProgressBar+ value={data?.num || 0}+ minValue={0}+ maxValue={data?.total || 1}+ style={{ width: '100%' }}+ />+ <Text weight="bold" size="7">+ {data?.total ? Math.round((+data?.num / +data?.total) * 100) : '0'}%+ </Text></Row>- </Row>- <Row alignItems="center" gap="6">- <ProgressBar- value={data?.num || 0}- minValue={0}- maxValue={data?.total || 1}- style={{ width: '100%' }}- />- <Text weight="bold" size="7">- {data?.total ? Math.round((+data?.num / +data?.total) * 100) : '0'}%- </Text>- </Row>- </Grid>+ </Grid>+ )}</LoadingPanel>);}