Skip to content

Commit d55d340

Browse files
author
Aleksandr
committed
IGNITE-23260 [Extensions] Update dependency versions of performance statistics module
1 parent 5dabca1 commit d55d340

24 files changed

Lines changed: 1259 additions & 1176 deletions

‎modules/performance-statistics-ext/report/css/dashboard.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ body {
6262
}
6363

6464
.sidebar .nav-link.active {
65-
color: #007bff;
65+
color: #0d6efd;
6666
}
6767

6868
.sidebar .nav-link:hover .feather,

‎modules/performance-statistics-ext/report/index.html‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<html lang="en">
1919
<head>
2020
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
21-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
21+
<meta name="viewport" content="width=device-width, initial-scale=1">
2222
<meta name="theme-color" content="#563d7c">
2323

2424
<title>Ignite performance statistics report</title>
@@ -29,10 +29,10 @@
2929
<!-- Bootstrap table. -->
3030
<link rel="stylesheet" href="libs/bootstrap-table.min.css">
3131

32-
<!-- Bootstrap select. -->
33-
<link rel="stylesheet" href="libs/bootstrap-select.min.css">
32+
<!-- Bootstrap select (use-bootstrap-select). -->
33+
<link rel="stylesheet" href="libs/use-bootstrap-select.min.css">
3434

35-
<!-- Font Awesome Free 5.13.0 -->
35+
<!-- Font Awesome Free 5.15.4 -->
3636
<link rel="stylesheet" href="libs/fontawesome/css/all.min.css">
3737

3838
<!-- Favicons. -->
@@ -42,7 +42,7 @@
4242
</head>
4343
<body>
4444
<nav class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
45-
<a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">Ignite performance statistics report</a>
45+
<a class="navbar-brand col-sm-3 col-md-2 me-0" href="#">Ignite performance statistics report</a>
4646
</nav>
4747

4848
<div class="container-fluid">
@@ -51,42 +51,42 @@
5151
<div class="sidebar-sticky">
5252
<ul class="nav flex-column">
5353
<li class="nav-item">
54-
<a class="nav-link active" data-toggle="tab" href="#clusterInfoTab" role="tab"
54+
<a class="nav-link active" data-bs-toggle="tab" href="#clusterInfoTab" role="tab"
5555
aria-selected="true">Cluster info</a>
5656
</li>
5757
<li class="nav-item">
58-
<a class="nav-link" data-toggle="tab" href="#cacheOperationsTab" role="tab"
58+
<a class="nav-link" data-bs-toggle="tab" href="#cacheOperationsTab" role="tab"
5959
aria-selected="false">Cache operations</a>
6060
</li>
6161
<li class="nav-item">
62-
<a class="nav-link" data-toggle="tab" href="#txOperationsTab" role="tab"
62+
<a class="nav-link" data-bs-toggle="tab" href="#txOperationsTab" role="tab"
6363
aria-selected="false">Transactions</a>
6464
</li>
6565
<li class="nav-item">
66-
<a class="nav-link" data-toggle="tab" href="#sqlStatisticsTab" role="tab"
66+
<a class="nav-link" data-bs-toggle="tab" href="#sqlStatisticsTab" role="tab"
6767
aria-selected="false">SQL queries</a>
6868
</li>
6969
<li class="nav-item">
70-
<a class="nav-link" data-toggle="tab" href="#scanStatisticsTab" role="tab"
70+
<a class="nav-link" data-bs-toggle="tab" href="#scanStatisticsTab" role="tab"
7171
aria-selected="false">Scan queries</a>
7272
</li>
7373
<li class="nav-item">
74-
<a class="nav-link" data-toggle="tab" href="#indexQueryStatisticsTab" role="tab"
74+
<a class="nav-link" data-bs-toggle="tab" href="#indexQueryStatisticsTab" role="tab"
7575
aria-selected="false">Index queries</a>
7676
</li>
7777
<li class="nav-item">
78-
<a class="nav-link" data-toggle="tab" href="#computeStatisticsTab" role="tab"
78+
<a class="nav-link" data-bs-toggle="tab" href="#computeStatisticsTab" role="tab"
7979
aria-selected="false">Tasks and jobs</a>
8080
</li>
8181
<li class="nav-item">
82-
<a class="nav-link" data-toggle="tab" href="#systemViewTab" role="tab"
82+
<a class="nav-link" data-bs-toggle="tab" href="#systemViewTab" role="tab"
8383
aria-selected="false">System views</a>
8484
</li>
8585
</ul>
8686
</div>
8787
</nav>
8888

