Wizard: Replace deprecated Dropdown in BulkSelect
This updates deprecated Dropdown in `BulkSelect`.
This commit is contained in:
parent
54983cddf9
commit
c4dae746e7
2 changed files with 31 additions and 27 deletions
|
|
@ -3,9 +3,11 @@ import React, { useState } from 'react';
|
|||
import {
|
||||
Dropdown,
|
||||
DropdownItem,
|
||||
DropdownToggle,
|
||||
DropdownToggleCheckbox,
|
||||
} from '@patternfly/react-core/deprecated';
|
||||
DropdownList,
|
||||
MenuToggle,
|
||||
MenuToggleCheckbox,
|
||||
MenuToggleElement,
|
||||
} from '@patternfly/react-core';
|
||||
|
||||
import { ApiRepositoryResponseRead } from '../../../../../store/contentSourcesApi';
|
||||
|
||||
|
|
@ -42,26 +44,31 @@ export function BulkSelect({
|
|||
|
||||
return (
|
||||
<Dropdown
|
||||
toggle={
|
||||
<DropdownToggle
|
||||
id="stacked-example-toggle"
|
||||
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
|
||||
<MenuToggle
|
||||
id="bulk-select-toggle"
|
||||
data-testid="bulk-select-toggle"
|
||||
ref={toggleRef}
|
||||
isDisabled={isDisabled}
|
||||
splitButtonItems={[
|
||||
<DropdownToggleCheckbox
|
||||
id="example-checkbox-1"
|
||||
key="split-checkbox"
|
||||
aria-label="Select all"
|
||||
isChecked={allChecked || someChecked ? null : false}
|
||||
onClick={handleSelectPage}
|
||||
/>,
|
||||
]}
|
||||
onToggle={toggleDropdown}
|
||||
splitButtonOptions={{
|
||||
items: [
|
||||
<MenuToggleCheckbox
|
||||
id="bulk-select-checkbox"
|
||||
key="split-checkbox"
|
||||
aria-label="Select all"
|
||||
isChecked={allChecked || someChecked ? null : false}
|
||||
onClick={handleSelectPage}
|
||||
/>,
|
||||
],
|
||||
}}
|
||||
onClick={toggleDropdown}
|
||||
>
|
||||
{someChecked ? `${selected.size} selected` : null}
|
||||
</DropdownToggle>
|
||||
}
|
||||
</MenuToggle>
|
||||
)}
|
||||
isOpen={dropdownIsOpen}
|
||||
dropdownItems={[
|
||||
>
|
||||
<DropdownList>
|
||||
<DropdownItem
|
||||
key="none"
|
||||
isDisabled={!selected.size}
|
||||
|
|
@ -69,7 +76,7 @@ export function BulkSelect({
|
|||
deselectAll();
|
||||
toggleDropdown();
|
||||
}}
|
||||
>{`Clear all (${selected.size} items)`}</DropdownItem>,
|
||||
>{`Clear all (${selected.size} items)`}</DropdownItem>
|
||||
<DropdownItem
|
||||
key="page"
|
||||
isDisabled={!contentList.length}
|
||||
|
|
@ -79,8 +86,8 @@ export function BulkSelect({
|
|||
}}
|
||||
>{`${allChecked ? 'Remove' : 'Select'} page (${
|
||||
perPage > contentList.length ? contentList.length : perPage
|
||||
} items)`}</DropdownItem>,
|
||||
]}
|
||||
/>
|
||||
} items)`}</DropdownItem>
|
||||
</DropdownList>
|
||||
</Dropdown>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,10 +148,7 @@ describe('Step Custom repositories', () => {
|
|||
test('correct number of repositories is fetched', async () => {
|
||||
await renderCreateMode();
|
||||
await goToRepositoriesStep();
|
||||
|
||||
const select = await screen.findByRole('button', {
|
||||
name: /^select$/i,
|
||||
});
|
||||
const select = await screen.findByTestId('bulk-select-toggle');
|
||||
user.click(select);
|
||||
await screen.findByText(/select page \(10 items\)/i);
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue