Merge pull request #1690 from companieshouse/ROECCT-289-MATOMO-FIX-PR…

…OBLEMS-CSP ROECCT-289: Fix Matomo problems caused by Content Security Policy
companieshouse · Feb 12, 2025 · e767084 · e767084
2 parents 8549bc6 + 0708257
commit e767084
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/views/includes/piwik-goal.html b/views/includes/piwik-goal.html
@@ -0,0 +1,27 @@
+<script nonce={{ cspNonce | dump | safe }}>
+  function trackGoal(elementId, goalId) {
+    document
+      .getElementById(elementId)
+      .addEventListener("click", () => {
+        _paq.push(["trackGoal", goalId]);
+      });
+  }
+
+  function addGoalEventListeners() {
+    {% if (journey == "remove") %}
+    trackGoal("submit", {{PIWIK_REMOVE_START_GOAL_ID}} );
+    {% elif (update.owned_land_relevant_period == 1) %}
+    trackGoal("submit", {{PIWIK_RELEVANT_PERIOD_START_GOAL_ID}} );
+    {% else %}
+    trackGoal("submit", {{PIWIK_UPDATE_START_GOAL_ID}} );
+    {% endif %}
+  }
+
+  if (document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", function (e) {
+      addGoalEventListeners()
+    });
+  } else {
+    addGoalEventListeners()
+  }
+</script>
diff --git a/views/includes/relevant-period-start-goal-button.html b/views/includes/relevant-period-start-goal-button.html
@@ -2,10 +2,10 @@
     {{ govukButton({
         text: "Continue",
         attributes: {
-            "id": "submit",
-            "onclick": "_paq.push(['trackGoal', '" + PIWIK_RELEVANT_PERIOD_START_GOAL_ID + "'])"
+            "id": "submit"
         }
     }) }}
+    {% include   "includes/piwik-goal.html" %}
 {% else %}
     {% include "includes/continue-button.html" %}
-{% endif %}
+{% endif %}
diff --git a/views/includes/remove-start-goal-button.html b/views/includes/remove-start-goal-button.html
@@ -2,10 +2,10 @@
     {{ govukButton({
         text: "Continue",
         attributes: {
-            "id": "submit",
-            "onclick": "_paq.push(['trackGoal', '" + PIWIK_REMOVE_START_GOAL_ID + "'])"
+            "id": "submit"
         }
     }) }}
+    {% include "includes/piwik-goal.html" %}
 {% else %}
     {% include "includes/continue-button.html" %}
-{% endif %}
+{% endif %}
diff --git a/views/includes/update-start-goal-button.html b/views/includes/update-start-goal-button.html
@@ -2,10 +2,10 @@
     {{ govukButton({
         text: "Continue",
         attributes: {
-            "id": "submit",
-            "onclick": "_paq.push(['trackGoal', '" + PIWIK_UPDATE_START_GOAL_ID + "'])"
+            "id": "submit"
         }
     }) }}
+    {% include "includes/piwik-goal.html"   %}
 {% else %}
     {% include "includes/continue-button.html" %}
-{% endif %}
+{% endif %}