Merge branch 'dev' into psp-7204

bcgov · Nov 9, 2023 · 47bfc40 · 47bfc40
2 parents 7612945 + fbfd704
commit 47bfc40
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 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-67.1</Version>
-    <Version>4.0.0-67.1</Version>
+    <Version>4.0.0-67.2</Version>
+    <Version>4.0.0-67.2</Version>
     <AssemblyVersion>4.0.0.67</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-67.1",
+  "version": "4.0.0-67.2",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",

diff --git a/source/frontend/src/components/layout/SideNavBar/LeaseAndLicenses.tsx b/source/frontend/src/components/layout/SideNavBar/LeaseAndLicenses.tsx
@@ -19,7 +19,7 @@ export const LeaseAndLicenses = ({ onLinkClick }: ISideTrayPageProps) => {
   return (
     <>
       <HalfHeightDiv>
-        <Styled.TrayHeader>Management</Styled.TrayHeader>
+        <Styled.TrayHeader>Leases & Licenses</Styled.TrayHeader>
         {hasClaim(Claims.LEASE_VIEW) && (
           <Link onClick={onLinkClick} to="/lease/list">
             Manage Lease/License Files
@@ -38,7 +38,7 @@ export const LeaseAndLicenses = ({ onLinkClick }: ISideTrayPageProps) => {
           </ExportH3>
           <p>Aggregated Lease & License Payments</p>
           <ExportAggregatedLeasesContainer />
-          <p>Lease and License Payments by Fiscal Year</p>
+          <p>Lease & License Payments by Fiscal Year</p>
           <ExportLeasePaymentsContainer />
         </HalfHeightDiv>
       )}

diff --git a/source/frontend/src/components/layout/SideNavBar/NavIcon.tsx b/source/frontend/src/components/layout/SideNavBar/NavIcon.tsx
@@ -27,7 +27,10 @@ export const NavIcon = ({ icon, text, showText, onClick, roles, claims }: INavIc
     _.find(claims, (claim: Claims) => hasClaim(claim));
 
   return (!roles?.length && !claims?.length) || displayIcon ? (
-    <StyledNav onClick={onClick} data-testid={`nav-tooltip-${text.replace(' ', '').toLowerCase()}`}>
+    <StyledNav
+      onClick={onClick}
+      data-testid={`nav-tooltip-${text.replaceAll(' ', '').toLowerCase()}`}
+    >
       <StyledLink>
         <TooltipWrapper toolTipId={`nav-tooltip-${text}`} toolTip={text}>
           {icon}

diff --git a/source/frontend/src/components/layout/SideNavBar/SideNavbar.test.tsx b/source/frontend/src/components/layout/SideNavBar/SideNavbar.test.tsx
@@ -50,8 +50,8 @@ describe('SideNavbar display and logic', () => {
     const { getByTitle, queryByText, getByTestId } = renderComponent();
     await waitFor(async () => {
       expect(getByTitle('expand')).toBeInTheDocument();
-      expect(queryByText('Management')?.clientWidth).toBe(0);
-      expect(getByTestId('nav-tooltip-management')).toContainHTML('svg');
+      expect(queryByText('Leases & Licenses')?.clientWidth).toBe(0);
+      expect(getByTestId('nav-tooltip-leases&licenses')).toContainHTML('svg');
     });
   });
 
@@ -73,8 +73,8 @@ describe('SideNavbar display and logic', () => {
       userEvent.click(expandButton);
     });
     await waitFor(async () => {
-      expect(getByTestId('nav-tooltip-management')).toContainHTML('svg');
-      expect(getByText('Management')).toBeInTheDocument();
+      expect(getByTestId('nav-tooltip-leases&licenses')).toContainHTML('svg');
+      expect(getByText('Leases & Licenses')).toBeInTheDocument();
     });
   });
 
@@ -118,7 +118,7 @@ describe('SideNavbar display and logic', () => {
       const { getByText, getByTestId } = renderComponent({
         roles: [Roles.SYSTEM_ADMINISTRATOR],
       });
-      const managementButton = getByTestId('nav-tooltip-management');
+      const managementButton = getByTestId('nav-tooltip-leases&licenses');
       await act(async () => {
         userEvent.click(managementButton);
       });
@@ -131,7 +131,7 @@ describe('SideNavbar display and logic', () => {
       const { getByTestId, getByTitle } = renderComponent({
         roles: [Roles.SYSTEM_ADMINISTRATOR],
       });
-      const managementButton = getByTestId('nav-tooltip-management');
+      const managementButton = getByTestId('nav-tooltip-leases&licenses');
       await act(async () => {
         userEvent.click(managementButton);
       });
@@ -148,7 +148,7 @@ describe('SideNavbar display and logic', () => {
       const { getByTestId, getByTitle } = renderComponent({
         roles: [Roles.SYSTEM_ADMINISTRATOR],
       });
-      const managementButton = getByTestId('nav-tooltip-management');
+      const managementButton = getByTestId('nav-tooltip-leases&licenses');
       await act(async () => {
         userEvent.click(managementButton);
       });

diff --git a/source/frontend/src/components/layout/SideNavBar/SideNavbar.tsx b/source/frontend/src/components/layout/SideNavBar/SideNavbar.tsx
@@ -54,7 +54,7 @@ export const SideNavBar = () => {
         <NavIcon
           onClick={() => setTrayPage(SidebarContextType.LEASE)}
           icon={<Fence />}
-          text="Management"
+          text="Leases & Licenses"
           showText={expanded}
         />
         <NavIcon

diff --git a/source/frontend/src/components/layout/SideNavBar/__snapshots__/SideNavbar.test.tsx.snap b/source/frontend/src/components/layout/SideNavBar/__snapshots__/SideNavbar.test.tsx.snap
@@ -264,7 +264,7 @@ exports[`SideNavbar display and logic renders 1`] = `
       </div>
       <div
         class="c2 nav-item"
-        data-testid="nav-tooltip-management"
+        data-testid="nav-tooltip-leases&licenses"
       >
         <a
           class="c3 nav-link"
@@ -277,7 +277,7 @@ exports[`SideNavbar display and logic renders 1`] = `
           <label
             class="c4"
           >
-            Management
+            Leases & Licenses
           </label>
         </a>
       </div>