Merge branch 'dev' into psp-9489

bcgov · Nov 7, 2024 · d07a124 · d07a124
2 parents 6319a1c + 9c3fcb9
commit d07a124
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 31 deletions.
diff --git a/.../frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap b/.../frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
@@ -911,7 +911,11 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                 <div
                   class="col"
                 >
-                  File Summary
+                  <span
+                    title="File Details"
+                  >
+                    File Summary
+                  </span>
                 </div>
                 <div
                   class="c22"
@@ -944,6 +948,7 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                 >
                   <button
                     class="c3 Button btn btn-link"
+                    title="View"
                     type="button"
                   >
                     <div
@@ -975,6 +980,7 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                 >
                   <button
                     class="c3 Button btn btn-link"
+                    title="View"
                     type="button"
                   >
                     <div

diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx b/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx
@@ -53,10 +53,14 @@ const AcquisitionMenu: React.FunctionComponent<
                 className={cx('no-gutters', { selected: props.selectedIndex === index })}
               >
                 {activeIndex ? (
-                  <Col>{label}</Col>
+                  <Col>
+                    <span title="File Details">{label}</span>
+                  </Col>
                 ) : (
                   <Col>
-                    <LinkButton onClick={() => handleClick(index)}>{label}</LinkButton>
+                    <LinkButton title="File Details" onClick={() => handleClick(index)}>
+                      {label}
+                    </LinkButton>
                   </Col>
                 )}
                 <StyledMenuHeaderWrapper>
@@ -92,10 +96,12 @@ const AcquisitionMenu: React.FunctionComponent<
                   </StyledIconWrapper>
                 </Col>
                 {activeIndex ? (
-                  <Col>{label}</Col>
+                  <Col>
+                    <span title="View">{label}</span>
+                  </Col>
                 ) : (
                   <Col>
-                    <LinkButton>{label}</LinkButton>
+                    <LinkButton title="View">{label}</LinkButton>
                   </Col>
                 )}
               </StyledRow>

diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/GenerateForm/GenerateFormView.tsx b/source/frontend/src/features/mapSideBar/acquisition/common/GenerateForm/GenerateFormView.tsx
@@ -50,6 +50,7 @@ const GenerateFormView: React.FunctionComponent<
               <LinkButton
                 key={`generate-form-entry-${entry.formType}`}
                 onClick={() => onGenerateClick(entry.formType)}
+                title="Generate"
               >
                 {entry.text}
               </LinkButton>

diff --git a/...nd/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap b/...nd/src/features/mapSideBar/acquisition/common/__snapshots__/AcquisitionMenu.test.tsx.snap
@@ -306,7 +306,11 @@ exports[`AcquisitionMenu component > matches snapshot 1`] = `
       <div
         class="col"
       >
-        one
+        <span
+          title="File Details"
+        >
+          one
+        </span>
       </div>
       <div
         class="c2"
@@ -366,6 +370,7 @@ exports[`AcquisitionMenu component > matches snapshot 1`] = `
       >
         <button
           class="c6 Button btn btn-link"
+          title="View"
           type="button"
         >
           <div
@@ -397,6 +402,7 @@ exports[`AcquisitionMenu component > matches snapshot 1`] = `
       >
         <button
           class="c6 Button btn btn-link"
+          title="View"
           type="button"
         >
           <div

diff --git a/...c/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.test.tsx b/...c/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.test.tsx
@@ -9,16 +9,7 @@ import { getEmptyPerson } from '@/mocks/contacts.mock';
 import { getEmptyOrganization } from '@/mocks/organization.mock';
 import { ApiGen_Concepts_Person } from '@/models/api/generated/ApiGen_Concepts_Person';
 import { toTypeCodeNullable } from '@/utils/formUtils';
-import {
-  act,
-  cleanup,
-  findAllByTestId,
-  findByTestId,
-  render,
-  RenderOptions,
-  userEvent,
-  waitForEffects,
-} from '@/utils/test-utils';
+import { act, cleanup, render, RenderOptions, userEvent, waitForEffects } from '@/utils/test-utils';
 
 import AcquisitionSummaryView, { IAcquisitionSummaryViewProps } from './AcquisitionSummaryView';
 

diff --git a/...rc/features/mapSideBar/acquisition/tabs/fileDetails/update/UpdateAcquisitionForm.test.tsx b/...rc/features/mapSideBar/acquisition/tabs/fileDetails/update/UpdateAcquisitionForm.test.tsx
@@ -10,14 +10,14 @@ import { mockNotesResponse } from '@/mocks/noteResponses.mock';
 import { lookupCodesSlice } from '@/store/slices/lookupCodes';
 import {
   act,
+  fakeText,
+  fireEvent,
   render,
   RenderOptions,
+  screen,
   userEvent,
   waitFor,
-  screen,
   waitForEffects,
-  fakeText,
-  fireEvent,
 } from '@/utils/test-utils';
 
 import { UpdateAcquisitionSummaryFormModel } from './models';

diff --git a/.../frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap b/.../frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
@@ -847,7 +847,11 @@ exports[`DispositionView component > renders as expected 1`] = `
                 <div
                   class="col"
                 >
