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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Report parameters.
Mike Caoe7fef80d79b1
diff --git a/components/pages/reports/ReportHeader.js b/components/pages/reports/ReportHeader.jsindex 805e45b65..0b2054d04 100644--- a/components/pages/reports/ReportHeader.js+++ b/components/pages/reports/ReportHeader.js@@ -25,8 +25,8 @@ export function ReportHeader({ icon }) {if (!report.id) {create(report, {onSuccess: async ({ id }) => {- router.push(`/reports/${id}`, null, { shallow: true });showToast({ message: formatMessage(messages.saved), variant: 'success' });+ router.push(`/reports/${id}`, null, { shallow: true });},});} else {diff --git a/components/pages/reports/event-data/EventDataParameters.js b/components/pages/reports/event-data/EventDataParameters.jsindex cbb141933..8255ae921 100644--- a/components/pages/reports/event-data/EventDataParameters.js+++ b/components/pages/reports/event-data/EventDataParameters.js@@ -5,6 +5,7 @@ import { ReportContext } from 'components/pages/reports/Report';import NoData from 'components/common/NoData';import styles from './EventDataParameters.module.css';import { DATA_TYPES } from 'lib/constants';+import BaseParameters from '../BaseParameters';function useFields(websiteId, startDate, endDate) {const { get, useQuery } = useApi();@@ -31,16 +32,9 @@ export function EventDataParameters() {runReport(values);};- if (!websiteId || !dateRange) {- return null;- }-- if (isLoading) {- return <Loading icon="dots" />;- }-return (<Form ref={ref} values={parameters} error={error} onSubmit={handleSubmit}>+ <BaseParameters /><FormRow label={formatMessage(labels.fields)}><div className={styles.fields}>{!data?.length && <NoData />}diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.jsindex cf22f19cb..77f0fdf59 100644--- a/components/pages/reports/funnel/FunnelParameters.js+++ b/components/pages/reports/funnel/FunnelParameters.js@@ -1,4 +1,4 @@-import { useContext, useRef, useState } from 'react';+import { useContext, useRef } from 'react';import { useMessages } from 'hooks';import {Icon,diff --git a/pages/api/send.ts b/pages/api/send.tsindex 24264fa3c..ec5f55b3b 100644--- a/pages/api/send.ts+++ b/pages/api/send.ts@@ -61,7 +61,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {return forbidden(res);}- const { url, referrer, name: eventName, data: dynamicData, title: pageTitle } = payload;+ const { url, referrer, name: eventName, data: eventData, title: pageTitle } = payload;await useSession(req, res);@@ -96,18 +96,18 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {referrerDomain,pageTitle,eventName,- eventData: dynamicData,+ eventData,...session,sessionId: session.id,});}if (type === COLLECTION_TYPE.identify) {- if (!dynamicData) {+ if (!eventData) {return badRequest(res, 'Data required.');}- await saveSessionData({ ...session, sessionData: dynamicData, sessionId: session.id });+ await saveSessionData({ ...session, sessionData: eventData, sessionId: session.id });}const token = createToken(session, secret());@@ -153,7 +153,7 @@ async function hasBlockedIp(req: NextApiRequestCollect) {const clientIp = getIpAddress(req);- const blocked = ips.find(ip => {+ return ips.find(ip => {if (ip === clientIp) return true;// CIDR notation@@ -166,7 +166,5 @@ async function hasBlockedIp(req: NextApiRequestCollect) {return false;});-- return blocked;}}