Remove unused activity query from patient session urls

Author: paulrobertlloyd

app/controllers/patient-session.js

@@ -22,7 +22,6 @@ export const patientSessionController = {
   read(request, response, next, nhsn) {
     const { account } = request.app.locals
     const { programme_id, session_id } = request.params
-    const { activity } = request.query
     const { __ } = response.locals
 
     const patientSession = PatientSession.findAll(request.session.data)
@@ -127,27 +126,20 @@ export const patientSessionController = {
           icon: 'tick'
         }),
         text: patientSession.programme.name,
-        href: activity
-          ? `${patientSession.uri}?activity=${activity}`
-          : patientSession.uri,
+        href: patientSession.uri,
         current:
           view !== 'events' && patientSession.programme_id === programme_id
       })),
       ...[
         {
           text: __('patientSession.events.title'),
-          href: activity
-            ? `${patientSession.uri}/events?activity=${activity}`
-            : `${patientSession.uri}/events`,
+          href: `${patientSession.uri}/events`,
           current: view === 'events'
         }
       ]
     ]
 
-    response.locals.activity = activity
-    response.locals.referrer = activity
-      ? `${patientSession.uri}?activity=${activity}`
-      : patientSession.uri
+    response.locals.referrer = patientSession.uri
     response.locals.patientProgramme = patientProgramme
     response.locals.patientSession = patientSession
     response.locals.patient = patient

app/controllers/reply.js

@@ -79,7 +79,7 @@ export const replyController = {
       const { account, invalidUuid } = request.app.locals
       const { reply_uuid } = request.params
       const { data } = request.session
-      const { __, activity, patientSession, triage } = response.locals
+      const { __, patientSession, triage } = response.locals
 
       let reply
       let next
@@ -90,7 +90,7 @@ export const replyController = {
         Reply.update(reply_uuid, request.body.reply, data)
       } else {
         reply = new Reply(Reply.findOne(reply_uuid, data.wizard), data)
-        next = `${patientSession.uri}?activity=${activity || 'consent'}`
+        next = patientSession.uri
 
         // Remove any parent details in reply if self consent
         if (reply.selfConsent) {
@@ -402,7 +402,7 @@ export const replyController = {
     const { note } = request.body.reply
     const { reply_uuid } = request.params
     const { data } = request.session
-    const { __, activity, patientSession } = response.locals
+    const { __, patientSession } = response.locals
 
     // Clean up session data
     delete data.reply
@@ -412,15 +412,15 @@ export const replyController = {
 
     request.flash('success', __(`reply.invalidate.success`, { reply }))
 
-    response.redirect(`${patientSession.uri}?activity=${activity || 'consent'}`)
+    response.redirect(patientSession.uri)
   },
 
   withdraw(request, response) {
     const { account } = request.app.locals
     const { refusalReason, refusalReasonOther, note } = request.body.reply
     const { reply_uuid } = request.params
     const { data } = request.session
-    const { __, activity, patientSession, reply } = response.locals
+    const { __, patientSession, reply } = response.locals
 
     // Create a new reply
     const newReply = Reply.create(
@@ -464,6 +464,6 @@ export const replyController = {
 
     request.flash('success', __(`reply.withdraw.success`, { reply }))
 
-    response.redirect(`${patientSession.uri}?activity=${activity || 'consent'}`)
+    response.redirect(patientSession.uri)
   }
 }

app/views/patient-session/_note.njk

@@ -26,7 +26,7 @@
   {{ button({
     text: __("patientSession.notes.new.confirm"),
     attributes: {
-      formaction: patientSession.uri + "/new/note?referrer=" + patientSession.uri + "/events?activity=" + activity
+      formaction: patientSession.uri + "/new/note?referrer=" + patientSession.uri + "/events"
     }
   }) }}
 {% endcall %}

app/views/session/activity.njk

@@ -85,7 +85,7 @@
             headingSize: "s",
             headingLevel: 4,
             clickable: not showRegistration,
-            href: patientSession.uri + "?activity=" + view
+            href: patientSession.uri
           }) %}
             {{ summaryList({
               rows: summaryRows(patientSession.patient, {