Merged in develop (pull request #539)

Promote to test

Approved-by: Christel Westerberg
This commit is contained in:
Michael Zetterberg
2024-08-29 08:24:59 +00:00
5 changed files with 24 additions and 8 deletions

View File

@@ -44,7 +44,7 @@ export default async function Profile({ params }: PageArgs<LangParams>) {
</Title>
</hgroup>
<Button asChild intent="primary" size="small" theme="base">
<Link color="none" href={profileEdit[getLang()]}>
<Link prefetch={false} color="none" href={profileEdit[getLang()]}>
{formatMessage({ id: "Edit profile" })}
</Link>
</Button>

View File

@@ -60,7 +60,7 @@ export default function Form({ user }: EditFormProps) {
streetAddress: user.address.streetAddress ?? "",
zipCode: user.address.zipCode ?? "",
},
dateOfBirth: user.dateOfBirth ?? "1900-01-01",
dateOfBirth: user.dateOfBirth,
email: user.email,
language: user.language ?? langToApiLang[lang],
phoneNumber: phoneInput,

View File

@@ -1,9 +1,10 @@
"use client"
import { usePathname } from "next/navigation"
import { useCallback, useEffect, useState } from "react"
import { useCallback, useEffect } from "react"
import { webviews } from "@/constants/routes/webviews"
import useTrackingStore from "@/stores/tracking"
import { createSDKPageObject } from "@/utils/tracking"
@@ -12,7 +13,7 @@ import { TrackingSDKProps } from "@/types/components/tracking"
export default function TrackingSDK({ pageData, userData }: TrackingSDKProps) {
const pathName = usePathname()
const isWebview = webviews.includes(pathName)
const [initPerformanceTracking, setInitPerformanceTracking] = useState(true)
const { hasRun, setHasRun } = useTrackingStore()
const CookiebotCallbackOnAccept = useCallback(() => {
const cookie = window._satellite.cookie.get("CookieConsent")
@@ -39,7 +40,7 @@ export default function TrackingSDK({ pageData, userData }: TrackingSDKProps) {
}
useEffect(() => {
if (initPerformanceTracking) {
if (!hasRun) {
const perfObserver = new PerformanceObserver((observedEntries) => {
const entry = observedEntries.getEntriesByType("navigation")[0]
@@ -61,9 +62,9 @@ export default function TrackingSDK({ pageData, userData }: TrackingSDKProps) {
buffered: true,
})
setInitPerformanceTracking(false)
setHasRun()
}
}, [pathName, pageData, userData, initPerformanceTracking])
}, [pathName, pageData, userData, hasRun, setHasRun])
useEffect(() => {
// handle consent

View File

@@ -10,7 +10,7 @@ export const getUserSchema = z.object({
streetAddress: z.string().optional(),
zipCode: z.string().optional(),
}),
dateOfBirth: z.string().optional().default("N/A"),
dateOfBirth: z.string().optional().default("1900-01-01"),
email: z.string().email(),
firstName: z.string(),
language: z.string().optional(),

15
stores/tracking.ts Normal file
View File

@@ -0,0 +1,15 @@
"use client"
import { create } from "zustand"
interface TrackingStoreState {
hasRun: boolean
setHasRun: () => void
}
const useTrackingStore = create<TrackingStoreState>((set) => ({
hasRun: false,
setHasRun: () => set(() => ({ hasRun: true })),
}))
export default useTrackingStore