From d9e1cebca4b2826705abb9211cc8296cae626fb6 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 09:32:22 -0400 Subject: [PATCH 01/49] fix handleSelect in ConditionTable.tsx --- .../page-builder/condition/search/ConditionTable.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionTable.tsx b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionTable.tsx index 4dd8661e74..14f9f6634a 100644 --- a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionTable.tsx +++ b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionTable.tsx @@ -81,11 +81,15 @@ export const ConditionTable = ({ conditions, isLoading, onSelectionChange, onSor onSelectionChange(selected); }, [selected]); - const handleSelect = (event: ChangeEvent, item: { id: number }) => { + const handleSelect = (event: ChangeEvent, item: TableBody) => { + if (item.id === undefined || item.id === null) return; + + const itemId = typeof item.id === 'number' ? item.id : Number(item.id); + if (event.target.checked) { - setSelected((current) => [...current, item.id]); + setSelected((current) => [...current, itemId]); } else { - setSelected((current) => current.filter((id) => id !== item.id)); + setSelected((current) => current.filter((id) => id !== itemId)); } }; From b3c57c23e0bfe6e152c0df7b454a3dc6b2064496 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 09:39:10 -0400 Subject: [PATCH 02/49] set type for selectField obj --- apps/modernization-ui/src/utils/util.spec.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/modernization-ui/src/utils/util.spec.ts b/apps/modernization-ui/src/utils/util.spec.ts index ae3ba15e2d..bea98355ae 100644 --- a/apps/modernization-ui/src/utils/util.spec.ts +++ b/apps/modernization-ui/src/utils/util.spec.ts @@ -2,28 +2,28 @@ import { selectField, toClockString } from './util'; describe('selectField', () => { it('should return the value at the given path', () => { - const obj = { a: { b: { c: 42 } } }; + const obj: Record = { a: { b: { c: 42 } } }; const path = 'a.b.c'; const result = selectField(obj, path); expect(result).toBe(42); }); it('should return undefined for an invalid path', () => { - const obj = { a: { b: { c: 42 } } }; + const obj: Record = { a: { b: { c: 42 } } }; const path = 'a.b.d'; const result = selectField(obj, path); expect(result).toBeUndefined(); }); it('should return the object itself for an empty path', () => { - const obj = { a: { b: { c: 42 } } }; + const obj: Record = { a: { b: { c: 42 } } }; const path = ''; const result = selectField(obj, path); expect(result).toBe(obj); }); it('should return the nested object for a non-terminal path', () => { - const obj = { a: { b: { c: 42 } } }; + const obj: Record = { a: { b: { c: 42 } } }; const path = 'a.b'; const result = selectField(obj, path); expect(result).toStrictEqual({ c: 42 }); @@ -37,14 +37,14 @@ describe('selectField', () => { }); it('should handle paths with array indices', () => { - const obj = { a: [{ b: 42 }] }; + const obj: Record = { a: [{ b: 42 }] }; const path = 'a.0.b'; const result = selectField(obj, path); expect(result).toBe(42); }); it('should return undefined for out of bounds array indices', () => { - const obj = { a: [{ b: 42 }] }; + const obj: Record = { a: [{ b: 42 }] }; const path = 'a.1.b'; const result = selectField(obj, path); expect(result).toBeUndefined(); From 931c2a9bf7637b787fd540ab3772a71d86da9f3b Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 09:53:00 -0400 Subject: [PATCH 03/49] update toBeCalledWith to toHaveBeenCalledWith --- .../panel/MatchingCriteriaSidePanel.spec.tsx | 2 +- .../TabbedButtonBar/TabbedButtonBar.spec.tsx | 2 +- .../condition/search/ConditionSearch.spec.tsx | 2 +- .../CancelAddPatientPanel.spec.tsx | 6 +++--- .../patient/data/race/RaceEntryFields.spec.tsx | 6 +++--- .../InvestigationSearchResultListItem.spec.tsx | 2 +- .../pagination/SearchResultPagination.spec.tsx | 6 +++--- .../SearchResultPageSizeSelect.spec.tsx | 2 +- .../src/apps/search/terms/removeTerm.spec.ts | 16 ++++++++-------- .../src/apps/search/useSearchCriteria.ts | 2 +- .../src/apps/search/useSearchResults.spec.tsx | 6 +++--- .../design-system/pagination/Pagination.spec.tsx | 6 +++--- .../preferences/useSortingPreferences.spec.tsx | 10 +++++----- .../race/edit/RaceDemographicFields.spec.tsx | 4 ++-- .../src/utils/predicate/allOf.spec.ts | 16 ++++++++-------- .../src/utils/predicate/anyOf.spec.ts | 16 ++++++++-------- .../src/utils/predicate/not.spec.ts | 4 ++-- 17 files changed, 54 insertions(+), 54 deletions(-) diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx index 8b0355d768..73c54731bd 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx @@ -253,6 +253,6 @@ describe('MatchingCriteriaSidePanel', () => { await user.click(add); - expect(onAccept).toBeCalledWith([]); + expect(onAccept).toHaveBeenCalledWith([]); }); }); diff --git a/apps/modernization-ui/src/apps/page-builder/components/TabbedButtonBar/TabbedButtonBar.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/TabbedButtonBar/TabbedButtonBar.spec.tsx index b4162820ac..eda4c9c488 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/TabbedButtonBar/TabbedButtonBar.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/TabbedButtonBar/TabbedButtonBar.spec.tsx @@ -17,7 +17,7 @@ describe('Tabbed button bar', () => { await waitFor(() => { fireEvent.click(buttons[1]); }); - expect(mockFn).toBeCalledWith('2'); + expect(mockFn).toHaveBeenCalledWith('2'); }); it('should set active class on click', async () => { diff --git a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.spec.tsx b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.spec.tsx index b5eed2e124..578c4d9e70 100644 --- a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.spec.tsx @@ -103,7 +103,7 @@ describe('ConditionSearch', () => { ); - expect(search).toBeCalledWith({ page: 0, pageSize: 10, sort: undefined }); + expect(search).toHaveBeenCalledWith({ page: 0, pageSize: 10, sort: undefined }); }); it('should have aria labels', () => { diff --git a/apps/modernization-ui/src/apps/patient/add/cancelAddPatientPanel/CancelAddPatientPanel.spec.tsx b/apps/modernization-ui/src/apps/patient/add/cancelAddPatientPanel/CancelAddPatientPanel.spec.tsx index 26d71a7411..04881fa277 100644 --- a/apps/modernization-ui/src/apps/patient/add/cancelAddPatientPanel/CancelAddPatientPanel.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/cancelAddPatientPanel/CancelAddPatientPanel.spec.tsx @@ -28,7 +28,7 @@ describe('CancelAddPatientPanel', () => { await user.click(closer); - expect(onClose).toBeCalled(); + expect(onClose).toHaveBeenCalledWith(); }); it('should call onConfirm when confirm button is clicked', async () => { @@ -41,7 +41,7 @@ describe('CancelAddPatientPanel', () => { await user.click(confirmButton); - expect(onConfirm).toBeCalled(); + expect(onConfirm).toHaveBeenCalledWith(); }); it('should save checkbox state to local storage on confirm', async () => { @@ -53,6 +53,6 @@ describe('CancelAddPatientPanel', () => { await user.click(getByRole('button', { name: 'Yes, cancel' })); expect(getByRole('checkbox')).toBeChecked(); - expect(mockSave).toBeCalledWith(true); + expect(mockSave).toHaveBeenCalledWith(true); }); }); diff --git a/apps/modernization-ui/src/apps/patient/data/race/RaceEntryFields.spec.tsx b/apps/modernization-ui/src/apps/patient/data/race/RaceEntryFields.spec.tsx index c93b9b7b0c..2c69ae6925 100644 --- a/apps/modernization-ui/src/apps/patient/data/race/RaceEntryFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/data/race/RaceEntryFields.spec.tsx @@ -72,7 +72,7 @@ describe('Race entry fields', () => { await user.selectOptions(race, 'selected'); - expect(mockDetailResolver).toBeCalledWith('selected'); + expect(mockDetailResolver).toHaveBeenCalledWith('selected'); }); it('detailed race values should clear when the category changes', async () => { @@ -102,7 +102,7 @@ describe('Race entry fields', () => { await user.selectOptions(race, 'other').then(() => user.click(detailed)); - expect(mockDetailResolver).toBeCalledWith('other'); + expect(mockDetailResolver).toHaveBeenCalledWith('other'); expect(detailed).toHaveValue(''); }); @@ -175,7 +175,7 @@ describe('Race entry fields', () => { .then(() => user.tab()); expect(getByText('category not valid')).toBeInTheDocument(); - expect(validator).toBeCalledWith(19, expect.objectContaining({ value: 'other' })); + expect(validator).toHaveBeenCalledWith(19, expect.objectContaining({ value: 'other' })); }); it('should have accessibility description for the as of date field', () => { const { getByLabelText } = render(); diff --git a/apps/modernization-ui/src/apps/search/investigation/result/list/InvestigationSearchResultListItem.spec.tsx b/apps/modernization-ui/src/apps/search/investigation/result/list/InvestigationSearchResultListItem.spec.tsx index 523a3d115a..e4b2c0b3c4 100644 --- a/apps/modernization-ui/src/apps/search/investigation/result/list/InvestigationSearchResultListItem.spec.tsx +++ b/apps/modernization-ui/src/apps/search/investigation/result/list/InvestigationSearchResultListItem.spec.tsx @@ -257,7 +257,7 @@ describe('when showing an investigation search results', () => { expect(getByText('Notification')).toBeInTheDocument(); expect(getByText('notification-status-display')).toBeInTheDocument(); - expect(notificationStatusResolver).toBeCalledWith('notification-status'); + expect(notificationStatusResolver).toHaveBeenCalledWith('notification-status'); }); it('should display the provided notification status unknown value is given', () => { diff --git a/apps/modernization-ui/src/apps/search/layout/result/pagination/SearchResultPagination.spec.tsx b/apps/modernization-ui/src/apps/search/layout/result/pagination/SearchResultPagination.spec.tsx index f9aed18e9b..3971e4a019 100644 --- a/apps/modernization-ui/src/apps/search/layout/result/pagination/SearchResultPagination.spec.tsx +++ b/apps/modernization-ui/src/apps/search/layout/result/pagination/SearchResultPagination.spec.tsx @@ -73,7 +73,7 @@ describe('When paginating search results', () => { await user.click(page); - expect(mockRequest).toBeCalledWith(2); + expect(mockRequest).toHaveBeenCalledWith(2); }); it('should request the selected page when a page is clicked.', async () => { @@ -89,7 +89,7 @@ describe('When paginating search results', () => { await user.click(page); - expect(mockRequest).toBeCalledWith(2); + expect(mockRequest).toHaveBeenCalledWith(2); }); it('should request the next page when the "Next page" button is clicked', async () => { @@ -105,7 +105,7 @@ describe('When paginating search results', () => { await user.click(page); - expect(mockRequest).toBeCalledWith(3); + expect(mockRequest).toHaveBeenCalledWith(3); }); it('should default to a page size of 20', () => { diff --git a/apps/modernization-ui/src/apps/search/layout/result/pagination/page-size-select/SearchResultPageSizeSelect.spec.tsx b/apps/modernization-ui/src/apps/search/layout/result/pagination/page-size-select/SearchResultPageSizeSelect.spec.tsx index d8da192d60..4869ef1f6e 100644 --- a/apps/modernization-ui/src/apps/search/layout/result/pagination/page-size-select/SearchResultPageSizeSelect.spec.tsx +++ b/apps/modernization-ui/src/apps/search/layout/result/pagination/page-size-select/SearchResultPageSizeSelect.spec.tsx @@ -46,6 +46,6 @@ describe('when changing the number of results per page', () => { const user = userEvent.setup(); await user.selectOptions(toggle, '50'); - expect(mockOnPageSizeChanged).toBeCalledWith(50); + expect(mockOnPageSizeChanged).toHaveBeenCalledWith(50); }); }); diff --git a/apps/modernization-ui/src/apps/search/terms/removeTerm.spec.ts b/apps/modernization-ui/src/apps/search/terms/removeTerm.spec.ts index 1778860b72..428cf3693b 100644 --- a/apps/modernization-ui/src/apps/search/terms/removeTerm.spec.ts +++ b/apps/modernization-ui/src/apps/search/terms/removeTerm.spec.ts @@ -27,9 +27,9 @@ describe('when removing search terms', () => { remove({ ...DEFAULT_TERM, source: 'value' }); - expect(after).toBeCalled(); - expect(setValue).toBeCalledWith('value', null); - expect(resetField).toBeCalledWith('value'); + expect(after).toHaveBeenCalled(); + expect(setValue).toHaveBeenCalledWith('value', null); + expect(resetField).toHaveBeenCalledWith('value'); }); it('should remove a term with multi values', () => { @@ -45,7 +45,7 @@ describe('when removing search terms', () => { remove({ ...DEFAULT_TERM, source: 'values' }); }); - expect(after).toBeCalled(); + expect(after).toHaveBeenCalled(); const actual = result.current.getValues(); @@ -64,7 +64,7 @@ describe('when removing search terms', () => { remove({ ...DEFAULT_TERM, source: 'values' }); }); - expect(after).toBeCalled(); + expect(after).toHaveBeenCalled(); const actual = result.current.getValues(); @@ -84,7 +84,7 @@ describe('when removing search terms', () => { remove({ ...DEFAULT_TERM, source: 'value', value: 'two', partial: true }); }); - expect(after).toBeCalled(); + expect(after).toHaveBeenCalled(); const actual = result.current.getValues(); @@ -106,7 +106,7 @@ describe('when removing search terms', () => { remove({ ...DEFAULT_TERM, source: 'nested.value' }); }); - expect(after).toBeCalled(); - expect(resetField).toBeCalledWith('nested.value'); + expect(after).toHaveBeenCalled(); + expect(resetField).toHaveBeenCalledWith('nested.value'); }); }); diff --git a/apps/modernization-ui/src/apps/search/useSearchCriteria.ts b/apps/modernization-ui/src/apps/search/useSearchCriteria.ts index ff2c86be59..63fb8554d4 100644 --- a/apps/modernization-ui/src/apps/search/useSearchCriteria.ts +++ b/apps/modernization-ui/src/apps/search/useSearchCriteria.ts @@ -97,7 +97,7 @@ const useSearchCriteria = ({ defaultValues }: Options): Int .then((criteria) => dispatch({ type: 'wait', criteria })); } else if (state.status === 'preparing') { // encrypt the new criteria - encrypt(state.criteria) + encrypt(state.criteria as Record) .then((encrypted) => encrypted.value) .then((encrypted) => { if (encrypted) { diff --git a/apps/modernization-ui/src/apps/search/useSearchResults.spec.tsx b/apps/modernization-ui/src/apps/search/useSearchResults.spec.tsx index c1cb4f5d5c..c6b6b684f2 100644 --- a/apps/modernization-ui/src/apps/search/useSearchResults.spec.tsx +++ b/apps/modernization-ui/src/apps/search/useSearchResults.spec.tsx @@ -245,7 +245,7 @@ describe('when searching using useSearchResults', () => { }); await waitFor(() => - expect(resultResolver).toBeCalledWith( + expect(resultResolver).toHaveBeenCalledWith( expect.objectContaining({ page: expect.objectContaining({ number: 1, size: 307 }) }) ) ); @@ -267,7 +267,7 @@ describe('when searching using useSearchResults', () => { }); await waitFor(() => - expect(resultResolver).toBeCalledWith( + expect(resultResolver).toHaveBeenCalledWith( expect.objectContaining({ page: expect.objectContaining({ number: 1, size: 307 }) }) ) ); @@ -289,7 +289,7 @@ describe('when searching using useSearchResults', () => { }); await waitFor(() => - expect(resultResolver).toBeCalledWith( + expect(resultResolver).toHaveBeenCalledWith( expect.objectContaining({ page: expect.objectContaining({ number: 1, size: 307 }) }) ) ); diff --git a/apps/modernization-ui/src/design-system/pagination/Pagination.spec.tsx b/apps/modernization-ui/src/design-system/pagination/Pagination.spec.tsx index b3e8f519a6..2cd1a98bef 100644 --- a/apps/modernization-ui/src/design-system/pagination/Pagination.spec.tsx +++ b/apps/modernization-ui/src/design-system/pagination/Pagination.spec.tsx @@ -110,7 +110,7 @@ describe('when paginating a large set of data', () => { await user.click(page); - expect(mockOnPrevious).toBeCalled(); + expect(mockOnPrevious).toHaveBeenCalled(); }); it('should request the selected page when a page is clicked', async () => { @@ -134,7 +134,7 @@ describe('when paginating a large set of data', () => { await user.click(page); - expect(mockOnSelectPage).toBeCalledWith(2); + expect(mockOnSelectPage).toHaveBeenCalledWith(2); }); it('should request the next page when the "Next page" button is clicked', async () => { @@ -158,6 +158,6 @@ describe('when paginating a large set of data', () => { await user.click(page); - expect(mockOnNext).toBeCalled(); + expect(mockOnNext).toHaveBeenCalled(); }); }); diff --git a/apps/modernization-ui/src/design-system/sorting/preferences/useSortingPreferences.spec.tsx b/apps/modernization-ui/src/design-system/sorting/preferences/useSortingPreferences.spec.tsx index 4692984edc..d428bc1304 100644 --- a/apps/modernization-ui/src/design-system/sorting/preferences/useSortingPreferences.spec.tsx +++ b/apps/modernization-ui/src/design-system/sorting/preferences/useSortingPreferences.spec.tsx @@ -58,7 +58,7 @@ describe('useSortingPreferences', () => { expect.objectContaining({ property: 'property-value', direction: 'asc' }) ); - expect(mockSortBy).toBeCalledWith('property-value', 'asc'); + expect(mockSortBy).toHaveBeenCalledWith('property-value', 'asc'); }); it('should reset the active sorting', () => { @@ -74,7 +74,7 @@ describe('useSortingPreferences', () => { expect(result.current.active).toBeUndefined(); - expect(mockReset).toBeCalled(); + expect(mockReset).toHaveBeenCalled(); }); it('should sync with active sort changes', () => { @@ -100,7 +100,7 @@ describe('useSortingPreferences', () => { expect.objectContaining({ property: 'initial-value', direction: 'desc' }) ); - expect(mockSortBy).toBeCalledWith('initial-value', 'desc'); + expect(mockSortBy).toHaveBeenCalledWith('initial-value', 'desc'); }); it('should save sorting preferences when active sorting is changed', () => { @@ -110,7 +110,7 @@ describe('useSortingPreferences', () => { result.current.sortOn({ property: 'property-value', direction: 'asc' as Direction }); }); - expect(mockSave).toBeCalledWith(expect.objectContaining({ property: 'property-value', direction: 'asc' })); + expect(mockSave).toHaveBeenCalledWith(expect.objectContaining({ property: 'property-value', direction: 'asc' })); }); it('should remove sorting preferences when active sorting is reset', () => { @@ -126,6 +126,6 @@ describe('useSortingPreferences', () => { expect(result.current.active).toBeUndefined(); - expect(mockRemove).toBeCalled(); + expect(mockRemove).toHaveBeenCalled(); }); }); diff --git a/apps/modernization-ui/src/libs/patient/demographics/race/edit/RaceDemographicFields.spec.tsx b/apps/modernization-ui/src/libs/patient/demographics/race/edit/RaceDemographicFields.spec.tsx index f3c5aa2bff..1197df6bd3 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/race/edit/RaceDemographicFields.spec.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/race/edit/RaceDemographicFields.spec.tsx @@ -93,7 +93,7 @@ describe('Race entry fields', () => { const race = screen.getByRole('combobox', { name: 'Race' }); await user.selectOptions(race, 'other'); - expect(mockSelected).toBeCalledWith({ value: 'other', name: 'other name' }); + expect(mockSelected).toHaveBeenCalledWith({ value: 'other', name: 'other name' }); rerender( { .then(() => user.tab()); expect(getByText('category not valid')).toBeInTheDocument(); - expect(validator).toBeCalledWith(19, expect.objectContaining({ value: 'other' })); + expect(validator).toHaveBeenCalledWith(19, expect.objectContaining({ value: 'other' })); }); it('should have accessibility description for the as of date field', () => { const { getByLabelText } = render(); diff --git a/apps/modernization-ui/src/utils/predicate/allOf.spec.ts b/apps/modernization-ui/src/utils/predicate/allOf.spec.ts index 982bb738bd..ad62e303cc 100644 --- a/apps/modernization-ui/src/utils/predicate/allOf.spec.ts +++ b/apps/modernization-ui/src/utils/predicate/allOf.spec.ts @@ -17,10 +17,10 @@ describe('allOf', () => { expect(actual).toBe(true); - expect(first).toBeCalledWith(6); - expect(second).toBeCalledWith(6); - expect(third).toBeCalledWith(6); - expect(fourth).toBeCalledWith(6); + expect(first).toHaveBeenCalledWith(6); + expect(second).toHaveBeenCalledWith(6); + expect(third).toHaveBeenCalledWith(6); + expect(fourth).toHaveBeenCalledWith(6); }); it('should return false, failing fast, if any predicates fails', () => { @@ -33,9 +33,9 @@ describe('allOf', () => { expect(actual).toBe(false); - expect(first).toBeCalledWith(6); - expect(second).toBeCalledWith(6); - expect(third).not.toBeCalled(); - expect(fourth).not.toBeCalled(); + expect(first).toHaveBeenCalledWith(6); + expect(second).toHaveBeenCalledWith(6); + expect(third).not.toHaveBeenCalled(); + expect(fourth).not.toHaveBeenCalled(); }); }); diff --git a/apps/modernization-ui/src/utils/predicate/anyOf.spec.ts b/apps/modernization-ui/src/utils/predicate/anyOf.spec.ts index 298801d052..433863aa3b 100644 --- a/apps/modernization-ui/src/utils/predicate/anyOf.spec.ts +++ b/apps/modernization-ui/src/utils/predicate/anyOf.spec.ts @@ -17,10 +17,10 @@ describe('anyOf', () => { expect(actual).toBe(false); - expect(first).toBeCalledWith(6); - expect(second).toBeCalledWith(6); - expect(third).toBeCalledWith(6); - expect(fourth).toBeCalledWith(6); + expect(first).toHaveBeenCalledWith(6); + expect(second).toHaveBeenCalledWith(6); + expect(third).toHaveBeenCalledWith(6); + expect(fourth).toHaveBeenCalledWith(6); }); it('should return true, when the first predicate succeeds', () => { @@ -33,9 +33,9 @@ describe('anyOf', () => { expect(actual).toBe(true); - expect(first).toBeCalledWith(6); - expect(second).toBeCalledWith(6); - expect(third).not.toBeCalled(); - expect(fourth).not.toBeCalled(); + expect(first).toHaveBeenCalledWith(6); + expect(second).toHaveBeenCalledWith(6); + expect(third).not.toHaveBeenCalled(); + expect(fourth).not.toHaveBeenCalled(); }); }); diff --git a/apps/modernization-ui/src/utils/predicate/not.spec.ts b/apps/modernization-ui/src/utils/predicate/not.spec.ts index 446d3b50cf..41d435d574 100644 --- a/apps/modernization-ui/src/utils/predicate/not.spec.ts +++ b/apps/modernization-ui/src/utils/predicate/not.spec.ts @@ -8,7 +8,7 @@ describe('not', () => { expect(actual).toBe(false); - expect(predicate).toBeCalledWith(7); + expect(predicate).toHaveBeenCalledWith(7); }); it('should return true when the given predicate returns false', () => { @@ -18,6 +18,6 @@ describe('not', () => { expect(actual).toBe(true); - expect(predicate).toBeCalledWith(7); + expect(predicate).toHaveBeenCalledWith(7); }); }); From 513ad5935528b4568e453eb223016e728b4602b3 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 09:58:04 -0400 Subject: [PATCH 04/49] add type for callback on handleExternalOnBlur --- .../src/design-system/date/picker/DatePicker.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/modernization-ui/src/design-system/date/picker/DatePicker.tsx b/apps/modernization-ui/src/design-system/date/picker/DatePicker.tsx index 37fd6f00b9..aaf9416603 100644 --- a/apps/modernization-ui/src/design-system/date/picker/DatePicker.tsx +++ b/apps/modernization-ui/src/design-system/date/picker/DatePicker.tsx @@ -63,7 +63,7 @@ const DatePicker = ({ } }, [current, externalInputRef.current]); - const handleExternalOnBlur = useCallback((e) => onBlur?.(e), [onBlur]); + const handleExternalOnBlur = useCallback((e: Event) => onBlur?.(), [onBlur]); const handleExternalOnChange = useCallback( (event: Event) => { From c72a7e476a1f336df5224390b30e9dec365dce6c Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 09:59:58 -0400 Subject: [PATCH 05/49] add parens to fn --- .../ManageSectionTile/ManageSectionTile.spec.tsx | 2 +- .../edit/tabs/AddEditTab/AddEditTab.spec.tsx | 2 +- .../src/filters/applied/AppliedFilters.spec.tsx | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx index 8f98af21dc..b84efd4e29 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx @@ -86,7 +86,7 @@ describe('when ManageSectionTile renders', () => { { it('should display a single value filter when applied', () => { - const { getByText } = render(); + const { getByText } = render(); const title = getByText('All Testing'); @@ -51,7 +51,7 @@ describe('when there are applied filters', () => { value: 'prefix-value', }; - const { getByText } = render(); + const { getByText } = render(); expect(getByText('Single Value Starts with prefix-value')).toBeInTheDocument(); }); @@ -64,7 +64,7 @@ describe('when there are applied filters', () => { values: ['value-one', 'value-two'], }; - const { getByText } = render(); + const { getByText } = render(); expect(getByText('Multi Value equals value-one OR value-two')).toBeInTheDocument(); }); @@ -76,7 +76,7 @@ describe('when there are applied filters', () => { operator: { name: 'today', value: 'TODAY' }, }; - const { getByText } = render(); + const { getByText } = render(); expect(getByText('Date Period today')).toBeInTheDocument(); }); @@ -90,7 +90,7 @@ describe('when there are applied filters', () => { before: '12/29/2023', }; - const { getByText } = render(); + const { getByText } = render(); expect(getByText('Date Range between 12/01/2023 and 12/29/2023')); }); From 3e239aefee47e95f915dd9625f2723c5e13dcdd5 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:01:44 -0400 Subject: [PATCH 06/49] set types on params for handleFieldOnChange --- .../src/design-system/date/criteria/range/DateRangeField.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/modernization-ui/src/design-system/date/criteria/range/DateRangeField.tsx b/apps/modernization-ui/src/design-system/date/criteria/range/DateRangeField.tsx index 2a610ce108..80854f48f6 100644 --- a/apps/modernization-ui/src/design-system/date/criteria/range/DateRangeField.tsx +++ b/apps/modernization-ui/src/design-system/date/criteria/range/DateRangeField.tsx @@ -16,7 +16,7 @@ export type DateRangeFieldProps = { }; const DateRangeField = ({ id, value, sizing, onChange, onBlur, label, required }: DateRangeFieldProps) => { - const handleFieldOnChange = (v, type) => { + const handleFieldOnChange = (v: any, type: string) => { if (type === 'to') { onChange({ between: { to: v, from: value?.between.from } }); } From 994faa04500e68bc84509c5bee64b530d46848a6 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:29:12 -0400 Subject: [PATCH 07/49] dateRangeFilter updates --- .../src/apps/report/run/filters/basic/DateRangeFilter.spec.tsx | 1 + .../src/apps/report/run/filters/basic/DateRangeFilter.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/modernization-ui/src/apps/report/run/filters/basic/DateRangeFilter.spec.tsx b/apps/modernization-ui/src/apps/report/run/filters/basic/DateRangeFilter.spec.tsx index 5a214690c7..b54e3ed29f 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/basic/DateRangeFilter.spec.tsx +++ b/apps/modernization-ui/src/apps/report/run/filters/basic/DateRangeFilter.spec.tsx @@ -15,6 +15,7 @@ describe('DateRangeFilter', () => { }, isRequired: true, reportColumnUid: 2001, + defaultIncludeNulls: false, }; const MOCK_LABEL = 'Full Name'; diff --git a/apps/modernization-ui/src/apps/report/run/filters/basic/DateRangeFilter.tsx b/apps/modernization-ui/src/apps/report/run/filters/basic/DateRangeFilter.tsx index 014b370b76..01d529b24b 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/basic/DateRangeFilter.tsx +++ b/apps/modernization-ui/src/apps/report/run/filters/basic/DateRangeFilter.tsx @@ -30,7 +30,7 @@ const dateRangeValidator = (filter: BasicFilterConfiguration, label: string) => return filter.isRequired ? validateRequiredRule(label).required.message : true; } - const errorMsg = validateDateRange(value, label); + const errorMsg = validateDateRange(value.map((v) => v ?? ''), label); if (errorMsg) return errorMsg; From 5b901bd4a514ccc1b6e4f505972d1c382c7e44ac Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:31:59 -0400 Subject: [PATCH 08/49] null coalesce the value on NumericInput --- .../general/edit/GeneralInformationDemographicFields.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/modernization-ui/src/libs/patient/demographics/general/edit/GeneralInformationDemographicFields.tsx b/apps/modernization-ui/src/libs/patient/demographics/general/edit/GeneralInformationDemographicFields.tsx index 7e6f3e45f7..cbeffdcdd5 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/general/edit/GeneralInformationDemographicFields.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/general/edit/GeneralInformationDemographicFields.tsx @@ -85,7 +85,7 @@ const GeneralInformationDemographicFields = ({ orientation={orientation} onBlur={onBlur} onChange={onChange} - value={value} + value={value ?? undefined} id={name} name={name} min="0" @@ -105,7 +105,7 @@ const GeneralInformationDemographicFields = ({ orientation={orientation} onBlur={onBlur} onChange={onChange} - value={value} + value={value ?? undefined} id={name} name={name} min="0" From e501745444d46d67afd9f6a794accc3df4759dc8 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:32:48 -0400 Subject: [PATCH 09/49] null coalesce on Modal id --- .../src/components/ModalComponent/ModalComponent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/modernization-ui/src/components/ModalComponent/ModalComponent.tsx b/apps/modernization-ui/src/components/ModalComponent/ModalComponent.tsx index 70dafcfd9d..0c5f2e0ac2 100644 --- a/apps/modernization-ui/src/components/ModalComponent/ModalComponent.tsx +++ b/apps/modernization-ui/src/components/ModalComponent/ModalComponent.tsx @@ -32,7 +32,7 @@ export const ModalComponent = ({ forceAction={disabled} ref={modalRef} isLarge={isLarge} - id={id} + id={id ?? ''} aria-labelledby={`${id}-heading`} className={`padding-0 ${size} ${className}`} aria-describedby={`${id}-description`} From 21b6d6941ce11f102517725c574600864b8ce4e8 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:33:09 -0400 Subject: [PATCH 10/49] mock filter missing required defaultIncludeNulls --- .../apps/report/run/filters/basic/MonthYearRangeFilter.spec.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/modernization-ui/src/apps/report/run/filters/basic/MonthYearRangeFilter.spec.tsx b/apps/modernization-ui/src/apps/report/run/filters/basic/MonthYearRangeFilter.spec.tsx index 77b394fab9..c6017d1ad2 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/basic/MonthYearRangeFilter.spec.tsx +++ b/apps/modernization-ui/src/apps/report/run/filters/basic/MonthYearRangeFilter.spec.tsx @@ -15,6 +15,7 @@ describe('MonthYearRangeFilter', () => { }, isRequired: true, reportColumnUid: 2001, + defaultIncludeNulls: false, }; const MOCK_LABEL = 'Full Name'; From 1dfb52f57b9f49f738920201aa0e445a9bd8ca55 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:33:50 -0400 Subject: [PATCH 11/49] null coalesce NumericInput value --- .../demographics/sex-birth/edit/SexBirthDemographicFields.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/modernization-ui/src/libs/patient/demographics/sex-birth/edit/SexBirthDemographicFields.tsx b/apps/modernization-ui/src/libs/patient/demographics/sex-birth/edit/SexBirthDemographicFields.tsx index c2b5ba38af..f17a5dcfcc 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/sex-birth/edit/SexBirthDemographicFields.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/sex-birth/edit/SexBirthDemographicFields.tsx @@ -221,7 +221,7 @@ const SexBirthDemographicFields = ({ label={labels.order} id={name} name={name} - value={value} + value={value ?? undefined} min="0" max="9999" onChange={onChange} From 25ed0e717b432a58095a906fd0b99c4433cd80ca Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:40:45 -0400 Subject: [PATCH 12/49] ValueEditorSwitch pass any type for default --- .../src/apps/patient/add/extended/useAddExtendedPatient.spec.ts | 2 +- .../src/apps/report/run/filters/advanced/ValueEditorSwitch.tsx | 2 +- .../src/components/TabNavigation/TabNavigation.stories.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/modernization-ui/src/apps/patient/add/extended/useAddExtendedPatient.spec.ts b/apps/modernization-ui/src/apps/patient/add/extended/useAddExtendedPatient.spec.ts index e6ac2bb0be..b29789f0d5 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/useAddExtendedPatient.spec.ts +++ b/apps/modernization-ui/src/apps/patient/add/extended/useAddExtendedPatient.spec.ts @@ -33,7 +33,7 @@ describe('when adding patients with extended data', () => { result.current.create(entry); }); - expect(mockCreate).toBeCalledWith(entry); + expect(mockCreate).toHaveBeenCalledWith(entry); }); it('should validate name sub form is not dirty when attempting to create', async () => { diff --git a/apps/modernization-ui/src/apps/report/run/filters/advanced/ValueEditorSwitch.tsx b/apps/modernization-ui/src/apps/report/run/filters/advanced/ValueEditorSwitch.tsx index 665d5d2467..9676029bcc 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/advanced/ValueEditorSwitch.tsx +++ b/apps/modernization-ui/src/apps/report/run/filters/advanced/ValueEditorSwitch.tsx @@ -8,7 +8,7 @@ const ValueEditorSwitch = (props: ValueEditorProps; default: - return ; + return ; } }; diff --git a/apps/modernization-ui/src/components/TabNavigation/TabNavigation.stories.tsx b/apps/modernization-ui/src/components/TabNavigation/TabNavigation.stories.tsx index 32348a129d..a0e6ef5e3b 100644 --- a/apps/modernization-ui/src/components/TabNavigation/TabNavigation.stories.tsx +++ b/apps/modernization-ui/src/components/TabNavigation/TabNavigation.stories.tsx @@ -1,5 +1,5 @@ import { MemoryRouter } from 'react-router'; -import { Meta, StoryObj } from '@storybook/react/*'; +import { Meta, StoryObj } from '@storybook/react'; import { TabNavigation, TabNavigationEntry, TabNavigationProps } from './TabNavigation'; const meta = { From ca3a28184071e1ba6e9d56d2794200ab5d2daa47 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:41:53 -0400 Subject: [PATCH 13/49] replace toBeCalled with toHaveBeenCalled --- .../ImportTemplate/ImportTemplate.spec.tsx | 2 +- .../pages/AddNewPage/AddNewPage.spec.tsx | 2 +- .../patient/add/extended/AddPatientExtended.spec.tsx | 2 +- .../src/design-system/modal/Confirmation.spec.tsx | 12 ++++++------ .../src/design-system/modal/Modal.spec.tsx | 4 ++-- .../src/design-system/modal/Success.spec.tsx | 4 ++-- .../src/design-system/modal/Warning.spec.tsx | 4 ++-- .../panel/closable/ClosablePanel.spec.tsx | 2 +- .../src/utils/mapping/maybeMappAll.spec.ts | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.spec.tsx index fd3c0168b4..21341b6f38 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.spec.tsx @@ -135,7 +135,7 @@ describe('when canceled', () => { }); await waitFor(() => { - expect(onCancel).toBeCalled(); + expect(onCancel).toHaveBeenCalled(); }); }); }); diff --git a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx index 5b9a5e8f53..f2e0b08ef6 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx @@ -133,7 +133,7 @@ describe('Add New Page', () => { await user.click(submit); expect(setHrefSpy).toHaveBeenCalledWith('/nbs/page-builder/api/v1/pages/create'); - expect(savePage).not.toBeCalled(); + expect(savePage).not.toHaveBeenCalled(); }); it.skip('should display form when Investigation type is selected', async () => { diff --git a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.spec.tsx index de1e3f6731..12a5ec8961 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.spec.tsx @@ -152,7 +152,7 @@ describe('AddPatientExtended', () => { const cancelButton = screen.getByRole('button', { name: 'Cancel' }); cancelButton.click(); - expect(useNavigate).toBeCalled(); + expect(useNavigate).toHaveBeenCalled(); }); it('should not show modal when local storage flag is set', () => { diff --git a/apps/modernization-ui/src/design-system/modal/Confirmation.spec.tsx b/apps/modernization-ui/src/design-system/modal/Confirmation.spec.tsx index b52aeb24f2..a443fb5d29 100644 --- a/apps/modernization-ui/src/design-system/modal/Confirmation.spec.tsx +++ b/apps/modernization-ui/src/design-system/modal/Confirmation.spec.tsx @@ -92,8 +92,8 @@ describe('when a confirmation is displayed', () => { const user = userEvent.setup(); await user.click(cancel); - expect(onCancel).toBeCalled(); - expect(onConfirm).not.toBeCalled(); + expect(onCancel).toHaveBeenCalled(); + expect(onConfirm).not.toHaveBeenCalled(); }); it('should invoke onCancel when the close icon is clicked', async () => { @@ -113,8 +113,8 @@ describe('when a confirmation is displayed', () => { const user = userEvent.setup(); await user.click(cancel); - expect(onCancel).toBeCalled(); - expect(onConfirm).not.toBeCalled(); + expect(onCancel).toHaveBeenCalled(); + expect(onConfirm).not.toHaveBeenCalled(); }); it('should render a confirmation with the default "Confirm" button', () => { @@ -158,8 +158,8 @@ describe('when a confirmation is displayed', () => { const user = userEvent.setup(); await user.click(confirm); - expect(onConfirm).toBeCalled(); - expect(onCancel).not.toBeCalled(); + expect(onConfirm).toHaveBeenCalled(); + expect(onCancel).not.toHaveBeenCalled(); }); it('should render close icon by default', () => { diff --git a/apps/modernization-ui/src/design-system/modal/Modal.spec.tsx b/apps/modernization-ui/src/design-system/modal/Modal.spec.tsx index 61287bbacc..758e3e4332 100644 --- a/apps/modernization-ui/src/design-system/modal/Modal.spec.tsx +++ b/apps/modernization-ui/src/design-system/modal/Modal.spec.tsx @@ -77,7 +77,7 @@ describe('when a modal is displayed', () => { await user.click(closer); - expect(onClose).toBeCalled(); + expect(onClose).toHaveBeenCalled(); }); it('should render without a footer', () => { @@ -124,6 +124,6 @@ describe('when a modal is displayed', () => { await user.click(closer); - expect(onClose).toBeCalled(); + expect(onClose).toHaveBeenCalled(); }); }); diff --git a/apps/modernization-ui/src/design-system/modal/Success.spec.tsx b/apps/modernization-ui/src/design-system/modal/Success.spec.tsx index c1ba288863..b15c32c4ee 100644 --- a/apps/modernization-ui/src/design-system/modal/Success.spec.tsx +++ b/apps/modernization-ui/src/design-system/modal/Success.spec.tsx @@ -51,7 +51,7 @@ describe('when a success is displayed', () => { const user = userEvent.setup(); await user.click(closer); - expect(onClose).toBeCalled(); + expect(onClose).toHaveBeenCalled(); }); it('should invoke onClose when the close icon is clicked', async () => { @@ -66,6 +66,6 @@ describe('when a success is displayed', () => { const user = userEvent.setup(); await user.click(closer); - expect(onClose).toBeCalled(); + expect(onClose).toHaveBeenCalled(); }); }); diff --git a/apps/modernization-ui/src/design-system/modal/Warning.spec.tsx b/apps/modernization-ui/src/design-system/modal/Warning.spec.tsx index 592d4b175c..03bbd061e1 100644 --- a/apps/modernization-ui/src/design-system/modal/Warning.spec.tsx +++ b/apps/modernization-ui/src/design-system/modal/Warning.spec.tsx @@ -51,7 +51,7 @@ describe('when a warning is displayed', () => { const user = userEvent.setup(); await user.click(closer); - expect(onClose).toBeCalled(); + expect(onClose).toHaveBeenCalled(); }); it('should invoke onClose when the close icon is clicked', async () => { @@ -66,6 +66,6 @@ describe('when a warning is displayed', () => { const user = userEvent.setup(); await user.click(closer); - expect(onClose).toBeCalled(); + expect(onClose).toHaveBeenCalled(); }); }); diff --git a/apps/modernization-ui/src/design-system/panel/closable/ClosablePanel.spec.tsx b/apps/modernization-ui/src/design-system/panel/closable/ClosablePanel.spec.tsx index d63949a64d..a85a8cf5fb 100644 --- a/apps/modernization-ui/src/design-system/panel/closable/ClosablePanel.spec.tsx +++ b/apps/modernization-ui/src/design-system/panel/closable/ClosablePanel.spec.tsx @@ -101,6 +101,6 @@ describe('CloseablePanel', () => { await user.click(closer); - expect(onClose).toBeCalled(); + expect(onClose).toHaveBeenCalled(); }); }); diff --git a/apps/modernization-ui/src/utils/mapping/maybeMappAll.spec.ts b/apps/modernization-ui/src/utils/mapping/maybeMappAll.spec.ts index c01c4d1594..6a05fe9767 100644 --- a/apps/modernization-ui/src/utils/mapping/maybeMappAll.spec.ts +++ b/apps/modernization-ui/src/utils/mapping/maybeMappAll.spec.ts @@ -12,7 +12,7 @@ describe('when mapping over an array that could result in undefined elements', ( expect(actual).toEqual([]); - expect(mapping).not.toBeCalled(); + expect(mapping).not.toHaveBeenCalled(); }); it('should map an empty array to an empty array', () => { @@ -21,7 +21,7 @@ describe('when mapping over an array that could result in undefined elements', ( const actual = maybeMapAll(mapping)([]); expect(actual).toEqual([]); - expect(mapping).not.toBeCalled(); + expect(mapping).not.toHaveBeenCalled(); }); it('should only include element that maps to defined values', () => { From 99639906f2929da8b52fe6468067043e6fc55e39 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:47:26 -0400 Subject: [PATCH 14/49] validateNumericRange expects string array --- .../apps/report/run/filters/utils/rangeValidator.spec.ts | 8 ++++---- .../src/libs/classic/ClassicModalButton.spec.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/modernization-ui/src/apps/report/run/filters/utils/rangeValidator.spec.ts b/apps/modernization-ui/src/apps/report/run/filters/utils/rangeValidator.spec.ts index 0233b394b1..33d0da19c0 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/utils/rangeValidator.spec.ts +++ b/apps/modernization-ui/src/apps/report/run/filters/utils/rangeValidator.spec.ts @@ -23,7 +23,7 @@ describe('rangeValidator', () => { const actual0 = validateDateRange(['14/1999', '10/13/2026'], FIELD_NAME); expect(actual0).toEqual(`From date of "14/1999" is not valid mm/dd/yyyy formatted date for ${FIELD_NAME}.`); - const actual1 = validateDateRange(['10/13/2022', 1], FIELD_NAME); + const actual1 = validateDateRange(['10/13/2022', "1"], FIELD_NAME); expect(actual1).toEqual(`To date of "1" is not valid mm/dd/yyyy formatted date for ${FIELD_NAME}.`); const actual2 = validateDateRange(['10/13/2022', '1/1/1992323'], FIELD_NAME); @@ -42,8 +42,8 @@ describe('rangeValidator', () => { it('should not return an error msg for a valid numeric', () => { [ ['90210', '100000'], - [-1, 1.0], - [0.125, '0.9887'], + ["-1", "1.0"], + ["0.125", '0.9887'], ].forEach((range) => { const actual = validateNumericRange(range, FIELD_NAME); expect(actual).toBeUndefined(); @@ -71,7 +71,7 @@ describe('rangeValidator', () => { it('should return an error msg when the from number is greater than the to number', () => { [ - [15, 6], + ["15", "6"], ['0.9887', '0.125'], ].forEach((range, index) => { const actual = validateNumericRange(range, FIELD_NAME); diff --git a/apps/modernization-ui/src/libs/classic/ClassicModalButton.spec.tsx b/apps/modernization-ui/src/libs/classic/ClassicModalButton.spec.tsx index 6420a32a98..f42826ac08 100644 --- a/apps/modernization-ui/src/libs/classic/ClassicModalButton.spec.tsx +++ b/apps/modernization-ui/src/libs/classic/ClassicModalButton.spec.tsx @@ -14,7 +14,7 @@ const mockUseClassicModal = { }; vi.mock('./useClassicModal', async (importOriginal) => { - const actual = await importOriginal(); + const actual = await importOriginal(); return { ...actual, useClassicModal: () => mockUseClassicModal, From 7a422ae8a7d97071f36292863b3ce6ba0173f737 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 10:54:20 -0400 Subject: [PATCH 15/49] cast type as QbQuery --- .../run/filters/advanced/validator.spec.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/modernization-ui/src/apps/report/run/filters/advanced/validator.spec.ts b/apps/modernization-ui/src/apps/report/run/filters/advanced/validator.spec.ts index a2b0562a64..5ef885bd8a 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/advanced/validator.spec.ts +++ b/apps/modernization-ui/src/apps/report/run/filters/advanced/validator.spec.ts @@ -1,5 +1,6 @@ import { validateRule, ValidationResultMap } from './validator'; -import { RuleGroupType, RuleType } from 'react-querybuilder'; + +type QbQuery = Parameters[0]; describe('validateRule', () => { let mockResult: ValidationResultMap; @@ -18,7 +19,7 @@ describe('validateRule', () => { field: '~', operator: '~', value: '', - } as RuleType, + } as unknown as QbQuery, mockResult ); @@ -39,7 +40,7 @@ describe('validateRule', () => { ], combinator: 'and', not: false, - } as RuleGroupType, + } as unknown as QbQuery, mockResult ); @@ -61,7 +62,7 @@ describe('validateRule', () => { ], combinator: 'and', not: false, - } as RuleGroupType, + } as unknown as QbQuery, mockResult ); @@ -84,7 +85,7 @@ describe('validateRule', () => { ], combinator: 'and', not: false, - } as RuleGroupType, + } as unknown as QbQuery, mockResult ); @@ -114,7 +115,7 @@ describe('validateRule', () => { ], combinator: 'and', not: false, - } as RuleGroupType, + } as unknown as QbQuery, mockResult ); @@ -148,7 +149,7 @@ describe('validateRule', () => { ], combinator: 'and', not: false, - } as RuleGroupType, + } as unknown as QbQuery, mockResult ); @@ -186,7 +187,7 @@ describe('validateRule', () => { ], combinator: 'and', not: false, - } as RuleGroupType, + } as unknown as QbQuery, mockResult ); @@ -217,7 +218,7 @@ describe('validateRule', () => { ], combinator: 'and', not: false, - } as RuleGroupType, + } as unknown as QbQuery, mockResult ); From 1ff73ce2fca4689b90db933a617ce193fcc4cca7 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 11:11:29 -0400 Subject: [PATCH 16/49] add parens to fn --- .../ManageSectionTile/ManageSectionTile.spec.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx index b84efd4e29..b425194333 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx @@ -88,12 +88,12 @@ describe('when ManageSectionTile renders', () => { index={1} setSelectedForDelete={vi.fn()} selectedForDelete={undefined} - handleDelete={vi.fn} - setOnAction={vi.fn} + handleDelete={vi.fn()} + setOnAction={vi.fn()} onAction={false} - setSectionState={vi.fn} - setSelectedForEdit={vi.fn} - onChangeVisibility={vi.fn} + setSectionState={vi.fn()} + setSelectedForEdit={vi.fn()} + onChangeVisibility={vi.fn()} /> )} From 4ed430fc947d3347584dbfa7b4387ad3066b22cc Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 11:14:12 -0400 Subject: [PATCH 17/49] update toBeCalledTimes to toHaveBeenCalledTime and lastCalledWith to toHaveBeenLastCalledWith --- .../panel/BlockingCriteriaSidePanel.spec.tsx | 4 ++-- .../panel/MatchingCriteriaSidePanel.spec.tsx | 2 +- .../MatchesRequiringReviewTable.spec.tsx | 24 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.spec.tsx index 6fc8463579..62d7b1c075 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.spec.tsx @@ -160,7 +160,7 @@ describe('BlockingCriteriaSidePanel', () => { expect(cancel).toHaveTextContent('Cancel'); await user.click(cancel); - expect(onCancel).toBeCalledTimes(1); + expect(onCancel).toHaveBeenCalledTimes(1); }); it('should trigger onAccept when Add attribute(s) is clicked', async () => { @@ -175,6 +175,6 @@ describe('BlockingCriteriaSidePanel', () => { await user.click(add); - expect(onAccept).toBeCalledTimes(1); + expect(onAccept).toHaveBeenCalledTimes(1); }); }); diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx index 73c54731bd..e849d219a2 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx @@ -238,7 +238,7 @@ describe('MatchingCriteriaSidePanel', () => { await user.click(cancel); - expect(onCancel).toBeCalledTimes(1); + expect(onCancel).toHaveBeenCalledTimes(1); }); it('should trigger onAccept when Add attribute(s) is clicked', async () => { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.spec.tsx index 23ee308af3..bd8655d9c0 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.spec.tsx @@ -111,41 +111,41 @@ describe('MatchesRequiringReviewTable', () => { // default sort await waitFor(() => { - expect(mockFetch).lastCalledWith(0, 20, 'identified,desc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'identified,desc'); }); await user.click(getByText('Patient ID').children[0]); // sort on patient Id asc - expect(mockFetch).lastCalledWith(0, 20, 'patient-id,asc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'patient-id,asc'); await user.click(getByText('Patient ID').children[0]); // sort on patient Id desc - expect(mockFetch).lastCalledWith(0, 20, 'patient-id,desc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'patient-id,desc'); await user.click(getByText('Person name').children[0]); // sort on Person name - expect(mockFetch).lastCalledWith(0, 20, 'name,asc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'name,asc'); await user.click(getByText('Person name').children[0]); // sort on Person name desc - expect(mockFetch).lastCalledWith(0, 20, 'name,desc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'name,desc'); await user.click(getByText('Date created').children[0]); // sort on Date created - expect(mockFetch).lastCalledWith(0, 20, 'created,asc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'created,asc'); await user.click(getByText('Date created').children[0]); // sort on Date created desc - expect(mockFetch).lastCalledWith(0, 20, 'created,desc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'created,desc'); await user.click(getByText('Date identified').children[0]); // sort on Date identified - expect(mockFetch).lastCalledWith(0, 20, 'identified,asc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'identified,asc'); await user.click(getByText('Date identified').children[0]); // sort on Date identified desc - expect(mockFetch).lastCalledWith(0, 20, 'identified,desc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'identified,desc'); await user.click(getByText('Number of matching records').children[0]); // sort on Number of matching records - expect(mockFetch).lastCalledWith(0, 20, 'count,asc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'count,asc'); await user.click(getByText('Number of matching records').children[0]); // sort on Number of matching records desc - expect(mockFetch).lastCalledWith(0, 20, 'count,desc'); + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'count,desc'); await user.click(getByText('Number of matching records').children[0]); // clear sort on Number - expect(mockFetch).lastCalledWith(0, 20, 'identified,desc'); // back to default + expect(mockFetch).toHaveBeenLastCalledWith(0, 20, 'identified,desc'); // back to default }); it('should display the proper match data', () => { From 664d2ce2db96aac525fd9f2832b260cb1f4bd925 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 11:21:08 -0400 Subject: [PATCH 18/49] mock the modalRef --- .../components/SaveTemplate/SaveTemplate.spec.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/modernization-ui/src/apps/page-builder/components/SaveTemplate/SaveTemplate.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/SaveTemplate/SaveTemplate.spec.tsx index 8bf029ebff..63611b7d98 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/SaveTemplate/SaveTemplate.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/SaveTemplate/SaveTemplate.spec.tsx @@ -1,15 +1,18 @@ import { render } from '@testing-library/react'; import { BrowserRouter } from 'react-router'; +import { createRef } from 'react'; import { SaveTemplates } from './SaveTemplate'; describe('When SaveTemplates component loads', () => { it('Save button should be disabled', () => { + const mockModalRef = createRef(); + const { container } = render( - + ); const btn = container.getElementsByClassName('usa-button')[0]; - expect(btn.hasAttribute('disabled')); + expect(btn).toBeDisabled(); }); }); From 2ff517179be99d00d9f96266a534ab5b4cee04cb Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 11:31:34 -0400 Subject: [PATCH 19/49] remove unused React import --- .../administrative-comments/AdministrativeComments.tsx | 1 - .../merge-preview/components/ethnicity/PreviewEthnicity.tsx | 1 - .../general-patient-info/PreviewGeneralPatientInfo.tsx | 1 - .../merge-preview/components/mortality/PreviewMortality.tsx | 1 - .../components/sex-and-birth/PreviewSexAndBirth.tsx | 1 - .../shared/preview-card-lined/LinedMergePreviewCard.tsx | 1 - .../page-builder/components/DeleteQuestion/DeleteQuestion.tsx | 2 +- .../src/components/MediaBlockBody/MediaBlockBody.tsx | 2 +- .../modernization-ui/src/components/TopBanner/Banner/banner.tsx | 2 +- .../src/components/TopBanner/BannerButton/BannerButton.tsx | 2 +- .../src/components/TopBanner/BannerContent/BannerContent.tsx | 2 +- .../src/components/TopBanner/BannerFlag/BannerFlag.tsx | 2 +- .../src/components/TopBanner/BannerGuidance/BannerGuidance.tsx | 2 +- .../src/components/TopBanner/BannerHeader/BannerHeader.tsx | 2 +- .../src/components/TopBanner/BannerIcon/BannerIcon.tsx | 2 +- apps/modernization-ui/src/components/TopBanner/TopBanner.tsx | 2 +- .../src/design-system/card/section/Section.stories.tsx | 1 - 17 files changed, 10 insertions(+), 17 deletions(-) diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/administrative-comments/AdministrativeComments.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/administrative-comments/AdministrativeComments.tsx index 2bdac07c76..3576cf73b5 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/administrative-comments/AdministrativeComments.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/administrative-comments/AdministrativeComments.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { format, parseISO, isValid } from 'date-fns'; import { Card } from 'design-system/card/Card'; import styles from './AdministrativeComments.module.scss'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/ethnicity/PreviewEthnicity.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/ethnicity/PreviewEthnicity.tsx index 8c03df26fd..7c96599662 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/ethnicity/PreviewEthnicity.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/ethnicity/PreviewEthnicity.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { MergeCandidate } from '../../../../../api/model/MergeCandidate'; import { PatientMergeForm } from '../../../merge-review/model/PatientMergeForm'; import { LinedMergePreviewCard } from '../shared/preview-card-lined/LinedMergePreviewCard'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/general-patient-info/PreviewGeneralPatientInfo.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/general-patient-info/PreviewGeneralPatientInfo.tsx index 5adc58890b..edb44f78c8 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/general-patient-info/PreviewGeneralPatientInfo.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/general-patient-info/PreviewGeneralPatientInfo.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { format, isValid, parseISO } from 'date-fns'; import { LinedMergePreviewCard } from '../shared/preview-card-lined/LinedMergePreviewCard'; import { PatientMergeForm } from '../../../merge-review/model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/mortality/PreviewMortality.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/mortality/PreviewMortality.tsx index 5343d164dc..491cd9f035 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/mortality/PreviewMortality.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/mortality/PreviewMortality.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { format, parseISO, isValid } from 'date-fns'; import { LinedMergePreviewCard } from '../shared/preview-card-lined/LinedMergePreviewCard'; import { PatientMergeForm } from '../../../merge-review/model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/sex-and-birth/PreviewSexAndBirth.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/sex-and-birth/PreviewSexAndBirth.tsx index 45660734f3..0f768f450c 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/sex-and-birth/PreviewSexAndBirth.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/sex-and-birth/PreviewSexAndBirth.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { MergeCandidate, MergeSexAndBirth } from '../../../../../api/model/MergeCandidate'; import { LinedMergePreviewCard } from '../shared/preview-card-lined/LinedMergePreviewCard'; import { format, parseISO, differenceInYears, isValid } from 'date-fns'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/shared/preview-card-lined/LinedMergePreviewCard.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/shared/preview-card-lined/LinedMergePreviewCard.tsx index f8eda36f5a..7d0083acce 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/shared/preview-card-lined/LinedMergePreviewCard.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/shared/preview-card-lined/LinedMergePreviewCard.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Card } from 'design-system/card/Card'; import styles from './LinedMergePreviewCard.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/DeleteQuestion/DeleteQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/components/DeleteQuestion/DeleteQuestion.tsx index 1faecc47cd..c1872ec9fe 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/DeleteQuestion/DeleteQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/DeleteQuestion/DeleteQuestion.tsx @@ -1,4 +1,4 @@ -import React, { useRef } from 'react'; +import { useRef } from 'react'; import { ModalRef, Icon, ModalToggleButton } from '@trussworks/react-uswds'; import styles from './delete-question.module.scss'; import { ConfirmationModal } from '../../../../confirmation'; diff --git a/apps/modernization-ui/src/components/MediaBlockBody/MediaBlockBody.tsx b/apps/modernization-ui/src/components/MediaBlockBody/MediaBlockBody.tsx index 3913bc0da6..dac3db0128 100644 --- a/apps/modernization-ui/src/components/MediaBlockBody/MediaBlockBody.tsx +++ b/apps/modernization-ui/src/components/MediaBlockBody/MediaBlockBody.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react'; +import { ReactElement } from 'react'; import classNames from 'classnames'; export const MediaBlockBody = ({ children, className, ...divProps }: JSX.IntrinsicElements['div']): ReactElement => { diff --git a/apps/modernization-ui/src/components/TopBanner/Banner/banner.tsx b/apps/modernization-ui/src/components/TopBanner/Banner/banner.tsx index 358ad978cb..af3f0c3af3 100644 --- a/apps/modernization-ui/src/components/TopBanner/Banner/banner.tsx +++ b/apps/modernization-ui/src/components/TopBanner/Banner/banner.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react'; +import { ReactElement } from 'react'; import classNames from 'classnames'; type BannerProps = { diff --git a/apps/modernization-ui/src/components/TopBanner/BannerButton/BannerButton.tsx b/apps/modernization-ui/src/components/TopBanner/BannerButton/BannerButton.tsx index ea102ec4be..457d9e5e93 100644 --- a/apps/modernization-ui/src/components/TopBanner/BannerButton/BannerButton.tsx +++ b/apps/modernization-ui/src/components/TopBanner/BannerButton/BannerButton.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react'; +import { ReactElement } from 'react'; import classNames from 'classnames'; type BannerButtonProps = { diff --git a/apps/modernization-ui/src/components/TopBanner/BannerContent/BannerContent.tsx b/apps/modernization-ui/src/components/TopBanner/BannerContent/BannerContent.tsx index 5551ca3671..f83876dfe1 100644 --- a/apps/modernization-ui/src/components/TopBanner/BannerContent/BannerContent.tsx +++ b/apps/modernization-ui/src/components/TopBanner/BannerContent/BannerContent.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react'; +import { ReactElement } from 'react'; import classNames from 'classnames'; type BannerContentProps = { diff --git a/apps/modernization-ui/src/components/TopBanner/BannerFlag/BannerFlag.tsx b/apps/modernization-ui/src/components/TopBanner/BannerFlag/BannerFlag.tsx index 222e081566..ccf87e9f34 100644 --- a/apps/modernization-ui/src/components/TopBanner/BannerFlag/BannerFlag.tsx +++ b/apps/modernization-ui/src/components/TopBanner/BannerFlag/BannerFlag.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react'; +import { ReactElement } from 'react'; import classNames from 'classnames'; export const BannerFlag = ({ alt, className, ...imgProps }: JSX.IntrinsicElements['img']): ReactElement => { diff --git a/apps/modernization-ui/src/components/TopBanner/BannerGuidance/BannerGuidance.tsx b/apps/modernization-ui/src/components/TopBanner/BannerGuidance/BannerGuidance.tsx index 1ce0929c06..29c3cc575d 100644 --- a/apps/modernization-ui/src/components/TopBanner/BannerGuidance/BannerGuidance.tsx +++ b/apps/modernization-ui/src/components/TopBanner/BannerGuidance/BannerGuidance.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react'; +import { ReactElement } from 'react'; import classNames from 'classnames'; export const BannerGuidance = ({ children, className, ...divProps }: JSX.IntrinsicElements['div']): ReactElement => { diff --git a/apps/modernization-ui/src/components/TopBanner/BannerHeader/BannerHeader.tsx b/apps/modernization-ui/src/components/TopBanner/BannerHeader/BannerHeader.tsx index 6b233b7726..6b862bf435 100644 --- a/apps/modernization-ui/src/components/TopBanner/BannerHeader/BannerHeader.tsx +++ b/apps/modernization-ui/src/components/TopBanner/BannerHeader/BannerHeader.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement, ReactNode } from 'react'; +import { ReactElement, ReactNode } from 'react'; import classNames from 'classnames'; type BannerHeaderProps = { diff --git a/apps/modernization-ui/src/components/TopBanner/BannerIcon/BannerIcon.tsx b/apps/modernization-ui/src/components/TopBanner/BannerIcon/BannerIcon.tsx index 417778b5ce..f508313ab9 100644 --- a/apps/modernization-ui/src/components/TopBanner/BannerIcon/BannerIcon.tsx +++ b/apps/modernization-ui/src/components/TopBanner/BannerIcon/BannerIcon.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react'; +import { ReactElement } from 'react'; import classNames from 'classnames'; export const BannerIcon = ({ src, alt, className, ...imgProps }: JSX.IntrinsicElements['img']): ReactElement => { diff --git a/apps/modernization-ui/src/components/TopBanner/TopBanner.tsx b/apps/modernization-ui/src/components/TopBanner/TopBanner.tsx index 664ff9726e..16a06ec898 100644 --- a/apps/modernization-ui/src/components/TopBanner/TopBanner.tsx +++ b/apps/modernization-ui/src/components/TopBanner/TopBanner.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement, useState } from 'react'; +import { ReactElement, useState } from 'react'; import { Banner } from './Banner/banner'; import { BannerLockImage } from './BannerLockImage/BannerLockImage'; import { BannerHeader } from './BannerHeader/BannerHeader'; diff --git a/apps/modernization-ui/src/design-system/card/section/Section.stories.tsx b/apps/modernization-ui/src/design-system/card/section/Section.stories.tsx index 4c79f44f29..adcb5e4ba3 100644 --- a/apps/modernization-ui/src/design-system/card/section/Section.stories.tsx +++ b/apps/modernization-ui/src/design-system/card/section/Section.stories.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { Meta, StoryObj } from '@storybook/react'; import { Section } from './Section'; import { Button } from 'design-system/button'; From da4c7305c1e5a38a1ed8305cdaf15a21028a5c87 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 14:12:19 -0400 Subject: [PATCH 20/49] typecheck script --- apps/modernization-ui/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/modernization-ui/package.json b/apps/modernization-ui/package.json index 963e1896fd..1300356bbc 100644 --- a/apps/modernization-ui/package.json +++ b/apps/modernization-ui/package.json @@ -91,6 +91,7 @@ "scripts": { "start": "vite", "build": "vite build", + "typecheck": "tsc -b", "preview": "vite preview", "test": "vitest --changed", "test:all": "vitest run", From 9cdbdd6ed113c300d5a22242945e917996ac822c Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 16:42:56 -0400 Subject: [PATCH 21/49] address remaining failures --- .../notification-cards/SelectPass.spec.tsx | 2 +- .../general/GeneralSelection.spec.tsx | 2 -- .../fields/BasicInformationFields.spec.tsx | 9 +-------- .../AddQuestion/fields/DataMartFields.spec.tsx | 15 +-------------- .../page/library/usePageSummaryAPI.ts | 2 +- .../question/GroupQuestion/RepeatingBlock.tsx | 2 +- .../pages/AddNewPage/AddNewPage.spec.tsx | 2 +- .../apps/page-builder/services/conditionAPI.ts | 1 - .../src/apps/page-builder/services/pagesAPI.ts | 2 +- .../src/apps/page-builder/services/questionAPI.ts | 8 ++++---- .../phoneEmail/PhoneEmailEntryFields.spec.tsx | 4 ++-- .../data/race/categoryRequiredValidator.ts | 2 +- .../useCompareInvestigation.spec.ts | 2 +- .../report/run/filters/advanced/validator.spec.ts | 3 +-- .../run/filters/utils/rangeValidator.spec.ts | 2 +- .../pagination/SearchResultPagination.spec.tsx | 2 +- .../PatientCriteria/BasicInformation.spec.tsx | 2 -- .../MediaBlockBody/MediaBlockBody.test.tsx | 2 +- .../TabNavigation/TabNavigation.stories.tsx | 2 +- .../components/TopBanner/Banner/Banner.spec.tsx | 2 +- .../src/components/TopBanner/TopBanner.spec.tsx | 2 +- .../src/design-system/checkbox/Checkbox.spec.tsx | 2 -- .../checkbox/SelectableCheckbox.spec.tsx | 2 -- .../date/criteria/range/DateRangeField.spec.tsx | 2 +- .../design-system/date/occursInThePast.spec.ts | 2 +- .../design-system/date/picker/DatePicker.spec.tsx | 2 +- .../src/design-system/date/picker/DatePicker.tsx | 2 +- .../src/design-system/date/validateDate.spec.ts | 3 --- .../design-system/date/validateDateEntry.spec.ts | 3 --- .../input/range/NumberRangeField.spec.tsx | 1 - .../text/criteria/TextCriteriaField.spec.tsx | 2 +- .../criteria/operator/OperatorSelect.spec.tsx | 1 - .../src/design-system/radio/RadioGroup.spec.tsx | 2 +- .../preferences/useSortingPreferences.spec.tsx | 2 +- .../contact/email/validateEmail.spec.ts | 2 ++ .../edit/EthnicityDemographicFields.spec.tsx | 3 +-- .../GeneralInformationDemographicsFields.spec.tsx | 3 +-- .../view/MortalityDemographicView.spec.tsx | 2 -- .../name/NameDemographicView.spec.tsx | 14 -------------- .../phoneEmail/PhoneEmailDemographicView.spec.tsx | 1 - .../edit/PhoneEmailDemographicFields.spec.tsx | 2 +- .../race/edit/categoryRequiredValidator.ts | 2 +- 42 files changed, 35 insertions(+), 90 deletions(-) diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/notification-cards/SelectPass.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/notification-cards/SelectPass.spec.tsx index a38f470f9d..c19717a93d 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/notification-cards/SelectPass.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/notification-cards/SelectPass.spec.tsx @@ -31,7 +31,7 @@ describe('SelectPass', () => { const { getAllByText } = render(); expect( getAllByText( - (content, element) => + (_content, element) => element?.textContent === 'To get started, select "Add pass configuration" from the left panel.' )[0] ).toBeInTheDocument(); diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/GeneralSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/GeneralSelection.spec.tsx index ec5a4e582a..078b3154d2 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/GeneralSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/GeneralSelection.spec.tsx @@ -2,8 +2,6 @@ import { render } from '@testing-library/react'; import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; -import { SexAndBirthSelection } from '../sex-and-birth/SexAndBirthSelection'; - import { GeneralSelection } from './GeneralSelection'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/BasicInformationFields.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/BasicInformationFields.spec.tsx index b7265c46d2..11854091e7 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/BasicInformationFields.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/BasicInformationFields.spec.tsx @@ -1,4 +1,4 @@ -import { render, renderHook } from '@testing-library/react'; +import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { FormProvider, useForm } from 'react-hook-form'; @@ -6,13 +6,6 @@ import { CreateQuestionForm } from '../QuestionForm'; import { BasicInformationFields } from './BasicInformationFields'; -const { result } = renderHook(() => - useForm({ - mode: 'onBlur', - defaultValues: { uniqueId: 'duplicateUniqueId', uniqueName: 'duplicateUniqueName' }, - }) -); - const setError = vi.fn(); const validate = vi.fn(); const mockUseQuestionValidation = { diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DataMartFields.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DataMartFields.spec.tsx index 1e00b160b8..85ebc877b3 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DataMartFields.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DataMartFields.spec.tsx @@ -1,23 +1,10 @@ -import { render, renderHook } from '@testing-library/react'; +import { render } from '@testing-library/react'; import { FormProvider, useForm } from 'react-hook-form'; import { CreateQuestionForm } from '../QuestionForm'; import { DataMartFields } from './DataMartFields'; -const { result } = renderHook(() => - useForm({ - mode: 'onBlur', - defaultValues: { - subgroup: 'RSK', - dataMartInfo: { - dataMartColumnName: 'duplicateDataMartColumnName', - rdbColumnName: 'duplicateRdbColumnName', - }, - }, - }) -); - const setError = vi.fn(); const validate = vi.fn(); const mockUseQuestionValidation = { diff --git a/apps/modernization-ui/src/apps/page-builder/page/library/usePageSummaryAPI.ts b/apps/modernization-ui/src/apps/page-builder/page/library/usePageSummaryAPI.ts index fa09cac103..d2d56612b2 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/library/usePageSummaryAPI.ts +++ b/apps/modernization-ui/src/apps/page-builder/page/library/usePageSummaryAPI.ts @@ -1,7 +1,7 @@ import { PagePageSummary, PageSummaryService } from 'apps/page-builder/generated'; export const fetchPageSummaries = async ( - token: string, + _token: string, search?: string, sort?: string, currentPage?: number, diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.tsx index 18da55b41e..e95ad18467 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.tsx @@ -71,7 +71,7 @@ export const RepeatingBlock = ({ questions, valid, setValid }: Props) => { - {fields.map((item: Batch, index: number) => ( + {fields.map((_item: Batch, index: number) => (

{index + 1}

diff --git a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx index 26da020fe6..f869ec1c7e 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx @@ -1,4 +1,4 @@ -import { act, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { AlertProvider } from 'alert'; import { diff --git a/apps/modernization-ui/src/apps/page-builder/services/conditionAPI.ts b/apps/modernization-ui/src/apps/page-builder/services/conditionAPI.ts index 4f9eca43c3..bbcf6a614f 100644 --- a/apps/modernization-ui/src/apps/page-builder/services/conditionAPI.ts +++ b/apps/modernization-ui/src/apps/page-builder/services/conditionAPI.ts @@ -21,7 +21,6 @@ export const findConditions = async (page: number, size: number, sort: string) = }; export const searchConditions = async ( - token: string, page: number, size: number, sort: string, diff --git a/apps/modernization-ui/src/apps/page-builder/services/pagesAPI.ts b/apps/modernization-ui/src/apps/page-builder/services/pagesAPI.ts index 5b00c78c51..35613959eb 100644 --- a/apps/modernization-ui/src/apps/page-builder/services/pagesAPI.ts +++ b/apps/modernization-ui/src/apps/page-builder/services/pagesAPI.ts @@ -1,7 +1,7 @@ import { PageControllerService, PagePageSummary, PagesService, PageSummaryService } from 'apps/page-builder/generated'; export const fetchPageSummaries = ( - token: string, + _token: string, search?: string, sort?: string, currentPage?: number, diff --git a/apps/modernization-ui/src/apps/page-builder/services/questionAPI.ts b/apps/modernization-ui/src/apps/page-builder/services/questionAPI.ts index 65eed72856..969588e807 100644 --- a/apps/modernization-ui/src/apps/page-builder/services/questionAPI.ts +++ b/apps/modernization-ui/src/apps/page-builder/services/questionAPI.ts @@ -6,25 +6,25 @@ import { QuestionControllerService, } from '../generated'; -export const createTextQuestion = async (token: string, request: CreateTextQuestionRequest) => { +export const createTextQuestion = async (_token: string, request: CreateTextQuestionRequest) => { return await QuestionControllerService.createTextQuestion({ requestBody: request, }); }; -export const createNumericQuestion = async (token: string, request: CreateNumericQuestionRequest) => { +export const createNumericQuestion = async (_token: string, request: CreateNumericQuestionRequest) => { return await QuestionControllerService.createNumericQuestion({ requestBody: request, }); }; -export const createDateQuestion = async (token: string, request: CreateDateQuestionRequest) => { +export const createDateQuestion = async (_token: string, request: CreateDateQuestionRequest) => { return await QuestionControllerService.createDateQuestion({ requestBody: request, }); }; -export const createCodedQuestion = async (token: string, request: CreateCodedQuestionRequest) => { +export const createCodedQuestion = async (_token: string, request: CreateCodedQuestionRequest) => { return await QuestionControllerService.createCodedQuestion({ requestBody: request, }); diff --git a/apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.spec.tsx b/apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.spec.tsx index 5110db5139..2416bea749 100644 --- a/apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.spec.tsx @@ -141,7 +141,7 @@ describe('when entering patient phone & email demographics', () => { }); it('should not allow country codes over 20 characters', async () => { - const { getByLabelText, getByText } = render(); + const { getByLabelText } = render(); const user = userEvent.setup(); const country = getByLabelText('Country code'); @@ -181,7 +181,7 @@ describe('when entering patient phone & email demographics', () => { }); it('should not allow extensions over 20 characters', async () => { - const { getByLabelText, getByText } = render(); + const { getByLabelText } = render(); const user = userEvent.setup(); const extension = getByLabelText('Extension'); diff --git a/apps/modernization-ui/src/apps/patient/data/race/categoryRequiredValidator.ts b/apps/modernization-ui/src/apps/patient/data/race/categoryRequiredValidator.ts index cb89db10c0..73eff80a21 100644 --- a/apps/modernization-ui/src/apps/patient/data/race/categoryRequiredValidator.ts +++ b/apps/modernization-ui/src/apps/patient/data/race/categoryRequiredValidator.ts @@ -9,7 +9,7 @@ import { exists } from 'utils'; * * @return {Promise} */ -const categoryRequiredValidator = (id: number, category: Selectable | null): Promise => +const categoryRequiredValidator = (_id: number, category: Selectable | null): Promise => !exists(category) ? Promise.resolve('The Race is required.') : Promise.resolve(true); export { categoryRequiredValidator }; diff --git a/apps/modernization-ui/src/apps/patient/file/events/investigations/useCompareInvestigation.spec.ts b/apps/modernization-ui/src/apps/patient/file/events/investigations/useCompareInvestigation.spec.ts index 3525a0868f..d6412dcdd0 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/investigations/useCompareInvestigation.spec.ts +++ b/apps/modernization-ui/src/apps/patient/file/events/investigations/useCompareInvestigation.spec.ts @@ -1,6 +1,6 @@ import { act } from 'react'; -import { renderHook, waitFor } from '@testing-library/react'; +import { renderHook } from '@testing-library/react'; import { useCompareInvestigation } from './useCompareInvestigation'; diff --git a/apps/modernization-ui/src/apps/report/run/filters/advanced/validator.spec.ts b/apps/modernization-ui/src/apps/report/run/filters/advanced/validator.spec.ts index 0b7e3abcc9..2d5c4a52c4 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/advanced/validator.spec.ts +++ b/apps/modernization-ui/src/apps/report/run/filters/advanced/validator.spec.ts @@ -1,6 +1,5 @@ -import { RuleGroupType, RuleType } from 'react-querybuilder'; - import { validateRule, ValidationResultMap } from './validator'; +import {QbQuery} from "./AdvancedFilter.tsx"; describe('validateRule', () => { let mockResult: ValidationResultMap; diff --git a/apps/modernization-ui/src/apps/report/run/filters/utils/rangeValidator.spec.ts b/apps/modernization-ui/src/apps/report/run/filters/utils/rangeValidator.spec.ts index 33d0da19c0..f041745623 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/utils/rangeValidator.spec.ts +++ b/apps/modernization-ui/src/apps/report/run/filters/utils/rangeValidator.spec.ts @@ -73,7 +73,7 @@ describe('rangeValidator', () => { [ ["15", "6"], ['0.9887', '0.125'], - ].forEach((range, index) => { + ].forEach((range) => { const actual = validateNumericRange(range, FIELD_NAME); expect(actual).toEqual(`From value must be before To value for ${FIELD_NAME}.`); }); diff --git a/apps/modernization-ui/src/apps/search/layout/result/pagination/SearchResultPagination.spec.tsx b/apps/modernization-ui/src/apps/search/layout/result/pagination/SearchResultPagination.spec.tsx index 33cce7d9f0..352981fd0e 100644 --- a/apps/modernization-ui/src/apps/search/layout/result/pagination/SearchResultPagination.spec.tsx +++ b/apps/modernization-ui/src/apps/search/layout/result/pagination/SearchResultPagination.spec.tsx @@ -82,7 +82,7 @@ describe('When paginating search results', () => { mockPageSize = 20; mockCurrent = 1; - const { getByLabelText, debug } = render(); + const { getByLabelText } = render(); const page = getByLabelText('Page 2'); diff --git a/apps/modernization-ui/src/apps/search/patient/PatientCriteria/BasicInformation.spec.tsx b/apps/modernization-ui/src/apps/search/patient/PatientCriteria/BasicInformation.spec.tsx index 32a4dc356a..8c7567d390 100644 --- a/apps/modernization-ui/src/apps/search/patient/PatientCriteria/BasicInformation.spec.tsx +++ b/apps/modernization-ui/src/apps/search/patient/PatientCriteria/BasicInformation.spec.tsx @@ -1,5 +1,3 @@ -import { error } from 'console'; - import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { SkipLinkProvider } from 'SkipLink/SkipLinkContext'; diff --git a/apps/modernization-ui/src/components/MediaBlockBody/MediaBlockBody.test.tsx b/apps/modernization-ui/src/components/MediaBlockBody/MediaBlockBody.test.tsx index acd77d676f..15a0c58350 100644 --- a/apps/modernization-ui/src/components/MediaBlockBody/MediaBlockBody.test.tsx +++ b/apps/modernization-ui/src/components/MediaBlockBody/MediaBlockBody.test.tsx @@ -4,7 +4,7 @@ import { MediaBlockBody } from './MediaBlockBody'; describe('MediaBlockBody component tests', () => { it('should render media block children inside the div tag', () => { - const { container, getByLabelText } = render( + const { container } = render(

Some content

 diff --git a/apps/modernization-ui/src/components/TabNavigation/TabNavigation.stories.tsx b/apps/modernization-ui/src/components/TabNavigation/TabNavigation.stories.tsx index c6d3af1506..f5b00d4e64 100644 --- a/apps/modernization-ui/src/components/TabNavigation/TabNavigation.stories.tsx +++ b/apps/modernization-ui/src/components/TabNavigation/TabNavigation.stories.tsx @@ -1,4 +1,4 @@ -import { Meta, StoryObj } from '@storybook/react/*'; +import { Meta, StoryObj } from '@storybook/react'; import { MemoryRouter } from 'react-router'; import { TabNavigation, TabNavigationEntry, TabNavigationProps } from './TabNavigation'; diff --git a/apps/modernization-ui/src/components/TopBanner/Banner/Banner.spec.tsx b/apps/modernization-ui/src/components/TopBanner/Banner/Banner.spec.tsx index 211af2ea0a..e0537686a3 100644 --- a/apps/modernization-ui/src/components/TopBanner/Banner/Banner.spec.tsx +++ b/apps/modernization-ui/src/components/TopBanner/Banner/Banner.spec.tsx @@ -1,4 +1,4 @@ -import { render, within } from '@testing-library/react'; +import { render } from '@testing-library/react'; import { Banner } from './banner'; diff --git a/apps/modernization-ui/src/components/TopBanner/TopBanner.spec.tsx b/apps/modernization-ui/src/components/TopBanner/TopBanner.spec.tsx index b84302b900..90b1d4aa36 100644 --- a/apps/modernization-ui/src/components/TopBanner/TopBanner.spec.tsx +++ b/apps/modernization-ui/src/components/TopBanner/TopBanner.spec.tsx @@ -4,7 +4,7 @@ import { TopBanner } from './TopBanner'; describe('TopBanner component tests', () => { it('should render top banner header and content inside the banner', () => { - const { container, getByLabelText } = render(); + const { container } = render(); expect(container.querySelector('strong')?.innerHTML).toBe( 'An official website of the United States government' ); diff --git a/apps/modernization-ui/src/design-system/checkbox/Checkbox.spec.tsx b/apps/modernization-ui/src/design-system/checkbox/Checkbox.spec.tsx index a5d69d0408..42ae35bc27 100644 --- a/apps/modernization-ui/src/design-system/checkbox/Checkbox.spec.tsx +++ b/apps/modernization-ui/src/design-system/checkbox/Checkbox.spec.tsx @@ -28,8 +28,6 @@ describe('Checkbox testing', () => { }); it('should render checked', () => { - const { container } = render(); - const checkbox = screen.getByRole('checkbox', { name: 'Test Label' }); expect(checkbox).toBeChecked(); expect(checkbox).toHaveAttribute('aria-checked', 'true'); diff --git a/apps/modernization-ui/src/design-system/checkbox/SelectableCheckbox.spec.tsx b/apps/modernization-ui/src/design-system/checkbox/SelectableCheckbox.spec.tsx index 850484b906..6c0f978bac 100644 --- a/apps/modernization-ui/src/design-system/checkbox/SelectableCheckbox.spec.tsx +++ b/apps/modernization-ui/src/design-system/checkbox/SelectableCheckbox.spec.tsx @@ -68,8 +68,6 @@ describe('Checkbox testing', () => { }); it('should emit onChange event when label clicked', async () => { - const user = userEvent.setup(); - const onChange = vi.fn(); const { getByText } = render(); diff --git a/apps/modernization-ui/src/design-system/date/criteria/range/DateRangeField.spec.tsx b/apps/modernization-ui/src/design-system/date/criteria/range/DateRangeField.spec.tsx index a1e9b4394b..9241b2a2ea 100644 --- a/apps/modernization-ui/src/design-system/date/criteria/range/DateRangeField.spec.tsx +++ b/apps/modernization-ui/src/design-system/date/criteria/range/DateRangeField.spec.tsx @@ -1,4 +1,4 @@ -import { act, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { axe } from 'jest-axe'; diff --git a/apps/modernization-ui/src/design-system/date/occursInThePast.spec.ts b/apps/modernization-ui/src/design-system/date/occursInThePast.spec.ts index 139d654d3f..4bc2038532 100644 --- a/apps/modernization-ui/src/design-system/date/occursInThePast.spec.ts +++ b/apps/modernization-ui/src/design-system/date/occursInThePast.spec.ts @@ -1,5 +1,5 @@ import { internalizeDate } from 'date'; -import { add, isFuture } from 'date-fns'; +import { add } from 'date-fns'; import { occursInThePast } from './occursInThePast'; diff --git a/apps/modernization-ui/src/design-system/date/picker/DatePicker.spec.tsx b/apps/modernization-ui/src/design-system/date/picker/DatePicker.spec.tsx index 4459db6e83..e76d561f1e 100644 --- a/apps/modernization-ui/src/design-system/date/picker/DatePicker.spec.tsx +++ b/apps/modernization-ui/src/design-system/date/picker/DatePicker.spec.tsx @@ -1,4 +1,4 @@ -import { render, waitFor } from '@testing-library/react'; +import { render} from '@testing-library/react'; import { axe } from 'jest-axe'; import { DatePicker, DatePickerProps } from './DatePicker'; diff --git a/apps/modernization-ui/src/design-system/date/picker/DatePicker.tsx b/apps/modernization-ui/src/design-system/date/picker/DatePicker.tsx index b55304a15d..a8e71f5524 100644 --- a/apps/modernization-ui/src/design-system/date/picker/DatePicker.tsx +++ b/apps/modernization-ui/src/design-system/date/picker/DatePicker.tsx @@ -64,7 +64,7 @@ const DatePicker = ({ } }, [current, externalInputRef.current]); - const handleExternalOnBlur = useCallback((e: Event) => onBlur?.(), [onBlur]); + const handleExternalOnBlur = useCallback((_e: Event) => onBlur?.(), [onBlur]); const handleExternalOnChange = useCallback( (event: Event) => { diff --git a/apps/modernization-ui/src/design-system/date/validateDate.spec.ts b/apps/modernization-ui/src/design-system/date/validateDate.spec.ts index 8fd751f410..c541b14531 100644 --- a/apps/modernization-ui/src/design-system/date/validateDate.spec.ts +++ b/apps/modernization-ui/src/design-system/date/validateDate.spec.ts @@ -1,6 +1,3 @@ -import { internalizeDate } from 'date'; -import { add } from 'date-fns'; - import { validateDate } from './validateDate'; const mockNow = vi.fn(); diff --git a/apps/modernization-ui/src/design-system/date/validateDateEntry.spec.ts b/apps/modernization-ui/src/design-system/date/validateDateEntry.spec.ts index 971014b278..d0530eba60 100644 --- a/apps/modernization-ui/src/design-system/date/validateDateEntry.spec.ts +++ b/apps/modernization-ui/src/design-system/date/validateDateEntry.spec.ts @@ -1,4 +1,3 @@ -import { internalizeDate } from 'date'; import { add } from 'date-fns'; import { validateDateEntry } from './validateDateEntry'; @@ -44,8 +43,6 @@ describe('when validating a date entered in parts', () => { }); it('should not allow months after today', () => { - const today = new Date('2017-05-23T00:00:00'); - mockNow.mockReturnValue(new Date('2017-05-23T00:00:00')); const actual = validateDateEntry('Date in the future')({ diff --git a/apps/modernization-ui/src/design-system/input/range/NumberRangeField.spec.tsx b/apps/modernization-ui/src/design-system/input/range/NumberRangeField.spec.tsx index 62e0fd09c0..8a5605b380 100644 --- a/apps/modernization-ui/src/design-system/input/range/NumberRangeField.spec.tsx +++ b/apps/modernization-ui/src/design-system/input/range/NumberRangeField.spec.tsx @@ -1,6 +1,5 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { axe } from 'jest-axe'; import { NumberRangeField } from './NumberRangeField.tsx'; diff --git a/apps/modernization-ui/src/design-system/input/text/criteria/TextCriteriaField.spec.tsx b/apps/modernization-ui/src/design-system/input/text/criteria/TextCriteriaField.spec.tsx index 830901a279..1e297b7d7e 100644 --- a/apps/modernization-ui/src/design-system/input/text/criteria/TextCriteriaField.spec.tsx +++ b/apps/modernization-ui/src/design-system/input/text/criteria/TextCriteriaField.spec.tsx @@ -1,4 +1,4 @@ -import { fireEvent, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { TextCriteria } from 'options/operator'; diff --git a/apps/modernization-ui/src/design-system/input/text/criteria/operator/OperatorSelect.spec.tsx b/apps/modernization-ui/src/design-system/input/text/criteria/operator/OperatorSelect.spec.tsx index c2a2b764b5..ba1a279c55 100644 --- a/apps/modernization-ui/src/design-system/input/text/criteria/operator/OperatorSelect.spec.tsx +++ b/apps/modernization-ui/src/design-system/input/text/criteria/operator/OperatorSelect.spec.tsx @@ -20,7 +20,6 @@ describe('OperatorSelect', () => { }); it('calls onChange when an option is selected', async () => { - const user = userEvent.setup(); const { getByRole } = render(); const selectElement = getByRole('combobox'); diff --git a/apps/modernization-ui/src/design-system/radio/RadioGroup.spec.tsx b/apps/modernization-ui/src/design-system/radio/RadioGroup.spec.tsx index 59e47f98f0..f09f038c9b 100644 --- a/apps/modernization-ui/src/design-system/radio/RadioGroup.spec.tsx +++ b/apps/modernization-ui/src/design-system/radio/RadioGroup.spec.tsx @@ -1,4 +1,4 @@ -import { render, screen } from '@testing-library/react'; +import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { axe } from 'jest-axe'; diff --git a/apps/modernization-ui/src/design-system/sorting/preferences/useSortingPreferences.spec.tsx b/apps/modernization-ui/src/design-system/sorting/preferences/useSortingPreferences.spec.tsx index 245f0f4155..6476a0354d 100644 --- a/apps/modernization-ui/src/design-system/sorting/preferences/useSortingPreferences.spec.tsx +++ b/apps/modernization-ui/src/design-system/sorting/preferences/useSortingPreferences.spec.tsx @@ -24,7 +24,7 @@ const mockSave = vi.fn(); const mockRemove = vi.fn(); vi.mock('storage', () => ({ - useLocalStorage: ({ key, initial }: { key: string; initial?: any }) => ({ + useLocalStorage: () => ({ value: mockValue, save: mockSave, remove: mockRemove, diff --git a/apps/modernization-ui/src/libs/demographics/contact/email/validateEmail.spec.ts b/apps/modernization-ui/src/libs/demographics/contact/email/validateEmail.spec.ts index 26c95a5a21..db6eb29783 100644 --- a/apps/modernization-ui/src/libs/demographics/contact/email/validateEmail.spec.ts +++ b/apps/modernization-ui/src/libs/demographics/contact/email/validateEmail.spec.ts @@ -3,6 +3,8 @@ import { validateEmail } from './validateEmail'; describe('when validating an email entered at text', () => { it('should allow a value with a username and a domain', () => { const actual = validateEmail('valid email')('username@domain.com'); + + expect(actual).toBeTruthy(); }); it('should not allow a value that does not contain a domain', () => { diff --git a/apps/modernization-ui/src/libs/patient/demographics/ethnicity/edit/EthnicityDemographicFields.spec.tsx b/apps/modernization-ui/src/libs/patient/demographics/ethnicity/edit/EthnicityDemographicFields.spec.tsx index f50eb1dd63..81dd689a70 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/ethnicity/edit/EthnicityDemographicFields.spec.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/ethnicity/edit/EthnicityDemographicFields.spec.tsx @@ -1,8 +1,7 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { EthnicityEntry } from 'apps/patient/data/ethnicity'; import { EthnicityCodedValues } from 'apps/patient/data/ethnicity/useEthnicityCodedValues'; -import { FormProvider, useForm } from 'react-hook-form'; +import { useForm } from 'react-hook-form'; import { PatientDemographics } from '../../demographics'; diff --git a/apps/modernization-ui/src/libs/patient/demographics/general/edit/GeneralInformationDemographicsFields.spec.tsx b/apps/modernization-ui/src/libs/patient/demographics/general/edit/GeneralInformationDemographicsFields.spec.tsx index f58033e30e..7566c185b6 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/general/edit/GeneralInformationDemographicsFields.spec.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/general/edit/GeneralInformationDemographicsFields.spec.tsx @@ -1,8 +1,7 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ExtendedNewPatientEntry } from 'apps/patient/add/extended'; import { indicators } from 'options/indicator'; -import { FormProvider, useForm } from 'react-hook-form'; +import { useForm } from 'react-hook-form'; import { PatientDemographics } from '../../demographics'; diff --git a/apps/modernization-ui/src/libs/patient/demographics/mortality/view/MortalityDemographicView.spec.tsx b/apps/modernization-ui/src/libs/patient/demographics/mortality/view/MortalityDemographicView.spec.tsx index e4777d6b5b..d0e502f299 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/mortality/view/MortalityDemographicView.spec.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/mortality/view/MortalityDemographicView.spec.tsx @@ -2,8 +2,6 @@ import { render, screen } from '@testing-library/react'; import { MortalityDemographicView } from './MortalityDemographicView'; -const noop = () => undefined; - describe('MortalityDemographicView', () => { it('should display "As of" when present', () => { render(); diff --git a/apps/modernization-ui/src/libs/patient/demographics/name/NameDemographicView.spec.tsx b/apps/modernization-ui/src/libs/patient/demographics/name/NameDemographicView.spec.tsx index 6c95849ed9..2702e36055 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/name/NameDemographicView.spec.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/name/NameDemographicView.spec.tsx @@ -2,20 +2,6 @@ import { render, screen } from '@testing-library/react'; import { asSelectable } from 'options/selectable'; import { NameDemographicView } from './NameDemographicView'; -import { NameDemographic } from './names'; - -const entry: NameDemographic = { - asOf: '12/25/2020', - type: asSelectable('AN', 'Adopted name'), - prefix: asSelectable('MS', 'Miss'), - first: 'test first', - middle: 'test middle', - secondMiddle: 'second middle', - last: 'test last', - secondLast: 'second last', - suffix: asSelectable('SR', 'test 2'), - degree: asSelectable('BA', 'test ba'), -}; describe('NameDemographicView', () => { it('should display the as of', () => { diff --git a/apps/modernization-ui/src/libs/patient/demographics/phoneEmail/PhoneEmailDemographicView.spec.tsx b/apps/modernization-ui/src/libs/patient/demographics/phoneEmail/PhoneEmailDemographicView.spec.tsx index e435a04b15..538e47132b 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/phoneEmail/PhoneEmailDemographicView.spec.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/phoneEmail/PhoneEmailDemographicView.spec.tsx @@ -1,5 +1,4 @@ import { render, screen } from '@testing-library/react'; -import { today } from 'date'; import { asSelectable } from 'options'; import { PhoneEmailDemographicView } from './PhoneEmailDemographicView'; diff --git a/apps/modernization-ui/src/libs/patient/demographics/phoneEmail/edit/PhoneEmailDemographicFields.spec.tsx b/apps/modernization-ui/src/libs/patient/demographics/phoneEmail/edit/PhoneEmailDemographicFields.spec.tsx index 7f2204aaf2..c8bc814e90 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/phoneEmail/edit/PhoneEmailDemographicFields.spec.tsx +++ b/apps/modernization-ui/src/libs/patient/demographics/phoneEmail/edit/PhoneEmailDemographicFields.spec.tsx @@ -138,7 +138,7 @@ describe('when entering patient phone & email demographics', () => { }); it('should not allow country codes over 20 characters', async () => { - const { getByLabelText, getByText } = render(); + const { getByLabelText} = render(); const user = userEvent.setup(); const country = getByLabelText('Country code'); diff --git a/apps/modernization-ui/src/libs/patient/demographics/race/edit/categoryRequiredValidator.ts b/apps/modernization-ui/src/libs/patient/demographics/race/edit/categoryRequiredValidator.ts index cb89db10c0..73eff80a21 100644 --- a/apps/modernization-ui/src/libs/patient/demographics/race/edit/categoryRequiredValidator.ts +++ b/apps/modernization-ui/src/libs/patient/demographics/race/edit/categoryRequiredValidator.ts @@ -9,7 +9,7 @@ import { exists } from 'utils'; * * @return {Promise} */ -const categoryRequiredValidator = (id: number, category: Selectable | null): Promise => +const categoryRequiredValidator = (_id: number, category: Selectable | null): Promise => !exists(category) ? Promise.resolve('The Race is required.') : Promise.resolve(true); export { categoryRequiredValidator }; From 36c424da14550633c479217ac9b42c62fb871b96 Mon Sep 17 00:00:00 2001 From: brick-green Date: Tue, 4 Aug 2026 16:57:11 -0400 Subject: [PATCH 22/49] add ci type check --- .github/workflows/verify-modernization-ui.yaml | 4 ++++ apps/modernization-ui/package.json | 3 ++- apps/modernization-ui/src/vite-env.d.ts | 2 ++ apps/modernization-ui/tsconfig.app.json | 18 ++++++++++++++---- apps/modernization-ui/tsconfig.test.json | 17 ++++++++++++----- 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/.github/workflows/verify-modernization-ui.yaml b/.github/workflows/verify-modernization-ui.yaml index b501d0531a..0b49158766 100644 --- a/.github/workflows/verify-modernization-ui.yaml +++ b/.github/workflows/verify-modernization-ui.yaml @@ -39,6 +39,10 @@ jobs: working-directory: ./apps/modernization-ui run: npm run format:check + - name: Type Check + working-directory: ./apps/modernization-ui + run: npm run typecheck + - name: Unit Test working-directory: ./apps/modernization-ui run: npm run test:all diff --git a/apps/modernization-ui/package.json b/apps/modernization-ui/package.json index 65f080772e..fd39614730 100644 --- a/apps/modernization-ui/package.json +++ b/apps/modernization-ui/package.json @@ -93,7 +93,8 @@ "scripts": { "start": "vite", "build": "vite build", - "typecheck": "tsc -b", + "typecheck": "tsc -b --noEmit", + "typecheck:watch": "tsc -b --noEmit --watch", "preview": "vite preview", "test": "vitest --changed", "test:all": "vitest run", diff --git a/apps/modernization-ui/src/vite-env.d.ts b/apps/modernization-ui/src/vite-env.d.ts index 11f02fe2a0..b16bf73f21 100644 --- a/apps/modernization-ui/src/vite-env.d.ts +++ b/apps/modernization-ui/src/vite-env.d.ts @@ -1 +1,3 @@ /// + +declare module 'config'; diff --git a/apps/modernization-ui/tsconfig.app.json b/apps/modernization-ui/tsconfig.app.json index 169287a216..05bb602946 100644 --- a/apps/modernization-ui/tsconfig.app.json +++ b/apps/modernization-ui/tsconfig.app.json @@ -1,10 +1,11 @@ { "compilerOptions": { /* base vite config */ + "allowJs": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", - "target": "ES2020", + "target": "ES2023", "useDefineForClassFields": true, - "lib": ["ES2020", "DOM", "DOM.Iterable"], + "lib": ["ES2023", "DOM", "DOM.Iterable"], "module": "ESNext", "skipLibCheck": true, @@ -25,8 +26,17 @@ /* nbs additions */ "plugins": [{ "name": "typescript-plugin-css-modules" }], - "baseUrl": "src" + "ignoreDeprecations": "6.0", + "paths": { + "*": ["./src/*"] + }, + "types": ["vite/client", "node"] }, - "exclude": ["src/**/*.spec.ts", "src/**/*.spec.tsx", "src/setupTests.ts"], + "exclude": [ + "src/**/*.spec.ts", + "src/**/*.spec.tsx", + "src/**/*.test.tsx", + "src/setupTests.ts" + ], "include": ["src"] } diff --git a/apps/modernization-ui/tsconfig.test.json b/apps/modernization-ui/tsconfig.test.json index a4053e084d..80dd407d5d 100644 --- a/apps/modernization-ui/tsconfig.test.json +++ b/apps/modernization-ui/tsconfig.test.json @@ -2,9 +2,9 @@ "compilerOptions": { /* base vite config */ "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", - "target": "ES2020", + "target": "ES2023", "useDefineForClassFields": true, - "lib": ["ES2020", "DOM", "DOM.Iterable"], + "lib": ["ES2023", "DOM", "DOM.Iterable"], "module": "ESNext", "skipLibCheck": true, @@ -24,8 +24,15 @@ "noUncheckedSideEffectImports": true, /* nbs additions */ - "baseUrl": "src", - "types": ["vitest/globals"] + "paths": { + "*": ["./src/*"] + }, + "types": ["vitest/globals", "@testing-library/jest-dom", "node"] }, - "include": ["src/**/*.spec.ts", "src/**/*.spec.tsx", "src/setupTests.ts"] + "include": [ + "src/**/*.spec.ts", + "src/**/*.spec.tsx", + "src/setupTests.ts", + "src/**/*.d.ts" + ] } From bf0d2f1e19831a6427cbd6cd313478f3e3af2f7e Mon Sep 17 00:00:00 2001 From: brick-green Date: Wed, 5 Aug 2026 09:27:25 -0400 Subject: [PATCH 23/49] lint fix --- apps/modernization-ui/src/analytics/useAnalytics.ts | 3 ++- .../configuration/MatchConfigurationLandingPage.spec.tsx | 3 ++- .../import/ImportConfigurationModal.spec.tsx | 1 + .../configuration/import/importModal/ImportModal.tsx | 1 + .../import/importPreview/ImportPreview.spec.tsx | 1 + .../data-element-table/DataElementsTable.spec.tsx | 1 + .../PassConfigurationTable.spec.tsx | 1 + .../notification-cards/AlgorithmNotConfigured.tsx | 3 ++- .../pass-configuration/PassConfiguration.tsx | 5 +++-- .../pass-configuration/pass-form/PassForm.tsx | 3 ++- .../pass-form/activate-toggle/ActivateToggle.spec.tsx | 3 ++- .../pass-form/activate-toggle/ActivateToggle.tsx | 3 ++- .../pass-form/attribute-entry/AttributeEntry.tsx | 1 + .../blocking-criteria/BlockingCriteria.spec.tsx | 3 ++- .../pass-form/blocking-criteria/BlockingCriteria.tsx | 3 ++- .../blocking-criteria/BlockingCriteriaAttribute.tsx | 3 ++- .../attribute/BlockingCriteriaAttribute.spec.tsx | 3 ++- .../attribute/BlockingCriteriaAttribute.tsx | 3 ++- .../panel/BlockingCriteriaSidePanel.spec.tsx | 3 ++- .../panel/BlockingCriteriaSidePanel.tsx | 3 ++- .../pass-form/matching-bounds/MatchingBounds.spec.tsx | 3 ++- .../pass-form/matching-bounds/MatchingBounds.tsx | 3 ++- .../numeric-hint-input/NumericHintInput.tsx | 1 + .../matching-criteria/MatchingCriteria.spec.tsx | 3 ++- .../pass-form/matching-criteria/MatchingCriteria.tsx | 3 ++- .../attribute/MatchingCriteriaAttribute.spec.tsx | 3 ++- .../attribute/MatchingCriteriaAttribute.tsx | 3 ++- .../panel/MatchingCriteriaSidePanel.spec.tsx | 3 ++- .../panel/MatchingCriteriaSidePanel.tsx | 3 ++- .../pass-form/save-modal/SavePassModal.tsx | 3 ++- .../pass-form/save-modal/UpdatePassNameModal.tsx | 3 ++- .../pass-configuration/pass-list/PassList.spec.tsx | 1 + .../pass-list/pass-entry/PassEntry.spec.tsx | 1 + .../pass-list/pass-entry/PassEntry.tsx | 3 ++- .../deduplication/data-elements/DataElementConfig.tsx | 5 +++-- .../form/DataElementRow/DataElementRow.spec.tsx | 3 ++- .../data-elements/form/DataElementRow/DataElementRow.tsx | 3 ++- .../form/DataElementsForm/DataElementsForm.tsx | 3 ++- .../patient-merge/details/MergeDetails.spec.tsx | 3 ++- .../deduplication/patient-merge/details/MergeDetails.tsx | 7 ++++--- .../merge-preview/components/address/PreviewAddress.tsx | 1 + .../administrative-comments/AdministrativeComments.tsx | 1 + .../components/identification/PreviewIdentification.tsx | 1 + .../merge-preview/components/name/PreviewName.tsx | 1 + .../components/patient-summary/PatientSummary.tsx | 1 + .../components/phone-and-email/PreviewPhoneAndEmail.tsx | 1 + .../merge-preview/components/race/PreviewRace.tsx | 1 + .../preview-card-table/MergePreviewTableCard.spec.tsx | 3 ++- .../details/merge-review/MergeReview.spec.tsx | 5 +++-- .../patient-merge/details/merge-review/MergeReview.tsx | 3 ++- .../patient-form/address/AddressSelection.spec.tsx | 3 ++- .../address/address-data-table/AddressDataTable.spec.tsx | 3 ++- .../address/address-data-table/AddressDataTable.tsx | 3 ++- .../address/address-details/AddressDetails.spec.tsx | 1 + .../admin-comments/AdminCommentsSelection.spec.tsx | 3 ++- .../admin-comments/admin-comment/AdminComment.tsx | 3 ++- .../patient-form/ethnicity/EthnicitySelection.spec.tsx | 3 ++- .../patient-form/ethnicity/ethnicity/Ethnicity.spec.tsx | 3 ++- .../patient-form/ethnicity/ethnicity/Ethnicity.tsx | 3 ++- .../patient-form/general/GeneralSelection.spec.tsx | 3 ++- .../general/general-info/GeneralInfo.spec.tsx | 3 ++- .../patient-form/general/general-info/GeneralInfo.tsx | 3 ++- .../identification/IdentificationSelection.spec.tsx | 3 ++- .../IdentificationDataTable.spec.tsx | 3 ++- .../IdentificationDataTable.tsx | 3 ++- .../IdentificationDetails.spec.tsx | 1 + .../investigations/InvestigationDisplay.spec.tsx | 3 ++- .../investigations/investigation/Investigation.spec.tsx | 1 + .../patient-form/mortality/MortalitySelection.spec.tsx | 3 ++- .../patient-form/mortality/MortalitySelection.tsx | 3 ++- .../patient-form/mortality/mortality/Mortality.spec.tsx | 3 ++- .../patient-form/mortality/mortality/Mortality.tsx | 3 ++- .../patient-form/name/NameSelection.spec.tsx | 3 ++- .../name/name-data-table/NameDataTable.spec.tsx | 3 ++- .../patient-form/name/name-data-table/NameDataTable.tsx | 3 ++- .../patient-form/name/name-details/NameDetails.spec.tsx | 1 + .../patient-form/patient-id/PatientIdSelection.spec.tsx | 3 ++- .../patient-form/patient-id/PatientIdSelection.tsx | 5 +++-- .../phone-email/PhoneEmailSelection.spec.tsx | 3 ++- .../phone-email-data-table/PhoneEmailDataTable.spec.tsx | 3 ++- .../phone-email-data-table/PhoneEmailDataTable.tsx | 3 ++- .../phone-email-details/PhoneEmailDetails.spec.tsx | 1 + .../patient-form/race/RaceSelection.spec.tsx | 3 ++- .../race/race-data-table/RaceDataTable.spec.tsx | 3 ++- .../patient-form/race/race-data-table/RaceDataTable.tsx | 3 ++- .../patient-form/race/race-details/RaceDetails.spec.tsx | 1 + .../sex-and-birth/SexAndBirthSelection.spec.tsx | 3 ++- .../sex-and-birth/sex-and-birth/SexAndBirth.spec.tsx | 3 ++- .../sex-and-birth/sex-and-birth/SexAndBirth.tsx | 3 ++- .../shared/merge-data-display/MergeDataDisplay.tsx | 3 ++- .../patient-merge/landing/MergeLanding.spec.tsx | 5 +++-- .../MatchesRequiringReviewTable.spec.tsx | 3 ++- .../MatchesRequiringReviewTable.tsx | 5 +++-- .../src/apps/landing/Layout/WelcomeLayout.tsx | 3 ++- apps/modernization-ui/src/apps/landing/SignIn/SignIn.tsx | 3 ++- apps/modernization-ui/src/apps/landing/SignUp/SignUp.tsx | 3 ++- .../src/apps/page-builder/PageBuilderRouting.tsx | 3 ++- .../page-builder/components/AddQuestion/AddQuestion.tsx | 5 +++-- .../page-builder/components/AddQuestion/QuestionForm.tsx | 3 ++- .../AddQuestion/fields/AdministrativeFields.tsx | 1 + .../AddQuestion/fields/BasicInformationFields.tsx | 3 ++- .../components/AddQuestion/fields/CodedFields.tsx | 3 ++- .../components/AddQuestion/fields/DataMartFields.tsx | 3 ++- .../components/AddQuestion/fields/DateFields.tsx | 3 ++- .../components/AddQuestion/fields/MessagingFields.tsx | 3 ++- .../components/AddQuestion/fields/NumericFields.tsx | 3 ++- .../AddQuestion/fields/QuestionSpecificFields.tsx | 3 ++- .../components/AddQuestion/fields/TextFields.tsx | 3 ++- .../AddQuestion/fields/UserInterfaceFields.tsx | 3 ++- .../AddQuestion/valueset/CreateEditValueset.tsx | 3 ++- .../components/AddQuestion/valueset/ValuesetSearch.tsx | 1 + .../components/AddSection/AddSectionModal.spec.tsx | 1 + .../components/AddSection/AddSectionModal.tsx | 1 + .../page-builder/components/AddValueset/AddValueset.tsx | 3 ++- .../components/AddValueset/ValuesetForm/ValuesetForm.tsx | 3 ++- .../components/CreateCondition/CreateCondition.spec.tsx | 3 ++- .../components/CreateCondition/CreateCondition.tsx | 3 ++- .../components/EditValueset/CreateConcept.tsx | 3 ++- .../page-builder/components/EditValueset/EditConcept.tsx | 3 ++- .../components/EditValueset/EditValuesetDetails.tsx | 3 ++- .../components/EditValueset/ValuesetDetails.tsx | 1 + .../components/EditValueset/ViewValueset.tsx | 1 + .../components/EditValueset/concept/ConceptForm.tsx | 3 ++- .../components/EditValueset/concept/ConceptTable.tsx | 1 + .../components/ImportTemplate/ImportTemplate.spec.tsx | 3 ++- .../components/ImportTemplate/ImportTemplate.tsx | 1 + .../components/SaveTemplate/SaveTemplate.spec.tsx | 3 ++- .../ValuesetSearchTable/ValuesetSearchTable.tsx | 1 + .../condition/search/ConditionSearch.spec.tsx | 3 ++- .../page-builder/condition/search/ConditionSearch.tsx | 1 + .../condition/search/ConditionTable.spec.tsx | 1 + .../src/apps/page-builder/hooks/api/useFetchPageRules.ts | 3 ++- .../apps/page-builder/hooks/api/useGetAllPageRules.ts | 3 ++- .../src/apps/page-builder/page/library/PageLibrary.tsx | 3 ++- .../apps/page-builder/page/library/asPageSummaryRows.tsx | 3 ++- .../page/library/table/ConditionsDisplay.spec.tsx | 1 + .../page/library/table/PageLibraryTable.spec.tsx | 1 + .../page-builder/page/library/table/PageLibraryTable.tsx | 3 ++- .../src/apps/page-builder/page/management/edit/Edit.tsx | 1 + .../edit/add-question/modal/AddQuestionModal.tsx | 1 + .../edit/add-question/search/QuestionSearch.tsx | 1 + .../search/table/QuestionSearchTable.spec.tsx | 3 ++- .../add-question/search/table/QuestionSearchTable.tsx | 1 + .../edit/change-valueset/ChangeValuesetModal.tsx | 1 + .../page/management/edit/content/PageContent.tsx | 1 + .../page/management/edit/content/PageSideMenu.tsx | 1 + .../management/edit/edit-question/EditQuestionModal.tsx | 3 ++- .../management/edit/edit-question/form/EditFields.tsx | 3 ++- .../edit/edit-question/form/EditPageQuestion.tsx | 3 ++- .../edit/edit-staticelement/EditStaticElementModal.tsx | 1 + .../management/edit/edit-valueset/EditValuesetModal.tsx | 1 + .../question/GroupQuestion/Create/GroupQuestion.spec.tsx | 3 ++- .../edit/question/GroupQuestion/Create/GroupQuestion.tsx | 3 ++- .../edit/question/GroupQuestion/GroupQuestionModal.tsx | 1 + .../edit/question/GroupQuestion/RepeatingBlock.spec.tsx | 3 ++- .../edit/question/GroupQuestion/RepeatingBlock.tsx | 3 ++- .../question/GroupQuestion/SubsectionDetails.spec.tsx | 3 ++- .../edit/question/GroupQuestion/SubsectionDetails.tsx | 3 ++- .../GroupQuestion/Update/UpdateGroupedQuestion.tsx | 3 ++- .../page/management/edit/question/Question.tsx | 1 + .../management/edit/question/QuestionContent.spec.tsx | 3 ++- .../page/management/edit/question/QuestionContent.tsx | 1 + .../page/management/edit/question/QuestionHeader.tsx | 1 + .../edit/reorder/ReorderModal/ReorderModal.spec.tsx | 1 + .../edit/reorder/ReorderModal/ReorderModal.tsx | 1 + .../reorder/ReorderQuestion/ReorderQuestion.spec.tsx | 1 + .../edit/reorder/ReorderQuestion/ReorderQuestion.tsx | 1 + .../edit/reorder/ReorderSection/ReorderSection.spec.tsx | 1 + .../edit/reorder/ReorderSection/ReorderSection.tsx | 1 + .../reorder/ReorderSubsection/ReorderSubsection.spec.tsx | 1 + .../edit/reorder/ReorderSubsection/ReorderSubsection.tsx | 1 + .../management/edit/reorder/ReorderTab/ReorderTab.tsx | 1 + .../page/management/edit/section/Section.tsx | 1 + .../page/management/edit/section/SectionHeader.tsx | 3 ++- .../page/management/edit/section/Sections.tsx | 1 + .../page/management/edit/section/manage/AddSection.tsx | 3 ++- .../edit/section/manage/ManageSection.spec.tsx | 1 + .../management/edit/section/manage/ManageSection.tsx | 1 + .../edit/section/manage/ManageSectionModal.tsx | 1 + .../manage/ManageSectionTile/ManageSectionTile.spec.tsx | 1 + .../manage/ManageSectionTile/ManageSectionTile.tsx | 1 + .../edit/staticelement/AddStaticElement.spec.tsx | 1 + .../management/edit/staticelement/AddStaticElement.tsx | 3 ++- .../management/edit/staticelement/CommentsFields.tsx | 3 ++- .../edit/staticelement/EditStaticElement.spec.tsx | 3 ++- .../management/edit/staticelement/EditStaticElement.tsx | 3 ++- .../management/edit/staticelement/HyperlinkFields.tsx | 3 ++- .../management/edit/subsection/SubsectionHeader.spec.tsx | 1 + .../page/management/edit/subsection/SubsectionHeader.tsx | 1 + .../management/edit/subsection/manage/AddSubSection.tsx | 3 ++- .../edit/subsection/manage/ManageSubsection.tsx | 1 + .../ManageSubsectionTile/ManageSubsectionTile.spec.tsx | 1 + .../manage/ManageSubsectionTile/ManageSubsectionTile.tsx | 1 + .../management/edit/tabs/AddEditTab/AddEditTab.spec.tsx | 5 +++-- .../page/management/edit/tabs/AddEditTab/AddEditTab.tsx | 3 ++- .../management/edit/tabs/ManageTabs/ManageTabs.spec.tsx | 1 + .../page/management/edit/tabs/ManageTabs/ManageTabs.tsx | 3 ++- .../edit/tabs/ManageTabsTile/ManageTabsTile.spec.tsx | 1 + .../edit/tabs/ManageTabsTile/ManageTabsTile.tsx | 1 + .../edit/tabs/ReorderableTabs/ReorderableTabs.tsx | 1 + .../page/management/header/tabs/PageTabs.spec.tsx | 1 + .../page/management/layout/PageManagementLayout.tsx | 3 ++- .../page/management/preview/PageDetails/PageDetails.tsx | 5 +++-- .../management/preview/PageDetails/PageDetailsField.tsx | 3 ++- .../page-builder/page/management/preview/PreviewPage.tsx | 3 ++- .../management/preview/PublishPage/PublishPage.spec.tsx | 1 + .../page/management/preview/PublishPage/PublishPage.tsx | 3 ++- .../preview/SaveTemplate/SaveTemplate.spec.tsx | 1 + .../management/preview/SaveTemplate/SaveTemplate.tsx | 3 ++- .../management/preview/information/PageInformation.tsx | 3 ++- .../management/preview/tab/question/PreviewQuestion.tsx | 1 + .../page-builder/page/management/useGetPageDetails.ts | 3 ++- .../page-builder/pages/AddNewPage/AddNewPage.spec.tsx | 3 ++- .../apps/page-builder/pages/AddNewPage/AddNewPage.tsx | 5 +++-- .../page-builder/pages/AddNewPage/AddNewPageFields.tsx | 3 ++- .../pages/BusinessRulesLibrary/Add/AddBusinessRules.tsx | 5 +++-- .../pages/BusinessRulesLibrary/BusinessRulesLibrary.tsx | 1 + .../BusinessRulesLibraryTable.spec.tsx | 3 ++- .../BusinessRulesLibrary/BusinessRulesLibraryTable.tsx | 3 ++- .../BusinessRulesLibrary/Edit/EditBusinessRules.tsx | 5 +++-- .../BusinessRulesLibrary/Form/BusinessRulesForm.tsx | 5 +++-- .../SourceQuestion/SourceQuestion.tsx | 1 + .../pages/BusinessRulesLibrary/SubSectionDropdown.tsx | 3 ++- .../TargetQuestion/TargetQuestion.tsx | 1 + .../ViewBusinessRule/ViewBusinessRule.spec.tsx | 3 ++- .../ViewBusinessRule/ViewBusinessRule.tsx | 3 ++- .../src/apps/patient/add/PatientDataEntryProvider.tsx | 3 ++- .../src/apps/patient/add/basic/AddPatientBasic.tsx | 5 +++-- .../src/apps/patient/add/basic/AddPatientBasicForm.tsx | 3 ++- .../add/basic/address/BasicAddressFields.spec.tsx | 3 ++- .../patient/add/basic/address/BasicAddressFields.tsx | 3 ++- .../identification/BasicIdentificationFields.spec.tsx | 3 ++- .../basic/identification/BasicIdentificationFields.tsx | 3 ++- .../BasicIdentificationRepeatingBlock.spec.tsx | 1 + .../src/apps/patient/add/basic/name/NameEntryFields.tsx | 3 ++- .../basic/personalDetails/BasicPersonalDetailsFields.tsx | 3 ++- .../add/basic/phoneEmail/BasicPhoneEmailFields.tsx | 3 ++- .../raceEthnicity/BasicEthnicityRaceFields.spec.tsx | 3 ++- .../add/basic/raceEthnicity/BasicEthnicityRaceFields.tsx | 3 ++- .../add/cancelAddPatientPanel/CancelAddPatientPanel.tsx | 1 + .../patient/add/extended/AddPatientExtended.spec.tsx | 5 +++-- .../src/apps/patient/add/extended/AddPatientExtended.tsx | 3 ++- .../patient/add/extended/AddPatientExtendedForm.spec.tsx | 3 ++- .../apps/patient/add/extended/AddPatientExtendedForm.tsx | 3 ++- .../inputs/address/AddressRepeatingBlock.spec.tsx | 1 + .../add/extended/inputs/address/AddressView.spec.tsx | 1 + .../identification/IdentificationRepeatingBlock.spec.tsx | 1 + .../inputs/identification/IdentificationView.spec.tsx | 1 + .../add/extended/inputs/name/NameEntryView.spec.tsx | 1 + .../add/extended/inputs/name/NameRepeatingBlock.spec.tsx | 1 + .../inputs/phone/PhoneAndEmailRepeatingBlock.spec.tsx | 1 + .../add/extended/inputs/phone/PhoneEntryView.spec.tsx | 1 + .../add/extended/inputs/race/RaceEntryView.spec.tsx | 1 + .../add/extended/inputs/race/RaceRepeatingBlock.spec.tsx | 1 + .../apps/patient/add/layout/AddPatientLayout.spec.tsx | 3 ++- .../patient/data/address/AddressEntryFields.spec.tsx | 3 ++- .../src/apps/patient/data/address/AddressEntryFields.tsx | 3 ++- .../administrative/AdministrativeEntryFields.spec.tsx | 3 ++- .../data/administrative/AdministrativeEntryFields.tsx | 3 ++- .../apps/patient/data/ethnicity/EthnicityEntryFields.tsx | 3 ++- .../data/general/GeneralInformationEntryFields.spec.tsx | 3 ++- .../data/general/GeneralInformationEntryFields.tsx | 3 ++- .../data/identification/IdentificationEntryFields.tsx | 3 ++- .../patient/data/mortality/MortalityEntryFields.spec.tsx | 3 ++- .../apps/patient/data/mortality/MortalityEntryFields.tsx | 3 ++- .../src/apps/patient/data/name/NameEntryFields.tsx | 3 ++- .../patient/data/phoneEmail/PhoneEmailEntryFields.tsx | 3 ++- .../src/apps/patient/data/race/RaceEntryFields.tsx | 3 ++- .../data/sexAndBirth/SexAndBirthEntryFields.spec.tsx | 3 ++- .../patient/data/sexAndBirth/SexAndBirthEntryFields.tsx | 3 ++- .../src/apps/patient/file/PatientFile.tsx | 3 ++- .../src/apps/patient/file/PatientFileLayout.spec.tsx | 1 + .../src/apps/patient/file/PatientFileRouting.tsx | 1 + .../src/apps/patient/file/PatientFileView.tsx | 3 ++- .../src/apps/patient/file/delete/DeleteAction.spec.tsx | 3 ++- .../apps/patient/file/delete/useDeletePatient.spec.ts | 3 ++- .../file/demographics/address/PatientFileAddressCard.tsx | 3 ++- .../PatientFileAdministrativeInformationCard.tsx | 3 ++- .../demographics/ethnicity/PatientFileEthnicityCard.tsx | 3 ++- .../general/PatientFileGeneralInformationCard.tsx | 3 ++- .../identification/PatientFileIdentificationCard.tsx | 3 ++- .../demographics/mortality/PatientFileMortalityCard.tsx | 3 ++- .../file/demographics/name/PatientFileNameCard.tsx | 3 ++- .../phoneEmail/PatientFilePhoneEmailCard.tsx | 3 ++- .../file/demographics/race/PatientFileRaceCard.tsx | 3 ++- .../demographics/sex-birth/PatientFileSexBirthCard.tsx | 3 ++- .../summary/PatientFileDemographicsSummaryCard.tsx | 3 ++- .../src/apps/patient/file/edit/PatientFileEdit.tsx | 5 +++-- .../apps/patient/file/events/contacts/ContactsCard.tsx | 3 ++- .../file/events/documents/PatientFileDocumentsCard.tsx | 3 ++- .../investigations/PatientFileInvestigationsCard.tsx | 3 ++- .../events/record/birth/PatientFileBirthRecordCard.tsx | 3 ++- .../laboratory/PatientFileLaboratoryReportsCard.tsx | 3 ++- .../morbidity/PatientFileMorbidityReportsCard.tsx | 3 ++- .../file/events/treatments/PatientFileTreatmentsCard.tsx | 3 ++- .../events/vaccinations/PatientFileVaccinationsCard.tsx | 3 ++- apps/modernization-ui/src/apps/patient/file/loader.ts | 3 ++- .../PatientDocumentRequiringReviewCard.tsx | 3 ++- .../patient/file/summary/mergeHistory/MergeAlert.tsx | 3 ++- .../mergeHistory/PatientMergeHistoryCard.spec.tsx | 3 ++- .../summary/mergeHistory/PatientMergeHistoryCard.tsx | 3 ++- .../PatientFileOpenInvestigationsCard.tsx | 3 ++- apps/modernization-ui/src/apps/report/ReportRouting.tsx | 3 ++- .../configuration/AddReportConfiguration.spec.tsx | 3 ++- .../management/configuration/AddReportConfiguration.tsx | 5 +++-- .../configuration/EditReportConfiguration.spec.tsx | 3 ++- .../management/configuration/EditReportConfiguration.tsx | 5 +++-- .../management/configuration/FilterRepeatingBlock.tsx | 3 ++- .../configuration/ReportConfigurationContent.tsx | 5 +++-- .../configuration/ViewReportConfiguration.spec.tsx | 3 ++- .../management/configuration/ViewReportConfiguration.tsx | 3 ++- .../src/apps/report/run/ReportConfigurationPage.tsx | 3 ++- .../src/apps/report/run/ReportResultPage.spec.tsx | 3 ++- .../src/apps/report/run/ReportResultPage.tsx | 1 + .../src/apps/report/run/ReportRunPage.spec.tsx | 7 ++++--- .../src/apps/report/run/ReportRunPage.tsx | 7 ++++--- .../src/apps/report/run/ResultDataPage.spec.tsx | 3 ++- .../src/apps/report/run/ResultDataPage.tsx | 9 +++++---- .../src/apps/report/run/columns/ColumnSelector.tsx | 3 ++- .../src/apps/report/run/columns/SortSelector.tsx | 3 ++- .../src/apps/report/run/filters/advanced/AddButton.tsx | 3 ++- .../apps/report/run/filters/advanced/AdvancedFilter.tsx | 7 ++++--- .../apps/report/run/filters/advanced/RemoveButton.tsx | 3 ++- .../report/run/filters/advanced/ShiftableDragHandle.tsx | 3 ++- .../report/run/filters/advanced/ValueSetSelector.tsx | 3 ++- .../report/run/filters/advanced/ValueSingleSelector.tsx | 3 ++- .../apps/report/run/filters/advanced/useKeyboardDnd.tsx | 3 ++- .../apps/report/run/filters/advanced/validator.spec.ts | 2 +- .../src/apps/report/run/filters/advanced/validator.ts | 1 + .../src/apps/report/run/filters/basic/BasicFilter.tsx | 3 ++- .../apps/report/run/filters/basic/useCurrentState.tsx | 3 ++- .../src/apps/report/run/modals/SaveAsReportModal.tsx | 3 ++- .../src/apps/report/utils/loadReportConfiguration.ts | 3 ++- apps/modernization-ui/src/apps/search/SearchPage.tsx | 3 ++- apps/modernization-ui/src/apps/search/SearchRouting.tsx | 3 ++- .../src/apps/search/basic/BasicPatient.tsx | 3 ++- .../src/apps/search/criteria/SearchCriteria.tsx | 1 + .../apps/search/investigation/CriteriaSearchFields.tsx | 3 ++- .../search/investigation/GeneralSearchFields.spec.tsx | 3 ++- .../apps/search/investigation/GeneralSearchFields.tsx | 3 ++- .../apps/search/investigation/InvestigationSearch.tsx | 3 ++- .../list/InvestigationSearchResultListItem.spec.tsx | 3 ++- .../table/InvestigationSearchResultsTable.spec.tsx | 3 ++- .../apps/search/investigation/useInvestigationSearch.ts | 3 ++- .../src/apps/search/laboratory-report/CriteriaFields.tsx | 3 ++- .../apps/search/laboratory-report/GeneralFields.spec.tsx | 1 + .../src/apps/search/laboratory-report/GeneralFields.tsx | 3 ++- .../search/laboratory-report/LaboratoryReportSearch.tsx | 3 ++- .../result/ResultedTestDisplay.spec.tsx | 1 + .../result/laboratoryReportResult.spec.tsx | 1 + .../list/LaboratoryReportSearchResultListItem.spec.tsx | 3 ++- .../table/LaboratoryReportSearchResultsTable.spec.tsx | 3 ++- .../laboratory-report/useLaboratoryReportSearch.ts | 3 ++- .../src/apps/search/layout/SearchLayout.spec.tsx | 3 ++- .../apps/search/layout/navigation/SearchNavigation.tsx | 1 + .../layout/patientSearchHeader/PatientSearchHeader.tsx | 1 + .../search/layout/result/header/SearchResultsHeader.tsx | 3 ++- .../result/header/options/toggleView/ToggleView.tsx | 3 ++- .../layout/result/header/terms/SearchTerms.spec.tsx | 3 ++- .../src/apps/search/layout/result/list/ResultItem.tsx | 1 + .../pagination/showing/SearchResultsShowing.spec.tsx | 1 + .../src/apps/search/patient/PatientCriteria/Address.tsx | 3 ++- .../patient/PatientCriteria/BasicInformation.spec.tsx | 3 ++- .../search/patient/PatientCriteria/BasicInformation.tsx | 3 ++- .../src/apps/search/patient/PatientCriteria/Contact.tsx | 3 ++- .../src/apps/search/patient/PatientCriteria/Id.tsx | 3 ++- .../patient/PatientCriteria/RaceEthnicity.spec.tsx | 3 ++- .../search/patient/PatientCriteria/RaceEthnicity.tsx | 3 ++- .../src/apps/search/patient/PatientSearch.tsx | 3 ++- .../apps/search/patient/add/useAddPatientFromSearch.ts | 3 ++- .../apps/search/patient/result/PatientFileLink.spec.tsx | 3 ++- .../src/apps/search/patient/result/PatientFileLink.tsx | 3 ++- .../patient/result/displayProfileLegalName.spec.tsx | 3 ++- .../result/list/PatientSearchResultListItem.spec.tsx | 3 ++- .../search/patient/result/patientSearchResult.spec.tsx | 1 + .../src/apps/search/patient/usePatientSearch.ts | 3 ++- .../src/apps/search/simple/SimpleSearch.tsx | 3 ++- .../src/apps/search/terms/removeTerm.spec.ts | 3 ++- .../modernization-ui/src/apps/search/terms/removeTerm.ts | 1 + .../src/apps/search/useSearchCriteria.spec.tsx | 3 ++- .../src/apps/search/useSearchCriteria.ts | 3 ++- .../src/apps/search/useSearchNavigation.ts | 3 ++- .../src/apps/search/useSearchResults.spec.tsx | 1 + .../src/apps/search/useSearchResultsFormAdapter.ts | 3 ++- .../components/shared/SystemManagementInfoCard.tsx | 3 ++- apps/modernization-ui/src/authorization/IdleTimer.tsx | 3 ++- .../src/authorization/ProtectedLayout.tsx | 3 ++- .../src/components/FormInputs/DatePickerInput.tsx | 3 ++- .../modernization-ui/src/components/FormInputs/Input.tsx | 1 + .../src/components/FormInputs/SelectInput.tsx | 1 + .../src/components/Search/LiveSearch.tsx | 1 + .../SegmentedButtons/SegmentedButtons.spec.tsx | 1 + .../src/components/SegmentedButtons/SegmentedButtons.tsx | 1 + .../src/components/TabNavigation/TabNavigation.tsx | 3 ++- .../src/components/Table/RangeToggle/RangeToggle.tsx | 1 + apps/modernization-ui/src/components/Table/Table.tsx | 1 + .../src/components/Table/TableHeader.tsx | 1 + .../src/components/Table/testing/WithinTableProvider.tsx | 3 ++- .../selection/multi/MultiSelectAutocomplete.tsx | 5 +++-- .../src/components/selection/multi/MultiSelectInput.tsx | 3 ++- .../src/configuration/useConfiguration.tsx | 1 + apps/modernization-ui/src/date/age/displayAge.ts | 1 + apps/modernization-ui/src/date/maybeDate.ts | 1 + .../autocomplete/multi/AutocompleteMulti.stories.tsx | 1 + .../autocomplete/multi/AutocompleteMulti.tsx | 5 +++-- .../autocomplete/single/Autocomplete.spec.tsx | 1 + .../design-system/autocomplete/single/Autocomplete.tsx | 1 + .../single/selectable/SelectableAutocomplete.spec.tsx | 1 + .../single/selectable/SelectableAutocomplete.stories.tsx | 1 + .../autocomplete/single/text/TextAutocomplete.spec.tsx | 1 + .../single/text/TextAutocomplete.stories.tsx | 1 + .../src/design-system/card/Card.stories.tsx | 1 + apps/modernization-ui/src/design-system/card/Card.tsx | 1 + .../src/design-system/card/CardHeader.spec.tsx | 1 + .../src/design-system/card/section/Section.stories.tsx | 1 + .../src/design-system/card/section/Section.tsx | 1 + .../src/design-system/card/table/TableCard.spec.tsx | 3 ++- .../src/design-system/card/table/TableCard.stories.tsx | 3 ++- .../src/design-system/checkbox/Checkbox.tsx | 1 + .../src/design-system/checkbox/CheckboxGroup.stories.tsx | 1 + .../src/design-system/checkbox/CheckboxGroup.tsx | 1 + .../design-system/checkbox/SelectableCheckbox.spec.tsx | 1 + apps/modernization-ui/src/design-system/chips/Chip.tsx | 1 + .../design-system/collapsible-panel/CollapsiblePanel.tsx | 1 + .../src/design-system/data-display/ValueView.tsx | 1 + .../design-system/date/criteria/exact/ExactDateField.tsx | 1 + .../design-system/date/criteria/exact/MonthYearField.tsx | 1 + .../design-system/date/criteria/range/DateRangeField.tsx | 1 + .../date/criteria/range/MonthYearRangeField.tsx | 1 + .../design-system/date/criteria/range/YearRangeField.tsx | 1 + .../src/design-system/date/occursInThePast.spec.ts | 3 ++- .../src/design-system/date/picker/DatePicker.tsx | 1 + .../entry/multi-value/RepeatingBlock.spec.tsx | 3 ++- .../entry/multi-value/RepeatingBlock.stories.tsx | 3 ++- .../design-system/entry/multi-value/RepeatingBlock.tsx | 3 ++- .../design-system/entry/multi-value/view/DetailView.tsx | 1 + .../entry/navigation-guard/NavigationGuard.spec.tsx | 3 ++- .../entry/navigation-guard/NavigationGuard.tsx | 3 ++- .../src/design-system/errors/ApiError.spec.tsx | 1 + .../src/design-system/field/value/ValueField.tsx | 1 + apps/modernization-ui/src/design-system/hint/Hint.tsx | 3 ++- apps/modernization-ui/src/design-system/icon/Icon.tsx | 1 + .../design-system/inPageNavigation/InPageNavigation.tsx | 1 + .../src/design-system/input/range/NumberRangeField.tsx | 1 + .../src/design-system/input/text/TextInput.tsx | 1 + .../input/text/criteria/TextCriteriaField.spec.tsx | 1 + .../input/text/criteria/operator/OperatorSelect.spec.tsx | 1 + .../src/design-system/loading/LoadingPanel.tsx | 1 + .../src/design-system/message/Message.tsx | 1 + .../src/design-system/message/alert/AlertMessage.tsx | 1 + apps/modernization-ui/src/design-system/modal/Modal.tsx | 3 ++- .../src/design-system/pagination/Pagination.tsx | 1 + apps/modernization-ui/src/design-system/radio/Radio.tsx | 1 + .../src/design-system/radio/RadioGroup.tsx | 1 + .../src/design-system/search/SearchBar.tsx | 1 + .../src/design-system/select/multi/CheckboxOption.tsx | 3 ++- .../design-system/select/multi/MultiSelect.stories.tsx | 1 + .../src/design-system/select/multi/MultiSelect.tsx | 3 ++- .../src/design-system/select/single/Select.tsx | 1 + .../design-system/select/single/SingleSelect.stories.tsx | 1 + .../src/design-system/side-nav/SideNavigation.tsx | 1 + .../design-system/sorting/preferences/SortPreference.tsx | 1 + .../sorting/preferences/useSortingPreferences.spec.tsx | 1 + .../src/design-system/table/DataTable.spec.tsx | 3 ++- .../src/design-system/table/DataTable.stories.tsx | 1 + .../src/design-system/table/DataTable.tsx | 1 + .../src/design-system/table/DataTableRow.tsx | 1 + .../src/design-system/table/header/ColumnHeader.tsx | 1 + .../src/design-system/table/header/DataTableHeader.tsx | 1 + .../table/header/filter/HeaderFilterField.spec.tsx | 1 + .../table/header/filter/HeaderFilterField.tsx | 1 + .../table/preferences/ColumnPreferencesPanel.tsx | 1 + .../src/design-system/tag/Tag.stories.tsx | 1 + apps/modernization-ui/src/design-system/tag/Tag.tsx | 1 + .../modernization-ui/src/design-system/toggle/Toggle.tsx | 1 + .../src/design-system/tooltip/Tooltip.stories.tsx | 1 + .../src/design-system/value/labeled/LabeledValue.tsx | 1 + apps/modernization-ui/src/feature/FeatureLayout.tsx | 1 + .../src/filters/applied/AppliedFilters.spec.tsx | 1 + .../src/filters/applied/AppliedFilters.tsx | 1 + .../src/filters/entry/DataRangeEntryForm.tsx | 3 ++- .../src/filters/entry/ExactValueEntryForm.tsx | 3 ++- .../src/filters/entry/FilterEntryForm.tsx | 3 ++- .../src/filters/entry/PartialValueEntryForm.tsx | 3 ++- apps/modernization-ui/src/filters/panel/FilterPanel.tsx | 1 + apps/modernization-ui/src/index.tsx | 1 + apps/modernization-ui/src/layout/Layout.tsx | 3 ++- apps/modernization-ui/src/libs/alert/AlertToast.tsx | 3 ++- apps/modernization-ui/src/libs/guard/GuardedLayout.tsx | 1 + .../src/libs/page/back-to-top/BackToTop.tsx | 1 + .../src/libs/patient/PatientDescriptor.tsx | 1 + .../patient/demographics/PatientDemographicsForm.tsx | 5 +++-- .../demographics/address/AddressDemographicView.spec.tsx | 1 + .../address/edit/AddressDemographicFields.spec.tsx | 3 ++- .../address/edit/AddressDemographicFields.tsx | 3 ++- .../address/edit/EditAddressDemographicsCard.tsx | 3 ++- .../edit/AdministrativeInformationFields.tsx | 3 ++- .../edit/EditAdministrativeInformationCard.tsx | 3 ++- .../view/AdministrativeInformationCard.tsx | 1 + .../ethnicity/edit/EditEthnicityDemographicCard.tsx | 3 ++- .../ethnicity/edit/EthnicityDemographicFields.spec.tsx | 3 ++- .../ethnicity/edit/EthnicityDemographicFields.tsx | 3 ++- .../edit/EditGeneralInformationDemographicCard.tsx | 3 ++- .../general/edit/GeneralInformationDemographicFields.tsx | 3 ++- .../edit/GeneralInformationDemographicsFields.spec.tsx | 3 ++- .../IdentificationDemographicView.spec.tsx | 1 + .../edit/EditIdentificationDemographicsCard.tsx | 3 ++- .../edit/IdentificationDemographicFields.tsx | 3 ++- .../mortality/edit/MortalityDemographicFields.spec.tsx | 3 ++- .../mortality/edit/MortalityDemographicFields.tsx | 3 ++- .../demographics/name/NameDemographicView.spec.tsx | 1 + .../demographics/name/edit/EditNameDemographicsCard.tsx | 3 ++- .../demographics/name/edit/NameDemographicFields.tsx | 3 ++- .../phoneEmail/PhoneEmailDemographicView.spec.tsx | 1 + .../phoneEmail/edit/EditPhoneEmailDemographicsCard.tsx | 3 ++- .../phoneEmail/edit/PhoneEmailDemographicFields.tsx | 3 ++- .../demographics/race/RaceDemographicView.spec.tsx | 1 + .../demographics/race/edit/EditRaceDemographicsCard.tsx | 3 ++- .../demographics/race/edit/RaceDemographicFields.tsx | 3 ++- .../sex-birth/edit/SexBirthDemographicFields.spec.tsx | 3 ++- .../sex-birth/edit/SexBirthDemographicFields.tsx | 3 ++- .../src/libs/permission/PermittedLayout.tsx | 1 + .../src/libs/verification/useVerification.ts | 1 + .../src/navigation/useFormNavigationBlock.ts | 1 + .../src/navigation/useNavigationBlock.ts | 1 + .../src/options/autocompete/useSelectableAutocomplete.ts | 1 + apps/modernization-ui/src/options/cache/cached.ts | 1 + .../src/options/concepts/useConceptOptions.ts | 1 + apps/modernization-ui/src/pages/error/ErrorPage.spec.tsx | 3 ++- apps/modernization-ui/src/pages/error/ErrorPage.tsx | 3 ++- apps/modernization-ui/src/pages/login/LoginForm.tsx | 3 ++- apps/modernization-ui/src/pagination/usePagination.tsx | 1 + apps/modernization-ui/src/routes/AppRoutes.tsx | 3 ++- apps/modernization-ui/src/routes/RedirectHome.tsx | 3 ++- apps/modernization-ui/src/shared/header/NavBar.spec.tsx | 3 ++- 535 files changed, 901 insertions(+), 367 deletions(-) diff --git a/apps/modernization-ui/src/analytics/useAnalytics.ts b/apps/modernization-ui/src/analytics/useAnalytics.ts index 0555f89e25..b0e402beb6 100644 --- a/apps/modernization-ui/src/analytics/useAnalytics.ts +++ b/apps/modernization-ui/src/analytics/useAnalytics.ts @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; -import { useConfiguration } from 'configuration'; import { PostHogConfig } from 'posthog-js'; +import { useConfiguration } from 'configuration'; + type AnalyticsSettings = { enabled: boolean; key?: string; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/MatchConfigurationLandingPage.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/MatchConfigurationLandingPage.spec.tsx index f5db5821e1..75d6f6f87d 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/MatchConfigurationLandingPage.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/MatchConfigurationLandingPage.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { AlertProvider } from 'alert'; import { MemoryRouter } from 'react-router'; +import { AlertProvider } from 'alert'; + import { DataElements } from '../api/model/DataElement'; import { MatchConfigurationLandingPage } from './MatchConfigurationLandingPage'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/import/ImportConfigurationModal.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/import/ImportConfigurationModal.spec.tsx index 657a2b0099..a64ff71dd4 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/import/ImportConfigurationModal.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/import/ImportConfigurationModal.spec.tsx @@ -1,5 +1,6 @@ import { render, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { AlgorithmExport } from 'apps/deduplication/api/model/AlgorithmExport'; import { BlockingAttribute, MatchingAttribute, MatchMethod } from 'apps/deduplication/api/model/Pass'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/import/importModal/ImportModal.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/import/importModal/ImportModal.tsx index 63dba2d00b..3f4700ff00 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/import/importModal/ImportModal.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/import/importModal/ImportModal.tsx @@ -1,6 +1,7 @@ import { DragEvent, ReactNode, useMemo, useState } from 'react'; import classNames from 'classnames'; + import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; import { Icon } from 'design-system/icon'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/ImportPreview.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/ImportPreview.spec.tsx index d2e6a1f930..b465bad55b 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/ImportPreview.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/ImportPreview.spec.tsx @@ -1,5 +1,6 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { AlgorithmExport } from 'apps/deduplication/api/model/AlgorithmExport'; import { ImportPreview } from './ImportPreview'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/data-element-table/DataElementsTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/data-element-table/DataElementsTable.spec.tsx index 1eff7ba3f2..179f2725b2 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/data-element-table/DataElementsTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/data-element-table/DataElementsTable.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { DataElementsTable } from './DataElementsTable'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/pass-configuration-table/PassConfigurationTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/pass-configuration-table/PassConfigurationTable.spec.tsx index 7f735d9a09..a76b3bcb23 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/pass-configuration-table/PassConfigurationTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/import/importPreview/pass-configuration-table/PassConfigurationTable.spec.tsx @@ -1,4 +1,5 @@ import { render, within } from '@testing-library/react'; + import { BlockingAttribute, MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; import { PassConfigurationTable } from './PassConfigurationTable'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/notification-cards/AlgorithmNotConfigured.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/notification-cards/AlgorithmNotConfigured.tsx index a559f2b11d..a74e52c796 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/notification-cards/AlgorithmNotConfigured.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/notification-cards/AlgorithmNotConfigured.tsx @@ -1,6 +1,7 @@ -import { Button } from 'design-system/button'; import { useNavigate } from 'react-router'; +import { Button } from 'design-system/button'; + import { NotificationCard } from './NotificationCard'; type Props = { diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/PassConfiguration.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/PassConfiguration.tsx index 1f04a85646..1b517d112e 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/PassConfiguration.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/PassConfiguration.tsx @@ -1,13 +1,14 @@ import { useEffect, useState } from 'react'; +import { FormProvider, useForm, useFormState } from 'react-hook-form'; +import { useNavigate } from 'react-router'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { Pass } from 'apps/deduplication/api/model/Pass'; import { useMatchConfiguration } from 'apps/deduplication/api/useMatchConfiguration'; import { Loading } from 'components/Spinner'; import { Shown } from 'conditional-render'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm, useFormState } from 'react-hook-form'; -import { useNavigate } from 'react-router'; import { exists } from 'utils'; import { UnsavedChangesConfirmation } from '../confirmation/UnsavedChangesConfirmation'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/PassForm.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/PassForm.tsx index 60880c48d9..2e9189ad55 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/PassForm.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/PassForm.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; +import { useFormContext, useFormState, useWatch } from 'react-hook-form'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { BlockingAttribute, MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; -import { useFormContext, useFormState, useWatch } from 'react-hook-form'; import { exists } from 'utils'; import { ActivateToggle } from './activate-toggle/ActivateToggle'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/activate-toggle/ActivateToggle.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/activate-toggle/ActivateToggle.spec.tsx index f81dde49b3..320d4f795b 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/activate-toggle/ActivateToggle.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/activate-toggle/ActivateToggle.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { Pass } from 'apps/deduplication/api/model/Pass'; import { FormProvider, useForm } from 'react-hook-form'; +import { Pass } from 'apps/deduplication/api/model/Pass'; + import { ActivateToggle } from './ActivateToggle'; const Fixture = () => { diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/activate-toggle/ActivateToggle.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/activate-toggle/ActivateToggle.tsx index df732c2872..e85b46a89e 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/activate-toggle/ActivateToggle.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/activate-toggle/ActivateToggle.tsx @@ -1,6 +1,7 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { Pass } from 'apps/deduplication/api/model/Pass'; import { Toggle } from 'design-system/toggle/Toggle'; -import { Controller, useFormContext } from 'react-hook-form'; import styles from './activate-toggle.module.scss'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/attribute-entry/AttributeEntry.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/attribute-entry/AttributeEntry.tsx index 326cf7c0c7..bf4c4f0b9a 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/attribute-entry/AttributeEntry.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/attribute-entry/AttributeEntry.tsx @@ -1,4 +1,5 @@ import classNames from 'classnames'; + import { Shown } from 'conditional-render'; import { Checkbox } from 'design-system/checkbox'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteria.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteria.spec.tsx index 24df0c2d11..fcf0c2d4b5 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteria.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteria.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { BlockingAttribute, Pass } from 'apps/deduplication/api/model/Pass'; import { FormProvider, useForm } from 'react-hook-form'; +import { BlockingAttribute, Pass } from 'apps/deduplication/api/model/Pass'; + import { BlockingCriteria } from './BlockingCriteria'; const onAddAttributes = vi.fn(); diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteria.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteria.tsx index af3525550d..6e780454c2 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteria.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteria.tsx @@ -1,9 +1,10 @@ +import { useFormContext, useWatch } from 'react-hook-form'; + import { BlockingAttributeLabelsList } from 'apps/deduplication/api/model/Labels'; import { BlockingAttribute } from 'apps/deduplication/api/model/Pass'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; import { Card } from 'design-system/card'; -import { useFormContext, useWatch } from 'react-hook-form'; import { BlockingCriteriaAttribute } from './attribute/BlockingCriteriaAttribute'; import styles from './blocking-criteria.module.scss'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteriaAttribute.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteriaAttribute.tsx index d2be59ff39..331cf45fdc 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteriaAttribute.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/BlockingCriteriaAttribute.tsx @@ -1,9 +1,10 @@ import { useEffect, useState } from 'react'; +import { useFormContext, useWatch } from 'react-hook-form'; + import { BlockingAttribute } from 'apps/deduplication/api/model/Pass'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; -import { useFormContext, useWatch } from 'react-hook-form'; import styles from './blocking-criteria.module.scss'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/attribute/BlockingCriteriaAttribute.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/attribute/BlockingCriteriaAttribute.spec.tsx index fd8864264e..9def612af9 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/attribute/BlockingCriteriaAttribute.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/attribute/BlockingCriteriaAttribute.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { BlockingAttribute, Pass } from 'apps/deduplication/api/model/Pass'; import { FormProvider, useForm } from 'react-hook-form'; +import { BlockingAttribute, Pass } from 'apps/deduplication/api/model/Pass'; + import { BlockingCriteriaAttribute } from './BlockingCriteriaAttribute'; const onRemove = vi.fn(); diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/attribute/BlockingCriteriaAttribute.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/attribute/BlockingCriteriaAttribute.tsx index 94a291ff6d..982d34ad42 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/attribute/BlockingCriteriaAttribute.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/attribute/BlockingCriteriaAttribute.tsx @@ -1,9 +1,10 @@ import { useEffect, useState } from 'react'; +import { useFormContext, useWatch } from 'react-hook-form'; + import { BlockingAttribute } from 'apps/deduplication/api/model/Pass'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; -import { useFormContext, useWatch } from 'react-hook-form'; import styles from './blocking-criteria-attribute.module.scss'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.spec.tsx index d261b54357..913815ffc6 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.spec.tsx @@ -1,8 +1,9 @@ import { render, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { FormProvider, useForm } from 'react-hook-form'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { BlockingAttribute, Pass } from 'apps/deduplication/api/model/Pass'; -import { FormProvider, useForm } from 'react-hook-form'; import { BlockingCriteriaSidePanel } from './BlockingCriteriaSidePanel'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.tsx index 696b49162d..c45d468c7e 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/blocking-criteria/panel/BlockingCriteriaSidePanel.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; +import { useFormContext, useWatch } from 'react-hook-form'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { BlockingAttributeLabelsList } from 'apps/deduplication/api/model/Labels'; import { BlockingAttribute, Pass } from 'apps/deduplication/api/model/Pass'; import { Button } from 'design-system/button'; -import { useFormContext, useWatch } from 'react-hook-form'; import { AttributeEntry } from '../../attribute-entry/AttributeEntry'; import { SidePanel } from '../../side-panel/SidePanel'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/MatchingBounds.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/MatchingBounds.spec.tsx index 11267c4f1c..66b7a5a037 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/MatchingBounds.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/MatchingBounds.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { BlockingAttribute, MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; import { FormProvider, useForm } from 'react-hook-form'; +import { BlockingAttribute, MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; + import { MatchingBounds } from './MatchingBounds'; const Fixture = () => { diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/MatchingBounds.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/MatchingBounds.tsx index 05df44a921..790603c4ad 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/MatchingBounds.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/MatchingBounds.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { Pass } from 'apps/deduplication/api/model/Pass'; import { Shown } from 'conditional-render'; import { Card } from 'design-system/card'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { getLogOdds } from '../matching-criteria/getLogOdds'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/numeric-hint-input/NumericHintInput.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/numeric-hint-input/NumericHintInput.tsx index 6536d09f99..8a4212e967 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/numeric-hint-input/NumericHintInput.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-bounds/numeric-hint-input/NumericHintInput.tsx @@ -1,6 +1,7 @@ import { ReactNode } from 'react'; import classNames from 'classnames'; + import { InlineErrorMessage } from 'design-system/field/InlineErrorMessage'; import { Hint } from 'design-system/hint'; import { Numeric } from 'design-system/input/numeric/Numeric'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/MatchingCriteria.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/MatchingCriteria.spec.tsx index b2d6b3e969..31dbc5dc5f 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/MatchingCriteria.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/MatchingCriteria.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { BlockingAttribute, MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; import { FormProvider, useForm } from 'react-hook-form'; +import { BlockingAttribute, MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; + import { MatchingCriteria } from './MatchingCriteria'; const onAddAttributes = vi.fn(); diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/MatchingCriteria.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/MatchingCriteria.tsx index 2c0b39c433..cd68fb44e3 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/MatchingCriteria.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/MatchingCriteria.tsx @@ -1,12 +1,13 @@ import { useEffect, useState } from 'react'; +import { useFieldArray, useFormContext, useWatch } from 'react-hook-form'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { MatchingAttributeLabels } from 'apps/deduplication/api/model/Labels'; import { Pass } from 'apps/deduplication/api/model/Pass'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; import { Card } from 'design-system/card'; -import { useFieldArray, useFormContext, useWatch } from 'react-hook-form'; import { MatchingCriteriaAttribute } from './attribute/MatchingCriteriaAttribute'; import { getLogOdds } from './getLogOdds'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/attribute/MatchingCriteriaAttribute.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/attribute/MatchingCriteriaAttribute.spec.tsx index 789bbf8c9c..75c6ea0618 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/attribute/MatchingCriteriaAttribute.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/attribute/MatchingCriteriaAttribute.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { BlockingAttribute, MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; import { FormProvider, useForm } from 'react-hook-form'; +import { BlockingAttribute, MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; + import { MatchingCriteriaAttribute } from './MatchingCriteriaAttribute'; const onRemove = vi.fn(); diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/attribute/MatchingCriteriaAttribute.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/attribute/MatchingCriteriaAttribute.tsx index 923e3e3ca9..084146c437 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/attribute/MatchingCriteriaAttribute.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/attribute/MatchingCriteriaAttribute.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { MatchingAttribute, MatchMethod, Pass } from 'apps/deduplication/api/model/Pass'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { NumericHintInput } from '../../matching-bounds/numeric-hint-input/NumericHintInput'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx index 5ff45c0a63..000e02f1df 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.spec.tsx @@ -1,8 +1,9 @@ import { render, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { FormProvider, useForm } from 'react-hook-form'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { BlockingAttribute, Pass } from 'apps/deduplication/api/model/Pass'; -import { FormProvider, useForm } from 'react-hook-form'; import { MatchingCriteriaSidePanel } from './MatchingCriteriaSidePanel'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.tsx index 0fd85e1c5d..a9470fbef5 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/matching-criteria/panel/MatchingCriteriaSidePanel.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; +import { useFormContext, useWatch } from 'react-hook-form'; + import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { MatchingAttributeLabelsList } from 'apps/deduplication/api/model/Labels'; import { MatchingAttribute, Pass } from 'apps/deduplication/api/model/Pass'; import { Button } from 'design-system/button'; -import { useFormContext, useWatch } from 'react-hook-form'; import { AttributeEntry } from '../../attribute-entry/AttributeEntry'; import { SidePanel } from '../../side-panel/SidePanel'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/save-modal/SavePassModal.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/save-modal/SavePassModal.tsx index 450cf4041e..7178b66684 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/save-modal/SavePassModal.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/save-modal/SavePassModal.tsx @@ -1,11 +1,12 @@ import { useEffect } from 'react'; +import { Controller, useFormContext, useFormState } from 'react-hook-form'; + import { Pass } from 'apps/deduplication/api/model/Pass'; import { Input } from 'components/FormInputs/Input'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; import { Modal } from 'design-system/modal'; -import { Controller, useFormContext, useFormState } from 'react-hook-form'; import styles from './save-pass-modal.module.scss'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/save-modal/UpdatePassNameModal.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/save-modal/UpdatePassNameModal.tsx index f0fd549216..7466ab82e8 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/save-modal/UpdatePassNameModal.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-form/save-modal/UpdatePassNameModal.tsx @@ -1,10 +1,11 @@ import { useEffect } from 'react'; +import { Controller, useForm } from 'react-hook-form'; + import { Input } from 'components/FormInputs/Input'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; import { Modal } from 'design-system/modal'; -import { Controller, useForm } from 'react-hook-form'; import styles from './save-pass-modal.module.scss'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/PassList.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/PassList.spec.tsx index f0afd3814b..42261e7905 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/PassList.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/PassList.spec.tsx @@ -1,5 +1,6 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { AlertProvider } from 'alert'; import { Pass } from 'apps/deduplication/api/model/Pass'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/pass-entry/PassEntry.spec.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/pass-entry/PassEntry.spec.tsx index 5c816cb0aa..c955cdaac6 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/pass-entry/PassEntry.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/pass-entry/PassEntry.spec.tsx @@ -1,5 +1,6 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { Pass } from 'apps/deduplication/api/model/Pass'; import { PassEntry } from './PassEntry'; diff --git a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/pass-entry/PassEntry.tsx b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/pass-entry/PassEntry.tsx index c62e419561..1c1892f240 100644 --- a/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/pass-entry/PassEntry.tsx +++ b/apps/modernization-ui/src/apps/deduplication/configuration/match-configuration/pass-configuration/pass-list/pass-entry/PassEntry.tsx @@ -1,7 +1,8 @@ import { MouseEvent } from 'react'; -import { Pass } from 'apps/deduplication/api/model/Pass'; import classNames from 'classnames'; + +import { Pass } from 'apps/deduplication/api/model/Pass'; import { Shown } from 'conditional-render'; import { Icon } from 'design-system/icon'; diff --git a/apps/modernization-ui/src/apps/deduplication/data-elements/DataElementConfig.tsx b/apps/modernization-ui/src/apps/deduplication/data-elements/DataElementConfig.tsx index 56f20cc991..78498b36bc 100644 --- a/apps/modernization-ui/src/apps/deduplication/data-elements/DataElementConfig.tsx +++ b/apps/modernization-ui/src/apps/deduplication/data-elements/DataElementConfig.tsx @@ -1,12 +1,13 @@ import { useEffect, useState } from 'react'; +import { FormProvider, useForm, useFormState, useWatch } from 'react-hook-form'; +import { useNavigate } from 'react-router'; + import { Loading } from 'components/Spinner'; import { Button } from 'components/button'; import { Heading } from 'components/heading'; import { Shown } from 'conditional-render'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm, useFormState, useWatch } from 'react-hook-form'; -import { useNavigate } from 'react-router'; import { exists } from 'utils'; import { DataElements } from '../api/model/DataElement'; diff --git a/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementRow/DataElementRow.spec.tsx b/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementRow/DataElementRow.spec.tsx index 7211df794f..9dc945846d 100644 --- a/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementRow/DataElementRow.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementRow/DataElementRow.spec.tsx @@ -1,8 +1,9 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { DataElements } from 'apps/deduplication/api/model/DataElement'; import { FormProvider, useForm } from 'react-hook-form'; +import { DataElements } from 'apps/deduplication/api/model/DataElement'; + import { DataElementRow } from './DataElementRow'; // Test component that provides the form context diff --git a/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementRow/DataElementRow.tsx b/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementRow/DataElementRow.tsx index 7282b9502a..b9768f695d 100644 --- a/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementRow/DataElementRow.tsx +++ b/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementRow/DataElementRow.tsx @@ -1,8 +1,9 @@ import { useEffect } from 'react'; -import { Checkbox } from 'design-system/checkbox'; import { Controller, useFormContext, useWatch } from 'react-hook-form'; +import { Checkbox } from 'design-system/checkbox'; + import { DataElements } from '../../../api/model/DataElement'; import { TableNumericInput } from '../TableNumericInput/TableNumericInput'; diff --git a/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementsForm/DataElementsForm.tsx b/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementsForm/DataElementsForm.tsx index 37cacacba7..3a66a66890 100644 --- a/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementsForm/DataElementsForm.tsx +++ b/apps/modernization-ui/src/apps/deduplication/data-elements/form/DataElementsForm/DataElementsForm.tsx @@ -1,9 +1,10 @@ +import { useFormContext, useWatch } from 'react-hook-form'; + import { DataElementToMatchingAttribute } from 'apps/deduplication/api/model/Conversion'; import { MatchingAttributeLabels } from 'apps/deduplication/api/model/Labels'; import { Card } from 'design-system/card/Card'; import { Checkbox } from 'design-system/checkbox'; import { Hint } from 'design-system/hint'; -import { useFormContext, useWatch } from 'react-hook-form'; import { DataElements } from '../../../api/model/DataElement'; import { DataElementRow } from '../DataElementRow/DataElementRow'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/MergeDetails.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/MergeDetails.spec.tsx index 832531db29..f6fc4072bc 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/MergeDetails.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/MergeDetails.spec.tsx @@ -1,8 +1,9 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { MemoryRouter, Route, Routes } from 'react-router'; + import { AlertProvider } from 'alert'; import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; -import { MemoryRouter, Route, Routes } from 'react-router'; import { MergeDetails } from './MergeDetails'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/MergeDetails.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/MergeDetails.tsx index 5a19a5d102..4a5b1ec73a 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/MergeDetails.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/MergeDetails.tsx @@ -1,16 +1,17 @@ import { useEffect, useState } from 'react'; +import { parseISO } from 'date-fns/fp'; +import { FormProvider, useForm } from 'react-hook-form'; +import { useLocation, useNavigate, useParams } from 'react-router'; + import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { useMergeDetails } from 'apps/deduplication/api/useMergeDetails'; import { usePatientMerge } from 'apps/deduplication/api/usePatientMerge'; import { useRemoveMerge } from 'apps/deduplication/api/useRemoveMerge'; import { Loading } from 'components/Spinner'; import { Shown } from 'conditional-render'; -import { parseISO } from 'date-fns/fp'; import { Confirmation } from 'design-system/modal'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm } from 'react-hook-form'; -import { useLocation, useNavigate, useParams } from 'react-router'; import styles from './MergeDetails.module.scss'; import { MergePreview } from './merge-preview/MergePreview'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/address/PreviewAddress.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/address/PreviewAddress.tsx index c42a8abd15..95904f35be 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/address/PreviewAddress.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/address/PreviewAddress.tsx @@ -1,4 +1,5 @@ import { format, parseISO } from 'date-fns'; + import { Column } from 'design-system/table'; import { MergeAddress, MergeCandidate } from '../../../../../api/model/MergeCandidate'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/administrative-comments/AdministrativeComments.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/administrative-comments/AdministrativeComments.tsx index 53ae216e4e..de5e2eea4b 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/administrative-comments/AdministrativeComments.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/administrative-comments/AdministrativeComments.tsx @@ -1,4 +1,5 @@ import { format, isValid, parseISO } from 'date-fns'; + import { Card } from 'design-system/card/Card'; import { MergeCandidate } from '../../../../../api/model/MergeCandidate'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/identification/PreviewIdentification.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/identification/PreviewIdentification.tsx index 1c71032888..48359c3e2e 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/identification/PreviewIdentification.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/identification/PreviewIdentification.tsx @@ -1,4 +1,5 @@ import { format, parseISO } from 'date-fns'; + import { Column } from 'design-system/table'; import { MergeCandidate, MergeIdentification } from '../../../../../api/model/MergeCandidate'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/name/PreviewName.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/name/PreviewName.tsx index 2c35342136..f9598eb093 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/name/PreviewName.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/name/PreviewName.tsx @@ -1,4 +1,5 @@ import { format, parseISO } from 'date-fns'; + import { Column } from 'design-system/table'; import { MergeCandidate, MergeName } from '../../../../../api/model/MergeCandidate'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/patient-summary/PatientSummary.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/patient-summary/PatientSummary.tsx index ec882f3c77..d75a4a94d1 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/patient-summary/PatientSummary.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/patient-summary/PatientSummary.tsx @@ -1,4 +1,5 @@ import { format, parseISO } from 'date-fns'; + import { PatientDescriptor } from 'libs/patient/PatientDescriptor'; import { MergeCandidate } from '../../../../../api/model/MergeCandidate'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/phone-and-email/PreviewPhoneAndEmail.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/phone-and-email/PreviewPhoneAndEmail.tsx index 49f4c9944c..d96ce22961 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/phone-and-email/PreviewPhoneAndEmail.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/phone-and-email/PreviewPhoneAndEmail.tsx @@ -1,4 +1,5 @@ import { format, parseISO } from 'date-fns'; + import { Column } from 'design-system/table'; import { MergeCandidate, MergePhoneEmail } from '../../../../../api/model/MergeCandidate'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/race/PreviewRace.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/race/PreviewRace.tsx index a4e9965cf3..ffc1181bd5 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/race/PreviewRace.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/race/PreviewRace.tsx @@ -1,4 +1,5 @@ import { format, isAfter, parseISO } from 'date-fns'; + import { Column } from 'design-system/table'; import { MergeCandidate } from '../../../../../api/model/MergeCandidate'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/shared/preview-card-table/MergePreviewTableCard.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/shared/preview-card-table/MergePreviewTableCard.spec.tsx index c7824cef93..44b138a4b7 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/shared/preview-card-table/MergePreviewTableCard.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-preview/components/shared/preview-card-table/MergePreviewTableCard.spec.tsx @@ -1,7 +1,8 @@ import { render, screen } from '@testing-library/react'; -import type { Column } from 'design-system/table'; import { MemoryRouter } from 'react-router'; +import type { Column } from 'design-system/table'; + import { MergePreviewTableCard } from './MergePreviewTableCard'; type TestData = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/MergeReview.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/MergeReview.spec.tsx index 8ffe7bab1d..1d0ebd3b5c 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/MergeReview.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/MergeReview.spec.tsx @@ -1,11 +1,12 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { AlertProvider } from 'alert'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; import { MemoryRouter, Route, Routes, useNavigate } from 'react-router'; import { Mock } from 'vitest'; +import { AlertProvider } from 'alert'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { MergeReview } from './MergeReview'; import { PatientMergeForm } from './model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/MergeReview.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/MergeReview.tsx index c86e9f8265..abaf6222c3 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/MergeReview.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/MergeReview.tsx @@ -1,9 +1,10 @@ +import { useLocation, useNavigate, useParams } from 'react-router'; + import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { useRemoveMerge } from 'apps/deduplication/api/useRemoveMerge'; import { Heading } from 'components/heading'; import { Button } from 'design-system/button'; import { useAlert } from 'libs/alert'; -import { useLocation, useNavigate, useParams } from 'react-router'; import styles from './merge-review.module.scss'; import { AddressSelection } from './patient-form/address/AddressSelection'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/AddressSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/AddressSelection.spec.tsx index d3789b2662..8b77b4c188 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/AddressSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/AddressSelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { AddressSelection } from './AddressSelection'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-data-table/AddressDataTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-data-table/AddressDataTable.spec.tsx index ca837df4ad..5d633d2048 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-data-table/AddressDataTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-data-table/AddressDataTable.spec.tsx @@ -1,8 +1,9 @@ import { render, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { AddressDataTable } from './AddressDataTable'; const patientData: Partial = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-data-table/AddressDataTable.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-data-table/AddressDataTable.tsx index 9ea17090a2..777b317718 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-data-table/AddressDataTable.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-data-table/AddressDataTable.tsx @@ -1,7 +1,8 @@ +import { useFieldArray, useFormContext } from 'react-hook-form'; + import { displayAddressText } from 'address/display'; import { MergeAddress, MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { Column } from 'design-system/table'; -import { useFieldArray, useFormContext } from 'react-hook-form'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; import { PatientMergeForm } from '../../../model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-details/AddressDetails.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-details/AddressDetails.spec.tsx index eae2ef9c69..cfef0e0d12 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-details/AddressDetails.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/address/address-details/AddressDetails.spec.tsx @@ -1,4 +1,5 @@ import { render, within } from '@testing-library/react'; + import { MergeAddress } from 'apps/deduplication/api/model/MergeCandidate'; import { AddressDetails } from './AddressDetails'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/admin-comments/AdminCommentsSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/admin-comments/AdminCommentsSelection.spec.tsx index 0031ccd71b..c4d92587c6 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/admin-comments/AdminCommentsSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/admin-comments/AdminCommentsSelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { PatientMergeForm } from '../../model/PatientMergeForm'; import { AdminCommentsSelection } from './AdminCommentsSelection'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/admin-comments/admin-comment/AdminComment.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/admin-comments/admin-comment/AdminComment.tsx index 58b219a94f..33670c1eca 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/admin-comments/admin-comment/AdminComment.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/admin-comments/admin-comment/AdminComment.tsx @@ -1,6 +1,7 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { AdminComments } from 'apps/deduplication/api/model/MergeCandidate'; import { Radio } from 'design-system/radio'; -import { Controller, useFormContext } from 'react-hook-form'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; import { PatientMergeForm } from '../../../model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/EthnicitySelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/EthnicitySelection.spec.tsx index 676e412a33..6462d70068 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/EthnicitySelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/EthnicitySelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { EthnicitySelection } from './EthnicitySelection'; const data: Partial = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/ethnicity/Ethnicity.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/ethnicity/Ethnicity.spec.tsx index 957783f62b..df364fbc08 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/ethnicity/Ethnicity.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/ethnicity/Ethnicity.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeEthnicity } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeEthnicity } from 'apps/deduplication/api/model/MergeCandidate'; + import { Ethnicity } from './Ethnicity'; const defaultData: MergeEthnicity = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/ethnicity/Ethnicity.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/ethnicity/Ethnicity.tsx index da65ac846d..ba256d3056 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/ethnicity/Ethnicity.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/ethnicity/ethnicity/Ethnicity.tsx @@ -1,6 +1,7 @@ -import { MergeEthnicity } from 'apps/deduplication/api/model/MergeCandidate'; import { Controller, useFormContext } from 'react-hook-form'; +import { MergeEthnicity } from 'apps/deduplication/api/model/MergeCandidate'; + import { toDateDisplay } from '../../../../shared/toDateDisplay'; import { PatientMergeForm } from '../../../model/PatientMergeForm'; import { MergeDataDisplay } from '../../shared/merge-data-display/MergeDataDisplay'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/GeneralSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/GeneralSelection.spec.tsx index 078b3154d2..84e5274101 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/GeneralSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/GeneralSelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { GeneralSelection } from './GeneralSelection'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/general-info/GeneralInfo.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/general-info/GeneralInfo.spec.tsx index df4249a28e..8c0ab73e59 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/general-info/GeneralInfo.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/general-info/GeneralInfo.spec.tsx @@ -1,7 +1,8 @@ import { render, within } from '@testing-library/react'; -import { MergeGeneralInfo } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeGeneralInfo } from 'apps/deduplication/api/model/MergeCandidate'; + import { GeneralInfo } from './GeneralInfo'; let mockPermissions: string[] = []; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/general-info/GeneralInfo.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/general-info/GeneralInfo.tsx index 1c6de45cd2..0f2b8676d1 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/general-info/GeneralInfo.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/general/general-info/GeneralInfo.tsx @@ -1,6 +1,7 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { MergeGeneralInfo } from 'apps/deduplication/api/model/MergeCandidate'; import { Permitted } from 'libs/permission'; -import { Controller, useFormContext } from 'react-hook-form'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; import { PatientMergeForm } from '../../../model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/IdentificationSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/IdentificationSelection.spec.tsx index 1eb158e77e..bff807368b 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/IdentificationSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/IdentificationSelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { IdentificationSelection } from './IdentificationSelection'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-data-table/IdentificationDataTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-data-table/IdentificationDataTable.spec.tsx index fbcc6977b5..b45f92b4ec 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-data-table/IdentificationDataTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-data-table/IdentificationDataTable.spec.tsx @@ -1,8 +1,9 @@ import { render, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { IdentificationDataTable } from './IdentificationDataTable'; const patientData: Partial = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-data-table/IdentificationDataTable.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-data-table/IdentificationDataTable.tsx index 3f27b21bd2..5bb805a8f4 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-data-table/IdentificationDataTable.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-data-table/IdentificationDataTable.tsx @@ -1,6 +1,7 @@ +import { useFieldArray, useFormContext } from 'react-hook-form'; + import { MergeCandidate, MergeIdentification } from 'apps/deduplication/api/model/MergeCandidate'; import { Column } from 'design-system/table'; -import { useFieldArray, useFormContext } from 'react-hook-form'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; import { PatientMergeForm } from '../../../model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-details/IdentificationDetails.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-details/IdentificationDetails.spec.tsx index 1717639282..174020d87c 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-details/IdentificationDetails.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/identification/identification-details/IdentificationDetails.spec.tsx @@ -1,4 +1,5 @@ import { render, within } from '@testing-library/react'; + import { MergeIdentification } from 'apps/deduplication/api/model/MergeCandidate'; import { IdentificationDetails } from './IdentificationDetails'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/investigations/InvestigationDisplay.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/investigations/InvestigationDisplay.spec.tsx index 2045aa9af9..8c01d91c55 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/investigations/InvestigationDisplay.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/investigations/InvestigationDisplay.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { InvestigationDisplay } from './InvestigationsDisplay'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/investigations/investigation/Investigation.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/investigations/investigation/Investigation.spec.tsx index fefb3dc718..748cb5b76e 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/investigations/investigation/Investigation.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/investigations/investigation/Investigation.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { MergeInvestigation } from 'apps/deduplication/api/model/MergeCandidate'; import { Investigation } from './Investigation'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/MortalitySelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/MortalitySelection.spec.tsx index 1e9db6f276..293cd0d55b 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/MortalitySelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/MortalitySelection.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { MortalitySelection } from './MortalitySelection'; const data: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/MortalitySelection.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/MortalitySelection.tsx index 3eaf67f1e6..f13eb99363 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/MortalitySelection.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/MortalitySelection.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { useFormContext, useWatch } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { PatientMergeForm } from '../../model/PatientMergeForm'; import { Section } from '../shared/section/Section'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/mortality/Mortality.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/mortality/Mortality.spec.tsx index f346872128..d59e4fde5a 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/mortality/Mortality.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/mortality/Mortality.spec.tsx @@ -1,7 +1,8 @@ import { render, within } from '@testing-library/react'; -import { MergeMortality } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeMortality } from 'apps/deduplication/api/model/MergeCandidate'; + import { Mortality } from './Mortality'; const data: MergeMortality = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/mortality/Mortality.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/mortality/Mortality.tsx index a8f8760357..75d8ce1676 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/mortality/Mortality.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/mortality/mortality/Mortality.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; +import { Controller, useFormContext } from 'react-hook-form'; + import { MergeMortality } from 'apps/deduplication/api/model/MergeCandidate'; import { Shown } from 'conditional-render'; -import { Controller, useFormContext } from 'react-hook-form'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; import { PatientMergeForm } from '../../../model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/NameSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/NameSelection.spec.tsx index 567b46b6d1..d531fe0ada 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/NameSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/NameSelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { NameSelection } from './NameSelection'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-data-table/NameDataTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-data-table/NameDataTable.spec.tsx index 1744dd9a06..0baf44d237 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-data-table/NameDataTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-data-table/NameDataTable.spec.tsx @@ -1,8 +1,9 @@ import { render, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { NameDataTable } from './NameDataTable'; const patientData: Partial = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-data-table/NameDataTable.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-data-table/NameDataTable.tsx index 36c200dbad..a6cbd9cf10 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-data-table/NameDataTable.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-data-table/NameDataTable.tsx @@ -1,6 +1,7 @@ +import { useFieldArray, useFormContext } from 'react-hook-form'; + import { MergeCandidate, MergeName } from 'apps/deduplication/api/model/MergeCandidate'; import { Column } from 'design-system/table'; -import { useFieldArray, useFormContext } from 'react-hook-form'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; import { PatientMergeForm } from '../../../model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-details/NameDetails.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-details/NameDetails.spec.tsx index 111fe1fbf6..9600dfd133 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-details/NameDetails.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/name/name-details/NameDetails.spec.tsx @@ -1,4 +1,5 @@ import { render, within } from '@testing-library/react'; + import { MergeName } from 'apps/deduplication/api/model/MergeCandidate'; import { NameDetails } from './NameDetails'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/patient-id/PatientIdSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/patient-id/PatientIdSelection.spec.tsx index d94c92d455..3a8d9c5c19 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/patient-id/PatientIdSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/patient-id/PatientIdSelection.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { PatientMergeForm } from '../../model/PatientMergeForm'; import { PatientIdSelection } from './PatientIdSelection'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/patient-id/PatientIdSelection.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/patient-id/PatientIdSelection.tsx index 3f60f718f3..9cf5fb9bcb 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/patient-id/PatientIdSelection.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/patient-id/PatientIdSelection.tsx @@ -1,9 +1,10 @@ -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import classNames from 'classnames'; +import { Controller, useFormContext } from 'react-hook-form'; + +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { Shown } from 'conditional-render'; import { Button } from 'design-system/button'; import { Radio } from 'design-system/radio'; -import { Controller, useFormContext } from 'react-hook-form'; import { PatientMergeForm } from '../../model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/PhoneEmailSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/PhoneEmailSelection.spec.tsx index 7ade5c34da..3ae7720764 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/PhoneEmailSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/PhoneEmailSelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { PhoneEmailSelection } from './PhoneEmailSelection'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-data-table/PhoneEmailDataTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-data-table/PhoneEmailDataTable.spec.tsx index e232e77874..150643ddcc 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-data-table/PhoneEmailDataTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-data-table/PhoneEmailDataTable.spec.tsx @@ -1,8 +1,9 @@ import { render, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { PhoneEmailDataTable } from './PhoneEmailDataTable'; const patientData: Partial = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-data-table/PhoneEmailDataTable.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-data-table/PhoneEmailDataTable.tsx index 11c8916566..b7134cce22 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-data-table/PhoneEmailDataTable.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-data-table/PhoneEmailDataTable.tsx @@ -1,6 +1,7 @@ +import { useFieldArray, useFormContext } from 'react-hook-form'; + import { MergeCandidate, MergePhoneEmail } from 'apps/deduplication/api/model/MergeCandidate'; import { Column } from 'design-system/table'; -import { useFieldArray, useFormContext } from 'react-hook-form'; import { formatPhone } from '../../../../shared/formatPhone'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-details/PhoneEmailDetails.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-details/PhoneEmailDetails.spec.tsx index 54c35f2e60..81e01b1640 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-details/PhoneEmailDetails.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/phone-email/phone-email-details/PhoneEmailDetails.spec.tsx @@ -1,4 +1,5 @@ import { render, within } from '@testing-library/react'; + import { MergePhoneEmail } from 'apps/deduplication/api/model/MergeCandidate'; import { PhoneEmailDetails } from './PhoneEmailDetails'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/RaceSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/RaceSelection.spec.tsx index 1f02e4204a..35b34244c6 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/RaceSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/RaceSelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { RaceSelection } from './RaceSelection'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-data-table/RaceDataTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-data-table/RaceDataTable.spec.tsx index c7b3676bac..52ffd7e9a8 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-data-table/RaceDataTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-data-table/RaceDataTable.spec.tsx @@ -1,8 +1,9 @@ import { render, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { RaceDataTable } from './RaceDataTable'; const patientData: Partial = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-data-table/RaceDataTable.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-data-table/RaceDataTable.tsx index 5d9f1e79bf..17855a44a8 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-data-table/RaceDataTable.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-data-table/RaceDataTable.tsx @@ -1,6 +1,7 @@ +import { useFieldArray, useFormContext } from 'react-hook-form'; + import { MergeCandidate, MergeRace } from 'apps/deduplication/api/model/MergeCandidate'; import { Column } from 'design-system/table'; -import { useFieldArray, useFormContext } from 'react-hook-form'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; import { PatientMergeForm } from '../../../model/PatientMergeForm'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-details/RaceDetails.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-details/RaceDetails.spec.tsx index 85e96a48b7..09bbd51dd4 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-details/RaceDetails.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/race/race-details/RaceDetails.spec.tsx @@ -1,4 +1,5 @@ import { render, within } from '@testing-library/react'; + import { MergeRace } from 'apps/deduplication/api/model/MergeCandidate'; import { RaceDetails } from './RaceDetails'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/SexAndBirthSelection.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/SexAndBirthSelection.spec.tsx index 0261268ea3..48d0964dd4 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/SexAndBirthSelection.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/SexAndBirthSelection.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeCandidate } from 'apps/deduplication/api/model/MergeCandidate'; + import { SexAndBirthSelection } from './SexAndBirthSelection'; const mergeCandidates: Partial[] = [ diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/sex-and-birth/SexAndBirth.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/sex-and-birth/SexAndBirth.spec.tsx index 522f7b8a38..972b900a7d 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/sex-and-birth/SexAndBirth.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/sex-and-birth/SexAndBirth.spec.tsx @@ -1,8 +1,9 @@ import { render, within } from '@testing-library/react'; -import { MergeSexAndBirth } from 'apps/deduplication/api/model/MergeCandidate'; import { differenceInYears } from 'date-fns/differenceInYears'; import { FormProvider, useForm } from 'react-hook-form'; +import { MergeSexAndBirth } from 'apps/deduplication/api/model/MergeCandidate'; + import { SexAndBirth } from './SexAndBirth'; const data: MergeSexAndBirth = { diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/sex-and-birth/SexAndBirth.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/sex-and-birth/SexAndBirth.tsx index 51732bf0f8..e4d618366e 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/sex-and-birth/SexAndBirth.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/sex-and-birth/sex-and-birth/SexAndBirth.tsx @@ -1,6 +1,7 @@ -import { MergeSexAndBirth } from 'apps/deduplication/api/model/MergeCandidate'; import { parseISO } from 'date-fns'; import { Controller, useFormContext } from 'react-hook-form'; + +import { MergeSexAndBirth } from 'apps/deduplication/api/model/MergeCandidate'; import { calculateAge } from 'utils/util'; import { toDateDisplay } from '../../../../shared/toDateDisplay'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/shared/merge-data-display/MergeDataDisplay.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/shared/merge-data-display/MergeDataDisplay.tsx index 048050a74e..332eea35cd 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/shared/merge-data-display/MergeDataDisplay.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/details/merge-review/patient-form/shared/merge-data-display/MergeDataDisplay.tsx @@ -1,7 +1,8 @@ import classNames from 'classnames'; +import { ControllerRenderProps } from 'react-hook-form'; + import { Shown } from 'conditional-render'; import { Radio } from 'design-system/radio'; -import { ControllerRenderProps } from 'react-hook-form'; import { GroupLine } from '../group-line/GroupLine'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/MergeLanding.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/MergeLanding.spec.tsx index e3355cab93..515a43ee8c 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/MergeLanding.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/MergeLanding.spec.tsx @@ -1,10 +1,11 @@ import { render, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { SortingProvider } from 'libs/sorting'; -import { PaginationProvider } from 'pagination'; import { MemoryRouter, useSearchParams } from 'react-router'; import { Mock } from 'vitest'; +import { SortingProvider } from 'libs/sorting'; +import { PaginationProvider } from 'pagination'; + import { useExportMatches } from '../../api/useExportMatches'; import { MergeLanding } from './MergeLanding'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.spec.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.spec.tsx index 40cd8cffb2..97abee73a4 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.spec.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.spec.tsx @@ -1,9 +1,10 @@ import { render, waitFor, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { MemoryRouter } from 'react-router'; + import { MatchRequiringReviewResponse } from 'apps/deduplication/api/model/MatchRequiringReview'; import { SortingProvider } from 'libs/sorting'; import { PaginationProvider } from 'pagination'; -import { MemoryRouter } from 'react-router'; import { MatchesRequiringReviewTable } from './MatchesRequiringReviewTable'; diff --git a/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.tsx b/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.tsx index 8fbfd31721..f32d331333 100644 --- a/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.tsx +++ b/apps/modernization-ui/src/apps/deduplication/patient-merge/landing/matches-requiring-review-table/MatchesRequiringReviewTable.tsx @@ -1,18 +1,19 @@ import { useEffect, useState } from 'react'; +import { format, parseISO } from 'date-fns'; +import { useNavigate } from 'react-router'; + import { MatchRequiringReview } from 'apps/deduplication/api/model/MatchRequiringReview'; import { useMatchesRequiringReview } from 'apps/deduplication/api/useMatchesRequiringReview'; import { SearchResultPageSizeSelect } from 'apps/search/layout/result/pagination/page-size-select'; import { SearchResultsShowing } from 'apps/search/layout/result/pagination/showing'; import { Loading } from 'components/Spinner'; import { Shown } from 'conditional-render'; -import { format, parseISO } from 'date-fns'; import { Button } from 'design-system/button'; import { Pagination } from 'design-system/pagination'; import { Column, DataTable } from 'design-system/table'; import { Direction, useSorting } from 'libs/sorting'; import { Status, usePagination } from 'pagination'; -import { useNavigate } from 'react-router'; import styles from './matches-requiring-review.module.scss'; diff --git a/apps/modernization-ui/src/apps/landing/Layout/WelcomeLayout.tsx b/apps/modernization-ui/src/apps/landing/Layout/WelcomeLayout.tsx index 59362bef3d..803c0dfd2b 100644 --- a/apps/modernization-ui/src/apps/landing/Layout/WelcomeLayout.tsx +++ b/apps/modernization-ui/src/apps/landing/Layout/WelcomeLayout.tsx @@ -1,12 +1,13 @@ import { useState } from 'react'; +import { Outlet } from 'react-router'; + import { SkipLinkProvider } from 'SkipLink/SkipLinkContext'; import { SignIn } from 'apps/landing/SignIn/SignIn'; import { SignUp } from 'apps/landing/SignUp/SignUp'; import { TabNavigation, TabNavigationEntry } from 'components/TabNavigation/TabNavigation'; import { TopBanner } from 'components/TopBanner/TopBanner'; import { PageProvider } from 'page'; -import { Outlet } from 'react-router'; import { LoginWrapper } from './LoginWrapper'; import logo from './cdc.svg'; diff --git a/apps/modernization-ui/src/apps/landing/SignIn/SignIn.tsx b/apps/modernization-ui/src/apps/landing/SignIn/SignIn.tsx index 52132d5d66..67c8d07caf 100644 --- a/apps/modernization-ui/src/apps/landing/SignIn/SignIn.tsx +++ b/apps/modernization-ui/src/apps/landing/SignIn/SignIn.tsx @@ -1,8 +1,9 @@ import { useEffect } from 'react'; import { Button } from '@trussworks/react-uswds'; -import { useSkipLink } from 'SkipLink/SkipLinkContext'; import classNames from 'classnames'; + +import { useSkipLink } from 'SkipLink/SkipLinkContext'; import { LinkButton } from 'design-system/button'; import { AlertMessage } from 'design-system/message'; diff --git a/apps/modernization-ui/src/apps/landing/SignUp/SignUp.tsx b/apps/modernization-ui/src/apps/landing/SignUp/SignUp.tsx index 940179df29..c9ba9f54bd 100644 --- a/apps/modernization-ui/src/apps/landing/SignUp/SignUp.tsx +++ b/apps/modernization-ui/src/apps/landing/SignUp/SignUp.tsx @@ -1,7 +1,8 @@ import { Button } from '@trussworks/react-uswds'; +import { Controller, useForm } from 'react-hook-form'; + import { QuickNavigation } from 'apps/landing/QuickNavigation'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useForm } from 'react-hook-form'; import { validEmailRule } from 'validation/entry'; import styles from './sign-up.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/PageBuilderRouting.tsx b/apps/modernization-ui/src/apps/page-builder/PageBuilderRouting.tsx index 5e93d1fe42..2ecf275c53 100644 --- a/apps/modernization-ui/src/apps/page-builder/PageBuilderRouting.tsx +++ b/apps/modernization-ui/src/apps/page-builder/PageBuilderRouting.tsx @@ -1,6 +1,7 @@ -import { FeatureLayout } from 'feature'; import { Navigate, RouteObject } from 'react-router'; +import { FeatureLayout } from 'feature'; + const routing: RouteObject[] = [ { path: '/page-builder', diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/AddQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/AddQuestion.tsx index 9329a030dc..0669413514 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/AddQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/AddQuestion.tsx @@ -1,12 +1,13 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; +import classNames from 'classnames'; +import { FormProvider, useForm, useFormContext } from 'react-hook-form'; + import { CreateCodedQuestionRequest } from 'apps/page-builder/generated'; import { CreateQuestionRequest, useCreateQuestion } from 'apps/page-builder/hooks/api/useCreateQuestion'; -import classNames from 'classnames'; import { useAlert } from 'libs/alert'; import { PaginationProvider } from 'pagination'; -import { FormProvider, useForm, useFormContext } from 'react-hook-form'; import { ButtonBar } from '../ButtonBar/ButtonBar'; import { CloseableHeader } from '../CloseableHeader/CloseableHeader'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/QuestionForm.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/QuestionForm.tsx index 779cfa8111..fd84cf0fc4 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/QuestionForm.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/QuestionForm.tsx @@ -1,8 +1,9 @@ import { useEffect } from 'react'; -import { CreateQuestionRequest } from 'apps/page-builder/hooks/api/useCreateQuestion'; import { useFormContext, useWatch } from 'react-hook-form'; +import { CreateQuestionRequest } from 'apps/page-builder/hooks/api/useCreateQuestion'; + import { HorizontalRule } from '../FormDivider/HorizontalRule'; import { AdministrativeFields } from './fields/AdministrativeFields'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/AdministrativeFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/AdministrativeFields.tsx index a24592b5c8..0dd15b4d96 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/AdministrativeFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/AdministrativeFields.tsx @@ -1,5 +1,6 @@ import { Label, Textarea } from '@trussworks/react-uswds'; import { Controller, useFormContext } from 'react-hook-form'; + import { maxLengthRule } from 'validation/entry'; import { CreateQuestionForm } from '../QuestionForm'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/BasicInformationFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/BasicInformationFields.tsx index 9f8ecdd767..359cf6f58b 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/BasicInformationFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/BasicInformationFields.tsx @@ -1,13 +1,14 @@ import { useEffect } from 'react'; import { ErrorMessage, Label, Radio, Textarea } from '@trussworks/react-uswds'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { QuestionValidationRequest } from 'apps/page-builder/generated/models/QuestionValidationRequest'; import { useOptions } from 'apps/page-builder/hooks/api/useOptions'; import { useQuestionValidation } from 'apps/page-builder/hooks/api/useQuestionValidation'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { SegmentedButtons } from 'components/SegmentedButtons/SegmentedButtons'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { CreateQuestionForm } from '../QuestionForm'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/CodedFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/CodedFields.tsx index 5345601724..cc6ec43a7f 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/CodedFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/CodedFields.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; import { Button } from '@trussworks/react-uswds'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { CreateCodedQuestionRequest, ValueSetControllerService, ValueSetOption } from 'apps/page-builder/generated'; import { useOptions } from 'apps/page-builder/hooks/api/useOptions'; import { SelectInput } from 'components/FormInputs/SelectInput'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import styles from '../question-form.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DataMartFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DataMartFields.tsx index 5f304b733b..e613afa59b 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DataMartFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DataMartFields.tsx @@ -1,11 +1,12 @@ import { ChangeEvent, useEffect } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { QuestionValidationRequest } from 'apps/page-builder/generated/models/QuestionValidationRequest'; import { useOptions } from 'apps/page-builder/hooks/api/useOptions'; import { usePageQuestionDataMartValidation } from 'apps/page-builder/hooks/api/usePageQuestionValidation'; import { useQuestionValidation } from 'apps/page-builder/hooks/api/useQuestionValidation'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { CreateQuestionForm } from '../QuestionForm'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DateFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DateFields.tsx index 50e9f6f0f8..cf95d009cc 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DateFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/DateFields.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; import { Label, Radio } from '@trussworks/react-uswds'; +import { Controller, useFormContext } from 'react-hook-form'; + import { CreateDateQuestionRequest } from 'apps/page-builder/generated'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { Option } from 'generated'; -import { Controller, useFormContext } from 'react-hook-form'; import styles from '../question-form.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/MessagingFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/MessagingFields.tsx index 4c6da39713..d66cc5c8db 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/MessagingFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/MessagingFields.tsx @@ -1,9 +1,10 @@ import { useEffect } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { useOptions } from 'apps/page-builder/hooks/api/useOptions'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { ToggleButton } from '../../ToggleButton'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/NumericFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/NumericFields.tsx index dfadb4ce8f..5e892a8e4a 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/NumericFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/NumericFields.tsx @@ -1,11 +1,12 @@ import { useEffect, useState } from 'react'; import { Label, Radio } from '@trussworks/react-uswds'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { CreateNumericQuestionRequest, ValueSetControllerService } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; import { Selectable, SelectInput } from 'components/FormInputs/SelectInput'; import { Option } from 'generated'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { AdditionalQuestionFields } from '../QuestionForm'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/QuestionSpecificFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/QuestionSpecificFields.tsx index a45b9593b2..fb3ac00429 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/QuestionSpecificFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/QuestionSpecificFields.tsx @@ -1,6 +1,7 @@ -import { useOptions } from 'apps/page-builder/hooks/api/useOptions'; import { useFormContext, useWatch } from 'react-hook-form'; +import { useOptions } from 'apps/page-builder/hooks/api/useOptions'; + import { CreateQuestionForm } from '../QuestionForm'; import { CodedFields } from './CodedFields'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/TextFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/TextFields.tsx index f7000b244f..3e130d9861 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/TextFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/TextFields.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { CreateTextQuestionRequest } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { Option } from 'generated'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; type Props = { diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/UserInterfaceFields.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/UserInterfaceFields.tsx index d2c89127dd..822e9f5e76 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/UserInterfaceFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/fields/UserInterfaceFields.tsx @@ -1,7 +1,8 @@ import { ErrorMessage, Label, Textarea } from '@trussworks/react-uswds'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { CreateQuestionForm } from '../QuestionForm'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/valueset/CreateEditValueset.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/valueset/CreateEditValueset.tsx index fb8d4bafee..01faed27bb 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/valueset/CreateEditValueset.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/valueset/CreateEditValueset.tsx @@ -1,8 +1,9 @@ import { useEffect, useState } from 'react'; +import { useFormContext } from 'react-hook-form'; + import { CreateCodedQuestionRequest } from 'apps/page-builder/generated'; import { useValueset } from 'apps/page-builder/hooks/api/useValueset'; -import { useFormContext } from 'react-hook-form'; import { AddValueset } from '../../AddValueset/AddValueset'; import { EditValueset } from '../../EditValueset/EditValueset'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/valueset/ValuesetSearch.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/valueset/ValuesetSearch.tsx index 52096f1e2d..8466b17a42 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/valueset/ValuesetSearch.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddQuestion/valueset/ValuesetSearch.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; + import { useFindValuesets, ValuesetSort } from 'apps/page-builder/hooks/api/useFindValueset'; import { Status, usePagination } from 'pagination'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddSection/AddSectionModal.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddSection/AddSectionModal.spec.tsx index 69f37b740a..0d390d8ff3 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddSection/AddSectionModal.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddSection/AddSectionModal.spec.tsx @@ -1,4 +1,5 @@ import { fireEvent, render } from '@testing-library/react'; + import { SectionControllerService } from 'apps/page-builder/generated'; import AddSectionModal from './AddSectionModal'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddSection/AddSectionModal.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddSection/AddSectionModal.tsx index 5301023e73..04f39f7a13 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddSection/AddSectionModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddSection/AddSectionModal.tsx @@ -1,6 +1,7 @@ import { ChangeEvent, RefObject, useState } from 'react'; import { ButtonGroup, Label, ModalFooter, ModalRef, ModalToggleButton, TextInput } from '@trussworks/react-uswds'; + import { SectionControllerService, SubSectionControllerService } from 'apps/page-builder/generated'; import { ModalComponent } from 'components/ModalComponent/ModalComponent'; import { logErrorToUserConsole } from 'utils/logging'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddValueset/AddValueset.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddValueset/AddValueset.tsx index 4364419594..09a3d3ba55 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddValueset/AddValueset.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddValueset/AddValueset.tsx @@ -1,7 +1,8 @@ import { Button, Icon } from '@trussworks/react-uswds'; +import { FormProvider, useForm } from 'react-hook-form'; + import { CreateValuesetRequest, Valueset, ValueSetControllerService } from 'apps/page-builder/generated'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm } from 'react-hook-form'; import { ButtonBar } from '../ButtonBar/ButtonBar'; import { CloseableHeader } from '../CloseableHeader/CloseableHeader'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/AddValueset/ValuesetForm/ValuesetForm.tsx b/apps/modernization-ui/src/apps/page-builder/components/AddValueset/ValuesetForm/ValuesetForm.tsx index 9647185c90..4d3917592f 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/AddValueset/ValuesetForm/ValuesetForm.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/AddValueset/ValuesetForm/ValuesetForm.tsx @@ -1,7 +1,8 @@ import { Radio } from '@trussworks/react-uswds'; +import { Controller, useFormContext } from 'react-hook-form'; + import { CreateValuesetRequest } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import styles from './valueset-form.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/CreateCondition/CreateCondition.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/CreateCondition/CreateCondition.spec.tsx index ce2aeed9a3..62252ec732 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/CreateCondition/CreateCondition.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/CreateCondition/CreateCondition.spec.tsx @@ -1,7 +1,8 @@ import { fireEvent, render } from '@testing-library/react'; -import { AlertProvider } from 'alert'; import { BrowserRouter } from 'react-router'; +import { AlertProvider } from 'alert'; + import { CreateCondition } from './CreateCondition'; vi.mock('apps/page-builder/services/valueSetAPI', () => ({ diff --git a/apps/modernization-ui/src/apps/page-builder/components/CreateCondition/CreateCondition.tsx b/apps/modernization-ui/src/apps/page-builder/components/CreateCondition/CreateCondition.tsx index 6d267ba290..b7a1a88dd3 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/CreateCondition/CreateCondition.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/CreateCondition/CreateCondition.tsx @@ -1,6 +1,8 @@ import { ChangeEvent, RefObject, useEffect, useState } from 'react'; import { Button, Form, ModalRef, ModalToggleButton, Radio } from '@trussworks/react-uswds'; +import { Controller, useForm, useWatch } from 'react-hook-form'; + import { createCondition } from 'apps/page-builder/services/conditionAPI'; import { fetchProgramAreaOptions } from 'apps/page-builder/services/programAreaAPI'; import { @@ -12,7 +14,6 @@ import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { useConfiguration } from 'configuration'; import { useAlert } from 'libs/alert'; -import { Controller, useForm, useWatch } from 'react-hook-form'; import { logErrorToUserConsole } from 'utils/logging'; import { Condition, CreateConditionRequest, ProgramArea } from '../../generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/CreateConcept.tsx b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/CreateConcept.tsx index 86f033e6f0..2f2b4ebf65 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/CreateConcept.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/CreateConcept.tsx @@ -1,8 +1,9 @@ import { Button } from '@trussworks/react-uswds'; +import { FormProvider, useForm } from 'react-hook-form'; + import { ConceptControllerService, CreateConceptRequest } from 'apps/page-builder/generated'; import { externalizeDateTime, internalizeDate } from 'date'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm } from 'react-hook-form'; import { ButtonBar } from '../ButtonBar/ButtonBar'; import { CloseableHeader } from '../CloseableHeader/CloseableHeader'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/EditConcept.tsx b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/EditConcept.tsx index e7266d9bc1..97ea919a4b 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/EditConcept.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/EditConcept.tsx @@ -1,12 +1,13 @@ import { useEffect } from 'react'; import { Button } from '@trussworks/react-uswds'; +import { FormProvider, useForm, useFormState } from 'react-hook-form'; + import { Concept, UpdateConceptRequest } from 'apps/page-builder/generated'; import { useUpdateConcept } from 'apps/page-builder/hooks/api/useUpdateConcept'; import { internalizeDate } from 'date'; import { externalizeDateTime } from 'date/ExternalizeDateTime'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm, useFormState } from 'react-hook-form'; import { ButtonBar } from '../ButtonBar/ButtonBar'; import { CloseableHeader } from '../CloseableHeader/CloseableHeader'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/EditValuesetDetails.tsx b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/EditValuesetDetails.tsx index 8369ebf757..1cfe2ed463 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/EditValuesetDetails.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/EditValuesetDetails.tsx @@ -1,10 +1,11 @@ import { useEffect } from 'react'; import { Button } from '@trussworks/react-uswds'; +import { FormProvider, useForm } from 'react-hook-form'; + import { CreateValuesetRequest, Valueset } from 'apps/page-builder/generated'; import { useUpdateValueset } from 'apps/page-builder/hooks/api/useUpdateValueset'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm } from 'react-hook-form'; import { ValuesetForm } from '../AddValueset/ValuesetForm/ValuesetForm'; import { ButtonBar } from '../ButtonBar/ButtonBar'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/ValuesetDetails.tsx b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/ValuesetDetails.tsx index 0a2cc544ba..2c4510284b 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/ValuesetDetails.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/ValuesetDetails.tsx @@ -1,4 +1,5 @@ import { Button, Icon } from '@trussworks/react-uswds'; + import { Valueset } from 'apps/page-builder/generated'; import styles from './edit-valueset.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/ViewValueset.tsx b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/ViewValueset.tsx index d560fda519..114d57806b 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/ViewValueset.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/ViewValueset.tsx @@ -1,4 +1,5 @@ import { Button, Icon } from '@trussworks/react-uswds'; + import { Concept, Valueset } from 'apps/page-builder/generated'; import { ConceptSort } from 'apps/page-builder/hooks/api/useFindConcepts'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/concept/ConceptForm.tsx b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/concept/ConceptForm.tsx index b03bd18fa2..04feeabf33 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/concept/ConceptForm.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/concept/ConceptForm.tsx @@ -1,12 +1,13 @@ import { ChangeEvent, useEffect } from 'react'; import { Label, Radio, Textarea } from '@trussworks/react-uswds'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { CreateConceptRequest } from 'apps/page-builder/generated'; import { useOptions } from 'apps/page-builder/hooks/api/useOptions'; import { DatePickerInput } from 'components/FormInputs/DatePickerInput'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { isAfter } from 'validation/date/isAfter'; import { maxLengthRule } from 'validation/entry'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/concept/ConceptTable.tsx b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/concept/ConceptTable.tsx index 278e2cc8ca..2a16b2d810 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/EditValueset/concept/ConceptTable.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/EditValueset/concept/ConceptTable.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; + import { Concept } from 'apps/page-builder/generated'; import { ConceptSort, SortField } from 'apps/page-builder/hooks/api/useFindConcepts'; import { TableBody, TableComponent } from 'components/Table'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.spec.tsx index 23d848d2c0..d3ee0a56f5 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.spec.tsx @@ -1,7 +1,8 @@ import { fireEvent, render, waitFor } from '@testing-library/react'; -import { CancelablePromise, Template, TemplateControllerService } from 'apps/page-builder/generated'; import { BrowserRouter } from 'react-router'; +import { CancelablePromise, Template, TemplateControllerService } from 'apps/page-builder/generated'; + import { ImportTemplate } from './ImportTemplate'; const onCancel = vi.fn(); const onCreated = vi.fn(); diff --git a/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.tsx b/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.tsx index be2beb59ef..9e73874a21 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/ImportTemplate/ImportTemplate.tsx @@ -1,6 +1,7 @@ import { ChangeEvent, DragEvent, useEffect, useState } from 'react'; import { Button, Icon, Tag } from '@trussworks/react-uswds'; + import { Template } from 'apps/page-builder/generated'; import { useImportTemplate } from 'apps/page-builder/hooks/api/useImportTemplate'; import { Spinner } from 'components/Spinner/Spinner'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/SaveTemplate/SaveTemplate.spec.tsx b/apps/modernization-ui/src/apps/page-builder/components/SaveTemplate/SaveTemplate.spec.tsx index b62fb82af6..d3e8ea435c 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/SaveTemplate/SaveTemplate.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/SaveTemplate/SaveTemplate.spec.tsx @@ -1,6 +1,7 @@ +import { createRef } from 'react'; + import { render } from '@testing-library/react'; import { BrowserRouter } from 'react-router'; -import { createRef } from 'react'; import { SaveTemplates } from './SaveTemplate'; diff --git a/apps/modernization-ui/src/apps/page-builder/components/ValuesetSearchTable/ValuesetSearchTable.tsx b/apps/modernization-ui/src/apps/page-builder/components/ValuesetSearchTable/ValuesetSearchTable.tsx index 2dfcc44dce..b3a5a2d1c9 100644 --- a/apps/modernization-ui/src/apps/page-builder/components/ValuesetSearchTable/ValuesetSearchTable.tsx +++ b/apps/modernization-ui/src/apps/page-builder/components/ValuesetSearchTable/ValuesetSearchTable.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; + import { ValueSetOption } from 'apps/page-builder/generated'; import { SortField, ValuesetSort } from 'apps/page-builder/hooks/api/useFindValueset'; import { Search } from 'components/Search/Search'; diff --git a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.spec.tsx b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.spec.tsx index 95b29a978a..1e3dce5278 100644 --- a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { Condition } from 'apps/page-builder/generated'; import { MemoryRouter } from 'react-router'; +import { Condition } from 'apps/page-builder/generated'; + import { ConditionSearch } from './ConditionSearch'; const mockCondition: Condition = { diff --git a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.tsx b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.tsx index 6d3d726b75..0cada7901b 100644 --- a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.tsx +++ b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionSearch.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; + import { ConditionSort, useConditionSearch } from 'apps/page-builder/condition/search/useConditionSearch'; import { Search } from 'components/Search'; import { PaginationProvider, Status, usePagination } from 'pagination'; diff --git a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionTable.spec.tsx b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionTable.spec.tsx index 0ea10c94ef..a07201c91e 100644 --- a/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionTable.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/condition/search/ConditionTable.spec.tsx @@ -1,5 +1,6 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { Condition } from 'apps/page-builder/generated'; import { WithinTableProvider } from 'components/Table/testing'; diff --git a/apps/modernization-ui/src/apps/page-builder/hooks/api/useFetchPageRules.ts b/apps/modernization-ui/src/apps/page-builder/hooks/api/useFetchPageRules.ts index 6bbd57e433..6e6fbfd1a7 100644 --- a/apps/modernization-ui/src/apps/page-builder/hooks/api/useFetchPageRules.ts +++ b/apps/modernization-ui/src/apps/page-builder/hooks/api/useFetchPageRules.ts @@ -1,8 +1,9 @@ import { useEffect, useReducer } from 'react'; +import { useParams } from 'react-router'; + import { PageRule, PageRuleControllerService, SearchPageRuleRequest } from 'apps/page-builder/generated'; import { Direction } from 'libs/sorting'; -import { useParams } from 'react-router'; export type FetchBusinessRules = { pageId?: number; diff --git a/apps/modernization-ui/src/apps/page-builder/hooks/api/useGetAllPageRules.ts b/apps/modernization-ui/src/apps/page-builder/hooks/api/useGetAllPageRules.ts index 090518ce1f..bb5dbfaa1c 100644 --- a/apps/modernization-ui/src/apps/page-builder/hooks/api/useGetAllPageRules.ts +++ b/apps/modernization-ui/src/apps/page-builder/hooks/api/useGetAllPageRules.ts @@ -1,8 +1,9 @@ import { useEffect, useReducer } from 'react'; -import { PageRuleControllerService, Rule } from 'apps/page-builder/generated'; import { useParams } from 'react-router'; +import { PageRuleControllerService, Rule } from 'apps/page-builder/generated'; + type State = | { status: 'idle' } | { status: 'fetching' } diff --git a/apps/modernization-ui/src/apps/page-builder/page/library/PageLibrary.tsx b/apps/modernization-ui/src/apps/page-builder/page/library/PageLibrary.tsx index 1ab467df44..1362c312c5 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/library/PageLibrary.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/library/PageLibrary.tsx @@ -1,5 +1,7 @@ import { useState } from 'react'; +import fileDownload from 'js-file-download'; + import { Date, DateRange, @@ -13,7 +15,6 @@ import { useConfiguration } from 'configuration'; import { LinkButton } from 'design-system/button'; import { NavLinkButton } from 'design-system/button'; import { externalize, Filter } from 'filters'; -import fileDownload from 'js-file-download'; import { useSorting } from 'libs/sorting'; import { downloadPageLibraryPdf } from 'utils/ExportUtil'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/library/asPageSummaryRows.tsx b/apps/modernization-ui/src/apps/page-builder/page/library/asPageSummaryRows.tsx index 8ea7d16d08..c0fba1df3a 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/library/asPageSummaryRows.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/library/asPageSummaryRows.tsx @@ -1,7 +1,8 @@ +import { Link } from 'react-router'; + import { PageSummary } from 'apps/page-builder/generated'; import { TableBody } from 'components/Table'; import { internalizeDate } from 'date'; -import { Link } from 'react-router'; const asTableRow = (page: PageSummary): TableBody => ({ id: page.id, diff --git a/apps/modernization-ui/src/apps/page-builder/page/library/table/ConditionsDisplay.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/library/table/ConditionsDisplay.spec.tsx index 0cc5847309..d600578d31 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/library/table/ConditionsDisplay.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/library/table/ConditionsDisplay.spec.tsx @@ -1,5 +1,6 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { ConditionSummary } from 'apps/page-builder/generated'; import { ConditionsDisplay } from './ConditionsDisplay'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/library/table/PageLibraryTable.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/library/table/PageLibraryTable.spec.tsx index 646d2495c5..41b3643be8 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/library/table/PageLibraryTable.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/library/table/PageLibraryTable.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { WithinTableProvider } from 'components/Table/testing'; import { PageLibraryTable } from './PageLibraryTable'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/library/table/PageLibraryTable.tsx b/apps/modernization-ui/src/apps/page-builder/page/library/table/PageLibraryTable.tsx index ef83d3ce5c..78e9ee39d8 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/library/table/PageLibraryTable.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/library/table/PageLibraryTable.tsx @@ -1,11 +1,12 @@ import { useEffect, useState } from 'react'; +import { Link } from 'react-router'; + import { PageSummary } from 'apps/page-builder/generated'; import { TableBody, TableComponent } from 'components/Table/Table'; import { internalizeDate } from 'date'; import { Direction } from 'libs/sorting'; import { usePagination } from 'pagination'; -import { Link } from 'react-router'; import { ConditionsDisplay } from './ConditionsDisplay'; import styles from './page-library-table.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/Edit.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/Edit.tsx index 6d0b7c052e..6af33e60a9 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/Edit.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/Edit.tsx @@ -1,6 +1,7 @@ import { useRef } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PageHeader, diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/modal/AddQuestionModal.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/modal/AddQuestionModal.tsx index 27b4970b77..061f52da3e 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/modal/AddQuestionModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/modal/AddQuestionModal.tsx @@ -1,6 +1,7 @@ import { RefObject, useEffect, useState } from 'react'; import { Modal, ModalRef } from '@trussworks/react-uswds'; + import { AddQuestion } from 'apps/page-builder/components/AddQuestion/AddQuestion'; import { PaginationProvider, usePagination } from 'pagination'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/QuestionSearch.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/QuestionSearch.tsx index 547c796f34..fcdd2f9a65 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/QuestionSearch.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/QuestionSearch.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button } from '@trussworks/react-uswds'; + import { ButtonBar } from 'apps/page-builder/components/ButtonBar/ButtonBar'; import { CloseableHeader } from 'apps/page-builder/components/CloseableHeader/CloseableHeader'; import { AddableQuestionSort, useFindAddableQuestions } from 'apps/page-builder/hooks/api/useFindAvailableQuestions'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/table/QuestionSearchTable.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/table/QuestionSearchTable.spec.tsx index 432b12617f..e919480951 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/table/QuestionSearchTable.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/table/QuestionSearchTable.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { PaginationProvider } from 'pagination'; import { MemoryRouter } from 'react-router'; +import { PaginationProvider } from 'pagination'; + import { QuestionSearchTable } from './QuestionSearchTable'; describe('question search table tests', () => { diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/table/QuestionSearchTable.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/table/QuestionSearchTable.tsx index dd5678436d..cfcf11a96d 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/table/QuestionSearchTable.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/add-question/search/table/QuestionSearchTable.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; + import { AvailableQuestion } from 'apps/page-builder/generated'; import { Search } from 'components/Search'; import { SelectionMode, TableBody, TableComponent } from 'components/Table'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/change-valueset/ChangeValuesetModal.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/change-valueset/ChangeValuesetModal.tsx index adc8f4b03d..9829c1c356 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/change-valueset/ChangeValuesetModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/change-valueset/ChangeValuesetModal.tsx @@ -1,6 +1,7 @@ import { RefObject, useEffect } from 'react'; import { Modal, ModalRef } from '@trussworks/react-uswds'; + import { ValuesetSearch } from 'apps/page-builder/components/AddQuestion/valueset/ValuesetSearch'; import { PagesQuestion } from 'apps/page-builder/generated'; import { useUpdatePageQuestionValueset } from 'apps/page-builder/hooks/api/useUpdatePageQuestionValueset'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/content/PageContent.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/content/PageContent.tsx index fad57955c1..ab62ab872b 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/content/PageContent.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/content/PageContent.tsx @@ -1,6 +1,7 @@ import { useEffect, useRef, useState } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; + import { PagesQuestion, PagesSubSection, PagesTab } from 'apps/page-builder/generated'; import { useAddQuestionsToPage } from 'apps/page-builder/hooks/api/useAddQuestionsToPage'; import { useAlert } from 'libs/alert'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/content/PageSideMenu.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/content/PageSideMenu.tsx index 9d6cf8f407..a2e78efa57 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/content/PageSideMenu.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/content/PageSideMenu.tsx @@ -1,4 +1,5 @@ import { Icon } from '@trussworks/react-uswds'; + import { Icon as EQIcon } from 'components/Icon/Icon'; import styles from './page-content.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/EditQuestionModal.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/EditQuestionModal.tsx index 691f85ac60..f35a329290 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/EditQuestionModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/EditQuestionModal.tsx @@ -1,6 +1,8 @@ import { RefObject, useEffect } from 'react'; import { Button, Modal, ModalRef } from '@trussworks/react-uswds'; +import { FormProvider, useForm, useFormState } from 'react-hook-form'; + import { ButtonBar } from 'apps/page-builder/components/ButtonBar/ButtonBar'; import { CloseableHeader } from 'apps/page-builder/components/CloseableHeader/CloseableHeader'; import { PagesQuestion } from 'apps/page-builder/generated'; @@ -8,7 +10,6 @@ import { useFetchEditableQuestion } from 'apps/page-builder/hooks/api/useFetchEd import { useUpdatePageQuestion } from 'apps/page-builder/hooks/api/useUpdatePageQuestion'; import { Spinner } from 'components/Spinner'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm, useFormState } from 'react-hook-form'; import { usePageManagement } from '../../usePageManagement'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/form/EditFields.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/form/EditFields.tsx index a6462a6e73..e0f2ec5fdc 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/form/EditFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/form/EditFields.tsx @@ -1,6 +1,7 @@ -import { ToggleButton } from 'apps/page-builder/components/ToggleButton'; import { Controller, useFormContext } from 'react-hook-form'; +import { ToggleButton } from 'apps/page-builder/components/ToggleButton'; + import { EditPageQuestionForm } from './EditPageQuestion'; import styles from './edit-question-form.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/form/EditPageQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/form/EditPageQuestion.tsx index cbe598d622..0328c76d3c 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/form/EditPageQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-question/form/EditPageQuestion.tsx @@ -1,3 +1,5 @@ +import { useFormContext, useWatch } from 'react-hook-form'; + import { AdditionalQuestionFields } from 'apps/page-builder/components/AddQuestion/QuestionForm'; import { AdministrativeFields } from 'apps/page-builder/components/AddQuestion/fields/AdministrativeFields'; import { BasicInformationFields } from 'apps/page-builder/components/AddQuestion/fields/BasicInformationFields'; @@ -8,7 +10,6 @@ import { UserInterfaceFields } from 'apps/page-builder/components/AddQuestion/fi import { HorizontalRule } from 'apps/page-builder/components/FormDivider/HorizontalRule'; import { PagesQuestion } from 'apps/page-builder/generated'; import { UpdatePageQuestionRequest } from 'apps/page-builder/hooks/api/useUpdatePageQuestion'; -import { useFormContext, useWatch } from 'react-hook-form'; import { EditFields } from './EditFields'; import styles from './edit-question-form.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-staticelement/EditStaticElementModal.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-staticelement/EditStaticElementModal.tsx index c7770c058c..b74d618fc9 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-staticelement/EditStaticElementModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-staticelement/EditStaticElementModal.tsx @@ -1,6 +1,7 @@ import { RefObject } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; + import { PagesQuestion } from 'apps/page-builder/generated'; import { ModalComponent } from 'components/ModalComponent/ModalComponent'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-valueset/EditValuesetModal.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-valueset/EditValuesetModal.tsx index 49f1ecf158..320cb00594 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-valueset/EditValuesetModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/edit-valueset/EditValuesetModal.tsx @@ -1,6 +1,7 @@ import { RefObject, useEffect } from 'react'; import { Modal, ModalRef } from '@trussworks/react-uswds'; + import { CloseableHeader } from 'apps/page-builder/components/CloseableHeader/CloseableHeader'; import { EditValueset } from 'apps/page-builder/components/EditValueset/EditValueset'; import { useValueset } from 'apps/page-builder/hooks/api/useValueset'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Create/GroupQuestion.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Create/GroupQuestion.spec.tsx index 4886ce0475..573eb5c32d 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Create/GroupQuestion.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Create/GroupQuestion.spec.tsx @@ -1,9 +1,10 @@ import { ReactNode } from 'react'; import { render } from '@testing-library/react'; +import { FormProvider, useForm } from 'react-hook-form'; + import { AlertProvider } from 'alert'; import { GroupSubSectionRequest, PagesQuestion, PagesResponse, PagesSubSection } from 'apps/page-builder/generated'; -import { FormProvider, useForm } from 'react-hook-form'; import { PageManagementProvider } from '../../../../usePageManagement'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Create/GroupQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Create/GroupQuestion.tsx index e8410f6eab..88b33fd59a 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Create/GroupQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Create/GroupQuestion.tsx @@ -1,6 +1,8 @@ import { useEffect, useState } from 'react'; import { Button } from '@trussworks/react-uswds'; +import { FormProvider, useForm, useWatch } from 'react-hook-form'; + import { AlertBanner } from 'apps/page-builder/components/AlertBanner/AlertBanner'; import { ButtonBar } from 'apps/page-builder/components/ButtonBar/ButtonBar'; import { CloseableHeader } from 'apps/page-builder/components/CloseableHeader/CloseableHeader'; @@ -8,7 +10,6 @@ import { PagesSubSection } from 'apps/page-builder/generated'; import { GroupRequest, useGroupSubsection } from 'apps/page-builder/hooks/api/useGroupSubsection'; import { Spinner } from 'components/Spinner'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm, useWatch } from 'react-hook-form'; import { RepeatingBlock } from '../RepeatingBlock'; import { SubsectionDetails } from '../SubsectionDetails'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/GroupQuestionModal.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/GroupQuestionModal.tsx index 1d49ae3155..929672cbaf 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/GroupQuestionModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/GroupQuestionModal.tsx @@ -1,6 +1,7 @@ import { RefObject } from 'react'; import { Modal, ModalRef } from '@trussworks/react-uswds'; + import { PagesSubSection } from 'apps/page-builder/generated'; import { usePageManagement } from '../../../usePageManagement'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.spec.tsx index bef0d87ef3..0101b626c2 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.spec.tsx @@ -1,9 +1,10 @@ import { ReactNode } from 'react'; import { render } from '@testing-library/react'; -import { GroupSubSectionRequest, PagesQuestion, PagesSubSection } from 'apps/page-builder/generated'; import { FormProvider, useForm } from 'react-hook-form'; +import { GroupSubSectionRequest, PagesQuestion, PagesSubSection } from 'apps/page-builder/generated'; + import { RepeatingBlock } from './RepeatingBlock'; const dateQuestion: PagesQuestion = { diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.tsx index e95ad18467..ebfcd892ed 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/RepeatingBlock.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; +import { Controller, useFieldArray, useFormContext, useWatch } from 'react-hook-form'; + import { Batch, PagesQuestion } from 'apps/page-builder/generated'; import { GroupRequest } from 'apps/page-builder/hooks/api/useGroupSubsection'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; -import { Controller, useFieldArray, useFormContext, useWatch } from 'react-hook-form'; import styles from './repeating-block.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/SubsectionDetails.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/SubsectionDetails.spec.tsx index da3aef9094..9bd51a526a 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/SubsectionDetails.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/SubsectionDetails.spec.tsx @@ -1,9 +1,10 @@ import { ReactNode } from 'react'; import { render } from '@testing-library/react'; -import { GroupSubSectionRequest, PagesSubSection } from 'apps/page-builder/generated'; import { FormProvider, useForm } from 'react-hook-form'; +import { GroupSubSectionRequest, PagesSubSection } from 'apps/page-builder/generated'; + import { SubsectionDetails } from './SubsectionDetails'; type Additional = { diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/SubsectionDetails.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/SubsectionDetails.tsx index eff41e4542..25ec6a874a 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/SubsectionDetails.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/SubsectionDetails.tsx @@ -1,9 +1,10 @@ import { useEffect, useState } from 'react'; import { Radio } from '@trussworks/react-uswds'; +import { Controller, useFormContext } from 'react-hook-form'; + import { GroupRequest } from 'apps/page-builder/hooks/api/useGroupSubsection'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useFormContext } from 'react-hook-form'; import styles from './subsection-details.module.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Update/UpdateGroupedQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Update/UpdateGroupedQuestion.tsx index 62ba26cc99..c35f802f1b 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Update/UpdateGroupedQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/GroupQuestion/Update/UpdateGroupedQuestion.tsx @@ -1,13 +1,14 @@ import { useEffect, useState } from 'react'; import { Button } from '@trussworks/react-uswds'; +import { FormProvider, useForm } from 'react-hook-form'; + import { ButtonBar } from 'apps/page-builder/components/ButtonBar/ButtonBar'; import { CloseableHeader } from 'apps/page-builder/components/CloseableHeader/CloseableHeader'; import { PagesSubSection } from 'apps/page-builder/generated'; import { GroupRequest, useGroupSubsection } from 'apps/page-builder/hooks/api/useGroupSubsection'; import { Spinner } from 'components/Spinner'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm } from 'react-hook-form'; import { RepeatingBlock } from '../RepeatingBlock'; import { SubsectionDetails } from '../SubsectionDetails'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/Question.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/Question.tsx index 8ce89c0c17..42a41dfa04 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/Question.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/Question.tsx @@ -1,6 +1,7 @@ import { useEffect, useRef, useState } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; + import { PagesQuestion } from 'apps/page-builder/generated'; import { ConfirmationModal } from 'confirmation'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionContent.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionContent.spec.tsx index 02c890014e..5cf2578254 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionContent.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionContent.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; +import { BrowserRouter } from 'react-router'; + import { AlertProvider } from 'alert'; import { PagesQuestion, PagesResponse, PagesSection, PagesSubSection, PagesTab } from 'apps/page-builder/generated'; -import { BrowserRouter } from 'react-router'; import { PageManagementProvider } from '../../usePageManagement'; import { PageContent } from '../content/PageContent'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionContent.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionContent.tsx index ea67bee6e1..8356660af8 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionContent.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionContent.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; + import { RadioButtons } from 'apps/page-builder/components/RadioButton/RadioButton'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionHeader.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionHeader.tsx index 007d2b3bca..110a5e615e 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionHeader.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/question/QuestionHeader.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; + import DeleteQuestion from 'apps/page-builder/components/DeleteQuestion/DeleteQuestion'; import { ToggleButton } from 'apps/page-builder/components/ToggleButton'; import { PagesQuestion } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderModal/ReorderModal.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderModal/ReorderModal.spec.tsx index b1d3051c13..80e1cb7e76 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderModal/ReorderModal.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderModal/ReorderModal.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderModal/ReorderModal.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderModal/ReorderModal.tsx index 9ff3d033a8..5b797773b6 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderModal/ReorderModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderModal/ReorderModal.tsx @@ -3,6 +3,7 @@ import { RefObject, useState } from 'react'; import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { ModalRef } from '@trussworks/react-uswds'; import { ModalToggleButton } from '@trussworks/react-uswds'; + import { AlertBanner } from 'apps/page-builder/components/AlertBanner/AlertBanner'; import { useDragDrop } from 'apps/page-builder/context/DragDropProvider'; import { PagesTab } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderQuestion/ReorderQuestion.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderQuestion/ReorderQuestion.spec.tsx index 93c9f92929..378512e222 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderQuestion/ReorderQuestion.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderQuestion/ReorderQuestion.spec.tsx @@ -1,5 +1,6 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesQuestion, PagesResponse } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderQuestion/ReorderQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderQuestion/ReorderQuestion.tsx index 999a612968..8bc7e55d28 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderQuestion/ReorderQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderQuestion/ReorderQuestion.tsx @@ -1,4 +1,5 @@ import { Draggable, DraggableProvided } from '@hello-pangea/dnd'; + import { PagesQuestion } from 'apps/page-builder/generated'; import { Icon } from 'components/Icon/Icon'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSection/ReorderSection.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSection/ReorderSection.spec.tsx index 3a592a8775..ca9564ab31 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSection/ReorderSection.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSection/ReorderSection.spec.tsx @@ -1,5 +1,6 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse, PagesSection } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSection/ReorderSection.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSection/ReorderSection.tsx index d24749df48..6f1e266e24 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSection/ReorderSection.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSection/ReorderSection.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Draggable, DraggableProvided, Droppable } from '@hello-pangea/dnd'; + import { useDragDrop } from 'apps/page-builder/context/DragDropProvider'; import { PagesSubSection } from 'apps/page-builder/generated'; import { PagesSection } from 'apps/page-builder/generated/models/PagesSection'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSubsection/ReorderSubsection.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSubsection/ReorderSubsection.spec.tsx index 5ff5dd75d5..571fad2725 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSubsection/ReorderSubsection.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSubsection/ReorderSubsection.spec.tsx @@ -1,5 +1,6 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse, PagesSubSection } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSubsection/ReorderSubsection.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSubsection/ReorderSubsection.tsx index aee86aef7e..111188f2ae 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSubsection/ReorderSubsection.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderSubsection/ReorderSubsection.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Draggable, DraggableProvided, Droppable } from '@hello-pangea/dnd'; + import { useDragDrop } from 'apps/page-builder/context/DragDropProvider'; import { PagesQuestion } from 'apps/page-builder/generated'; import { PagesSubSection } from 'apps/page-builder/generated/models/PagesSubSection'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderTab/ReorderTab.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderTab/ReorderTab.tsx index 9ad9b74fb3..c0045bb493 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderTab/ReorderTab.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/reorder/ReorderTab/ReorderTab.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Draggable, DraggableProvided, Droppable } from '@hello-pangea/dnd'; + import { useDragDrop } from 'apps/page-builder/context/DragDropProvider'; import { PagesSection, PagesTab } from 'apps/page-builder/generated'; import { Icon } from 'components/Icon/Icon'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/Section.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/Section.tsx index fb3df17189..05cd2513ae 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/Section.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/Section.tsx @@ -1,6 +1,7 @@ import { useEffect, useRef, useState } from 'react'; import { Modal, ModalRef } from '@trussworks/react-uswds'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesQuestion, PagesSection, PagesSubSection, SubSectionControllerService } from 'apps/page-builder/generated'; import { useAlert } from 'libs/alert'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/SectionHeader.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/SectionHeader.tsx index e61e4d0c21..89ea46c3fa 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/SectionHeader.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/SectionHeader.tsx @@ -1,9 +1,10 @@ import { useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; -import { MoreOptions } from 'apps/page-builder/components/MoreOptions/MoreOptions'; import classNames from 'classnames'; +import { MoreOptions } from 'apps/page-builder/components/MoreOptions/MoreOptions'; + import styles from './section.module.scss'; type Props = { diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/Sections.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/Sections.tsx index d92a9861c7..d8d8d916fa 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/Sections.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/Sections.tsx @@ -1,6 +1,7 @@ import { useRef, useState } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; + import { PagesQuestion, PagesSection, PagesSubSection, SectionControllerService } from 'apps/page-builder/generated'; import { useAlert } from 'libs/alert'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/AddSection.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/AddSection.tsx index 8d169d56bf..5404f267a3 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/AddSection.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/AddSection.tsx @@ -1,6 +1,8 @@ import { useEffect } from 'react'; import { Button, Form } from '@trussworks/react-uswds'; +import { Controller, useForm } from 'react-hook-form'; + import { ToggleButton } from 'apps/page-builder/components/ToggleButton'; import { CreateSectionRequest, @@ -9,7 +11,6 @@ import { UpdateSectionRequest, } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useForm } from 'react-hook-form'; import { maxLengthRule, validPageNameRule } from 'validation/entry'; import { notEmptyRule } from 'validation/entry/notEmptyRule'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSection.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSection.spec.tsx index 1cfb89dc01..3c92849f19 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSection.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSection.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse, PagesTab } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSection.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSection.tsx index 31f39ee880..cbda436dc6 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSection.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSection.tsx @@ -2,6 +2,7 @@ import { useState } from 'react'; import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { Button, Icon } from '@trussworks/react-uswds'; + import { useDragDrop } from 'apps/page-builder/context/DragDropProvider'; import { PagesSection, PagesTab, SectionControllerService } from 'apps/page-builder/generated'; import { Icon as NbsIcon } from 'components/Icon/Icon'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionModal.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionModal.tsx index 806838a410..9a930110f6 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionModal.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionModal.tsx @@ -1,6 +1,7 @@ import { RefObject, useEffect, useState } from 'react'; import { Modal, ModalRef } from '@trussworks/react-uswds'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { useAlert } from 'libs/alert'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx index 04fb6e00c6..288e160349 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.spec.tsx @@ -1,5 +1,6 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse, PagesSection } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.tsx index 971bb45bdf..d915cd807c 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/section/manage/ManageSectionTile/ManageSectionTile.tsx @@ -1,5 +1,6 @@ import { Draggable, DraggableProvided } from '@hello-pangea/dnd'; import { Button, Icon } from '@trussworks/react-uswds'; + import { PagesSection } from 'apps/page-builder/generated'; import { Icon as IconComponent } from 'components/Icon/Icon'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/AddStaticElement.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/AddStaticElement.spec.tsx index 8daeb3bb79..43dd9156e2 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/AddStaticElement.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/AddStaticElement.spec.tsx @@ -1,5 +1,6 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { AlertProvider } from 'alert'; import { PagesResponse } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/AddStaticElement.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/AddStaticElement.tsx index 9b2e3a9c38..662d66e6ba 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/AddStaticElement.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/AddStaticElement.tsx @@ -1,6 +1,8 @@ import { RefObject } from 'react'; import { Button, Form, ModalRef, ModalToggleButton } from '@trussworks/react-uswds'; +import { Controller, FormProvider, useForm, useWatch } from 'react-hook-form'; + import { AddDefault, AddHyperlink, @@ -10,7 +12,6 @@ import { import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { useAlert } from 'libs/alert'; -import { Controller, FormProvider, useForm, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry/maxLengthRule'; import { usePageManagement } from '../../usePageManagement'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/CommentsFields.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/CommentsFields.tsx index 39e513dc1e..ca5990b58d 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/CommentsFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/CommentsFields.tsx @@ -1,6 +1,7 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { AddReadOnlyComments, UpdateReadOnlyComments } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; export const CommentsFields = () => { diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/EditStaticElement.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/EditStaticElement.spec.tsx index deefc9d8d2..83477aab7f 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/EditStaticElement.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/EditStaticElement.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; +import { BrowserRouter } from 'react-router'; + import { AlertProvider } from 'alert'; import { PagesQuestion, PagesResponse } from 'apps/page-builder/generated'; -import { BrowserRouter } from 'react-router'; import { PageManagementProvider } from '../../usePageManagement'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/EditStaticElement.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/EditStaticElement.tsx index 38a2add097..065d8b43b7 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/EditStaticElement.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/EditStaticElement.tsx @@ -1,4 +1,6 @@ import { Button, Form } from '@trussworks/react-uswds'; +import { Controller, FormProvider, useForm } from 'react-hook-form'; + import { PagesQuestion, PageStaticControllerService, @@ -9,7 +11,6 @@ import { import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { useAlert } from 'libs/alert'; -import { Controller, FormProvider, useForm } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { usePageManagement } from '../../usePageManagement'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/HyperlinkFields.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/HyperlinkFields.tsx index 502ffffdf5..96a7bf3978 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/HyperlinkFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/staticelement/HyperlinkFields.tsx @@ -1,6 +1,7 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { AddHyperlink, UpdateHyperlink } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; export const HyperlinkFields = () => { diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/SubsectionHeader.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/SubsectionHeader.spec.tsx index 4c91ceaae3..be7a1e71a5 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/SubsectionHeader.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/SubsectionHeader.spec.tsx @@ -1,5 +1,6 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { AlertProvider } from 'alert'; import { PagesResponse, PagesSubSection } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/SubsectionHeader.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/SubsectionHeader.tsx index 54441cfe64..31e900e151 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/SubsectionHeader.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/SubsectionHeader.tsx @@ -1,6 +1,7 @@ import { useRef, useState } from 'react'; import { Button, Icon, ModalRef, ModalToggleButton } from '@trussworks/react-uswds'; + import { MoreOptions } from 'apps/page-builder/components/MoreOptions/MoreOptions'; import { PagesSubSection, SubSectionControllerService } from 'apps/page-builder/generated'; import { AddStaticElement } from 'apps/page-builder/page/management/edit/staticelement/AddStaticElement'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/AddSubSection.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/AddSubSection.tsx index be16c01cc6..4f08187fa1 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/AddSubSection.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/AddSubSection.tsx @@ -1,6 +1,8 @@ import { useEffect } from 'react'; import { Button, Form, Icon } from '@trussworks/react-uswds'; +import { Controller, useForm } from 'react-hook-form'; + import { ToggleButton } from 'apps/page-builder/components/ToggleButton'; import { CreateSubSectionRequest, @@ -9,7 +11,6 @@ import { UpdateSubSectionRequest, } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useForm } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { validSubsectionNameRule } from 'validation/entry/validSubsectionNameRule'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsection.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsection.tsx index 728806b679..b7e2118a09 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsection.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsection.tsx @@ -2,6 +2,7 @@ import { useState } from 'react'; import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { Button, Icon } from '@trussworks/react-uswds'; + import { useDragDrop } from 'apps/page-builder/context/DragDropProvider'; import { PagesSection, PagesSubSection, SubSectionControllerService } from 'apps/page-builder/generated'; import { Icon as NbsIcon } from 'components/Icon/Icon'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsectionTile/ManageSubsectionTile.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsectionTile/ManageSubsectionTile.spec.tsx index 7758d1e1f5..e86d8ad458 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsectionTile/ManageSubsectionTile.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsectionTile/ManageSubsectionTile.spec.tsx @@ -1,5 +1,6 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse, PagesSubSection } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsectionTile/ManageSubsectionTile.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsectionTile/ManageSubsectionTile.tsx index c545dd2d91..0ef610f017 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsectionTile/ManageSubsectionTile.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/subsection/manage/ManageSubsectionTile/ManageSubsectionTile.tsx @@ -2,6 +2,7 @@ import { useState } from 'react'; import { Draggable, DraggableProvided } from '@hello-pangea/dnd'; import { Button, Icon } from '@trussworks/react-uswds'; + import { PagesSubSection } from 'apps/page-builder/generated'; import { Icon as NbsIcon } from 'components/Icon/Icon'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab.spec.tsx index e5bfe2b4f0..9559496e3d 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab.spec.tsx @@ -1,9 +1,10 @@ import { render } from '@testing-library/react'; -import { AlertProvider } from 'alert'; -import { Tab } from 'apps/page-builder/generated'; import { FormProvider, useForm } from 'react-hook-form'; import { BrowserRouter } from 'react-router'; +import { AlertProvider } from 'alert'; +import { Tab } from 'apps/page-builder/generated'; + import { AddEditTab } from './AddEditTab'; vi.mock('react-router', async () => { diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab.tsx index 1106a05087..b15b9ea892 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab.tsx @@ -1,6 +1,7 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { CreateTabRequest, UpdateTabRequest } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { ToggleButton } from '../../../../../components/ToggleButton'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabs/ManageTabs.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabs/ManageTabs.spec.tsx index aa6030934c..0a45a4c48d 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabs/ManageTabs.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabs/ManageTabs.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabs/ManageTabs.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabs/ManageTabs.tsx index a91b8e1fac..2c3c4ec74b 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabs/ManageTabs.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabs/ManageTabs.tsx @@ -1,11 +1,12 @@ import { ReactNode, useEffect, useRef, useState } from 'react'; import { Button, Icon, Modal, ModalRef, ModalToggleButton } from '@trussworks/react-uswds'; +import { FormProvider, useForm } from 'react-hook-form'; + import { AlertBanner } from 'apps/page-builder/components/AlertBanner/AlertBanner'; import { PagesTab, Tab } from 'apps/page-builder/generated'; import { AddEditTab } from 'apps/page-builder/page/management/edit/tabs/AddEditTab/AddEditTab'; import { addTab, updateTab } from 'apps/page-builder/services/tabsAPI'; -import { FormProvider, useForm } from 'react-hook-form'; import { logErrorToUserConsole } from 'utils/logging'; import './ManageTabModal.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabsTile/ManageTabsTile.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabsTile/ManageTabsTile.spec.tsx index 91549e7fc1..151b16ca16 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabsTile/ManageTabsTile.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabsTile/ManageTabsTile.spec.tsx @@ -1,5 +1,6 @@ import { DragDropContext, Droppable } from '@hello-pangea/dnd'; import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabsTile/ManageTabsTile.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabsTile/ManageTabsTile.tsx index 358c982d0b..500cd6e302 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabsTile/ManageTabsTile.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ManageTabsTile/ManageTabsTile.tsx @@ -1,5 +1,6 @@ import { Draggable, DraggableProvided } from '@hello-pangea/dnd'; import { Icon } from '@trussworks/react-uswds'; + import { PagesTab } from 'apps/page-builder/generated'; import { Icon as IconComponent } from 'components/Icon/Icon'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ReorderableTabs/ReorderableTabs.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ReorderableTabs/ReorderableTabs.tsx index 0fa9c30667..93ad1c48bc 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ReorderableTabs/ReorderableTabs.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/edit/tabs/ReorderableTabs/ReorderableTabs.tsx @@ -1,6 +1,7 @@ import { useState } from 'react'; import { DragDropContext, Droppable } from '@hello-pangea/dnd'; + import { useDragDrop } from 'apps/page-builder/context/DragDropProvider'; import { PagesTab } from 'apps/page-builder/generated'; import { deleteTab, updateTab } from 'apps/page-builder/services/tabsAPI'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/header/tabs/PageTabs.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/header/tabs/PageTabs.spec.tsx index 4b66c608b9..146d4ed120 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/header/tabs/PageTabs.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/header/tabs/PageTabs.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import DragDropProvider from 'apps/page-builder/context/DragDropProvider'; import { PagesResponse } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/layout/PageManagementLayout.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/layout/PageManagementLayout.tsx index 6b79be56bd..93cfc3940a 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/layout/PageManagementLayout.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/layout/PageManagementLayout.tsx @@ -1,9 +1,10 @@ import { ReactNode } from 'react'; -import { Breadcrumb } from 'breadcrumb'; import classNames from 'classnames'; import { useLocation } from 'react-router'; +import { Breadcrumb } from 'breadcrumb'; + import styles from './page-management-layout.module.scss'; type PageBuilderLayoutProps = { diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PageDetails/PageDetails.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PageDetails/PageDetails.tsx index b0285d5651..6a36f462fc 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PageDetails/PageDetails.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PageDetails/PageDetails.tsx @@ -1,6 +1,9 @@ import { useEffect, useState } from 'react'; import { Button, Form, Icon } from '@trussworks/react-uswds'; +import { FormProvider, useForm } from 'react-hook-form'; +import { useNavigate, useParams } from 'react-router'; + import { PagesBreadcrumb } from 'apps/page-builder/components/PagesBreadcrumb/PagesBreadcrumb'; import { Concept, @@ -13,8 +16,6 @@ import { useGetPageDetails } from 'apps/page-builder/page/management/useGetPageD import { fetchMMGOptions } from 'apps/page-builder/services/valueSetAPI'; import { LinkButton } from 'components/button'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm } from 'react-hook-form'; -import { useNavigate, useParams } from 'react-router'; import { logErrorToUserConsole } from 'utils/logging'; import './PageDetails.scss'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PageDetails/PageDetailsField.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PageDetails/PageDetailsField.tsx index 0356efb2ae..040b4eecc7 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PageDetails/PageDetailsField.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PageDetails/PageDetailsField.tsx @@ -1,11 +1,12 @@ import { ChangeEvent } from 'react'; import { ErrorMessage, Label, Textarea } from '@trussworks/react-uswds'; +import { Controller, useFormContext } from 'react-hook-form'; + import { Concept, Condition, PageControllerService, PageInformationChangeRequest } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { MultiSelectInput } from 'components/selection/multi'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule, validPageNameRule } from '../../../../../../validation/entry'; import { dataMartNameRule } from '../../../../../../validation/entry/dataMartNameRule'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PreviewPage.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PreviewPage.tsx index aaf6355050..00e52e51ad 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PreviewPage.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PreviewPage.tsx @@ -1,6 +1,8 @@ import { useEffect, useRef, useState } from 'react'; import { Button, Icon, ModalRef, ModalToggleButton } from '@trussworks/react-uswds'; +import { useNavigate } from 'react-router'; + import { PagesTab } from 'apps/page-builder/generated'; import { PageHeader, @@ -16,7 +18,6 @@ import { ConfirmationModal } from 'confirmation'; import { LinkButton } from 'design-system/button'; import { NavLinkButton } from 'design-system/button'; import { useAlert } from 'libs/alert'; -import { useNavigate } from 'react-router'; import { logErrorToUserConsole } from 'utils/logging'; import { PageControllerService } from '../../../generated/services/PageControllerService'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PublishPage/PublishPage.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PublishPage/PublishPage.spec.tsx index 0b68830661..0d865e05e7 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PublishPage/PublishPage.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PublishPage/PublishPage.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { AlertProvider } from 'alert'; import { PagesResponse } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PublishPage/PublishPage.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PublishPage/PublishPage.tsx index b94207183a..ad0cebb50a 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/PublishPage/PublishPage.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/PublishPage/PublishPage.tsx @@ -1,9 +1,10 @@ import { Dispatch, RefObject, SetStateAction, useEffect, useState } from 'react'; import { Button, ErrorMessage, Form, Label, ModalRef, ModalToggleButton, Textarea } from '@trussworks/react-uswds'; +import { Controller, useForm } from 'react-hook-form'; + import { PageInformationService, PagePublishControllerService, SelectableCondition } from 'apps/page-builder/generated'; import { useAlert } from 'libs/alert'; -import { Controller, useForm } from 'react-hook-form'; import { logErrorToUserConsole } from 'utils/logging'; import { maxLengthRule } from 'validation/entry'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/SaveTemplate/SaveTemplate.spec.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/SaveTemplate/SaveTemplate.spec.tsx index 3e83722038..2207db2892 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/SaveTemplate/SaveTemplate.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/SaveTemplate/SaveTemplate.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { AlertProvider } from 'alert'; import { PagesResponse } from 'apps/page-builder/generated'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/SaveTemplate/SaveTemplate.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/SaveTemplate/SaveTemplate.tsx index 622580f33a..2740998ee4 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/SaveTemplate/SaveTemplate.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/SaveTemplate/SaveTemplate.tsx @@ -1,10 +1,11 @@ import { RefObject } from 'react'; import { Button, Form, ModalRef, ModalToggleButton } from '@trussworks/react-uswds'; +import { Controller, useForm } from 'react-hook-form'; + import { CreateTemplateRequest, PagesService } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; import { useAlert } from 'libs/alert'; -import { Controller, useForm } from 'react-hook-form'; import { logErrorToUserConsole } from 'utils/logging'; import { maxLengthRule } from 'validation/entry'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/information/PageInformation.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/information/PageInformation.tsx index e6cd6d4f7a..dea8c76561 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/information/PageInformation.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/information/PageInformation.tsx @@ -1,6 +1,8 @@ import { useEffect, useState } from 'react'; import { Button, Icon, Pagination } from '@trussworks/react-uswds'; +import { useNavigate, useParams } from 'react-router'; + import { PageInformation as InfoType, PageControllerService, @@ -8,7 +10,6 @@ import { PageInformationService, } from 'apps/page-builder/generated'; import { useDownloadPageMetadata } from 'apps/page-builder/hooks/api/useDownloadPageMetadata'; -import { useNavigate, useParams } from 'react-router'; import { logErrorToUserConsole } from 'utils/logging'; import { usePageManagement } from '../../usePageManagement'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/preview/tab/question/PreviewQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/page/management/preview/tab/question/PreviewQuestion.tsx index eb139835d8..00e74ddb6a 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/preview/tab/question/PreviewQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/page/management/preview/tab/question/PreviewQuestion.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Icon } from '@trussworks/react-uswds'; + import { RadioButtons } from 'apps/page-builder/components/RadioButton/RadioButton'; import { PagesQuestion } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; diff --git a/apps/modernization-ui/src/apps/page-builder/page/management/useGetPageDetails.ts b/apps/modernization-ui/src/apps/page-builder/page/management/useGetPageDetails.ts index 3388b35d17..915221813a 100644 --- a/apps/modernization-ui/src/apps/page-builder/page/management/useGetPageDetails.ts +++ b/apps/modernization-ui/src/apps/page-builder/page/management/useGetPageDetails.ts @@ -1,8 +1,9 @@ import { useEffect, useReducer } from 'react'; -import { PagesResponse, PagesService } from 'apps/page-builder/generated'; import { useParams } from 'react-router'; +import { PagesResponse, PagesService } from 'apps/page-builder/generated'; + type State = | { status: 'idle' } | { status: 'fetching'; page: number } diff --git a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx index f869ec1c7e..88c237f662 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.spec.tsx @@ -1,5 +1,7 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { MemoryRouter } from 'react-router'; + import { AlertProvider } from 'alert'; import { CancelablePromise, @@ -15,7 +17,6 @@ import { Template, TemplateControllerService, } from 'apps/page-builder/generated'; -import { MemoryRouter } from 'react-router'; import { AddNewPage } from './AddNewPage'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.tsx b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.tsx index b2e37cec1e..a8d0c89f08 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPage.tsx @@ -1,6 +1,9 @@ import { useEffect, useRef, useState } from 'react'; import { Button, Form, Modal, ModalRef } from '@trussworks/react-uswds'; +import { Controller, FormProvider, useForm, useWatch } from 'react-hook-form'; +import { useNavigate } from 'react-router'; + import { CreateCondition } from 'apps/page-builder/components/CreateCondition/CreateCondition'; import { ImportTemplate } from 'apps/page-builder/components/ImportTemplate/ImportTemplate'; import { PagesBreadcrumb } from 'apps/page-builder/components/PagesBreadcrumb/PagesBreadcrumb'; @@ -13,8 +16,6 @@ import { SelectInput } from 'components/FormInputs/SelectInput'; import { ModalComponent } from 'components/ModalComponent/ModalComponent'; import { useConfiguration } from 'configuration'; import { useAlert } from 'libs/alert'; -import { Controller, FormProvider, useForm, useWatch } from 'react-hook-form'; -import { useNavigate } from 'react-router'; import './AddNewPage.scss'; import { AddNewPageFields } from './AddNewPageFields'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPageFields.tsx b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPageFields.tsx index 848ee47b52..cf25b9e4f3 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPageFields.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/AddNewPage/AddNewPageFields.tsx @@ -1,12 +1,13 @@ import { ChangeEvent, RefObject } from 'react'; import { ErrorMessage, Icon, Label, ModalRef, ModalToggleButton, Textarea } from '@trussworks/react-uswds'; +import { Controller, useFormContext } from 'react-hook-form'; + import { Condition, PageControllerService, PageCreateRequest, Template } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { MultiSelectInput } from 'components/selection/multi'; import { Option } from 'generated'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule, validPageNameRule } from 'validation/entry'; import { dataMartNameRule } from 'validation/entry/dataMartNameRule'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Add/AddBusinessRules.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Add/AddBusinessRules.tsx index 6eb24a3d70..e133d77fc0 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Add/AddBusinessRules.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Add/AddBusinessRules.tsx @@ -1,11 +1,12 @@ import { Button, Form } from '@trussworks/react-uswds'; +import { FormProvider, useForm, useWatch } from 'react-hook-form'; +import { useNavigate } from 'react-router'; + import { PageRuleControllerService, Rule, RuleRequest } from 'apps/page-builder/generated'; import { useOptions } from 'apps/page-builder/hooks/api/useOptions'; import { useGetPageDetails } from 'apps/page-builder/page/management'; import { Breadcrumb } from 'breadcrumb'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm, useWatch } from 'react-hook-form'; -import { useNavigate } from 'react-router'; import { BusinessRulesForm } from '../Form/BusinessRulesForm'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibrary.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibrary.tsx index df04efd940..2229f4b127 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibrary.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibrary.tsx @@ -1,6 +1,7 @@ import { useEffect, useRef, useState } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; + import { useDownloadPageLibrary } from 'apps/page-builder/hooks/api/useDownloadPageLibrary'; import { BusinessRuleSort, RuleSortField, useFetchPageRules } from 'apps/page-builder/hooks/api/useFetchPageRules'; import { useGetPageDetails } from 'apps/page-builder/page/management'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibraryTable.spec.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibraryTable.spec.tsx index 550fce70f9..b78e43f4be 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibraryTable.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibraryTable.spec.tsx @@ -1,7 +1,8 @@ import { render, screen } from '@testing-library/react'; +import { BrowserRouter } from 'react-router'; + import { Rule } from 'apps/page-builder/generated'; import { PaginationProvider } from 'pagination'; -import { BrowserRouter } from 'react-router'; import { BusinessRulesLibraryTable } from './BusinessRulesLibraryTable'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibraryTable.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibraryTable.tsx index 6ffb0e7d9e..981a8b5f2b 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibraryTable.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/BusinessRulesLibraryTable.tsx @@ -1,6 +1,8 @@ import { Fragment, RefObject, useEffect, useState } from 'react'; import { Button, ModalRef, ModalToggleButton } from '@trussworks/react-uswds'; +import { Link } from 'react-router'; + import { Rule } from 'apps/page-builder/generated'; import { BusinessRuleSort, RuleSortField } from 'apps/page-builder/hooks/api/useFetchPageRules'; import { useGetPageDetails } from 'apps/page-builder/page/management'; @@ -8,7 +10,6 @@ import { TableBody, TableComponent } from 'components/Table/Table'; import { NavLinkButton } from 'design-system/button'; import { Direction } from 'libs/sorting'; import { usePagination } from 'pagination'; -import { Link } from 'react-router'; import './BusinessRulesLibraryTable.scss'; import { RuleSearchBar } from './RuleSearchBar'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Edit/EditBusinessRules.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Edit/EditBusinessRules.tsx index 62a285c0c3..cb0d33ffa3 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Edit/EditBusinessRules.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Edit/EditBusinessRules.tsx @@ -1,6 +1,9 @@ import { useEffect, useRef, useState } from 'react'; import { Button, Form, Icon, ModalRef } from '@trussworks/react-uswds'; +import { FormProvider, useForm, useWatch } from 'react-hook-form'; +import { useNavigate, useParams } from 'react-router'; + import { PageRuleControllerService, PagesQuestion, @@ -15,8 +18,6 @@ import { useGetPageDetails } from 'apps/page-builder/page/management'; import { Breadcrumb } from 'breadcrumb/Breadcrumb'; import { ConfirmationModal } from 'confirmation'; import { useAlert } from 'libs/alert'; -import { FormProvider, useForm, useWatch } from 'react-hook-form'; -import { useNavigate, useParams } from 'react-router'; import { BusinessRulesForm } from '../Form/BusinessRulesForm'; import { findTargetQuestion, findTargetSubsection } from '../helpers/findTargetQuestions'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Form/BusinessRulesForm.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Form/BusinessRulesForm.tsx index a25581c5da..9979888947 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Form/BusinessRulesForm.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/Form/BusinessRulesForm.tsx @@ -1,13 +1,14 @@ import { useEffect, useRef, useState } from 'react'; import { Button, Checkbox, Icon, Label, Modal, ModalRef, Radio } from '@trussworks/react-uswds'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; +import { useParams } from 'react-router'; + import { PagesQuestion, PagesSubSection, Rule, RuleRequest } from 'apps/page-builder/generated'; import { Input } from 'components/FormInputs/Input'; import { SelectInput } from 'components/FormInputs/SelectInput'; import { SegmentedButtons } from 'components/SegmentedButtons/SegmentedButtons'; import { MultiSelectInput } from 'components/selection/multi'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; -import { useParams } from 'react-router'; import { SourceValueProp } from '../Add/AddBusinessRules'; import { SourceQuestion } from '../SourceQuestion/SourceQuestion'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/SourceQuestion/SourceQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/SourceQuestion/SourceQuestion.tsx index f8c9137e55..9a2e0d301e 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/SourceQuestion/SourceQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/SourceQuestion/SourceQuestion.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import { Button, Radio, Tag, Icon as UswIcon } from '@trussworks/react-uswds'; + import { PagesQuestion, PagesSection, PagesSubSection, PagesTab, Rule } from 'apps/page-builder/generated'; import { useGetSourceQuestion } from 'apps/page-builder/hooks/api/useGetSourceQuestions'; import { useGetPageDetails } from 'apps/page-builder/page/management'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/SubSectionDropdown.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/SubSectionDropdown.tsx index 8b3fee7a53..cc3f238e84 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/SubSectionDropdown.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/SubSectionDropdown.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; +import { useFormContext } from 'react-hook-form'; + import { PagesQuestion, PagesSubSection, RuleRequest } from 'apps/page-builder/generated'; import { useGetTargetSubsections } from 'apps/page-builder/hooks/useGetTargetSubsections'; import { useGetPageDetails } from 'apps/page-builder/page/management'; import { MultiSelectInput } from 'components/selection/multi'; -import { useFormContext } from 'react-hook-form'; interface Props { sourceQuestion?: PagesQuestion; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/TargetQuestion/TargetQuestion.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/TargetQuestion/TargetQuestion.tsx index 2b78ff8544..89101ee08e 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/TargetQuestion/TargetQuestion.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/TargetQuestion/TargetQuestion.tsx @@ -1,6 +1,7 @@ import { ChangeEvent, useEffect, useState } from 'react'; import { Button, Checkbox, ErrorMessage, Tag, Icon as UswIcon } from '@trussworks/react-uswds'; + import { PagesQuestion, PagesSection, PagesSubSection, Rule } from 'apps/page-builder/generated'; import { useGetTargetQuestions } from 'apps/page-builder/hooks/api/useGetTargetQuestions'; import { useGetPageDetails } from 'apps/page-builder/page/management'; diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/ViewBusinessRule/ViewBusinessRule.spec.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/ViewBusinessRule/ViewBusinessRule.spec.tsx index 462ffb7f9a..46ee09209a 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/ViewBusinessRule/ViewBusinessRule.spec.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/ViewBusinessRule/ViewBusinessRule.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; -import { PaginationProvider } from 'pagination'; import { BrowserRouter } from 'react-router'; +import { PaginationProvider } from 'pagination'; + import { ViewBusinessRule } from './ViewBusinessRule'; describe('when ViewBusinessRule rendered', () => { diff --git a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/ViewBusinessRule/ViewBusinessRule.tsx b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/ViewBusinessRule/ViewBusinessRule.tsx index 998547b68f..da5c618919 100644 --- a/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/ViewBusinessRule/ViewBusinessRule.tsx +++ b/apps/modernization-ui/src/apps/page-builder/pages/BusinessRulesLibrary/ViewBusinessRule/ViewBusinessRule.tsx @@ -1,9 +1,10 @@ import { useEffect, useState } from 'react'; +import { useParams } from 'react-router'; + import { PageRuleControllerService, PagesQuestion, PagesSubSection, Rule } from 'apps/page-builder/generated'; import { useGetPageDetails } from 'apps/page-builder/page/management'; import { Breadcrumb } from 'breadcrumb'; -import { useParams } from 'react-router'; import { checkForSemicolon, removeNumericAndSymbols } from '../helpers/errorMessageUtils'; import { findTargetQuestion, findTargetSubsection } from '../helpers/findTargetQuestions'; diff --git a/apps/modernization-ui/src/apps/patient/add/PatientDataEntryProvider.tsx b/apps/modernization-ui/src/apps/patient/add/PatientDataEntryProvider.tsx index c774626f12..730b627501 100644 --- a/apps/modernization-ui/src/apps/patient/add/PatientDataEntryProvider.tsx +++ b/apps/modernization-ui/src/apps/patient/add/PatientDataEntryProvider.tsx @@ -1,6 +1,7 @@ -import { ComponentSizingProvider } from 'design-system/sizing'; import { Outlet } from 'react-router'; +import { ComponentSizingProvider } from 'design-system/sizing'; + import { PatientDataEntryMethodProvider } from './usePatientDataEntryMethod'; import { SearchFromAddPatientProvider } from './useSearchFromAddPatient'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/AddPatientBasic.tsx b/apps/modernization-ui/src/apps/patient/add/basic/AddPatientBasic.tsx index d133ab15f0..36633ebeef 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/AddPatientBasic.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/AddPatientBasic.tsx @@ -1,10 +1,11 @@ import { useCallback, useEffect } from 'react'; +import { FormProvider, useForm } from 'react-hook-form'; +import { useLocation } from 'react-router'; + import { SkipLink } from 'SkipLink'; import { Button } from 'components/button'; import { NavigationGuard } from 'design-system/entry/navigation-guard'; -import { FormProvider, useForm } from 'react-hook-form'; -import { useLocation } from 'react-router'; import { PatientCreatedPanel } from '../PatientCreatedPanel'; import { AddPatientLayout } from '../layout'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/AddPatientBasicForm.tsx b/apps/modernization-ui/src/apps/patient/add/basic/AddPatientBasicForm.tsx index f4b4216dda..c6f8f84be3 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/AddPatientBasicForm.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/AddPatientBasicForm.tsx @@ -1,7 +1,8 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { AdministrativeEntryFields } from 'apps/patient/data/administrative/AdministrativeEntryFields'; import { Card } from 'design-system/card'; import { useComponentSizing } from 'design-system/sizing'; -import { Controller, useFormContext } from 'react-hook-form'; import styles from './add-patient-basic-form.module.scss'; import { BasicAddressFields } from './address/BasicAddressFields'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/address/BasicAddressFields.spec.tsx b/apps/modernization-ui/src/apps/patient/add/basic/address/BasicAddressFields.spec.tsx index eb564b03f7..8fb93701a0 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/address/BasicAddressFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/address/BasicAddressFields.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { FormProvider, useForm } from 'react-hook-form'; + import { AddressEntry } from 'apps/patient/data'; import { LocationOptions } from 'options/location'; -import { FormProvider, useForm } from 'react-hook-form'; import { BasicAddressFields } from './BasicAddressFields'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/address/BasicAddressFields.tsx b/apps/modernization-ui/src/apps/patient/add/basic/address/BasicAddressFields.tsx index 1a9b1056ae..b04ea91bb1 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/address/BasicAddressFields.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/address/BasicAddressFields.tsx @@ -1,5 +1,7 @@ import { useEffect } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { BasicNewPatientEntry } from 'apps/patient/add/basic/entry'; import { Input } from 'components/FormInputs/Input'; import { EntryFieldsProps } from 'design-system/entry'; @@ -12,7 +14,6 @@ import { ZipCodeInputField, } from 'libs/demographics/location'; import { useLocationOptions } from 'options/location'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; const STREET_ADDRESS_LABEL = 'Street address 1'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationFields.spec.tsx b/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationFields.spec.tsx index b3d1ae668f..721c8ef721 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationFields.spec.tsx @@ -1,8 +1,9 @@ import { act, render, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { IdentificationCodedValues } from 'apps/patient/data/identification/useIdentificationCodedValues'; import { FormProvider, useForm } from 'react-hook-form'; +import { IdentificationCodedValues } from 'apps/patient/data/identification/useIdentificationCodedValues'; + import { BasicIdentificationEntry } from '../entry'; import { BasicIdentificationFields } from './BasicIdentificationFields'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationFields.tsx b/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationFields.tsx index ac08ae71f3..b2dc3a577a 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationFields.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationFields.tsx @@ -1,8 +1,9 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { useIdentificationCodedValues } from 'apps/patient/data/identification/useIdentificationCodedValues'; import { Input } from 'components/FormInputs/Input'; import { EntryFieldsProps } from 'design-system/entry'; import { SingleSelect } from 'design-system/select'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule, validateRequiredRule } from 'validation/entry'; import { BasicIdentificationEntry } from '../entry'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationRepeatingBlock.spec.tsx b/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationRepeatingBlock.spec.tsx index 84117fcff2..0227414d90 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationRepeatingBlock.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/identification/BasicIdentificationRepeatingBlock.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { IdentificationCodedValues } from 'apps/patient/data/identification/useIdentificationCodedValues'; import { diff --git a/apps/modernization-ui/src/apps/patient/add/basic/name/NameEntryFields.tsx b/apps/modernization-ui/src/apps/patient/add/basic/name/NameEntryFields.tsx index da98fc50e6..b26b49cabb 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/name/NameEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/name/NameEntryFields.tsx @@ -1,8 +1,9 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { useNameCodedValues } from 'apps/patient/data/name/useNameCodedValues'; import { Input } from 'components/FormInputs/Input'; import { EntryFieldsProps } from 'design-system/entry'; import { SingleSelect } from 'design-system/select'; -import { Controller, useFormContext } from 'react-hook-form'; import { validateExtendedNameRule } from 'validation/entry'; import { NameInformationEntry } from '../entry'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.tsx b/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.tsx index 0c2d00ca34..e064bc6264 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.tsx @@ -1,5 +1,7 @@ import { useCallback } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { asOfAgeResolver } from 'date'; import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; @@ -10,7 +12,6 @@ import { Permitted } from 'libs/permission'; import { useConceptOptions } from 'options/concepts'; import { genders } from 'options/gender'; import { indicators } from 'options/indicator'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { BasicPersonalDetailsEntry } from '../entry'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/phoneEmail/BasicPhoneEmailFields.tsx b/apps/modernization-ui/src/apps/patient/add/basic/phoneEmail/BasicPhoneEmailFields.tsx index 89be91527e..c485368a81 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/phoneEmail/BasicPhoneEmailFields.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/phoneEmail/BasicPhoneEmailFields.tsx @@ -1,8 +1,9 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { EntryFieldsProps } from 'design-system/entry'; import { MaskedTextInputField } from 'design-system/input/text'; import { EmailField, maybeValidateEmail, PhoneNumberInputField, validPhoneNumberRule } from 'libs/demographics/contact'; import { Verification } from 'libs/verification'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule } from 'validation/entry'; import { BasicPhoneEmail } from '../entry'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/raceEthnicity/BasicEthnicityRaceFields.spec.tsx b/apps/modernization-ui/src/apps/patient/add/basic/raceEthnicity/BasicEthnicityRaceFields.spec.tsx index 31c139e1cd..ea1a357d73 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/raceEthnicity/BasicEthnicityRaceFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/raceEthnicity/BasicEthnicityRaceFields.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { Selectable } from 'options'; import { FormProvider, useForm } from 'react-hook-form'; +import { Selectable } from 'options'; + import { BasicEthnicityRace } from '../entry'; import { BasicRaceEthnicityFields } from './BasicEthnicityRaceFields'; diff --git a/apps/modernization-ui/src/apps/patient/add/basic/raceEthnicity/BasicEthnicityRaceFields.tsx b/apps/modernization-ui/src/apps/patient/add/basic/raceEthnicity/BasicEthnicityRaceFields.tsx index 926cb32c1c..c92fdc4714 100644 --- a/apps/modernization-ui/src/apps/patient/add/basic/raceEthnicity/BasicEthnicityRaceFields.tsx +++ b/apps/modernization-ui/src/apps/patient/add/basic/raceEthnicity/BasicEthnicityRaceFields.tsx @@ -1,3 +1,5 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { BasicEthnicityRace } from 'apps/patient/add/basic/entry'; import { useEthnicityCodedValues } from 'apps/patient/data/ethnicity/useEthnicityCodedValues'; import { CheckboxGroup } from 'design-system/checkbox'; @@ -5,7 +7,6 @@ import { EntryFieldsProps } from 'design-system/entry'; import { SingleSelect } from 'design-system/select'; import { Selectable } from 'options'; import { MULTI_RACE, useRaceCategoryOptions } from 'options/race'; -import { Controller, useFormContext } from 'react-hook-form'; const categoryFilter = (race: Selectable) => race.value !== MULTI_RACE.value; diff --git a/apps/modernization-ui/src/apps/patient/add/cancelAddPatientPanel/CancelAddPatientPanel.tsx b/apps/modernization-ui/src/apps/patient/add/cancelAddPatientPanel/CancelAddPatientPanel.tsx index 97b463f241..97785dfce7 100644 --- a/apps/modernization-ui/src/apps/patient/add/cancelAddPatientPanel/CancelAddPatientPanel.tsx +++ b/apps/modernization-ui/src/apps/patient/add/cancelAddPatientPanel/CancelAddPatientPanel.tsx @@ -1,6 +1,7 @@ import { ChangeEvent, useCallback, useState } from 'react'; import { Checkbox } from '@trussworks/react-uswds'; + import { Confirmation } from 'design-system/modal'; import { useShowCancelModal } from './useShowCancelModal'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.spec.tsx index 71c3f42723..872975d2e0 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.spec.tsx @@ -1,9 +1,10 @@ import { render, screen } from '@testing-library/react'; +import { createMemoryRouter, RouterProvider, useNavigate } from 'react-router'; +import { Mock } from 'vitest'; + import { SkipLinkProvider } from 'SkipLink/SkipLinkContext'; import { Selectable } from 'options'; import { PageProvider } from 'page'; -import { createMemoryRouter, RouterProvider, useNavigate } from 'react-router'; -import { Mock } from 'vitest'; import { useShowCancelModal } from '../cancelAddPatientPanel'; import { PatientDataEntryMethodProvider } from '../usePatientDataEntryMethod'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.tsx b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.tsx index b7cc9c717b..3dfa5c9165 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtended.tsx @@ -1,3 +1,5 @@ +import { FormProvider, useForm } from 'react-hook-form'; + import { SkipLink } from 'SkipLink'; import { PatientCreatedPanel } from 'apps/patient/add/PatientCreatedPanel'; import { AddPatientLayout } from 'apps/patient/add/layout'; @@ -5,7 +7,6 @@ import { usePatientDataEntryMethod } from 'apps/patient/add/usePatientDataEntryM import { Button } from 'design-system/button'; import { NavigationGuard } from 'design-system/entry/navigation-guard'; import { NavSection } from 'design-system/inPageNavigation/InPageNavigation'; -import { FormProvider, useForm } from 'react-hook-form'; import { AddPatientExtendedForm } from './AddPatientExtendedForm'; import { ExtendedNewPatientEntry } from './entry'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.spec.tsx index 4e851587b8..ff2faca023 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.spec.tsx @@ -1,7 +1,8 @@ import { render, screen, within } from '@testing-library/react'; +import { FormProvider, useForm } from 'react-hook-form'; + import { internalizeDate } from 'date'; import { Selectable } from 'options'; -import { FormProvider, useForm } from 'react-hook-form'; import { AddPatientExtendedForm } from './AddPatientExtendedForm'; import { ExtendedNewPatientEntry, initial } from './entry'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.tsx b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.tsx index 8e745733ca..99d3c9b8a4 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.tsx @@ -1,5 +1,7 @@ import { useEffect, useRef } from 'react'; +import { Controller, useFormContext } from 'react-hook-form'; + import { AdministrativeEntryFields } from 'apps/patient/data/administrative/AdministrativeEntryFields'; import { EthnicityEntryFields } from 'apps/patient/data/ethnicity/EthnicityEntryFields'; import { GeneralInformationEntryFields } from 'apps/patient/data/general/GeneralInformationEntryFields'; @@ -9,7 +11,6 @@ import { Card } from 'design-system/card'; import { DirtySectionErrorMessage } from 'design-system/errors/ValidationError'; import { AlertMessage } from 'design-system/message'; import { useComponentSizing } from 'design-system/sizing'; -import { Controller, useFormContext } from 'react-hook-form'; import styles from './add-patient-extended-form.module.scss'; import { ExtendedNewPatientEntry } from './entry'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/address/AddressRepeatingBlock.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/address/AddressRepeatingBlock.spec.tsx index e7572ef31f..eb315d12c0 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/address/AddressRepeatingBlock.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/address/AddressRepeatingBlock.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { AddressEntry } from 'apps/patient/data'; import { internalizeDate } from 'date'; import { LocationOptions } from 'options/location'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/address/AddressView.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/address/AddressView.spec.tsx index 91dc0c8516..108a73bf93 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/address/AddressView.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/address/AddressView.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { AddressEntry } from 'apps/patient/data'; import { AddressView } from './AddressView'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/identification/IdentificationRepeatingBlock.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/identification/IdentificationRepeatingBlock.spec.tsx index 7225aa1a1c..9c76565991 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/identification/IdentificationRepeatingBlock.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/identification/IdentificationRepeatingBlock.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { internalizeDate } from 'date'; import { IdentificationRepeatingBlock, IdentificationRepeatingBlockProps } from './IdentificationRepeatingBlock'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/identification/IdentificationView.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/identification/IdentificationView.spec.tsx index ab3f2550bc..6207ee0f82 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/identification/IdentificationView.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/identification/IdentificationView.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { IdentificationEntry } from 'apps/patient/data'; import { IdentificationView } from './IdentificationView'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/name/NameEntryView.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/name/NameEntryView.spec.tsx index 2397bba41d..d6e9f5d490 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/name/NameEntryView.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/name/NameEntryView.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { NameEntry } from 'apps/patient/data/name'; import { asSelectable } from 'options/selectable'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/name/NameRepeatingBlock.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/name/NameRepeatingBlock.spec.tsx index 9b6ad56e80..70fbd9be46 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/name/NameRepeatingBlock.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/name/NameRepeatingBlock.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { internalizeDate } from 'date'; import { NameRepeatingBlock, NameRepeatingBlockProps } from './NameRepeatingBlock'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneAndEmailRepeatingBlock.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneAndEmailRepeatingBlock.spec.tsx index 4ebe625b02..869305722b 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneAndEmailRepeatingBlock.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneAndEmailRepeatingBlock.spec.tsx @@ -1,5 +1,6 @@ import { act, render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { internalizeDate } from 'date'; import { PhoneAndEmailRepeatingBlock, PhoneAndEmailRepeatingBlockProps } from './PhoneAndEmailRepeatingBlock'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneEntryView.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneEntryView.spec.tsx index d6ab01640d..5313d968fc 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneEntryView.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneEntryView.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { PhoneEmailEntry } from 'apps/patient/data'; import { PhoneEntryView } from './PhoneEntryView'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/race/RaceEntryView.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/race/RaceEntryView.spec.tsx index 6088b5a8eb..948538ecdb 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/race/RaceEntryView.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/race/RaceEntryView.spec.tsx @@ -1,4 +1,5 @@ import { render } from '@testing-library/react'; + import { RaceEntry } from 'apps/patient/data/race'; import { asSelectable } from 'options'; diff --git a/apps/modernization-ui/src/apps/patient/add/extended/inputs/race/RaceRepeatingBlock.spec.tsx b/apps/modernization-ui/src/apps/patient/add/extended/inputs/race/RaceRepeatingBlock.spec.tsx index 1bb576254b..99db74355a 100644 --- a/apps/modernization-ui/src/apps/patient/add/extended/inputs/race/RaceRepeatingBlock.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/extended/inputs/race/RaceRepeatingBlock.spec.tsx @@ -1,5 +1,6 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; + import { internalizeDate } from 'date'; import { Selectable } from 'options'; diff --git a/apps/modernization-ui/src/apps/patient/add/layout/AddPatientLayout.spec.tsx b/apps/modernization-ui/src/apps/patient/add/layout/AddPatientLayout.spec.tsx index 408539b3d7..0f75661f25 100644 --- a/apps/modernization-ui/src/apps/patient/add/layout/AddPatientLayout.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/add/layout/AddPatientLayout.spec.tsx @@ -1,7 +1,8 @@ import { render } from '@testing-library/react'; +import { MemoryRouter } from 'react-router'; + import { NavSection } from 'design-system/inPageNavigation/InPageNavigation'; import { PageProvider } from 'page'; -import { MemoryRouter } from 'react-router'; import { AddPatientLayout } from './AddPatientLayout'; diff --git a/apps/modernization-ui/src/apps/patient/data/address/AddressEntryFields.spec.tsx b/apps/modernization-ui/src/apps/patient/data/address/AddressEntryFields.spec.tsx index 80d8cb9a1c..7216bebf79 100644 --- a/apps/modernization-ui/src/apps/patient/data/address/AddressEntryFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/data/address/AddressEntryFields.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { LocationOptions } from 'options/location'; import { FormProvider, useForm } from 'react-hook-form'; +import { LocationOptions } from 'options/location'; + import { AddressEntryFields } from './AddressEntryFields'; import { AddressEntry } from './entry'; import { AddressCodedValues } from './useAddressCodedValues'; diff --git a/apps/modernization-ui/src/apps/patient/data/address/AddressEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/address/AddressEntryFields.tsx index 5afb9ad262..85794bb181 100644 --- a/apps/modernization-ui/src/apps/patient/data/address/AddressEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/address/AddressEntryFields.tsx @@ -1,5 +1,7 @@ import { useEffect } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; import { TextInputField } from 'design-system/input'; @@ -12,7 +14,6 @@ import { ZipCodeInputField, } from 'libs/demographics/location'; import { useLocationOptions } from 'options/location'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule, validateRequiredRule } from 'validation/entry'; import { AddressEntry } from './entry'; diff --git a/apps/modernization-ui/src/apps/patient/data/administrative/AdministrativeEntryFields.spec.tsx b/apps/modernization-ui/src/apps/patient/data/administrative/AdministrativeEntryFields.spec.tsx index 935ac278a2..3b2692a68f 100644 --- a/apps/modernization-ui/src/apps/patient/data/administrative/AdministrativeEntryFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/data/administrative/AdministrativeEntryFields.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { AdministrativeEntry } from 'apps/patient/data/entry'; import { FormProvider, useForm } from 'react-hook-form'; +import { AdministrativeEntry } from 'apps/patient/data/entry'; + import { AdministrativeEntryFields } from './AdministrativeEntryFields'; const Fixture = (props: { sizing?: 'small' | 'medium' | 'large' }) => { diff --git a/apps/modernization-ui/src/apps/patient/data/administrative/AdministrativeEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/administrative/AdministrativeEntryFields.tsx index d137791eeb..4fe0b9fbff 100644 --- a/apps/modernization-ui/src/apps/patient/data/administrative/AdministrativeEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/administrative/AdministrativeEntryFields.tsx @@ -1,8 +1,9 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { AdministrativeEntry } from 'apps/patient/data/entry'; import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; import { TextAreaField } from 'design-system/input/text/TextAreaField'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule, validateRequiredRule } from 'validation/entry'; const AS_OF_DATE_LABEL = 'Information as of date'; diff --git a/apps/modernization-ui/src/apps/patient/data/ethnicity/EthnicityEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/ethnicity/EthnicityEntryFields.tsx index edefa7a669..cc8999b518 100644 --- a/apps/modernization-ui/src/apps/patient/data/ethnicity/EthnicityEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/ethnicity/EthnicityEntryFields.tsx @@ -1,9 +1,10 @@ import { useEffect } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; import { MultiSelect, SingleSelect } from 'design-system/select'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { validateRequiredRule } from 'validation/entry'; import { EthnicityEntry } from './entry'; diff --git a/apps/modernization-ui/src/apps/patient/data/general/GeneralInformationEntryFields.spec.tsx b/apps/modernization-ui/src/apps/patient/data/general/GeneralInformationEntryFields.spec.tsx index 986e0f2000..3d51d1173c 100644 --- a/apps/modernization-ui/src/apps/patient/data/general/GeneralInformationEntryFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/data/general/GeneralInformationEntryFields.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ExtendedNewPatientEntry } from 'apps/patient/add/extended'; import { FormProvider, useForm } from 'react-hook-form'; +import { ExtendedNewPatientEntry } from 'apps/patient/add/extended'; + import { GeneralInformationEntryFields } from './GeneralInformationEntryFields'; import { GeneralCodedValues } from './useGeneralCodedValues'; diff --git a/apps/modernization-ui/src/apps/patient/data/general/GeneralInformationEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/general/GeneralInformationEntryFields.tsx index 5feac8c667..90e0d995cc 100644 --- a/apps/modernization-ui/src/apps/patient/data/general/GeneralInformationEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/general/GeneralInformationEntryFields.tsx @@ -1,10 +1,11 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { Input } from 'components/FormInputs/Input'; import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; import { NumericInput } from 'design-system/input'; import { SingleSelect } from 'design-system/select'; import { Permitted } from 'libs/permission'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule, numericRangeRule, validateRequiredRule } from 'validation/entry'; import { GeneralInformationEntry } from '../entry'; diff --git a/apps/modernization-ui/src/apps/patient/data/identification/IdentificationEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/identification/IdentificationEntryFields.tsx index 7401319700..ddf0f7a6f3 100644 --- a/apps/modernization-ui/src/apps/patient/data/identification/IdentificationEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/identification/IdentificationEntryFields.tsx @@ -1,8 +1,9 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { Input } from 'components/FormInputs/Input'; import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; import { SingleSelect } from 'design-system/select'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule, validateRequiredRule } from 'validation/entry'; import { IdentificationEntry } from './entry'; diff --git a/apps/modernization-ui/src/apps/patient/data/mortality/MortalityEntryFields.spec.tsx b/apps/modernization-ui/src/apps/patient/data/mortality/MortalityEntryFields.spec.tsx index 6e823bf660..a3ce8fcead 100644 --- a/apps/modernization-ui/src/apps/patient/data/mortality/MortalityEntryFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/data/mortality/MortalityEntryFields.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { FormProvider, useForm } from 'react-hook-form'; + import { ExtendedNewPatientEntry } from 'apps/patient/add/extended'; import { internalizeDate } from 'date'; -import { FormProvider, useForm } from 'react-hook-form'; import { MortalityEntryFields } from './MortalityEntryFields'; diff --git a/apps/modernization-ui/src/apps/patient/data/mortality/MortalityEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/mortality/MortalityEntryFields.tsx index f26d3f6c7c..7b2eb5cc72 100644 --- a/apps/modernization-ui/src/apps/patient/data/mortality/MortalityEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/mortality/MortalityEntryFields.tsx @@ -1,5 +1,7 @@ import { useEffect } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { MortalityEntry } from 'apps/patient/data/entry'; import { Input } from 'components/FormInputs/Input'; import { DatePickerInput, validDateRule } from 'design-system/date'; @@ -7,7 +9,6 @@ import { EntryFieldsProps } from 'design-system/entry'; import { SingleSelect } from 'design-system/select'; import { indicators } from 'options/indicator'; import { useLocationOptions } from 'options/location'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule, validateRequiredRule } from 'validation/entry'; const AS_OF_DATE_LABEL = 'Mortality information as of'; diff --git a/apps/modernization-ui/src/apps/patient/data/name/NameEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/name/NameEntryFields.tsx index b0878cab0d..5decec4133 100644 --- a/apps/modernization-ui/src/apps/patient/data/name/NameEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/name/NameEntryFields.tsx @@ -1,8 +1,9 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { Input } from 'components/FormInputs/Input'; import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; import { SingleSelect } from 'design-system/select'; -import { Controller, useFormContext } from 'react-hook-form'; import { validateExtendedNameRule, validateRequiredRule } from 'validation/entry/'; import { NameEntry } from './entry'; diff --git a/apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.tsx index 04f93830bc..a0a721c299 100644 --- a/apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.tsx @@ -1,3 +1,5 @@ +import { Controller, useFormContext } from 'react-hook-form'; + import { PhoneEmailEntry } from 'apps/patient/data'; import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; @@ -6,7 +8,6 @@ import { TextAreaField } from 'design-system/input/text/TextAreaField'; import { SingleSelect } from 'design-system/select'; import { EmailField, maybeValidateEmail, PhoneNumberInputField, validPhoneNumberRule } from 'libs/demographics/contact'; import { Verification } from 'libs/verification'; -import { Controller, useFormContext } from 'react-hook-form'; import { maxLengthRule, validateRequiredRule } from 'validation/entry'; import { usePhoneCodedValues } from './usePhoneCodedValues'; diff --git a/apps/modernization-ui/src/apps/patient/data/race/RaceEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/race/RaceEntryFields.tsx index 306cdb741c..df5971d8e1 100644 --- a/apps/modernization-ui/src/apps/patient/data/race/RaceEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/race/RaceEntryFields.tsx @@ -1,11 +1,12 @@ import { useEffect } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; import { MultiSelect, SingleSelect } from 'design-system/select'; import { Selectable } from 'options'; import { useDetailedRaceOptions } from 'options/race'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { validateRequiredRule } from 'validation/entry'; import { RaceCategoryValidator, RaceEntry } from './entry'; diff --git a/apps/modernization-ui/src/apps/patient/data/sexAndBirth/SexAndBirthEntryFields.spec.tsx b/apps/modernization-ui/src/apps/patient/data/sexAndBirth/SexAndBirthEntryFields.spec.tsx index 550bedce1d..10bc1c30e5 100644 --- a/apps/modernization-ui/src/apps/patient/data/sexAndBirth/SexAndBirthEntryFields.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/data/sexAndBirth/SexAndBirthEntryFields.spec.tsx @@ -1,8 +1,9 @@ import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { ExtendedNewPatientEntry } from 'apps/patient/add/extended'; import { FormProvider, useForm } from 'react-hook-form'; +import { ExtendedNewPatientEntry } from 'apps/patient/add/extended'; + import { SexAndBirthEntryFields } from './SexAndBirthEntryFields'; import { SexBirthCodedValues } from './useSexBirthCodedValues'; diff --git a/apps/modernization-ui/src/apps/patient/data/sexAndBirth/SexAndBirthEntryFields.tsx b/apps/modernization-ui/src/apps/patient/data/sexAndBirth/SexAndBirthEntryFields.tsx index c50865334b..aa9f263697 100644 --- a/apps/modernization-ui/src/apps/patient/data/sexAndBirth/SexAndBirthEntryFields.tsx +++ b/apps/modernization-ui/src/apps/patient/data/sexAndBirth/SexAndBirthEntryFields.tsx @@ -1,5 +1,7 @@ import { useEffect, useMemo } from 'react'; +import { Controller, useFormContext, useWatch } from 'react-hook-form'; + import { BirthEntry, MortalityEntry, SexEntry } from 'apps/patient/data/entry'; import { Input } from 'components/FormInputs/Input'; import { displayAgeAsOf, displayAgeAsOfToday } from 'date'; @@ -8,7 +10,6 @@ import { DatePickerInput, validDateRule } from 'design-system/date'; import { EntryFieldsProps } from 'design-system/entry'; import { SingleSelect } from 'design-system/select'; import { useLocationOptions } from 'options/location'; -import { Controller, useFormContext, useWatch } from 'react-hook-form'; import { maxLengthRule, validateRequiredRule } from 'validation/entry'; import { useSexBirthCodedValues } from './useSexBirthCodedValues'; diff --git a/apps/modernization-ui/src/apps/patient/file/PatientFile.tsx b/apps/modernization-ui/src/apps/patient/file/PatientFile.tsx index 98343ba5a8..8b2f1efe3b 100644 --- a/apps/modernization-ui/src/apps/patient/file/PatientFile.tsx +++ b/apps/modernization-ui/src/apps/patient/file/PatientFile.tsx @@ -1,6 +1,7 @@ +import { Outlet, useLoaderData } from 'react-router'; + import { ComponentSizingProvider } from 'design-system/sizing'; import { PageTitle } from 'page'; -import { Outlet, useLoaderData } from 'react-router'; import { PatientFileData, PatientFileProvider } from './usePatientFileData'; diff --git a/apps/modernization-ui/src/apps/patient/file/PatientFileLayout.spec.tsx b/apps/modernization-ui/src/apps/patient/file/PatientFileLayout.spec.tsx index e10c4e7a2c..2932dc7248 100644 --- a/apps/modernization-ui/src/apps/patient/file/PatientFileLayout.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/file/PatientFileLayout.spec.tsx @@ -1,4 +1,5 @@ import { render, screen } from '@testing-library/react'; + import { SkipLinkProvider } from 'SkipLink'; import { PatientFileLayout } from './PatientFileLayout'; diff --git a/apps/modernization-ui/src/apps/patient/file/PatientFileRouting.tsx b/apps/modernization-ui/src/apps/patient/file/PatientFileRouting.tsx index 1044dd2a10..b6a91d8011 100644 --- a/apps/modernization-ui/src/apps/patient/file/PatientFileRouting.tsx +++ b/apps/modernization-ui/src/apps/patient/file/PatientFileRouting.tsx @@ -1,4 +1,5 @@ import { Navigate, RouteObject } from 'react-router'; + import { RedirectHome } from 'routes'; const routing: RouteObject[] = [ diff --git a/apps/modernization-ui/src/apps/patient/file/PatientFileView.tsx b/apps/modernization-ui/src/apps/patient/file/PatientFileView.tsx index c89c338b96..809ac3ce4e 100644 --- a/apps/modernization-ui/src/apps/patient/file/PatientFileView.tsx +++ b/apps/modernization-ui/src/apps/patient/file/PatientFileView.tsx @@ -1,12 +1,13 @@ import { ReactNode } from 'react'; +import { useLocation } from 'react-router'; + import { TabNavigation, TabNavigationEntry } from 'components/TabNavigation/TabNavigation'; import { Shown } from 'conditional-render'; import { Button, NavLinkButton } from 'design-system/button'; import { Sizing } from 'design-system/field'; import { BackToTop } from 'libs/page/back-to-top'; import { permissions, Permitted } from 'libs/permission'; -import { useLocation } from 'react-router'; import { PatientFileLayout } from './PatientFileLayout'; import { DeleteAction } from './delete'; diff --git a/apps/modernization-ui/src/apps/patient/file/delete/DeleteAction.spec.tsx b/apps/modernization-ui/src/apps/patient/file/delete/DeleteAction.spec.tsx index c02117e1c4..22af69c7dd 100644 --- a/apps/modernization-ui/src/apps/patient/file/delete/DeleteAction.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/file/delete/DeleteAction.spec.tsx @@ -2,9 +2,10 @@ import { ReactNode } from 'react'; import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { Permitted } from 'libs/permission'; import { Mock } from 'vitest'; +import { Permitted } from 'libs/permission'; + import { DeleteAction } from './DeleteAction'; import { useDeletePatient } from './useDeletePatient'; diff --git a/apps/modernization-ui/src/apps/patient/file/delete/useDeletePatient.spec.ts b/apps/modernization-ui/src/apps/patient/file/delete/useDeletePatient.spec.ts index 2f31856aee..09840091de 100644 --- a/apps/modernization-ui/src/apps/patient/file/delete/useDeletePatient.spec.ts +++ b/apps/modernization-ui/src/apps/patient/file/delete/useDeletePatient.spec.ts @@ -1,7 +1,8 @@ import { renderHook } from '@testing-library/react'; -import { PatientFileService } from 'generated'; import { Mock } from 'vitest'; +import { PatientFileService } from 'generated'; + import { useDeletePatient } from './useDeletePatient'; vi.mock('generated', () => ({ diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/address/PatientFileAddressCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/address/PatientFileAddressCard.tsx index ca887ecb46..9818fb6c81 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/address/PatientFileAddressCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/address/PatientFileAddressCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { AddressDemographic, @@ -7,7 +9,6 @@ import { AddressDemographicCardProps, } from 'libs/patient/demographics/address'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFileAddressProps = { provider: MemoizedSupplier>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/administrative/PatientFileAdministrativeInformationCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/administrative/PatientFileAdministrativeInformationCard.tsx index 1173704c89..506dd7b0eb 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/administrative/PatientFileAdministrativeInformationCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/administrative/PatientFileAdministrativeInformationCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { AdministrativeInformation, @@ -7,7 +9,6 @@ import { AdministrativeInformationCardProps, } from 'libs/patient/demographics/administrative'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFileAdministrativeInformationCardProps = { provider: MemoizedSupplier>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/ethnicity/PatientFileEthnicityCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/ethnicity/PatientFileEthnicityCard.tsx index 97fd3a27e4..eb4de2122d 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/ethnicity/PatientFileEthnicityCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/ethnicity/PatientFileEthnicityCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { EthnicityDemographic, @@ -7,7 +9,6 @@ import { EthnicityDemographicCardProps, } from 'libs/patient/demographics/ethnicity'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFileEthnicityCardType = { provider: MemoizedSupplier>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/general/PatientFileGeneralInformationCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/general/PatientFileGeneralInformationCard.tsx index ed5a55dfde..855a249801 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/general/PatientFileGeneralInformationCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/general/PatientFileGeneralInformationCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { GeneralInformationDemographic, @@ -7,7 +9,6 @@ import { GeneralInformationDemographicCardProps, } from 'libs/patient/demographics/general'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFileGeneralCardProps = { provider: MemoizedSupplier>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/identification/PatientFileIdentificationCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/identification/PatientFileIdentificationCard.tsx index 7b004b48fd..8bccb3ca24 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/identification/PatientFileIdentificationCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/identification/PatientFileIdentificationCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { IdentificationDemographic, @@ -7,7 +9,6 @@ import { IdentificationDemographicCardProps, } from 'libs/patient/demographics/identification'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFileIdentificationProps = { provider: MemoizedSupplier>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/mortality/PatientFileMortalityCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/mortality/PatientFileMortalityCard.tsx index e882784082..51a686597a 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/mortality/PatientFileMortalityCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/mortality/PatientFileMortalityCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { MortalityDemographic, @@ -7,7 +9,6 @@ import { MortalityDemographicCardProps, } from 'libs/patient/demographics/mortality'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFileMortalityCardProps = { provider: MemoizedSupplier>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/name/PatientFileNameCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/name/PatientFileNameCard.tsx index 4e29b403a6..66ae48a8ac 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/name/PatientFileNameCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/name/PatientFileNameCard.tsx @@ -1,9 +1,10 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { NameDemographic, NameDemographicCard, NameDemographicCardProps } from 'libs/patient/demographics/name'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFileNameCardProps = { provider: MemoizedSupplier>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/phoneEmail/PatientFilePhoneEmailCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/phoneEmail/PatientFilePhoneEmailCard.tsx index a43a5164db..8a20206299 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/phoneEmail/PatientFilePhoneEmailCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/phoneEmail/PatientFilePhoneEmailCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { PhoneEmailDemographic, @@ -7,7 +9,6 @@ import { PhoneEmailDemographicCardProps, } from 'libs/patient/demographics/phoneEmail'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFilePhoneEmailProps = { provider: MemoizedSupplier>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/race/PatientFileRaceCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/race/PatientFileRaceCard.tsx index e43f286f51..9c693d0163 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/race/PatientFileRaceCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/race/PatientFileRaceCard.tsx @@ -1,9 +1,10 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { RaceDemographic, RaceDemographicCard, RaceDemographicCardProps } from 'libs/patient/demographics/race'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; type PatientFileRaceProps = { provider: MemoizedSupplier>>; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/sex-birth/PatientFileSexBirthCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/sex-birth/PatientFileSexBirthCard.tsx index 250dd7516e..c9acba6274 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/sex-birth/PatientFileSexBirthCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/sex-birth/PatientFileSexBirthCard.tsx @@ -1,9 +1,10 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { SexBirthDemographicCard, SexBirthDemographicCardProps } from 'libs/patient/demographics/sex-birth'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import { PatientFileSexBirthDemographic } from './PatientFileSexBirthDemographic'; diff --git a/apps/modernization-ui/src/apps/patient/file/demographics/summary/PatientFileDemographicsSummaryCard.tsx b/apps/modernization-ui/src/apps/patient/file/demographics/summary/PatientFileDemographicsSummaryCard.tsx index 1efd48d025..96d7ab0b84 100644 --- a/apps/modernization-ui/src/apps/patient/file/demographics/summary/PatientFileDemographicsSummaryCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/demographics/summary/PatientFileDemographicsSummaryCard.tsx @@ -1,8 +1,9 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { LoadingOverlay } from 'libs/loading'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import { PatientDemographicsSummaryCard, PatientDemographicsSummaryCardProps } from './PatientDemographicsSummaryCard'; import { PatientFileDemographicsSummary } from './summary'; diff --git a/apps/modernization-ui/src/apps/patient/file/edit/PatientFileEdit.tsx b/apps/modernization-ui/src/apps/patient/file/edit/PatientFileEdit.tsx index 4da4278b24..8682dd21a5 100644 --- a/apps/modernization-ui/src/apps/patient/file/edit/PatientFileEdit.tsx +++ b/apps/modernization-ui/src/apps/patient/file/edit/PatientFileEdit.tsx @@ -1,5 +1,8 @@ import { useCallback, useEffect, useState } from 'react'; +import { useForm } from 'react-hook-form'; +import { useLocation, useNavigate } from 'react-router'; + import { useAlert } from 'alert'; import { TabNavigation, TabNavigationEntry } from 'components/TabNavigation/TabNavigation'; import { Shown } from 'conditional-render'; @@ -15,8 +18,6 @@ import { } from 'libs/patient/demographics'; import { defaultTo } from 'libs/supplying'; import { maybeDisplayName } from 'name'; -import { useForm } from 'react-hook-form'; -import { useLocation, useNavigate } from 'react-router'; import { exists } from 'utils/exists'; import { PatientFileLayout } from '../PatientFileLayout'; diff --git a/apps/modernization-ui/src/apps/patient/file/events/contacts/ContactsCard.tsx b/apps/modernization-ui/src/apps/patient/file/events/contacts/ContactsCard.tsx index 278d58282f..cb6f600c28 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/contacts/ContactsCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/events/contacts/ContactsCard.tsx @@ -1,5 +1,7 @@ import { Suspense, useState } from 'react'; +import { Await, NavLink } from 'react-router'; + import { Shown } from 'conditional-render'; import { internalizeDate, internalizeDateTime } from 'date'; import { Card, TableCardProps } from 'design-system/card'; @@ -15,7 +17,6 @@ import { AssociatedWith } from 'libs/events/investigations/associated'; import { LoadingOverlay } from 'libs/loading'; import { MemoizedSupplier } from 'libs/supplying'; import { maybeDisplayName } from 'name'; -import { Await, NavLink } from 'react-router'; import { exists } from 'utils'; import { maybeMap } from 'utils/mapping'; diff --git a/apps/modernization-ui/src/apps/patient/file/events/documents/PatientFileDocumentsCard.tsx b/apps/modernization-ui/src/apps/patient/file/events/documents/PatientFileDocumentsCard.tsx index 2e22a3acdf..c51bb1d7f4 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/documents/PatientFileDocumentsCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/events/documents/PatientFileDocumentsCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { internalizeDate, internalizeDateTime } from 'date'; import { TableCard, TableCardProps } from 'design-system/card'; import { Column } from 'design-system/table'; @@ -7,7 +9,6 @@ import { ColumnPreference } from 'design-system/table/preferences'; import { Associations } from 'libs/events/investigations/associated'; import { LoadingOverlay } from 'libs/loading'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import styles from './document-card.module.scss'; import { PatientFileDocument } from './documents'; diff --git a/apps/modernization-ui/src/apps/patient/file/events/investigations/PatientFileInvestigationsCard.tsx b/apps/modernization-ui/src/apps/patient/file/events/investigations/PatientFileInvestigationsCard.tsx index a6848d936a..4b942bc95b 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/investigations/PatientFileInvestigationsCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/events/investigations/PatientFileInvestigationsCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { Shown } from 'conditional-render'; import { LinkButton } from 'design-system/button'; import { TableCard, TableCardProps } from 'design-system/card'; @@ -12,7 +14,6 @@ import { displayInvestigator, displayNotificationStatus, displayStatus } from 'l import { LoadingOverlay } from 'libs/loading'; import { permissions, Permitted } from 'libs/permission'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import { either, not } from 'utils/predicate'; import { PatientFileInvestigation } from './investigation'; diff --git a/apps/modernization-ui/src/apps/patient/file/events/record/birth/PatientFileBirthRecordCard.tsx b/apps/modernization-ui/src/apps/patient/file/events/record/birth/PatientFileBirthRecordCard.tsx index 1dee67ae7d..d0c5d03aeb 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/record/birth/PatientFileBirthRecordCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/events/record/birth/PatientFileBirthRecordCard.tsx @@ -1,5 +1,7 @@ import { Suspense, useState } from 'react'; +import { Await } from 'react-router'; + import { internalizeDateTime } from 'date'; import { TableCard, TableCardProps } from 'design-system/card'; import { Column } from 'design-system/table'; @@ -9,7 +11,6 @@ import { Associations } from 'libs/events/investigations/associated'; import { LoadingOverlay } from 'libs/loading'; import { permissions, Permitted } from 'libs/permission'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import { PatientFileBirthRecord } from './birth-record'; import { maybeDisplayMotherInformation } from './displayMotherInformation'; diff --git a/apps/modernization-ui/src/apps/patient/file/events/reports/laboratory/PatientFileLaboratoryReportsCard.tsx b/apps/modernization-ui/src/apps/patient/file/events/reports/laboratory/PatientFileLaboratoryReportsCard.tsx index 5e0d1ed9a2..a8173c944e 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/reports/laboratory/PatientFileLaboratoryReportsCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/events/reports/laboratory/PatientFileLaboratoryReportsCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { Shown } from 'conditional-render'; import { internalizeDateTime } from 'date'; import { LinkButton } from 'design-system/button'; @@ -13,7 +15,6 @@ import { LoadingOverlay } from 'libs/loading'; import { permissions, Permitted } from 'libs/permission'; import { displayProvider } from 'libs/provider'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import styles from './lab-reports.module.scss'; import { PatientFileLaboratoryReport } from './laboratory-report'; diff --git a/apps/modernization-ui/src/apps/patient/file/events/reports/morbidity/PatientFileMorbidityReportsCard.tsx b/apps/modernization-ui/src/apps/patient/file/events/reports/morbidity/PatientFileMorbidityReportsCard.tsx index 832df854bd..b59d41fb44 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/reports/morbidity/PatientFileMorbidityReportsCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/events/reports/morbidity/PatientFileMorbidityReportsCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { Shown } from 'conditional-render'; import { internalizeDateTime } from 'date'; import { LinkButton } from 'design-system/button'; @@ -14,7 +16,6 @@ import { LoadingOverlay } from 'libs/loading'; import { permissions, Permitted } from 'libs/permission'; import { displayProvider } from 'libs/provider'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import { PatientFileMorbidityReport } from './morbidity-report'; import styles from './morbidity-reports.module.scss'; diff --git a/apps/modernization-ui/src/apps/patient/file/events/treatments/PatientFileTreatmentsCard.tsx b/apps/modernization-ui/src/apps/patient/file/events/treatments/PatientFileTreatmentsCard.tsx index 9dfb75952e..046418b08f 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/treatments/PatientFileTreatmentsCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/events/treatments/PatientFileTreatmentsCard.tsx @@ -1,5 +1,7 @@ import { Suspense, useState } from 'react'; +import { Await } from 'react-router'; + import { internalizeDateTime } from 'date'; import { TableCard, TableCardProps } from 'design-system/card'; import { Column } from 'design-system/table'; @@ -9,7 +11,6 @@ import { Associations } from 'libs/events/investigations/associated'; import { LoadingOverlay } from 'libs/loading'; import { displayProvider } from 'libs/provider'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import styles from './treatments.module.scss'; diff --git a/apps/modernization-ui/src/apps/patient/file/events/vaccinations/PatientFileVaccinationsCard.tsx b/apps/modernization-ui/src/apps/patient/file/events/vaccinations/PatientFileVaccinationsCard.tsx index 1acfa596da..396485f00c 100644 --- a/apps/modernization-ui/src/apps/patient/file/events/vaccinations/PatientFileVaccinationsCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/events/vaccinations/PatientFileVaccinationsCard.tsx @@ -1,5 +1,7 @@ import { Suspense, useState } from 'react'; +import { Await } from 'react-router'; + import { Shown } from 'conditional-render'; import { internalizeDate, internalizeDateTime } from 'date'; import { TableCard, TableCardProps } from 'design-system/card'; @@ -13,7 +15,6 @@ import { LoadingOverlay } from 'libs/loading'; import { permissions, Permitted } from 'libs/permission'; import { displayProvider } from 'libs/provider'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import { exists } from 'utils'; import styles from './patient-file-vaccinations.module.scss'; diff --git a/apps/modernization-ui/src/apps/patient/file/loader.ts b/apps/modernization-ui/src/apps/patient/file/loader.ts index d742eb7ca9..4df1f2b9f0 100644 --- a/apps/modernization-ui/src/apps/patient/file/loader.ts +++ b/apps/modernization-ui/src/apps/patient/file/loader.ts @@ -1,6 +1,7 @@ -import { MemoizedSupplier } from 'libs/supplying'; import { Params } from 'react-router'; +import { MemoizedSupplier } from 'libs/supplying'; + import { demographics } from './demographics'; import { description } from './description'; import { events } from './events'; diff --git a/apps/modernization-ui/src/apps/patient/file/summary/documentRequiringReview/PatientDocumentRequiringReviewCard.tsx b/apps/modernization-ui/src/apps/patient/file/summary/documentRequiringReview/PatientDocumentRequiringReviewCard.tsx index ac1ec3a4a0..b917321150 100644 --- a/apps/modernization-ui/src/apps/patient/file/summary/documentRequiringReview/PatientDocumentRequiringReviewCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/summary/documentRequiringReview/PatientDocumentRequiringReviewCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { Shown } from 'conditional-render'; import { internalizeDate } from 'date'; import { internalizeDateTime } from 'date/InternalizeDateTime'; @@ -14,7 +16,6 @@ import { MaybeLabeledValue } from 'design-system/value'; import { ResultedTests } from 'libs/events/tests'; import { LoadingOverlay } from 'libs/loading'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import { renderFacilityProvider, renderMorbidity } from '../../renderPatientFile'; diff --git a/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/MergeAlert.tsx b/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/MergeAlert.tsx index 40b9fbfa97..b8a1e15f7e 100644 --- a/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/MergeAlert.tsx +++ b/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/MergeAlert.tsx @@ -1,7 +1,8 @@ +import { useNavigate } from 'react-router'; + import { AlertMessage } from 'design-system/message'; import { FeatureToggle } from 'feature'; import { permissions, Permitted } from 'libs/permission'; -import { useNavigate } from 'react-router'; import { usePatientMergeQueueStatus } from './api/usePatientMergeQueueStatus'; diff --git a/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/PatientMergeHistoryCard.spec.tsx b/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/PatientMergeHistoryCard.spec.tsx index 13335b767c..02dd5f0a1b 100644 --- a/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/PatientMergeHistoryCard.spec.tsx +++ b/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/PatientMergeHistoryCard.spec.tsx @@ -1,7 +1,8 @@ import { render, screen } from '@testing-library/react'; -import { MemoizedSupplier } from 'libs/supplying'; import { MemoryRouter } from 'react-router'; +import { MemoizedSupplier } from 'libs/supplying'; + import { PatientMergeHistoryCard } from './PatientMergeHistoryCard'; import type { PatientFileMergeHistory } from './model/mergeHistory'; diff --git a/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/PatientMergeHistoryCard.tsx b/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/PatientMergeHistoryCard.tsx index a45f7dd48f..51b601e7f1 100644 --- a/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/PatientMergeHistoryCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/summary/mergeHistory/PatientMergeHistoryCard.tsx @@ -1,6 +1,8 @@ import { Suspense, useMemo } from 'react'; import { format } from 'date-fns'; +import { Await } from 'react-router'; + import { Card } from 'design-system/card'; import { Section } from 'design-system/card/section/Section'; import { Column, SortableDataTable } from 'design-system/table'; @@ -8,7 +10,6 @@ import { Tag } from 'design-system/tag'; import { permissions, Permitted } from 'libs/permission'; import { MemoizedSupplier } from 'libs/supplying'; import { displayName } from 'name/displayName'; -import { Await } from 'react-router'; import { Patient } from '../../patient'; diff --git a/apps/modernization-ui/src/apps/patient/file/summary/openInvestigations/PatientFileOpenInvestigationsCard.tsx b/apps/modernization-ui/src/apps/patient/file/summary/openInvestigations/PatientFileOpenInvestigationsCard.tsx index beae41795b..2660b7a73b 100644 --- a/apps/modernization-ui/src/apps/patient/file/summary/openInvestigations/PatientFileOpenInvestigationsCard.tsx +++ b/apps/modernization-ui/src/apps/patient/file/summary/openInvestigations/PatientFileOpenInvestigationsCard.tsx @@ -1,5 +1,7 @@ import { Suspense } from 'react'; +import { Await } from 'react-router'; + import { TableCard } from 'design-system/card'; import { TableCardProps } from 'design-system/card/table/TableCard'; import { Column } from 'design-system/table'; @@ -7,7 +9,6 @@ import { ColumnPreference } from 'design-system/table/preferences'; import { displayInvestigator, displayNotificationStatus } from 'libs/events/investigations'; import { LoadingOverlay } from 'libs/loading'; import { MemoizedSupplier } from 'libs/supplying'; -import { Await } from 'react-router'; import styles from './open-investigations.module.scss'; import { PatientFileOpenInvestigation } from './openInvestigation'; diff --git a/apps/modernization-ui/src/apps/report/ReportRouting.tsx b/apps/modernization-ui/src/apps/report/ReportRouting.tsx index 016cd558cb..201fec5cca 100644 --- a/apps/modernization-ui/src/apps/report/ReportRouting.tsx +++ b/apps/modernization-ui/src/apps/report/ReportRouting.tsx @@ -1,9 +1,10 @@ +import { RouteObject } from 'react-router'; + import { FeatureLayout } from 'feature'; import { LoadingBlock } from 'libs/loading/block'; import { permissions, permitsAny, Permitted } from 'libs/permission'; import { PermittedLayout } from 'libs/permission/PermittedLayout'; import { ErrorPage } from 'pages/error'; -import { RouteObject } from 'react-router'; import { RedirectHome } from 'routes'; import { ReportRunPage } from './run'; diff --git a/apps/modernization-ui/src/apps/report/management/configuration/AddReportConfiguration.spec.tsx b/apps/modernization-ui/src/apps/report/management/configuration/AddReportConfiguration.spec.tsx index fe753eba7f..d5c9d7923e 100644 --- a/apps/modernization-ui/src/apps/report/management/configuration/AddReportConfiguration.spec.tsx +++ b/apps/modernization-ui/src/apps/report/management/configuration/AddReportConfiguration.spec.tsx @@ -2,10 +2,11 @@ import { ReactNode } from 'react'; import { render, screen, waitFor, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { createMemoryRouter, RouterProvider, useNavigate } from 'react-router'; + import * as generated from 'generated'; import { Layout } from 'layout'; import * as options from 'options/selectableResolver'; -import { createMemoryRouter, RouterProvider, useNavigate } from 'react-router'; import { AddReportConfiguration } from './AddReportConfiguration'; diff --git a/apps/modernization-ui/src/apps/report/management/configuration/AddReportConfiguration.tsx b/apps/modernization-ui/src/apps/report/management/configuration/AddReportConfiguration.tsx index 28a2d91a2c..79248960b5 100644 --- a/apps/modernization-ui/src/apps/report/management/configuration/AddReportConfiguration.tsx +++ b/apps/modernization-ui/src/apps/report/management/configuration/AddReportConfiguration.tsx @@ -1,12 +1,13 @@ import { useState } from 'react'; +import { FormProvider, useForm } from 'react-hook-form'; +import { useNavigate } from 'react-router'; + import { ReportLayout } from 'apps/report/layout/ReportLayout'; import styles from 'apps/report/layout/layout.module.scss'; import { Button, LinkButton } from 'design-system/button'; import { ApiErrorBanner } from 'design-system/errors/ApiError'; import { ReportControllerService } from 'generated'; -import { FormProvider, useForm } from 'react-hook-form'; -import { useNavigate } from 'react-router'; import { ConfigForm, formToRequest, ReportConfigurationContent } from './ReportConfigurationContent'; import { NBS_LIST_REPORT_CONFIG_PAGE } from './constants'; diff --git a/apps/modernization-ui/src/apps/report/management/configuration/EditReportConfiguration.spec.tsx b/apps/modernization-ui/src/apps/report/management/configuration/EditReportConfiguration.spec.tsx index f3cb32af50..0372ea1c39 100644 --- a/apps/modernization-ui/src/apps/report/management/configuration/EditReportConfiguration.spec.tsx +++ b/apps/modernization-ui/src/apps/report/management/configuration/EditReportConfiguration.spec.tsx @@ -2,11 +2,12 @@ import { ReactNode } from 'react'; import { render, waitFor, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { createMemoryRouter, RouterProvider, useLoaderData, useNavigate } from 'react-router'; + import * as generated from 'generated'; import { Layout } from 'layout'; import { LoadingBlock } from 'libs/loading/block'; import * as options from 'options/selectableResolver'; -import { createMemoryRouter, RouterProvider, useLoaderData, useNavigate } from 'react-router'; import { EditReportConfiguration } from './EditReportConfiguration'; diff --git a/apps/modernization-ui/src/apps/report/management/configuration/EditReportConfiguration.tsx b/apps/modernization-ui/src/apps/report/management/configuration/EditReportConfiguration.tsx index b743eae8c8..153919ce9e 100644 --- a/apps/modernization-ui/src/apps/report/management/configuration/EditReportConfiguration.tsx +++ b/apps/modernization-ui/src/apps/report/management/configuration/EditReportConfiguration.tsx @@ -1,13 +1,14 @@ import { useState } from 'react'; +import { FormProvider, useForm } from 'react-hook-form'; +import { useLoaderData, useNavigate, useParams } from 'react-router'; + import { ReportLayout } from 'apps/report/layout/ReportLayout'; import styles from 'apps/report/layout/layout.module.scss'; import { Button, NavLinkButton } from 'design-system/button'; import { ApiErrorBanner } from 'design-system/errors/ApiError'; import { ReportConfiguration, ReportControllerService } from 'generated'; import { LoadingBlock } from 'libs/loading/block'; -import { FormProvider, useForm } from 'react-hook-form'; -import { useLoaderData, useNavigate, useParams } from 'react-router'; import { ConfigForm, formToRequest, ReportConfigurationContent } from './ReportConfigurationContent'; diff --git a/apps/modernization-ui/src/apps/report/management/configuration/FilterRepeatingBlock.tsx b/apps/modernization-ui/src/apps/report/management/configuration/FilterRepeatingBlock.tsx index 55830ea617..bd3ae0e2c5 100644 --- a/apps/modernization-ui/src/apps/report/management/configuration/FilterRepeatingBlock.tsx +++ b/apps/modernization-ui/src/apps/report/management/configuration/FilterRepeatingBlock.tsx @@ -1,5 +1,7 @@ import { useEffect, useState } from 'react'; +import { Controller, useWatch } from 'react-hook-form'; + import { Shown } from 'conditional-render'; import { RepeatingBlock } from 'design-system/entry/multi-value'; import { ValueField } from 'design-system/field'; @@ -11,7 +13,6 @@ import { LoadingIndicator } from 'libs/loading/indicator'; import { Selectable } from 'options'; import { useReportFilters } from 'options/report'; import { useReportDataSourceFilterableColumnOptions } from 'options/report/useReportDataSourceColumnOptions'; -import { Controller, useWatch } from 'react-hook-form'; import { validateRequiredRule } from 'validation/entry'; import { SIZING } from '../../constants'; diff --git a/apps/modernization-ui/src/apps/report/management/configuration/ReportConfigurationContent.tsx b/apps/modernization-ui/src/apps/report/management/configuration/ReportConfigurationContent.tsx index f306fd6cc0..51320fafc3 100644 --- a/apps/modernization-ui/src/apps/report/management/configuration/ReportConfigurationContent.tsx +++ b/apps/modernization-ui/src/apps/report/management/configuration/ReportConfigurationContent.tsx @@ -1,6 +1,9 @@ import { ReactNode, useId, useRef, useState } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; +import { ReactComponentLike } from 'prop-types'; +import { Controller, useFormState, useWatch } from 'react-hook-form'; + import { Shown } from 'conditional-render'; import { ConfirmationModal } from 'confirmation'; import { Button } from 'design-system/button'; @@ -20,8 +23,6 @@ import { AdminReportRequest, ReportConfiguration } from 'generated'; import { Selectable } from 'options'; import { useReportDataSources, useReportLibraries, useReportSections } from 'options/report'; import { useUserOptions } from 'options/users'; -import { ReactComponentLike } from 'prop-types'; -import { Controller, useFormState, useWatch } from 'react-hook-form'; import { validateRequiredRule } from 'validation/entry'; import { GROUP_OPTIONS, SIZING } from '../../constants.ts'; diff --git a/apps/modernization-ui/src/apps/report/management/configuration/ViewReportConfiguration.spec.tsx b/apps/modernization-ui/src/apps/report/management/configuration/ViewReportConfiguration.spec.tsx index 80075cbdc6..06c4bc9899 100644 --- a/apps/modernization-ui/src/apps/report/management/configuration/ViewReportConfiguration.spec.tsx +++ b/apps/modernization-ui/src/apps/report/management/configuration/ViewReportConfiguration.spec.tsx @@ -2,11 +2,12 @@ import { ReactNode } from 'react'; import { render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { createMemoryRouter, RouterProvider, useLoaderData } from 'react-router'; + import * as generated from 'generated'; import { Layout } from 'layout'; import { LoadingBlock } from 'libs/loading/block'; import * as options from 'options/selectableResolver'; -import { createMemoryRouter, RouterProvider, useLoaderData } from 'react-router'; import { ViewReportConfiguration } from './ViewReportConfiguration'; diff --git a/apps/modernization-ui/src/apps/report/management/configuration/ViewReportConfiguration.tsx b/apps/modernization-ui/src/apps/report/management/configuration/ViewReportConfiguration.tsx index 618975a87a..3f1ef2b11e 100644 --- a/apps/modernization-ui/src/apps/report/management/configuration/ViewReportConfiguration.tsx +++ b/apps/modernization-ui/src/apps/report/management/configuration/ViewReportConfiguration.tsx @@ -1,6 +1,8 @@ import { useRef, useState } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; +import { useLoaderData, useParams } from 'react-router'; + import { ReportLayout } from 'apps/report/layout/ReportLayout'; import styles from 'apps/report/layout/layout.module.scss'; import { ConfirmationModal } from 'confirmation'; @@ -8,7 +10,6 @@ import { Button, NavLinkButton } from 'design-system/button'; import { ApiErrorBanner } from 'design-system/errors/ApiError'; import { ReportConfiguration, ReportControllerService } from 'generated'; import { LoadingBlock } from 'libs/loading/block'; -import { useLoaderData, useParams } from 'react-router'; import { redirectToNBS6 } from 'utils'; import { ReportConfigurationContent } from './ReportConfigurationContent'; diff --git a/apps/modernization-ui/src/apps/report/run/ReportConfigurationPage.tsx b/apps/modernization-ui/src/apps/report/run/ReportConfigurationPage.tsx index 81dae0778f..db1b3fcf2d 100644 --- a/apps/modernization-ui/src/apps/report/run/ReportConfigurationPage.tsx +++ b/apps/modernization-ui/src/apps/report/run/ReportConfigurationPage.tsx @@ -1,5 +1,7 @@ import { BaseSyntheticEvent, ReactNode } from 'react'; +import { FieldErrors, useFormState } from 'react-hook-form'; + import { FullPageBlock } from 'components/FullPageBlock'; import { Heading } from 'components/heading'; import { Button, NavLinkButton } from 'design-system/button'; @@ -10,7 +12,6 @@ import { InPageNavigation } from 'design-system/inPageNavigation'; import { ReportConfiguration } from 'generated'; import { permissions, Permitted } from 'libs/permission'; import { usePermissions } from 'libs/permission/usePermissions'; -import { FieldErrors, useFormState } from 'react-hook-form'; import { NBS_MANAGE_REPORT_PAGE } from '../constants'; import { ReportLayout } from '../layout/ReportLayout'; diff --git a/apps/modernization-ui/src/apps/report/run/ReportResultPage.spec.tsx b/apps/modernization-ui/src/apps/report/run/ReportResultPage.spec.tsx index e6986ecfdb..e590d08239 100644 --- a/apps/modernization-ui/src/apps/report/run/ReportResultPage.spec.tsx +++ b/apps/modernization-ui/src/apps/report/run/ReportResultPage.spec.tsx @@ -2,10 +2,11 @@ import { ReactNode } from 'react'; import { render, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import { axe } from 'jest-axe'; + import { SkipLinkProvider } from 'SkipLink/SkipLinkContext.tsx'; import * as generated from 'generated'; import { ReportConfiguration } from 'generated'; -import { axe } from 'jest-axe'; import { ReportResultPage } from './ReportResultPage.tsx'; diff --git a/apps/modernization-ui/src/apps/report/run/ReportResultPage.tsx b/apps/modernization-ui/src/apps/report/run/ReportResultPage.tsx index d6f92f1e94..e838639eef 100644 --- a/apps/modernization-ui/src/apps/report/run/ReportResultPage.tsx +++ b/apps/modernization-ui/src/apps/report/run/ReportResultPage.tsx @@ -2,6 +2,7 @@ import { ReactNode, useRef, useState } from 'react'; import { ModalRef } from '@trussworks/react-uswds'; import classNames from 'classnames'; + import { FullPageBlock } from 'components/FullPageBlock'; import { Heading } from 'components/heading'; import { Shown } from 'conditional-render'; diff --git a/apps/modernization-ui/src/apps/report/run/ReportRunPage.spec.tsx b/apps/modernization-ui/src/apps/report/run/ReportRunPage.spec.tsx index bd68846454..fa7edab127 100644 --- a/apps/modernization-ui/src/apps/report/run/ReportRunPage.spec.tsx +++ b/apps/modernization-ui/src/apps/report/run/ReportRunPage.spec.tsx @@ -1,16 +1,17 @@ import { fireEvent, render, waitFor, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import * as generated from 'generated'; -import { BasicFilterConfiguration, ReportConfiguration } from 'generated'; import { axe } from 'jest-axe'; import fileDownload from 'js-file-download'; +import { createMemoryRouter, RouterProvider, useLoaderData } from 'react-router'; + +import * as generated from 'generated'; +import { BasicFilterConfiguration, ReportConfiguration } from 'generated'; import { Layout } from 'layout'; import { LoadingBlock } from 'libs/loading/block'; import { permissions } from 'libs/permission'; import { ConceptOptions, useConceptOptions } from 'options/concepts'; import * as options from 'options/selectableResolver'; import { ErrorPage } from 'pages/error'; -import { createMemoryRouter, RouterProvider, useLoaderData } from 'react-router'; import { UserContextProvider } from 'user'; import { PERMISSION_GROUP_MAP } from '../constants'; diff --git a/apps/modernization-ui/src/apps/report/run/ReportRunPage.tsx b/apps/modernization-ui/src/apps/report/run/ReportRunPage.tsx index ff7c62f45d..537e105ee4 100644 --- a/apps/modernization-ui/src/apps/report/run/ReportRunPage.tsx +++ b/apps/modernization-ui/src/apps/report/run/ReportRunPage.tsx @@ -1,6 +1,10 @@ import { BaseSyntheticEvent } from 'react'; import { useCallback, useState } from 'react'; +import fileDownload from 'js-file-download'; +import { FormProvider, useForm } from 'react-hook-form'; +import { useLoaderData, useParams } from 'react-router'; + import { ApiErrorBanner } from 'design-system/errors/ApiError'; import { AdvancedFilterRequest, @@ -10,13 +14,10 @@ import { ReportExecutionRequest, SortSpec, } from 'generated'; -import fileDownload from 'js-file-download'; import { LoadingBlock } from 'libs/loading/block'; import { permissions, permitsAll } from 'libs/permission'; import { usePermissions } from 'libs/permission/usePermissions'; import { NotFoundError } from 'pages/error/NotFoundError'; -import { FormProvider, useForm } from 'react-hook-form'; -import { useLoaderData, useParams } from 'react-router'; import { LOCAL_STORAGE_RESULT_PREFIX, PERMISSION_GROUP_MAP } from '../constants'; import { openNewTab } from '../utils/openNewTab'; diff --git a/apps/modernization-ui/src/apps/report/run/ResultDataPage.spec.tsx b/apps/modernization-ui/src/apps/report/run/ResultDataPage.spec.tsx index 9293dd2c95..6191a458e8 100644 --- a/apps/modernization-ui/src/apps/report/run/ResultDataPage.spec.tsx +++ b/apps/modernization-ui/src/apps/report/run/ResultDataPage.spec.tsx @@ -1,7 +1,8 @@ import { getByText, queryByRole, render } from '@testing-library/react'; -import { ReportExecutionResult } from 'generated'; import { LoaderFunctionArgs, useLoaderData } from 'react-router'; +import { ReportExecutionResult } from 'generated'; + import { loadReportResult, ResultDataPage } from './ResultDataPage'; vi.mock('react-router', async () => { diff --git a/apps/modernization-ui/src/apps/report/run/ResultDataPage.tsx b/apps/modernization-ui/src/apps/report/run/ResultDataPage.tsx index 4fa96c0474..98989af088 100644 --- a/apps/modernization-ui/src/apps/report/run/ResultDataPage.tsx +++ b/apps/modernization-ui/src/apps/report/run/ResultDataPage.tsx @@ -1,15 +1,16 @@ import { useEffect, useId } from 'react'; +import DOMPurify from 'dompurify'; +import { marked } from 'marked'; +import { parse } from 'papaparse'; +import { LoaderFunction, useLoaderData } from 'react-router'; + import { Card } from 'design-system/card'; import { ValueField } from 'design-system/field'; import { AlertMessage } from 'design-system/message'; import { DataTable } from 'design-system/table'; import { NoDataRow } from 'design-system/table/NoDataRow'; -import DOMPurify from 'dompurify'; import { ReportExecutionResult } from 'generated'; -import { marked } from 'marked'; -import { parse } from 'papaparse'; -import { LoaderFunction, useLoaderData } from 'react-router'; import { LOCAL_STORAGE_RESULT_PREFIX } from '../constants'; import { ReportLayout } from '../layout/ReportLayout'; diff --git a/apps/modernization-ui/src/apps/report/run/columns/ColumnSelector.tsx b/apps/modernization-ui/src/apps/report/run/columns/ColumnSelector.tsx index eb81ac6d96..18542569c6 100644 --- a/apps/modernization-ui/src/apps/report/run/columns/ColumnSelector.tsx +++ b/apps/modernization-ui/src/apps/report/run/columns/ColumnSelector.tsx @@ -1,6 +1,8 @@ import { useState } from 'react'; import { DragDropContext, Draggable, DraggableProvided, Droppable, DropResult } from '@hello-pangea/dnd'; +import { useController } from 'react-hook-form'; + import { SIZING } from 'apps/report/constants'; import { LiveSearch } from 'components/Search/LiveSearch'; import { Button } from 'design-system/button'; @@ -10,7 +12,6 @@ import { ValidationErrorBanner } from 'design-system/errors/ValidationError'; import { Icon } from 'design-system/icon'; import { ReportColumn } from 'generated'; import { Selectable } from 'options'; -import { useController } from 'react-hook-form'; import { ReportExecuteForm } from '../ReportRunPage'; diff --git a/apps/modernization-ui/src/apps/report/run/columns/SortSelector.tsx b/apps/modernization-ui/src/apps/report/run/columns/SortSelector.tsx index 7ad11c90f8..2b2cbd64c8 100644 --- a/apps/modernization-ui/src/apps/report/run/columns/SortSelector.tsx +++ b/apps/modernization-ui/src/apps/report/run/columns/SortSelector.tsx @@ -1,11 +1,12 @@ import { useEffect, useId } from 'react'; +import { Controller, useController, useWatch } from 'react-hook-form'; + import { SIZING } from 'apps/report/constants'; import { EnumSelectable } from 'apps/report/utils'; import { EntryWrapper } from 'components/Entry'; import { SingleSelect } from 'design-system/select'; import { ReportColumn, SortSpec } from 'generated'; -import { Controller, useController, useWatch } from 'react-hook-form'; import { ReportExecuteForm } from '../ReportRunPage'; diff --git a/apps/modernization-ui/src/apps/report/run/filters/advanced/AddButton.tsx b/apps/modernization-ui/src/apps/report/run/filters/advanced/AddButton.tsx index 736d981931..4163cbc3ea 100644 --- a/apps/modernization-ui/src/apps/report/run/filters/advanced/AddButton.tsx +++ b/apps/modernization-ui/src/apps/report/run/filters/advanced/AddButton.tsx @@ -1,6 +1,7 @@ -import { Button } from 'design-system/button'; import { ActionProps } from 'react-querybuilder'; +import { Button } from 'design-system/button'; + const AddButton = (props: ActionProps) => { return (