Skip to content

Commit 0f607e9

Browse files
authored
Pewpew updates20220906 (#98)
* Updated dependencies Cargo and npm * Fixed clippy and format warnings * Fixed tests that are failing in Rust 1.63 - Rust version 1.63 changed how they convert float to Durations. Previously they truncated, now they round - https://github.com/rust-lang/rust/releases/tag/1.63.0 - rust-lang/rust#96051 - 'Rounding is now used when converting a float to a Duration. The converted duration can differ slightly from what it was.' * Fixed the names of some variables to match what they are
1 parent 154445c commit 0f607e9

21 files changed

+6268
-6229
lines changed

Cargo.lock

+204-166
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ url = "2"
5151
yansi = "0.5"
5252
zip_all = { path = "./lib/zip_all" }
5353
# https://github.com/softprops/json-env-logger/issues/6
54-
log = { version = "0.4.14", features = ["kv_unstable_std"] }
54+
log = { version = "0.4", features = ["kv_unstable_std"] }
5555
env_logger = "0.9"
5656
json_env_logger = { version = "0.1", features = ["iso-timestamps"] }
5757
# https://github.com/sfackler/rust-openssl/issues/1021#issuecomment-605602642

guide/results-viewer-react/package-lock.json

+833-845
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

guide/results-viewer-react/package.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,48 @@
1818
"license": "ISC",
1919
"dependencies": {
2020
"@fs/hdr-histogram-wasm": "file:./lib/hdr-histogram-wasm",
21-
"chart.js": "^3.8.0",
21+
"chart.js": "^3.9.1",
2222
"chartjs-adapter-date-fns": "^2.0.0",
23-
"date-fns": "^2.28.0",
23+
"date-fns": "^2.29.2",
2424
"file-saver": "^2.0.5",
2525
"immutability-helper": "^3.1.1",
2626
"js-yaml": "^4.1.0",
2727
"react": "^18.2.0",
2828
"react-accessible-accordion": "^5.0.0",
2929
"react-dom": "^18.2.0",
3030
"react-dropzone": "^14.2.2",
31-
"react-transition-group": "^4.4.2",
31+
"react-transition-group": "^4.4.5",
3232
"styled-components": "^5.3.5"
3333
},
3434
"devDependencies": {
35-
"@babel/core": "^7.18.9",
36-
"@storybook/addon-actions": "^6.5.9",
37-
"@storybook/addon-essentials": "^6.5.9",
38-
"@storybook/addon-interactions": "^6.5.9",
39-
"@storybook/addon-links": "^6.5.9",
40-
"@storybook/builder-webpack5": "^6.5.9",
41-
"@storybook/manager-webpack5": "^6.5.9",
42-
"@storybook/react": "^6.5.9",
35+
"@babel/core": "^7.19.0",
36+
"@storybook/addon-actions": "^6.5.10",
37+
"@storybook/addon-essentials": "^6.5.10",
38+
"@storybook/addon-interactions": "^6.5.10",
39+
"@storybook/addon-links": "^6.5.10",
40+
"@storybook/builder-webpack5": "^6.5.10",
41+
"@storybook/manager-webpack5": "^6.5.10",
42+
"@storybook/react": "^6.5.10",
4343
"@storybook/testing-library": "0.0.13",
4444
"@types/chart.js": "^2.9.37",
4545
"@types/file-saver": "^2.0.5",
4646
"@types/har-format": "^1.2.8",
4747
"@types/js-yaml": "^4.0.5",
48-
"@types/react": "^18.0.15",
48+
"@types/react": "^18.0.18",
4949
"@types/react-dom": "^18.0.6",
5050
"@types/react-transition-group": "^4.4.5",
51-
"@types/styled-components": "^5.1.25",
52-
"@typescript-eslint/eslint-plugin": "^5.30.7",
53-
"@typescript-eslint/parser": "^5.30.7",
51+
"@types/styled-components": "^5.1.26",
52+
"@typescript-eslint/eslint-plugin": "^5.36.2",
53+
"@typescript-eslint/parser": "^5.36.2",
5454
"babel-loader": "^8.2.5",
55-
"eslint": "^8.20.0",
55+
"eslint": "^8.23.0",
5656
"eslint-config-prettier": "^8.5.0",
5757
"eslint-plugin-prettier": "^4.2.1",
5858
"html-webpack-plugin": "^5.5.0",
5959
"ts-loader": "^9.3.1",
60-
"typescript": "^4.7.4",
61-
"webpack": "^5.73.0",
60+
"typescript": "^4.8.2",
61+
"webpack": "^5.74.0",
6262
"webpack-cli": "^4.10.0",
63-
"webpack-dev-server": "^4.9.3"
63+
"webpack-dev-server": "^4.10.1"
6464
}
6565
}

guide/results-viewer-react/src/components/TestResults/charts.ts

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
Title,
1717
Tooltip
1818
} from "chart.js";
19+
import { LogLevel, log } from "../../util/log";
1920
import { DataPoint } from "./model";
2021

2122
// https://www.chartjs.org/docs/latest/getting-started/integration.html#bundlers-webpack-rollup-etc
@@ -337,6 +338,10 @@ const afterBuildTicks = (chart: any) => {
337338
const chart: Chart = legend.chart;
338339
const datasets = chart.data.datasets!;
339340
let allHidden = true;
341+
if (legendItem.datasetIndex === undefined) {
342+
log("legendItem.datasetIndex was undefined. Please investigate", LogLevel.ERROR, legendItem);
343+
return;
344+
}
340345
for (let i = 0; i < datasets.length; i++) {
341346
const meta = chart.getDatasetMeta(i);
342347
if (!meta.hidden && i !== legendItem.datasetIndex) {

0 commit comments

Comments
 (0)