Merge branch 'dev' into psp-7002

bcgov · Oct 27, 2023 · 6b4211c · 6b4211c
2 parents 55a0ba8 + 857fb61
commit 6b4211c
Show file tree

Hide file tree

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

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

diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/PropertyInformation.tsx b/source/frontend/src/features/leases/detail/LeasePages/details/PropertyInformation.tsx
@@ -32,9 +32,11 @@ export const PropertyInformation: React.FunctionComponent<
   );
   const pid = getIn(formikProps.values, withNameSpace(nameSpace, 'property.pid'));
   const pidText = pid ? `PID: ${pidFormatter(pid)}` : '';
-  const legalPidText = [legalDescription, pidText].filter(x => x).join(' ');
   return (
     <StyledPropertyInfo>
+      <SectionField label="PID" labelWidth="3">
+        {pidText}
+      </SectionField>
       <SectionField label="Descriptive name" labelWidth="3">
         <Input disabled={disabled} field={withNameSpace(nameSpace, 'propertyName')} />
       </SectionField>
@@ -57,7 +59,7 @@ export const PropertyInformation: React.FunctionComponent<
         </SectionField>
       ) : null}
       <SectionField label="Legal description" labelWidth="3">
-        {legalPidText}
+        {legalDescription}
       </SectionField>
 
       <hr />

diff --git a/...atures/leases/detail/LeasePages/details/__snapshots__/PropertiesInformation.test.tsx.snap b/...atures/leases/detail/LeasePages/details/__snapshots__/PropertiesInformation.test.tsx.snap
@@ -95,6 +95,22 @@ exports[`PropertiesInformation component renders as expected 1`] = `
       <div
         class="c3"
       >
+        <div
+          class="pb-2 row"
+        >
+          <div
+            class="pr-0 text-left col-3"
+          >
+            <label
+              class="c4"
+            >
+              PID:
+            </label>
+          </div>
+          <div
+            class="c5 text-left col"
+          />
+        </div>
         <div
           class="pb-2 row"
         >

diff --git a/...features/leases/detail/LeasePages/details/__snapshots__/PropertyInformation.test.tsx.snap b/...features/leases/detail/LeasePages/details/__snapshots__/PropertyInformation.test.tsx.snap
@@ -32,6 +32,22 @@ exports[`PropertyInformation component renders a complete lease as expected 1`]
 <div
     class="c0"
   >
+    <div
+      class="pb-2 row"
+    >
+      <div
+        class="pr-0 text-left col-3"
+      >
+        <label
+          class="c1"
+        >
+          PID:
+        </label>
+      </div>
+      <div
+        class="c2 text-left col"
+      />
+    </div>
     <div
       class="pb-2 row"
     >
@@ -160,6 +176,22 @@ exports[`PropertyInformation component renders minimally as expected 1`] = `
 <div
     class="c0"
   >
+    <div
+      class="pb-2 row"
+    >
+      <div
+        class="pr-0 text-left col-3"
+      >
+        <label
+          class="c1"
+        >
+          PID:
+        </label>
+      </div>
+      <div
+        class="c2 text-left col"
+      />
+    </div>
     <div
       class="pb-2 row"
     >