Define dropdown items as const above JSX & rename for consistency
parent
33f1ab32c1
commit
4971aba341
|
@ -52,7 +52,7 @@ class NewOrganization extends Component {
|
|||
|
||||
const isSaveDisabled = name === null || name === ''
|
||||
|
||||
const defaultRoleItems = USER_ROLES.map(role => ({
|
||||
const dropdownRolesItems = USER_ROLES.map(role => ({
|
||||
...role,
|
||||
text: role.name,
|
||||
}))
|
||||
|
@ -73,7 +73,7 @@ class NewOrganization extends Component {
|
|||
/>
|
||||
<div className="orgs-table--default-role editing">
|
||||
<Dropdown
|
||||
items={defaultRoleItems}
|
||||
items={dropdownRolesItems}
|
||||
onChoose={this.handleChooseDefaultRole}
|
||||
selected={defaultRole}
|
||||
className="dropdown-stretch"
|
||||
|
|
|
@ -70,6 +70,7 @@ class NewUserTableRow extends Component {
|
|||
const {onBlur} = this.props
|
||||
const {name, provider, scheme, role, superAdmin} = this.state
|
||||
|
||||
const dropdownRolesItems = USER_ROLES.map(r => ({...r, text: r.name}))
|
||||
const preventCreate = !name || !provider
|
||||
|
||||
return (
|
||||
|
@ -86,7 +87,7 @@ class NewUserTableRow extends Component {
|
|||
</td>
|
||||
<td style={{width: colRole}}>
|
||||
<Dropdown
|
||||
items={USER_ROLES.map(r => ({...r, text: r.name}))}
|
||||
items={dropdownRolesItems}
|
||||
selected={role}
|
||||
onChoose={this.handleSelectRole}
|
||||
buttonColor="btn-primary"
|
||||
|
|
|
@ -22,6 +22,10 @@ const OrgTableRow = ({
|
|||
colActions,
|
||||
} = USERS_TABLE
|
||||
|
||||
const dropdownRolesItems = USER_ROLES.map(r => ({
|
||||
...r,
|
||||
text: r.name,
|
||||
}))
|
||||
const currentRole = user.roles.find(
|
||||
role => role.organization === organization.id
|
||||
)
|
||||
|
@ -36,10 +40,7 @@ const OrgTableRow = ({
|
|||
<td style={{width: colRole}}>
|
||||
<span className="chronograf-user--role">
|
||||
<Dropdown
|
||||
items={USER_ROLES.map(r => ({
|
||||
...r,
|
||||
text: r.name,
|
||||
}))}
|
||||
items={dropdownRolesItems}
|
||||
selected={currentRole.name}
|
||||
onChoose={onChangeUserRole(user, currentRole)}
|
||||
buttonColor="btn-primary"
|
||||
|
|
|
@ -71,7 +71,7 @@ class Organization extends Component {
|
|||
const {workingName, reset, isEditing, isDeleting, defaultRole} = this.state
|
||||
const {organization} = this.props
|
||||
|
||||
const defaultRoleItems = USER_ROLES.map(role => ({
|
||||
const dropdownRolesItems = USER_ROLES.map(role => ({
|
||||
...role,
|
||||
text: role.name,
|
||||
}))
|
||||
|
@ -103,7 +103,7 @@ class Organization extends Component {
|
|||
</div>}
|
||||
<div className={defaultRoleClassName}>
|
||||
<Dropdown
|
||||
items={defaultRoleItems}
|
||||
items={dropdownRolesItems}
|
||||
onChoose={this.handleChooseDefaultRole}
|
||||
selected={defaultRole}
|
||||
className="dropdown-stretch"
|
||||
|
|
Loading…
Reference in New Issue