mirror of
https://github.com/umami-software/umami.git
synced 2026-02-17 02:55:38 +01:00
Fixed pages.
This commit is contained in:
parent
f7151a880e
commit
b85109241b
22 changed files with 86 additions and 77 deletions
|
|
@ -4,7 +4,7 @@ import Empty from 'components/common/Empty';
|
|||
import Icons from 'components/icons';
|
||||
import { useApi, useMessages } from 'components/hooks';
|
||||
import { DATA_TYPES, REPORT_PARAMETERS } from 'lib/constants';
|
||||
import { ReportContext } from '../[reportId]/ReportPage';
|
||||
import { ReportContext } from '../[reportId]/Report';
|
||||
import FieldAddForm from '../[reportId]/FieldAddForm';
|
||||
import ParameterList from '../[reportId]/ParameterList';
|
||||
import BaseParameters from '../[reportId]/BaseParameters';
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import ReportPage from '../[reportId]/ReportPage';
|
||||
import Report from '../[reportId]/Report';
|
||||
import ReportHeader from '../[reportId]/ReportHeader';
|
||||
import ReportMenu from '../[reportId]/ReportMenu';
|
||||
import ReportBody from '../[reportId]/ReportBody';
|
||||
|
|
@ -13,7 +13,7 @@ const defaultParameters = {
|
|||
|
||||
export default function EventDataReport({ reportId }: { reportId?: string }) {
|
||||
return (
|
||||
<ReportPage reportId={reportId} defaultParameters={defaultParameters}>
|
||||
<Report reportId={reportId} defaultParameters={defaultParameters}>
|
||||
<ReportHeader icon={<Nodes />} />
|
||||
<ReportMenu>
|
||||
<EventDataParameters />
|
||||
|
|
@ -21,6 +21,6 @@ export default function EventDataReport({ reportId }: { reportId?: string }) {
|
|||
<ReportBody>
|
||||
<EventDataTable />
|
||||
</ReportBody>
|
||||
</ReportPage>
|
||||
</Report>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { useContext } from 'react';
|
||||
import { GridTable, GridColumn } from 'react-basics';
|
||||
import { useMessages } from 'components/hooks';
|
||||
import { ReportContext } from '../[reportId]/ReportPage';
|
||||
import { ReportContext } from '../[reportId]/Report';
|
||||
|
||||
export function EventDataTable() {
|
||||
const { report } = useContext(ReportContext);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import { Metadata } from 'next';
|
||||
import EventDataReport from './EventDataReport';
|
||||
import EventDataReportPage from './EventDataReportPage';
|
||||
|
||||
export default function () {
|
||||
return <EventDataReport />;
|
||||
return <EventDataReportPage />;
|
||||
}
|
||||
|
||||
export const metadata: Metadata = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue