External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 10:11:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8230 from nixocio/ui_issue_7751

Browse Source 
Add username to tooltip

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-10-19 17:20:01 +00:00
committed by GitHub
parent 28e792056d 98b9d4358d
commit 5c751f3f8e
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.jsx
View File

@@ -94,7 +94,7 @@ function ToolbarDeleteButton({
const renderTooltip = () => { const renderTooltip = () => {
const itemsUnableToDelete = itemsToDelete const itemsUnableToDelete = itemsToDelete
.filter(cannotDelete) .filter(cannotDelete)
.map(item => item.name) .map(item => item.name || item.username)
.join(', '); .join(', ');
if (itemsToDelete.some(cannotDelete)) { if (itemsToDelete.some(cannotDelete)) {
return ( return (

15
awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.test.jsx
View File

@@ -12,6 +12,11 @@ const itemB = {
name: 'Foo', name: 'Foo',
summary_fields: { user_capabilities: { delete: false } }, summary_fields: { user_capabilities: { delete: false } },
}; };
const itemC = {
id: 1,
username: 'Foo',
summary_fields: { user_capabilities: { delete: false } },
};
describe('<ToolbarDeleteButton />', () => { describe('<ToolbarDeleteButton />', () => {
test('should render button', () => { test('should render button', () => {
@@ -61,4 +66,14 @@ describe('<ToolbarDeleteButton />', () => {
expect(wrapper.find('Tooltip')).toHaveLength(1); expect(wrapper.find('Tooltip')).toHaveLength(1);
expect(wrapper.find('Tooltip').prop('content')).toEqual('Delete'); expect(wrapper.find('Tooltip').prop('content')).toEqual('Delete');
}); });
test('should render tooltip for username', () => {
const wrapper = mountWithContexts(
<ToolbarDeleteButton onDelete={() => {}} itemsToDelete={[itemC]} />
);
expect(wrapper.find('Tooltip')).toHaveLength(1);
expect(wrapper.find('Tooltip').prop('content').props.children).toEqual(
'You do not have permission to delete Items: Foo'
);
});
}); });