Skip to content

N
nexpie-grafana-theme
Commit 36ef1865 by Alexander Zobnin
Options

repeat row: expose scopedVars to row panels

parent dd9c727e
Showing with 93 additions and 45 deletions
public/app/features/dashboard/dashboard_model.ts
...@@ -274,7 +274,6 @@ export class DashboardModel { ...@@ -274,7 +274,6 @@ export class DashboardModel {
this.sortPanelsByGridPos(); this.sortPanelsByGridPos();
this.events.emit('repeats-processed'); this.events.emit('repeats-processed');
console.log(this.panels);
} }
getPanelRepeatClone(sourcePanel, valueIndex, sourcePanelIndex) { getPanelRepeatClone(sourcePanel, valueIndex, sourcePanelIndex) {
...@@ -286,25 +285,42 @@ export class DashboardModel { ...@@ -286,25 +285,42 @@ export class DashboardModel {
let clone = new PanelModel(sourcePanel.getSaveModel()); let clone = new PanelModel(sourcePanel.getSaveModel());
clone.id = this.getNextPanelId(); clone.id = this.getNextPanelId();
if (sourcePanel.type === 'row') { // insert after source panel + value index
// for row clones we need to figure out panels under row to clone and where to insert clone this.panels.splice(sourcePanelIndex+valueIndex, 0, clone);
let rowPanels, insertPos;
if (sourcePanel.collapsed) { clone.repeatIteration = this.iteration;
rowPanels = sourcePanel.panels; clone.repeatPanelId = sourcePanel.id;
clone.panels = _.cloneDeep(rowPanels); clone.repeat = null;
// insert copied row after preceding row return clone;
insertPos = sourcePanelIndex + valueIndex; }
} else {
rowPanels = this.getRowPanels(sourcePanelIndex); getRowRepeatClone(sourcePanel, valueIndex, sourcePanelIndex) {
clone.panels = _.map(rowPanels, panel => panel.getSaveModel()); // if first clone return source
// insert copied row after preceding row's panels if (valueIndex === 0) {
insertPos = sourcePanelIndex + ((rowPanels.length + 1)*valueIndex); if (!sourcePanel.collapsed) {
let rowPanels = this.getRowPanels(sourcePanelIndex);
sourcePanel.panels = rowPanels;
} }
this.panels.splice(insertPos, 0, clone); return sourcePanel;
}
let clone = new PanelModel(sourcePanel.getSaveModel());
clone.id = this.getNextPanelId();
// for row clones we need to figure out panels under row to clone and where to insert clone
let rowPanels, insertPos;
if (sourcePanel.collapsed) {
rowPanels = _.cloneDeep(sourcePanel.panels);
clone.panels = rowPanels;
// insert copied row after preceding row
insertPos = sourcePanelIndex + valueIndex;
} else { } else {
// insert after source panel + value index rowPanels = this.getRowPanels(sourcePanelIndex);
this.panels.splice(sourcePanelIndex+valueIndex, 0, clone); clone.panels = _.map(rowPanels, panel => panel.getSaveModel());
// insert copied row after preceding row's panels
insertPos = sourcePanelIndex + ((rowPanels.length + 1)*valueIndex);
} }
this.panels.splice(insertPos, 0, clone);
clone.repeatIteration = this.iteration; clone.repeatIteration = this.iteration;
clone.repeatPanelId = sourcePanel.id; clone.repeatPanelId = sourcePanel.id;
...@@ -334,32 +350,43 @@ export class DashboardModel { ...@@ -334,32 +350,43 @@ export class DashboardModel {
for (let index = 0; index < selected.length; index++) { for (let index = 0; index < selected.length; index++) {
let option = selected[index]; let option = selected[index];
let copy = this.getPanelRepeatClone(panel, index, panelIndex); let copy;
copy.scopedVars = {}; if (panel.type === 'row') {
copy.scopedVars[variable.name] = option; copy = this.getRowRepeatClone(panel, index, panelIndex);
copy.scopedVars = {};
copy.scopedVars[variable.name] = option;
if (copy.type === 'row') {
let rowHeight = this.getRowHeight(copy); let rowHeight = this.getRowHeight(copy);
if (rowHeight) { // if (rowHeight) {
let panelsBelowIndex; let panelsBelowIndex;
let rowPanels = copy.panels; let rowPanels = copy.panels || [];
// insert after 'row' panel // insert after 'row' panel
let insertPos = panelIndex + ((rowPanels.length + 1) * index) + 1; let insertPos = panelIndex + ((rowPanels.length + 1) * index) + 1;
if (copy.collapsed) { if (copy.collapsed) {
copy.gridPos.y += index; copy.gridPos.y += index;
yPos += index; yPos += index;
panelsBelowIndex = panelIndex + index + 1; panelsBelowIndex = panelIndex + index + 1;
_.each(copy.panels, (panel, i) => {
_.each(copy.panels, (panel, i) => {
panel.scopedVars = {};
panel.scopedVars[variable.name] = option;
if (index > 0) {
panel.id = this.getNextPanelId(); panel.id = this.getNextPanelId();
panel.repeatIteration = this.iteration; panel.repeatIteration = this.iteration;
panel.repeatPanelId = rowPanels[i].id; panel.repeatPanelId = rowPanels[i].id;
panel.repeat = null; panel.repeat = null;
copy.panels[i] = panel; copy.panels[i] = panel;
}); }
} else { });
_.each(rowPanels, (rowPanel, i) => { } else {
_.each(rowPanels, (rowPanel, i) => {
rowPanel.scopedVars = {};
rowPanel.scopedVars[variable.name] = option;
if (index > 0) {
let cloneRowPanel = new PanelModel(rowPanel); let cloneRowPanel = new PanelModel(rowPanel);
cloneRowPanel.id = this.getNextPanelId(); cloneRowPanel.id = this.getNextPanelId();
cloneRowPanel.repeatIteration = this.iteration; cloneRowPanel.repeatIteration = this.iteration;
...@@ -367,19 +394,23 @@ export class DashboardModel { ...@@ -367,19 +394,23 @@ export class DashboardModel {
cloneRowPanel.repeat = null; cloneRowPanel.repeat = null;
cloneRowPanel.gridPos.y += rowHeight * index; cloneRowPanel.gridPos.y += rowHeight * index;
this.panels.splice(insertPos+i, 0, cloneRowPanel); this.panels.splice(insertPos+i, 0, cloneRowPanel);
}); }
copy.panels = []; });
copy.gridPos.y += rowHeight * index; copy.panels = [];
yPos += rowHeight; copy.gridPos.y += rowHeight * index;
panelsBelowIndex = insertPos+rowPanels.length; yPos += rowHeight;
} panelsBelowIndex = insertPos+rowPanels.length;
}
// Update gridPos for panels below // Update gridPos for panels below
for (let i = panelsBelowIndex; i< this.panels.length; i++) { for (let i = panelsBelowIndex; i< this.panels.length; i++) {
this.panels[i].gridPos.y += yPos; this.panels[i].gridPos.y += yPos;
}
} }
} else { } else {
copy = this.getPanelRepeatClone(panel, index, panelIndex);
copy.scopedVars = {};
copy.scopedVars[variable.name] = option;
if (panel.repeatDirection === REPEAT_DIR_VERTICAL) { if (panel.repeatDirection === REPEAT_DIR_VERTICAL) {
copy.gridPos.y = yPos; copy.gridPos.y = yPos;
yPos += copy.gridPos.h; yPos += copy.gridPos.h;
......
public/app/features/dashboard/specs/repeat.jest.ts
...@@ -187,6 +187,23 @@ describe('given dashboard with row repeat', function() { ...@@ -187,6 +187,23 @@ describe('given dashboard with row repeat', function() {
]); ]);
}); });
it('should set scopedVars for each panel', function() {
dashboardJSON.templating.list[0].options[2].selected = true;
dashboard = new DashboardModel(dashboardJSON);
dashboard.processRepeats();
const scopedVars = _.compact(_.map(dashboard.panels, (panel) => {
if (panel.scopedVars) {
return panel.scopedVars.apps.value;
}
}));
expect(scopedVars).toEqual([
'se1', 'se1', 'se1',
'se2', 'se2', 'se2',
'se3', 'se3', 'se3',
]);
});
it('should repeat only row if it is collapsed', function() { it('should repeat only row if it is collapsed', function() {
dashboardJSON.panels = [ dashboardJSON.panels = [
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment