Merge pull request #11 from NHSDigital/d-01-remove-session-edit-interstitial

D-01: remove recurring session edit interstitial

Author: roobottom

app/routes/sessions.js

@@ -26,9 +26,6 @@ function sessions (router, shared) {
     if (!avail) return res.status(404).send('Availability not found')
     const draft = ensureSessionEditDraft(req, avail, req.params.date)
 
-    if (draft.isRecurring) {
-      return res.redirect(getSessionEditInfoHref(req.site.id, avail.id, req.params.date))
-    }
     if ((draft.affectedBookingIds || []).length > 0) {
       return res.redirect(`${getSessionEditInfoHref(req.site.id, avail.id, req.params.date)}/warning`)
     }
@@ -130,15 +127,8 @@ function sessions (router, shared) {
   router.get('/sites/:siteId/session/:availId/:date/edit', (req, res) => {
     const avail = req.site.availability.find(a => a.id === req.params.availId)
     if (!avail) return res.status(404).send('Availability not found')
-    const draft = ensureSessionEditDraft(req, avail, req.params.date)
-    if (!draft.isRecurring) return res.redirect(getSessionEditSummaryHref(req.site.id, avail.id, req.params.date))
-
-    res.render('sites/session-edit-info', {
-      site: req.site,
-      sessionLabel: avail.label,
-      date: req.params.date,
-      backHref: getSessionEditSummaryHref(req.site.id, avail.id, req.params.date)
-    })
+    ensureSessionEditDraft(req, avail, req.params.date)
+    res.redirect(getSessionEditSummaryHref(req.site.id, avail.id, req.params.date))
   })
 
   router.post('/sites/:siteId/session/:availId/:date/edit', (req, res) => {
@@ -297,7 +287,7 @@ function sessions (router, shared) {
       affectedCount: affected.length,
       affectedBookingRows,
       formAction: `${base}/warning`,
-      backHref: draft.isRecurring ? base : getSessionEditSummaryHref(site.id, req.params.availId, date)
+      backHref: getSessionEditSummaryHref(site.id, req.params.availId, date)
     })
   })
 
@@ -317,13 +307,11 @@ function sessions (router, shared) {
     res.render('sites/session-edit-success', {
       site: req.site,
       sessionLabel: sd.sessionLabel || 'Session',
-      parentLabel: sd.parentLabel || 'the recurring session',
       date: sd.date || req.params.date,
       bookingCount: sd.bookingCount || 0,
       bookingsChoice: sd.bookingsChoice || 'keep',
       contactableCount: sd.contactableCount || 0,
       uncontactableCount: sd.uncontactableCount || 0,
-      createdOneOff: !!sd.createdOneOff,
       notifyPageHref: `/sites/${req.site.id}/session/${req.params.availId}/${req.params.date}/edit/not-notified`
     })
   })

app/routes/shared/session-edit.js

@@ -220,7 +220,6 @@ function applySessionEditDraft (req, avail, draft) {
 
   let sessionLabel = avail.label
   const parentLabel = avail.label
-  let createdOneOff = false
 
   if (draft.isRecurring) {
     if (!avail.exceptions) avail.exceptions = []
@@ -239,7 +238,6 @@ function applySessionEditDraft (req, avail, draft) {
     }
     site.availability.push(newAvail)
     unaffected.forEach(b => { b.availabilityId = newAvail.id })
-    createdOneOff = true
   } else {
     avail.services = draft.services
     avail.slotLength = parseInt(draft.slotLength) || 15
@@ -267,16 +265,14 @@ function applySessionEditDraft (req, avail, draft) {
 
   req.session.data.sessionEditSuccess = {
     sessionLabel,
-    parentLabel,
     date,
     bookingCount: affected.length,
     bookingsChoice,
     contactableCount: contactable.length,
     uncontactableCount: uncontactable.length,
     uncontactablePeople: uncontactable.map(b => ({
       name: b.name, nhsNumber: b.nhsNumber, date: b.date, time: b.time, service: b.service
-    })),
-    createdOneOff
+    }))
   }
 
   delete req.session.data.sessionEditDraft

app/views/sites/session-edit-info.html

@@ -11,11 +11,7 @@
       <p>"{{ sessionLabel }}" on {{ date | formatDateLong }}</p>
     {% endcall %}
 
-    {% if createdOneOff %}
-      <p>A new one-off session has been created for {{ date | formatDateLong }}. The recurring session "{{ parentLabel }}" will skip this date going forward.</p>
-    {% else %}
-      <p>The one-off session for {{ date | formatDateLong }} has been updated.</p>
-    {% endif %}
+    <p>The session for {{ date | formatDateLong }} has been updated.</p>
 
     {% if bookingCount > 0 %}