watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 22:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed triggered event lookup. Closes #3742.

Browse source
This commit is contained in:
Mike Cao 2025-11-14 15:42:23 -08:00
parent cc8254985b
commit cb63e49a9b
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelEditForm.tsx
View file

@ -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>

3
src/app/(main)/websites/[websiteId]/(reports)/goals/GoalAddButton.tsx
View file

@ -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>