diff --git a/CHANGELOG.md b/CHANGELOG.md index dd05f637e..280e3433c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Bug Fixes 1. [#1104](https://github.com/influxdata/chronograf/pull/1104): Fix windows hosts on host list + 2. [#1125](https://github.com/influxdata/chronograf/pull/1125): Fix visualizations not showing graph name ### Features 1. [#1112](https://github.com/influxdata/chronograf/pull/1112): Add ability to delete a dashboard diff --git a/ui/src/dashboards/components/CellEditorOverlay.js b/ui/src/dashboards/components/CellEditorOverlay.js index 37d20c2da..e54abc11b 100644 --- a/ui/src/dashboards/components/CellEditorOverlay.js +++ b/ui/src/dashboards/components/CellEditorOverlay.js @@ -91,7 +91,13 @@ class CellEditorOverlay extends Component { render() { const {onCancel, autoRefresh, timeRange} = this.props - const {activeQueryIndex, cellWorkingType, queriesWorkingDraft} = this.state + const { + activeQueryIndex, + cellWorkingName, + cellWorkingType, + queriesWorkingDraft, + } = this.state + const queryActions = { addQuery: this.handleAddQuery, ..._.mapValues(queryModifiers, (qm) => this.queryStateReducer(qm)), @@ -106,6 +112,7 @@ class CellEditorOverlay extends Component { queryConfigs={queriesWorkingDraft} activeQueryIndex={0} cellType={cellWorkingType} + cellName={cellWorkingName} /> : -
+ } { dashboard ? diff --git a/ui/src/data_explorer/components/Visualization.js b/ui/src/data_explorer/components/Visualization.js index a1dc679e1..da8e6e7ac 100644 --- a/ui/src/data_explorer/components/Visualization.js +++ b/ui/src/data_explorer/components/Visualization.js @@ -18,6 +18,7 @@ const { const Visualization = React.createClass({ propTypes: { + cellName: string, cellType: string, autoRefresh: number.isRequired, timeRange: shape({ @@ -25,7 +26,6 @@ const Visualization = React.createClass({ lower: string, }).isRequired, queryConfigs: arrayOf(shape({})).isRequired, - name: string, activeQueryIndex: number, height: string, heightPixels: number, @@ -74,7 +74,14 @@ const Visualization = React.createClass({ }, render() { - const {queryConfigs, timeRange, height, heightPixels} = this.props + const { + queryConfigs, + timeRange, + height, + heightPixels, + cellName, + } = this.props + const {source} = this.context const proxyLink = source.links.proxy @@ -91,7 +98,7 @@ const Visualization = React.createClass({
- {name || "Graph"} + {cellName || "Graph"}