@centreon/ui 24.4.72 → 24.4.74

package/src/Graph/BarStack/Graph.tsx

@@ -0,0 +1,176 @@
+import { memo, useMemo } from 'react';
+
+import {
+  BarRounded,
+  BarStackHorizontal,
+  BarStack as BarStackVertical
+} from '@visx/shape';
+import { Text } from '@visx/text';
+import { equals, props } from 'ramda';
+
+import { Tooltip } from '../../components';
+import { getValueByUnit } from '../common/utils';
+
+import { useGraphStyles } from './BarStack.styles';
+import { BarStackProps } from './models';
+import { useGraphAndLegend } from './useGraphAndLegend';
+
+interface Props
+  extends Pick<
+    BarStackProps,
+    | 'data'
+    | 'displayValues'
+    | 'onSingleBarClick'
+    | 'unit'
+    | 'TooltipContent'
+    | 'tooltipProps'
+  > {
+  colorScale;
+  height: number;
+  isVerticalBar: boolean;
+  total: number;
+  width: number;
+}
+
+const Graph = ({
+  width,
+  height,
+  isVerticalBar,
+  colorScale,
+  data,
+  total,
+  unit,
+  displayValues,
+  onSingleBarClick,
+  tooltipProps,
+  TooltipContent
+}: Props): JSX.Element => {
+  const { classes } = useGraphStyles();
+
+  const BarStackComponent = useMemo(
+    () => (isVerticalBar ? BarStackVertical : BarStackHorizontal),
+    [isVerticalBar]
+  );
+
+  const normalizedHeight = useMemo(() => height - 10, [height]);
+
+  const { barStackData, xScale, yScale, keys } = useGraphAndLegend({
+    data,
+    height: normalizedHeight,
+    isVerticalBar,
+    total,
+    width
+  });
+
+  return (
+    <svg height={normalizedHeight} width="100%">
+      <BarStackComponent
+        color={colorScale}
+        data={[barStackData]}
+        keys={keys}
+        {...(isVerticalBar ? { x: () => undefined } : { y: () => undefined })}
+        xScale={xScale}
+        yScale={yScale}
+      >
+        {(barStacks) =>
+          barStacks.map((barStack, index) =>
+            barStack.bars.map((bar) => {
+              const isFirstBar = equals(index, 0);
+              const isLastBar = equals(index, barStacks.length - 1);
+              const fitsInBar = isVerticalBar
+                ? bar.height >= 18
+                : (equals(unit, 'number') && bar.width > 15) ||
+                  (equals(unit, 'percentage') && bar.width > 35);
+
+              const textX = bar.x + bar.width / 2;
+              const textY = bar.y + bar.height / 2;
+
+              const click = onSingleBarClick
+                ? (e: MouseEvent): void => {
+                    if (!equals(e.button, 0)) {
+                      return;
+                    }
+                    onSingleBarClick(bar);
+                  }
+                : undefined;
+
+              return (
+                <Tooltip
+                  classes={classes}
+                  followCursor={false}
+                  key={`bar-stack-${barStack.index}-${bar.index}`}
+                  label={
+                    TooltipContent && (
+                      <TooltipContent
+                        color={bar.color}
+                        label={bar.key}
+                        total={total}
+                        value={barStack.bars[0].bar.data[barStack.key]}
+                        {...tooltipProps}
+                      />
+                    )
+                  }
+                  position={isVerticalBar ? 'right' : 'bottom'}
+                >
+                  <g data-testid={bar.key} key={bar.key}>
+                    <BarRounded
+                      bottom={isVerticalBar && isFirstBar}
+                      cursor={onSingleBarClick ? 'pointer' : 'default'}
+                      fill={bar.color}
+                      height={bar.height}
+                      key={`bar-stack-${barStack.index}-${bar.index}`}
+                      left={!isVerticalBar && isFirstBar}
+                      radius={8}
+                      right={!isVerticalBar && isLastBar}
+                      top={isVerticalBar && isLastBar}
+                      width={isVerticalBar ? bar.width - 10 : bar.width}
+                      x={bar.x}
+                      y={bar.y}
+                      onMouseDown={click}
+                    />
+                    {displayValues && fitsInBar && (
+                      <Text
+                        cursor={onSingleBarClick ? 'pointer' : 'default'}
+                        data-testid="value"
+                        fill="#000"
+                        fontSize={12}
+                        fontWeight={600}
+                        textAnchor="middle"
+                        verticalAnchor="middle"
+                        x={textX}
+                        y={textY}
+                        onMouseUp={click}
+                      >
+                        {getValueByUnit({
+                          total,
+                          unit: unit || 'number',
+                          value: barStack.bars[0].bar.data[barStack.key]
+                        })}
+                      </Text>
+                    )}
+                  </g>
+                </Tooltip>
+              );
+            })
+          )
+        }
+      </BarStackComponent>
+    </svg>
+  );
+};
+
+const propsToMemoize = [
+  'width',
+  'height',
+  'isVerticalBar',
+  'colorScale',
+  'data',
+  'total',
+  'unit',
+  'displayValues',
+  'tooltipProps'
+];
+
+export default memo(Graph, (prevProps, nextProps) =>
+  equals(props(propsToMemoize, prevProps), props(propsToMemoize, nextProps))
+);

