Merge pull request #1740 from companieshouse/origin/feature/roecct-638-matomo-pre-reg-fix

Matomo: Adding goals for the Pre-registration page of the S174 journey in CIDEV

Author: rbeaz-ch

src/frontend/analytics/piwik.relevant.period.confirm.goals.ts

@@ -0,0 +1,11 @@
+{% if PIWIK_RELEVANT_PERIOD_START_GOAL_ID > 0 %}
+    {{ govukButton({
+        text: "Continue",
+        attributes: {
+            "id": "submit"
+        }
+    }) }}
+    {% include   "includes/piwik-relevant-period-confirm-goals.html" %}
+{% else %}
+    {% include "includes/continue-button.html" %}
+{% endif %}

test/frontend/analytics/piwik.relevant.period.confirm.goals.spec.ts

@@ -1,29 +1,33 @@
-<script type="module">
-  import { trackRelevantPeriodGoal, isCiDevEnvironment } from "../../../../../../../../src/frontend/analytics/piwik.relevant.period.confirm.goals.ts";
+<script nonce={{ cspNonce | dump | safe }}>
+  document.addEventListener("DOMContentLoaded", function () {
+    if (!window.location.href.includes("cidev")) {
+      return; // Don't run tracking logic unless in "cidev" environment
+    }
+    
+    var submitBtn = document.getElementById("submit");
 
-  function setupRelevantPeriodTracking() {
-    document.addEventListener("DOMContentLoaded", () => {
-      if (!isCiDevEnvironment(window.location.hostname)) {
-        return;
-      }
+    if (!submitBtn) {
+      console.warn("Submit button not found.");
+      return;
+    }
 
-      const submitButton = document.getElementById("submit");
-      if (!submitButton) {
-        return;
+    submitBtn.addEventListener("click", function (event) {
+      var selected = document.querySelector('input[name="required_information"]:checked');
+      if (!selected) {
+        return; 
       }
 
-      submitButton.addEventListener("click", () => {
-        const selected = document.querySelector(
-          'input[name="required_information"]:checked'
-        );
-        if (!selected) {
-          return;
-        }
+      event.preventDefault();
 
-        trackRelevantPeriodGoal(selected.value);
-      });
-    });
-  }
+      if (window._paq) {
+        if (selected.value === "1") {
+          _paq.push(["trackGoal", 55]);
+        } else if (selected.value === "0") {
+          _paq.push(["trackGoal", 118]);
+        }
+      }
 
-  setupRelevantPeriodTracking();
+      submitBtn.click();
+    }, { once: true }); 
+  });
 </script>

views/includes/piwik-pre-reg-goals-button.html

@@ -81,14 +81,9 @@ <h1 class="govuk-heading-xl">You'll need to tell us about the pre-registration p
                     }
                 ]
             }) }}
-            {% include "includes/continue-button.html" %}
+            {% include "includes/piwik-pre-reg-goals-button.html" %}
         </form>
     </div>
 </div>
 
-{% endblock %}
-
-{% block scripts %}
-  {{ super() }}
-  {% include "includes/piwik-relevant-period-confirm-goals.html" %}
 {% endblock %}