@dwp/govuk-casa 8.7.12 → 8.8.0

package/views/casa/components/select/template.njk

@@ -0,0 +1,49 @@
+{% from 'govuk/components/select/macro.njk' import govukSelect %}
+
+{% set fieldErrors = params.casaErrors[params.name] %}
+
+{# Generate validation data- attributes #}
+{% set mergedAttributes = params.attributes or {} %}
+{% if fieldErrors %}
+  {% set mergedAttributes = mergeObjects(mergedAttributes, {
+    'data-validation': {fn: params.name, va: fieldErrors[0].validator} | dump
+  }) %}
+{% endif %}
+
+{# Add selected flag to chosen item #}
+{% set mergedItems = [] %}
+{% for item in params.items %}
+  {% set item = mergeObjects({
+    attributes: {
+      'data-ga-question': params.label.text or params.label.html,
+      'data-ga-answer': item.text or item.html
+    }
+  } if params.casaWithAnalytics else {}, item, {
+    selected: true if item.selected or item.value == params.casaValue else false
+  }) %}
+  {% set mergedItems = (mergedItems.push(item), mergedItems) %}
+{% endfor %}
+
+{# Merge parameters #}
+{% set mergedParams = mergeObjects(params, {
+  id: params.id if params.id else 'f-' + params.name,
+  attributes: mergedAttributes,
+  items: mergedItems,
+  errorMessage: {
+    text: t(params.casaErrors[params.name][0].inline, params.casaErrors[params.name][0].variables),
+    attributes: {
+      'data-ga-question': params.label.text or params.label.html | striptags
+    } if params.casaWithAnalytics else {}
+  } if params.casaErrors[params.name].length
+}) %}
+
+{# Ensure that the first item has the id matching `f-<name>` in order for error summary linkage to work
+{% if not mergedParams.items[0].id %}
+  {% set mergedParams = mergeObjects(mergedParams, {
+    items: [{
+      id: 'f-' + params.name
+    }]
+  }) %}
+{% endif %} #}
+
+{{ govukSelect(mergedParams) }}

package/views/casa/components/textarea/README.md

@@ -19,3 +19,12 @@ casaGovukTextarea({
   casaErrors: formErrors
 })
 ```
+## Google Tag Manager
+
+The following attributes will be attached to the error `<p>` tag if `casaWithAnalytics` is `true`:
+
+* `data-ga-question`: Holds the fieldset label's text content after removing all html tags
+
+These are the conventions used by DWP.
+
+> **IMPORTANT:** DO NOT ENABLE this option if the question or answer may contain personally-identifiable information as values will be pushed to Google

package/views/casa/components/textarea/template.njk

@@ -1,4 +1,4 @@
-{% from "govuk/components/textarea/macro.njk" import govukTextarea %}
+{% from 'govuk/components/textarea/macro.njk' import govukTextarea %}
 
 {% set fieldErrors = params.casaErrors[params.name] %}
 
@@ -10,11 +10,15 @@
   }) %}
 {% endif %}
 
+{# Merge parameters #}
 {% set mergedParams = mergeObjects(params, {
   id: params.id if params.id else 'f-' + params.name,
   attributes: mergedAttributes,
   errorMessage: {
-    text: t(params.casaErrors[params.name][0].inline, params.casaErrors[params.name][0].variables)
+    text: t(params.casaErrors[params.name][0].inline, params.casaErrors[params.name][0].variables),
+    attributes: {
+      'data-ga-question': params.label.text or params.label.html | striptags
+    } if params.casaWithAnalytics else {}
   } if params.casaErrors[params.name].length
 }) %}
 

package/views/casa/layouts/journey.njk

@@ -22,7 +22,7 @@
 
 {# Use `casaPageTitle` instead of `pageTitle` if you want CASA to automatically prefix with `Error` when appropriate #}
 {% block pageTitle -%}
-  {{- t("error:documentTtlePrefix") if formErrors -}}
+  {{- t("error:documentTitlePrefix") if formErrors -}}
   {% block casaPageTitle %}{% endblock %}
 {%- endblock %}