Merge pull request #4213 from devinleighsmith/psp-8914

Psp 8914 fix project npe
bcgov · Jul 18, 2024 · 4b3d1df · 4b3d1df
2 parents 0c1914f + f9931b0
commit 4b3d1df
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.4.0-84.54</Version>
-    <Version>5.4.0-84.54</Version>
-    <AssemblyVersion>5.4.0.84</AssemblyVersion>
+    <Version>5.4.1-84.54</Version>
+    <Version>5.4.1-84.54</Version>
+    <AssemblyVersion>5.4.1.84</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
     <TargetFramework>net8.0</TargetFramework>

diff --git a/source/frontend/package-lock.json b/source/frontend/package-lock.json
diff --git a/source/frontend/package.json b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "5.4.0-84.54",
+  "version": "5.4.1-84.54",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",

diff --git a/source/frontend/src/features/mapSideBar/project/common/ProjectHeader.tsx b/source/frontend/src/features/mapSideBar/project/common/ProjectHeader.tsx
@@ -27,8 +27,8 @@ const ProjectHeader: React.FunctionComponent<React.PropsWithChildren<IProjectHea
       <Col>
         <StyledFiller>
           <AuditSection baseAudit={project} />
-          {exists(project.projectStatusTypeCode) && (
-            <StatusField statusCodeType={project.projectStatusTypeCode} />
+          {exists(project?.projectStatusTypeCode) && (
+            <StatusField statusCodeType={project?.projectStatusTypeCode} />
           )}
         </StyledFiller>
       </Col>

diff --git a/...nd/src/features/mapSideBar/property/tabs/propertyAssociations/LeaseAssociationContent.tsx b/...nd/src/features/mapSideBar/property/tabs/propertyAssociations/LeaseAssociationContent.tsx
@@ -70,8 +70,8 @@ export const LeaseAssociationContent: React.FunctionComponent<
   const tableData = orderBy(
     props.associations.map<IAssociationInfo>(x => {
       const lease = find(props.leases, lease => x.id === lease.id);
-      const leaseRenewals = props.renewals.filter(renewal => x.id === renewal.leaseId);
-      const calculatedExpiry = getCalculatedExpiry(lease, leaseRenewals);
+      const leaseRenewals = props.renewals?.filter(renewal => x.id === renewal.leaseId);
+      const calculatedExpiry = getCalculatedExpiry(lease, leaseRenewals ?? []);
       return {
         id: x.id?.toString() || '',
         linkUrl: props.linkUrlMask.replace('|id|', x.id?.toString() || ''),
@@ -81,7 +81,7 @@ export const LeaseAssociationContent: React.FunctionComponent<
         createdByGuid: x.createdByGuid || '',
         createdDate: x.createdDateTime || '',
         status: x.status || '',
-        tenants: getFormattedTenants(props.tenants.filter(tenant => x.id === tenant.leaseId)),
+        tenants: getFormattedTenants(props.tenants?.filter(tenant => x.id === tenant.leaseId)),
         expiryDate: calculatedExpiry,
       };
     }),