Fix for regional UI of vaccines for an organisation (#402)

Author: frankieroberto

app/routes/regions.js

@@ -273,8 +273,12 @@ module.exports = router => {
     const organisation = data.organisations.find((org) => org.id === id)
     if (!organisation) { res.redirect('/regions/'); return }
 
-    const vaccines = organisation.vaccines || []
-    const vaccinesNotYetAdded = vaccines.filter((vaccine) => vaccine.status !== "enabled")
+    const organisationVaccines = organisation.vaccines || []
+    const vaccineEnabledNames = organisationVaccines.filter((vaccine) => vaccine.status === "enabled").map((vaccine) => vaccine.name)
+
+    const allVaccines = data.vaccines
+
+    const vaccinesNotYetAdded = allVaccines.filter((vaccine) => !vaccineEnabledNames.includes(vaccine.name))
 
     res.render('regions/add-vaccines', {
       organisation,
@@ -293,10 +297,20 @@ module.exports = router => {
 
     const vaccines = organisation.vaccines || []
 
-    for (vaccine of vaccines) {
-      if (vaccinesToAdd.includes(vaccine.name)) {
-        vaccine.status = "enabled"
+    for (vaccineToAdd of vaccinesToAdd) {
+
+      const existingVaccine = vaccines.find((vaccine) => vaccine.name === vaccineToAdd)
+
+      if (existingVaccine) {
+        existingVaccine.status = "enabled"
+      } else {
+
+        vaccines.push({
+          name: vaccineToAdd,
+          status: "enabled"
+        })
       }
+
     }
 
     res.redirect(`/regions/organisations/${id}`)

app/views/regions/organisation.html

@@ -31,14 +31,14 @@ <h1 class="nhsuk-heading-l">{{ organisation.name }}</h1>
       {% else  %}
 
         <p>They can record
-          {% if (vaccinesEnabled | length) == 4 %}
+          {% if (vaccinesEnabled | length) == (data.vaccines | length) %}
             all
           {% else %}
             {{ vaccinesEnabled | sort(false, false, "name") | pluck("name") | formatList }}
           {% endif %}
         vaccinations.
 
-          {% if (vaccinesEnabled | length) < 4 %}
+          {% if (vaccinesEnabled | length) < (data.vaccines | length) %}
             <a href="/regions/organisations/{{organisation.id}}/add-vaccines">Add vaccines<span class="nhsuk-u-visually-hidden"></span></a>
           {% endif %}
         </p>