From 8e333cc7fdb2cf79d5f8fd04a05258202ba1068b Mon Sep 17 00:00:00 2001 From: Hrishikesh Vaipurkar Date: Wed, 3 Sep 2025 12:42:27 +0000 Subject: [PATCH] Merged in chore/SW-3379-move-useformtracking-to-common (pull request #2754) chore(SW-3379): Moved useFormTracking to common * chore(SW-3379): Moved useFormTracking to common Approved-by: Anton Gunnarsson --- apps/scandic-web/components/Forms/Signup/index.tsx | 2 +- .../HotelReservation/EnterDetails/Details/Multiroom/index.tsx | 2 +- .../HotelReservation/EnterDetails/Details/RoomOne/index.tsx | 2 +- packages/common/package.json | 1 + {apps/scandic-web/utils => packages/common}/tracking/form.ts | 2 +- .../TrackingSDK => packages/common/tracking}/useFormTracking.ts | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) rename {apps/scandic-web/utils => packages/common}/tracking/form.ts (97%) rename {apps/scandic-web/components/TrackingSDK => packages/common/tracking}/useFormTracking.ts (98%) diff --git a/apps/scandic-web/components/Forms/Signup/index.tsx b/apps/scandic-web/components/Forms/Signup/index.tsx index 12f66c5db..c8a827e33 100644 --- a/apps/scandic-web/components/Forms/Signup/index.tsx +++ b/apps/scandic-web/components/Forms/Signup/index.tsx @@ -7,6 +7,7 @@ import { FormProvider, useForm } from "react-hook-form" import { useIntl } from "react-intl" import { logger } from "@scandic-hotels/common/logger" +import { useFormTracking } from "@scandic-hotels/common/tracking/useFormTracking" import { formatPhoneNumber, getDefaultCountryFromLang, @@ -33,7 +34,6 @@ import { import Input from "@/components/TempDesignSystem/Form/Input" import PasswordInput from "@/components/TempDesignSystem/Form/PasswordInput" -import { useFormTracking } from "@/components/TrackingSDK/useFormTracking" import useLang from "@/hooks/useLang" import { getFormattedCountryList } from "@/utils/countries" import { getErrorMessage } from "@/utils/getErrorMessage" diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/Details/Multiroom/index.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/Details/Multiroom/index.tsx index cc13ce37c..58a0e5023 100644 --- a/apps/scandic-web/components/HotelReservation/EnterDetails/Details/Multiroom/index.tsx +++ b/apps/scandic-web/components/HotelReservation/EnterDetails/Details/Multiroom/index.tsx @@ -4,6 +4,7 @@ import { useCallback, useEffect, useMemo } from "react" import { FormProvider, useForm } from "react-hook-form" import { useIntl } from "react-intl" +import { useFormTracking } from "@scandic-hotels/common/tracking/useFormTracking" import { getDefaultCountryFromLang } from "@scandic-hotels/common/utils/phone" import Footnote from "@scandic-hotels/design-system/Footnote" import CountrySelect from "@scandic-hotels/design-system/Form/Country" @@ -13,7 +14,6 @@ import { useEnterDetailsStore } from "@/stores/enter-details" import SpecialRequests from "@/components/HotelReservation/EnterDetails/Details/SpecialRequests" import Input from "@/components/TempDesignSystem/Form/Input" -import { useFormTracking } from "@/components/TrackingSDK/useFormTracking" import { useRoomContext } from "@/contexts/Details/Room" import useLang from "@/hooks/useLang" import usePhoneNumberParsing from "@/hooks/usePhoneNumberParsing" diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/Details/RoomOne/index.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/Details/RoomOne/index.tsx index 642fb8ea9..36c7467f9 100644 --- a/apps/scandic-web/components/HotelReservation/EnterDetails/Details/RoomOne/index.tsx +++ b/apps/scandic-web/components/HotelReservation/EnterDetails/Details/RoomOne/index.tsx @@ -4,6 +4,7 @@ import { useCallback, useEffect } from "react" import { FormProvider, useForm } from "react-hook-form" import { useIntl } from "react-intl" +import { useFormTracking } from "@scandic-hotels/common/tracking/useFormTracking" import { getDefaultCountryFromLang } from "@scandic-hotels/common/utils/phone" import Footnote from "@scandic-hotels/design-system/Footnote" import CountrySelect from "@scandic-hotels/design-system/Form/Country" @@ -13,7 +14,6 @@ import { useEnterDetailsStore } from "@/stores/enter-details" import SpecialRequests from "@/components/HotelReservation/EnterDetails/Details/SpecialRequests" import Input from "@/components/TempDesignSystem/Form/Input" -import { useFormTracking } from "@/components/TrackingSDK/useFormTracking" import { useRoomContext } from "@/contexts/Details/Room" import useLang from "@/hooks/useLang" import usePhoneNumberParsing from "@/hooks/usePhoneNumberParsing" diff --git a/packages/common/package.json b/packages/common/package.json index c33991066..3d43d9ce6 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -38,6 +38,7 @@ "./tracking/base": "./tracking/base.ts", "./tracking/pageview": "./tracking/pageview.ts", "./tracking/types": "./tracking/types.ts", + "./tracking/useFormTracking": "./tracking/useFormTracking.ts", "./tracking/useTrackHardNavigation": "./tracking/useTrackHardNavigation.ts", "./tracking/useTrackSoftNavigation": "./tracking/useTrackSoftNavigation.ts", "./utils/chunk": "./utils/chunk.ts", diff --git a/apps/scandic-web/utils/tracking/form.ts b/packages/common/tracking/form.ts similarity index 97% rename from apps/scandic-web/utils/tracking/form.ts rename to packages/common/tracking/form.ts index a2b6a1566..1bbf6aed4 100644 --- a/apps/scandic-web/utils/tracking/form.ts +++ b/packages/common/tracking/form.ts @@ -1,4 +1,4 @@ -import { trackEvent } from "@scandic-hotels/common/tracking/base" +import { trackEvent } from "./base" export type FormType = "checkout" | "signup" diff --git a/apps/scandic-web/components/TrackingSDK/useFormTracking.ts b/packages/common/tracking/useFormTracking.ts similarity index 98% rename from apps/scandic-web/components/TrackingSDK/useFormTracking.ts rename to packages/common/tracking/useFormTracking.ts index c76a27ead..602d2ab73 100644 --- a/apps/scandic-web/components/TrackingSDK/useFormTracking.ts +++ b/packages/common/tracking/useFormTracking.ts @@ -13,7 +13,7 @@ import { trackFormAbandonment, trackFormCompletion, trackFormInputStarted, -} from "@/utils/tracking/form" +} from "./form" export function useFormTracking( formType: FormType,