m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-06-30 13:41:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse Source
This commit is contained in:
Francis Cao 2023-08-25 11:35:06 -07:00
commit 22aa53ac7e
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/pages/websites/WebsiteChartList.js
View File

@ -40,7 +40,7 @@ export default function WebsiteChartList({ websites, showCharts, limit }) {
</Button> </Button>
</Link> </Link>
</WebsiteHeader> </WebsiteHeader>
<WebsiteMetricsBar websiteId={id} /> <WebsiteMetricsBar websiteId={id} showFilter={false} />
{showCharts && <WebsiteChart websiteId={id} />} {showCharts && <WebsiteChart websiteId={id} />}
</div> </div>
) : null; ) : null;

4
src/components/pages/websites/WebsiteMetricsBar.js
View File

@ -10,7 +10,7 @@ import { formatShortTime } from 'lib/format';
import { Button, Column, Icon, Icons, Popup, PopupTrigger, Row, TooltipPopup } from 'react-basics'; import { Button, Column, Icon, Icons, Popup, PopupTrigger, Row, TooltipPopup } from 'react-basics';
import styles from './WebsiteMetricsBar.module.css'; import styles from './WebsiteMetricsBar.module.css';
export function WebsiteMetricsBar({ websiteId, sticky }) { export function WebsiteMetricsBar({ websiteId, showFilter = true, sticky }) {
const { formatMessage, labels } = useMessages(); const { formatMessage, labels } = useMessages();
const { get, useQuery } = useApi(); const { get, useQuery } = useApi();
@ -162,7 +162,7 @@ export function WebsiteMetricsBar({ websiteId, sticky }) {
</Column> </Column>
<Column defaultSize={12} xl={4}> <Column defaultSize={12} xl={4}>
<div className={styles.actions}> <div className={styles.actions}>
<WebsiteFilterButton /> {showFilter && <WebsiteFilterButton />}
<WebsiteDateFilter websiteId={websiteId} /> <WebsiteDateFilter websiteId={websiteId} />
<RefreshButton websiteId={websiteId} /> <RefreshButton websiteId={websiteId} />
</div> </div>

4
src/pages/api/realtime/[id].ts
View File

@ -11,12 +11,10 @@ export interface RealtimeRequestQuery {
startAt: number; startAt: number;
} }
const currentDate = new Date().getTime();
const schema = { const schema = {
GET: yup.object().shape({ GET: yup.object().shape({
id: yup.string().uuid().required(), id: yup.string().uuid().required(),
startAt: yup.number().integer().max(currentDate).required(), startAt: yup.number().integer().required(),
}), }),
}; };