Swap use of global.booleanItems constant for a function call (#245)

malross · web-flow · commit f8e603e0fdf6 · 2026-04-02T10:37:39.000+01:00
Background is that there'd been an instance where a set of boolean items on one page in a journey had ended up recording values for boolean items on a completely separate page. It was like the latter had injected itself into the earlier page via the constant. Happened both locally and on Heroku.
diff --git a/app/globals.js b/app/globals.js
@@ -24,16 +24,6 @@ import {
 export default () => {
   const globals = {}
 
-  /**
-   * Get boolean form field items
-   *
-   * @returns {object} Form field items
-   */
-  globals.booleanItems = [
-    { text: 'Yes', value: true },
-    { text: 'No', value: false }
-  ]
-
   /**
    * Get boolean form field items
    *
diff --git a/app/views/book-into-a-clinic/form/extra-time.njk b/app/views/book-into-a-clinic/form/extra-time.njk
@@ -8,7 +8,7 @@
     label: { text: __("clinicBooking.extraTime.reason.label") },
     decorate: "appointment.extraTimeReason"
   }) %}
-  {% set items = injectConditionalHtml(booleanItems, true, yesHtml) %}
+  {% set items = injectConditionalHtml(getBooleanItems(), true, yesHtml) %}
 
   {{ radios({
     fieldset: {
diff --git a/app/views/parent/form/parent.njk b/app/views/parent/form/parent.njk
@@ -17,7 +17,7 @@
       legend: { text: __("consent.parent.hasParentalResponsibility.label") }
     },
     hint: { text: __("consent.parent.hasParentalResponsibility.hint") },
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "consent.parent.hasParentalResponsibility"
   }) %}
 
@@ -29,7 +29,7 @@
       legend: { text: __("consent.parent.hasParentalResponsibility.label") }
     },
     hint: { text: __("consent.parent.hasParentalResponsibility.hint") },
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "consent.parent.hasParentalResponsibility"
   }) %}
 
diff --git a/app/views/patient-session/_note.njk b/app/views/patient-session/_note.njk
@@ -19,7 +19,7 @@
     },
     hint: { text: __("event.pinned.hint") },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "pinned"
   }) }}
 
diff --git a/app/views/patient-session/_triage.njk b/app/views/patient-session/_triage.njk
@@ -62,7 +62,7 @@
     {% set psdRadiosHtml = radios({
       fieldset: { legend: { text: __("triage.psd.label") } },
       inline: true,
-      items: booleanItems,
+      items: getBooleanItems(),
       decorate: "triage.psd"
     }) if account.canPrescribe %}
 
diff --git a/app/views/patient-session/form/gillick.njk b/app/views/patient-session/form/gillick.njk
@@ -18,7 +18,7 @@
       legend: { text: __("patientSession.gillick.q1.label") }
     },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "patientSession.gillick.q1"
   }) }}
 
@@ -27,7 +27,7 @@
       legend: { text: __("patientSession.gillick.q2.label") }
     },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "patientSession.gillick.q2"
   }) }}
 
@@ -36,7 +36,7 @@
       legend: { text: __("patientSession.gillick.q3.label") }
     },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "patientSession.gillick.q3"
   }) }}
 
@@ -45,7 +45,7 @@
       legend: { text: __("patientSession.gillick.q4.label") }
     },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "patientSession.gillick.q4"
   }) }}
 
@@ -54,7 +54,7 @@
       legend: { text: __("patientSession.gillick.q5.label") }
     },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "patientSession.gillick.q5"
   }) }}
 
diff --git a/app/views/patient-session/form/triage.njk b/app/views/patient-session/form/triage.njk
@@ -11,7 +11,7 @@
   {% set psdRadiosHtml = radios({
     fieldset: { legend: { text: __("triage.psd.label") } },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "triage.psd"
   }) if account.canPrescribe %}
 
diff --git a/app/views/reply/form/decision.njk b/app/views/reply/form/decision.njk
@@ -29,7 +29,7 @@
               }
             },
             hint: { text: __("reply.alternative.hint") },
-            items: booleanItems,
+            items: getBooleanItems(),
             decorate: "reply.alternative"
           })
         } if programme.alternativeVaccine
diff --git a/app/views/reply/form/follow-up.njk b/app/views/reply/form/follow-up.njk
@@ -40,7 +40,7 @@
         text: __("reply.follow-up.decision.label")
       }
     },
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "decision"
   }) }}
 {% endblock %}
diff --git a/app/views/reply/form/notify-parent.njk b/app/views/reply/form/notify-parent.njk
@@ -12,7 +12,7 @@
         })
       }
     },
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "reply.parent.notify"
   }) }}
 {% endblock %}
diff --git a/app/views/reply/form/outcome.njk b/app/views/reply/form/outcome.njk
@@ -19,7 +19,7 @@
       legend: { text: __("reply.confirmed.label") }
     },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "reply.confirmed"
   }) }}
 {% endblock %}
diff --git a/app/views/reply/form/refusal-notification.njk b/app/views/reply/form/refusal-notification.njk
@@ -13,7 +13,7 @@
         })
       }
     },
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "reply.parent.notify"
   }) }}
 {% endblock %}
diff --git a/app/views/reply/form/triage.njk b/app/views/reply/form/triage.njk
@@ -11,7 +11,7 @@
   {% set psdRadiosHtml = radios({
     fieldset: { legend: { text: __("triage.psd.label") } },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "triage.psd"
   }) if account.canPrescribe %}
 
diff --git a/app/views/school/form/confirm-school.njk b/app/views/school/form/confirm-school.njk
@@ -25,7 +25,7 @@
     fieldset: {
       legend: { text: __("school.confirm-school.label") }
     },
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "confirmSchool"
   }) }}
 {% endblock %}
diff --git a/app/views/school/form/sen.njk b/app/views/school/form/sen.njk
@@ -13,7 +13,7 @@
         })
       }
     },
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "school.sen"
   }) }}
 {% endblock %}
diff --git a/app/views/session/form/registration.njk b/app/views/session/form/registration.njk
@@ -13,7 +13,7 @@
         })
       }
     },
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "session.registration"
   }) }}
 {% endblock %}
diff --git a/app/views/team/form/sessions.njk b/app/views/team/form/sessions.njk
@@ -48,7 +48,7 @@
       }
     },
     inline: true,
-    items: booleanItems,
+    items: getBooleanItems(),
     decorate: "team.sessionRegistration"
   }) }}
 {% endblock %}
diff --git a/app/views/vaccination/form/variant.njk b/app/views/vaccination/form/variant.njk
@@ -2,7 +2,7 @@
 
 {% if vaccination.outcome != VaccinationOutcome.AlreadyVaccinated %}
   {% set title = __("vaccination.variant.title", { patient: vaccination.patient }) %}
-  {% set items = booleanItems %}
+  {% set items = getBooleanItems() %}
 {% else %}
   {% set title = __("vaccination.programme.title", { patient: vaccination.patient }) %}
   {% set items = [{

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`}`
`30`	`30`	`},`
`31`	`31`	`hint: { text: __("reply.alternative.hint") },`
`32`		`- items: booleanItems,`
	`32`	`+ items: getBooleanItems(),`
`33`	`33`	`decorate: "reply.alternative"`
`34`	`34`	`})`
`35`	`35`	`} if programme.alternativeVaccine`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`text: __("reply.follow-up.decision.label")`
`41`	`41`	`}`
`42`	`42`	`},`
`43`		`- items: booleanItems,`
	`43`	`+ items: getBooleanItems(),`
`44`	`44`	`decorate: "decision"`
`45`	`45`	`}) }}`
`46`	`46`	`{% endblock %}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`})`
`13`	`13`	`}`
`14`	`14`	`},`
`15`		`- items: booleanItems,`
	`15`	`+ items: getBooleanItems(),`
`16`	`16`	`decorate: "reply.parent.notify"`
`17`	`17`	`}) }}`
`18`	`18`	`{% endblock %}`