Merge branch 'min-max-field' of github.com:ryantxu/grafana into min-m…

…ax-field * 'min-max-field' of github.com:ryantxu/grafana: FieldPropEditor: Max should change max SingleStatPanels: show title if manual specified Docs: Updated changelog
ryantxu · May 3, 2019 · 3358054 · 3358054
2 parents 11fc26b + 79028d1
commit 3358054
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # 6.2.0 (unreleased)
 
+### Breaking changes
+
+* **Gauge Panel**: The suffix / prefix options have been removed from the new Guage Panel (introduced in v6.0). [#16870](https://github.com/grafana/grafana/issues/16870). 
+
 # 6.1.6 (2019-04-29)
 ### Features / Enhancements
 * **Security**: Bump jQuery to 3.4.0 . [#16761](https://github.com/grafana/grafana/pull/16761), [@dprokop](https://github.com/dprokop)

diff --git a/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx b/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx
@@ -38,7 +38,7 @@ export class FieldPropertiesEditor extends PureComponent<Props> {
   onMaxChange = (event: ChangeEvent<HTMLInputElement>) => {
     this.props.onChange({
       ...this.props.options,
-      min: toIntegerOrUndefined(event.target.value),
+      max: toIntegerOrUndefined(event.target.value),
     });
   };
 

diff --git a/packages/grafana-ui/src/utils/fieldDisplay.ts b/packages/grafana-ui/src/utils/fieldDisplay.ts
@@ -212,7 +212,7 @@ export const getFieldDisplayValues = (options: GetFieldDisplayValuesOptions): Fi
         text: 'No data',
       },
     });
-  } else if (values.length === 1) {
+  } else if (values.length === 1 && !fieldOptions.title) {
     // Don't show title for single item
     values[0].display.title = undefined;
   }