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

Feat/um 49 query builder api (#1573)

Browse source 
* add uuid to event. add indexes

* eventdata api

* add event data

* remove test data

* update list
This commit is contained in:
Brian Cao 2022-10-21 21:33:23 -07:00 • committed by GitHub
parent 9c36dc485e
commit ba31f48f1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 690 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/pages/TestConsole.js
View file

@ -24,9 +24,9 @@ export default function TestConsole() {
return null;
}
const options = data.map(({ name, websiteId }) => ({ label: name, value: websiteId }));
const website = data.find(({ websiteId }) => websiteId === +websiteId);
const selectedValue = options.find(({ value }) => value === website?.websiteId)?.value;
const options = data.map(({ name, websiteUuid }) => ({ label: name, value: websiteUuid }));
const website = data.find(({ websiteUuid }) => websiteId === websiteUuid);
const selectedValue = options.find(({ value }) => value === website?.websiteUuid)?.value;
function handleSelect(value) {
router.push(`/console/${value}`);
@ -104,13 +104,13 @@ export default function TestConsole() {
<div className="row">
<div className="col-12">
<WebsiteChart
websiteId={website.websiteId}
websiteId={website.websiteUuid}
title={website.name}
domain={website.domain}
showLink
/>
<PageHeader>Events</PageHeader>
<EventsChart websiteId={website.websiteId} />
<EventsChart websiteId={website.websiteUuid} />
</div>
</div>
</>

2
components/pages/WebsiteDetails.js
View file

@ -24,6 +24,7 @@ import useFetch from 'hooks/useFetch';
import usePageQuery from 'hooks/usePageQuery';
import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';
import styles from './WebsiteDetails.module.css';
import EventDataButton from 'components/common/EventDataButton';
const messages = defineMessages({
pages: { id: 'metrics.pages', defaultMessage: 'Pages' },
@ -183,6 +184,7 @@ export default function WebsiteDetails({ websiteId }) {
<EventsTable {...tableProps} onDataLoad={setEventsData} />
</GridColumn>
<GridColumn xs={12} md={12} lg={8}>
<EventDataButton websiteId={websiteId} />
<EventsChart className={styles.eventschart} websiteId={websiteId} />
</GridColumn>
</GridRow>