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.

Fixed triggered event lookup. Closes #3742.

Mike Caocb63e49a9b2d
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
index 30976bff7..13712f2ad 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
@@ -56,7 +56,7 @@ export function FunnelEditForm({
const defaultValues = {
name: data?.name || '',
window: data?.parameters?.window || 60,
- steps: data?.parameters?.steps || [{ type: 'path', value: '/' }],
+ steps: data?.parameters?.steps || [{ type: 'path', value: '' }],
};
return (
@@ -82,12 +82,10 @@ export function FunnelEditForm({
validate: value => value.length > 1 || 'At least two steps are required',
}}
>
- {({ fields, append, remove, getValues }) => {
+ {({ fields, append, remove }) => {
return (
<Grid gap>
{fields.map(({ id }: { id: string }, index: number) => {
- const type = getValues(`steps.${index}.type`);
-
return (
<Grid key={id} columns="260px 1fr auto" gap>
<Column>
@@ -103,7 +101,8 @@ export function FunnelEditForm({
name={`steps.${index}.value`}
rules={{ required: formatMessage(labels.required) }}
>
- {({ field }) => {
+ {({ field, context }) => {
+ const type = context.watch(`steps.${index}.type`);
return <LookupField websiteId={websiteId} type={type} {...field} />;
}}
</FormField>
@@ -118,7 +117,7 @@ export function FunnelEditForm({
})}
<Row>
<Button
- onPress={() => append({ type: 'path', value: '/' })}
+ onPress={() => append({ type: 'path', value: '' })}
isDisabled={fields.length >= FUNNEL_STEPS_MAX}
>
<Icon>
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx
index f5fec7b0e..c75d72b02 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx
@@ -17,9 +17,8 @@ export function GoalAddButton({ websiteId }: { websiteId: string }) {
<Modal>
<Dialog
aria-label="add goal"
- variant="modal"
title={formatMessage(labels.goal)}
- style={{ minWidth: 800, minHeight: 300 }}
+ style={{ minWidth: 400, minHeight: 300 }}
>
{({ close }) => <GoalEditForm websiteId={websiteId} onClose={close} />}
</Dialog>
diff --git a/src/components/common/DateDistance.tsx b/src/components/common/DateDistance.tsx
index b305f857f..65bec3870 100644
--- a/src/components/common/DateDistance.tsx
+++ b/src/components/common/DateDistance.tsx
@@ -1,13 +1,18 @@
import { Text } from '@umami/react-zen';
import { formatDistanceToNow } from 'date-fns';
import { useLocale, useTimezone } from '@/components/hooks';
+import { isInvalidDate } from '@/lib/date';
export function DateDistance({ date }: { date: Date }) {
const { formatTimezoneDate } = useTimezone();
const { dateLocale } = useLocale();
+ if (!isInvalidDate(date)) {
+ return null;
+ }
+
return (
- <Text title={formatTimezoneDate(date.toISOString(), 'PPPpp')}>
+ <Text title={formatTimezoneDate(date?.toISOString(), 'PPPpp')}>
{formatDistanceToNow(date, { addSuffix: true, locale: dateLocale })}
</Text>
);
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 81b70c62c..f0f54de41 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -369,3 +369,7 @@ export function getDateRangeValue(startDate: Date, endDate: Date) {
export function getMonthDateRangeValue(date: Date) {
return getDateRangeValue(startOfMonth(date), endOfMonth(date));
}
+
+export function isInvalidDate(date: any) {
+ return date instanceof Date && isNaN(date.getTime());
+}