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.

fix(funnels): align FunnelResult export with actual returned shape

Rudy B.a5f4210d84c7
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx
index a16a802c3..13567c049 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/Funnel.tsx
@@ -6,17 +6,9 @@ import { ReportEditButton } from '@/components/input/ReportEditButton';
import { ChangeLabel } from '@/components/metrics/ChangeLabel';
import { Lightning } from '@/components/svg';
import { formatLongNumber } from '@/lib/format';
-import type { FunnelStep } from '@/queries/sql/reports/getFunnel';
+import type { FunnelResult } from '@/queries/sql/reports/getFunnel';
import { FunnelEditForm } from './FunnelEditForm';
-type FunnelResult = FunnelStep & {
- visitors: number;
- previous: number;
- dropped: number;
- dropoff: number;
- remaining: number;
-};
-
interface FunnelProps {
id: string;
name: string;
diff --git a/src/queries/sql/reports/getFunnel.ts b/src/queries/sql/reports/getFunnel.ts
index a623fb5e5..fcf30a903 100644
--- a/src/queries/sql/reports/getFunnel.ts
+++ b/src/queries/sql/reports/getFunnel.ts
@@ -22,10 +22,12 @@ export interface FunnelParameters {
steps: Array<FunnelStep>;
}
-export interface FunnelResult {
- value: string;
+export interface FunnelResult extends FunnelStep {
visitors: number;
+ previous: number;
+ dropped: number;
dropoff: number;
+ remaining: number;
}
export async function getFunnel(