IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 12:44:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle DescriptionPicker's initial state #13425

Browse Source
This commit is contained in:
Johannes Schill 2018-10-11 15:06:51 +02:00
parent a42227cdff
commit 7689e9bbf2
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
View File

@ -28,6 +28,7 @@ export default class DisabledPermissionListItem extends Component<Props, any> {
onSelected={() => {}}
disabled={true}
className={'gf-form-select-box__control--menu-right'}
value={item.permission}
/>
</div>
</td>

1
public/app/core/components/PermissionList/PermissionListItem.tsx
View File

@ -79,6 +79,7 @@ export default class PermissionsListItem extends PureComponent<Props> {
onSelected={this.onPermissionChanged}
disabled={item.inherited}
className={'gf-form-select-box__control--menu-right'}
value={item.permission}
/>
</div>
</td>

7
public/app/core/components/Picker/DescriptionPicker.tsx
View File

@ -16,15 +16,19 @@ export interface Props {
onSelected: (permission) => void;
disabled: boolean;
className?: string;
value?: any;
}
const getSelectedOption = (optionsWithDesc, value) => optionsWithDesc.find(option => option.value === value);
class DescriptionPicker extends Component<Props, any> {
constructor(props) {
super(props);
}
render() {
const { optionsWithDesc, onSelected, disabled, className } = this.props;
const { optionsWithDesc, onSelected, disabled, className, value } = this.props;
const selectedOption = getSelectedOption(optionsWithDesc, value);
return (
<div className="permissions-picker">
<Select
@ -42,6 +46,7 @@ class DescriptionPicker extends Component<Props, any> {
onChange={onSelected}
getOptionValue={i => i.value}
getOptionLabel={i => i.label}
value={selectedOption}
/>
</div>
);