NewPanelEdit: Fixed error with custom override properties (#23055)

packages/grafana-data/src/field/fieldOverrides.ts

@@ -204,8 +204,8 @@ function setDynamicConfigValue(config: FieldConfig, value: DynamicConfigValue, c
   const remove = val === undefined || val === null;
   const remove = val === undefined || val === null;
 
 
   if (remove) {
   if (remove) {
-    if (value.custom) {
-      delete (config?.custom as any)[value.prop];
+    if (value.custom && config.custom) {
+      delete config.custom[value.prop];
     } else {
     } else {
       delete (config as any)[value.prop];
       delete (config as any)[value.prop];
     }
     }

packages/grafana-ui/src/components/Forms/Select/Select.story.tsx

@@ -108,6 +108,33 @@ export const basicSelectPlainValue = () => {
 /**
 /**
  * Uses plain values instead of SelectableValue<T>
  * 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>
+ */
 export const multiPlainValue = () => {
 export const multiPlainValue = () => {
   const [value, setValue] = useState<string[]>();
   const [value, setValue] = useState<string[]>();