package/src/Graph/BarStack/GraphAndLegend.tsx

@@ -0,0 +1,119 @@
+import { memo, useMemo } from 'react';
+
+import { equals, props } from 'ramda';
+
+import { useGraphAndLegendStyles } from './BarStack.styles';
+import Graph from './Graph';
+import { gap, legendMaxHeight, legendMaxWidth } from './constants';
+import { BarStackProps } from './models';
+
+interface Props
+  extends Pick<
+    BarStackProps,
+    | 'data'
+    | 'displayValues'
+    | 'onSingleBarClick'
+    | 'unit'
+    | 'TooltipContent'
+    | 'tooltipProps'
+  > {
+  colorScale;
+  displayLegend: boolean;
+  height: number;
+  isVerticalBar: boolean;
+  legend: JSX.Element;
+  total: number;
+  width: number;
+}
+
+const GraphAndLegend = ({
+  isVerticalBar,
+  legend,
+  displayLegend,
+  height,
+  width,
+  colorScale,
+  total,
+  unit,
+  data,
+  displayValues,
+  onSingleBarClick,
+  tooltipProps,
+  TooltipContent
+}: Props): JSX.Element => {
+  const { classes } = useGraphAndLegendStyles();
+
+  const isSmall = useMemo(
+    () =>
+      (!isVerticalBar && Math.floor(height) <= 80) ||
+      (isVerticalBar && Math.floor(width) <= 150),
+    [isVerticalBar, height, width]
+  );
+
+  const mustDisplayLegend = useMemo(
+    () => displayLegend && !isSmall,
+    [isSmall, displayLegend]
+  );
+
+  const graphWidth = useMemo(
+    () =>
+      isVerticalBar ? width - (isSmall ? 0 : legendMaxWidth - gap) : width,
+    [width, isVerticalBar, isSmall]
+  );
+
+  const graphHeight = useMemo(
+    () =>
+      isVerticalBar ? height : height - (isSmall ? 0 : legendMaxHeight - gap),
+    [height, isVerticalBar, isSmall]
+  );
+
+  return (
+    <div
+      className={classes.graphAndLegend}
+      data-display-legend={mustDisplayLegend}
+      data-is-vertical={isVerticalBar}
+      style={{ height }}
+    >
+      <Graph
+        TooltipContent={TooltipContent}
+        colorScale={colorScale}
+        data={data}
+        displayValues={displayValues}
+        height={graphHeight}
+        isVerticalBar={isVerticalBar}
+        tooltipProps={tooltipProps}
+        total={total}
+        unit={unit}
+        width={graphWidth}
+        onSingleBarClick={onSingleBarClick}
+      />
+      {mustDisplayLegend && (
+        <div
+          className={classes.legend}
+          data-is-vertical={isVerticalBar}
+          data-testid="Legend"
+        >
+          {legend}
+        </div>
+      )}
+    </div>
+  );
+};
+
+const propsToMemoize = [
+  'width',
+  'height',
+  'isVerticalBar',
+  'colorScale',
+  'data',
+  'total',
+  'unit',
+  'displayValues',
+  'tooltipProps',
+  'displayLegend',
+  'legend'
+];
+
+export default memo(GraphAndLegend, (prevProps, nextProps) =>
+  equals(props(propsToMemoize, prevProps), props(propsToMemoize, nextProps))
+);

package/src/Graph/BarStack/ResponsiveBarStack.tsx

@@ -1,19 +1,18 @@
-import { useRef } from 'react';
+import { useMemo } from 'react';
 
-import { BarStack as BarStackVertical, BarStackHorizontal } from '@visx/shape';
-import { Group } from '@visx/group';
 import numeral from 'numeral';
-import { Text } from '@visx/text';
-import { useTranslation } from 'react-i18next';
 import { equals } from 'ramda';
+import { useTranslation } from 'react-i18next';
+
+import { Typography } from '@mui/material';
 
-import { Tooltip } from '../../components';
-import { LegendProps } from '../Legend/models';
 import { Legend as LegendComponent } from '../Legend';
-import { getValueByUnit } from '../common/utils';
+import { LegendProps } from '../Legend/models';
 
+import { useStyles } from './BarStack.styles';
+import GraphAndLegend from './GraphAndLegend';
+import { gap, smallTitleHeight, titleHeight } from './constants';
 import { BarStackProps } from './models';
