NE PAS MERGER / Try 2 domaines with same posthog key

package.json

@@ -67,6 +67,7 @@
     "next": "14.2.7",
     "next-i18n-router": "^4.1.1",
     "postcss": "8.4.36",
+    "posthog-js": "^1.217.2",
     "process": "^0.11.10",
     "publicodes": "1.4.0",
     "qrcode.react": "^3.1.0",

src/app/(simulation)/(large-layout)/actions/[...dottedName]/_components/ActionDetail.tsx

@@ -14,7 +14,7 @@ import {
   useTempEngine,
   useUser,
 } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { DottedName, NGCRuleNode } from '@incubateur-ademe/nosgestesclimat'
 import { utils } from 'publicodes'
 import ActionForm from '../../_components/actionsContent/actions/ActionForm'

src/app/(simulation)/(large-layout)/actions/_components/ActionsTutorial.tsx

@@ -8,7 +8,7 @@ import Emoji from '@/design-system/utils/Emoji'
 import { getCarbonFootprint } from '@/helpers/actions/getCarbonFootprint'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
 import { useCurrentSimulation, useEngine, useUser } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 export default function ActionsTutorial() {
   const { t, i18n } = useClientTranslation()

src/app/(simulation)/(large-layout)/actions/_components/actionsContent/AllerPlusLoin.tsx

@@ -6,7 +6,7 @@ import Trans from '@/components/translation/Trans'
 import { actionsClickAdeme } from '@/constants/tracking/pages/actions'
 import Card from '@/design-system/layout/Card'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 export default function AllerPlusLoin() {
   const { t } = useClientTranslation()

src/app/(simulation)/(large-layout)/actions/_components/actionsContent/actions/ActionCard.tsx

@@ -26,7 +26,7 @@ import {
   useTempEngine,
   useUser,
 } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { encodeRuleName } from '@/utils/publicodes/encodeRuleName'
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 import { useCallback } from 'react'

src/app/(simulation)/(large-layout)/actions/_components/actionsContent/actions/ActionList.tsx

@@ -8,7 +8,7 @@ import {
   useEngine,
   useUser,
 } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { Fragment } from 'react'
 import ActionCard from './ActionCard'
 import ActionForm from './ActionForm'

src/app/(simulation)/(large-layout)/actions/_components/actionsContent/categoryFilters/Filter.tsx

@@ -7,7 +7,7 @@ import {
   getTextDarkColor,
 } from '@/helpers/getCategoryColorClass'
 import { useRule } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 import { useRouter, useSearchParams } from 'next/navigation'
 

src/app/(simulation)/(large-layout)/amis/creer/vos-informations/_component/GroupCreationForm.tsx

@@ -7,8 +7,8 @@ import EmailInput from '@/design-system/inputs/EmailInput'
 import PrenomInput from '@/design-system/inputs/PrenomInput'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
 import { useUser } from '@/publicodes-state'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { formatEmail } from '@/utils/format/formatEmail'
-import { trackEvent } from '@/utils/matomo/trackEvent'
 import { useRouter } from 'next/navigation'
 import { useForm as useReactHookForm } from 'react-hook-form'
 

src/app/(simulation)/(large-layout)/amis/creer/votre-groupe/_components/NameForm.tsx

@@ -11,8 +11,8 @@ import { useEndPage } from '@/hooks/navigation/useEndPage'
 import { useSimulateurPage } from '@/hooks/navigation/useSimulateurPage'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
 import { useCurrentSimulation, useUser } from '@/publicodes-state'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { formatEmail } from '@/utils/format/formatEmail'
-import { trackEvent } from '@/utils/matomo/trackEvent'
 import { captureException } from '@sentry/react'
 import { useSearchParams } from 'next/navigation'
 import { useEffect, useState } from 'react'

src/app/(simulation)/(large-layout)/amis/resultats/_components/EditableGroupTitle.tsx

@@ -14,7 +14,7 @@ import { useIsGroupOwner } from '@/hooks/groups/useIsGroupOwner'
 import { useUpdateGroup } from '@/hooks/groups/useUpdateGroup'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
 import type { Group } from '@/types/groups'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { captureException } from '@sentry/react'
 import { useState } from 'react'
 

src/app/(simulation)/(large-layout)/amis/resultats/_components/groupResults/InviteBlock.tsx

@@ -5,7 +5,7 @@ import { amisDashboardCopyLink } from '@/constants/tracking/pages/amisDashboard'
 import Button from '@/design-system/inputs/Button'
 import Emoji from '@/design-system/utils/Emoji'
 import type { Group } from '@/types/groups'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { useEffect, useRef, useState } from 'react'
 
 const SubmitButton = ({

src/app/(simulation)/(large-layout)/amis/resultats/_components/groupResults/OwnerAdminSection.tsx

@@ -12,7 +12,7 @@ import { linkToClassement } from '@/helpers/navigation/classementPages'
 import { useDeleteGroup } from '@/hooks/groups/useDeleteGroup'
 import { useUser } from '@/publicodes-state'
 import type { Group } from '@/types/groups'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { captureException } from '@sentry/react'
 import { useRouter } from 'next/navigation'
 import { useEffect, useRef, useState } from 'react'

src/app/(simulation)/(large-layout)/classements/_components/Organisations/CreateOrganisation.tsx

@@ -5,7 +5,7 @@ import Trans from '@/components/translation/Trans'
 import { classementCreateOrganisation } from '@/constants/tracking/pages/classements'
 import ButtonLink from '@/design-system/inputs/ButtonLink'
 import type { Organisation } from '@/types/organisations'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 type Props = {
   organisations?: Organisation[]

src/app/(simulation)/(large-layout)/classements/_components/Organisations/pollList/OrganisationItem.tsx

@@ -6,7 +6,7 @@ import Trans from '@/components/translation/Trans'
 import { classementClickOrganisation } from '@/constants/tracking/pages/classements'
 import Badge from '@/design-system/layout/Badge'
 import type { Organisation } from '@/types/organisations'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 export default function OrganisationItem({
   organisation,

src/app/(simulation)/(large-layout)/classements/_components/Organisations/pollList/PollItem.tsx

@@ -6,7 +6,7 @@ import Trans from '@/components/translation/Trans'
 import { classementClickOrganisation } from '@/constants/tracking/pages/classements'
 import { getLinkToPollDashboard } from '@/helpers/navigation/pollPages'
 import type { Organisation, OrganisationPoll } from '@/types/organisations'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 type Props = {
   organisation: Organisation

src/app/(simulation)/(large-layout)/classements/_components/groups/createOtherGroupsSection/groupList/GroupItem.tsx

@@ -8,7 +8,7 @@ import Emoji from '@/design-system/utils/Emoji'
 import { getLinkToGroupDashboard } from '@/helpers/navigation/groupPages'
 import { useUser } from '@/publicodes-state'
 import type { Group } from '@/types/groups'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 type Props = {
   group: Group

src/app/(simulation)/(large-layout)/infos/_components/Navigation.tsx

@@ -16,7 +16,7 @@ import {
 import Button from '@/design-system/inputs/Button'
 import ButtonLink from '@/design-system/inputs/ButtonLink'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 type Props = {
   linkToPrev: string

src/app/(simulation)/(large-layout)/infos/commencer/page.tsx

@@ -13,7 +13,7 @@ import Emoji from '@/design-system/utils/Emoji'
 import { useSimulateurPage } from '@/hooks/navigation/useSimulateurPage'
 import { usePollQueryParams } from '@/hooks/organisations/usePollQueryParams'
 import { useCurrentSimulation } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { useContext, useEffect, useState } from 'react'
 import { InfosContext } from '../_components/InfosProvider'
 

src/app/(simulation)/(large-layout)/infos/email/page.tsx

@@ -7,8 +7,8 @@ import Title from '@/design-system/layout/Title'
 import { useInfosPage } from '@/hooks/navigation/useInfosPage'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
 import { useUser } from '@/publicodes-state'
+import { trackPageView } from '@/utils/analytics/trackEvent'
 import { isEmailValid } from '@/utils/isEmailValid'
-import { trackPageView } from '@/utils/matomo/trackEvent'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { useCallback, useEffect } from 'react'
 import { useForm as useReactHookForm } from 'react-hook-form'

src/app/(simulation)/(large-layout)/organisations/[orgaSlug]/_components/OurTools.tsx

@@ -10,7 +10,7 @@ import {
 import ButtonLink from '@/design-system/inputs/ButtonLink'
 import Title from '@/design-system/layout/Title'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import CTACard from './CTACard'
 
 export default function OurTools() {

src/app/(simulation)/(large-layout)/organisations/[orgaSlug]/campagnes/[pollSlug]/_components/AdminSection.tsx

@@ -11,7 +11,7 @@ import {
 import ButtonLink from '@/design-system/inputs/ButtonLink'
 import CopyInput from '@/design-system/inputs/CopyInput'
 import type { PublicOrganisationPoll } from '@/types/organisations'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { useParams } from 'next/navigation'
 
 type Props = {

src/app/(simulation)/(large-layout)/organisations/[orgaSlug]/campagnes/[pollSlug]/_components/pollStatisticsFilters/AgeFilter.tsx

@@ -3,7 +3,7 @@ import { organisationsResultatsDetaillesFilterByAge } from '@/constants/tracking
 import ComplexSelect from '@/design-system/inputs/ComplexSelect'
 import { getAgeFilterOptions } from '@/helpers/organisations/getAgeFilterOptions'
 import type { Simulation } from '@/types/organisations'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { SetStateAction } from 'react'
 import { useContext } from 'react'
 import type { MultiValue, SingleValue } from 'react-select'

src/app/(simulation)/(large-layout)/organisations/[orgaSlug]/campagnes/[pollSlug]/_components/pollStatisticsFilters/DepartementFilter.tsx

@@ -3,7 +3,7 @@ import { organisationsResultatsDetaillesFilterByPostalCode } from '@/constants/t
 import ComplexSelect from '@/design-system/inputs/ComplexSelect'
 import { extractPostalCodesFromSimulations } from '@/helpers/organisations/extractPostalCodesFromSimulations'
 import type { Simulation } from '@/types/organisations'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { SetStateAction } from 'react'
 import { useContext } from 'react'
 import type { MultiValue, SingleValue } from 'react-select'

src/app/(simulation)/(large-layout)/organisations/[orgaSlug]/parametres/DeconnexionButton.tsx

@@ -5,7 +5,7 @@ import Trans from '@/components/translation/Trans'
 import { organisationsParametersLogout } from '@/constants/tracking/pages/organisationsParameters'
 import Button from '@/design-system/inputs/Button'
 import { useLogout } from '@/hooks/authentication/useLogout'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { useQueryClient } from '@tanstack/react-query'
 import { useRouter } from 'next/navigation'
 

src/app/(simulation)/(large-layout)/organisations/[orgaSlug]/parametres/page.tsx

@@ -19,8 +19,8 @@ import type {
   Organisation,
   OrgaSettingsInputsType,
 } from '@/types/organisations'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import { formatEmail } from '@/utils/format/formatEmail'
-import { trackEvent } from '@/utils/matomo/trackEvent'
 import { useEffect, useRef, useState } from 'react'
 import type { SubmitHandler } from 'react-hook-form'
 import { useForm as useReactHookForm } from 'react-hook-form'

src/app/(simulation)/(large-layout)/organisations/_components/HeroSection.tsx

@@ -8,7 +8,7 @@ import {
 } from '@/constants/tracking/pages/organisationsAccueil'
 import ButtonLink from '@/design-system/inputs/ButtonLink'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import Image from 'next/image'
 
 export default function HeroSection() {

src/app/(simulation)/(large-layout)/organisations/connexion/_components/emailSection/verificationForm/notReceived/ResendButton.tsx

@@ -8,7 +8,7 @@ import { organisationsConnexionClickCode } from '@/constants/tracking/pages/orga
 import Button from '@/design-system/inputs/Button'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
 import { useUser } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { UseMutateAsyncFunction } from '@tanstack/react-query'
 import React, { useEffect, useRef, useState } from 'react'
 

src/app/(simulation)/(large-layout)/profil/_components/SimulationList.tsx

@@ -10,7 +10,7 @@ import {
 import Button from '@/design-system/inputs/Button'
 import { useUser } from '@/publicodes-state'
 import type { Simulation } from '@/publicodes-state/types'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 export default function SimulationList() {
   const {

src/app/(simulation)/(large-layout)/profil/_components/answerList/Category.tsx

@@ -10,7 +10,7 @@ import {
 } from '@/helpers/getCategoryColorClass'
 import { getSubcatsOfCategory } from '@/helpers/publicodes/getSubcatsOfCategory'
 import { useRule, useSimulation } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 import { useState } from 'react'
 import QuestionsWithoutSubcategory from './category/QuestionsWithoutSubcategory'

src/app/(simulation)/(large-layout)/profil/_components/answerList/category/Subcategory.tsx

@@ -8,7 +8,7 @@ import {
   getTextDarkColor,
 } from '@/helpers/getCategoryColorClass'
 import { useForm, useRule } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 import { useState } from 'react'
 import Question from './subcategory/Question'

src/app/(simulation)/(large-layout)/profil/_components/answerList/category/subcategory/Question.tsx

@@ -7,7 +7,7 @@ import { profilClickQuestion } from '@/constants/tracking/pages/profil'
 import { getLinkToSimulateur } from '@/helpers/navigation/simulateurPages'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
 import { useRule } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 import MosaicQuestion from './question/MosaicQuestion'
 

src/app/(simulation)/(large-layout)/profil/_components/localisation/RegionSelector.tsx

@@ -19,7 +19,7 @@ import { useClientTranslation } from '@/hooks/useClientTranslation'
 import { useLocale } from '@/hooks/useLocale'
 import { useRules } from '@/hooks/useRules'
 import { useUser } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { SupportedRegions } from '@incubateur-ademe/nosgestesclimat'
 
 type Props = {

src/app/(simulation)/(large-layout)/quiz/_components/Choices.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import { quizClickAnswer } from '@/constants/tracking/pages/quiz'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 import { useMemo } from 'react'
 import Choice from './choices/Choice'

src/app/(simulation)/(large-layout)/quiz/_components/Navigation.tsx

@@ -12,7 +12,8 @@ import { getLinkToSimulateur } from '@/helpers/navigation/simulateurPages'
 import { useEndPage } from '@/hooks/navigation/useEndPage'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
 import { useEngine } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
+import posthog from 'posthog-js'
 
 type Props = {
   answer: string | null
@@ -52,9 +53,14 @@ export default function Navigation({
           })}
           data-cypress-id="button-skip-quiz"
           onClick={() => {
-            trackEvent(
-              simulationSimulationCompleted({ bilan: getNumericValue('bilan') })
-            )
+            const eventParams = simulationSimulationCompleted({
+              bilan: getNumericValue('bilan'),
+            })
+            trackEvent(eventParams)
+            posthog.capture(eventParams[2] as string, {
+              category: eventParams[1],
+              bilanValue: eventParams[4],
+            })
             trackEvent(quizClickPass)
           }}>
           <Trans>Passer la question →</Trans>
@@ -64,11 +70,16 @@ export default function Navigation({
           href={getLinkToEndPage({
             allowedToGoToGroupDashboard: true,
           })}
-          onClick={() =>
-            trackEvent(
-              simulationSimulationCompleted({ bilan: getNumericValue('bilan') })
-            )
-          }>
+          onClick={() => {
+            const eventParams = simulationSimulationCompleted({
+              bilan: getNumericValue('bilan'),
+            })
+            trackEvent(eventParams)
+            posthog.capture(eventParams[2] as string, {
+              category: eventParams[1],
+              bilanValue: eventParams[4],
+            })
+          }}>
           <Trans>Voir mes résultats →</Trans>
         </ButtonLink>
       ) : (

src/app/(simulation)/(large-layout)/quiz/_components/choices/Choice.tsx

@@ -4,7 +4,7 @@ import ChoiceInput from '@/components/misc/ChoiceInput'
 import { quizClickAnswer } from '@/constants/tracking/pages/quiz'
 import Emoji from '@/design-system/utils/Emoji'
 import { useRule } from '@/publicodes-state'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 
 type Props = {

src/app/(simulation)/(large-layout)/quiz/page.tsx

@@ -9,7 +9,7 @@ import { useQuizGuard } from '@/hooks/navigation/useQuizGuard'
 import { useSaveQuizAnswer } from '@/hooks/quiz/useSaveQuizAnswer'
 import { useSortedSubcategoriesByFootprint } from '@/hooks/useSortedSubcategoriesByFootprint'
 import type { AnswerType } from '@/types/quiz'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import type { DottedName } from '@incubateur-ademe/nosgestesclimat'
 import { useMemo, useState } from 'react'
 import Choices from './_components/Choices'

src/app/(simulation)/(large-layout-nosticky)/fin/_components/AgirMainBlock.tsx

@@ -5,7 +5,7 @@ import Button from '@/design-system/inputs/Button'
 import Loader from '@/design-system/layout/Loader'
 import { useExportSituationToAgir } from '@/hooks/simulation/useExportSituationToAgir'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import Image from 'next/image'
 import { useEffect, useState } from 'react'
 

src/app/(simulation)/(large-layout-nosticky)/fin/_components/AgirSecondaryBlock.tsx

@@ -6,7 +6,7 @@ import Badge from '@/design-system/layout/Badge'
 import Loader from '@/design-system/layout/Loader'
 import { useExportSituationToAgir } from '@/hooks/simulation/useExportSituationToAgir'
 import { useClientTranslation } from '@/hooks/useClientTranslation'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 import Image from 'next/image'
 import { useEffect, useState } from 'react'
 

src/app/(simulation)/(large-layout-nosticky)/fin/_components/DocumentationBlock.tsx

@@ -3,7 +3,7 @@ import Trans from '@/components/translation/Trans'
 import { endClickDocumentation } from '@/constants/tracking/pages/end'
 import InlineLink from '@/design-system/inputs/InlineLink'
 import Title from '@/design-system/layout/Title'
-import { trackEvent } from '@/utils/matomo/trackEvent'
+import { trackEvent } from '@/utils/analytics/trackEvent'
 
 export default function DocumentationBlock() {
   return (