Skip to content

Refresh UI and modernize its dependencies #22831

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
wendigo merged 9 commits into from
Oct 9, 2024
Merged

Refresh UI and modernize its dependencies #22831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f35ae07
Update vis.timeline to 7.7.3
wendigo Jul 26, 2024
2e1cb4a
Remove HTML5 shims
wendigo Jul 26, 2024
77e2dcc
Update JQuery to 3.7.1
wendigo Jul 26, 2024
231668d
Update ClipboardJS to 2.0.11
wendigo Jul 26, 2024
a338fcb
Update highlightjs to 11.10.0 and use it as react component
wendigo Jul 26, 2024
5ed2b48
Change highlightjs theme to stackoverflow-dark
wendigo Jul 26, 2024
3562171
Remove background color from highlighted blocks
wendigo Jul 26, 2024
4d36e5c
Add links to query details from list
wendigo Jul 26, 2024
f7f9f92
Use trino color palette
wendigo Oct 9, 2024
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
6 changes: 0 additions & 6 deletions core/trino-web-ui/src/main/resources/oauth2/failure.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
<!-- Bootstrap core -->
<link href="/ui/vendor/bootstrap/css/bootstrap.css" rel="stylesheet">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- jQuery -->
<script type="text/javascript" src="/ui/vendor/jquery/jquery-3.5.1.min.js"></script>

Expand Down
6 changes: 0 additions & 6 deletions core/trino-web-ui/src/main/resources/oauth2/logout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
<!-- Bootstrap core -->
<link href="/ui/vendor/bootstrap/css/bootstrap.css" rel="stylesheet">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- CSS loader -->
<link href="/ui/vendor/css-loaders/loader.css" rel="stylesheet">

Expand Down
6 changes: 0 additions & 6 deletions core/trino-web-ui/src/main/resources/oauth2/success.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
<!-- Bootstrap core -->
<link href="/ui/vendor/bootstrap/css/bootstrap.css" rel="stylesheet">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- jQuery -->
<script type="text/javascript" src="/ui/vendor/jquery/jquery-3.5.1.min.js"></script>

Expand Down
54 changes: 29 additions & 25 deletions core/trino-web-ui/src/main/resources/webapp/assets/css/timeline.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@
* limitations under the License.
*/

.vis.timeline .item {
.vis-timeline .vis-item {
padding: 0px;
}
.vis.timeline .labelset .vlabel .inner {
.vis-timeline .vis-labelset .vis-label .vis-inner {
padding: 0px;
}
.vis.timeline .item.range {
height: 3px;
.vis-timeline .vis-item.vis-range {
height: 0.8em;
}
.vis.timeline .red {
background-color: #F2DEDE;
border-color: #F2AEAE;
.vis-timeline .red {
background-color: #DD00A1;
border-color: #252830;
}
.vis.timeline .green {
background-color: #DFF0DB;
border-color: #B8F0AA;
.vis-timeline .gray {
background-color: #9E9E9E;
border-color: #252830;
}
.vis.timeline .blue {
background-color: #E3E9FC;
border-color: #B0C3FC;
.vis-timeline .blue {
background-color: #001C93;
border-color: #252830;
}
.vis.timeline .orange {
background-color: #FFA500;
border-color: #B0C3FC;
.vis-timeline .orange {
background-color: #F88600;
border-color: #252830;
}
#legend {
padding: 10px 40px
Expand All @@ -50,24 +50,28 @@
margin-left: -20px;
}
#legend .red {
background-color: #F2DEDE;
border-color: #F2AEAE;
background-color: #DD00A1;
border-color: #252830;
}
#legend .green {
background-color: #DFF0DB;
border-color: #B8F0AA;
#legend .gray {
background-color: #9E9E9E;
border-color: #252830;
}
#legend .blue {
background-color: #E3E9FC;
border-color: #B0C3FC;
background-color: #001C93;
border-color: #252830;
}
#legend .orange {
background-color: #FFA500;
border-color: #B0C3FC;
background-color: #F88600;
border-color: #252830;
}
#legend .empty {
border-style: none;
}
#legend>div {
display: inline-block;
}

