Merge branch 'dev' into psp-8315

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>5.3.0-81.23</Version>
- <Version>5.3.0-81.23</Version>
+ <Version>5.3.0-81.27</Version>
+ <Version>5.3.0-81.27</Version>
  <AssemblyVersion>5.3.0.81</AssemblyVersion>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>

source/frontend/package.json

@@ -1,6 +1,6 @@
 {
  "name": "frontend",
- "version": "5.3.0-81.23",
+ "version": "5.3.0-81.27",
  "private": true,
  "dependencies": {
  "@bcgov/bc-sans": "1.0.1",

source/frontend/src/assets/scss/_variables.module.scss

@@ -10,8 +10,9 @@
  highlightBackgroundColor: $highlight-background-color;
  // buttons
  borderOutlineColor: $border-outline-color;
-
+ 
  // Colors
+ pimsGreen80: $pims-green-80;
  warningBackgroundColor: $warning-background-color;
  numberBackgroundColor: $number-background-color;
  dangerBackgroundColor: $danger-background-color;

source/frontend/src/components/common/Section/Section.tsx

@@ -42,7 +42,7 @@ export const Section: React.FC<
  <Row className="no-gutters">
  <Col>{header}</Col>
  {isCollapsable && (
- <Col xs="1">
+ <Col xs="auto" className="pl-8">
  {isCollapsed && (
  <ArrowDropDownIcon
  title={`expand-${title ?? 'section'}`}

source/frontend/src/components/common/SectionListHeader.tsx

@@ -12,6 +12,7 @@ export interface ISectionListHeaderProps {
  addButtonIcon?: JSX.Element;
  onAdd?: () => void;
  claims: Claims[];
+ 'data-testId'?: string;
 }
 
 export const SectionListHeader: React.FunctionComponent<
@@ -27,7 +28,7 @@ export const SectionListHeader: React.FunctionComponent<
  </Col>
  <Col xs="auto" className="my-1">
  {hasClaim(props.claims) && (
- <StyledSectionAddButton onClick={onClick}>
+ <StyledSectionAddButton onClick={onClick} data-testid={props['data-testId']}>
  {props.addButtonIcon}
  &nbsp;{props.addButtonText ?? 'Add'}
  </StyledSectionAddButton>

source/frontend/src/components/common/styles.ts

@@ -106,6 +106,9 @@ export const StyledAddButton = styled(Button)`
  &.btn.btn-primary:active {
  background-color: ${props => props.theme.bcTokens.iconsColorSuccess};
  }
+ &.btn.btn-primary:hover {
+ background-color: ${props => props.theme.css.pimsGreen80};
+ }
 `;
 
 export const StyledSectionAddButton = styled(StyledAddButton)`

source/frontend/src/features/contacts/contact/create/Organization/__snapshots__/CreateOrganizationForm.test.tsx.snap

@@ -688,7 +688,7 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
  Mailing Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c10"
@@ -942,7 +942,7 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
  Property Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c10"
@@ -1196,7 +1196,7 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
  Billing Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c10"

source/frontend/src/features/contacts/contact/create/Person/__snapshots__/CreatePersonForm.test.tsx.snap

@@ -853,7 +853,7 @@ exports[`CreatePersonForm > renders as expected 1`] = `
  </div>
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c12"
@@ -1107,7 +1107,7 @@ exports[`CreatePersonForm > renders as expected 1`] = `
  Property Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c12"
@@ -1361,7 +1361,7 @@ exports[`CreatePersonForm > renders as expected 1`] = `
  Billing Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c12"

source/frontend/src/features/contacts/contact/create/__snapshots__/CreateContactContainer.test.tsx.snap

@@ -1067,7 +1067,7 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
  </div>
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c20"
@@ -1321,7 +1321,7 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
  Property Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c20"
@@ -1575,7 +1575,7 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
  Billing Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c20"

source/frontend/src/features/contacts/contact/edit/Organization/__snapshots__/UpdateOrganizationForm.test.tsx.snap

@@ -806,7 +806,7 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
  Mailing Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c10"
@@ -1060,7 +1060,7 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
  Property Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c10"
@@ -1314,7 +1314,7 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
  Billing Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c10"

source/frontend/src/features/contacts/contact/edit/Person/__snapshots__/UpdatePersonForm.test.tsx.snap

@@ -926,7 +926,7 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
  </div>
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c13"
@@ -1180,7 +1180,7 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
  Property Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c13"
@@ -1434,7 +1434,7 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
  Billing Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c13"

source/frontend/src/features/contacts/contact/edit/__snapshots__/UpdateContactContainer.test.tsx.snap

@@ -1070,7 +1070,7 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
  </div>
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c19"
@@ -1324,7 +1324,7 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
  Property Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c19"
@@ -1578,7 +1578,7 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
  Billing Address
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c19"

source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap

@@ -263,7 +263,7 @@ exports[`Document List View > renders as expected 1`] = `
  </div>
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c3"

source/frontend/src/features/leases/add/LeaseDetailSubForm.tsx

@@ -104,6 +104,7 @@ export const LeaseDetailSubForm: React.FunctionComponent<ILeaseDetailsSubFormPro
  <li>Archived: File to be archived as per ARCS/ORCS.</li>
  </ul>
  }
+ placement="right"
  ></TooltipIcon>
  }
  required

source/frontend/src/features/leases/add/__snapshots__/AddLeaseContainer.test.tsx.snap

@@ -2330,7 +2330,7 @@ exports[`AddLeaseContainer component > renders as expected 1`] = `
  Consultation
  </div>
  <div
- class="col-1"
+ class="pl-8 col-auto"
  >
  <svg
  class="c25"