@centreon/ui 24.10.12 → 24.10.13

package/src/Graph/BarStack/ResponsiveBarStack.tsx

@@ -1,18 +1,14 @@
-import { useRef } from 'react';
-
-import { Group } from '@visx/group';
-import { BarStackHorizontal, BarStack as BarStackVertical } from '@visx/shape';
-import { Text } from '@visx/text';
-import numeral from 'numeral';
-import { equals, lt } from 'ramda';
-import { useTranslation } from 'react-i18next';
-
-import { Tooltip } from '../../components';
 import { Legend as LegendComponent } from '../Legend';
 import { LegendProps } from '../Legend/models';
-import { getValueByUnit } from '../common/utils';
+import { useStyles } from './BarStack.styles';
 
-import { useBarStackStyles } from './BarStack.styles';
+import { Typography } from '@mui/material';
+import numeral from 'numeral';
+import { equals } from 'ramda';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import GraphAndLegend from './GraphAndLegend';
+import { gap, smallTitleHeight, titleHeight } from './constants';
 import { BarStackProps } from './models';
 import useResponsiveBarStack from './useResponsiveBarStack';
 
@@ -23,9 +19,8 @@ const DefaultLengd = ({ scale, direction }: LegendProps): JSX.Element => (
 const ResponsiveBarStack = ({
   title,
   data,
-  width,
   height,
-  size = 72,
+  width,
   onSingleBarClick,
   displayLegend = true,
   TooltipContent,
@@ -33,184 +28,82 @@ const ResponsiveBarStack = ({
   unit = 'number',
   displayValues,
   variant = 'vertical',
-  legendDirection = 'column',
+  legendDirection,
   tooltipProps = {}
 }: BarStackProps & { height: number; width: number }): JSX.Element => {
   const { t } = useTranslation();
-  const { classes, cx } = useBarStackStyles();
-
-  const titleRef = useRef(null);
-  const legendRef = useRef(null);
+  const { classes, cx } = useStyles();
 
   const {
-    barSize,
-    colorScale,
-    input,
-    keys,
-    legendScale,
     total,
-    xScale,
-    yScale,
-    svgContainerSize,
-    isVerticalBar
+    titleVariant,
+    legendScale,
+    isVerticalBar,
+    colorScale,
+    formattedLegendDirection
   } = useResponsiveBarStack({
     data,
     height,
-    legendRef,
-    size,
-    titleRef,
+    width,
     unit,
     variant,
-    width
+    legendDirection
   });
 
-  const BarStackComponent = isVerticalBar
-    ? BarStackVertical
-    : BarStackHorizontal;
+  const graphAndLegendHeight = useMemo(() => {
+    if (equals(titleVariant, 'xs')) {
+      return height - 2 * smallTitleHeight - gap;
+    }
 
-  const isSmallHeight = isVerticalBar ? lt(height, 190) : lt(height, 100);
-  const isSmallWidth = isVerticalBar ? lt(width, 80) : lt(width, 350);
-  const mustDisplayLegend = isSmallWidth ? false : displayLegend;
+    if (equals(titleVariant, 'sm')) {
+      return height - smallTitleHeight - gap;
+    }
+
+    return height - titleHeight - gap;
+  }, [titleVariant, height]);
 
   return (
-    <div className={classes.container} style={{ width }}>
-      <div className={classes.svgWrapper}>
-        {title && (
-          <div
-            className={cx(classes.title, isSmallHeight && classes.smallTitle)}
-            data-testid="Title"
-            ref={titleRef}
-          >
-            {`${numeral(total).format('0a').toUpperCase()} `} {t(title)}
-          </div>
-        )}
-        <div
-          className={classes.svgContainer}
-          data-testid="barStack"
-          style={{
-            width: svgContainerSize.width
-          }}
+    <div
+      className={classes.container}
+      data-has-title={!!title}
+      data-title-variant={titleVariant}
+      data-variant={variant}
+    >
+      {title && (
+        <Typography
+          data-testid="Title"
+          variant={equals(titleVariant, 'md') ? 'h6' : 'body1'}
+          textAlign="center"
+          fontWeight="bold"
+          className={cx(equals(titleVariant, 'md') && classes.clippedTitle)}
         >
-          <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 TextX = bar.x + bar.width / 2;
-                      const TextY = bar.y + bar.height / 2;
-
-                      const onClick = (): void => {
-                        onSingleBarClick?.(bar);
-                      };
-
-                      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]}
-                                {...tooltipProps}
-                              />
-                            )
-                          }
-                          position={
-                            isVerticalBar ? 'right-start' : 'bottom-start'
-                          }
-                        >
-                          <g
-                            data-testid={bar.key}
-                            onClick={onClick}
-                            onKeyUp={() => undefined}
-                          >
-                            <rect
-                              cursor="pointer"
-                              fill={bar.color}
-                              height={
-                                isVerticalBar ? bar.height - 1 : bar.height
-                              }
-                              key={`bar-stack-${barStack.index}-${bar.index}`}
-                              ry={4}
-                              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>
-      {mustDisplayLegend && (
-        <div data-testid="Legend" ref={legendRef}>
+          {`${numeral(total).format('0a')}`} {t(title)}
+        </Typography>
+      )}
+      <GraphAndLegend
+        height={graphAndLegendHeight}
+        width={width}
+        isVerticalBar={isVerticalBar}
+        displayLegend={displayLegend}
+        colorScale={colorScale}
+        total={total}
+        data={data}
+        unit={unit}
+        displayValues={displayValues}
+        onSingleBarClick={onSingleBarClick}
+        tooltipProps={tooltipProps}
+        TooltipContent={TooltipContent}
+        legend={
           <Legend
             data={data}
-            direction={legendDirection}
+            direction={formattedLegendDirection}
             scale={legendScale}
             title={title}
             total={total}
             unit={unit}
           />
-        </div>
-      )}
+        }
+      />
     </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,7 +12,6 @@ export type BarStackProps = {
   displayValues?: boolean;
   legendDirection?: 'row' | 'column';
   onSingleBarClick?: (barData) => void;
-  size?: number;
   title?: string;
   tooltipProps?: object;
   unit?: 'percentage' | 'number';

package/src/Graph/BarStack/useGraphAndLegend.ts

@@ -0,0 +1,84 @@
+import { scaleBand, scaleLinear } from '@visx/scale';
+import { pluck } from 'ramda';
+import { useMemo } from 'react';
+import { BarType } from './models';
+
+interface UseGraphandLegendProps {
+  data: Array<BarType>;
+  isVerticalBar: boolean;
+  total: number;
+  width: number;
+  height: number;
+}
+
+interface UseGraphAndLegendState {
+  barStackData: Record<string, number>;
+  xScale;
+  yScale;
+  keys: Array<string>;
+}
+
+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,
+    xScale,
+    yScale,
+    keys
+  };
+};

