@centreon/ui 25.2.3 → 25.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "25.2.3",
+  "version": "25.2.5",
   "description": "Centreon UI Components",
   "scripts": {
     "update:deps": "pnpx npm-check-updates -i --format group",

package/src/Graph/BarChart/BarChart.cypress.spec.tsx

@@ -61,14 +61,14 @@ const checkWidth = (orientation): void => {
     cy.get('g[class*="visx-rows"] > line')
       .eq(0)
       .should('have.attr', 'x2')
-      .and('equal', '1135');
+      .and('equal', '1145');
 
     return;
   }
   cy.get('g[class*="visx-rows"] > line')
     .eq(0)
     .should('have.attr', 'x2')
-    .and('equal', '1170');
+    .and('equal', '1180');
 };
 
 describe('Bar chart', () => {

package/src/Graph/BarChart/ResponsiveBarChart.tsx

@@ -13,6 +13,7 @@ import { useIntersection } from '../Chart/useChartIntersection';
 import BaseChart from '../common/BaseChart/BaseChart';
 import ChartSvgWrapper from '../common/BaseChart/ChartSvgWrapper';
 import { useComputeBaseChartDimensions } from '../common/BaseChart/useComputeBaseChartDimensions';
+import { useComputeYAxisMaxCharacters } from '../common/BaseChart/useComputeYAxisMaxCharacters';
 import Thresholds from '../common/Thresholds/Thresholds';
 import { Thresholds as ThresholdsModel } from '../common/models';
 import {
@@ -22,7 +23,6 @@ import {
 } from '../common/timeSeries';
 import { Line } from '../common/timeSeries/models';
 import { useTooltipStyles } from '../common/useTooltipStyles';
-
 import BarGroup from './BarGroup';
 import BarChartTooltip from './Tooltip/BarChartTooltip';
 import { tooltipDataAtom } from './atoms';
@@ -58,7 +58,7 @@ const ResponsiveBarChart = ({
   barStyle,
   skipIntersectionObserver
 }: Props): JSX.Element => {
-  const { title, timeSeries, baseAxis, lines } = graphData;
+  const { title, timeSeries, baseAxis, lines } = graphData || {};
 
   const { classes, cx } = useTooltipStyles();
 
@@ -70,19 +70,30 @@ const ResponsiveBarChart = ({
   const { isInViewport } = useIntersection({ element: graphRef?.current });
 
   const displayedLines = useMemo(
-    () => linesGraph.filter(({ display }) => display),
+    () => (linesGraph || []).filter(({ display }) => display),
     [linesGraph]
   );
 
   const [firstUnit, secondUnit] = getUnits(displayedLines);
   const allUnits = getUnits(lines);
 
+  const { maxLeftAxisCharacters, maxRightAxisCharacters } =
+    useComputeYAxisMaxCharacters({
+      graphData,
+      thresholds,
+      thresholdUnit,
+      axis,
+      firstUnit,
+      secondUnit
+    });
+
   const { legendRef, graphWidth, graphHeight } = useComputeBaseChartDimensions({
     hasSecondUnit: Boolean(secondUnit),
     height,
     legendDisplay: legend?.display,
     legendPlacement: legend?.placement,
-    width
+    width,
+    maxAxisCharacters: maxRightAxisCharacters || maxLeftAxisCharacters
   });
 
   const thresholdValues = flatten([
@@ -216,6 +227,8 @@ const ResponsiveBarChart = ({
             svgRef={graphSvgRef}
             timeSeries={timeSeries}
             xScale={xScale}
+            maxAxisCharacters={maxLeftAxisCharacters}
+            hasSecondUnit={Boolean(secondUnit)}
           >
             <>
               <BarGroup

package/src/Graph/Chart/Chart.cypress.spec.tsx

@@ -129,13 +129,13 @@ const initializeCustomUnits = ({
 };
 
 const checkGraphWidth = (): void => {
-  cy.findByTestId('graph-interaction-zone')
-    .should('have.attr', 'width')
-    .and('equal', '1170');
-
   cy.findByTestId('graph-interaction-zone')
     .should('have.attr', 'height')
     .and('equal', '393');
+
+  cy.findByTestId('graph-interaction-zone').then((graph) => {
+    expect(Number(graph[0].attributes.width.value)).to.be.greaterThan(1170);
+  });
 };
 
 describe('Line chart', () => {
@@ -158,8 +158,7 @@ describe('Line chart', () => {
       cy.contains('06/18/2023').should('be.visible');
 
       cy.contains('0.45 s').should('be.visible');
-      cy.contains('75.93%').should('be.visible');
-      cy.contains('0.43 s').should('be.visible');
+      cy.contains('73.65%').should('be.visible');
 
       cy.makeSnapshot();
     });
@@ -181,7 +180,7 @@ describe('Line chart', () => {
       cy.get('[data-metric="connTime"]').should(
         'have.attr',
         'data-highlight',
-        'true'
+        'false'
       );
 
       cy.makeSnapshot();
@@ -194,7 +193,7 @@ describe('Line chart', () => {
 
       cy.contains('Min: 70.31').should('be.visible');
 
-      cy.findByTestId('graph-interaction-zone').realMouseMove(1185, 100);
+      cy.findByTestId('graph-interaction-zone').realMouseMove(1198, 100);
 
       cy.get('[data-metric="querytime"]').should('not.exist');
 
@@ -208,10 +207,10 @@ describe('Line chart', () => {
 
       cy.contains('Min: 70.31').should('be.visible');
 
-      cy.findByTestId('graph-interaction-zone').realMouseMove(1152, 100);
+      cy.findByTestId('graph-interaction-zone').realMouseMove(1170, 100);
 
       cy.get('[data-metric="querytime"]').should('be.visible');
-      cy.get('[data-metric="hitratio"]').should('not.exist');
+      cy.get('[data-metric="hitratio"]').should('be.visible');
 
       cy.makeSnapshot();
     });
@@ -225,12 +224,12 @@ describe('Line chart', () => {
 
       cy.findByTestId('graph-interaction-zone').realMouseMove(452, 26);
 
-      cy.get('[data-metric="connTime"]').should(
+      cy.get('[data-metric="hitratio"]').should(
         'have.attr',
         'data-highlight',
         'true'
       );
-      cy.get('[data-metric="hitratio"]').should('not.exist');
+      cy.get('[data-metric="querytime"]').should('not.exist');
 
       cy.makeSnapshot();
     });
@@ -286,7 +285,7 @@ describe('Line chart', () => {
 
     cy.findByTestId('graph-interaction-zone')
       .should('have.attr', 'width')
-      .and('equal', '1212');
+      .and('equal', '1200');
 
     cy.findByLabelText('Centreon-Server: Round-Trip Average Time')
       .find('[data-icon="true"]')
@@ -371,8 +370,6 @@ describe('Line chart', () => {
       cy.get('[data-as-list="true"]').should('exist');
 
       cy.contains(':00 AM').should('be.visible');
-
-      cy.makeSnapshot();
     });
   });
 
@@ -528,8 +525,7 @@ describe('Line chart', () => {
 
       checkGraphWidth();
       cy.contains(':00 AM').should('be.visible');
-      cy.get('circle[cx="4.0625"]').should('be.visible');
-      cy.get('circle[cy="105.21757370835121"]').should('be.visible');
+      cy.get('circle[cx="37.625"]').should('be.visible');
 
       cy.makeSnapshot();
     });

package/src/Graph/Chart/Chart.tsx

@@ -16,6 +16,7 @@ import BarGroup from '../BarChart/BarGroup';
 import BaseChart from '../common/BaseChart/BaseChart';
 import ChartSvgWrapper from '../common/BaseChart/ChartSvgWrapper';
 import { useComputeBaseChartDimensions } from '../common/BaseChart/useComputeBaseChartDimensions';
+import { useComputeYAxisMaxCharacters } from '../common/BaseChart/useComputeYAxisMaxCharacters';
 import Thresholds from '../common/Thresholds/Thresholds';
 import type { Thresholds as ThresholdsModel } from '../common/models';
 import {
@@ -25,7 +26,6 @@ import {
   getYScalePerUnit
 } from '../common/timeSeries';
 import type { Line } from '../common/timeSeries/models';
-
 import Lines from './BasicComponents/Lines';
 import {
   canDisplayThreshold,
@@ -140,13 +140,24 @@ const Chart = ({
     [displayedLines]
   );
 
+  const { maxLeftAxisCharacters, maxRightAxisCharacters } =
+    useComputeYAxisMaxCharacters({
+      graphData,
+      thresholds,
+      thresholdUnit,
+      axis,
+      firstUnit,
+      secondUnit
+    });
+
   const { legendRef, graphWidth, graphHeight } = useComputeBaseChartDimensions({
     hasSecondUnit: Boolean(secondUnit),
     height,
     legendDisplay: legend?.display,
     legendHeight: legend?.height,
     legendPlacement: legend?.placement,
-    width
+    width,
+    maxAxisCharacters: maxRightAxisCharacters || maxLeftAxisCharacters
   });
 
   const xScale = useMemo(
@@ -283,39 +294,45 @@ const Chart = ({
                 svgRef={graphSvgRef}
                 timeSeries={timeSeries}
                 xScale={xScale}
+                maxAxisCharacters={maxLeftAxisCharacters}
+                hasSecondUnit={Boolean(secondUnit)}
               >
                 <>
-                  <BarGroup
-                    barStyle={barStyle}
-                    isTooltipHidden={false}
-                    lines={linesDisplayedAsBar}
-                    orientation="horizontal"
-                    size={graphHeight - margin.top - 5}
-                    timeSeries={timeSeries}
-                    xScale={xScaleBand}
-                    yScalesPerUnit={yScalesPerUnit}
-                  />
-                  <Lines
-                    areaTransparency={lineStyle?.areaTransparency}
-                    curve={lineStyle?.curve || 'linear'}
-                    dashLength={lineStyle?.dashLength}
-                    dashOffset={lineStyle?.dashOffset}
-                    displayAnchor={displayAnchor}
-                    displayedLines={linesDisplayedAsLine}
-                    dotOffset={lineStyle?.dotOffset}
-                    graphSvgRef={graphSvgRef}
-                    height={graphHeight - margin.top}
-                    lineWidth={lineStyle?.lineWidth}
-                    scale={axis?.scale}
-                    scaleLogarithmicBase={axis?.scaleLogarithmicBase}
-                    showArea={lineStyle?.showArea}
-                    showPoints={lineStyle?.showPoints}
-                    timeSeries={timeSeries}
-                    width={graphWidth}
-                    xScale={xScale}
-                    yScalesPerUnit={yScalesPerUnit}
-                    {...shapeLines}
-                  />
+                  {!isEmpty(linesDisplayedAsBar) && (
+                    <BarGroup
+                      barStyle={barStyle}
+                      isTooltipHidden={false}
+                      lines={linesDisplayedAsBar}
+                      orientation="horizontal"
+                      size={graphHeight - margin.top - 5}
+                      timeSeries={timeSeries}
+                      xScale={xScaleBand}
+                      yScalesPerUnit={yScalesPerUnit}
+                    />
+                  )}
+                  {!isEmpty(linesDisplayedAsLine) && (
+                    <Lines
+                      areaTransparency={lineStyle?.areaTransparency}
+                      curve={lineStyle?.curve || 'linear'}
+                      dashLength={lineStyle?.dashLength}
+                      dashOffset={lineStyle?.dashOffset}
+                      displayAnchor={displayAnchor}
+                      displayedLines={linesDisplayedAsLine}
+                      dotOffset={lineStyle?.dotOffset}
+                      graphSvgRef={graphSvgRef}
+                      height={graphHeight - margin.top}
+                      lineWidth={lineStyle?.lineWidth}
+                      scale={axis?.scale}
+                      scaleLogarithmicBase={axis?.scaleLogarithmicBase}
+                      showArea={lineStyle?.showArea}
+                      showPoints={lineStyle?.showPoints}
+                      timeSeries={timeSeries}
+                      width={graphWidth}
+                      xScale={xScale}
+                      yScalesPerUnit={yScalesPerUnit}
+                      {...shapeLines}
+                    />
+                  )}
                   <InteractionWithGraph
                     annotationData={{ ...annotationEvent }}
                     commonData={{

package/src/Graph/Chart/InteractiveComponents/AnchorPoint/GuidingLines.tsx

@@ -11,7 +11,7 @@ const GuidingLines = ({
   graphHeight,
   graphWidth
 }: GuidingLinesModel): JSX.Element | null => {
-  const { positionX, positionY } = useTickGraph({
+  const { positionX, positionY, guidingLinesRef } = useTickGraph({
     timeSeries,
     xScale
   });
@@ -20,7 +20,7 @@ const GuidingLines = ({
   }
 
   return (
-    <>
+    <g ref={guidingLinesRef}>
       <Shape.Line
         fill="dotted"
         from={{ x: positionX, y: 0 }}
@@ -38,7 +38,7 @@ const GuidingLines = ({
         strokeWidth={1}
         to={{ x: graphWidth, y: positionY }}
       />
-    </>
+    </g>
   );
 };
 

package/src/Graph/Chart/InteractiveComponents/AnchorPoint/useTickGraph.ts

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { MutableRefObject, useEffect, useMemo, useRef, useState } from 'react';
 
 import { ScaleLinear } from 'd3-scale';
 import { useAtomValue } from 'jotai';
@@ -15,6 +15,7 @@ interface AnchorPointResult {
   tickAxisBottom: Date | null;
   tickAxisLeft: string | null;
   tickAxisRight: string | null;
+  guidingLinesRef: MutableRefObject<SVGGElement | null>;
 }
 
 interface Props {
@@ -34,6 +35,7 @@ const useTickGraph = ({
   lines = [],
   baseAxis = 1000
 }: Props): AnchorPointResult => {
+  const guidingLinesRef = useRef<SVGGElement | null>(null);
   const [tickAxisBottom, setTickAxisBottom] = useState<Date | null>(null);
   const [tickAxisLeft, setTickAxisLeft] = useState<string | null>(null);
   const [tickAxisRight, setTickAxisRight] = useState<string | null>(null);
@@ -42,12 +44,22 @@ const useTickGraph = ({
 
   const mousePosition = useAtomValue(mousePositionAtom);
 
+  const paddingLeftString = useMemo(
+    () =>
+      (
+        guidingLinesRef.current?.parentElement?.parentElement?.attributes
+          ?.transform.value || ''
+      ).match(/translate\(([0-9\.]+), ([0-9\.]+)\)/)?.[1] || '0',
+    [
+      guidingLinesRef.current?.parentElement?.parentElement?.attributes
+        ?.transform.value
+    ]
+  );
+
   const positionX = mousePosition
-    ? mousePosition[0] - margin.left - 4
-    : undefined;
-  const positionY = mousePosition
-    ? mousePosition[1] - margin.top + 2
+    ? mousePosition[0] - Number(paddingLeftString) - 1
     : undefined;
+  const positionY = mousePosition ? mousePosition[1] - margin.top : undefined;
 
   useEffect(() => {
     if (!mousePosition) {
@@ -86,7 +98,8 @@ const useTickGraph = ({
     positionY,
     tickAxisBottom,
     tickAxisLeft,
-    tickAxisRight
+    tickAxisRight,
+    guidingLinesRef
   };
 };
 export default useTickGraph;

package/src/Graph/common/Axes/index.tsx

@@ -97,7 +97,7 @@ const Axes = ({
         tickLabelProps={() => ({
           ...axisLeft.tickLabelProps(),
           angle: yAxisTickLabelRotation,
-          dx: isHorizontal ? -8 : 4,
+          dx: isHorizontal ? -4 : 4,
           dy: isHorizontal ? 4 : -6
         })}
         tickLength={2}

package/src/Graph/common/Axes/useAxisY.ts

@@ -1,14 +1,14 @@
 import { useMemo } from 'react';
 
-import { Axis } from '@visx/visx';
+import type { Axis } from '@visx/visx';
 import { isNil } from 'ramda';
 
 import { useTheme } from '@mui/material';
 
-import { formatMetricValue, getUnits } from '../timeSeries';
+import { formatMetricValueWithUnit, getUnits } from '../timeSeries';
 import { commonTickLabelProps } from '../utils';
 
-import { Data, LabelProps } from './models';
+import type { Data, LabelProps } from './models';
 
 interface AxisYData {
   displayUnit: boolean;
@@ -69,7 +69,11 @@ const useAxisY = ({
         return '';
       }
 
-      return formatMetricValue({ base: data.baseAxis, unit, value }) as string;
+      return formatMetricValueWithUnit({
+        base: data.baseAxis,
+        unit,
+        value
+      }) as string;
     };
 
   const labelProps = ({

package/src/Graph/common/BaseChart/ChartSvgWrapper.tsx

@@ -9,8 +9,6 @@ import Axes from '../Axes';
 import Grids from '../Grids';
 import { Line, TimeValue } from '../timeSeries/models';
 
-import { extraMargin } from './useComputeBaseChartDimensions';
-
 interface Props {
   allUnits: Array<string>;
   axis?: ChartAxis;
@@ -27,6 +25,8 @@ interface Props {
   svgRef: MutableRefObject<SVGSVGElement | null>;
   timeSeries: Array<TimeValue>;
   xScale;
+  maxAxisCharacters?: number;
+  hasSecondUnit?: boolean;
 }
 
 const ChartSvgWrapper = ({
@@ -44,7 +44,9 @@ const ChartSvgWrapper = ({
   axis,
   children,
   orientation = 'horizontal',
-  allUnits
+  allUnits,
+  maxAxisCharacters = 0,
+  hasSecondUnit
 }: Props): JSX.Element => {
   const isHorizontal = equals(orientation, 'horizontal');
 
@@ -55,7 +57,13 @@ const ChartSvgWrapper = ({
       ref={svgRef}
       width="100%"
     >
-      <Group.Group left={margin.left + extraMargin / 2} top={margin.top}>
+      <Group.Group
+        left={
+          maxAxisCharacters * 5 +
+          (hasSecondUnit ? margin.top * 0.8 : margin.top * 0.6)
+        }
+        top={margin.top}
+      >
         {showGridLines && (
           <Grids
             gridLinesType={gridLinesType}

package/src/Graph/common/BaseChart/useComputeBaseChartDimensions.ts

@@ -3,6 +3,7 @@ import { MutableRefObject, useRef } from 'react';
 import { equals, isNil } from 'ramda';
 
 import { margin } from '../../Chart/common';
+import { margins } from '../margins';
 
 export const extraMargin = 10;
 
@@ -13,6 +14,7 @@ interface UseComputeBaseChartDimensionsProps {
   legendHeight?: number;
   legendPlacement?: string;
   width: number;
+  maxAxisCharacters: number;
 }
 
 interface UseComputeBaseChartDimensionsState {
@@ -27,7 +29,8 @@ export const useComputeBaseChartDimensions = ({
   legendDisplay,
   legendPlacement,
   hasSecondUnit,
-  legendHeight
+  legendHeight,
+  maxAxisCharacters
 }: UseComputeBaseChartDimensionsProps): UseComputeBaseChartDimensionsState => {
   const legendRef = useRef<HTMLDivElement | null>(null);
 
@@ -48,9 +51,8 @@ export const useComputeBaseChartDimensions = ({
   const graphWidth =
     width > 0
       ? width -
-        margin.left -
-        (hasSecondUnit ? margin.right : 8) -
-        extraMargin -
+        (hasSecondUnit ? maxAxisCharacters * 2 : maxAxisCharacters) * 6 -
+        (hasSecondUnit ? margins.left * 0.8 : margin.left) -
         legendBoundingWidth
       : 0;
   const graphHeight =

package/src/Graph/common/BaseChart/useComputeYAxisMaxCharacters.ts

@@ -0,0 +1,92 @@
+import { isEmpty } from 'ramda';
+import { useMemo } from 'react';
+import { ChartAxis } from '../../Chart/models';
+import { Data } from '../Axes/models';
+import { Thresholds } from '../models';
+import { getFormattedAxisValues } from '../utils';
+
+interface UseComputeYAxisMaxCharactersProps {
+  firstUnit: string;
+  secondUnit: string;
+  thresholdUnit?: string;
+  thresholds?: Thresholds;
+  graphData: Data;
+  axis?: ChartAxis;
+}
+
+interface UseComputteYAxisMaxCharactersState {
+  maxLeftAxisCharacters: number;
+  maxRightAxisCharacters: number;
+}
+
+export const useComputeYAxisMaxCharacters = ({
+  thresholds,
+  firstUnit,
+  secondUnit,
+  graphData,
+  axis,
+  thresholdUnit
+}: UseComputeYAxisMaxCharactersProps): UseComputteYAxisMaxCharactersState => {
+  const maxLeftValue = useMemo(
+    () =>
+      getFormattedAxisValues({
+        threshold: thresholds?.critical ?? [],
+        axisUnit: axis?.axisYLeft?.unit ?? firstUnit,
+        timeSeries: graphData?.timeSeries ?? [],
+        thresholdUnit,
+        lines: graphData?.lines ?? [],
+        base: graphData?.baseAxis
+      }),
+    [
+      thresholds?.critical,
+      axis?.axisYLeft?.unit,
+      firstUnit,
+      graphData?.timeSeries,
+      thresholdUnit,
+      graphData?.lines,
+      graphData?.baseAxis
+    ]
+  );
+
+  const maxRightValue = useMemo(
+    () =>
+      getFormattedAxisValues({
+        threshold: thresholds?.critical ?? [],
+        axisUnit: axis?.axisYRight?.unit ?? secondUnit,
+        timeSeries: graphData.timeSeries ?? [],
+        thresholdUnit,
+        lines: graphData.lines ?? [],
+        base: graphData.baseAxis
+      }),
+    [
+      thresholds?.critical,
+      axis?.axisYRight?.unit,
+      secondUnit,
+      graphData.timeSeries,
+      thresholdUnit,
+      graphData.lines,
+      graphData.baseAxis
+    ]
+  );
+
+  const maxLeftAxisCharacters = useMemo(
+    () =>
+      isEmpty(maxLeftValue)
+        ? 2
+        : Math.max(...maxLeftValue.map((value) => value.length), 2),
+    [maxLeftValue]
+  );
+
+  const maxRightAxisCharacters = useMemo(
+    () =>
+      isEmpty(maxRightValue)
+        ? 5
+        : Math.max(...maxRightValue.map((value) => value.length), 5),
+    [maxRightValue]
+  );
+
+  return {
+    maxLeftAxisCharacters,
+    maxRightAxisCharacters
+  };
+};

package/src/Graph/common/models.ts

@@ -6,14 +6,13 @@ export interface LineChartData {
   times: Array<string>;
 }
 
+export interface Threshold {
+  label: string;
+  value: number;
+}
+
 export interface Thresholds {
-  critical: Array<{
-    label: string;
-    value: number;
-  }>;
+  critical: Array<Threshold>;
   enabled: boolean;
-  warning: Array<{
-    label: string;
-    value: number;
-  }>;
+  warning: Array<Threshold>;
 }

package/src/Graph/common/timeSeries/index.test.ts

@@ -567,7 +567,7 @@ describe('Format value with unit', () => {
 
     if (unit === 'ms') {
       return {
-        expectedResult: '34.23 seconds',
+        expectedResult: '34.23k ms',
         unit,
         value: 34232
       };

package/src/Graph/common/timeSeries/index.ts

@@ -523,13 +523,7 @@ const getYScalePerUnit = ({
 };
 
 const formatTime = (value: number): string => {
-  if (value < 1000) {
-    return `${numeral(value).format('0.[00]a')} ms`;
-  }
-
-  const t = numeral(value / 1000).format('0.[00]a');
-
-  return `${t} seconds`;
+  return `${numeral(value).format('0.[00]a')} ms`;
 };
 
 const registerMsUnitToNumeral = (): null => {