Skip to content

Commit 006a3c6

Browse files
committed
Fixes #38663 - Host details kebab inconsistent ui
1 parent 8663870 commit 006a3c6

File tree

1 file changed

+23
-19
lines changed
  • webpack/assets/javascripts/react_app/components/HostDetails/ActionsBar

1 file changed

+23
-19
lines changed

webpack/assets/javascripts/react_app/components/HostDetails/ActionsBar/index.js

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
import PropTypes from 'prop-types';
22
import React, { useState, createContext } from 'react';
33
import { useSelector, shallowEqual, useDispatch } from 'react-redux';
4-
import { Button, Split, SplitItem } from '@patternfly/react-core';
5-
import {
6-
DropdownItem,
7-
Dropdown,
8-
DropdownSeparator,
9-
KebabToggle,
10-
} from '@patternfly/react-core/deprecated';
4+
import { Button, Split, SplitItem, Dropdown, DropdownItem, DropdownList, MenuToggle, Divider } from '@patternfly/react-core';
115
import {
126
DatabaseIcon,
137
TrashIcon,
148
CloneIcon,
159
UndoIcon,
1610
BuildIcon,
1711
TerminalIcon,
12+
EllipsisVIcon,
1813
} from '@patternfly/react-icons';
1914
import { translate as __ } from '../../../common/I18n';
2015
import { selectKebabItems } from './Selectors';
@@ -110,7 +105,7 @@ const ActionsBar = ({
110105
>
111106
{__('Delete')}
112107
</DropdownItem>,
113-
<DropdownSeparator key="sp-1" ouiaId="dropdown-separator-1" />,
108+
<Divider key="sp-1" ouiaId="dropdown-separator-1" component="li" />,
114109
<DropdownItem
115110
ouiaId="console-dropdown-item"
116111
onClick={() => visit(foremanUrl(`/hosts/${hostFriendlyId}/console`))}
@@ -131,11 +126,11 @@ const ActionsBar = ({
131126
>
132127
{__('Facts')}
133128
</DropdownItem>,
134-
<DropdownSeparator key="sp-2" ouiaId="dropdown-separator-2" />,
129+
<Divider key="sp-2" component="li" />,
135130
<DropdownItem
136131
ouiaId="pre-version-dropdown-item"
137132
icon={<UndoIcon />}
138-
href={`/hosts/${hostFriendlyId}`}
133+
to={`/hosts/${hostFriendlyId}`}
139134
key="prev-version"
140135
>
141136
{__('Legacy UI')}
@@ -160,17 +155,26 @@ const ActionsBar = ({
160155
<ForemanActionsBarContext.Provider value={{ onKebabToggle }}>
161156
<Dropdown
162157
ouiaId="kebab-dropdown"
163-
alignments={{ default: 'right' }}
164-
toggle={
165-
<KebabToggle
166-
id="hostdetails-kebab"
167-
onToggle={(_event, isOpen) => onKebabToggle(isOpen)}
168-
/>
169-
}
170158
isOpen={kebabIsOpen}
159+
onOpenChange={isOpen => onKebabToggle(isOpen)}
171160
isPlain
172-
dropdownItems={dropdownItems.concat(registeredItems)}
173-
/>
161+
popperProps={{ position: 'right' }}
162+
toggle={toggleRef => (
163+
<MenuToggle
164+
ref={toggleRef}
165+
id="hostdetails-kebab"
166+
variant="plain"
167+
isExpanded={kebabIsOpen}
168+
onClick={() => onKebabToggle(!kebabIsOpen)}
169+
>
170+
<EllipsisVIcon />
171+
</MenuToggle>
172+
)}
173+
>
174+
<DropdownList>
175+
{dropdownItems.concat(registeredItems)}
176+
</DropdownList>
177+
</Dropdown>
174178
</ForemanActionsBarContext.Provider>
175179
</SplitItem>
176180
</Split>

0 commit comments

Comments
 (0)