Merge branch 'main' into update-api-types-1700648959

server/@types/shared/index.d.ts

@@ -237,5 +237,6 @@ export type { User } from './models/User';
 export type { UserQualification } from './models/UserQualification';
 export type { UserRolesAndQualifications } from './models/UserRolesAndQualifications';
 export type { UserSortField } from './models/UserSortField';
+export type { UserWithWorkload } from './models/UserWithWorkload';
 export type { ValidationError } from './models/ValidationError';
 export type { WithdrawalReason } from './models/WithdrawalReason';

server/@types/shared/models/ExternalUser.ts

@@ -6,6 +6,8 @@
 export type ExternalUser = {
     id: string;
     username: string;
+    name: string;
+    email: string;
     origin?: string;
 };
 

server/@types/shared/models/TemporaryAccommodationPremisesSummary.ts

@@ -7,6 +7,7 @@ import type { PremisesSummary } from './PremisesSummary';
 
 export type TemporaryAccommodationPremisesSummary = (PremisesSummary & {
     pdu?: string;
+    localAuthorityAreaName?: string;
 } & {
     pdu: string;
 });

server/@types/shared/models/UserWithWorkload.ts

@@ -0,0 +1,17 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { ApprovedPremisesUserRole } from './ApprovedPremisesUserRole';
+import type { User } from './User';
+import type { UserQualification } from './UserQualification';
+
+export type UserWithWorkload = (User & {
+    numAssessmentsPending?: number;
+    numAssessmentsCompleted7Days?: number;
+    numAssessmentsCompleted30Days?: number;
+    qualifications?: Array<UserQualification>;
+    roles?: Array<ApprovedPremisesUserRole>;
+});
+

server/controllers/landingController.test.ts

@@ -8,7 +8,6 @@ import { userFactory } from '../testutils/factories'
 import { UnauthorizedError } from '../utils/errors'
 import { isApplyEnabledForUser } from '../utils/userUtils'
 import LandingController from './landingController'
