IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

prettier: ran on all files again, sorry. now settings are defined in package.json

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-21 08:39:31 +01:00
parent af34f9977e
commit 3a1f52d8a2
262 changed files with 3996 additions and 7431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/app/features/dashboard/dashboard_migration.ts
View File

@@ -394,10 +394,7 @@ export class DashboardMigrator {
}
// Add special "row" panels if even one row is collapsed, repeated or has visible title
const showRows = _.some(
old.rows,
row => row.collapse || row.showTitle || row.repeat
);
const showRows = _.some(old.rows, row => row.collapse || row.showTitle || row.repeat);
for (let row of old.rows) {
if (row.repeatIteration) {
@@ -433,9 +430,7 @@ export class DashboardMigrator {
for (let panel of row.panels) {
panel.span = panel.span || DEFAULT_PANEL_SPAN;
const panelWidth = Math.floor(panel.span) * widthFactor;
const panelHeight = panel.height
? getGridHeight(panel.height)
: rowGridHeight;
const panelHeight = panel.height ? getGridHeight(panel.height) : rowGridHeight;
let panelPos = rowArea.getPanelPosition(panelHeight, panelWidth);
yPos = rowArea.yPos;
@@ -539,11 +534,7 @@ class RowArea {
}
}
if (
startPlace !== undefined &&
endPlace !== undefined &&
endPlace - startPlace >= panelWidth - 1
) {
if (startPlace !== undefined && endPlace !== undefined && endPlace - startPlace >= panelWidth - 1) {
const yPos = _.max(this.area.slice(startPlace));
place = {
x: startPlace,