chore(ui): simplify UserRole component
parent
3027ab9b7e
commit
aa95f394ee
|
@ -1,4 +1,4 @@
|
||||||
import React, {PureComponent} from 'react'
|
import React from 'react'
|
||||||
|
|
||||||
import UserPermissionsDropdown from 'src/admin/components/UserPermissionsDropdown'
|
import UserPermissionsDropdown from 'src/admin/components/UserPermissionsDropdown'
|
||||||
import UserRoleDropdown from 'src/admin/components/UserRoleDropdown'
|
import UserRoleDropdown from 'src/admin/components/UserRoleDropdown'
|
||||||
|
@ -6,7 +6,6 @@ import {USERS_TABLE} from 'src/admin/constants/tableSizing'
|
||||||
|
|
||||||
import UserRowEdit from 'src/admin/components/UserRowEdit'
|
import UserRowEdit from 'src/admin/components/UserRowEdit'
|
||||||
import {User, UserPermission} from 'src/types/influxAdmin'
|
import {User, UserPermission} from 'src/types/influxAdmin'
|
||||||
import {ErrorHandling} from 'src/shared/decorators/errors'
|
|
||||||
import {Link} from 'react-router'
|
import {Link} from 'react-router'
|
||||||
|
|
||||||
const ADMIN_STYLES = [
|
const ADMIN_STYLES = [
|
||||||
|
@ -51,7 +50,7 @@ const OssUserDBPermissions = ({user}: {user: User}) => (
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
|
|
||||||
interface UserRowProps {
|
interface Props {
|
||||||
user: User
|
user: User
|
||||||
allRoles: any[]
|
allRoles: any[]
|
||||||
allPermissions: string[]
|
allPermissions: string[]
|
||||||
|
@ -66,10 +65,7 @@ interface UserRowProps {
|
||||||
onUpdateRoles: (user: User, roles: any[]) => void
|
onUpdateRoles: (user: User, roles: any[]) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
@ErrorHandling
|
const UserRow = ({
|
||||||
class UserRow extends PureComponent<UserRowProps> {
|
|
||||||
public render() {
|
|
||||||
const {
|
|
||||||
user,
|
user,
|
||||||
allRoles,
|
allRoles,
|
||||||
allPermissions,
|
allPermissions,
|
||||||
|
@ -82,8 +78,7 @@ class UserRow extends PureComponent<UserRowProps> {
|
||||||
onCancel,
|
onCancel,
|
||||||
onUpdatePermissions,
|
onUpdatePermissions,
|
||||||
onUpdateRoles,
|
onUpdateRoles,
|
||||||
} = this.props
|
}: Props) => {
|
||||||
|
|
||||||
if (isEditing) {
|
if (isEditing) {
|
||||||
return (
|
return (
|
||||||
<UserRowEdit
|
<UserRowEdit
|
||||||
|
@ -123,7 +118,7 @@ class UserRow extends PureComponent<UserRowProps> {
|
||||||
</td>
|
</td>
|
||||||
)}
|
)}
|
||||||
<td>
|
<td>
|
||||||
{this.hasPermissions ? (
|
{hasRoles ? (
|
||||||
<UserPermissionsDropdown
|
<UserPermissionsDropdown
|
||||||
user={user}
|
user={user}
|
||||||
allPermissions={allPermissions}
|
allPermissions={allPermissions}
|
||||||
|
@ -137,10 +132,4 @@ class UserRow extends PureComponent<UserRowProps> {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private get hasPermissions() {
|
|
||||||
const {allPermissions, hasRoles} = this.props
|
|
||||||
return hasRoles && allPermissions && !!allPermissions.length
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default UserRow
|
export default UserRow
|
||||||
|
|
Loading…
Reference in New Issue