Move regions views out from v1 folder (#290)

Maintaining multiple versions of the interface has proven to be
impractical.

Author: frankieroberto

app/routes/regions.js

@@ -1,28 +1,28 @@
 module.exports = router => {
 
-  router.get('/regions/v1', (req, res) => {
+  router.get('/regions', (req, res) => {
     const data = req.session.data
     const organisations = data.organisations.filter((organisation) => (organisation.region === "Y61") && (organisation.status != "Closed"))
 
     const closedOrganisationsCount = data.organisations.filter((organisation) => (organisation.region === "Y61" && organisation.status == "Closed")).length
 
-    res.render('regions/v1/index', {
+    res.render('regions/index', {
       organisations,
       closedOrganisationsCount
     })
   })
 
-  router.get('/regions/v1/organisations/closed', (req, res) => {
+  router.get('/regions/organisations/closed', (req, res) => {
     const data = req.session.data
     const organisations = data.organisations.filter((organisation) => (organisation.region === "Y61" && organisation.status == "Closed"))
 
-    res.render('regions/v1/closed-organisations', {
+    res.render('regions/closed-organisations', {
       organisations
     })
   })
 
   // Inviting an organisation
-  router.post('/regions/v1/add', (req, res) => {
+  router.post('/regions/add', (req, res) => {
 
     const organisationCode = req.session.data.organisationCode
     const addedUserId = Math.floor(Math.random() * 10000000).toString()
@@ -78,10 +78,10 @@ module.exports = router => {
     req.session.data.firstName = ''
     req.session.data.lastName = ''
 
-    res.redirect('/regions/v1/organisations/' + organisationCode)
+    res.redirect('/regions/organisations/' + organisationCode)
   })
 
-  router.get('/regions/v1/organisation-details', (req, res) => {
+  router.get('/regions/organisation-details', (req, res) => {
     const organisationCode = req.session.data.organisationCode
 
     let organisationName, organisationLine1, organisationTown, organisationPostcode, organisationType, legallyClosed
@@ -114,12 +114,12 @@ module.exports = router => {
       legallyClosed: legallyClosed
     }
 
-    res.render('regions/v1/organisation-details', {
+    res.render('regions/organisation-details', {
       organisation
     })
   })
 
-  router.get('/regions/v1/add-email', (req, res) => {
+  router.get('/regions/add-email', (req, res) => {
     const organisationCode = req.session.data.organisationCode
 
     let organisationName, organisationLine1, organisationTown, organisationPostcode, organisationType
@@ -149,12 +149,12 @@ module.exports = router => {
       }
     }
 
-    res.render('regions/v1/add-email', {
+    res.render('regions/add-email', {
       organisation
     })
   })
 
-  router.get('/regions/v1/check-and-send', (req, res) => {
+  router.get('/regions/check-and-send', (req, res) => {
     const organisationCode = req.session.data.organisationCode
 
     let organisationName, organisationLine1, organisationTown, organisationPostcode, organisationType
@@ -184,16 +184,16 @@ module.exports = router => {
       }
     }
 
-    res.render('regions/v1/check-and-send', {
+    res.render('regions/check-and-send', {
       organisation
     })
   })
 
   // Inviting a second lead user for an organisation
-  router.post('/regions/v1/organisations/:id/add', (req, res) => {
+  router.post('/regions/organisations/:id/add', (req, res) => {
     const data = req.session.data
     const organisation = data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
     const addedUserId = Math.floor(Math.random() * 10000000).toString()
 
@@ -218,141 +218,141 @@ module.exports = router => {
     req.session.data.firstName = ''
     req.session.data.lastName = ''
 
-    res.redirect('/regions/v1/organisations/' + organisation.id)
+    res.redirect('/regions/organisations/' + organisation.id)
   })
 
   // Viewing an organisation
-  router.get('/regions/v1/organisations/:id', (req, res) => {
+  router.get('/regions/organisations/:id', (req, res) => {
     const data = req.session.data
     const id = req.params.id
     const organisation = data.organisations.find((org) => org.id === id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
     const users = data.users.filter((user) => (user.organisations || []).find((organisation) => organisation.id === id))
 
 
-    res.render('regions/v1/organisation', {
+    res.render('regions/organisation', {
       organisation,
       users
     })
   })
 
   // Delete an organisation confirmation page
-  router.get('/regions/v1/organisations/:id/delete', (req, res) => {
+  router.get('/regions/organisations/:id/delete', (req, res) => {
     const organisation = req.session.data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
-    res.render('regions/v1/delete-organisation', {
+    res.render('regions/delete-organisation', {
       organisation
     })
   })
 
   // Deleting an organisation
-  router.post('/regions/v1/organisations/:id/deleted', (req, res) => {
+  router.post('/regions/organisations/:id/deleted', (req, res) => {
     const organisation = req.session.data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
     // Remove organisation
     req.session.data.organisations.splice(req.session.data.organisations.indexOf(organisation), 1)
 
-    res.redirect('/regions/v1')
+    res.redirect('/regions')
   })
 
   // Add another lead user to an organisation form
-  router.get('/regions/v1/organisations/:id/add-email', (req, res) => {
+  router.get('/regions/organisations/:id/add-email', (req, res) => {
     const data = req.session.data
     const organisation = data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
-    res.render('regions/v1/add-another-email', {
+    res.render('regions/add-another-email', {
       organisation
     })
   })
 
   // Deactivate an organisation
-  router.get('/regions/v1/organisations/:id/deactivate', (req, res) => {
+  router.get('/regions/organisations/:id/deactivate', (req, res) => {
     const data = req.session.data
     const organisation = data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
-    res.render('regions/v1/deactivate', {
+    res.render('regions/deactivate', {
       organisation
     })
   })
 
   // Deactivating an organisation
-  router.post('/regions/v1/organisations/:id/deactivated', (req, res) => {
+  router.post('/regions/organisations/:id/deactivated', (req, res) => {
     const organisation = req.session.data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
     organisation.status = "Deactivated"
 
-    res.redirect('/regions/v1/organisations/' + organisation.id)
+    res.redirect('/regions/organisations/' + organisation.id)
   })
 
   // Reactivate an organisation
-  router.get('/regions/v1/organisations/:id/reactivate', (req, res) => {
+  router.get('/regions/organisations/:id/reactivate', (req, res) => {
     const data = req.session.data
     const organisation = data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
-    res.render('regions/v1/reactivate', {
+    res.render('regions/reactivate', {
       organisation
     })
   })
 
   // Reactivating an organisation
-  router.post('/regions/v1/organisations/:id/reactivated', (req, res) => {
+  router.post('/regions/organisations/:id/reactivated', (req, res) => {
     const organisation = req.session.data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
     organisation.status = "Active"
 
-    res.redirect('/regions/v1/organisations/' + organisation.id)
+    res.redirect('/regions/organisations/' + organisation.id)
   })
 
 
   // Check a second lead user for an organisation
-  router.get('/regions/v1/organisations/:id/add-email-check', (req, res) => {
+  router.get('/regions/organisations/:id/add-email-check', (req, res) => {
     const data = req.session.data
     const organisation = data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
-    res.render('regions/v1/add-another-email-check', {
+    res.render('regions/add-another-email-check', {
       organisation
     })
   })
 
   // Uninvite page for a user
-  router.get('/regions/v1/organisations/:id/users/:userId/uninvite', (req, res) => {
+  router.get('/regions/organisations/:id/users/:userId/uninvite', (req, res) => {
     const data = req.session.data
     const organisation = data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
     const user = data.users.find((user) => user.id === req.params.userId)
 
     const userOrganisationSettings = (user.organisations || []).find((organisation) => organisation.id === organisation.id)
 
-    // if (!user || userOrganisationSettings.status == 'Active') { res.redirect(`/regions/v1/organisations/${organisation.id}`); return }
+    // if (!user || userOrganisationSettings.status == 'Active') { res.redirect(`/regions/organisations/${organisation.id}`); return }
 
     const numberOfActiveUsers = data.users.filter((user) => (user.organisations || []).find((orgSetting) => (orgSetting.id === organisation.id ) && (orgSetting.status === 'Active'))).length
 
-    res.render('regions/v1/uninvite', {
+    res.render('regions/uninvite', {
       organisation,
       user,
       numberOfActiveUsers
     })
   })
 
   // Uninvite a user
-  router.post('/regions/v1/organisations/:id/users/:userId/uninvited', (req, res) => {
+  router.post('/regions/organisations/:id/users/:userId/uninvited', (req, res) => {
     const data = req.session.data
     const { id, userId } = req.params;
     const organisation = data.organisations.find((org) => org.id === req.params.id)
-    if (!organisation) { res.redirect('/regions/v1/'); return }
+    if (!organisation) { res.redirect('/regions/'); return }
 
     const user = data.users.find((user) => user.id === userId)
-    if (!user) { res.redirect(`/regions/v1/organisations/${organisation.id}`); return }
+    if (!user) { res.redirect(`/regions/organisations/${organisation.id}`); return }
 
     const organisationSetting = user.organisations.find((org) => org.id === id)
 
@@ -364,9 +364,9 @@ module.exports = router => {
     // Remove the organisation if no lead users are left
     if (numberOfUsersAtOrganisation === 0) {
       data.organisations.splice(data.organisations.indexOf(organisation), 1)
-      res.redirect('/regions/v1/')
+      res.redirect('/regions/')
     } else {
-      res.redirect('/regions/v1/organisations/' + organisation.id)
+      res.redirect('/regions/organisations/' + organisation.id)
     }
 
   })

app/views/index.html

@@ -49,7 +49,7 @@ <h2>Main interface</h2>
       <h2>Regions interface</h2>
 
       <ul>
-        <li><a href="/regions/v1">Regions interface</a></li>
+        <li><a href="/regions">Regions interface</a></li>
       </ul>
 
       <h2>Support interface</h2>

…/views/regions/v1/_email-deactivate.html app/views/regions/_email-deactivate.htmlapp/views/regions/v1/_email-deactivate.html renamed to app/views/regions/_email-deactivate.html app/views/regions/v1/_email-deactivate.html renamed to app/views/regions/_email-deactivate.html

@@ -10,7 +10,7 @@
 
 {% block beforeContent %}
   {{ backLink({
-    href: "/regions/v1/organisations/" + organisation.code + "/add-email",
+    href: "/regions/organisations/" + organisation.code + "/add-email",
     text: "Back"
   }) }}
 {% endblock %}
@@ -22,9 +22,9 @@ <h1 class="nhsuk-heading-xl">Check and send</h1>
 
       <p>This email will be sent to {{ data["email"] }}:</p>
 
-      {% include "regions/v1/_email-preview.html" %}
+      {% include "regions/_email-preview.html" %}
 
-      <form action="/regions/v1/organisations/{{ organisation.id }}/add" method="post">
+      <form action="/regions/organisations/{{ organisation.id }}/add" method="post">
         {{ button({
           "text": "Send invitation"
         }) }}

app/views/regions/v1/_email-preview.html app/views/regions/_email-preview.htmlapp/views/regions/v1/_email-preview.html renamed to app/views/regions/_email-preview.html

@@ -10,7 +10,7 @@
 
 {% block beforeContent %}
   {{ backLink({
-    href: "/regions/v1/organisations/" + organisation.id,
+    href: "/regions/organisations/" + organisation.id,
     text: "Back"
   }) }}
 {% endblock %}
@@ -25,7 +25,7 @@ <h1 class="nhsuk-heading-l">Add another user</h1>
 
       <p>They will also be able to set up and add their organisation’s users and vaccination sites.</p>
 
-      <form action="/regions/v1/organisations/{{ organisation.id }}/add-email-check" method="post" novalidate>
+      <form action="/regions/organisations/{{ organisation.id }}/add-email-check" method="post" novalidate>
 
         {{ input({
           "label": {

…/views/regions/v1/_email-reactivate.html app/views/regions/_email-reactivate.htmlapp/views/regions/v1/_email-reactivate.html renamed to app/views/regions/_email-reactivate.html app/views/regions/v1/_email-reactivate.html renamed to app/views/regions/_email-reactivate.html

@@ -10,7 +10,7 @@
 
 {% block beforeContent %}
   {{ backLink({
-    href: "/regions/v1/organisation-details",
+    href: "/regions/organisation-details",
     text: "Back"
   }) }}
 {% endblock %}
@@ -26,7 +26,7 @@ <h1 class="nhsuk-heading-l">Add a user</h1>
 
       <p>It’s their responsibility to set up and add their organisation’s users and vaccination sites.</p>
 
-      <form action="/regions/v1/check-and-send" method="post" novalidate>
+      <form action="/regions/check-and-send" method="post" novalidate>
 
         {{ input({
           "label": {

…/regions/v1/add-another-email-check.html …ews/regions/add-another-email-check.htmlapp/views/regions/v1/add-another-email-check.html renamed to app/views/regions/add-another-email-check.html app/views/regions/v1/add-another-email-check.html renamed to app/views/regions/add-another-email-check.html

@@ -10,7 +10,7 @@
 
 {% block beforeContent %}
   {{ backLink({
-    href: "/regions/v1",
+    href: "/regions",
     text: "Back"
   }) }}
 {% endblock %}
@@ -22,7 +22,7 @@
 
       <h1 class="nhsuk-heading-xl">Find an organisation to invite</h1>
 
-      <form action="/regions/v1/organisation-details" method="post">
+      <form action="/regions/organisation-details" method="post">
 
       <div class="nhsuk-form-group">
         <h1 class="nhsuk-label-wrapper">