mirror of
https://github.com/ansible/awx.git
synced 2024-11-01 08:21:15 +03:00
Add alert for org. delete.
This commit is contained in:
parent
1cb2a95a47
commit
f3a07753e6
@ -221,4 +221,32 @@ describe('<DataListToolbar />', () => {
|
||||
const upAlphaIcon = toolbar.find(upAlphaIconSelector);
|
||||
expect(upAlphaIcon.length).toBe(1);
|
||||
});
|
||||
|
||||
test('trash can button triggers correct function', () => {
|
||||
const columns = [{ name: 'Name', key: 'name', isSortable: true }];
|
||||
const onOpenDeleteModal = jest.fn();
|
||||
const deleteModal = 'button.pf-c-button.pf-m-plain.awx-ToolBarBtn';
|
||||
const onSearch = jest.fn();
|
||||
const onSort = jest.fn();
|
||||
const onSelectAll = jest.fn();
|
||||
|
||||
toolbar = mount(
|
||||
<I18nProvider>
|
||||
<DataListToolbar
|
||||
isAllSelected={false}
|
||||
selected={() => ([1, 2, 3, 4])}
|
||||
sortedColumnKey="name"
|
||||
sortOrder="ascending"
|
||||
columns={columns}
|
||||
onSearch={onSearch}
|
||||
onSort={onSort}
|
||||
onSelectAll={onSelectAll}
|
||||
onOpenDeleteModal={() => {}}
|
||||
/>
|
||||
</I18nProvider>
|
||||
);
|
||||
|
||||
toolbar.find(deleteModal).simulate('click');
|
||||
expect(onOpenDeleteModal).toBeCalled();
|
||||
});
|
||||
});
|
||||
|
@ -56,6 +56,11 @@ class APIClient {
|
||||
return this.http.get(API_CONFIG);
|
||||
}
|
||||
|
||||
destroyOrganization (id) {
|
||||
const endpoint = `${API_ORGANIZATIONS}${id}/`;
|
||||
return (this.http.delete(endpoint));
|
||||
}
|
||||
|
||||
getOrganizations (params = {}) {
|
||||
return this.http.get(API_ORGANIZATIONS, { params });
|
||||
}
|
||||
|
@ -279,6 +279,10 @@
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.orgListAlert-actionBtn{
|
||||
margin:0 10px;
|
||||
}
|
||||
|
||||
.awx-c-form-action-group {
|
||||
float: right;
|
||||
display: block;
|
||||
|
@ -24,29 +24,31 @@ import ExpandCollapse from '../ExpandCollapse';
|
||||
import Search from '../Search';
|
||||
import Sort from '../Sort';
|
||||
import VerticalSeparator from '../VerticalSeparator';
|
||||
// import SelectedList from '../SelectedList';
|
||||
|
||||
class DataListToolbar extends React.Component {
|
||||
render () {
|
||||
const {
|
||||
addUrl,
|
||||
columns,
|
||||
isAllSelected,
|
||||
disableTrashCanIcon,
|
||||
onSelectAll,
|
||||
sortedColumnKey,
|
||||
sortOrder,
|
||||
addUrl,
|
||||
showDelete,
|
||||
showSelectAll,
|
||||
isAllSelected,
|
||||
isLookup,
|
||||
isCompact,
|
||||
onSort,
|
||||
onSearch,
|
||||
onCompact,
|
||||
onExpand,
|
||||
add
|
||||
add,
|
||||
onOpenDeleteModal
|
||||
} = this.props;
|
||||
|
||||
const showExpandCollapse = (onCompact && onExpand);
|
||||
|
||||
return (
|
||||
<I18n>
|
||||
{({ i18n }) => (
|
||||
@ -115,10 +117,13 @@ class DataListToolbar extends React.Component {
|
||||
position="top"
|
||||
>
|
||||
<Button
|
||||
className="awx-ToolBarBtn"
|
||||
variant="plain"
|
||||
aria-label={i18n._(t`Delete`)}
|
||||
onClick={onOpenDeleteModal}
|
||||
isDisabled={disableTrashCanIcon}
|
||||
>
|
||||
<TrashAltIcon />
|
||||
<TrashAltIcon className="awx-ToolBarTrashCanIcon" />
|
||||
</Button>
|
||||
</Tooltip>
|
||||
)}
|
||||
|
@ -80,3 +80,16 @@
|
||||
.awx-toolbar .pf-l-toolbar__item .pf-c-button.pf-m-plain {
|
||||
font-size: 18px;
|
||||
}
|
||||
.pf-c-button--disabled--BackgroundColor{
|
||||
background-color: #b7b7b7;
|
||||
}
|
||||
.awx-ToolBarBtn{
|
||||
width: 30px;
|
||||
}
|
||||
.awx-ToolBarBtn:hover{
|
||||
.awx-ToolBarTrashCanIcon {
|
||||
color:white;
|
||||
}
|
||||
background-color:#d9534f;
|
||||
}
|
||||
|
||||
|
@ -4,14 +4,20 @@ import { Trans, t } from '@lingui/macro';
|
||||
import {
|
||||
Badge,
|
||||
Checkbox,
|
||||
Button,
|
||||
} from '@patternfly/react-core';
|
||||
import {
|
||||
TrashAltIcon,
|
||||
} from '@patternfly/react-icons';
|
||||
import {
|
||||
Link
|
||||
} from 'react-router-dom';
|
||||
|
||||
import VerticalSeparator from '../../../components/VerticalSeparator';
|
||||
|
||||
export default ({
|
||||
class OrganizationListItem extends React.Component {
|
||||
render () {
|
||||
const {
|
||||
itemId,
|
||||
name,
|
||||
userCount,
|
||||
@ -19,7 +25,8 @@ export default ({
|
||||
isSelected,
|
||||
onSelect,
|
||||
detailUrl,
|
||||
}) => (
|
||||
} = this.props;
|
||||
return (
|
||||
<li key={itemId} className="pf-c-data-list__item" aria-labelledby="check-action-item1">
|
||||
<I18n>
|
||||
{({ i18n }) => (
|
||||
@ -62,3 +69,7 @@ export default ({
|
||||
<div className="pf-c-data-list__cell" />
|
||||
</li>
|
||||
);
|
||||
}
|
||||
}
|
||||
export default OrganizationListItem;
|
||||
|
||||
|
@ -12,9 +12,11 @@ import {
|
||||
EmptyState,
|
||||
EmptyStateIcon,
|
||||
EmptyStateBody,
|
||||
Modal,
|
||||
PageSection,
|
||||
PageSectionVariants,
|
||||
Title
|
||||
Title,
|
||||
Button
|
||||
} from '@patternfly/react-core';
|
||||
import { CubesIcon } from '@patternfly/react-icons';
|
||||
import DataListToolbar from '../../../components/DataListToolbar';
|
||||
@ -54,6 +56,8 @@ class OrganizationsList extends Component {
|
||||
loading: true,
|
||||
results: [],
|
||||
selected: [],
|
||||
isModalOpen: false,
|
||||
orgsToDelete: []
|
||||
};
|
||||
|
||||
this.onSearch = this.onSearch.bind(this);
|
||||
@ -64,6 +68,9 @@ class OrganizationsList extends Component {
|
||||
this.onSelect = this.onSelect.bind(this);
|
||||
this.updateUrl = this.updateUrl.bind(this);
|
||||
this.fetchOrganizations = this.fetchOrganizations.bind(this);
|
||||
this.handleOrgDelete = this.handleOrgDelete.bind(this);
|
||||
this.handleOpenOrgDeleteModal = this.handleOpenOrgDeleteModal.bind(this);
|
||||
this.handleClearOrgsToDelete = this.handleClearOrgsToDelete.bind(this);
|
||||
}
|
||||
|
||||
componentDidMount () {
|
||||
@ -129,6 +136,50 @@ class OrganizationsList extends Component {
|
||||
return Object.assign({}, this.defaultParams, searchParams, overrides);
|
||||
}
|
||||
|
||||
handleClearOrgsToDelete () {
|
||||
this.setState(({ isModalOpen }) => ({ isModalOpen: !isModalOpen, orgsToDelete: [] }));
|
||||
this.onSelectAll();
|
||||
}
|
||||
|
||||
handleOpenOrgDeleteModal () {
|
||||
const { results, selected } = this.state;
|
||||
const warningTitle = i18nMark('Delete Organization');
|
||||
const warningMsg = i18nMark('Are you sure you want to delete:');
|
||||
|
||||
const orgsToDelete = [];
|
||||
results.forEach((result) => {
|
||||
selected.forEach((selectedOrg) => {
|
||||
if (result.id === selectedOrg) {
|
||||
orgsToDelete.push({ name: result.name, id: selectedOrg });
|
||||
}
|
||||
});
|
||||
});
|
||||
this.setState({
|
||||
orgsToDelete,
|
||||
isModalOpen: true,
|
||||
warningTitle,
|
||||
warningMsg,
|
||||
loading: false });
|
||||
}
|
||||
|
||||
async handleOrgDelete (event) {
|
||||
const { orgsToDelete } = this.state;
|
||||
const { api } = this.props;
|
||||
try {
|
||||
const deleteOrgsApiCalls = [];
|
||||
|
||||
orgsToDelete.forEach((org) => {
|
||||
deleteOrgsApiCalls.push(api.destroyOrganization(org.id));
|
||||
});
|
||||
await Promise.all(deleteOrgsApiCalls);
|
||||
} finally {
|
||||
this.handleClearOrgsToDelete();
|
||||
const queryParams = this.getQueryParams();
|
||||
this.fetchOrganizations(queryParams);
|
||||
}
|
||||
event.preventDefault();
|
||||
}
|
||||
|
||||
updateUrl (queryParams) {
|
||||
const { history, location } = this.props;
|
||||
const pathname = '/organizations';
|
||||
@ -196,18 +247,47 @@ class OrganizationsList extends Component {
|
||||
error,
|
||||
loading,
|
||||
noInitialResults,
|
||||
orgsToDelete,
|
||||
page,
|
||||
pageCount,
|
||||
page_size,
|
||||
selected,
|
||||
sortedColumnKey,
|
||||
sortOrder,
|
||||
results,
|
||||
selected,
|
||||
isModalOpen,
|
||||
warningTitle,
|
||||
warningMsg,
|
||||
} = this.state;
|
||||
const { match } = this.props;
|
||||
return (
|
||||
<PageSection variant={medium}>
|
||||
<Card>
|
||||
{ isModalOpen && (
|
||||
<Modal
|
||||
className="orgListAlert"
|
||||
width="50%"
|
||||
title={warningTitle}
|
||||
isOpen={isModalOpen}
|
||||
style={{ width: '1000px' }}
|
||||
variant="danger"
|
||||
onClose={this.handleClearOrgsToDelete}
|
||||
>
|
||||
{warningMsg}
|
||||
<br />
|
||||
{orgsToDelete.map((org) => (
|
||||
<strong key={org.id}>
|
||||
{org.name}
|
||||
<br />
|
||||
</strong>
|
||||
))}
|
||||
<br />
|
||||
<span className="awx-c-form-action-group">
|
||||
<Button className="orgListAlert-actionBtn" keys="cancel" variant="secondary" aria-label="cancel-delete" onClick={this.handleClearOrgsToDelete}>Cancel</Button>
|
||||
<Button className="orgListAlert-actionBtn" keys="cancel" variant="danger" aria-label="confirm-delete" onClick={this.handleOrgDelete}>Delete</Button>
|
||||
</span>
|
||||
</Modal>
|
||||
)}
|
||||
{noInitialResults && (
|
||||
<EmptyState>
|
||||
<EmptyStateIcon icon={CubesIcon} />
|
||||
@ -229,6 +309,8 @@ class OrganizationsList extends Component {
|
||||
onSearch={this.onSearch}
|
||||
onSort={this.onSort}
|
||||
onSelectAll={this.onSelectAll}
|
||||
onOpenDeleteModal={this.handleOpenOrgDeleteModal}
|
||||
disableTrashCanIcon={selected.length === 0}
|
||||
showDelete
|
||||
showSelectAll
|
||||
/>
|
||||
@ -244,7 +326,8 @@ class OrganizationsList extends Component {
|
||||
userCount={o.summary_fields.related_field_counts.users}
|
||||
teamCount={o.summary_fields.related_field_counts.teams}
|
||||
isSelected={selected.includes(o.id)}
|
||||
onSelect={() => this.onSelect(o.id)}
|
||||
onSelect={() => this.onSelect(o.id, o.name)}
|
||||
onOpenOrgDeleteModal={this.handleOpenOrgDeleteModal}
|
||||
/>
|
||||
))}
|
||||
</ul>
|
||||
|
Loading…
Reference in New Issue
Block a user