-import { useBarStackStyles } from './BarStack.styles';
 import useResponsiveBarStack from './useResponsiveBarStack';
 
 const DefaultLengd = ({ scale, direction }: LegendProps): JSX.Element => (
@@ -23,9 +22,8 @@ const DefaultLengd = ({ scale, direction }: LegendProps): JSX.Element => (
 const BarStack = ({
   title,
   data,
-  width,
   height,
-  size = 72,
+  width,
   onSingleBarClick,
   displayLegend = true,
   TooltipContent,
@@ -33,175 +31,82 @@ const BarStack = ({
   unit = 'number',
   displayValues,
   variant = 'vertical',
-  legendDirection = 'column'
+  legendDirection,
+  tooltipProps = {}
 }: BarStackProps & { height: number; width: number }): JSX.Element => {
+  const { classes, cx } = useStyles();
   const { t } = useTranslation();
-  const { classes } = useBarStackStyles();
-
-  const titleRef = useRef(null);
-  const legendRef = useRef(null);
 
   const {
-    barSize,
-    colorScale,
-    input,
-    keys,
-    legendScale,
     total,
-    xScale,
-    yScale,
-    svgWrapperWidth,
-    svgContainerSize,
-    isVerticalBar
+    titleVariant,
+    legendScale,
+    isVerticalBar,
+    colorScale,
+    formattedLegendDirection
   } = useResponsiveBarStack({
     data,
     height,
-    legendRef,
-    size,
-    titleRef,
+    legendDirection,
     unit,
     variant,
     width
   });
 
-  const BarStackComponent = isVerticalBar
-    ? BarStackVertical
-    : BarStackHorizontal;
-
-  return (
-    <div className={classes.container} style={{ height, width }}>
-      <div
-        className={classes.svgWrapper}
-        style={{
-          height,
-          width: svgWrapperWidth
-        }}
-      >
-        {title && (
-          <div className={classes.title} data-testid="Title" ref={titleRef}>
-            {`${numeral(total).format('0a').toUpperCase()} `} {t(title)}
-          </div>
-        )}
-        <div
-          className={classes.svgContainer}
-          data-testid="barStack"
-          style={svgContainerSize}
-        >
-          <svg
-            data-variant={variant}
-            height={barSize.height}
-            width={barSize.width}
-          >
-            <Group>
-              <BarStackComponent
-                color={colorScale}
-                data={[input]}
-                keys={keys}
-                {...(isVerticalBar
-                  ? { x: () => undefined }
-                  : { y: () => undefined })}
-                xScale={xScale}
-                yScale={yScale}
-              >
-                {(barStacks) =>
-                  barStacks.map((barStack) =>
-                    barStack.bars.map((bar) => {
-                      const shouldDisplayValues = (): boolean => {
-                        if (bar.height < 10) {
-                          return false;
-                        }
-
-                        return (
-                          (equals(unit, 'number') && bar.width > 10) ||
-                          (equals(unit, 'percentage') && bar.width > 25)
-                        );
-                      };
+  const graphAndLegendHeight = useMemo(() => {
+    if (equals(titleVariant, 'xs')) {
+      return height - 2 * smallTitleHeight - gap;
+    }
 
-                      const TextX = bar.x + bar.width / 2;
-                      const TextY = bar.y + bar.height / 2;
+    if (equals(titleVariant, 'sm')) {
+      return height - smallTitleHeight - gap;
+    }
 
-                      const onClick = (): void => {
-                        onSingleBarClick?.(bar);
-                      };
+    return height - titleHeight - gap;
+  }, [titleVariant, height]);
 
-                      return (
-                        <Tooltip
-                          hasCaret
-                          classes={{
-                            tooltip: classes.barStackTooltip
-                          }}
-                          followCursor={false}
-                          key={`bar-stack-${barStack.index}-${bar.index}`}
-                          label={
-                            TooltipContent && (
-                              <TooltipContent
-                                color={bar.color}
-                                label={bar.key}
-                                title={title}
-                                total={total}
-                                value={barStack.bars[0].bar.data[barStack.key]}
-                              />
-                            )
-                          }
-                          position={
-                            isVerticalBar ? 'right-start' : 'bottom-start'
-                          }
-                        >
-                          <g data-testid={bar.key} onClick={onClick}>
-                            <rect
-                              cursor="pointer"
-                              fill={bar.color}
-                              height={
-                                isVerticalBar ? bar.height - 1 : bar.height
-                              }
-                              key={`bar-stack-${barStack.index}-${bar.index}`}
-                              ry={10}
-                              width={isVerticalBar ? bar.width : bar.width - 1}
-                              x={bar.x}
-                              y={bar.y}
-                            />
-                            {displayValues && shouldDisplayValues() && (
-                              <Text
-                                cursor="pointer"
-                                data-testid="value"
-                                fill="#000"
-                                fontSize={12}
-                                fontWeight={600}
-                                textAnchor="middle"
-                                verticalAnchor="middle"
-                                x={TextX}
-                                y={TextY}
-                              >
-                                {getValueByUnit({
-                                  total,
-                                  unit,
-                                  value: barStack.bars[0].bar.data[barStack.key]
-                                })}
-                              </Text>
-                            )}
-                          </g>
-                        </Tooltip>
-                      );
-                    })
-                  )
-                }
-              </BarStackComponent>
-            </Group>
-          </svg>
-        </div>
-      </div>
-      {displayLegend && (
-        <div data-testid="Legend" ref={legendRef}>
+  return (
+    <div
+      className={classes.container}
+      data-has-title={!!title}
+      data-title-variant={titleVariant}
+      data-variant={variant}
+    >
+      {title && (
+        <Typography
+          className={cx(equals(titleVariant, 'md') && classes.clippedTitle)}
+          data-testid="Title"
+          fontWeight="bold"
+          textAlign="center"
+          variant={equals(titleVariant, 'md') ? 'h6' : 'body1'}
+        >
+          {`${numeral(total).format('0a')}`} {t(title)}
+        </Typography>
+      )}
+      <GraphAndLegend
+        TooltipContent={TooltipContent}
+        colorScale={colorScale}
+        data={data}
+        displayLegend={displayLegend}
+        displayValues={displayValues}
+        height={graphAndLegendHeight}
+        isVerticalBar={isVerticalBar}
+        legend={
           <Legend
             data={data}
-            direction={legendDirection}
+            direction={formattedLegendDirection}
             scale={legendScale}
             title={title}
             total={total}
             unit={unit}
           />
-        </div>
-      )}
+        }
+        tooltipProps={tooltipProps}
+        total={total}
+        unit={unit}
+        width={width}
+        onSingleBarClick={onSingleBarClick}
+      />
     </div>
   );
 };

package/src/Graph/BarStack/constants.ts

@@ -0,0 +1,5 @@
+export const legendMaxWidth = 85;
+export const legendMaxHeight = 43;
+export const titleHeight = 36;
+export const smallTitleHeight = 20;
+export const gap = 4;

package/src/Graph/BarStack/models.ts

@@ -12,8 +12,8 @@ export type BarStackProps = {
   displayValues?: boolean;
   legendDirection?: 'row' | 'column';
   onSingleBarClick?: (barData) => void;
-  size?: number;
   title?: string;
+  tooltipProps?: object;
   unit?: 'percentage' | 'number';
   variant?: 'vertical' | 'horizontal';
 };

package/src/Graph/BarStack/useGraphAndLegend.ts

@@ -0,0 +1,86 @@
+import { useMemo } from 'react';
+
+import { scaleBand, scaleLinear } from '@visx/scale';
+import { pluck } from 'ramda';
+
+import { BarType } from './models';
+
+interface UseGraphandLegendProps {
+  data: Array<BarType>;
+  height: number;
+  isVerticalBar: boolean;
+  total: number;
+  width: number;
+}
+
+interface UseGraphAndLegendState {
+  barStackData: Record<string, number>;
+  keys: Array<string>;
+  xScale;
+  yScale;
+}
+
+export const useGraphAndLegend = ({
+  data,
+  isVerticalBar,
+  total,
+  width,
+  height
+}: UseGraphandLegendProps): UseGraphAndLegendState => {
+  const dataWithNonEmptyValue = useMemo(
+    () => data.filter(({ value }) => value),
+    [data]
+  );
+
+  const keys = useMemo(
+    () => pluck('label', dataWithNonEmptyValue),
+    [dataWithNonEmptyValue]
+  );
+
+  const barStackData = useMemo(
+    () =>
+      dataWithNonEmptyValue.reduce((acc, { label, value }) => {
+        acc[label] = value;
+
+        return acc;
+      }, {}),
+    [dataWithNonEmptyValue]
+  );
+
+  const yScale = useMemo(
+    () =>
+      isVerticalBar
+        ? scaleLinear({
+            domain: [0, total],
+            range: [height, 0]
+          })
+        : scaleBand({
+            domain: [0, 0],
+            padding: 0,
+            range: [height, 0]
+          }),
+    [isVerticalBar, total, height]
+  );
+
+  const xScale = useMemo(
+    () =>
+      isVerticalBar
+        ? scaleBand({
+            domain: [0, 0],
+            padding: 0,
+            range: [0, width]
+          })
+        : scaleLinear({
+            domain: [0, total],
+            range: [0, width]
+          }),
+    [total, width, isVerticalBar]
+  );
+
+  return {
+    barStackData,
+    keys,
+    xScale,
+    yScale
+  };
+};