8000 hides wrong label in the statistics memory tooltip + node 16 build support by hkernbach · Pull Request #14389 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

hides wrong label in the statistics memory tooltip + node 16 build support #14389

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 communi 8000 ty.

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
merged 3 commits into from
Jun 23, 2021
Merged

hides wrong label in the statistics memory tooltip + node 16 build support #14389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74a1e24
hides wrong label in the statistics memory tooltip, add support to bu…
hkernbach Jun 21, 2021
42bbab9
changelog
hkernbach Jun 23, 2021
e9e973d
Merge branch 'devel' into bug-fix/ui-add-node-16-support-and-fix-memo…
jsteemann Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
10000
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
devel
-----

* Web UI: Disables the hover tooltip within the statistics view of the
memory consumption chart.

* Raised the versions of the node modules `node-sass` and `sass-loader`
to be able to build the Web UI with Node v16+.

* Improve usability of hidden options: `--help` mentions that these exist
and how to display them.

Expand Down
10 changes: 7 additions & 3 deletions js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@
'values': [
{
label: 'used',
value: newData.residentSizePercent * 100
value: parseFloat((newData.residentSizePercent * 100).toFixed(2))
}
]
},
Expand All @@ -506,7 +506,7 @@
'values': [
{
label: 'used',
value: 100 - newData.residentSizePercent * 100
value: parseFloat((100 - newData.residentSizePercent * 100).toFixed(2))
}
]
}
Expand Down Expand Up @@ -898,7 +898,11 @@
return d + '%';
})
.showMaxMin(false);
self.residentChart.xAxis.showMaxMin(false);
self.residentChart.xAxis
.tickFormat(function () {
return "";
})
.showMaxMin(false);

d3.select('#residentSizeChart svg')
.datum(self.history[self.server].residentSizeChart)
Expand Down
4 changes: 2 additions & 2 deletions js/apps/system/_admin/aardvark/APP/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"lodash": "^4.17.11",
"marked": "^0.7.0",
"mini-css-extract-plugin": "0.4.3",
"node-sass": "^4.14.1",
"node-sass": "^6.0.0",
"noty": "^3.2.0-beta",
"nvd3": "^1.8.6",
"optimize-css-assets-webpack-plugin": "5.0.1",
Expand All @@ -73,7 +73,7 @@
"react-dev-utils": "^6.1.1",
"react-dom": "^16.13.1",
"resolve": "1.8.1",
"sass-loader": "^7.3.1",
"sass-loader": "^10.1.1",
"sigma": "1.2.0",
"style-loader": "^0.23.1",
"terser-webpack-plugin": "^3.0.6",
Expand Down
Loading
0