From 0870ccea7d3fbbf91cd9ce68d560ce782eac5d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 25 Mar 2020 14:04:41 +0100
Subject: [PATCH] NewPanelEdit: Fixed error with custom override properties
 (#23055)

---
 .../grafana-data/src/field/fieldOverrides.ts  |  4 +--
 .../components/Forms/Select/Select.story.tsx  | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-data/src/field/fieldOverrides.ts b/packages/grafana-data/src/field/fieldOverrides.ts
index 1eae9593de7..ff18d42ce4c 100644
--- a/packages/grafana-data/src/field/fieldOverrides.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.ts
@@ -204,8 +204,8 @@ function setDynamicConfigValue(config: FieldConfig, value: DynamicConfigValue, c
   const remove = val === undefined || val === null;
 
   if (remove) {
-    if (value.custom) {
-      delete (config?.custom as any)[value.prop];
+    if (value.custom && config.custom) {
+      delete config.custom[value.prop];
     } else {
       delete (config as any)[value.prop];
     }
diff --git a/packages/grafana-ui/src/components/Forms/Select/Select.story.tsx b/packages/grafana-ui/src/components/Forms/Select/Select.story.tsx
index 64aef4fc9ee..91e1eed5157 100644
--- a/packages/grafana-ui/src/components/Forms/Select/Select.story.tsx
+++ b/packages/grafana-ui/src/components/Forms/Select/Select.story.tsx
@@ -105,6 +105,33 @@ export const basicSelectPlainValue = () => {
   );
 };
 
+/**
+ * Uses plain values instead of SelectableValue<T>
+ */
+export const SelectWithOptionDescriptions = () => {
+  // TODO this is not working with new Select
+
+  const [value, setValue] = useState<number>();
+  const options = [
+    { label: 'hello', value: 1, description: 'this is a description' },
+    { label: 'hello 2', value: 2, description: 'second description' },
+  ];
+
+  return (
+    <>
+      <Select
+        options={options}
+        value={value}
+        onChange={v => {
+          setValue(v.value);
+        }}
+        size="md"
+        {...getDynamicProps()}
+      />
+    </>
+  );
+};
+
 /**
  * Uses plain values instead of SelectableValue<T>
  */