From f3f324daf1aa96b77de5e2bc0f2344553e238564 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sun, 13 Nov 2022 21:00:13 -0500 Subject: [PATCH] Upgrade to antd/v3.9.0 to avoid loading fonts from alicdn (#1053) Resolves #187 Despite the concerns in the original ticket, it does not seem to affect the bundle size, because SVG icons are inlined, so the full font file is not added to the bundle. ``` $ du -h cmd/query/app/ui/actual/ 3.8M cmd/query/app/ui/actual/ ``` Signed-off-by: Yuri Shkuro --- packages/jaeger-ui/package.json | 2 +- .../src/components/App/TraceIDSearchInput.tsx | 7 +- .../TraceIDSearchInput.test.js.snap | 20 +- .../__snapshots__/index.test.js.snap | 2471 ++++++++++++++++- .../src/components/common/NameSelector.tsx | 2 +- .../src/components/common/UiFindInput.tsx | 1 - .../__snapshots__/UiFindInput.test.js.snap | 1 - yarn.lock | 258 +- 8 files changed, 2520 insertions(+), 242 deletions(-) diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json index f67d486077..e4b6f940f3 100644 --- a/packages/jaeger-ui/package.json +++ b/packages/jaeger-ui/package.json @@ -58,7 +58,7 @@ "@types/react-virtualized-select": "^3.0.7", "@types/recompose": "^0.30.5", "@types/redux-actions": "2.2.1", - "antd": "3.8.0", + "antd": "3.9.0", "chance": "^1.0.10", "classnames": "^2.2.5", "combokeys": "^3.0.0", diff --git a/packages/jaeger-ui/src/components/App/TraceIDSearchInput.tsx b/packages/jaeger-ui/src/components/App/TraceIDSearchInput.tsx index 4bd8a384d2..d2cdb64927 100644 --- a/packages/jaeger-ui/src/components/App/TraceIDSearchInput.tsx +++ b/packages/jaeger-ui/src/components/App/TraceIDSearchInput.tsx @@ -37,12 +37,7 @@ class TraceIDSearchInput extends React.PureComponent { render() { return (
- } - /> + } />
); } diff --git a/packages/jaeger-ui/src/components/App/__snapshots__/TraceIDSearchInput.test.js.snap b/packages/jaeger-ui/src/components/App/__snapshots__/TraceIDSearchInput.test.js.snap index 753a3c8bf1..4bafa32de6 100644 --- a/packages/jaeger-ui/src/components/App/__snapshots__/TraceIDSearchInput.test.js.snap +++ b/packages/jaeger-ui/src/components/App/__snapshots__/TraceIDSearchInput.test.js.snap @@ -13,10 +13,26 @@ exports[` renders as expected 1`] = ` > + > + + render No data table 1`] = ` > + > + + render No data table 1`] = ` > + > + + @@ -267,7 +301,24 @@ exports[` render No data table 1`] = ` > + > + + render No data table 1`] = ` > + > + + @@ -299,7 +367,24 @@ exports[` render No data table 1`] = ` > + > + + render No data table 1`] = ` > + > + + @@ -331,7 +433,24 @@ exports[` render No data table 1`] = ` > + > + + render No data table 1`] = ` > + > + + @@ -371,9 +507,28 @@ exports[` render No data table 1`] = `   + > + +
render No data table 1`] = ` > + > + + render No data table 1`] = ` > + > + +
@@ -530,7 +719,24 @@ exports[` render P95 latency with more than 2 decimal pla > + > + + render P95 latency with more than 2 decimal pla > + > + + @@ -562,7 +785,24 @@ exports[` render P95 latency with more than 2 decimal pla > + > + + render P95 latency with more than 2 decimal pla > + > + + @@ -594,7 +851,24 @@ exports[` render P95 latency with more than 2 decimal pla > + > + + render P95 latency with more than 2 decimal pla > + > + + @@ -626,7 +917,24 @@ exports[` render P95 latency with more than 2 decimal pla > + > + + render P95 latency with more than 2 decimal pla > + > + + @@ -666,9 +991,28 @@ exports[` render P95 latency with more than 2 decimal pla   + > + +
render P95 latency with more than 2 decimal pla > + > + + render P95 latency with more than 2 decimal pla > + > + +
@@ -1023,7 +1401,28 @@ exports[` render P95 latency with more than 2 decimal pla > + > + + + +
  • render P95 latency with more than 2 decimal pla > + > + + + +
  • render P95 latency with more than 2 decimal pla } unselectable="on" > - + + + @@ -1221,7 +1660,24 @@ exports[` render error rate with more than 2 decimal plac > + > + + render error rate with more than 2 decimal plac > + > + + @@ -1253,7 +1726,24 @@ exports[` render error rate with more than 2 decimal plac > + > + + render error rate with more than 2 decimal plac > + > + + @@ -1285,7 +1792,24 @@ exports[` render error rate with more than 2 decimal plac > + > + + render error rate with more than 2 decimal plac > + > + + @@ -1317,7 +1858,24 @@ exports[` render error rate with more than 2 decimal plac > + > + + render error rate with more than 2 decimal plac > + > + + @@ -1357,9 +1932,28 @@ exports[` render error rate with more than 2 decimal plac   + > + +
    render error rate with more than 2 decimal plac > + > + + render error rate with more than 2 decimal plac > + > + +
    @@ -1714,7 +2342,28 @@ exports[` render error rate with more than 2 decimal plac > + > + + + +
  • render error rate with more than 2 decimal plac > + > + + + +
  • render error rate with more than 2 decimal plac } unselectable="on" > - + + + @@ -1912,7 +2601,24 @@ exports[` render lower than 0.1 P95 latency 1`] = ` > + > + + render lower than 0.1 P95 latency 1`] = ` > + > + + @@ -1944,7 +2667,24 @@ exports[` render lower than 0.1 P95 latency 1`] = ` > + > + + render lower than 0.1 P95 latency 1`] = ` > + > + + @@ -1976,7 +2733,24 @@ exports[` render lower than 0.1 P95 latency 1`] = ` > + > + + render lower than 0.1 P95 latency 1`] = ` > + > + + @@ -2008,7 +2799,24 @@ exports[` render lower than 0.1 P95 latency 1`] = ` > + > + + render lower than 0.1 P95 latency 1`] = ` > + > + + @@ -2048,9 +2873,28 @@ exports[` render lower than 0.1 P95 latency 1`] = `   + > + +
    render lower than 0.1 P95 latency 1`] = ` > + > + + render lower than 0.1 P95 latency 1`] = ` > + > + +
    @@ -2405,7 +3283,28 @@ exports[` render lower than 0.1 P95 latency 1`] = ` > + > + + + +
  • render lower than 0.1 P95 latency 1`] = ` > + > + + + +
  • render lower than 0.1 P95 latency 1`] = ` } unselectable="on" > - + + + @@ -2603,7 +3542,24 @@ exports[` render lower than 0.1 error rate 1`] = ` > + > + + render lower than 0.1 error rate 1`] = ` > + > + + @@ -2635,7 +3608,24 @@ exports[` render lower than 0.1 error rate 1`] = ` > + > + + render lower than 0.1 error rate 1`] = ` > + > + + @@ -2667,7 +3674,24 @@ exports[` render lower than 0.1 error rate 1`] = ` > + > + + render lower than 0.1 error rate 1`] = ` > + > + + @@ -2699,7 +3740,24 @@ exports[` render lower than 0.1 error rate 1`] = ` > + > + + render lower than 0.1 error rate 1`] = ` > + > + + @@ -2739,9 +3814,28 @@ exports[` render lower than 0.1 error rate 1`] = `   + > + +
    render lower than 0.1 error rate 1`] = ` > + > + + render lower than 0.1 error rate 1`] = ` > + > + +
    @@ -3096,7 +4224,28 @@ exports[` render lower than 0.1 error rate 1`] = ` > + > + + + +
  • render lower than 0.1 error rate 1`] = ` > + > + + + +
  • render lower than 0.1 error rate 1`] = ` } unselectable="on" > - + + + @@ -3294,7 +4483,24 @@ exports[` render lower than 0.1 request rate value 1`] = > + > + + render lower than 0.1 request rate value 1`] = > + > + + @@ -3326,7 +4549,24 @@ exports[` render lower than 0.1 request rate value 1`] = > + > + + render lower than 0.1 request rate value 1`] = > + > + + @@ -3358,7 +4615,24 @@ exports[` render lower than 0.1 request rate value 1`] = > + > + + render lower than 0.1 request rate value 1`] = > + > + + @@ -3390,7 +4681,24 @@ exports[` render lower than 0.1 request rate value 1`] = > + > + + render lower than 0.1 request rate value 1`] = > + > + + @@ -3430,9 +4755,28 @@ exports[` render lower than 0.1 request rate value 1`] =   + > + +
    render lower than 0.1 request rate value 1`] = > + > + + render lower than 0.1 request rate value 1`] = > + > + +
    @@ -3787,7 +5165,28 @@ exports[` render lower than 0.1 request rate value 1`] = > + > + + + +
  • render lower than 0.1 request rate value 1`] = > + > + + + +
  • render lower than 0.1 request rate value 1`] = } unselectable="on" > - + + + @@ -3985,7 +5424,24 @@ exports[` render request rate number with more than 2 dec > + > + + render request rate number with more than 2 dec > + > + + @@ -4017,7 +5490,24 @@ exports[` render request rate number with more than 2 dec > + > + + render request rate number with more than 2 dec > + > + + @@ -4049,7 +5556,24 @@ exports[` render request rate number with more than 2 dec > + > + + render request rate number with more than 2 dec > + > + + @@ -4081,7 +5622,24 @@ exports[` render request rate number with more than 2 dec > + > + + render request rate number with more than 2 dec > + > + + @@ -4121,9 +5696,28 @@ exports[` render request rate number with more than 2 dec   + > + +
    render request rate number with more than 2 dec > + > + + render request rate number with more than 2 dec > + > + +
    @@ -4478,7 +6106,28 @@ exports[` render request rate number with more than 2 dec > + > + + + +
  • render request rate number with more than 2 dec > + > + + + +
  • render request rate number with more than 2 dec } unselectable="on" > - + + + @@ -4676,7 +6365,24 @@ exports[` render some values in the table 1`] = ` > + > + + render some values in the table 1`] = ` > + > + + @@ -4708,7 +6431,24 @@ exports[` render some values in the table 1`] = ` > + > + + render some values in the table 1`] = ` > + > + + @@ -4740,7 +6497,24 @@ exports[` render some values in the table 1`] = ` > + > + + render some values in the table 1`] = ` > + > + + @@ -4772,7 +6563,24 @@ exports[` render some values in the table 1`] = ` > + > + + render some values in the table 1`] = ` > + > + + @@ -4812,9 +6637,28 @@ exports[` render some values in the table 1`] = `   + > + +
    render some values in the table 1`] = ` > + > + + render some values in the table 1`] = ` > + > + +
    @@ -5169,7 +7047,28 @@ exports[` render some values in the table 1`] = ` > + > + + + +
  • render some values in the table 1`] = ` > + > + + + +
  • render some values in the table 1`] = ` } unselectable="on" > - + + + @@ -5367,7 +7306,24 @@ exports[` test column render function 1`] = ` > + > + + test column render function 1`] = ` > + > + + @@ -5399,7 +7372,24 @@ exports[` test column render function 1`] = ` > + > + + test column render function 1`] = ` > + > + + @@ -5431,7 +7438,24 @@ exports[` test column render function 1`] = ` > + > + + test column render function 1`] = ` > + > + + @@ -5463,7 +7504,24 @@ exports[` test column render function 1`] = ` > + > + + test column render function 1`] = ` > + > + + @@ -5503,9 +7578,28 @@ exports[` test column render function 1`] = `   + > + +
    test column render function 1`] = ` > + > + + test column render function 1`] = ` > + > + +
    @@ -5673,7 +7801,28 @@ exports[` test column render function 1`] = ` > + > + + + +
  • test column render function 1`] = ` > + > + + + +
  • test column render function 1`] = ` } unselectable="on" > - + + + diff --git a/packages/jaeger-ui/src/components/common/NameSelector.tsx b/packages/jaeger-ui/src/components/common/NameSelector.tsx index cd7c9ef835..0bb7b2d81c 100644 --- a/packages/jaeger-ui/src/components/common/NameSelector.tsx +++ b/packages/jaeger-ui/src/components/common/NameSelector.tsx @@ -65,7 +65,7 @@ export default class NameSelector extends React.PureComponent { this.setState({ popoverVisible }); } - private clearValue = (evt: React.MouseEvent) => { + private clearValue = (evt: React.MouseEvent) => { if (this.props.required) throw new Error('Cannot clear value of required NameSelector'); evt.stopPropagation(); diff --git a/packages/jaeger-ui/src/components/common/UiFindInput.tsx b/packages/jaeger-ui/src/components/common/UiFindInput.tsx index 4bf19a4c6f..c825effe26 100644 --- a/packages/jaeger-ui/src/components/common/UiFindInput.tsx +++ b/packages/jaeger-ui/src/components/common/UiFindInput.tsx @@ -96,7 +96,6 @@ export class UnconnectedUiFindInput extends React.PureComponent