From d90c330326f5254e7c003bf3f95d714ed66f03f9 Mon Sep 17 00:00:00 2001
From: markpit <mpitten@companieshouse.gov.uk>
Date: Mon, 16 Dec 2024 11:51:41 +0000
Subject: [PATCH 1/3] LP-275 Add matomo tracking

---
 src/config/app-config.ts             |  1 +
 src/config/constants.ts              |  1 +
 src/views/includes/piwik-scripts.njk |  2 +-
 src/views/start.njk                  |  4 ++--
 src/views/which-type.njk             | 15 ++++++++++-----
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/config/app-config.ts b/src/config/app-config.ts
index 6f83e62..e55a7fa 100644
--- a/src/config/app-config.ts
+++ b/src/config/app-config.ts
@@ -34,6 +34,7 @@ export const appConfig = (app: express.Application) => {
 
   nunjucksEnv.addGlobal("CDN_HOST", config.CDN_HOST);
   nunjucksEnv.addGlobal("MATOMO_ASSET_PATH", `//${config.CDN_HOST}`);
+  nunjucksEnv.addGlobal("PIWIK_REGISTRATION_START_GOAL_ID", config.PIWIK_REGISTRATION_START_GOAL_ID);
   nunjucksEnv.addGlobal("PIWIK_SITE_ID", config.PIWIK_SITE_ID);
   nunjucksEnv.addGlobal("PIWIK_URL", config.PIWIK_URL);
   nunjucksEnv.addGlobal("SERVICE_NAME", config.SERVICE_NAME);
diff --git a/src/config/constants.ts b/src/config/constants.ts
index c390fad..a023be7 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -22,6 +22,7 @@ export const LOG_LEVEL = getEnvironmentValue("LOG_LEVEL");
 export const NODE_ENV = process.env["NODE_ENV"];
 export const OAUTH2_CLIENT_ID = getEnvironmentValue("OAUTH2_CLIENT_ID");
 export const OAUTH2_CLIENT_SECRET = getEnvironmentValue("OAUTH2_CLIENT_SECRET");
+export const PIWIK_REGISTRATION_START_GOAL_ID = getEnvironmentValue("PIWIK_REGISTRATION_START_GOAL_ID");
 export const PIWIK_SITE_ID = getEnvironmentValue("PIWIK_SITE_ID");
 export const PIWIK_URL = getEnvironmentValue("PIWIK_URL");
 export const PORT = getEnvironmentValue("PORT");
diff --git a/src/views/includes/piwik-scripts.njk b/src/views/includes/piwik-scripts.njk
index 7883c80..959186a 100644
--- a/src/views/includes/piwik-scripts.njk
+++ b/src/views/includes/piwik-scripts.njk
@@ -4,7 +4,7 @@
     window.PIWIK_URL = '{{ PIWIK_URL }}'
     window.PIWIK_SITE_ID = '{{ PIWIK_SITE_ID }}'
 </script>
-<div id="templateName" data-id='{{templateName}}' hidden></div>
+<div id="templateName" data-id='{{ props.pageType }}' hidden></div>
 <script src="{{MATOMO_ASSET_PATH}}/javascripts/app/cookie-consent/cookie-consent-1.0.0.js"></script>
 <script src="{{MATOMO_ASSET_PATH}}/javascripts/app/cookie-consent/matomo-only-cookie-consent.js"></script>
 <noscript>
diff --git a/src/views/start.njk b/src/views/start.njk
index 278e320..29e9518 100644
--- a/src/views/start.njk
+++ b/src/views/start.njk
@@ -8,6 +8,6 @@
 
   {{ errorMessage }}
 
-  <button class="govuk-button" onClick="location.href='{{ props.nextUrl }}'">Start</button>
-
+  <button class="govuk-button" onClick="_paq.push(['trackGoal', '{{PIWIK_REGISTRATION_START_GOAL_ID}}']); location.href='{{ props.nextUrl }}'">Start</button>
+  
 {% endblock %}
\ No newline at end of file
diff --git a/src/views/which-type.njk b/src/views/which-type.njk
index 36bf459..f411bf8 100644
--- a/src/views/which-type.njk
+++ b/src/views/which-type.njk
@@ -25,35 +25,40 @@
               value: "registerLp",
               text: i18n.whichTypePage.options.registerLp,
               attributes: {
-                required: true
+                "required": true,
+                "data-event-id": "which-type-of-partnership-to-register - limited-partnership-england-wales"
               }
             },
             {
               value: "registerPflp",
               text: i18n.whichTypePage.options.registerPflp,
               attributes: {
-                required: true
+                "required": true,
+                "data-event-id": "which-type-of-partnership-to-register - private-fund-limited-partnership-england-wales"
               }
             },
             {
               value: "registerSlp",
               text: i18n.whichTypePage.options.registerSlp,
               attributes: {
-                required: true
+                "required": true,
+                "data-event-id": "which-type-of-partnership-to-register - scottish-limited-partnership"
               }
             },
             {
               value: "registerPflpSco",
               text: i18n.whichTypePage.options.registerPflpSco,
               attributes: {
-                required: true
+                "required": true,
+                "data-event-id": "which-type-of-partnership-to-register - private-fund-limited-partnership-in-scotland"
               }
             },
             {
               value: "registerSqp",
               text: i18n.whichTypePage.options.registerSqp,
               attributes: {
-                required: true
+                "required": true,
+                "data-event-id": "which-type-of-partnership-to-register - scottish-qualifying-partnership"
               }
             }
           ]

