From 8b11ba19777e85bd5382596a1b1a6577bfa55332 Mon Sep 17 00:00:00 2001 From: cs-308-2023 Date: Fri, 24 Jan 2025 11:59:19 +0530 Subject: [PATCH 1/2] Remove defaultProps from ScatterPlot.jsx Signed-off-by: cs-308-2023 --- .../SearchTracePage/SearchResults/ScatterPlot.jsx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx index a28e6453d5..214c49e422 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx @@ -23,9 +23,11 @@ import { ONE_MILLISECOND, formatDuration } from '../../../utils/date'; import 'react-vis/dist/style.css'; import './ScatterPlot.css'; -export default function ScatterPlot(props) { - const { data, onValueClick, calculateContainerWidth } = props; - +export default function ScatterPlot({ + data, + onValueClick, + calculateContainerWidth = container => container.clientWidth, +}) { const containerRef = useRef(null); const [containerWidth, setContainerWidth] = useState(0); @@ -103,8 +105,3 @@ ScatterPlot.propTypes = { onValueClick: PropTypes.func.isRequired, calculateContainerWidth: PropTypes.func, }; - -ScatterPlot.defaultProps = { - // JSDOM does not, as of 2023, have a layout engine, so allow tests to supply a mock width as a workaround. - calculateContainerWidth: container => container.clientWidth, -}; From e6fb61db6a397ef5fbbd259a2c1f26b36ecfb3a4 Mon Sep 17 00:00:00 2001 From: cs-308-2023 Date: Mon, 27 Jan 2025 20:11:32 +0530 Subject: [PATCH 2/2] Minor fixes Signed-off-by: cs-308-2023 --- .../components/SearchTracePage/SearchResults/ScatterPlot.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx index 214c49e422..af92462c00 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx @@ -26,6 +26,8 @@ import './ScatterPlot.css'; export default function ScatterPlot({ data, onValueClick, + // JSDOM does not, as of 2023, have a layout engine, + // so allow tests to supply a mock width as a workaround calculateContainerWidth = container => container.clientWidth, }) { const containerRef = useRef(null);