@centreon/ui 24.4.2 → 24.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "24.4.2",
+  "version": "24.4.3",
   "description": "Centreon UI Components",
   "scripts": {
     "eslint": "eslint ./src --ext .js,.jsx,.ts,.tsx --max-warnings 0",

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';
 
@@ -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/Legend/InteractiveValue.tsx

@@ -1,19 +1,19 @@
 import { Typography } from '@mui/material';
 
-import { useStyles } from './Legend.styles';
+import { useLegendValueStyles } from './Legend.styles';
 
 interface Props {
   value?: string | null;
 }
 
 const InteractiveValue = ({ value }: Props): JSX.Element | null => {
-  const { classes } = useStyles({});
+  const { classes } = useLegendValueStyles({});
   if (!value) {
     return null;
   }
 
   return (
-    <Typography className={classes.legendValue} variant="h6">
+    <Typography className={classes.text} variant="h6">
       {value}
     </Typography>
   );

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

@@ -6,66 +6,112 @@ interface MakeStylesProps {
   limitLegendRows?: boolean;
 }
 
+export const legendWidth = 21;
+const legendItemHeight = 5.25;
+const legendItemHeightCompact = 1.75;
+
 export const useStyles = makeStyles<MakeStylesProps>()(
   (theme, { limitLegendRows }) => ({
     highlight: {
       color: theme.typography.body1.color
     },
     item: {
-      display: 'grid',
-      gridTemplateColumns: 'min-content minmax(50px, 1fr)',
-      marginBottom: theme.spacing(1)
+      minWidth: theme.spacing(legendWidth)
     },
     items: {
+      '&[data-mode="compact"]': {
+        gridAutoRows: theme.spacing(legendItemHeightCompact),
+        height: limitLegendRows
+          ? theme.spacing(legendItemHeightCompact * 2 + 1.5)
+          : 'unset'
+      },
+      columnGap: theme.spacing(3),
       display: 'grid',
-      gridTemplateColumns: 'repeat(auto-fit, minmax(150px, max-content))',
-      marginLeft: theme.spacing(0.5),
-      maxHeight: limitLegendRows ? theme.spacing(14) : 'unset',
+      gridAutoRows: theme.spacing(legendItemHeight),
+      gridTemplateColumns: `repeat(auto-fit, ${theme.spacing(legendWidth)})`,
+      maxHeight: limitLegendRows
+        ? theme.spacing(legendItemHeight * 2 + 1)
+        : 'unset',
       overflowY: 'auto',
+      rowGap: theme.spacing(1),
       width: '100%'
     },
     legend: {
       marginLeft: margin.left,
       marginRight: margin.right,
-      maxHeight: theme.spacing(24),
-      overflowX: 'hidden',
-      overflowY: 'auto'
+      overflow: 'hidden'
     },
-    legendData: {
-      display: 'flex',
-      flexDirection: 'column'
+    minMaxAvgContainer: {
+      columnGap: theme.spacing(0.5),
+      display: 'grid',
+      gridTemplateColumns: 'repeat(2, min-content)',
+      whiteSpace: 'nowrap'
     },
-    legendName: {
+    normal: {
+      color: theme.palette.text.primary
+    },
+    toggable: {
+      cursor: 'pointer'
+    }
+  })
+);
+
+interface StylesProps {
+  color?: string;
+}
+
+export const useLegendHeaderStyles = makeStyles<StylesProps>()(
+  (theme, { color }) => ({
+    container: {
       display: 'flex',
       flexDirection: 'row',
-      justifyContent: 'start',
-      marginRight: theme.spacing(0.5),
-      overflow: 'hidden',
-      textOverflow: 'ellipsis'
+      gap: theme.spacing(0.5),
+      width: '100%'
     },
-    legendUnit: {
-      justifyContent: 'start',
-      marginLeft: 'auto',
-      marginRight: theme.spacing(0.5),
-      overflow: 'hidden',
-      textOverflow: 'ellipsis'
+    disabled: {
+      color: theme.palette.text.disabled
     },
-    legendValue: {
-      fontWeight: theme.typography.body1.fontWeight
+    icon: {
+      backgroundColor: color,
+      borderRadius: theme.shape.borderRadius,
+      height: theme.spacing(1.5),
+      minWidth: theme.spacing(1.5),
+      width: theme.spacing(1.5)
+    },
+    legendName: {
+      '&[data-mode="compact"]': {
+        maxWidth: theme.spacing(legendWidth * 0.5)
+      },
+      maxWidth: theme.spacing(legendWidth * 0.75)
+    },
+    markerAndLegendName: {
+      alignItems: 'center',
+      display: 'flex',
+      flexDirection: 'row',
+      gap: theme.spacing(0.5)
     },
     minMaxAvgContainer: {
       columnGap: theme.spacing(0.5),
       display: 'grid',
-      gridAutoRows: theme.spacing(2),
       gridTemplateColumns: 'repeat(2, min-content)',
       whiteSpace: 'nowrap'
     },
-    minMaxAvgValue: { fontWeight: 600 },
-    normal: {
-      color: theme.palette.text.primary
-    },
-    toggable: {
-      cursor: 'pointer'
+    text: {
+      fontWeight: theme.typography.fontWeightMedium,
+      lineHeight: 1
     }
   })
 );
+
+export const useLegendContentStyles = makeStyles()((theme) => ({
+  minMaxAvgValue: { fontWeight: theme.typography.fontWeightMedium },
+  text: {
+    lineHeight: 0.9
+  }
+}));
+
+export const useLegendValueStyles = makeStyles()({
+  text: {
+    lineHeight: 1.4
+  }
+});

package/src/Graph/LineChart/Legend/LegendContent.tsx

@@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next';
 
 import { Typography } from '@mui/material';
 
-import { useStyles } from './Legend.styles';
+import { useLegendContentStyles } from './Legend.styles';
 
 interface Props {
   data: string;
@@ -10,15 +10,21 @@ interface Props {
 }
 
 const LegendContent = ({ data, label }: Props): JSX.Element => {
-  const { classes } = useStyles({});
+  const { classes, cx } = useLegendContentStyles();
 
   const { t } = useTranslation();
 
   return (
-    <div data-testid={label}>
-      <Typography variant="caption">{t(label)}: </Typography>
-      <Typography className={classes.minMaxAvgValue} variant="caption">
-        {data}
+    <div className={classes.text} data-testid={label}>
+      <Typography className={classes.text} component="span" variant="caption">
+        {t(label)}:{' '}
+        <Typography
+          className={cx(classes.minMaxAvgValue, classes.text)}
+          component="span"
+          variant="caption"
+        >
+          {data}
+        </Typography>
       </Typography>
     </div>
   );

package/src/Graph/LineChart/Legend/LegendHeader.tsx

@@ -1,43 +1,91 @@
 import { includes, isEmpty, split } from 'ramda';
 
-import { Tooltip, Typography } from '@mui/material';
+import { Typography } from '@mui/material';
 
+import { EllipsisTypography, formatMetricValue } from '../../..';
 import { Line } from '../../common/timeSeries/models';
+import { Tooltip } from '../../../components';
 
-import { useStyles } from './Legend.styles';
+import { useLegendHeaderStyles } from './Legend.styles';
+import { LegendDisplayMode } from './models';
+import LegendContent from './LegendContent';
 
 interface Props {
+  color: string;
+  disabled?: boolean;
   line: Line;
+  minMaxAvg?;
+  value?: string | null;
 }
 
-const LegendHeader = ({ line }: Props): JSX.Element => {
-  const { classes } = useStyles({});
+const LegendHeader = ({
+  line,
+  color,
+  disabled,
+  value,
+  minMaxAvg
+}: Props): JSX.Element => {
+  const { classes, cx } = useLegendHeaderStyles({ color });
+
   const { unit, name, legend } = line;
 
   const legendName = legend || name;
-  const unitName = ` (${unit})`;
+  const hasUnit = !isEmpty(unit);
+  const unitName = `(${unit})`;
   const metricName = includes('#', legendName)
     ? split('#')(legendName)[1]
     : legendName;
 
+  const getEndText = (): string => {
+    if (value) {
+      return `${value}${hasUnit ? ` ${unit}` : ''}`;
+    }
+
+    return hasUnit ? ` ${unitName}` : '';
+  };
+
   return (
-    <div className={classes.legendName}>
-      <Tooltip placement="top" title={legendName + unitName}>
-        <Typography
-          className={classes.legendName}
-          component="p"
-          variant="caption"
-        >
-          {metricName}
-        </Typography>
-      </Tooltip>
-      <Typography
-        className={classes.legendUnit}
-        component="p"
-        variant="caption"
+    <div className={classes.container}>
+      <Tooltip
+        followCursor={false}
+        label={
+          minMaxAvg ? (
+            <div>
+              <Typography>{`${legendName} ${unitName}`}</Typography>
+              <div className={classes.minMaxAvgContainer}>
+                {minMaxAvg.map(({ label, value: subValue }) => (
+                  <LegendContent
+                    data={formatMetricValue({
+                      unit: line.unit,
+                      value: subValue
+                    })}
+                    key={label}
+                    label={label}
+                  />
+                ))}
+              </div>
+            </div>
+          ) : (
+            `${legendName} ${unitName}`
+          )
+        }
+        placement="top"
       >
-        {!isEmpty(line?.unit) && `(${line.unit})`}
-      </Typography>
+        <div className={classes.markerAndLegendName}>
+          <div className={cx(classes.icon, { [classes.disabled]: disabled })} />
+          <EllipsisTypography
+            className={cx(classes.text, classes.legendName)}
+            data-mode={
+              value ? LegendDisplayMode.Compact : LegendDisplayMode.Normal
+            }
+          >
+            {metricName}
+          </EllipsisTypography>
+        </div>
+      </Tooltip>
+      {hasUnit && (
+        <Typography className={classes.text}>{getEndText()}</Typography>
+      )}
     </div>
   );
 };

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

@@ -16,8 +16,7 @@ import { timeValueAtom } from '../InteractiveComponents/interactionWithGraphAtom
 import InteractiveValue from './InteractiveValue';
 import { useStyles } from './Legend.styles';
 import LegendHeader from './LegendHeader';
-import LegendMarker from './Marker';
-import { GetMetricValueProps } from './models';
+import { GetMetricValueProps, LegendDisplayMode } from './models';
 import useInteractiveValues from './useInteractiveValues';
 import useLegend from './useLegend';
 import LegendContent from './LegendContent';
@@ -29,6 +28,7 @@ interface Props {
   lines: Array<Line>;
   renderExtraComponent?: ReactNode;
   setLinesGraph: Dispatch<SetStateAction<Array<Line> | null>>;
+  shouldDisplayLegendInCompactMode: boolean;
   timeSeries: Array<TimeValue>;
   toggable?: boolean;
   xScale;
@@ -43,7 +43,8 @@ const MainLegend = ({
   renderExtraComponent,
   displayAnchor = true,
   setLinesGraph,
-  xScale
+  xScale,
+  shouldDisplayLegendInCompactMode
 }: Props): JSX.Element => {
   const { classes, cx } = useStyles({ limitLegendRows });
   const theme = useTheme();
@@ -85,9 +86,13 @@ const MainLegend = ({
     selectMetricLine(metric_id);
   };
 
+  const mode = shouldDisplayLegendInCompactMode
+    ? LegendDisplayMode.Compact
+    : LegendDisplayMode.Normal;
+
   return (
     <div className={classes.legend}>
-      <div className={classes.items}>
+      <div className={classes.items} data-mode={mode}>
         {displayedLines.map((line) => {
           const { color, display, highlight, metric_id } = line;
 
@@ -126,22 +131,37 @@ const MainLegend = ({
               onMouseEnter={(): void => highlightLine(metric_id)}
               onMouseLeave={(): void => clearHighlight()}
             >
-              <LegendMarker color={markerColor} disabled={!display} />
-              <div className={classes.legendData}>
-                <LegendHeader line={line} />
-                {displayAnchor && <InteractiveValue value={interactiveValue} />}
-                {!interactiveValue && (
-                  <div className={classes.minMaxAvgContainer}>
-                    {minMaxAvg.map(({ label, value }) => (
-                      <LegendContent
-                        data={getMetricValue({ unit: line.unit, value })}
-                        key={label}
-                        label={label}
-                      />
-                    ))}
-                  </div>
-                )}
-              </div>
+              <LegendHeader
+                color={markerColor}
+                disabled={!display}
+                line={line}
+                minMaxAvg={
+                  shouldDisplayLegendInCompactMode ? minMaxAvg : undefined
+                }
+                value={
+                  shouldDisplayLegendInCompactMode
+                    ? interactiveValue
+                    : undefined
+                }
+              />
+              {!shouldDisplayLegendInCompactMode && (
+                <div>
+                  {displayAnchor && (
+                    <InteractiveValue value={interactiveValue} />
+                  )}
+                  {!interactiveValue && (
+                    <div className={classes.minMaxAvgContainer}>
+                      {minMaxAvg.map(({ label, value }) => (
+                        <LegendContent
+                          data={getMetricValue({ unit: line.unit, value })}
+                          key={label}
+                          label={label}
+                        />
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
             </Box>
           );
         })}
@@ -152,8 +172,15 @@ const MainLegend = ({
 };
 
 const Legend = (props: Props): JSX.Element => {
-  const { toggable, limitLegendRows, timeSeries, lines, base, displayAnchor } =
-    props;
+  const {
+    toggable,
+    limitLegendRows,
+    timeSeries,
+    lines,
+    base,
+    displayAnchor,
+    shouldDisplayLegendInCompactMode
+  } = props;
   const timeValue = useAtomValue(timeValueAtom);
 
   return useMemoComponent({
@@ -165,7 +192,8 @@ const Legend = (props: Props): JSX.Element => {
       base,
       toggable,
       limitLegendRows,
-      displayAnchor
+      displayAnchor,
+      shouldDisplayLegendInCompactMode
     ]
   });
 };

package/src/Graph/LineChart/Legend/models.ts

@@ -9,3 +9,8 @@ export interface GetMetricValueProps {
   unit: string;
   value: number | null;
 }
+
+export enum LegendDisplayMode {
+  Compact = 'compact',
+  Normal = 'normal'
+}

package/src/Graph/LineChart/Legend/useLegend.ts

@@ -32,20 +32,19 @@ const useLegend = ({ lines, setLinesGraph }: Props): LegendActions => {
     find(propEq(metric_id, 'metric_id'), lines) as Line;
 
   const toggleMetricLine = (metric_id): void => {
-    const line = getLineByMetric(metric_id);
+    const data = lines.map((line) => ({
+      ...line,
+      display: equals(line.metric_id, metric_id) ? !line.display : line.display
+    }));
 
-    setLinesGraph([
-      ...reject(propEq(metric_id, 'metric_id'), lines),
-      { ...line, display: !line.display }
-    ]);
+    setLinesGraph(data);
   };
 
   const highlightLine = (metric_id): void => {
-    const fadedLines = map((line) => ({ ...line, highlight: false }), lines);
-    const data = [
-      ...reject(propEq(metric_id, 'metric_id'), fadedLines),
-      { ...getLineByMetric(metric_id), highlight: true }
-    ];
+    const data = lines.map((line) => ({
+      ...line,
+      highlight: equals(line.metric_id, metric_id)
+    }));
 
     setLinesGraph(data);
   };

package/src/Graph/LineChart/LineChart.tsx

@@ -1,7 +1,7 @@
 import { MutableRefObject, useMemo, useRef, useState } from 'react';
 
 import { Group, Tooltip } from '@visx/visx';
-import { flatten, isNil, pluck } from 'ramda';
+import { flatten, gt, isNil, lte, pluck, reduce } from 'ramda';
 
 import { ClickAwayListener, Fade, Skeleton, useTheme } from '@mui/material';
 
@@ -33,6 +33,7 @@ import {
 import { useIntersection } from './useLineChartIntersection';
 import { CurveType } from './BasicComponents/Lines/models';
 import Thresholds from './BasicComponents/Thresholds';
+import { legendWidth } from './Legend/Legend.styles';
 
 const extraMargin = 10;
 
@@ -161,6 +162,15 @@ const LineChart = ({
   const displayLegend = legend?.display ?? true;
   const displayTooltip = !isNil(tooltip?.renderComponent);
 
+  const legendItemsWidth = reduce(
+    (acc) => acc + legendWidth * 8 + 24,
+    0,
+    displayedLines
+  );
+
+  const shouldDisplayLegendInCompactMode =
+    lte(graphWidth, 808) && gt(legendItemsWidth, graphWidth);
+
   if (!isInViewport) {
     return (
       <Skeleton
@@ -294,6 +304,7 @@ const LineChart = ({
             lines={newLines}
             renderExtraComponent={legend?.renderExtraComponent}
             setLinesGraph={setLinesGraph}
+            shouldDisplayLegendInCompactMode={shouldDisplayLegendInCompactMode}
             timeSeries={timeSeries}
             xScale={xScale}
           />

package/src/Graph/LineChart/Legend/Marker.tsx

@@ -1,43 +0,0 @@
-import { equals } from 'ramda';
-import { makeStyles } from 'tss-react/mui';
-
-export enum LegendMarkerVariant {
-  'dot',
-  'bar'
-}
-
-interface StylesProps {
-  color?: string;
-  variant: LegendMarkerVariant;
-}
-
-const useStyles = makeStyles<StylesProps>()((theme, { color, variant }) => ({
-  disabled: {
-    color: theme.palette.text.disabled
-  },
-  icon: {
-    backgroundColor: color,
-    borderRadius: equals(LegendMarkerVariant.dot, variant) ? '50%' : 0,
-    height: equals(LegendMarkerVariant.dot, variant) ? 9 : '100%',
-    marginRight: theme.spacing(0.5),
-    width: 9
-  }
-}));
-
-interface Props {
-  color: string;
-  disabled?: boolean;
-  variant?: LegendMarkerVariant;
-}
-
-const LegendMarker = ({
-  disabled,
-  color,
-  variant = LegendMarkerVariant.bar
-}: Props): JSX.Element => {
-  const { classes, cx } = useStyles({ color, variant });
-
-  return <div className={cx(classes.icon, { [classes.disabled]: disabled })} />;
-};
-
-export default LegendMarker;