-                  File Summary
+                  <span
+                    title="File Details"
+                  >
+                    File Summary
+                  </span>
                 </div>
                 <div
                   class="c22"
@@ -880,6 +884,7 @@ exports[`DispositionView component > renders as expected 1`] = `
                 >
                   <button
                     class="c3 Button btn btn-link"
+                    title="View"
                     type="button"
                   >
                     <div

diff --git a/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.tsx b/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.tsx
@@ -50,10 +50,14 @@ const DispositionMenu: React.FunctionComponent<
                 className={cx('no-gutters', { selected: props.selectedIndex === index })}
               >
                 {activeIndex ? (
-                  <Col>{label}</Col>
+                  <Col>
+                    <span title="File Details">{label}</span>
+                  </Col>
                 ) : (
                   <Col>
-                    <LinkButton onClick={() => handleClick(index)}>{label}</LinkButton>
+                    <LinkButton title="File Details" onClick={() => handleClick(index)}>
+                      {label}
+                    </LinkButton>
                   </Col>
                 )}
                 <StyledMenuHeaderWrapper>
@@ -89,10 +93,12 @@ const DispositionMenu: React.FunctionComponent<
                   </StyledIconWrapper>
                 </Col>
                 {activeIndex ? (
-                  <Col>{label}</Col>
+                  <Col>
+                    <span title="View">{label}</span>
+                  </Col>
                 ) : (
                   <Col>
-                    <LinkButton>{label}</LinkButton>
+                    <LinkButton title="View">{label}</LinkButton>
                   </Col>
                 )}
               </StyledRow>

diff --git a/...nd/src/features/mapSideBar/disposition/common/__snapshots__/DispositionMenu.test.tsx.snap b/...nd/src/features/mapSideBar/disposition/common/__snapshots__/DispositionMenu.test.tsx.snap
@@ -298,7 +298,11 @@ exports[`DispositionMenu component > matches snapshot 1`] = `
       <div
         class="col"
       >
-        one
+        <span
+          title="File Details"
+        >
+          one
+        </span>
       </div>
       <div
         class="c2"
@@ -331,6 +335,7 @@ exports[`DispositionMenu component > matches snapshot 1`] = `
       >
         <button
           class="c5 Button btn btn-link"
+          title="View"
           type="button"
         >
           <div
@@ -362,6 +367,7 @@ exports[`DispositionMenu component > matches snapshot 1`] = `
       >
         <button
           class="c5 Button btn btn-link"
+          title="View"
           type="button"
         >
           <div

diff --git a/...e/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap b/...e/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap
@@ -894,7 +894,11 @@ exports[`ResearchContainer component > renders as expected 1`] = `
                   <div
                     class="col"
                   >
-                    File Summary
+                    <span
+                      title="File Details"
+                    >
+                      File Summary
+                    </span>
                   </div>
                   <div
                     class="c22"
@@ -927,6 +931,7 @@ exports[`ResearchContainer component > renders as expected 1`] = `
                   >
                     <button
                       class="c3 Button btn btn-link"
+                      title="View"
                       type="button"
                     >
                       <div

diff --git a/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx b/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx
@@ -40,10 +40,14 @@ const ResearchMenu: React.FunctionComponent<
                 </StyledIconWrapper>
               </Col>
               {props.selectedIndex === index ? (
-                <Col>{label}</Col>
+                <Col>
+                  <span title="View">{label}</span>
+                </Col>
               ) : (
                 <Col>
-                  <LinkButton onClick={() => handleClick(index)}>{label}</LinkButton>
+                  <LinkButton title="View" onClick={() => handleClick(index)}>
+                    {label}
+                  </LinkButton>
                 </Col>
               )}
             </>
@@ -52,10 +56,14 @@ const ResearchMenu: React.FunctionComponent<
           {index === 0 && (
             <>
               {props.selectedIndex === index ? (
-                <Col>{label}</Col>
+                <Col>
+                  <span title="File Details">{label}</span>
+                </Col>
               ) : (
                 <Col>
-                  <LinkButton onClick={() => handleClick(index)}>{label}</LinkButton>
+                  <LinkButton title="File Details" onClick={() => handleClick(index)}>
+                    {label}
+                  </LinkButton>
                 </Col>
               )}
               <StyledMenuHeaderWrapper>

diff --git a/...frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap b/...frontend/src/features/mapSideBar/research/common/__snapshots__/ResearchMenu.test.tsx.snap
@@ -306,7 +306,11 @@ exports[`ResearchMenu component > renders as expected when provided no research
       <div
         class="col"
       >
-        First label
+        <span
+          title="File Details"
+        >
+          First label
+        </span>
       </div>
       <div
         class="c2"
@@ -366,6 +370,7 @@ exports[`ResearchMenu component > renders as expected when provided no research
       >
         <button
           class="c6 Button btn btn-link"
+          title="View"
           type="button"
         >
           <div
@@ -397,6 +402,7 @@ exports[`ResearchMenu component > renders as expected when provided no research
       >
         <button
           class="c6 Button btn btn-link"
+          title="View"
           type="button"
         >
           <div