Skip to content

Display all graphs from an execution in ExecutionIndex. Closes #1907 #1909

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

Merged
brollb merged 1 commit into from
Sep 17, 2020
Merged

Display all graphs from an execution in ExecutionIndex. Closes #1907 #1909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/visualizers/panels/ExecutionIndex/ExecutionIndexControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ define([
};

ExecutionIndexControl.prototype._consolidateGraphData = function (graphExecIDs) {
let graphIds = graphExecIDs.map(execId => this._graphsForExecution[execId]);
let graphIds = graphExecIDs.flatMap(execId => this._graphsForExecution[execId]);
let graphDescs = graphIds.map(id => this._getObjectDescriptor(id))
.filter(desc => !!desc);

Expand All @@ -96,12 +96,12 @@ define([
let title = desc.plotlyData.layout.title ? desc.plotlyData.layout.title : {};

if (title.text) {
title.text = `${title.text} (${desc.abbr})`;
title.text = `${title.text} (${desc.abbr || desc.jobName})`;
} else if(typeof title === 'string') {
title = `${title} (${desc.abbr})`;
title = `${title} (${desc.abbr || desc.jobName})`;
} else {
title = {
text: `Graph (${desc.abbr})`
text: `Graph (${desc.abbr || desc.jobName})`
};
}

Expand Down Expand Up @@ -206,15 +206,19 @@ define([

ExecutionIndexControl.prototype.getGraphDesc = function (graphNode) {
let id = graphNode.getId();
const execId = this._client.getNode(graphNode.getParentId()).getParentId();
const jobId = graphNode.getParentId();
const jobNode = this._client.getNode(jobId);
const execId = jobNode.getParentId();
const plotlyData = graphNode.getAttribute('data');
let desc = {
execId: execId,
jobName: jobNode.getAttribute('name'),
plotlyData: plotlyData ? JSON.parse(plotlyData) : null
};

if (!this._graphToExec[id]) {
this._graphsForExecution[desc.execId] = id;
this._graphsForExecution[desc.execId] = this._graphsForExecution[desc.execId] || [];
this._graphsForExecution[desc.execId].push(id);
this._graphToExec[id] = desc.execId;
}
let displayedCnt = this.displayedExecCount(),
Expand Down