watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-14 09:35:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Upgraded Prisma, use new query compiler. Removed old reports.

Browse source
This commit is contained in:
Mike Cao 2025-06-07 00:15:30 -07:00
parent a167c590c5
commit 2af95b5802
58 changed files with 88 additions and 2224 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/app/(main)/websites/[websiteId]/funnels/Funnel.tsx
View file

@ -43,7 +43,11 @@ export function Funnel({ id, name, type, parameters, websiteId, startDate, endDa
<ReportEditButton id={id} name={name} type={type}>
{({ close }) => {
return (
<Dialog title={formatMessage(labels.funnel)} variant="modal">
<Dialog
title={formatMessage(labels.funnel)}
variant="modal"
style={{ minHeight: 300, minWidth: 400 }}
>
<FunnelEditForm id={id} websiteId={websiteId} onClose={close} />
</Dialog>
);

2
src/app/(main)/websites/[websiteId]/goals/Goal.tsx
View file

@ -52,7 +52,7 @@ export function Goal({ id, name, type, parameters, websiteId, startDate, endDate
<Dialog
title={formatMessage(labels.goal)}
variant="modal"
style={{ minHeight: 375, minWidth: 400 }}
style={{ minHeight: 300, minWidth: 400 }}
>
<GoalEditForm id={id} websiteId={websiteId} onClose={close} />
</Dialog>

14
src/app/(main)/websites/[websiteId]/journeys/Journey.tsx
View file

@ -1,12 +1,13 @@
import { useMemo, useState } from 'react';
import { TooltipTrigger, Tooltip, Focusable } from '@umami/react-zen';
import { TooltipTrigger, Tooltip, Focusable, Icon, Text, Row } from '@umami/react-zen';
import { firstBy } from 'thenby';
import classNames from 'classnames';
import { useEscapeKey, useMessages, useResultQuery } from '@/components/hooks';
import { File, Lightning } from '@/components/icons';
import { objectToArray } from '@/lib/data';
import styles from './Journey.module.css';
import { formatLongNumber } from '@/lib/format';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import styles from './Journey.module.css';
const NODE_HEIGHT = 60;
const NODE_GAP = 10;
@ -221,11 +222,12 @@ export function Journey({
})}
onClick={() => handleClick(name, columnIndex, paths)}
>
<div className={styles.name} title={name}>
{name}
</div>
<Row alignItems="center" className={styles.name} title={name} gap>
<Icon>{name.startsWith('/') ? <File /> : <Lightning />}</Icon>
<Text truncate>{name}</Text>
</Row>
<div className={styles.count} title={nodeCount}>
<TooltipTrigger delay={0}>
<TooltipTrigger delay={0} isDisabled={columnIndex === 0}>
<Focusable>
<div>{formatLongNumber(nodeCount)}</div>
</Focusable>