Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Merge branch 'feat/um-285-report-schema' into dev

Brian Cao40f53e8856f4
diff --cc components/layout/NavBar.js
index b5532ba01,ba06d172f..95d27306a
--- a/components/layout/NavBar.js
+++ b/components/layout/NavBar.js
@@@ -18,8 -18,8 +18,9 @@@ export function NavBar()
const links = [
{ label: formatMessage(labels.dashboard), url: '/dashboard' },
+ { label: formatMessage(labels.reports), url: '/reports' },
{ label: formatMessage(labels.realtime), url: '/realtime' },
+ { label: formatMessage(labels.reports), url: '/reports/funnel' },
!cloudMode && { label: formatMessage(labels.settings), url: '/settings' },
].filter(n => n);
diff --cc components/messages.js
index bdc8770d6,fe4b833a8..a89a800bd
--- a/components/messages.js
+++ b/components/messages.js
@@@ -18,7 -18,9 +18,8 @@@ export const labels = defineMessages(
admin: { id: 'label.admin', defaultMessage: 'Administrator' },
confirm: { id: 'label.confirm', defaultMessage: 'Confirm' },
details: { id: 'label.details', defaultMessage: 'Details' },
+ website: { id: 'label.website', defaultMessage: 'Website' },
websites: { id: 'label.websites', defaultMessage: 'Websites' },
- reports: { id: 'label.reports', defaultMessage: 'Reports' },
created: { id: 'label.created', defaultMessage: 'Created' },
edit: { id: 'label.edit', defaultMessage: 'Edit' },
name: { id: 'label.name', defaultMessage: 'Name' },
diff --cc components/pages/reports/ReportForm.js
index 000000000,b32a8531f..cdf47eab0
mode 000000,100644..100644
--- a/components/pages/reports/ReportForm.js
+++ b/components/pages/reports/ReportForm.js
@@@ -1,0 -1,28 +1,28 @@@
+ import useMessages from 'hooks/useMessages';
+ import { Form, FormButtons, FormInput, FormRow, SubmitButton, TextField } from 'react-basics';
+
-export function FunnelForm({ onSearch }) {
++export function FunnelForm() {
+ const { formatMessage, labels } = useMessages();
+
+ const handleSubmit = () => {};
+
+ return (
+ <>
+ <Form onSubmit={handleSubmit}>
+ <FormRow label={formatMessage(labels.website)}>
+ <FormInput name="name" rules={{ required: formatMessage(labels.required) }}>
+ <TextField />
+ </FormInput>
+ </FormRow>
+
+ <FormButtons>
+ <SubmitButton variant="primary" disabled={false}>
+ Save
+ </SubmitButton>
+ </FormButtons>
+ </Form>
+ </>
+ );
+ }
+
+ export default FunnelForm;
diff --cc components/pages/reports/ReportForm.module.css
index 000000000,2a07d552f..4b12238f0
mode 000000,100644..100644
--- a/components/pages/reports/ReportForm.module.css
+++ b/components/pages/reports/ReportForm.module.css
@@@ -1,0 -1,23 +1,19 @@@
+ .filter {
+ min-width: 200px;
+ }
+
-.hiddenInput {
- max-height: 100px;
-}
-
+ .hiddenInput {
+ visibility: hidden;
+ min-height: 0px;
+ max-height: 0px;
+ }
+
+ .hidden {
+ visibility: hidden;
+ min-height: 0px;
+ max-height: 0px;
+ }
+
+ .urlFormRow label {
+ min-width: 80px;
+ }
diff --cc components/pages/reports/funnel/FunnelChart.js
index 000000000,5a0b56996..307c78ee5
mode 000000,100644..100644
--- a/components/pages/reports/funnel/FunnelChart.js
+++ b/components/pages/reports/funnel/FunnelChart.js
@@@ -1,0 -1,186 +1,185 @@@
+ import Chart from 'chart.js/auto';
+ import classNames from 'classnames';
+ import { colord } from 'colord';
+ import HoverTooltip from 'components/common/HoverTooltip';
+ import Legend from 'components/metrics/Legend';
+ import useLocale from 'hooks/useLocale';
+ import useMessages from 'hooks/useMessages';
+ import useTheme from 'hooks/useTheme';
+ import { DEFAULT_ANIMATION_DURATION, THEME_COLORS } from 'lib/constants';
-import { dateFormat } from 'lib/date';
+ import { formatLongNumber } from 'lib/format';
+ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+ import { Loading, StatusLight } from 'react-basics';
+ import styles from './FunnelChart.module.css';
+
+ export function FunnelChart({
+ data,
+ animationDuration = DEFAULT_ANIMATION_DURATION,
+ stacked = false,
+ loading = false,
+ onCreate = () => {},
+ onUpdate = () => {},
+ className,
+ }) {
+ const { formatMessage, labels } = useMessages();
+ const canvas = useRef();
+ const chart = useRef(null);
+ const [tooltip, setTooltip] = useState(null);
+ const { locale } = useLocale();
+ const [theme] = useTheme();
+
+ const datasets = useMemo(() => {
+ const primaryColor = colord(THEME_COLORS[theme].primary);
+ return [
+ {
+ label: formatMessage(labels.uniqueVisitors),
+ data: data,
+ borderWidth: 1,
+ hoverBackgroundColor: primaryColor.alpha(0.9).toRgbString(),
+ backgroundColor: primaryColor.alpha(0.6).toRgbString(),
+ borderColor: primaryColor.alpha(0.9).toRgbString(),
+ hoverBorderColor: primaryColor.toRgbString(),
+ },
+ ];
+ }, [data]);
+
+ const colors = useMemo(
+ () => ({
+ text: THEME_COLORS[theme].gray700,
+ line: THEME_COLORS[theme].gray200,
+ }),
+ [theme],
+ );
+
+ const renderYLabel = label => {
+ return +label > 1000 ? formatLongNumber(label) : label;
+ };
+
+ const renderTooltip = useCallback(model => {
+ const { opacity, labelColors, dataPoints } = model.tooltip;
+
+ if (!dataPoints?.length || !opacity) {
+ setTooltip(null);
+ return;
+ }
+
+ setTooltip(
+ <div className={styles.tooltip}>
+ <div>
+ <StatusLight color={labelColors?.[0]?.backgroundColor}>
+ <div className={styles.value}>
+ <div>{dataPoints[0].raw.x}</div>
+ <div>{formatLongNumber(dataPoints[0].raw.y)}</div>
+ </div>
+ </StatusLight>
+ </div>
+ </div>,
+ );
+ }, []);
+
+ const getOptions = useCallback(() => {
+ return {
+ responsive: true,
+ maintainAspectRatio: false,
+ animation: {
+ duration: animationDuration,
+ resize: {
+ duration: 0,
+ },
+ active: {
+ duration: 0,
+ },
+ },
+ plugins: {
+ legend: {
+ display: false,
+ },
+ tooltip: {
+ enabled: false,
+ external: renderTooltip,
+ },
+ },
+ scales: {
+ x: {
+ grid: {
+ display: false,
+ },
+ border: {
+ color: colors.line,
+ },
+ ticks: {
+ color: colors.text,
+ autoSkip: false,
+ maxRotation: 0,
+ },
+ },
+ y: {
+ type: 'linear',
+ min: 0,
+ beginAtZero: true,
+ stacked,
+ grid: {
+ color: colors.line,
+ },
+ border: {
+ color: colors.line,
+ },
+ ticks: {
+ color: colors.text,
+ callback: renderYLabel,
+ },
+ },
+ },
+ };
+ }, [animationDuration, renderTooltip, stacked, colors, locale]);
+
+ const createChart = () => {
+ Chart.defaults.font.family = 'Inter';
+
+ const options = getOptions();
+
+ chart.current = new Chart(canvas.current, {
+ type: 'bar',
+ data: { datasets },
+ options,
+ });
+
+ onCreate(chart.current);
+ };
+
+ const updateChart = () => {
+ setTooltip(null);
+
+ chart.current.data.datasets[0].data = datasets[0].data;
+ chart.current.data.datasets[0].label = datasets[0].label;
+
+ chart.current.options = getOptions();
+
+ onUpdate(chart.current);
+
+ chart.current.update();
+ };
+
+ useEffect(() => {
+ if (datasets) {
+ if (!chart.current) {
+ createChart();
+ } else {
+ updateChart();
+ }
+ }
+ }, [datasets, theme, animationDuration, locale]);
+
+ return (
+ <>
+ <div className={classNames(styles.chart, className)}>
+ {loading && <Loading position="page" icon="dots" />}
+ <canvas ref={canvas} />
+ </div>
+ <Legend chart={chart.current} />
+ {tooltip && <HoverTooltip tooltip={tooltip} />}
+ </>
+ );
+ }
+
+ export default FunnelChart;
diff --cc components/pages/reports/funnel/FunnelForm.module.css
index 000000000,2a07d552f..f251b63f1
mode 000000,100644..100644
--- a/components/pages/reports/funnel/FunnelForm.module.css
+++ b/components/pages/reports/funnel/FunnelForm.module.css
@@@ -1,0 -1,23 +1,13 @@@
+ .filter {
+ min-width: 200px;
+ }
+
+ .hiddenInput {
- max-height: 100px;
-}
-
-.hiddenInput {
- visibility: hidden;
- min-height: 0px;
- max-height: 0px;
-}
-
-.hidden {
+ visibility: hidden;
+ min-height: 0px;
+ max-height: 0px;
+ }
+
+ .urlFormRow label {
+ min-width: 80px;
+ }
diff --cc components/pages/reports/funnel/FunnelPage.js
index 000000000,3bfbb9e35..9f4f9bdf5
mode 000000,100644..100644
--- a/components/pages/reports/funnel/FunnelPage.js
+++ b/components/pages/reports/funnel/FunnelPage.js
@@@ -1,0 -1,38 +1,36 @@@
+ import { useMutation } from '@tanstack/react-query';
+ import Page from 'components/layout/Page';
+ import PageHeader from 'components/layout/PageHeader';
+ import ReportsLayout from 'components/layout/ReportsLayout';
+ import useApi from 'hooks/useApi';
+ import { useState } from 'react';
+ import FunnelChart from './FunnelChart';
+ import FunnelTable from './FunnelTable';
+ import FunnelForm from './FunnelForm';
+
-import styles from './FunnelPage.module.css';
-
+ export default function FunnelPage() {
+ const { post } = useApi();
- const { mutate, error, isLoading } = useMutation(data => post('/reports/funnel', data));
++ const { mutate } = useMutation(data => post('/reports/funnel', data));
+ const [data, setData] = useState([{}]);
- const [formData, setFormData] = useState();
++ const [setFormData] = useState();
+
+ function handleOnSearch(data) {
+ setFormData(data);
+
+ mutate(data, {
+ onSuccess: async data => {
+ setData(data);
+ },
+ });
+ }
+
+ return (
+ <ReportsLayout filter={<FunnelForm onSearch={handleOnSearch} />} header={'test'}>
+ <Page>
+ <PageHeader title="Funnel Report"></PageHeader>
+ <FunnelChart data={data} />
+ <FunnelTable data={data} />
+ </Page>
+ </ReportsLayout>
+ );
+ }
diff --cc components/pages/reports/funnel/FunnelTable.js
index 000000000,2bbabc812..27b4bbfc1
mode 000000,100644..100644
--- a/components/pages/reports/funnel/FunnelTable.js
+++ b/components/pages/reports/funnel/FunnelTable.js
@@@ -1,0 -1,14 +1,12 @@@
+ import DataTable from 'components/metrics/DataTable';
-import useMessages from 'hooks/useMessages';
+
-export function DevicesTable({ ...props }) {
- const { formatMessage, labels } = useMessages();
++export function FunnelTable({ ...props }) {
+ const { data } = props;
+
+ const tableData =
+ data?.map(a => ({ x: a.x, y: a.y, z: Math.floor(a.y / data[0].y) * 100 })) || [];
+
+ return <DataTable data={tableData} title="Url" type="device" />;
+ }
+
-export default DevicesTable;
++export default FunnelTable;
diff --cc components/pages/settings/profile/DateRangeSetting.js
index 44c3dc42b,202bbbe16..16db3c07a
--- a/components/pages/settings/profile/DateRangeSetting.js
+++ b/components/pages/settings/profile/DateRangeSetting.js
@@@ -7,14 -7,15 +7,19 @@@ import useMessages from 'hooks/useMessa
export function DateRangeSetting() {
const { formatMessage, labels } = useMessages();
const [dateRange, setDateRange] = useDateRange();
- const { startDate, endDate, value } = dateRange;
+ const { value } = dateRange;
- const handleReset = () => {
- setDateRange(DEFAULT_DATE_RANGE);
- };
+ const handleChange = value => setDateRange(value);
+ const handleReset = () => setDateRange(DEFAULT_DATE_RANGE);
return (
<Flexbox gap={10}>
- <DateFilter value={value} startDate={startDate} endDate={endDate} onChange={handleChange} />
- <DateFilter value={value} />
++ <DateFilter
++ value={value}
++ startDate={dateRange.startDate}
++ endDate={dateRange.endDate}
++ onChange={handleChange}
++ />
<Button onClick={handleReset}>{formatMessage(labels.reset)}</Button>
</Flexbox>
);
diff --cc lib/auth.ts
index 2195ad8f1,4d11a289c..37dc6acb5
--- a/lib/auth.ts
+++ b/lib/auth.ts
@@@ -1,6 -1,6 +1,6 @@@
--import debug from 'debug';
++import { UserReport } from '@prisma/client';
import redis from '@umami/redis-client';
--import cache from 'lib/cache';
++import debug from 'debug';
import { PERMISSIONS, ROLE_PERMISSIONS, SHARE_TOKEN_HEADER } from 'lib/constants';
import { secret } from 'lib/crypto';
import {
@@@ -10,11 -10,12 +10,11 @@@
parseSecureToken,
parseToken,
} from 'next-basics';
--import { getTeamUser, getTeamUserById } from 'queries';
++import { getTeamUser } from 'queries';
import { getTeamWebsite, getTeamWebsiteByTeamMemberId } from 'queries/admin/teamWebsite';
import { validate } from 'uuid';
--import { Auth } from './types';
import { loadWebsite } from './query';
-import { UserReport } from '@prisma/client';
++import { Auth } from './types';
const log = debug('umami:auth');