@centreon/ui 23.10.121 → 24.4.0

package/src/Graph/HeatMap/HeatMap.stories.tsx

@@ -3,8 +3,6 @@ import { makeStyles } from 'tss-react/mui';
 
 import { Box, Typography } from '@mui/material';
 
-import EllipsisTypography from '../../Typography/EllipsisTypography';
-
 import heatMapData from './HeatMapData.json';
 
 import { HeatMap } from '.';
@@ -22,29 +20,6 @@ const meta: Meta<typeof HeatMap<Data>> = {
 export default meta;
 type Story = StoryObj<typeof HeatMap<Data>>;
 
-const TileContent = ({
-  isSmallestSize,
-  data
-}: {
-  data: Data;
-  isSmallestSize: boolean;
-}): JSX.Element | false =>
-  !isSmallestSize && (
-    <Box
-      sx={{
-        alignItems: 'center',
-        color: 'common.black',
-        display: 'flex',
-        flexDirection: 'column',
-        width: '100%'
-      }}
-    >
-      <EllipsisTypography textAlign="center">{data.host}</EllipsisTypography>
-      <EllipsisTypography textAlign="center">{data.service}</EllipsisTypography>
-      <EllipsisTypography textAlign="center">{data.counter}</EllipsisTypography>
-    </Box>
-  );
-
 const TooltipContent = ({ data }: { data: Data }): JSX.Element => {
   return (
     <Box sx={{ backgroundColor: 'common.white', color: 'common.black' }}>

package/src/Graph/HeatMap/HeatMap.styles.tsx

@@ -7,6 +7,7 @@ export const useHeatMapStyles = makeStyles()((theme) => ({
   heatMapTile: {
     alignItems: 'center',
     aspectRatio: '1 / 1',
+    borderRadius: theme.shape.borderRadius,
     display: 'flex',
     justifyContent: 'center',
     width: '100%'

package/src/Graph/HeatMap/ResponsiveHeatMap.tsx

@@ -1,7 +1,7 @@
-import { useMemo } from 'react';
+import { useMemo, useRef } from 'react';
 
 import { scaleLinear } from '@visx/scale';
-import { equals, gt, lt } from 'ramda';
+import { T, equals, gt, lt } from 'ramda';
 
 import { Box } from '@mui/material';
 
@@ -13,6 +13,7 @@ import { useHeatMapStyles } from './HeatMap.styles';
 const gap = 8;
 const maxTileSize = 120;
 const smallestTileSize = 44;
+const toleratedRangeWidth = 10;
 
 const ResponsiveHeatMap = <TData,>({
   width,
@@ -20,9 +21,11 @@ const ResponsiveHeatMap = <TData,>({
   tiles,
   arrowClassName,
   tooltipContent,
-  tileSizeFixed
+  tileSizeFixed,
+  displayTooltipCondition = T
 }: HeatMapProps<TData> & { width: number }): JSX.Element | null => {
   const { classes, cx } = useHeatMapStyles();
+  const previousTileSize = useRef(0);
 
   const tileSize = useMemo(() => {
     const scaleWidth = scaleLinear({
@@ -38,8 +41,14 @@ const ResponsiveHeatMap = <TData,>({
       tilesLength * maxTileSize + (tilesLength - 1) * gap;
     const theoricalTotalTilesWidth =
       tilesLength * tileWidth + (tilesLength - 1) * gap;
+    const canUpdateTileSize =
+      Math.abs(tileWidth - previousTileSize.current) > toleratedRangeWidth;
 
-    if (lt(width, 680) && gt(maxTotalTilesWidth, width)) {
+    if (!canUpdateTileSize) {
+      return previousTileSize.current;
+    }
+
+    if (lt(width, 680) && gt(maxTotalTilesWidth, width) && !tileSizeFixed) {
       return smallestTileSize;
     }
 
@@ -51,6 +60,8 @@ const ResponsiveHeatMap = <TData,>({
   }, [width, tiles]);
 
   const isSmallestSize = equals(tileSize, smallestTileSize);
+  const isMediumSize = !isSmallestSize && lt(tileSize, 90);
+  previousTileSize.current = tileSize;
 
   if (equals(width, 0)) {
     return null;
@@ -65,24 +76,40 @@ const ResponsiveHeatMap = <TData,>({
       }}
     >
       {tiles.map(({ backgroundColor, id, data }) => (
-        <Box className={classes.heatMapTile} key={id} sx={{ backgroundColor }}>
+        <Box
+          className={classes.heatMapTile}
+          data-testid={id}
+          key={id}
+          sx={{ backgroundColor }}
+        >
           <Tooltip
             hasCaret
             classes={{
               arrow: cx(classes.heatMapTooltipArrow, arrowClassName),
               tooltip: classes.heatMapTooltip
             }}
+            data-testid={`tooltip-${data?.id}`}
             followCursor={false}
-            label={tooltipContent?.({
-              backgroundColor,
-              data,
-              id,
-              isSmallestSize
-            })}
+            label={
+              displayTooltipCondition?.(data) &&
+              tooltipContent?.({
+                backgroundColor,
+                data,
+                id,
+                isSmallestSize
+              })
+            }
             position="right-start"
           >
             <div className={classes.heatMapTileContent}>
-              {children({ backgroundColor, data, id, isSmallestSize })}
+              {children({
+                backgroundColor,
+                data,
+                id,
+                isMediumSize,
+                isSmallestSize,
+                tileSize
+              })}
             </div>
           </Tooltip>
         </Box>

package/src/Graph/HeatMap/model.ts

@@ -10,7 +10,9 @@ interface ChildrenProps<TData> {
   backgroundColor: string;
   data: TData;
   id: string;
+  isMediumSize?: boolean;
   isSmallestSize: boolean;
+  tileSize?: number;
 }
 
 export interface HeatMapProps<TData> {
@@ -19,8 +21,11 @@ export interface HeatMapProps<TData> {
     backgroundColor,
     id,
     data,
-    isSmallestSize
+    isSmallestSize,
+    tileSize,
+    isMediumSize
   }: ChildrenProps<TData>) => ReactElement | boolean | null;
+  displayTooltipCondition?: (data: TData) => boolean;
   tileSizeFixed?: boolean;
   tiles: Array<Tile<TData>>;
   tooltipContent?: ({

package/src/Graph/Legend/Legend.styles.ts

@@ -0,0 +1,10 @@
+import { makeStyles } from 'tss-react/mui';
+
+export const useStyles = makeStyles()((theme) => ({
+  container: {
+    border: `1px solid ${theme.palette.divider}`,
+    borderRadius: theme.shape.borderRadius,
+    padding: theme.spacing(1),
+    width: 'fit-content'
+  }
+}));

package/src/Graph/Legend/Legend.tsx

@@ -0,0 +1,26 @@
+import { LegendOrdinal } from '@visx/legend';
+import { scaleOrdinal } from '@visx/scale';
+import { equals } from 'ramda';
+
+import { useStyles } from './Legend.styles';
+import { LegendProps } from './models';
+
+const Legend = ({ scale, direction = 'column' }: LegendProps): JSX.Element => {
+  const { classes } = useStyles();
+
+  const legendScale = scaleOrdinal({
+    domain: scale.domain,
+    range: scale.range
+  });
+
+  return (
+    <LegendOrdinal
+      className={classes.container}
+      direction={direction}
+      labelMargin={equals(direction, 'row') ? '0 12px 0 0' : '0 0 0 0'}
+      scale={legendScale}
+    />
+  );
+};
+
+export default Legend;

package/src/Graph/Legend/index.ts

@@ -0,0 +1 @@
+export { default as Legend } from './Legend';

package/src/Graph/Legend/models.ts

@@ -0,0 +1,11 @@
+export type LegendDirection = 'row' | 'column';
+
+export interface LegendScale {
+  domain: Array<number | string>;
+  range: Array<string>;
+}
+
+export interface LegendProps {
+  direction?: LegendDirection;
+  scale: LegendScale;
+}

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

@@ -55,6 +55,7 @@ const RegularLine = ({
   if (filled) {
     return (
       <Shape.AreaClosed<TimeValue>
+        data-metric={metric_id}
         fill={getFillColor({ areaColor, transparency })}
         fillRule="nonzero"
         key={metric_id}
@@ -65,7 +66,7 @@ const RegularLine = ({
     );
   }
 
-  return <Shape.LinePath<TimeValue> {...props} />;
+  return <Shape.LinePath<TimeValue> data-metric={metric_id} {...props} />;
 };
 
 export default memo(RegularLine, (prevProps, nextProps) => {

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

@@ -45,10 +45,8 @@ const StackLines = ({
     >
       {({ stacks, path: linePath }): Array<JSX.Element> => {
         return stacks.map((stack, index) => {
-          const { areaColor, transparency, lineColor, highlight } = nth(
-            index,
-            lines
-          ) as Line;
+          const { areaColor, transparency, lineColor, highlight, metric_id } =
+            nth(index, lines) as Line;
 
           return (
             <g key={`stack-${prop('key', stack)}`}>
@@ -65,6 +63,7 @@ const StackLines = ({
               )}
               <path
                 d={linePath(stack) || ''}
+                data-metric={metric_id}
                 fill={getFillColor({ areaColor, transparency })}
                 opacity={highlight === false ? 0.3 : 1}
                 stroke={lineColor}

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

@@ -1,7 +1,7 @@
 import { Shape } from '@visx/visx';
 import { isEmpty, isNil } from 'ramda';
 
-import { Circle } from './models';
+import { Circle as CircleModel } from './models';
 import useCoordinateCircle from './useCoordinateCircle';
 
 const Circle = ({
@@ -11,7 +11,7 @@ const Circle = ({
   timeSeries,
   getX,
   getCountDisplayedCircles
-}: Circle): JSX.Element | null => {
+}: CircleModel): JSX.Element | null => {
   const coordinates = useCoordinateCircle({
     getCountDisplayedCircles,
     getX,

package/src/Graph/LineChart/BasicComponents/ThresholdLine.tsx

@@ -2,6 +2,8 @@ import { equals } from 'ramda';
 
 import { useTheme } from '@mui/material';
 
+import { margin } from '../common';
+
 interface Props {
   hideTooltip: () => void;
   label: string;
@@ -28,7 +30,7 @@ export const ThresholdLine = ({
   const onMouseEnter = (): void =>
     showTooltip({
       tooltipData: label,
-      tooltipLeft: 0,
+      tooltipLeft: -(margin.left + margin.right),
       tooltipTop: scaledValue
     });
 

package/src/Graph/LineChart/BasicComponents/Thresholds.tsx

@@ -2,7 +2,7 @@ import { equals, isNil } from 'ramda';
 
 import { getUnits, getYScale } from '../../common/timeSeries';
 import { Line } from '../../common/timeSeries/models';
-import { Thresholds } from '../../common/models';
+import { Thresholds as ThresholdsModel } from '../../common/models';
 
 import { ThresholdLine } from './ThresholdLine';
 
@@ -13,7 +13,7 @@ interface Props {
   rightScale: (value: number) => number;
   showTooltip: (props) => void;
   thresholdUnit?: string;
-  thresholds: Thresholds;
+  thresholds: ThresholdsModel;
   width: number;
 }
 

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

@@ -1,6 +1,6 @@
 import { Dispatch, SetStateAction, useEffect } from 'react';
 
-import { compose, equals, prop, propEq, reject, sortBy, toLower } from 'ramda';
+import { equals, propEq, reject } from 'ramda';
 
 import { Line } from '../../common/timeSeries/models';
 
@@ -28,7 +28,7 @@ const useFilterLines = ({
   linesGraph,
   setLinesGraph
 }: UseFilterLines): Result => {
-  const displayedLines = reject(propEq('display', false), linesGraph ?? lines);
+  const displayedLines = reject(propEq(false, 'display'), linesGraph ?? lines);
   const filterLines = (): Array<Line> => {
     const lineOriginMetric = findLineOfOriginMetricThreshold(lines);
 
@@ -51,9 +51,7 @@ const useFilterLines = ({
       return;
     }
 
-    const sortedLines = sortBy(compose(toLower, prop('name')), filteredLines);
-
-    setLinesGraph(sortedLines);
+    setLinesGraph(filteredLines);
   }, [lines, displayThreshold]);
 
   return { displayedLines, newLines: linesGraph ?? lines };

package/src/Graph/LineChart/Header/index.tsx

@@ -1,41 +1,17 @@
-import { ScaleLinear } from 'd3-scale';
-import { isNil } from 'ramda';
-
 import Typography from '@mui/material/Typography';
 
-import { useLocaleDateTimeFormat, useMemoComponent } from '@centreon/ui';
+import { useMemoComponent } from '@centreon/ui';
 
 import { useStyles } from '../LineChart.styles';
-import useTickGraph from '../InteractiveComponents/AnchorPoint/useTickGraph';
 import { LineChartHeader } from '../models';
-import { TimeValue } from '../../common/timeSeries/models';
 
 interface Props {
-  displayTimeTick?: boolean;
   header?: LineChartHeader;
-  timeSeries: Array<TimeValue>;
   title: string;
-  xScale: ScaleLinear<number, number>;
 }
 
-const Header = ({
-  title,
-  displayTimeTick = true,
-  header,
-  timeSeries,
-  xScale
-}: Props): JSX.Element => {
+const Header = ({ title, header }: Props): JSX.Element => {
   const { classes } = useStyles();
-  const { toDateTime } = useLocaleDateTimeFormat();
-
-  const { tickAxisBottom } = useTickGraph({
-    timeSeries,
-    xScale
-  });
-  const time =
-    displayTimeTick && !isNil(tickAxisBottom)
-      ? toDateTime(tickAxisBottom)
-      : null;
 
   const displayTitle = header?.displayTitle ?? true;
 
@@ -49,16 +25,12 @@ const Header = ({
               {title}
             </Typography>
           )}
-
-          <Typography align="center" style={{ height: 20 }} variant="body1">
-            {time}
-          </Typography>
         </div>
         {header?.extraComponent}
       </div>
     ),
 
-    memoProps: [time, timeSeries, xScale, displayTimeTick, title, header]
+    memoProps: [title, header]
   });
 };
 

package/src/Graph/LineChart/Icons/Downtime.tsx

@@ -1,9 +1,9 @@
-import { SvgIcon, SvgIconProps } from '@mui/material';
+import { SvgIconProps } from '@mui/material';
 
-import { ReactComponent as IconDowntime } from '../../../@assets/icons/downtime.icon.svg';
+import { DowntimeIcon } from '../../../Icon/DowntimeIcon';
 
 const Downtime = (props: SvgIconProps): JSX.Element => (
-  <SvgIcon component={IconDowntime} {...props} />
+  <DowntimeIcon {...props} />
 );
 
 export default Downtime;

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

@@ -2,7 +2,7 @@ import { Shape } from '@visx/visx';
 
 import { grey } from '@mui/material/colors';
 
-import { GuidingLines } from './models';
+import { GuidingLines as GuidingLinesModel } from './models';
 import useTickGraph from './useTickGraph';
 
 const GuidingLines = ({
@@ -10,7 +10,7 @@ const GuidingLines = ({
   xScale,
   graphHeight,
   graphWidth
-}: GuidingLines): JSX.Element | null => {
+}: GuidingLinesModel): JSX.Element | null => {
   const { positionX, positionY } = useTickGraph({
     timeSeries,
     xScale

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

@@ -2,13 +2,12 @@ import { useEffect, useState } from 'react';
 
 import { ScaleLinear } from 'd3-scale';
 import { useAtomValue } from 'jotai';
-import { isEmpty, isNil, not } from 'ramda';
 
 import useAxisY from '../../BasicComponents/Axes/useAxisY';
 import { margin } from '../../common';
-import { getMetrics, getTimeValue } from '../../../common/timeSeries';
+import { getTimeValue } from '../../../common/timeSeries';
 import { Line, TimeValue } from '../../../common/timeSeries/models';
-import { mousePositionAtom, timeValueAtom } from '../interactionWithGraphAtoms';
+import { mousePositionAtom } from '../interactionWithGraphAtoms';
 
 interface AnchorPointResult {
   positionX?: number;
@@ -42,14 +41,13 @@ const useTickGraph = ({
   const { axisRight, axisLeft } = useAxisY({ data: { baseAxis, lines } });
 
   const mousePosition = useAtomValue(mousePositionAtom);
-  const timeValueData = useAtomValue(timeValueAtom);
 
-  const metrics = getMetrics(timeValueData as TimeValue);
-
-  const containsMetrics = not(isNil(metrics)) && not(isEmpty(metrics));
-
-  const positionX = mousePosition ? mousePosition[0] - margin.left : undefined;
-  const positionY = mousePosition ? mousePosition[1] - margin.top : undefined;
+  const positionX = mousePosition
+    ? mousePosition[0] - margin.left - 4
+    : undefined;
+  const positionY = mousePosition
+    ? mousePosition[1] - margin.top + 2
+    : undefined;
 
   useEffect(() => {
     if (!mousePosition) {
@@ -62,7 +60,7 @@ const useTickGraph = ({
     const mousePositionTimeTick = mousePosition
       ? getTimeValue({ timeSeries, x: mousePosition[0], xScale }).timeTick
       : 0;
-    const timeTickValue = containsMetrics
+    const timeTickValue = mousePosition
       ? new Date(mousePositionTimeTick)
       : null;
 

package/src/Graph/LineChart/InteractiveComponents/Annotations/EventAnnotations.tsx

@@ -26,7 +26,7 @@ const EventAnnotations = ({
   color,
   annotationHoveredId
 }: Props): JSX.Element => {
-  const events = filter(propEq('type', type), data);
+  const events = filter(propEq(type, 'type'), data);
 
   return (
     <>

package/src/Graph/LineChart/InteractiveComponents/GraphValueTooltip/GraphValueTooltip.tsx

@@ -0,0 +1,68 @@
+import { useAtomValue } from 'jotai';
+import { equals, isNil } from 'ramda';
+
+import { Box, Typography } from '@mui/material';
+
+import { mousePositionAtom } from '../interactionWithGraphAtoms';
+import { formatMetricValueWithUnit } from '../../../common/timeSeries';
+
+import { useGraphValueTooltip } from './useGraphValueTooltip';
+import { useGraphValueTooltipStyles } from './useGraphValueTooltipStyles';
+
+interface Props {
+  base: number;
+}
+
+const GraphValueTooltip = ({ base }: Props): JSX.Element | null => {
+  const { classes } = useGraphValueTooltipStyles();
+  const mousePosition = useAtomValue(mousePositionAtom);
+
+  const graphValue = useGraphValueTooltip();
+
+  if (isNil(graphValue) || isNil(mousePosition)) {
+    return null;
+  }
+
+  return (
+    <div className={classes.tooltipContainer}>
+      <Typography fontWeight="bold">{graphValue.dateTime}</Typography>
+      <div className={classes.metrics}>
+        {graphValue.metrics.map(({ unit, color, id, value, name }) => {
+          const isMetricHighlighted = equals(
+            id,
+            graphValue.highlightedMetricId
+          );
+
+          return (
+            <div
+              className={classes.metric}
+              data-highlight={isMetricHighlighted}
+              data-metric={name}
+              key={id}
+            >
+              <Box
+                className={classes.metricColorBox}
+                sx={{ backgroundColor: color }}
+              />
+              <Typography
+                className={classes.metricName}
+                fontWeight={isMetricHighlighted ? 'bold' : undefined}
+              >
+                {name}
+              </Typography>
+              <Typography fontWeight={isMetricHighlighted ? 'bold' : undefined}>
+                {formatMetricValueWithUnit({
+                  base,
+                  unit,
+                  value
+                })}
+              </Typography>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+};
+
+export default GraphValueTooltip;

package/src/Graph/LineChart/InteractiveComponents/GraphValueTooltip/useGraphValueTooltip.ts

@@ -0,0 +1,27 @@
+import { useAtomValue } from 'jotai';
+import { isNil } from 'ramda';
+
+import { graphTooltipDataAtom } from '../interactionWithGraphAtoms';
+import { useLocaleDateTimeFormat } from '../../../../utils';
+import { GraphTooltipData } from '../../models';
+
+interface UseGraphValueTooltipState extends Omit<GraphTooltipData, 'date'> {
+  dateTime: string;
+}
+
+export const useGraphValueTooltip = (): UseGraphValueTooltipState | null => {
+  const { toDate, toTime } = useLocaleDateTimeFormat();
+  const graphTooltipData = useAtomValue(graphTooltipDataAtom);
+
+  if (isNil(graphTooltipData)) {
+    return null;
+  }
+
+  const formattedDateTime = `${toDate(graphTooltipData.date)} / ${toTime(graphTooltipData.date)}`;
+
+  return {
+    dateTime: formattedDateTime,
+    highlightedMetricId: graphTooltipData.highlightedMetricId,
+    metrics: graphTooltipData.metrics
+  };
+};

package/src/Graph/LineChart/InteractiveComponents/GraphValueTooltip/useGraphValueTooltipStyles.ts

@@ -0,0 +1,31 @@
+import { makeStyles } from 'tss-react/mui';
+
+export const useGraphValueTooltipStyles = makeStyles()((theme) => ({
+  dateTimeLabel: {
+    fontSize: '1.1rem'
+  },
+  metric: {
+    alignItems: 'center',
+    display: 'flex',
+    gap: theme.spacing(1),
+    weidth: '100%'
+  },
+  metricColorBox: {
+    borderRadius: theme.shape.borderRadius,
+    flexShrink: 0,
+    height: theme.spacing(1.5),
+    width: theme.spacing(1.5)
+  },
+  metricName: {
+    flexGrow: 1
+  },
+  metrics: {
+    display: 'flex',
+    flexDirection: 'column',
+    marginTop: theme.spacing(0.5),
+    width: '100%'
+  },
+  tooltipContainer: {
+    padding: theme.spacing(1)
+  }
+}));

package/src/Graph/LineChart/InteractiveComponents/ZoomPreview/index.tsx

@@ -1,6 +1,7 @@
 import { omit } from 'ramda';
 
-import { alpha, useTheme } from '@mui/system';
+import { useTheme } from '@mui/material';
+import { alpha } from '@mui/system';
 
 import Bar from '../Bar';