89-
<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-4">
89+
<main role="main" class="col-md-9 ms-sm-auto col-lg-10 px-4">
9090
<div class="tab-content">
9191
<div class="tab-pane fade show active" id="clusterInfoTab" role="tabpanel">
9292
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
@@ -103,8 +103,10 @@ <h2 class="mt-4">Started caches</h2>
103103
<h1 class="h2">Cache operations statistics</h1>
104104
</div>
105105

106-
<select id="searchCaches" class="selectpicker" data-live-search="true"></select>
107-
<select id="searchNodes" class="selectpicker" data-live-search="true"></select>
106+
<div class="d-flex gap-2 mb-3" style="max-width: 50%;">
107+
<select id="searchCaches" class="form-select" data-searchable="true"></select>
108+
<select id="searchNodes" class="form-select" data-searchable="true"></select>
109+
</div>
108110

109111
<div id="operationsCharts"></div>
110112
</div>
@@ -113,8 +115,10 @@ <h1 class="h2">Cache operations statistics</h1>
113115
<h1 class="h2">Transactions statistics</h1>
114116
</div>
115117

116-
<select id="txSearchCaches" class="selectpicker" data-live-search="true"></select>
117-
<select id="txSearchNodes" class="selectpicker" data-live-search="true"></select>
118+
<div class="d-flex gap-2 mb-3" style="max-width: 50%;">
119+
<select id="txSearchCaches" class="form-select" data-searchable="true"></select>
120+
<select id="txSearchNodes" class="form-select" data-searchable="true"></select>
121+
</div>
118122

119123
<div id="txCharts"></div>
120124
</div>
@@ -158,8 +162,10 @@ <h2 class="mt-4">Top of slowest tasks</h2>
158162
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
159163
<h1 class="h2">System views</h1>
160164
</div>
161-
<select id="sysViewSearchNodes" class="selectpicker" data-live-search="true"></select>
162-
<select id="searchViews" class="selectpicker" data-live-search="true"></select>
165+
<div class="d-flex gap-2 mb-3" style="max-width: 50%;">
166+
<select id="sysViewSearchNodes" class="form-select" data-searchable="true"></select>
167+
<select id="searchViews" class="form-select" data-searchable="true"></select>
168+
</div>
163169

164170
<div id="systemViewTableDiv"></div>
165171
</div>
@@ -168,10 +174,11 @@ <h1 class="h2">System views</h1>
168174
</div>
169175
</div>
170176

171-
<!-- Bootstrap JS, Popper.js, and jQuery. -->
172-
<script src="libs/jquery-3.6.1.min.js"></script>
173-
<script src="libs/popper.min.js"></script>
174-
<script src="libs/bootstrap.min.js"></script>
177+
<!-- jQuery. -->
178+
<script src="libs/jquery-3.7.1.min.js"></script>
179+
180+
<!-- Bootstrap JS (includes Popper.js). -->
181+
<script src="libs/bootstrap.bundle.min.js"></script>
175182

176183
<!-- Bootstrap table. -->
177184
<script src="libs/bootstrap-table.min.js"></script>
@@ -185,8 +192,8 @@ <h1 class="h2">System views</h1>
185192
<!-- Chart JS. -->
186193
<script src="libs/Chart.min.js"></script>
187194

