@centreon/ui 24.6.5 → 24.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "24.6.5",
+  "version": "24.7.1",
   "description": "Centreon UI Components",
   "scripts": {
     "update:deps": "pnpx npm-check-updates -i --format group",
@@ -12,9 +12,9 @@
     "test:storybook:local": "test-storybook --url http://127.0.0.1:9001",
     "test:ci": "jest --silent --reporter=jest-junit",
     "cypress:ui": "cypress open --component --browser=chrome",
-    "cypress:cli:updateSnapshot": "pnpm cypress:cli --env updateSnapshots=true",
+    "cypress:run:updateSnapshot": "pnpm cypress:cli --env updateSnapshots=true",
     "cypress:run:coverage": "cypress run --component --browser=chrome --env codeCoverageTasksRegistered=true",
-    "cypress:cli": "cypress run --component --browser=chrome",
+    "cypress:run": "cypress run --component --browser=chrome",
     "tokens:transform": "TS_NODE_PROJECT=tsconfig.node.json ts-node style-dictionary.transform.ts"
   },
   "sideEffects": false,

package/src/Graph/BarChart/BarChart.tsx

@@ -8,6 +8,7 @@ import 'dayjs/locale/pt';
 import localizedFormat from 'dayjs/plugin/localizedFormat';
 import timezonePlugin from 'dayjs/plugin/timezone';
 import utcPlugin from 'dayjs/plugin/utc';
+import { Provider } from 'jotai';
 
 import { Box } from '@mui/material';
 
@@ -33,7 +34,7 @@ export interface BarChartProps
   end: string;
   limitLegend?: false | number;
   loading: boolean;
-  orientation: 'vertical' | 'horizontal';
+  orientation: 'vertical' | 'horizontal' | 'auto';
   start: string;
   thresholdUnit?: string;
   thresholds?: Thresholds;
@@ -71,30 +72,32 @@ const BarChart = ({
   }
 
   return (
-    <Box
-      ref={lineChartRef}
-      sx={{ height: '100%', overflow: 'hidden', width: '100%' }}
-    >
-      <ParentSize>
-        {({ height: responsiveHeight, width }) => (
-          <ResponsiveBarChart
-            axis={axis}
-            barStyle={barStyle}
-            graphData={adjustedData}
-            graphRef={lineChartRef}
-            header={header}
-            height={height || responsiveHeight}
-            legend={legend}
-            limitLegend={limitLegend}
-            orientation={orientation}
-            thresholdUnit={thresholdUnit}
-            thresholds={thresholds}
-            tooltip={tooltip}
-            width={width}
-          />
-        )}
-      </ParentSize>
-    </Box>
+    <Provider>
+      <Box
+        ref={lineChartRef}
+        sx={{ height: '100%', overflow: 'hidden', width: '100%' }}
+      >
+        <ParentSize>
+          {({ height: responsiveHeight, width }) => (
+            <ResponsiveBarChart
+              axis={axis}
+              barStyle={barStyle}
+              graphData={adjustedData}
+              graphRef={lineChartRef}
+              header={header}
+              height={height || responsiveHeight}
+              legend={legend}
+              limitLegend={limitLegend}
+              orientation={orientation}
+              thresholdUnit={thresholdUnit}
+              thresholds={thresholds}
+              tooltip={tooltip}
+              width={width}
+            />
+          )}
+        </ParentSize>
+      </Box>
+    </Provider>
   );
 };
 

package/src/Graph/BarChart/BarGroup.tsx

