Skip to content

Commit b6ea9bd

Browse files
committed
Wizard: Remove deprecated select for HyperV Generation
This swaps deprecated HyperV Generation select for a non deprecated one.
1 parent 32f701f commit b6ea9bd

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed

src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureHyperVSelect.tsx

+25-16
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import React, { useState } from 'react';
22

3-
import { FormGroup } from '@patternfly/react-core';
43
import {
4+
FormGroup,
5+
MenuToggle,
6+
MenuToggleElement,
57
Select,
8+
SelectList,
69
SelectOption,
7-
SelectVariant,
8-
} from '@patternfly/react-core/deprecated';
10+
} from '@patternfly/react-core';
911

1012
import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
1113
import {
@@ -42,25 +44,32 @@ export const AzureHyperVSelect = () => {
4244
/>,
4345
];
4446

47+
const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
48+
<MenuToggle
49+
ref={toggleRef}
50+
data-testid="azure-hyper-v-generation-select"
51+
onClick={() => setIsOpen(!isOpen)}
52+
isExpanded={isOpen}
53+
isFullWidth
54+
>
55+
{hyperVGeneration === 'V1' ? 'Generation 1' : 'Generation 2'}
56+
</MenuToggle>
57+
);
58+
4559
return (
4660
<>
47-
<FormGroup
48-
isRequired
49-
label="HyperV Generation"
50-
data-testid="azure-hyper-v-generation-select"
51-
>
61+
<FormGroup isRequired label="HyperV Generation">
5262
<Select
5363
ouiaId="hyperv_gen_select"
54-
variant={SelectVariant.single}
55-
onToggle={handleToggle}
56-
onSelect={handleSelect}
64+
isScrollable
5765
isOpen={isOpen}
58-
selections={
59-
hyperVGeneration === 'V1' ? 'Generation 1' : 'Generation 2'
60-
}
61-
value={hyperVGeneration}
66+
selected={hyperVGeneration === 'V1' ? 'Generation 1' : 'Generation 2'}
67+
onSelect={handleSelect}
68+
onOpenChange={handleToggle}
69+
toggle={toggle}
70+
shouldFocusFirstItemOnOpen={false}
6271
>
63-
{selectOptions}
72+
<SelectList>{selectOptions}</SelectList>
6473
</Select>
6574
</FormGroup>
6675
</>

src/test/Components/CreateImageWizard/steps/TargetEnvironment/AzureTarget.test.tsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,11 @@ const enterSubscriptionId = async () => {
159159

160160
const selectV1 = async () => {
161161
const user = userEvent.setup();
162-
const hypervMenu = screen.getAllByRole('button', {
163-
name: /options menu/i,
164-
})[0];
162+
const hypervMenu = screen.getByTestId('azure-hyper-v-generation-select');
165163

166164
await waitFor(() => user.click(hypervMenu));
167165
const v1 = await screen.findByRole('option', {
168-
name: /v1/i,
166+
name: /generation 1/i,
169167
});
170168
await waitFor(() => user.click(v1));
171169
};

0 commit comments

Comments
 (0)