.vis-text {
color: white !important;
}
158 changes: 80 additions & 78 deletions core/trino-web-ui/src/main/resources/webapp/assets/js/timeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,88 +12,90 @@
* limitations under the License.
*/

d3.json('/ui/api/query/' + window.location.search.substring(1), function (query) {
d3.select('#queryId').text(query.queryId);
renderTimeline(query);
});
$(document).ready(function () {
$.ajax({url: '/ui/api/query/' + window.location.search.substring(1)})
.done(function(data) {
$('#queryId').text(data.queryId);
renderTimeline(data);

function renderTimeline(data) {
function getTasks(stage) {
return [].concat.apply(
stage.tasks,
stage.subStages.map(getTasks));
}
tasks = getTasks(data.outputStage);
tasks = tasks.map(function(task) {
return {
taskId: task.taskStatus.taskId.substring(task.taskStatus.taskId.indexOf('.') + 1),
time: {
create: task.stats.createTime,
firstStart: task.stats.firstStartTime,
lastStart: task.stats.lastStartTime,
lastEnd: task.stats.lastEndTime,
end: task.stats.endTime,
},
};
});
});

var groups = new vis.DataSet();
var items = new vis.DataSet();
for (var i = 0; i < tasks.length; i++) {
var task = tasks[i];
var stageId = task.taskId.substr(0, task.taskId.indexOf("."));
var taskNumber = task.taskId.substr(task.taskId.indexOf(".") + 1);
if (taskNumber == 0) {
groups.add({
id: stageId,
content: stageId,
sort: stageId,
subgroupOrder: 'sort',
});
function renderTimeline(data) {
function getTasks(stage) {
return [].concat.apply(
stage.tasks,
stage.subStages.map(getTasks));
}
items.add({
group: stageId,
start: task.time.create,
end: task.time.firstStart,
className: 'red',
subgroup: taskNumber,
sort: -taskNumber,
});
items.add({
group: stageId,
start: task.time.firstStart,
end: task.time.lastStart,
className: 'green',
subgroup: taskNumber,
sort: -taskNumber,
});
items.add({
group: stageId,
start: task.time.lastStart,
end: task.time.lastEnd,
className: 'blue',
subgroup: taskNumber,
sort: -taskNumber,
});
items.add({
group: stageId,
start: task.time.lastEnd,
end: task.time.end,
className: 'orange',
subgroup: taskNumber,
sort: -taskNumber,

tasks = getTasks(data.outputStage);
tasks = tasks.map(function (task) {
return {
taskId: task.taskStatus.taskId.substring(task.taskStatus.taskId.indexOf('.') + 1),
time: {
create: task.stats.createTime,
firstStart: task.stats.firstStartTime,
lastStart: task.stats.lastStartTime,
lastEnd: task.stats.lastEndTime,
end: task.stats.endTime,
},
};
});
}

var options = {
stack: false,
groupOrder: 'sort',
padding: 0,
margin: 0,
clickToUse: true,
};
var groups = new vis.DataSet();
var items = new vis.DataSet();
for (var i = 0; i < tasks.length; i++) {
var task = tasks[i];
var stageId = task.taskId.substr(0, task.taskId.indexOf("."));
var taskNumber = task.taskId.substr(task.taskId.indexOf(".") + 1);
if (taskNumber == 0) {
groups.add({
id: stageId,
content: stageId,
sort: stageId,
subgroupOrder: 'sort',
});
}
items.add({
group: stageId,
start: task.time.create,
end: task.time.firstStart,
className: 'gray',
subgroup: taskNumber,
sort: -taskNumber,
});
items.add({
group: stageId,
start: task.time.firstStart,
end: task.time.lastStart,
className: 'red',
subgroup: taskNumber,
sort: -taskNumber,
});
items.add({
group: stageId,
start: task.time.lastStart,
end: task.time.lastEnd,
className: 'blue',
subgroup: taskNumber,
sort: -taskNumber,
});
items.add({
group: stageId,
start: task.time.lastEnd,
end: task.time.end,
className: 'orange',
subgroup: taskNumber,
sort: -taskNumber,
});
}

var container = document.getElementById('timeline');
var options = {
stack: false,
groupOrder: 'sort',
margin: 0,
clickToUse: true,
};

var timeline = new vis.Timeline(container, items, groups, options);
}
new vis.Timeline(document.getElementById('timeline'), items, groups, options);
}
});
4 changes: 2 additions & 2 deletions core/trino-web-ui/src/main/resources/webapp/assets/trino.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
pre {
margin: 0;
padding: 5px;
color: #999;
background-color: #2C2F38;
color: #9e9e9e;
background-color: #212121;
border: none;
}

Expand Down
8 changes: 1 addition & 7 deletions core/trino-web-ui/src/main/resources/webapp/disabled.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,8 @@
<!-- Bootstrap core -->
<link href="vendor/bootstrap/css/bootstrap.css" rel="stylesheet">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- jQuery -->
<script type="text/javascript" src="vendor/jquery/jquery-3.5.1.min.js"></script>
<script type="text/javascript" src="vendor/jquery/jquery-3.7.1.min.js"></script>

<!-- Bootstrap JS -->
<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.js"></script>
Expand Down
11 changes: 2 additions & 9 deletions core/trino-web-ui/src/main/resources/webapp/embedded_plan.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,8 @@
<!-- Bootstrap core -->
<link href="vendor/bootstrap/css/bootstrap.css" rel="stylesheet">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- jQuery -->
<script type="text/javascript" src="vendor/jquery/jquery-3.5.1.min.js"></script>
<script type="text/javascript" src="vendor/jquery/jquery-3.7.1.min.js"></script>

<!-- Bootstrap JS -->
<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.js"></script>
Expand All @@ -28,8 +22,7 @@
<script type="text/javascript" src="vendor/jquery.sparkline/jquery.sparkline.min.js"></script>

<!-- Code highlighting -->
<link rel="stylesheet" href="vendor/highlightjs/9.3/styles/solarized-dark.css">
<script src="vendor/highlightjs/9.3/highlight.pack.js"></script>
<link rel="stylesheet" href="vendor/highlightjs/styles/trino.css">

<!-- CSS loader -->
<link href="vendor/css-loaders/loader.css" rel="stylesheet">
Expand Down
9 changes: 3 additions & 6 deletions core/trino-web-ui/src/main/resources/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@
<!-- Bootstrap core -->
<link href="vendor/bootstrap/css/bootstrap.css" rel="stylesheet">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- Code highlighting -->
<link href="vendor/highlightjs/styles/trino.css" rel="stylesheet">

<!-- jQuery -->
<script type="text/javascript" src="vendor/jquery/jquery-3.5.1.min.js"></script>
<script type="text/javascript" src="vendor/jquery/jquery-3.7.1.min.js"></script>

<!-- Bootstrap JS -->
<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.js"></script>
Expand Down
8 changes: 1 addition & 7 deletions core/trino-web-ui/src/main/resources/webapp/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,8 @@
<!-- Bootstrap core -->
<link href="vendor/bootstrap/css/bootstrap.css" rel="stylesheet">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- jQuery -->
<script type="text/javascript" src="vendor/jquery/jquery-3.5.1.min.js"></script>
<script type="text/javascript" src="vendor/jquery/jquery-3.7.1.min.js"></script>

<!-- Bootstrap JS -->
<script type="text/javascript" src="vendor/bootstrap/js/bootstrap.js"></script>
Expand Down
Loading