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

hkernbach · jsteemann · web-flow · commit 9d2b1756e7d2 · 2021-06-23T22:24:40.000+02:00
Co-authored-by: Jan &lt;jsteemann@users.noreply.github.com&gt;
diff --git a/CHANGELOG b/CHANGELOG
@@ -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.
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
@@ -496,7 +496,7 @@
           'values': [
             {
               label: 'used',
-              value: newData.residentSizePercent * 100
+              value: parseFloat((newData.residentSizePercent * 100).toFixed(2))
             }
           ]
         },
@@ -506,7 +506,7 @@
           'values': [
             {
               label: 'used',
-              value: 100 - newData.residentSizePercent * 100
+              value: parseFloat((100 - newData.residentSizePercent * 100).toFixed(2))
             }
           ]
         }
@@ -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)
diff --git a/js/apps/system/_admin/aardvark/APP/react/package.json b/js/apps/system/_admin/aardvark/APP/react/package.json
@@ -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",
@@ -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",
diff --git a/js/apps/system/_admin/aardvark/APP/react/yarn.lock b/js/apps/system/_admin/aardvark/APP/react/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@`
`496`	`496`	`'values': [`
`497`	`497`	`{`
`498`	`498`	`label: 'used',`
`499`		`- value: newData.residentSizePercent * 100`
	`499`	`+ value: parseFloat((newData.residentSizePercent * 100).toFixed(2))`
`500`	`500`	`}`
`501`	`501`	`]`
`502`	`502`	`},`
`@@ -506,7 +506,7 @@`
`506`	`506`	`'values': [`
`507`	`507`	`{`
`508`	`508`	`label: 'used',`
`509`		`- value: 100 - newData.residentSizePercent * 100`
	`509`	`+ value: parseFloat((100 - newData.residentSizePercent * 100).toFixed(2))`
`510`	`510`	`}`
`511`	`511`	`]`
`512`	`512`	`}`
`@@ -898,7 +898,11 @@`
`898`	`898`	`return d + '%';`
`899`	`899`	`})`
`900`	`900`	`.showMaxMin(false);`
`901`		`- self.residentChart.xAxis.showMaxMin(false);`
	`901`	`+ self.residentChart.xAxis`
	`902`	`+ .tickFormat(function () {`
	`903`	`+ return "";`
	`904`	`+ })`
	`905`	`+ .showMaxMin(false);`
`902`	`906`
`903`	`907`	`d3.select('#residentSizeChart svg')`
`904`	`908`	`.datum(self.history[self.server].residentSizeChart)`