Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Fix user flow

Blue Mouse81032edfbeff
diff --git a/web/app/api/api.server.ts b/web/app/api/api.server.ts
index 5af9073b8..f075750e2 100644
--- a/web/app/api/api.server.ts
+++ b/web/app/api/api.server.ts
@@ -2230,11 +2230,16 @@ interface UserFlowLink {
value: number
}
-export interface UserFlowResponse {
+export interface UserFlowData {
nodes: UserFlowNode[]
links: UserFlowLink[]
}
+export interface UserFlowResponse {
+ ascending: UserFlowData
+ descending: UserFlowData
+}
+
export async function getUserFlowServer(
request: Request,
pid: string,
diff --git a/web/app/lib/models/UserFlow.ts b/web/app/lib/models/UserFlow.ts
index 5a3c7f2ef..55748efb8 100644
--- a/web/app/lib/models/UserFlow.ts
+++ b/web/app/lib/models/UserFlow.ts
@@ -1,4 +1,4 @@
-interface UserFlow {
+interface UserFlowData {
nodes: {
id: string
}[]
@@ -9,4 +9,9 @@ interface UserFlow {
}[]
}
-export type UserFlowType = UserFlow | null
+export type UserFlowType = UserFlowData | null
+
+export interface UserFlowResult {
+ ascending: UserFlowData
+ descending: UserFlowData
+}
diff --git a/web/app/pages/Project/tabs/Traffic/UserFlow.tsx b/web/app/pages/Project/tabs/Traffic/UserFlow.tsx
index ea4a0ac9a..e0bc87420 100644
--- a/web/app/pages/Project/tabs/Traffic/UserFlow.tsx
+++ b/web/app/pages/Project/tabs/Traffic/UserFlow.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
import { useUserFlowProxy } from '~/hooks/useAnalyticsProxy'
-import { UserFlowType } from '~/lib/models/UserFlow'
+import type { UserFlowResponse } from '~/api/api.server'
import Loader from '~/ui/Loader'
import { useCurrentProject } from '../../../../providers/CurrentProjectProvider'
@@ -23,10 +23,7 @@ const UserFlow = ({ setReversed, isReversed }: UserFlowProps) => {
const { id } = useCurrentProject()
const { t } = useTranslation('common')
const [isLoading, setIsLoading] = useState<boolean | null>(null)
- const [userFlow, setUserFlow] = useState<{
- ascending: UserFlowType
- descending: UserFlowType
- } | null>(null)
+ const [userFlow, setUserFlow] = useState<UserFlowResponse | null>(null)
const { fetchUserFlow: fetchUserFlowProxy } = useUserFlowProxy()
const [from, to] = useMemo(() => {
@@ -54,10 +51,7 @@ const UserFlow = ({ setReversed, isReversed }: UserFlowProps) => {
timezone,
})
if (result) {
- setUserFlow({
- ascending: result as unknown as UserFlowType,
- descending: result as unknown as UserFlowType,
- })
+ setUserFlow(result as UserFlowResponse)
}
} catch (error: any) {
toast.error(