From 1d8811d4071ef393670ad8c548a77c44c7f4959d Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Date: Thu, 9 Nov 2023 16:13:50 -0800 Subject: [PATCH 1/2] PSP-7228 Management summary lease information - text change (#3588) --- .../PropertyManagementDetailView.test.tsx.snap | 2 +- .../PropertyManagementUpdateForm.test.tsx.snap | 2 +- .../propertyDetailsManagement/update/summary/models.test.ts | 6 +++--- source/frontend/src/utils/propertyUtils.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/summary/__snapshots__/PropertyManagementDetailView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/summary/__snapshots__/PropertyManagementDetailView.test.tsx.snap index 332152d66a..7c423052c0 100644 --- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/summary/__snapshots__/PropertyManagementDetailView.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/summary/__snapshots__/PropertyManagementDetailView.test.tsx.snap @@ -161,7 +161,7 @@ exports[`PropertyManagementDetailView component renders as expected when provide
- No active Lease/License + No
- No active Lease/License + No
{ expect(model.additionalDetails).toBe(''); expect(model.isTaxesPayable).toBe(null); expect(model.isUtilitiesPayable).toBe(null); - expect(model.formattedLeaseInformation).toBe('No active Lease/License'); + expect(model.formattedLeaseInformation).toBe('No'); }); it('fromApi sets values as expected from api response', () => { @@ -35,11 +35,11 @@ describe('Property management model tests', () => { expect(model.additionalDetails).toBe('test'); expect(model.isTaxesPayable).toBe(null); expect(model.isUtilitiesPayable).toBe(null); - expect(model.formattedLeaseInformation).toBe('No active Lease/License'); + expect(model.formattedLeaseInformation).toBe('No'); }); it.each([ - ['NO lease found', 0, null, 'No active Lease/License'], + ['NO lease found', 0, null, 'No'], ['ONE lease with expiry date', 1, '2020-03-15', 'Yes (Mar 15, 2020)'], ['ONE lease with no expiry date', 1, null, 'Yes'], ['MULTIPLE leases', 5, null, 'Multiple'], diff --git a/source/frontend/src/utils/propertyUtils.ts b/source/frontend/src/utils/propertyUtils.ts index 6166b6b512..261bf00681 100644 --- a/source/frontend/src/utils/propertyUtils.ts +++ b/source/frontend/src/utils/propertyUtils.ts @@ -100,7 +100,7 @@ export function formatApiPropertyManagementLease(base?: Api_PropertyManagement | const count = base?.relatedLeases || 0; switch (count) { case 0: - return 'No active Lease/License'; + return 'No'; case 1: const expiryDate = base?.leaseExpiryDate ? `(${prettyFormatDate(base.leaseExpiryDate)})` : ''; From 61df91355e471162f926d6322151ecc9dd83cc5e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:14:18 +0000 Subject: [PATCH 2/2] CI: Bump version to v4.0.0-67.3 --- source/backend/api/Pims.Api.csproj | 4 ++-- source/frontend/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index e4a04ba4e4..9b38ba6f29 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,8 +2,8 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 4.0.0-67.2 - 4.0.0-67.2 + 4.0.0-67.3 + 4.0.0-67.3 4.0.0.67 true 16BC0468-78F6-4C91-87DA-7403C919E646 diff --git a/source/frontend/package.json b/source/frontend/package.json index c57595a9be..22e74bf296 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "4.0.0-67.2", + "version": "4.0.0-67.3", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1",