188-
<!-- Bootstrap select. -->
189-
<script src="libs/bootstrap-select.min.js"></script>
195+
<!-- Bootstrap select (use-bootstrap-select). -->
196+
<script src="libs/use-bootstrap-select.min.js"></script>
190197

191198
<!-- Report data. -->
192199
<script type="text/javascript" src="data/data.json.js"></script>

‎modules/performance-statistics-ext/report/js/utils.js‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ function sortByKeyAsc(array, key) {
5454
});
5555
}
5656

57-
/** Builds bootstrap-select for caches. */
57+
/** Builds select for caches. */
5858
function buildSelectCaches(el, onSelect) {
59-
el.append('<option data-content="<b>All caches</b>" value="total"/>');
59+
el.append('<option value="total">All caches</option>');
6060

6161
var caches = REPORT_DATA.clusterInfo.caches;
6262

@@ -66,40 +66,44 @@ function buildSelectCaches(el, onSelect) {
6666
$.each(caches, function (idx, cache) {
6767
var name = cache.name === undefined || cache.name == null ? cache.id : cache.name;
6868

69-
el.append('<option data-content="' + name + '" value="' + cache.id + '"/>');
69+
el.append('<option value="' + cache.id + '">' + name + '</option>');
7070
});
7171

72-
el.on('changed.bs.select', onSelect);
72+
UseBootstrapSelect.getOrCreateInstance(el[0]);
73+
el.on('change', onSelect);
7374
}
7475

75-
/** Builds bootstrap-select for nodes. */
76+
/** Builds select for nodes. */
7677
function buildSelectNodes(el, onSelect) {
77-
el.append('<option data-content="<b>All nodes</b>" value="total"/>');
78+
el.append('<option value="total">All nodes</option>');
7879

7980
var nodes = REPORT_DATA.clusterInfo.nodes;
8081

8182
$.each(nodes, (nodeId, node) => {
82-
el.append('<option data-content="' + node.id + '" value="' + node.id + '"/>');
83+
el.append('<option value="' + node.id + '">' + node.id + '</option>');
8384
});
8485

85-
el.on('changed.bs.select', onSelect);
86+
UseBootstrapSelect.getOrCreateInstance(el[0]);
87+
el.on('change', onSelect);
8688
}
8789

88-
/** Builds bootstrap-select for nodes in system view tab. */
90+
/** Builds select for nodes in system view tab. */
8991
function buildSelectNodesSystemView(el, onSelect) {
90-
el.append('<option data-content="<b>All nodes</b>" value="total"/>');
92+
el.append('<option value="total">All nodes</option>');
9193

9294
Object.keys(REPORT_DATA['systemView']).forEach(nodeId =>
93-
el.append('<option data-content="' + nodeId + '" value="' + nodeId + '"/>'));
95+
el.append('<option value="' + nodeId + '">' + nodeId + '</option>'));
9496

95-
el.on('changed.bs.select', onSelect);
97+
UseBootstrapSelect.getOrCreateInstance(el[0]);
98+
el.on('change', onSelect);
9699
}
97100

98-
/** Builds bootstrap-select for system views. */
101+
/** Builds select for system views. */
99102
function buildSelectSystemViews(el, onSelect) {
100103
const views = new Set(Object.values(REPORT_DATA['systemView']).flatMap(nodeData => Object.keys(nodeData)));
101104

102-
views.forEach(view => el.append('<option data-content="' + view + '" value="' + view + '"/>'));
105+
views.forEach(view => el.append('<option value="' + view + '">' + view + '</option>'));
103106

104-
el.on('changed.bs.select', onSelect);
107+
UseBootstrapSelect.getOrCreateInstance(el[0]);
108+
el.on('change', onSelect);
105109
}

‎modules/performance-statistics-ext/report/libs/Chart.min.js‎

Lines changed: 5 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)