Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #812 from influxdata/bugfix/layout-gaps 

Fix layout autoflow to handle multiple cells per layout
pull/10616/head
Nathan Haugo 2017-01-27 11:26:38 -08:00 committed by GitHub
parent 5d8cabab09 62acebc5c4
commit 5ad0292de6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
### Upcoming Bug Fixes ### Upcoming Bug Fixes
1. [#788](https://github.com/influxdata/chronograf/pull/788): Fix missing fields in data explorer when using non-default retention policy 1. [#788](https://github.com/influxdata/chronograf/pull/788): Fix missing fields in data explorer when using non-default retention policy
1. [#774](https://github.com/influxdata/chronograf/issues/774): Fix gaps in layouts for hosts
### Upcoming Features ### Upcoming Features
1. [#779](https://github.com/influxdata/chronograf/issues/779): Add layout for telegraf's diskio system plugin 1. [#779](https://github.com/influxdata/chronograf/issues/779): Add layout for telegraf's diskio system plugin

12
ui/src/hosts/containers/HostPage.js
View File

@ -86,13 +86,17 @@ export const HostPage = React.createClass({
const cellHeight = 4; const cellHeight = 4;
const pageWidth = 12; const pageWidth = 12;
const autoflowCells = autoflowLayouts.reduce((allCells, layout, i) => { let cellCount = 0;
return allCells.concat(layout.cells.map((cell, j) => { const autoflowCells = autoflowLayouts.reduce((allCells, layout) => {
return allCells.concat(layout.cells.map((cell) => {
const x = (cellCount * cellWidth % pageWidth);
const y = Math.floor(cellCount * cellWidth / pageWidth) * cellHeight;
cellCount += 1;
return Object.assign(cell, { return Object.assign(cell, {
w: cellWidth, w: cellWidth,
h: cellHeight, h: cellHeight,
x: ((i + j) * cellWidth % pageWidth), x,
y: Math.floor(((i + j) * cellWidth / pageWidth)) * cellHeight, y,
}); });
})); }));
}, []); }, []);