From 02b58f7cd21177c315e66ba8abef186d9a471855 Mon Sep 17 00:00:00 2001 From: Bob Meredith Date: Tue, 24 Dec 2024 11:55:34 +0000 Subject: [PATCH] APS-1705 Default keyworker to Not assigned --- server/utils/premises/index.test.ts | 9 +++++---- server/utils/premises/index.ts | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/utils/premises/index.test.ts b/server/utils/premises/index.test.ts index 64db1b57b..2211ed1a1 100644 --- a/server/utils/premises/index.test.ts +++ b/server/utils/premises/index.test.ts @@ -89,12 +89,12 @@ describe('premisesUtils', () => { ]) }) - it('should select the option whose id maches the premisesId field in the context', () => { + it('should select the option whose id matches the premisesId field in the context', () => { expect( groupCas1SummaryPremisesSelectOptions(premises, { premisesId: area1Premises[0].id })[0].items[0].selected, ).toBeTruthy() }) - it('should select the option whose id maches the specified field in the context', () => { + it('should select the option whose id matches the specified field in the context', () => { expect( groupCas1SummaryPremisesSelectOptions(premises, { premises: area2Premises[1].id }, 'premises')[1].items[1] .selected, @@ -119,7 +119,7 @@ describe('premisesUtils', () => { }, ]) }) - it('should select the option whose id maches the specfied field in the context', () => { + it('should select the option whose id matches the specfied field in the context', () => { expect( cas1PremisesSummaryRadioOptions(premises, { premises: premises[1].id }, 'premises')[1].selected, ).toBeTruthy() @@ -266,6 +266,7 @@ describe('premisesUtils', () => { const placements = [ ...cas1SpaceBookingSummaryFactory.buildList(3, { tier: 'A' }), cas1SpaceBookingSummaryFactory.build({ tier: 'A', status: undefined }), + cas1SpaceBookingSummaryFactory.build({ tier: 'A', keyWorkerAllocation: undefined }), ] const tableRows = placementTableRows(activeTab, 'Test_Premises_Id', placements) @@ -281,7 +282,7 @@ describe('premisesUtils', () => { ] return activeTab === 'historic' ? [...baseColumns, statusColumn] - : [...baseColumns, { text: placement.keyWorkerAllocation.keyWorker.name }, statusColumn] + : [...baseColumns, { text: placement.keyWorkerAllocation?.keyWorker?.name || 'Not assigned' }, statusColumn] }) expect(tableRows).toEqual(expectedRows) }, diff --git a/server/utils/premises/index.ts b/server/utils/premises/index.ts index 2ac6c9224..d70e99ac7 100644 --- a/server/utils/premises/index.ts +++ b/server/utils/premises/index.ts @@ -163,7 +163,7 @@ export const placementTableRows = ( tier: htmlValue(getTierOrBlank(tier)), canonicalArrivalDate: textValue(DateFormats.isoDateToUIDate(canonicalArrivalDate, { format: 'short' })), canonicalDepartureDate: textValue(DateFormats.isoDateToUIDate(canonicalDepartureDate, { format: 'short' })), - keyWorkerName: textValue(keyWorkerAllocation?.keyWorker?.name), + keyWorkerName: textValue(keyWorkerAllocation?.keyWorker?.name || 'Not assigned'), status: textValue(statusTextMap[status]), } return columnMap[activeTab].map(({ fieldName }: ColumnDefinition) => fieldValues[fieldName])