PI-2152: Default to team when 1 team and add links when no team (#68)

ministryofjustice · May 7, 2024 · ae2f445 · ae2f445
1 parent b66895d
commit ae2f445
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 55 deletions.
diff --git a/integration_tests/pages/index.ts b/integration_tests/pages/index.ts
@@ -2,7 +2,7 @@ import Page, { PageElement } from './page'
 
 export default class IndexPage extends Page {
   constructor() {
-    super('Manage a Supervision')
+    super('Your cases')
   }
 
   headerUserName = (): PageElement => cy.get('[data-qa=header-user-name]')

diff --git a/server/@types/express/index.d.ts b/server/@types/express/index.d.ts
@@ -33,6 +33,7 @@ export declare global {
     interface MasData {
       provider?: string
       team?: string
+      teamCount: number
     }
   }
 }
diff --git a/server/routes/case.ts b/server/routes/case.ts
@@ -10,6 +10,10 @@ import TierApiClient from '../data/tierApiClient'
 export default function caseRoutes(router: Router, { hmppsAuthClient }: Services) {
   const get = (path: string | string[], handler: RequestHandler) => router.get(path, asyncMiddleware(handler))
 
+  get('/', async (_req, res, _next) => {
+    res.redirect('/case')
+  })
+
   get('/case/:crn', async (req, res, _next) => {
     const { crn } = req.params
     const token = await hmppsAuthClient.getSystemClientToken(res.locals.user.username)

diff --git a/server/routes/caseload.ts b/server/routes/caseload.ts
@@ -39,19 +39,32 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv
     const masClient = new MasApiClient(token)
 
     if (req.session.mas === undefined || req.session.mas.team === undefined) {
-      req.session.mas = {}
-      await auditService.sendAuditMessage({
-        action: 'VIEW_MAS_TEAMS',
-        who: res.locals.user.username,
-        subjectId: res.locals.user.username,
-        subjectType: 'USER',
-        correlationId: v4(),
-        service: 'hmpps-manage-a-supervision-ui',
-      })
       const userTeams = await masClient.getUserTeams(res.locals.user.username)
-      res.render('pages/caseload/select-team', {
-        userTeams,
-      })
+      req.session.mas = { teamCount: userTeams.teams.length }
+      switch (userTeams.teams.length) {
+        case 1: {
+          req.session.mas.team = userTeams.teams[0].code
+          res.redirect(`/team/case`)
+          break
+        }
+        case 0: {
+          res.redirect(`/team/case`)
+          break
+        }
+        default: {
+          await auditService.sendAuditMessage({
+            action: 'VIEW_MAS_TEAMS',
+            who: res.locals.user.username,
+            subjectId: res.locals.user.username,
+            subjectType: 'USER',
+            correlationId: v4(),
+            service: 'hmpps-manage-a-supervision-ui',
+          })
+          res.render('pages/caseload/select-team', {
+            userTeams,
+          })
+        }
+      }
     } else {
       res.redirect(`/team/case`)
     }
@@ -80,10 +93,11 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv
   get('/team/case', async (req, res, _next) => {
     const token = await hmppsAuthClient.getSystemClientToken(res.locals.user.username)
     const masClient = new MasApiClient(token)
-    if (req.session.mas === undefined || req.session.mas.team === undefined) {
+    if (req.session.mas === undefined || (req.session.mas.teamCount > 0 && req.session.mas.team === undefined)) {
       res.redirect('/teams')
     } else {
       const teamCode = req.session.mas.team
+      const { teamCount } = req.session.mas
       await auditService.sendAuditMessage({
         action: 'VIEW_MAS_CASELOAD_TEAM',
         who: res.locals.user.username,
@@ -94,7 +108,10 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv
       })
       const pageNum: number = req.query.page ? Number.parseInt(req.query.page as string, 10) : 1
       const currentNavSection = 'teamCases'
-      const caseload = await masClient.getTeamCaseload(teamCode, (pageNum - 1).toString())
+      const caseload =
+        teamCount > 0
+          ? await masClient.getTeamCaseload(teamCode, (pageNum - 1).toString())
+          : { totalPages: 0, totalElements: 0, pageSize: 0 }
 
       const pagination: Pagination = getPaginationLinks(
         req.query.page ? Number.parseInt(req.query.page as string, 10) : 1,
@@ -107,14 +124,14 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv
         pagination,
         caseload,
         currentNavSection,
+        teamCount,
       })
     }
   })
 
   post('/team/case', async (req, res, _next) => {
     const token = await hmppsAuthClient.getSystemClientToken(res.locals.user.username)
     const masClient = new MasApiClient(token)
-    req.session.mas.team = req.body['team-code']
     const errorMessages: ErrorMessages = {}
     if (req.body['team-code'] == null) {
       logger.info('Team not selected')
@@ -125,7 +142,8 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv
         userTeams,
       })
     } else {
-      res.redirect(`/team/case`)
+      req.session.mas.team = req.body['team-code']
+      res.redirect(`/teams`)
     }
   })
 }
diff --git a/server/routes/index.test.ts b/server/routes/index.test.ts
diff --git a/server/routes/index.ts b/server/routes/index.ts
@@ -2,7 +2,6 @@ import { Router } from 'express'
 
 import type { Services } from '../services'
 
-import startRoutes from './start'
 import searchRoutes from './search'
 import caseRoutes from './case'
 import personalDetailRoutes from './personalDetails'
@@ -15,7 +14,6 @@ import caseloadRoutes from './caseload'
 
 export default function routes(services: Services): Router {
   const router = Router()
-  startRoutes(router)
   searchRoutes(router, services)
   caseRoutes(router, services)
   personalDetailRoutes(router, services)

diff --git a/server/routes/start.ts b/server/routes/start.ts
diff --git a/server/views/pages/caseload/minimal-cases.njk b/server/views/pages/caseload/minimal-cases.njk
@@ -10,7 +10,9 @@
         <p data-qa="change-team">
             Showing:
             <span class="govuk-body govuk-!-font-weight-bold" data-qa="caseload-names">{{ caseload.team.description }}</span>
-            <a class="govuk-link govuk-!-margin-left-3" href="/change-team" data-qa="change-team-link">Change team</a>
+            {% if teamCount > 1 %}
+                <a class="govuk-link govuk-!-margin-left-3" href="/change-team" data-qa="change-team-link">Change team</a>
+            {% endif %}
         </p>
     </div>
     {% endif %}
@@ -48,6 +50,13 @@
           {{ govukPagination({ previous: { href: pagination.prev }, next: { href: pagination.next }, items: pagination.items }) }}
          {% endif %}
      {% else %}
-        <p>No cases to show</p>
+        {% if currentNavSection == 'teamCases' and teamCount == 0 %}
+            <p>You are not currently assigned to any team</p>
+        {% elseif currentNavSection == 'teamCases' and teamCount > 0 %}
+            <p>{{ caseload.team.description }} has not been allocated to any cases</p>
+        {% elseif currentNavSection == 'yourCases' %}
+            <p>You have not been allocated to any cases</p>
+        {% endif %}
+        <p><a href="/search" target="_blank">Find a person on probation</a></br>
      {% endif %}
 {% endblock %}