From 487b22d0866e450985001eb504f9821211753f80 Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Date: Wed, 6 Nov 2024 15:37:46 -0800 Subject: [PATCH 1/2] Titles are missing on Properties links and File Summary --- .../acquisition/common/AcquisitionMenu.tsx | 14 ++++++++++---- .../common/GenerateForm/GenerateFormView.tsx | 1 + .../detail/AcquisitionSummaryView.test.tsx | 11 +---------- .../update/UpdateAcquisitionForm.test.tsx | 6 +++--- .../disposition/common/DispositionMenu.tsx | 14 ++++++++++---- .../mapSideBar/research/common/ResearchMenu.tsx | 16 ++++++++++++---- 6 files changed, 37 insertions(+), 25 deletions(-) diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx b/source/frontend/src/features/mapSideBar/acquisition/common/AcquisitionMenu.tsx index b82551aa90..8e57d207c9 100644 --- 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 ? ( - {label} + + {label} + ) : ( - handleClick(index)}>{label} + handleClick(index)}> + {label} + )} @@ -92,10 +96,12 @@ const AcquisitionMenu: React.FunctionComponent< {activeIndex ? ( - {label} + + {label} + ) : ( - {label} + {label} )} diff --git a/source/frontend/src/features/mapSideBar/acquisition/common/GenerateForm/GenerateFormView.tsx b/source/frontend/src/features/mapSideBar/acquisition/common/GenerateForm/GenerateFormView.tsx index 9ab4183c37..fc9248f849 100644 --- 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< onGenerateClick(entry.formType)} + title="Generate" > {entry.text} diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.test.tsx b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.test.tsx index 64981d85c4..1eff856b28 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.test.tsx +++ b/source/frontend/src/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/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/update/UpdateAcquisitionForm.test.tsx b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/update/UpdateAcquisitionForm.test.tsx index c81957bd32..ba56715d2d 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/update/UpdateAcquisitionForm.test.tsx +++ b/source/frontend/src/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/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.tsx b/source/frontend/src/features/mapSideBar/disposition/common/DispositionMenu.tsx index 8240928a46..4df637f9e5 100644 --- 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 ? ( - {label} + + {label} + ) : ( - handleClick(index)}>{label} + handleClick(index)}> + {label} + )} @@ -89,10 +93,12 @@ const DispositionMenu: React.FunctionComponent< {activeIndex ? ( - {label} + + {label} + ) : ( - {label} + {label} )} diff --git a/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx b/source/frontend/src/features/mapSideBar/research/common/ResearchMenu.tsx index d46d7b4a17..d8acf4ae1d 100644 --- 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< {props.selectedIndex === index ? ( - {label} + + {label} + ) : ( - handleClick(index)}>{label} + handleClick(index)}> + {label} + )} @@ -52,10 +56,14 @@ const ResearchMenu: React.FunctionComponent< {index === 0 && ( <> {props.selectedIndex === index ? ( - {label} + + {label} + ) : ( - handleClick(index)}>{label} + handleClick(index)}> + {label} + )} From 607b256395b50cf99c687b47f3bdef38a2a09d68 Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Date: Wed, 6 Nov 2024 15:42:08 -0800 Subject: [PATCH 2/2] Update snapshots --- .../__snapshots__/AcquisitionView.test.tsx.snap | 8 +++++++- .../common/__snapshots__/AcquisitionMenu.test.tsx.snap | 8 +++++++- .../__snapshots__/DispositionView.test.tsx.snap | 7 ++++++- .../common/__snapshots__/DispositionMenu.test.tsx.snap | 8 +++++++- .../__snapshots__/ResearchContainer.test.tsx.snap | 7 ++++++- .../common/__snapshots__/ResearchMenu.test.tsx.snap | 8 +++++++- 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap index e215cd1feb..d41a4834c9 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap @@ -911,7 +911,11 @@ exports[`AcquisitionView component > renders as expected 1`] = `
- File Summary + + File Summary +
renders as expected 1`] = ` >