chore(ui): simplify users/roles filterbar

pull/5921/head
Pavel Zavora 2022-05-24 08:22:51 +02:00
parent 20eb009607
commit 3027ab9b7e
3 changed files with 5 additions and 10 deletions

View File

@ -42,7 +42,7 @@ class FilterBar extends Component {
<button <button
className="btn btn-sm btn-primary" className="btn btn-sm btn-primary"
disabled={isEditing} disabled={isEditing}
onClick={onClickCreate(type)} onClick={onClickCreate}
> >
<span className="icon plus" /> Create{' '} <span className="icon plus" /> Create{' '}
{placeholderText.substring(0, placeholderText.length - 1)} {placeholderText.substring(0, placeholderText.length - 1)}

View File

@ -65,9 +65,6 @@ class RolesPage extends Component<Props> {
return globalPermissions ? globalPermissions.allowed : [] return globalPermissions ? globalPermissions.allowed : []
} }
private handleClickCreate = () => () => {
this.props.addRole()
}
private handleEditRole = (role, updates) => { private handleEditRole = (role, updates) => {
this.props.editRole(role, updates) this.props.editRole(role, updates)
} }
@ -119,7 +116,7 @@ class RolesPage extends Component<Props> {
</AdminInfluxDBTab> </AdminInfluxDBTab>
) )
} }
const {users, roles, filterRoles} = this.props const {users, roles, addRole, filterRoles} = this.props
return ( return (
<AdminInfluxDBTab activeTab="roles" source={source}> <AdminInfluxDBTab activeTab="roles" source={source}>
<RolesTable <RolesTable
@ -127,7 +124,7 @@ class RolesPage extends Component<Props> {
allUsers={users} allUsers={users}
permissions={this.allowed} permissions={this.allowed}
isEditing={roles.some(r => r.isEditing)} isEditing={roles.some(r => r.isEditing)}
onClickCreate={this.handleClickCreate} onClickCreate={addRole}
onEdit={this.handleEditRole} onEdit={this.handleEditRole}
onSave={this.handleSaveRole} onSave={this.handleSaveRole}
onCancel={this.handleCancelEditRole} onCancel={this.handleCancelEditRole}

View File

@ -79,9 +79,6 @@ class UsersPage extends Component<Props> {
return this.props.createUser(this.props.source.links.users, user) return this.props.createUser(this.props.source.links.users, user)
} }
} }
private handleClickCreate = () => () => {
this.props.addUser()
}
public render() { public render() {
const source = this.props.source const source = this.props.source
@ -96,6 +93,7 @@ class UsersPage extends Component<Props> {
users, users,
roles, roles,
filterUsers, filterUsers,
addUser,
removeUser, removeUser,
editUser, editUser,
updateUserPermissions, updateUserPermissions,
@ -110,7 +108,7 @@ class UsersPage extends Component<Props> {
type="users" type="users"
onFilter={filterUsers} onFilter={filterUsers}
isEditing={users.some(u => u.isEditing)} isEditing={users.some(u => u.isEditing)}
onClickCreate={this.handleClickCreate} onClickCreate={addUser}
/> />
<div className="panel-body"> <div className="panel-body">
<FancyScrollbar> <FancyScrollbar>