-import { TemporaryAccommodationUserRole } from '../@types/shared'
 
 jest.mock('../utils/userUtils', () => {
   const module = jest.requireActual('../utils/userUtils')
@@ -97,7 +96,7 @@ describe('LandingController', () => {
       const response: DeepMocked<Response> = createMock<Response>({
         locals: {
           user: userFactory.build({
-            roles: ['reporter' as TemporaryAccommodationUserRole],
+            roles: ['reporter'],
           }),
         },
       })

server/controllers/staticController.test.ts

@@ -23,6 +23,15 @@ describe('StaticController', () => {
     })
   })
 
+  describe('accessibility statement', () => {
+    it('should render the page', () => {
+      const requestHandler = staticController.accessibilityStatement()
+      requestHandler(request, response, next)
+
+      expect(response.render).toHaveBeenCalledWith('temporary-accommodation/static/accessibilityStatement')
+    })
+  })
+
   describe('useNDelius', () => {
     it('should render the disabled-region page', () => {
       const requestHandler = staticController.useNDelius()

server/controllers/staticController.ts

@@ -7,6 +7,12 @@ export default class StaticController {
     }
   }
 
+  accessibilityStatement(): RequestHandler {
+    return (_req: Request, res: Response) => {
+      res.render('temporary-accommodation/static/accessibilityStatement')
+    }
+  }
+
   useNDelius(): RequestHandler {
     return (_req: Request, res: Response) => {
       res.render('temporary-accommodation/static/useNDelius')

server/controllers/temporary-accommodation/manage/reportsController.test.ts

@@ -9,7 +9,6 @@ import extractCallConfig from '../../../utils/restUtils'
 import { filterProbationRegions } from '../../../utils/userUtils'
 import { getYearsSince, monthsArr } from '../../../utils/dateUtils'
 import { catchValidationErrorOrPropogate, fetchErrorsAndUserInput, insertGenericError } from '../../../utils/validation'
-import { TemporaryAccommodationUserRole } from '../../../@types/shared'
 
 jest.mock('../../../utils/validation')
 jest.mock('../../../utils/restUtils')
@@ -108,7 +107,7 @@ describe('ReportsController', () => {
         ;(getYearsSince as jest.Mock).mockReturnValue([])
 
         response = createMock<Response>({
-          locals: { user: userFactory.build({ roles: ['reporter' as TemporaryAccommodationUserRole] }) },
+          locals: { user: userFactory.build({ roles: ['reporter'] }) },
         })
 
         await requestHandler(request, response, next)

server/form-pages/apply/accommodation-need/eligibility/eligibilityReason.ts

@@ -1,4 +1,4 @@
-import { ApprovedPremisesApplication as Application } from '@approved-premises/api'
+import { TemporaryAccommodationApplication as Application } from '@approved-premises/api'
 import type { TaskListErrors } from '@approved-premises/ui'
 import { Page } from '../../../utils/decorators'
 

server/form-pages/apply/assess-placement-risks-and-needs/behaviour-in-cas/previousStaysDetails.ts

@@ -1,4 +1,4 @@
-import { ApprovedPremisesApplication as Application } from '@approved-premises/api'
+import { TemporaryAccommodationApplication as Application } from '@approved-premises/api'
 import type { TaskListErrors } from '@approved-premises/ui'
 import { Page } from '../../../utils/decorators'
 

server/form-pages/apply/assess-placement-risks-and-needs/licence-conditions/additionalLicenceConditions.ts

@@ -1,4 +1,4 @@
-import { ApprovedPremisesApplication as Application } from '@approved-premises/api'
+import { TemporaryAccommodationApplication as Application } from '@approved-premises/api'
 import type { TaskListErrors } from '@approved-premises/ui'
 import { Page } from '../../../utils/decorators'
 

server/form-pages/apply/assess-placement-risks-and-needs/prison-information/acctAlerts.ts

@@ -1,4 +1,4 @@
-import type { ApprovedPremisesApplication, PersonAcctAlert } from '@approved-premises/api'
+import type { TemporaryAccommodationApplication as Application, PersonAcctAlert } from '@approved-premises/api'
 import type { DataServices, PageResponse } from '@approved-premises/ui'
 import { CallConfig } from '../../../../data/restClient'
 import { DateFormats } from '../../../../utils/dateUtils'
@@ -32,12 +32,12 @@ export default class AcctAlerts implements TasklistPage {
 
   constructor(
     readonly body: Partial<AcctAlertsBody>,
-    readonly application: ApprovedPremisesApplication,
+    readonly application: Application,
   ) {}
 
   static async initialize(
     _: Record<string, unknown>,
-    application: ApprovedPremisesApplication,
+    application: Application,
     callConfig: CallConfig,
     dataServices: DataServices,
   ) {

server/form-pages/apply/assess-placement-risks-and-needs/prison-information/adjudications.ts

@@ -1,4 +1,4 @@
-import type { Adjudication, ApprovedPremisesApplication } from '@approved-premises/api'
+import type { Adjudication, TemporaryAccommodationApplication as Application } from '@approved-premises/api'
 import type { DataServices, PageResponse } from '@approved-premises/ui'
 import { CallConfig } from '../../../../data/restClient'
 import { DateFormats } from '../../../../utils/dateUtils'
@@ -34,12 +34,12 @@ export default class Adjudications implements TasklistPage {
 
   constructor(
     readonly body: Partial<AdjudicationsBody>,
-    readonly application: ApprovedPremisesApplication,
+    readonly application: Application,
   ) {}
 
   static async initialize(
     _: Record<string, unknown>,
-    application: ApprovedPremisesApplication,
+    application: Application,
     callConfig: CallConfig,
     dataServices: DataServices,
   ) {

server/form-pages/apply/requirements-for-placement/disability-cultural-and-specific-needs/needs.ts

@@ -1,4 +1,4 @@
-import { ApprovedPremisesApplication as Application } from '@approved-premises/api'
+import { TemporaryAccommodationApplication as Application } from '@approved-premises/api'
 import type { TaskListErrors } from '@approved-premises/ui'
 import { Page } from '../../../utils/decorators'
 

server/middleware/userCheckMiddleware.test.ts

@@ -2,7 +2,7 @@ import { createMock } from '@golevelup/ts-jest'
 import { Request, Response } from 'express'
 import { userFactory } from '../testutils/factories'
 import { UnauthorizedError } from '../utils/errors'
-import { TemporaryAccommodationUserRole, TemporaryAccommodationUser as User } from '../@types/shared'
+import { TemporaryAccommodationUser as User } from '../@types/shared'
 import { createUserCheckMiddleware, userIsAuthorisedForManage } from './userCheckMiddleware'
 import paths from '../paths/temporary-accommodation/manage'
 
@@ -91,7 +91,7 @@ describe('createUserCheckMiddleware', () => {
         const request = createMock<Request>({ path: paths.reports.new({}) })
         const response = createMock<Response>({
           locals: {
-            user: userFactory.build({ roles: ['reporter' as TemporaryAccommodationUserRole] }),
+            user: userFactory.build({ roles: ['reporter'] }),
           },
         })
         const next = jest.fn()
@@ -108,7 +108,7 @@ describe('createUserCheckMiddleware', () => {
         const request = createMock<Request>({ path: paths.reports.create({}) })
         const response = createMock<Response>({
           locals: {
-            user: userFactory.build({ roles: ['reporter' as TemporaryAccommodationUserRole] }),
+            user: userFactory.build({ roles: ['reporter'] }),
           },
         })
         const next = jest.fn()
@@ -125,7 +125,7 @@ describe('createUserCheckMiddleware', () => {
         const request = createMock<Request>({ path: paths.assessments.index({}) })
         const response = createMock<Response>({
           locals: {
-            user: userFactory.build({ roles: ['reporter' as TemporaryAccommodationUserRole] }),
+            user: userFactory.build({ roles: ['reporter'] }),
           },
         })
         const next = jest.fn()

server/paths/temporary-accommodation/static.ts

@@ -3,10 +3,12 @@ import { temporaryAccommodationPath } from '../service'
 const cookiesPath = temporaryAccommodationPath.path('cookies')
 const useNDeliusPath = temporaryAccommodationPath.path('use-ndelius')
 const notAuthorisedPath = temporaryAccommodationPath.path('not-authorised')
+const accessibilityStatementPath = temporaryAccommodationPath.path('accessibility-statement')
 
 const paths = {
   static: {
     cookies: cookiesPath,
+    accessibilityStatement: accessibilityStatementPath,
     useNDelius: useNDeliusPath,
     notAuthorised: notAuthorisedPath,
   },

server/routes/temporary-accommodation/index.ts

@@ -18,6 +18,9 @@ export default function routes(controllers: Controllers, services: Services): Ro
 
   get('/', landingController.index(), { auditEvent: 'VIEW_LANDING' })
   get(paths.static.cookies.pattern, staticController.cookies(), { auditEvent: 'VIEW_COOKIES' })
+  get(paths.static.accessibilityStatement.pattern, staticController.accessibilityStatement(), {
+    auditEvent: 'VIEW_ACCESSIBILITY_STATEMENT',
+  })
   get(paths.static.useNDelius.pattern, staticController.useNDelius(), { auditEvent: 'VIEW_USE_NDELIUS' })
   get(paths.static.notAuthorised.pattern, staticController.notAuthorised(), { auditEvent: 'VIEW_NOT_AUTHORISED' })
 

server/utils/userUtils.test.ts

@@ -10,7 +10,7 @@ import {
   userHasReferrerRoleAndIsApplyEnabled,
   userHasReporterRole,
 } from './userUtils'
-import { TemporaryAccommodationUserRole as Role, TemporaryAccommodationUserRole } from '../@types/shared'
+import { TemporaryAccommodationUserRole as Role } from '../@types/shared'
 import config from '../config'
 
 jest.mock('./enabledRegions', () => {
@@ -122,7 +122,7 @@ describe('userHasAssessorRole', () => {
 
 describe('userHasReporterRole', () => {
   it('returns true when user has got the role "reporter"', () => {
-    const user = userFactory.build({ roles: ['reporter' as TemporaryAccommodationUserRole] })
+    const user = userFactory.build({ roles: ['reporter'] })
     expect(userHasReporterRole(user)).toBe(true)
   })
 

server/utils/userUtils.ts

@@ -1,5 +1,5 @@
 import { Request } from 'express'
-import { ProbationRegion, TemporaryAccommodationUserRole, TemporaryAccommodationUser as User } from '../@types/shared'
+import { ProbationRegion, TemporaryAccommodationUser as User } from '../@types/shared'
 import enabledRegions from './enabledRegions'
 import config from '../config'
 
@@ -20,7 +20,7 @@ export function userHasAssessorRole(user: User): boolean {
 }
 
 export function userHasReporterRole(user: User): boolean {
-  return user.roles.includes('reporter' as TemporaryAccommodationUserRole)
+  return user.roles.includes('reporter')
 }
 
 export function userHasReferrerRoleAndIsApplyEnabled(user: User): boolean {

server/views/partials/layout.njk

@@ -47,6 +47,10 @@
         {
           href: paths.static.cookies({}),
           text: "Cookies"
+        },
+        {
+          href: paths.static.accessibilityStatement({}),
+          text: "Accessibility statement"
         }
       ]
     },