conflicts

elastic · Jan 24, 2023 · 9d2345a · 9d2345a
1 parent 0abf725
commit 9d2345a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/...ynthetics/public/apps/synthetics/components/common/monitor_test_result/result_details.tsx b/...ynthetics/public/apps/synthetics/components/common/monitor_test_result/result_details.tsx
@@ -54,10 +54,10 @@ export const TimingDetails = ({ step }: { step: JourneyStep }) => {
         <EuiLoadingContent lines={1} />
       ) : (
         <ThresholdIndicator
-          currentFormatted={formatMillisecond(item.value, 1)}
+          currentFormatted={formatMillisecond(item.value, { digits: 1 })}
           current={Number(item.value.toFixed(1))}
           previous={Number(prevValue.toFixed(1))}
-          previousFormatted={formatMillisecond(prevValue, 1)}
+          previousFormatted={formatMillisecond(prevValue, { digits: 1 })}
         />
       ),
     };

diff --git a/...ublic/apps/synthetics/components/step_details_page/common/network_data/data_formatting.ts b/...ublic/apps/synthetics/components/step_details_page/common/network_data/data_formatting.ts
@@ -491,9 +491,12 @@ export const colourPalette: ColourPalette = { ...TIMING_PALETTE, ...MIME_TYPE_PA
 export const formatTooltipHeading = (index: number, fullText: string): string =>
   isNaN(index) ? fullText : `${index}. ${fullText}`;
 
-export const formatMillisecond = (ms: number, maxMillis = 1000) => {
+export const formatMillisecond = (
+  ms: number,
+  { maxMillis = 1000, digits }: { digits?: number; maxMillis?: number }
+) => {
   if (ms < maxMillis) {
-    return `${ms.toFixed(digits??0)} ms`;
+    return `${ms.toFixed(digits ?? 0)} ms`;
   }
   return `${(ms / 1000).toFixed(digits ?? 1)} s`;
 };
diff --git a/...c/apps/synthetics/components/step_details_page/step_timing_breakdown/breakdown_legend.tsx b/...c/apps/synthetics/components/step_details_page/step_timing_breakdown/breakdown_legend.tsx
@@ -32,7 +32,7 @@ export const BreakdownLegend = () => {
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
               <EuiText css={{ whiteSpace: 'nowrap' }} size="s">
-                {formatMillisecond(value)}
+                {formatMillisecond(value, {})}
               </EuiText>
             </EuiFlexItem>
           </EuiFlexGroup>

diff --git a/...s/synthetics/components/step_details_page/step_timing_breakdown/network_timings_donut.tsx b/...s/synthetics/components/step_details_page/step_timing_breakdown/network_timings_donut.tsx
@@ -58,7 +58,7 @@ export const NetworkTimingsDonut = () => {
           data={networkTimings.timingsWithLabels}
           layout={PartitionLayout.sunburst}
           valueAccessor={(d: Datum) => d?.value}
-          valueFormatter={(d: number) => formatMillisecond(d)}
+          valueFormatter={(d: number) => formatMillisecond(d, {})}
           layers={[
             {
               groupByRollup: (d: Datum) => d.label,

diff --git a/...s/step_details_page/step_waterfall_chart/waterfall/waterfall_marker/waterfall_markers.tsx b/...s/step_details_page/step_waterfall_chart/waterfall/waterfall_marker/waterfall_markers.tsx
@@ -99,7 +99,7 @@ export function WaterfallChartMarkers() {
               {
                 dataValue: offset,
                 details: label,
-                header: formatMillisecond(offset, 4000),
+                header: formatMillisecond(offset, { maxMillis: 4000 }),
               },
             ]}
             marker={<WaterfallMarkerIcon field={field} label={label} />}