From ceedb0ca50c7c8cfbd1feec0abf533bea12ce87b Mon Sep 17 00:00:00 2001 From: bartoval Date: Mon, 26 Aug 2024 23:15:13 +0200 Subject: [PATCH 1/2] fix(Metrics): :lady_beetle: Adjust latency definition --- __tests__/pages/Metrics/Latency.spec.tsx | 3 +- .../__snapshots__/Metrics.spec.tsx.snap | 131 ++++++++++++++++-- package.json | 8 +- .../SkFlowPairsTable/FlowPair.constants.ts | 22 +-- .../SkFlowPairsTable/FlowPair.enum.ts | 13 +- src/core/components/SkTable/index.tsx | 32 +++-- .../Topology/hooks/useTopologyProcessData.ts | 2 +- .../Topology/hooks/useTopologySiteData.ts | 6 +- src/pages/Topology/services/index.ts | 19 ++- src/pages/shared/Metrics/Metrics.enum.ts | 6 +- .../shared/Metrics/components/Filters.tsx | 2 +- .../shared/Metrics/components/Latency.tsx | 23 ++- src/pages/shared/Metrics/index.tsx | 18 ++- src/pages/shared/Metrics/services/index.ts | 4 + src/types/Metrics.interfaces.ts | 3 +- yarn.lock | 122 ++++++++-------- 16 files changed, 290 insertions(+), 124 deletions(-) diff --git a/__tests__/pages/Metrics/Latency.spec.tsx b/__tests__/pages/Metrics/Latency.spec.tsx index 09a5e53a..703dd80c 100644 --- a/__tests__/pages/Metrics/Latency.spec.tsx +++ b/__tests__/pages/Metrics/Latency.spec.tsx @@ -35,6 +35,7 @@ describe('Latency component', () => { }> { timeout: waitForElementToBeRemovedTimeout }); - expect(screen.getByText(MetricsLabels.LatencyTitle)).toBeInTheDocument(); + expect(screen.getByText(MetricsLabels.LatencyTitleOut)).toBeInTheDocument(); fireEvent.click(document.querySelector('.pf-v5-c-card__header-toggle')?.querySelector('button')!); expect(handleGetisSectionExpanded).toHaveBeenCalledTimes(1); diff --git a/__tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap b/__tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap index 5c0727b4..cb7efc2e 100644 --- a/__tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap +++ b/__tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap @@ -548,7 +548,7 @@ exports[`Metrics Component renders correctly 1`] = `
- Latencies + Latencies Out
@@ -560,19 +560,27 @@ exports[`Metrics Component renders correctly 1`] = ` data-ouia-safe="true" type="button" > - + + + +
@@ -633,7 +641,41 @@ exports[`Metrics Component renders correctly 1`] = `
- Http requests + Latencies In +
+ +
@@ -659,7 +701,66 @@ exports[`Metrics Component renders correctly 1`] = ` + +
+
+
+ Http requests +
+
+
+ + + +
+
+
+
+ diff --git a/src/pages/shared/Metrics/index.tsx b/src/pages/shared/Metrics/index.tsx index 1f54eac6..8204a6fd 100644 --- a/src/pages/shared/Metrics/index.tsx +++ b/src/pages/shared/Metrics/index.tsx @@ -2,7 +2,7 @@ import { FC, useCallback, useRef, useState, startTransition } from 'react'; import { Stack, StackItem } from '@patternfly/react-core'; -import { AvailableProtocols } from '@API/REST.enum'; +import { AvailableProtocols, Direction } from '@API/REST.enum'; import { ConfigMetricFilters, ExpandedMetricSections, QueryMetricsParams } from '@sk-types/Metrics.interfaces'; import MetricFilters from './components/Filters'; @@ -11,6 +11,7 @@ import Request from './components/Request'; import Response from './components/Response'; import TcpConnection from './components/TcpConnection'; import Traffic from './components/Traffic'; +import { MetricsLabels } from './Metrics.enum'; interface UseMetricsProps { defaultMetricFilterValues: QueryMetricsParams; @@ -141,7 +142,20 @@ const Metrics: FC = function (props) { )} + + + + Date: Tue, 27 Aug 2024 16:31:56 +0200 Subject: [PATCH 2/2] test(General): :white_check_mark: Update snapshots --- __tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap b/__tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap index cb7efc2e..9f2bac69 100644 --- a/__tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap +++ b/__tests__/pages/Metrics/__snapshots__/Metrics.spec.tsx.snap @@ -548,7 +548,7 @@ exports[`Metrics Component renders correctly 1`] = `
- Latencies Out + Incoming Latency
@@ -641,7 +641,7 @@ exports[`Metrics Component renders correctly 1`] = `
- Latencies In + Outgoing Latency