Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix react key warning #672

Merged
merged 4 commits into from
Nov 16, 2015
Merged

Fix react key warning #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d5b917
Fix react key warning
davkal Nov 13, 2015
232a2eb
Fix react error in NodeDetailsControls
davkal Nov 13, 2015
2000890
Mitigate flattenChildren warning
davkal Nov 13, 2015
ee51247
Fix getDOMNode warning
davkal Nov 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions client/app/scripts/components/node-details-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ const NodeDetailsControls = React.createClass({

return (
<div className="node-details-controls">
{this.props.controls && this.props.controls.map(control => {
return (
<NodeControlButton control={control} pending={this.props.pending} />
);
})}
<span className="node-details-controls-buttons">
{this.props.controls && this.props.controls.map(control => {
return (
<NodeControlButton control={control} pending={this.props.pending} key={control.id} />
);
})}
</span>
{this.props.controls && <span title="Applying..." className={spinnerClassName}></span>}
{this.props.error && <div className="node-details-controls-error" title={this.props.error}>
<span className="node-details-controls-error-icon fa fa-warning" />
Expand Down
2 changes: 1 addition & 1 deletion client/app/scripts/components/node-details-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const NodeDetailsTable = React.createClass({

{this.props.rows.map(function(row) {
return (
<div className="node-details-table-row" key={row.key + row.value_major}>
<div className="node-details-table-row" key={row.key + row.value_major + row.value_minor}>
<div className="node-details-table-row-key truncate" title={row.key}>{row.key}</div>
{ row.value_type === 'numeric' && <div className="node-details-table-row-value-scalar">{row.value_major}</div> }
{ row.value_type === 'numeric' && <div className="node-details-table-row-value-unit">{row.value_minor}</div> }
Expand Down
7 changes: 4 additions & 3 deletions client/app/scripts/components/sparkline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Forked from: https://github.com/KyleAMathews/react-sparkline at commit a9d7c5203d8f240938b9f2288287aaf0478df013
const React = require('react');
const ReactDOM = require('react-dom');
const d3 = require('d3');

const Sparkline = React.createClass({
Expand All @@ -21,7 +22,7 @@ const Sparkline = React.createClass({

renderSparkline: function() {
// If the sparkline has already been rendered, remove it.
const el = this.getDOMNode();
const el = ReactDOM.findDOMNode(this);
while (el.firstChild) {
el.removeChild(el.firstChild);
}
Expand Down Expand Up @@ -89,9 +90,9 @@ const Sparkline = React.createClass({
title = data.length + ' samples, min: ' + d3.round(d3.min(data), 2) + ', max: ' + d3.round(d3.max(data), 2) + ', mean: ' + d3.round(d3.mean(data), 2);
}

d3.select(this.getDOMNode()).attr('title', title);
d3.select(ReactDOM.findDOMNode(this)).attr('title', title);

const svg = d3.select(this.getDOMNode()).
const svg = d3.select(ReactDOM.findDOMNode(this)).
append('svg').
attr('width', this.props.width).
attr('height', this.props.height).
Expand Down
9 changes: 7 additions & 2 deletions client/app/scripts/components/topology-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@ const TopologyOptions = React.createClass({

renderAction: function(action, option, topologyId) {
return (
<TopologyOptionAction option={option} value={action} topologyId={topologyId} />
<TopologyOptionAction option={option} value={action} topologyId={topologyId} key={action} />
);
},

/**
* transforms a list of options into one sidebar-item.
* The sidebar text comes from the active option. the actions come from the
* remaining items.
*/
renderOption: function(items) {
let activeText;
let activeValue;
Expand Down Expand Up @@ -41,7 +46,7 @@ const TopologyOptions = React.createClass({
}, this);

return (
<div className="sidebar-item">
<div className="sidebar-item" key={option}>
{activeText}
<span className="sidebar-item-actions">
{actions}
Expand Down