From 5bd5460e661af1a9fc1aead252babc255f2218e3 Mon Sep 17 00:00:00 2001 From: Hana Xu Date: Fri, 2 Aug 2024 12:18:12 -0400 Subject: [PATCH 1/2] fix regionFilter for core tab --- .../LinodeCreatev2/TwoStepRegion.test.tsx | 38 +++++++++++++++++++ .../Linodes/LinodeCreatev2/TwoStepRegion.tsx | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx b/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx index d2be890a68f..278488780f5 100644 --- a/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx +++ b/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx @@ -38,6 +38,44 @@ describe('TwoStepRegion', () => { expect(select).toBeEnabled(); }); + it('should display core regions in the Core tab region select', async () => { + const { + getByPlaceholderText, + getByRole, + } = renderWithThemeAndHookFormContext({ + component: , + }); + + const select = getByPlaceholderText('Select a Region'); + await userEvent.click(select); + + const dropdown = getByRole('listbox'); + expect(dropdown.innerHTML).toContain('US, Newark'); + expect(dropdown.innerHTML).not.toContain( + 'US, Gecko Distributed Region Test' + ); + }); + + it('should only display distributed regions in the Distributed tab region select', async () => { + const { + getAllByRole, + getByPlaceholderText, + getByRole, + } = renderWithThemeAndHookFormContext({ + component: , + }); + + const tabs = getAllByRole('tab'); + await userEvent.click(tabs[1]); + + const select = getByPlaceholderText('Select a Region'); + await userEvent.click(select); + + const dropdown = getByRole('listbox'); + expect(dropdown.innerHTML).toContain('US, Gecko Distributed Region Test'); + expect(dropdown.innerHTML).not.toContain('US, Newark'); + }); + it('should render a Geographical Area select with All pre-selected and a Region Select for the Distributed tab', async () => { const { getAllByRole } = renderWithThemeAndHookFormContext({ component: , diff --git a/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.tsx b/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.tsx index 2af6b9e6ac8..21f13c36d80 100644 --- a/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.tsx +++ b/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.tsx @@ -93,7 +93,7 @@ export const TwoStepRegion = (props: CombinedProps) => { disabledRegions={disabledRegions} errorText={errorText} onChange={(e, region) => onChange(region)} - regionFilter={regionFilter} + regionFilter="core" regions={regions ?? []} showDistributedRegionIconHelperText={false} value={value} From 6fe9b310ebf3389144828b628abcf7aeb9092a8b Mon Sep 17 00:00:00 2001 From: Hana Xu Date: Fri, 2 Aug 2024 12:27:47 -0400 Subject: [PATCH 2/2] update test text --- .../src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx b/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx index 278488780f5..bdc8bfacfec 100644 --- a/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx +++ b/packages/manager/src/features/Linodes/LinodeCreatev2/TwoStepRegion.test.tsx @@ -38,7 +38,7 @@ describe('TwoStepRegion', () => { expect(select).toBeEnabled(); }); - it('should display core regions in the Core tab region select', async () => { + it('should only display core regions in the Core tab region select', async () => { const { getByPlaceholderText, getByRole,