Address PR feedback.

This commit is contained in:
Kia Lam
2019-03-13 15:59:42 -04:00
parent 21156d1409
commit 0495214f47
4 changed files with 23 additions and 26 deletions

View File

@@ -116,7 +116,7 @@ class AccessList extends React.Component {
this.onCompact = this.onCompact.bind(this);
this.onSort = this.onSort.bind(this);
this.getQueryParams = this.getQueryParams.bind(this);
this.removeRole = this.removeRole.bind(this);
this.removeAccessRole = this.removeAccessRole.bind(this);
this.handleWarning = this.handleWarning.bind(this);
this.hideWarning = this.hideWarning.bind(this);
this.confirmDelete = this.confirmDelete.bind(this);
@@ -225,8 +225,8 @@ class AccessList extends React.Component {
}
});
result.teamRoles = teamRoles || [];
result.userRoles = userRoles || [];
result.teamRoles = teamRoles;
result.userRoles = userRoles;
});
this.setState(stateToUpdate);
} catch (error) {
@@ -234,10 +234,14 @@ class AccessList extends React.Component {
}
}
async removeRole (roleId, resourceId, type) {
async removeAccessRole (roleId, resourceId, type) {
const { removeRole } = this.props;
const url = `/api/v2/${type}/${resourceId}/roles/`;
await removeRole(url, roleId);
try {
await removeRole(url, roleId);
} catch (error) {
this.setState({ error });
}
const queryParams = this.getQueryParams();
try {
this.fetchOrgAccessList(queryParams);
@@ -280,7 +284,7 @@ class AccessList extends React.Component {
confirmDelete () {
const { deleteType, deleteResourceId, deleteRoleId } = this.state;
this.removeRole(deleteRoleId, deleteResourceId, deleteType);
this.removeAccessRole(deleteRoleId, deleteResourceId, deleteType);
}
render () {

View File

@@ -8,10 +8,3 @@
display: none;
}
}
.awx-c-chip {
padding: 3px 0;
height: 24px;
margin-right: 10px;
margin-bottom: 10px;
}