Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 27 additions & 13 deletions core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,18 @@ function drawApplicationTimeline(groupArray, eventObjArray, startTime, offset) {
locale: "en",
moment: function (date) {
return vis.moment(date).utcOffset(offset);
},
xss: {
disabled: false,
filterOptions: {
whiteList: { svg: ['width', 'height', 'class'], div: ['class', 'style', 'data-toggle', 'data-placement',
'data-html', 'data-container', 'data-title', 'data-original-title', 'title'],
text: ['x', 'y'], rect: ['x', 'y', 'class', 'width', 'height', 'rx', 'ry'],},
},
}
};

var applicationTimeline = new vis.Timeline(container);
applicationTimeline.setOptions(options);
applicationTimeline.setGroups(groups);
applicationTimeline.setItems(items);

var applicationTimeline = new vis.Timeline(container, items, groups, options);
setupZoomable("#application-timeline-zoom-lock", applicationTimeline);
setupExecutorEventAction();

Expand Down Expand Up @@ -121,13 +125,18 @@ function drawJobTimeline(groupArray, eventObjArray, startTime, offset) {
locale: "en",
moment: function (date) {
return vis.moment(date).utcOffset(offset);
},
xss: {
disabled: false,
filterOptions: {
whiteList: { svg: ['width', 'height', 'class'], div: ['class', 'style', 'data-toggle', 'data-placement',
'data-html', 'data-container', 'data-title', 'data-original-title', 'title'],
text: ['x', 'y'], rect: ['x', 'y', 'class', 'width', 'height', 'rx', 'ry'],},
},
}
};

var jobTimeline = new vis.Timeline(container);
jobTimeline.setOptions(options);
jobTimeline.setGroups(groups);
jobTimeline.setItems(items);
var jobTimeline = new vis.Timeline(container, items, groups, options);

setupZoomable("#job-timeline-zoom-lock", jobTimeline);
setupExecutorEventAction();
Expand Down Expand Up @@ -214,13 +223,18 @@ function drawTaskAssignmentTimeline(groupArray, eventObjArray, minLaunchTime, ma
locale: "en",
moment: function (date) {
return vis.moment(date).utcOffset(offset);
},
xss: {
disabled: false,
filterOptions: {
whiteList: { svg: ['width', 'height', 'class'], div: ['class', 'style', 'data-toggle', 'data-placement',
'data-html', 'data-container', 'data-title', 'data-original-title', 'title'],
text: ['x', 'y'], rect: ['x', 'y', 'class', 'width', 'height', 'rx', 'ry'],},
},
}
};

var taskTimeline = new vis.Timeline(container);
taskTimeline.setOptions(options);
taskTimeline.setGroups(groups);
taskTimeline.setItems(items);
var taskTimeline = new vis.Timeline(container, items, groups, options);

// If a user zooms while a tooltip is displayed, the user may zoom such that the cursor is no
// longer over the task that the tooltip corresponds to. So, when a user zooms, we should hide
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dev/.rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ dagre-d3.min.js
graphlib-dot.min.js
sorttable.js
vis-timeline-graph2d.min.js
vis-timeline-graph2d.min.js.map
vis-timeline-graph2d.min.css
vis-timeline-graph2d.min.css.map
dataTables.bootstrap4.1.13.2.min.css
dataTables.bootstrap4.1.13.2.min.js
dataTables.rowsGroup.js
Expand Down
29 changes: 15 additions & 14 deletions licenses-binary/LICENSE-vis-timeline.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
vis.js
https://github.com/almende/vis
vis-timeline
https://visjs.github.io/vis-timeline/

A dynamic, browser-based visualization library.
Create a fully customizable, interactive timeline with items and ranges.

@version 4.20.1-SNAPSHOT
@date 2017-10-12
@version 7.7.2
@date 2023-03-22T11:14:31.874Z

@license
Copyright (C) 2011-2017 Almende B.V, http://almende.com
@copyright (c) 2011-2017 Almende B.V, http://almende.com
@copyright (c) 2017-2019 visjs contributors, https://github.com/visjs

Vis.js is dual licensed under both
@license
vis.js is dual licensed under both

* The Apache 2.0 License
http://www.apache.org/licenses/LICENSE-2.0
1. The Apache 2.0 License
http://www.apache.org/licenses/LICENSE-2.0

and
and

* The MIT License
http://opensource.org/licenses/MIT
2. The MIT License
http://opensource.org/licenses/MIT

Vis.js may be distributed under either license.
vis.js may be distributed under either license.
29 changes: 15 additions & 14 deletions licenses/LICENSE-vis-timeline.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
vis.js
https://github.com/almende/vis
vis-timeline
https://visjs.github.io/vis-timeline/

A dynamic, browser-based visualization library.
Create a fully customizable, interactive timeline with items and ranges.

@version 4.20.1-SNAPSHOT
@date 2017-10-12
@version 7.7.2
@date 2023-03-22T11:14:31.874Z

@license
Copyright (C) 2011-2017 Almende B.V, http://almende.com
@copyright (c) 2011-2017 Almende B.V, http://almende.com
@copyright (c) 2017-2019 visjs contributors, https://github.com/visjs

Vis.js is dual licensed under both
@license
vis.js is dual licensed under both

* The Apache 2.0 License
http://www.apache.org/licenses/LICENSE-2.0
1. The Apache 2.0 License
http://www.apache.org/licenses/LICENSE-2.0

and
and

* The MIT License
http://opensource.org/licenses/MIT
2. The MIT License
http://opensource.org/licenses/MIT

Vis.js may be distributed under either license.
vis.js may be distributed under either license.