From 7689e9bbf22190b62c19e0817b8b6192156d165b Mon Sep 17 00:00:00 2001
From: Johannes Schill <johannes.schill@polyester.se>
Date: Thu, 11 Oct 2018 15:06:51 +0200
Subject: [PATCH] Handle DescriptionPicker's initial state #13425

---
 .../PermissionList/DisabledPermissionListItem.tsx          | 1 +
 .../core/components/PermissionList/PermissionListItem.tsx  | 1 +
 public/app/core/components/Picker/DescriptionPicker.tsx    | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx b/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
index 77671396505..ff679f67ae2 100644
--- a/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
+++ b/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
@@ -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>
diff --git a/public/app/core/components/PermissionList/PermissionListItem.tsx b/public/app/core/components/PermissionList/PermissionListItem.tsx
index 47ab62416ae..56b6114d236 100644
--- a/public/app/core/components/PermissionList/PermissionListItem.tsx
+++ b/public/app/core/components/PermissionList/PermissionListItem.tsx
@@ -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>
diff --git a/public/app/core/components/Picker/DescriptionPicker.tsx b/public/app/core/components/Picker/DescriptionPicker.tsx
index 2c3611cca81..4c39dcd8a79 100644
--- a/public/app/core/components/Picker/DescriptionPicker.tsx
+++ b/public/app/core/components/Picker/DescriptionPicker.tsx
@@ -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>
     );