From 61e5f16525b55ad2dc1b990a99e00258ff56d69f Mon Sep 17 00:00:00 2001 From: cs-308-2023 Date: Tue, 28 Jan 2025 21:25:24 +0530 Subject: [PATCH 1/2] Modified url and the struct Signed-off-by: cs-308-2023 --- packages/jaeger-ui/src/api/jaeger.js | 2 +- packages/jaeger-ui/src/components/QualityMetrics/index.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/jaeger-ui/src/api/jaeger.js b/packages/jaeger-ui/src/api/jaeger.js index 4ce0ee7706..d1003e0fa5 100644 --- a/packages/jaeger-ui/src/api/jaeger.js +++ b/packages/jaeger-ui/src/api/jaeger.js @@ -98,7 +98,7 @@ const JaegerAPI = { return getJSON(`${this.apiRoot}dependencies`, { query: { endTs, lookback } }); }, fetchQualityMetrics(service, hours) { - return getJSON(`/qualitymetrics-v2`, { query: { hours, service } }); + return getJSON(`/api/quality-metrics`, { query: { hours, service } }); }, fetchServiceOperations(serviceName) { return getJSON(`${this.apiRoot}services/${encodeURIComponent(serviceName)}/operations`); diff --git a/packages/jaeger-ui/src/components/QualityMetrics/index.tsx b/packages/jaeger-ui/src/components/QualityMetrics/index.tsx index 5f99a265cc..6ab76d1862 100644 --- a/packages/jaeger-ui/src/components/QualityMetrics/index.tsx +++ b/packages/jaeger-ui/src/components/QualityMetrics/index.tsx @@ -92,8 +92,8 @@ export class UnconnectedQualityMetrics extends React.PureComponent { - this.setState({ qualityMetrics, loading: false }); + .then((qualityMetrics: {data: TQualityMetrics}) => { + this.setState({ qualityMetrics: qualityMetrics.data, loading: false }); }) .catch((error: Error) => { this.setState({ From 397ab483373723e8b8dc8268daf18740f97b4e53 Mon Sep 17 00:00:00 2001 From: cs-308-2023 Date: Tue, 4 Feb 2025 17:01:29 +0530 Subject: [PATCH 2/2] Lint and some tests Signed-off-by: cs-308-2023 --- packages/jaeger-ui/src/api/jaeger.test.js | 2 +- .../__snapshots__/index.test.js.snap | 49 ------------------- .../src/components/QualityMetrics/index.tsx | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/packages/jaeger-ui/src/api/jaeger.test.js b/packages/jaeger-ui/src/api/jaeger.test.js index 23834bf67d..8dfb24f44d 100644 --- a/packages/jaeger-ui/src/api/jaeger.test.js +++ b/packages/jaeger-ui/src/api/jaeger.test.js @@ -95,7 +95,7 @@ describe('fetchQualityMetrics', () => { const service = 'test-service'; JaegerAPI.fetchQualityMetrics(service, hours); expect(fetchMock).toHaveBeenLastCalledWith( - `/qualitymetrics-v2?${queryString.stringify({ service, hours })}`, + `/api/quality-metrics?${queryString.stringify({ service, hours })}`, defaultOptions ); }); diff --git a/packages/jaeger-ui/src/components/QualityMetrics/__snapshots__/index.test.js.snap b/packages/jaeger-ui/src/components/QualityMetrics/__snapshots__/index.test.js.snap index fbc8341847..5f10d7b736 100644 --- a/packages/jaeger-ui/src/components/QualityMetrics/__snapshots__/index.test.js.snap +++ b/packages/jaeger-ui/src/components/QualityMetrics/__snapshots__/index.test.js.snap @@ -65,55 +65,6 @@ exports[`QualityMetrics UnconnectedQualityMetrics render renders with metrics 1` setLookback={[Function]} setService={[Function]} /> - -
-
- - -
-
- - -
-
`; diff --git a/packages/jaeger-ui/src/components/QualityMetrics/index.tsx b/packages/jaeger-ui/src/components/QualityMetrics/index.tsx index 6ab76d1862..38c90cb7de 100644 --- a/packages/jaeger-ui/src/components/QualityMetrics/index.tsx +++ b/packages/jaeger-ui/src/components/QualityMetrics/index.tsx @@ -92,7 +92,7 @@ export class UnconnectedQualityMetrics extends React.PureComponent { + .then((qualityMetrics: { data: TQualityMetrics }) => { this.setState({ qualityMetrics: qualityMetrics.data, loading: false }); }) .catch((error: Error) => {