@@ -171,6 +171,7 @@ const BarGroup = ({
                   <BarStack
                     barIndex={barGroup.index}
                     barPadding={isHorizontal ? bar.x : bar.y}
+                    barStyle={barStyle}
                     barWidth={isHorizontal ? bar.width : bar.height}
                     isHorizontal={isHorizontal}
                     isTooltipHidden={isTooltipHidden}
@@ -183,6 +184,7 @@ const BarGroup = ({
                   <BarStack
                     barIndex={barGroup.index}
                     barPadding={isHorizontal ? bar.x : bar.y}
+                    barStyle={barStyle}
                     barWidth={isHorizontal ? bar.width : bar.height}
                     isHorizontal={isHorizontal}
                     isTooltipHidden={isTooltipHidden}

package/src/Graph/BarChart/BarStack.tsx

@@ -4,6 +4,7 @@ import { scaleBand } from '@visx/scale';
 import { equals, gt, pick } from 'ramda';
 
 import { useBarStack, UseBarStackProps } from './useBarStack';
+import { BarStyle } from './models';
 
 const xScale = scaleBand<number>({
   domain: [0, 0],
@@ -14,6 +15,7 @@ const xScale = scaleBand<number>({
 interface Props extends Omit<UseBarStackProps, 'xScale'> {
   barIndex: number;
   barPadding: number;
+  barStyle: BarStyle;
   barWidth: number;
   isTooltipHidden: boolean;
 }
@@ -34,7 +36,8 @@ const BarStack = ({
   barWidth,
   barPadding,
   barIndex,
-  isTooltipHidden
+  isTooltipHidden,
+  barStyle
 }: Props): JSX.Element => {
   const {
     BarStackComponent,
@@ -63,6 +66,7 @@ const BarStack = ({
                 fill={bar.color}
                 height={isHorizontal ? Math.abs(bar.height) : barWidth}
                 key={`bar-stack-${barStack.index}-${bar.index}`}
+                opacity={barStyle.opacity}
                 width={isHorizontal ? barWidth : Math.abs(bar.width)}
                 x={
                   isHorizontal
@@ -107,7 +111,8 @@ const propsToMemoize = [
   'lines',
   'barPadding',
   'barIndex',
-  'isTooltipHidden'
+  'isTooltipHidden',
+  'barStyle'
 ];
 
 export default memo(BarStack, (prevProps, nextProps) => {

package/src/Graph/BarChart/ResponsiveBarChart.tsx

@@ -1,6 +1,6 @@
-import { MutableRefObject, useMemo, useRef, useState } from 'react';
+import { MutableRefObject, useEffect, useMemo, useRef, useState } from 'react';
 
-import { equals, flatten, has, isNil, pluck } from 'ramda';
+import { equals, flatten, gte, has, isNil, pluck } from 'ramda';
 import { useAtom } from 'jotai';
 
 import { Skeleton } from '@mui/material';
@@ -22,6 +22,7 @@ import { useTooltipStyles } from '../common/useTooltipStyles';
 import { margin } from '../LineChart/common';
 import { Tooltip } from '../../components';
 import Thresholds from '../common/Thresholds/Thresholds';
+import { useDeepCompare } from '../../utils';
 
 import BarGroup from './BarGroup';
 import { tooltipDataAtom } from './atoms';
@@ -35,7 +36,7 @@ interface Props
   graphRef: MutableRefObject<HTMLDivElement | null>;
   height: number;
   limitLegend?: false | number;
-  orientation: 'vertical' | 'horizontal';
+  orientation: 'vertical' | 'horizontal' | 'auto';
   thresholdUnit?: string;
   thresholds?: ThresholdsModel;
   width: number;
@@ -82,7 +83,13 @@ const ResponsiveBarChart = ({
     pluck('value', thresholds?.critical || [])
   ]);
 
-  const isHorizontal = equals(orientation, 'horizontal');
+  const isHorizontal = useMemo(() => {
+    if (!equals(orientation, 'auto')) {
+      return equals(orientation, 'horizontal');
+    }
+
+    return gte(graphWidth, graphHeight + 60);
+  }, [orientation, graphWidth, graphHeight]);
 
   const xScale = useMemo(
     () =>
@@ -144,6 +151,13 @@ const ResponsiveBarChart = ({
     ]
   );
 
+  useEffect(
+    () => {
+      setLinesGraph(lines);
+    },
+    useDeepCompare([lines])
+  );
+
   const displayLegend = legend?.display ?? true;
 
   const displayedLines = useMemo(
@@ -214,7 +228,7 @@ const ResponsiveBarChart = ({
             graphWidth={graphWidth - (isHorizontal ? 0 : margin.left - 15)}
             gridLinesType={axis?.gridLinesType}
             leftScale={leftScale}
-            orientation={orientation}
+            orientation={isHorizontal ? 'horizontal' : 'vertical'}
             rightScale={rightScale}
             showGridLines={showGridLines}
             svgRef={graphSvgRef}
@@ -228,7 +242,7 @@ const ResponsiveBarChart = ({
                 isTooltipHidden={isTooltipHidden}
                 leftScale={leftScale}
                 lines={displayedLines}
-                orientation={orientation}
+                orientation={isHorizontal ? 'horizontal' : 'vertical'}
                 rightScale={rightScale}
                 secondUnit={secondUnit}
                 size={isHorizontal ? graphHeight - margin.top - 5 : graphWidth}

package/src/Graph/LineChart/BasicComponents/Lines/Threshold/index.tsx

@@ -55,14 +55,14 @@ const WrapperThresholdLines = ({
   };
 
   const thresholdLines = areaThresholdLines?.map((item, index) => {
-    const { type } = item;
+    const { type, id } = item;
 
     if (equals(type, ThresholdType.basic)) {
       return [
         {
           Component: BasicThreshold,
           key: index,
-          props: { ...commonProps, getY0, getY1 }
+          props: { ...commonProps, getY0, getY1, id }
         }
       ];
     }
@@ -131,7 +131,7 @@ const WrapperThresholdLines = ({
     <g>
       {filteredThresholdLines.map((element) =>
         element?.map(({ Component, props, key }) => (
-          <Component {...props} id={key} key={key} />
+          <Component {...props} id={props?.id ?? key} key={key} />
         ))
       )}
     </g>

package/src/Graph/LineChart/LineChart.tsx

@@ -123,6 +123,7 @@ const LineChart = ({
     hasSecondUnit: Boolean(secondUnit),
     height,
     legendDisplay: legend?.display,
+    legendHeight: legend?.height,
     legendPlacement: legend?.placement,
     width
   });
@@ -229,6 +230,7 @@ const LineChart = ({
           height={height}
           legend={{
             displayLegend,
+            legendHeight: legend?.height,
             mode: legend?.mode,
             placement: legend?.placement,
             renderExtraComponent: legend?.renderExtraComponent

package/src/Graph/LineChart/index.tsx

@@ -11,6 +11,7 @@ import utcPlugin from 'dayjs/plugin/utc';
 
 import { ParentSize } from '../..';
 import { LineChartData, Thresholds } from '../common/models';
+import Loading from '../../LoadingSkeleton';
 
 import LineChart from './LineChart';
 import LoadingSkeleton from './LoadingSkeleton';
@@ -73,7 +74,7 @@ const WrapperLineChart = ({
   }
 
   if (!adjustedData) {
-    return null;
+    return <Loading height={height} width={width} />;
   }
 
   return (

package/src/Graph/LineChart/models.ts

@@ -154,6 +154,7 @@ export interface GlobalAreaLines {
 }
 export interface LegendModel {
   display?: boolean;
+  height?: number;
   mode: 'grid' | 'list';
   placement: 'bottom' | 'left' | 'right';
   renderExtraComponent?: ReactNode;

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

@@ -32,19 +32,23 @@ const Axes = ({
 }: Props): JSX.Element => {
   const { format } = useLocaleDateTimeFormat();
   const { lines, showBorder, yAxisTickLabelRotation } = data;
+  const isHorizontal = equals(orientation, 'horizontal');
 
-  const { axisLeft, axisRight } = useAxisY({ data, graphHeight: height });
+  const { axisLeft, axisRight } = useAxisY({
+    data,
+    graphHeight: height,
+    graphWidth: width,
+    isHorizontal
+  });
 
   const [firstUnit, secondUnit, thirdUnit] = getUnits(lines);
 
   const xTickCount = Math.min(Math.ceil(width / 82), 12);
 
+  const [start, end] = xScale.domain();
+
   const tickFormat =
-    data?.axisX?.xAxisTickFormat ??
-    getXAxisTickFormat({
-      start: xScale.domain()[0],
-      start: xScale.domain()[-1]
-    });
+    data?.axisX?.xAxisTickFormat ?? getXAxisTickFormat({ end, start });
 
   const formatAxisTick = (tick): string =>
     format({ date: new Date(tick), formatString: tickFormat });
@@ -52,8 +56,6 @@ const Axes = ({
   const hasMoreThanTwoUnits = !isNil(thirdUnit);
   const displayAxisRight = !isNil(secondUnit) && !hasMoreThanTwoUnits;
 
-  const isHorizontal = equals(orientation, 'horizontal');
-
   const AxisBottom = isHorizontal ? Axis.AxisBottom : Axis.AxisLeft;
   const AxisLeft = isHorizontal ? Axis.AxisLeft : Axis.AxisTop;
   const AxisRight = isHorizontal ? Axis.AxisRight : Axis.AxisBottom;
@@ -76,7 +78,7 @@ const Axes = ({
         <UnitLabel
           unit={firstUnit}
           x={isHorizontal ? -8 : width + 8}
-          y={isHorizontal ? 16 : 0}
+          y={isHorizontal ? 16 : -2}
         />
       )}
 
@@ -88,8 +90,8 @@ const Axes = ({
         tickLabelProps={() => ({
           ...axisLeft.tickLabelProps(),
           angle: yAxisTickLabelRotation,
-          dx: isHorizontal ? -8 : 2,
-          dy: isHorizontal ? 4 : -4
+          dx: isHorizontal ? -8 : 16,
+          dy: isHorizontal ? 4 : -6
         })}
         tickLength={2}
       />

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

@@ -27,15 +27,24 @@ interface AxisY {
 interface Props {
   data: Omit<Data, 'timeSeries'>;
   graphHeight?: number;
+  graphWidth?: number;
+  isHorizontal: boolean;
 }
 
-const useAxisY = ({ data, graphHeight }: Props): AxisY => {
+const useAxisY = ({
+  data,
+  graphHeight,
+  graphWidth,
+  isHorizontal
+}: Props): AxisY => {
   const theme = useTheme();
 
   const { lines } = data;
   const [firstUnit, secondUnit, thirdUnit] = getUnits(lines);
 
-  const numTicks = graphHeight && Math.ceil(graphHeight / 30);
+  const numTicks = isHorizontal
+    ? graphHeight && Math.ceil(graphHeight / 30)
+    : graphWidth && Math.ceil(graphWidth / 60);
 
   const hasMoreThanTwoUnits = !isNil(thirdUnit);
   const hasTwoUnits = !isNil(secondUnit) && !hasMoreThanTwoUnits;

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

@@ -27,6 +27,7 @@ interface Props {
   isHorizontal?: boolean;
   legend: {
     displayLegend: boolean;
+    legendHeight?: number;
     mode?: 'grid' | 'list';
     placement?: 'left' | 'right' | 'bottom';
     renderExtraComponent?: ReactNode;
@@ -112,7 +113,10 @@ const BaseChart = ({
         </Stack>
       </div>
       {legend.displayLegend && displayLegendInBottom && (
-        <div ref={legendRef}>
+        <div
+          ref={legendRef}
+          style={{ height: legend?.legendHeight ?? 'undefined' }}
+        >
           <Legend
             base={base}
             height={height}

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

@@ -4,10 +4,10 @@ import { Group } from '@visx/visx';
 import { equals } from 'ramda';
 
 import { margin } from '../../LineChart/common';
-import Grids from '../Grids';
+import { LineChartAxis } from '../../LineChart/models';
 import Axes from '../Axes';
+import Grids from '../Grids';
 import { Line, TimeValue } from '../timeSeries/models';
-import { LineChartAxis } from '../../LineChart/models';
 
 import { extraMargin } from './useComputeBaseChartDimensions';
 

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

@@ -10,6 +10,7 @@ interface UseComputeBaseChartDimensionsProps {
   hasSecondUnit?: boolean;
   height: number | null;
   legendDisplay?: boolean;
+  legendHeight?: number;
   legendPlacement?: string;
   width: number;
 }
@@ -25,14 +26,18 @@ export const useComputeBaseChartDimensions = ({
   height,
   legendDisplay,
   legendPlacement,
-  hasSecondUnit
+  hasSecondUnit,
+  legendHeight
 }: UseComputeBaseChartDimensionsProps): UseComputeBaseChartDimensionsState => {
   const legendRef = useRef<HTMLDivElement | null>(null);
 
+  const currentLegendHeight =
+    legendHeight ?? (legendRef.current?.getBoundingClientRect().height || 0);
+
   const legendBoundingHeight =
     !equals(legendDisplay, false) &&
     (isNil(legendPlacement) || equals(legendPlacement, 'bottom'))
-      ? legendRef.current?.getBoundingClientRect().height || 0
+      ? currentLegendHeight
       : 0;
   const legendBoundingWidth =
     !equals(legendDisplay, false) &&

package/src/Graph/index.ts

@@ -1,4 +1,7 @@
 export { default as LineChart } from './LineChart';
+export { default as ThresholdLines } from './LineChart/BasicComponents/Lines/Threshold';
+export { default as useLineChartData } from './LineChart/useLineChartData';
+export { default as BarChart } from './BarChart/BarChart';
 export { Gauge } from './Gauge';
 export { SingleBar } from './SingleBar';
 export { Text as GraphText } from './Text';
@@ -7,3 +10,6 @@ export { HeatMap } from './HeatMap';
 export { BarStack } from './BarStack';
 export { PieChart } from './PieChart';
 export * from './Tree';
+export type { LineChartData } from './common/models';
+export * from './common/timeSeries';
+export * from './LineChart/models';

package/src/TimePeriods/index.tsx

@@ -9,6 +9,7 @@ import timezonePlugin from 'dayjs/plugin/timezone';
 import utcPlugin from 'dayjs/plugin/utc';
 
 import { ParentSize } from '..';
+import LoadingSkeleton from '../LoadingSkeleton';
 
 import { WrapperTimePeriodProps } from './models';
 import TimePeriods from './TimePeriods';
@@ -18,10 +19,17 @@ dayjs.extend(utcPlugin);
 dayjs.extend(timezonePlugin);
 dayjs.extend(duration);
 
-const WrapperTimePeriods = (props: WrapperTimePeriodProps): JSX.Element => (
+const WrapperTimePeriods = ({
+  skeletonHeight = 38,
+  ...rest
+}: WrapperTimePeriodProps): JSX.Element => (
   <ParentSize>
     {({ width }): JSX.Element => {
-      return <TimePeriods width={width} {...props} />;
+      return !width ? (
+        <LoadingSkeleton height={skeletonHeight} variant="rectangular" />
+      ) : (
+        <TimePeriods width={width} {...rest} />
+      );
     }}
   </ParentSize>
 );

package/src/TimePeriods/models.ts

@@ -109,4 +109,5 @@ export interface WrapperTimePeriodProps {
   getIsError?: (value: boolean) => void;
   getParameters?: ({ start, end, timelineEventsLimit }: Parameters) => void;
   renderExternalComponent?: ReactNode;
+  skeletonHeight?: number;
 }

package/src/index.ts

@@ -158,8 +158,6 @@ export { default as FluidTypography } from './Typography/FluidTypography';
 export { default as EllipsisTypography } from './Typography/EllipsisTypography';
 export * from './Dashboard';
 export * from './Graph';
-export type { LineChartData } from './Graph/common/models';
-export * from './Graph/common/timeSeries';
 
 export { default as TimePeriods } from './TimePeriods';
 export { default as SimpleCustomTimePeriod } from './TimePeriods/CustomTimePeriod/SimpleCustomTimePeriod';

package/src/Graph/LineChart/BasicComponents/useFilterLines.ts

@@ -1,60 +0,0 @@
-import { Dispatch, SetStateAction, useEffect } from 'react';
-
-import { equals, propEq, reject } from 'ramda';
-
-import { Line } from '../../common/timeSeries/models';
-
-import {
-  findLineOfOriginMetricThreshold,
-  lowerLineName,
-  upperLineName
-} from './Lines/Threshold/models';
-
-interface UseFilterLines {
-  displayThreshold?: boolean;
-  lines: Array<Line>;
-  linesGraph: Array<Line> | null;
-  setLinesGraph: Dispatch<SetStateAction<Array<Line> | null>>;
-}
-
-interface Result {
-  displayedLines: Array<Line>;
-  newLines: Array<Line>;
-}
-
-const useFilterLines = ({
-  displayThreshold = false,
-  lines,
-  linesGraph,
-  setLinesGraph
-}: UseFilterLines): Result => {
-  const displayedLines = reject(propEq(false, 'display'), linesGraph ?? lines);
-  const filterLines = (): Array<Line> => {
-    const lineOriginMetric = findLineOfOriginMetricThreshold(lines);
-
-    const findLinesUpperLower = lines.map((line) =>
-      equals(line.name, lowerLineName) || equals(line.name, upperLineName)
-        ? line
-        : null
-    );
-
-    const linesUpperLower = reject((element) => !element, findLinesUpperLower);
-
-    return [...lineOriginMetric, ...linesUpperLower] as Array<Line>;
-  };
-
-  useEffect(() => {
-    const filteredLines = filterLines();
-    if (!lines || !displayThreshold) {
-      setLinesGraph(lines);
-
-      return;
-    }
-
-    setLinesGraph(filteredLines);
-  }, [lines, displayThreshold]);
-
-  return { displayedLines, newLines: linesGraph ?? lines };
-};
-
-export default useFilterLines;