From d580a668742cd67f97f150bc92b57d5f53277973 Mon Sep 17 00:00:00 2001
From: markpit <mpitten@companieshouse.gov.uk>
Date: Mon, 16 Dec 2024 11:54:34 +0000
Subject: [PATCH 2/3] LP-275 Update test config for Piwik/Matomo

---
 src/test/global.setup.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/global.setup.ts b/src/test/global.setup.ts
index fcb4ac8..1ce70d1 100644
--- a/src/test/global.setup.ts
+++ b/src/test/global.setup.ts
@@ -14,6 +14,7 @@ export default () => {
   process.env.NODE_ENV = "development";
   process.env.OAUTH2_CLIENT_ID = "OAUTH2_CLIENT_ID";
   process.env.OAUTH2_CLIENT_SECRET = "OAUTH2_CLIENT_SECRET";
+  process.env.PIWIK_REGISTRATION_START_GOAL_ID = "45";
   process.env.PIWIK_SITE_ID = "24";
   process.env.PIWIK_URL = "piwik.url";
   process.env.PORT = "3000";

From 405acb92a2be06699c91f9e0eece52d53066a460 Mon Sep 17 00:00:00 2001
From: markpit <mpitten@companieshouse.gov.uk>
Date: Mon, 16 Dec 2024 12:03:51 +0000
Subject: [PATCH 3/3] LP-275 Change name of radio matomo event

---
 src/views/which-type.njk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/which-type.njk b/src/views/which-type.njk
index f240961..acd64ec 100644
--- a/src/views/which-type.njk
+++ b/src/views/which-type.njk
@@ -26,7 +26,7 @@
               text: i18n.whichTypePage.options.LP,
               attributes: {
                 "required": true,
-                "data-event-id": "which-type-of-partnership-to-register - limited-partnership-england-wales"
+                "data-event-id": "which-type-of-partnership-to-register-radio - limited-partnership-england-wales"
               }
             },
             {
@@ -34,7 +34,7 @@
               text: i18n.whichTypePage.options.PFLP,
               attributes: {
                 "required": true,
-                "data-event-id": "which-type-of-partnership-to-register - private-fund-limited-partnership-england-wales"
+                "data-event-id": "which-type-of-partnership-to-register-radio - private-fund-limited-partnership-england-wales"
               }
             },
             {
@@ -42,7 +42,7 @@
               text: i18n.whichTypePage.options.SLP,
               attributes: {
                 "required": true,
-                "data-event-id": "which-type-of-partnership-to-register - scottish-limited-partnership"
+                "data-event-id": "which-type-of-partnership-to-register-radio - scottish-limited-partnership"
               }
             },
             {
@@ -50,7 +50,7 @@
               text: i18n.whichTypePage.options.SPFLP,
               attributes: {
                 "required": true,
-                "data-event-id": "which-type-of-partnership-to-register - private-fund-limited-partnership-in-scotland"
+                "data-event-id": "which-type-of-partnership-to-register-radio - private-fund-limited-partnership-in-scotland"
               }
             },
             {
@@ -58,7 +58,7 @@
               text: i18n.whichTypePage.options.SQP,
               attributes: {
                 "required": true,
-                "data-event-id": "which-type-of-partnership-to-register - scottish-qualifying-partnership"
+                "data-event-id": "which-type-of-partnership-to-register-radio - scottish-qualifying-partnership"
               }
             }
           ]