package/src/Graph/BarStack/useResponsiveBarStack.ts

@@ -1,37 +1,27 @@
-import { scaleBand, scaleLinear, scaleOrdinal } from '@visx/scale';
-import { equals, gt, pluck } from 'ramda';
-
+import { scaleOrdinal } from '@visx/scale';
+import { equals, isNil, pluck } from 'ramda';
+import { useMemo } from 'react';
 import { LegendScale } from '../Legend/models';
 import { getValueByUnit } from '../common/utils';
-
 import { BarType } from './models';
 
-interface Size {
-  height: number;
-  width: number;
-}
-
 interface UseBarStackProps {
   data: Array<BarType>;
   height: number;
-  legendRef;
-  size: number;
-  titleRef;
+  width: number;
   unit?: 'percentage' | 'number';
   variant?: 'vertical' | 'horizontal';
-  width: number;
+  legendDirection?: 'column' | 'row';
 }
+
 interface UseBarStackState {
-  barSize: Size;
-  colorScale;
-  input;
+  total: number;
+  isSmall: boolean;
+  titleVariant: 'xs' | 'sm' | 'md';
   isVerticalBar: boolean;
-  keys: Array<string>;
   legendScale: LegendScale;
-  svgContainerSize: Size;
-  total: number;
-  xScale;
-  yScale;
+  colorScale;
+  formattedLegendDirection: 'column' | 'row';
 }
 
 const useResponsiveBarStack = ({
@@ -40,87 +30,73 @@ const useResponsiveBarStack = ({
   height,
   width,
   unit = 'number',
-  titleRef,
-  legendRef,
-  size
+  legendDirection
 }: UseBarStackProps): UseBarStackState => {
-  const isVerticalBar = equals(variant, 'vertical');
-
-  const heightOfTitle = titleRef.current?.offsetHeight || 0;
-  const widthOfLegend = legendRef.current?.offsetWidth || 0;
-
-  const horizontalGap = widthOfLegend > 0 ? 12 : 0;
-  const verticalGap = heightOfTitle > 0 ? 8 : 0;
-
-  const svgContainerSize = {
-    height: isVerticalBar ? height - heightOfTitle - verticalGap : size,
-    width: isVerticalBar ? size : width - widthOfLegend - horizontalGap
-  };
-
-  const barSize = {
-    height: gt(height / 2, svgContainerSize.height - 16)
-      ? svgContainerSize.height - 16
-      : svgContainerSize.height - 46,
-    width: svgContainerSize.width - 16
-  };
-
-  const total = Math.floor(data.reduce((acc, { value }) => acc + value, 0));
-
-  const yScale = isVerticalBar
-    ? scaleLinear({
-        domain: [0, total]
-      })
-    : scaleBand({
-        domain: [0, 0],
-        padding: 0
-      });
-
-  const xScale = isVerticalBar
-    ? scaleBand({
-        domain: [0, 0],
-        padding: 0
-      })
-    : scaleLinear({
-        domain: [0, total]
-      });
-
-  const keys = pluck('label', data);
-
-  const colorsRange = pluck('color', data);
-
-  const colorScale = scaleOrdinal({
-    domain: keys,
-    range: colorsRange
-  });
-
-  const legendScale = {
-    domain: data.map(({ value }) => getValueByUnit({ total, unit, value })),
-    range: colorsRange
-  };
-
-  const xMax = barSize.width;
-  const yMax = barSize.height;
-
-  xScale.rangeRound([0, xMax]);
-  yScale.range([yMax, 0]);
-
-  const input = data.reduce((acc, { label, value }) => {
-    acc[label] = value;
-
-    return acc;
-  }, {});
+  const total = useMemo(
+    () => Math.floor(data.reduce((acc, { value }) => acc + value, 0)),
+    [data]
+  );
+
+  const isVerticalBar = useMemo(() => equals(variant, 'vertical'), [variant]);
+
+  const isSmall = useMemo(
+    () => Math.floor(height) < 90,
+    [isVerticalBar, height]
+  );
+
+  const titleVariant = useMemo(() => {
+    if (width <= 105) {
+      return 'xs';
+    }
+
+    if (width <= 150 || isSmall) {
+      return 'sm';
+    }
+
+    return 'md';
+  }, [isSmall, width]);
+
+  const keys = useMemo(() => pluck('label', data), [data]);
+
+  const colorsRange = useMemo(() => pluck('color', data), [data]);
+
+  const colorScale = useMemo(
+    () =>
+      scaleOrdinal({
+        domain: keys,
+        range: colorsRange
+      }),
+    [keys, colorsRange]
+  );
+
+  const legendScale = useMemo(
+    () => ({
+      domain: data.map(({ value }) => getValueByUnit({ total, unit, value })),
+      range: colorsRange
+    }),
+    [data, colorsRange]
+  );
+
+  const formattedLegendDirection = useMemo(() => {
+    if (!isNil(legendDirection)) {
+      return legendDirection;
+    }
+
+    if (equals(variant, 'horizontal')) {
+      return 'row';
+    }
+
+    return 'column';
+  }, [legendDirection, variant]);
 
   return {
-    barSize,
-    colorScale,
-    input,
+    total,
+    isSmall,
     isVerticalBar,
-    keys,
+    titleVariant,
     legendScale,
-    svgContainerSize,
-    total,
-    xScale,
-    yScale
+    colorScale,
+    formattedLegendDirection
   };
 };