@centreon/ui 23.10.1-MON-20802-fe-implement-new-visualization.2 → 23.10.1-MON-21543-implement-top-bottom-widget.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "23.10.1-MON-20802-fe-implement-new-visualization.2",
+  "version": "23.10.1-MON-21543-implement-top-bottom-widget.0",
   "description": "Centreon UI Components",
   "scripts": {
     "eslint": "eslint ./src --ext .js,.jsx,.ts,.tsx --max-warnings 0",

package/src/Dashboard/Dashboard.styles.ts

@@ -79,7 +79,12 @@ export const useDashboardItemStyles = makeStyles<{ hasHeader: boolean }>()(
       '&:hover': {
         backgroundColor: theme.palette.action.hover
       },
-      cursor: 'move',
+      '&[data-canMove="false"]': {
+        cursor: 'default'
+      },
+      '&[data-canMove="true"]': {
+        cursor: 'move'
+      },
       padding: theme.spacing(0.5, 2)
     },
     widgetPadding: {

package/src/Dashboard/Item.tsx

@@ -15,6 +15,7 @@ import { useMemoComponent } from '../utils';
 import { useDashboardItemStyles } from './Dashboard.styles';
 
 interface DashboardItemProps {
+  canMove?: boolean;
   children: ReactElement;
   className?: string;
   disablePadding?: boolean;
@@ -37,7 +38,8 @@ const Item = forwardRef(
       onMouseUp,
       onTouchEnd,
       id,
-      disablePadding = false
+      disablePadding = false,
+      canMove = false
     }: DashboardItemProps,
     ref: ForwardedRef<HTMLDivElement>
   ): ReactElement => {
@@ -66,6 +68,7 @@ const Item = forwardRef(
               <div
                 {...listeners}
                 className={classes.widgetHeader}
+                data-canMove={canMove}
                 data-testid={`${id}_move_panel`}
               >
                 {header}

package/src/Dashboard/Layout.tsx

@@ -45,7 +45,7 @@ const Layout = <T extends Layout>({
 
   return useMemoComponent({
     Component: (
-      <ResponsiveHeight>
+      <ResponsiveHeight margin={40}>
         <Responsive.ParentSize>
           {({ width, height }): JSX.Element => (
             <div className={classes.container}>

package/src/Graph/Gauge/Gauge.stories.tsx

@@ -134,3 +134,13 @@ export const withRangeThresholds: Story = {
   },
   render: Template
 };
+
+export const RawValue: Story = {
+  args: {
+    data: dataLastWeek,
+    displayAsRaw: true,
+    thresholdTooltipLabels: ['Warning', 'Critical'],
+    thresholds: [0.5, 0.6]
+  },
+  render: Template
+};

package/src/Graph/Gauge/Gauge.tsx

@@ -7,11 +7,18 @@ import { Metric } from '../common/timeSeries/models';
 import ResponsiveGauge from './ResponsiveGauge';
 
 interface Props {
+  baseColor?: string;
   data?: LineChartData;
+  displayAsRaw?: boolean;
   thresholds: Thresholds;
 }
 
-export const Gauge = ({ thresholds, data }: Props): JSX.Element | null => {
+export const Gauge = ({
+  thresholds,
+  data,
+  displayAsRaw,
+  baseColor
+}: Props): JSX.Element | null => {
   if (!data) {
     return null;
   }
@@ -22,6 +29,8 @@ export const Gauge = ({ thresholds, data }: Props): JSX.Element | null => {
     <Responsive.ParentSize>
       {({ width, height }) => (
         <ResponsiveGauge
+          baseColor={baseColor}
+          displayAsRaw={displayAsRaw}
           height={height}
           metric={metric}
           thresholds={thresholds}

package/src/Graph/Gauge/PieData.tsx

@@ -16,7 +16,8 @@ const PieData = ({
   metric,
   adaptedMaxValue,
   thresholds,
-  radius
+  radius,
+  baseColor
 }: Omit<
   GaugeProps,
   'width' | 'height' | 'showTooltip' | 'hideTooltip' | 'thresholdTooltipLabels'
@@ -24,13 +25,12 @@ const PieData = ({
   const theme = useTheme();
 
   const pieData = [metric.data[0], adaptedMaxValue - metric.data[0]];
-  const pieColor = !thresholds.enabled
-    ? theme.palette.success.main
-    : getColorFromDataAndTresholds({
-        data: metric.data[0],
-        theme,
-        thresholds
-      });
+  const pieColor = getColorFromDataAndTresholds({
+    baseColor,
+    data: metric.data[0],
+    theme,
+    thresholds
+  });
 
   const getDataColor = scaleOrdinal({
     domain: pieData,

package/src/Graph/Gauge/ResponsiveGauge.tsx

@@ -7,7 +7,7 @@ import { Tooltip } from '@visx/visx';
 import { Box, Fade, useTheme } from '@mui/material';
 
 import { Metric } from '../common/timeSeries/models';
-import { formatMetricValue } from '../common/timeSeries';
+import { formatMetricValueWithUnit } from '../common/timeSeries';
 import { getColorFromDataAndTresholds } from '../common/utils';
 import { margins } from '../common/margins';
 
@@ -15,7 +15,8 @@ import Thresholds from './Thresholds';
 import PieData from './PieData';
 import { GaugeProps } from './models';
 
-interface Props extends Pick<GaugeProps, 'thresholds'> {
+interface Props extends Pick<GaugeProps, 'thresholds' | 'baseColor'> {
+  displayAsRaw?: boolean;
   height: number;
   metric: Metric;
   width: number;
@@ -30,7 +31,9 @@ const ResponsiveGauge = ({
   width,
   height,
   thresholds,
-  metric
+  metric,
+  displayAsRaw,
+  baseColor
 }: Props): JSX.Element => {
   const svgRef = useRef<SVGSVGElement>(null);
 
@@ -50,28 +53,36 @@ const ResponsiveGauge = ({
   const centerY = innerHeight / 2;
   const centerX = innerWidth / 2;
   const radius = Math.min(innerWidth, innerHeight) / 2;
-  const thresholdValues = flatten([
-    pluck('value', thresholds.warning),
-    pluck('value', thresholds.critical)
-  ]);
+  const thresholdValues = thresholds.enabled
+    ? flatten([
+        pluck('value', thresholds.warning),
+        pluck('value', thresholds.critical)
+      ])
+    : [0];
   const adaptedMaxValue = Math.max(
     metric.maximum_value || 0,
     Math.max(...thresholdValues) * 1.1,
     head(metric.data) as number
   );
 
-  const pieColor = !thresholds.enabled
-    ? theme.palette.success.main
-    : getColorFromDataAndTresholds({
-        data: metric.data[0],
-        theme,
-        thresholds
-      });
+  const pieColor = getColorFromDataAndTresholds({
+    baseColor,
+    data: metric.data[0],
+    theme,
+    thresholds
+  });
 
   const svgTop = svgRef.current?.getBoundingClientRect().top || 0;
   const svgLeft = svgRef.current?.getBoundingClientRect().left || 0;
 
-  const isSmallHeight = height < 250;
+  const isSmallWidget = height < 240;
+
+  const gaugeValue = formatMetricValueWithUnit({
+    base: 1000,
+    isRaw: displayAsRaw,
+    unit: metric.unit,
+    value: metric.data[0]
+  });
 
   return (
     <Box sx={{ position: 'relative' }}>
@@ -87,6 +98,7 @@ const ResponsiveGauge = ({
           />
           <PieData
             adaptedMaxValue={adaptedMaxValue}
+            baseColor={baseColor}
             metric={metric}
             radius={radius}
             thresholds={thresholds}
@@ -97,18 +109,15 @@ const ResponsiveGauge = ({
           style={{
             fill: pieColor,
             ...theme.typography.h3,
-            fontSize: Math.min(width, height) / 7
+            fontSize:
+              Math.min(width, height) / 7 -
+              (isSmallWidget ? 0 : (gaugeValue?.length || 0) * 2)
           }}
           textAnchor="middle"
           x="50%"
-          y={isSmallHeight ? 140 : 100 + Math.min(width, height) / 3}
+          y={isSmallWidget ? 130 : height - height / 2.3}
         >
-          {formatMetricValue({
-            base: 1000,
-            unit: metric.unit,
-            value: metric.data[0]
-          })}{' '}
-          {metric.unit}
+          {gaugeValue}
         </text>
       </svg>
       <Fade in={tooltipOpen && thresholds.enabled}>

package/src/Graph/Gauge/Thresholds.tsx

@@ -16,7 +16,7 @@ const Thresholds = ({
   showTooltip,
   hideTooltip,
   metric
-}: Omit<GaugeProps, 'width' | 'height'>): JSX.Element => {
+}: Omit<GaugeProps, 'width' | 'height'>): JSX.Element | null => {
   const theme = useTheme();
 
   const criticalThresholdValues = pluck('value', thresholds.critical);
@@ -65,30 +65,7 @@ const Thresholds = ({
   });
 
   if (!thresholds.enabled) {
-    return (
-      <Pie
-        data={successThresholdArc}
-        endAngle={-Math.PI / 2}
-        innerRadius={radius - thresholdThickness}
-        outerRadius={radius}
-        pieSortValues={() => -1}
-        pieValue={(d) => d.value}
-        startAngle={Math.PI / 2}
-      >
-        {(pie) => (
-          <AnimatedPie<{ name: string; value: number }>
-            {...pie}
-            animate
-            getColor={(arc) => successThresholdScaleOrdinal(arc.data.name)}
-            getKey={(arc) => `${arc.data.name}_${arc.data.value}`}
-            hideTooltip={hideTooltip}
-            metric={metric}
-            showTooltip={showTooltip}
-            thresholds={thresholds}
-          />
-        )}
-      </Pie>
-    );
+    return null;
   }
 
   const arcs = [

package/src/Graph/Gauge/models.ts

@@ -3,6 +3,7 @@ import { Metric } from '../common/timeSeries/models';
 
 export interface GaugeProps {
   adaptedMaxValue: number;
+  baseColor?: string;
   height: number;
   hideTooltip: () => void;
   metric: Metric;

package/src/Graph/SingleBar/ResponsiveSingleBar.tsx

@@ -2,23 +2,22 @@ import { useMemo, useRef } from 'react';
 
 import { Group, Tooltip } from '@visx/visx';
 import { scaleLinear } from '@visx/scale';
-import { flatten, head, pluck } from 'ramda';
+import { equals, flatten, head, pluck } from 'ramda';
 import { Bar } from '@visx/shape';
 import { useSpring, animated } from '@react-spring/web';
 
 import { alpha, Box, Fade, useTheme } from '@mui/material';
 
 import {
-  formatMetricValue,
+  formatMetricValueWithUnit,
   getMetricWithLatestData
 } from '../common/timeSeries';
 import { Metric } from '../common/timeSeries/models';
 import { getColorFromDataAndTresholds } from '../common/utils';
-import { margins } from '../common/margins';
 
 import { SingleBarProps } from './models';
 import Thresholds, { groupMargin } from './Thresholds';
-import { barHeight, margin } from './ThresholdLine';
+import { barHeights } from './ThresholdLine';
 
 interface Props extends SingleBarProps {
   height: number;
@@ -34,25 +33,29 @@ const ResponsiveSingleBar = ({
   data,
   thresholds,
   width,
-  height
+  height,
+  displayAsRaw,
+  baseColor,
+  size = 'medium',
+  showLabels = true
 }: Props): JSX.Element => {
   const theme = useTheme();
 
   const metric = getMetricWithLatestData(data) as Metric;
   const latestMetricData = head(metric.data) as number;
-  const thresholdValues = flatten([
-    pluck('value', thresholds.warning),
-    pluck('value', thresholds.critical)
-  ]);
+  const thresholdValues = thresholds.enabled
+    ? flatten([
+        pluck('value', thresholds.warning),
+        pluck('value', thresholds.critical)
+      ])
+    : [0];
+
   const adaptedMaxValue = Math.max(
     metric.maximum_value || 0,
     Math.max(...thresholdValues) * 1.1,
     head(metric.data) as number
   );
 
-  const innerHeight = height;
-  const centerY = innerHeight / 4;
-
   const {
     showTooltip,
     hideTooltip,
@@ -66,6 +69,7 @@ const ResponsiveSingleBar = ({
   const barColor = useMemo(
     () =>
       getColorFromDataAndTresholds({
+        baseColor,
         data: latestMetricData,
         theme,
         thresholds
@@ -73,20 +77,31 @@ const ResponsiveSingleBar = ({
     [latestMetricData, thresholds, theme]
   );
 
-  const text = (
+  const isSmall = equals(size, 'small');
+
+  const textStyle = isSmall
+    ? {
+        ...theme.typography.h6
+      }
+    : theme.typography.h3;
+
+  const text = showLabels && (
     <text
       dominantBaseline="middle"
-      style={{ fill: barColor, ...theme.typography.h3 }}
+      style={{
+        fill: barColor,
+        ...textStyle
+      }}
       textAnchor="middle"
       x="50%"
-      y={25}
+      y={isSmall ? 10 : 25}
     >
-      {formatMetricValue({
+      {formatMetricValueWithUnit({
         base: 1000,
+        isRaw: displayAsRaw,
         unit: metric.unit,
         value: metric.data[0]
-      })}{' '}
-      {metric.unit}
+      })}
     </text>
   );
 
@@ -113,31 +128,32 @@ const ResponsiveSingleBar = ({
   return (
     <Box sx={{ position: 'relative' }}>
       <svg height={height} ref={svgRef} width={width}>
-        <Group.Group top={centerY - margins.bottom}>
+        <Group.Group>
           {text}
           <animated.rect
             data-testid={`${latestMetricData}-bar-${barColor}`}
             fill={barColor}
-            height={barHeight}
+            height={barHeights[size]}
             rx={4}
             style={springStyle}
             x={0}
-            y={groupMargin + margin}
+            y={groupMargin}
           />
           <Bar
             fill="transparent"
-            height={barHeight}
+            height={barHeights[size]}
             rx={4}
             ry={4}
             stroke={alpha(theme.palette.text.primary, 0.3)}
             width={maxBarWidth}
             x={0}
-            y={groupMargin + margin}
+            y={groupMargin}
           />
           {thresholds.enabled && (
             <Thresholds
               hideTooltip={hideTooltip}
               showTooltip={showTooltip}
+              size={size}
               thresholds={thresholds}
               xScale={xScale}
             />
@@ -151,7 +167,8 @@ const ResponsiveSingleBar = ({
             ...baseStyles,
             backgroundColor: theme.palette.background.paper,
             color: theme.palette.text.primary,
-            transform: 'translate(-50%, -20px)'
+            transform: `translate(-50%, ${isSmall ? -60 : -20}px)`,
+            zIndex: theme.zIndex.tooltip
           }}
           top={tooltipTop}
         >

package/src/Graph/SingleBar/SingleBar.stories.tsx

@@ -156,3 +156,49 @@ export const rangeThresholds: Story = {
   },
   render: Template
 };
+
+export const RawValue: Story = {
+  args: {
+    data: dataLastWeek,
+    displayAsRaw: true,
+    thresholds: {
+      critical: [
+        {
+          label: 'Critical',
+          value: 0.6
+        }
+      ],
+      enabled: false,
+      warning: [
+        {
+          label: 'Warning',
+          value: 0.5
+        }
+      ]
+    }
+  },
+  render: Template
+};
+
+export const Small: Story = {
+  args: {
+    data: dataLastWeek,
+    size: 'small',
+    thresholds: {
+      critical: [
+        {
+          label: 'Critical',
+          value: 0.6
+        }
+      ],
+      enabled: true,
+      warning: [
+        {
+          label: 'Warning',
+          value: 0.5
+        }
+      ]
+    }
+  },
+  render: Template
+};

package/src/Graph/SingleBar/ThresholdLine.tsx

@@ -4,18 +4,22 @@ import { useTheme } from '@mui/material';
 
 import { groupMargin } from './Thresholds';
 
-const lineMargin = 10;
-
-const thresholdLineHeight = 60 + 2 * lineMargin;
-
+export const barHeights = {
+  medium: 72,
+  small: 22
+};
 export const margin = 40;
 
-export const barHeight = 50;
+const lineMargins = {
+  medium: 10,
+  small: 5
+};
 
 interface Props {
   hideTooltip: () => void;
   label: string;
   showTooltip: (args) => void;
+  size: 'small' | 'medium';
   thresholdType: string;
   value: number;
   xScale: (value: number) => number;
@@ -27,13 +31,20 @@ export const ThresholdLine = ({
   xScale,
   thresholdType,
   showTooltip,
-  hideTooltip
+  hideTooltip,
+  size
 }: Props): JSX.Element => {
   const theme = useTheme();
 
   const scaledValue = xScale(value) || 0;
 
-  const bottom = barHeight + margin * 2;
+  const lineMargin = lineMargins[size];
+
+  const thresholdLineHeight = barHeights[size] + 2 * lineMargin;
+
+  const isSmall = equals(size, 'small');
+
+  const bottom = barHeights[size] + margin * 2;
 
   const onMouseEnter = (left) => (): void =>
     showTooltip({
@@ -51,12 +62,16 @@ export const ThresholdLine = ({
       <line
         data-testid={`${thresholdType}-line-${value}`}
         stroke={lineColor}
-        strokeDasharray={4}
+        strokeDasharray="6, 6"
         strokeWidth={2}
         x1={scaledValue}
         x2={scaledValue}
-        y1={groupMargin + 3 * lineMargin}
-        y2={thresholdLineHeight + groupMargin + 3 * lineMargin}
+        y1={isSmall ? groupMargin - lineMargin : groupMargin + 3 * lineMargin}
+        y2={
+          isSmall
+            ? thresholdLineHeight + groupMargin - lineMargin
+            : groupMargin + 3 * lineMargin
+        }
       />
       <line
         data-testid={`${thresholdType}-line-${value}-tooltip`}
@@ -64,8 +79,12 @@ export const ThresholdLine = ({
         strokeWidth={5}
         x1={scaledValue}
         x2={scaledValue}
-        y1={groupMargin + 3 * lineMargin}
-        y2={thresholdLineHeight + groupMargin + 3 * lineMargin}
+        y1={isSmall ? groupMargin - lineMargin : groupMargin + 3 * lineMargin}
+        y2={
+          isSmall
+            ? thresholdLineHeight + groupMargin - lineMargin
+            : groupMargin + 3 * lineMargin
+        }
         onMouseEnter={onMouseEnter(scaledValue)}
         onMouseLeave={hideTooltip}
       />

package/src/Graph/SingleBar/Thresholds.tsx

@@ -7,6 +7,7 @@ export const groupMargin = 25;
 interface Props {
   hideTooltip: () => void;
   showTooltip: (args) => void;
+  size: 'small' | 'medium';
   thresholds: Thresholds;
   xScale: (value: number) => number;
 }
@@ -15,7 +16,8 @@ const Thresholds = ({
   xScale,
   thresholds,
   showTooltip,
-  hideTooltip
+  hideTooltip,
+  size
 }: Props): JSX.Element => (
   <>
     {thresholds.warning.map(({ value, label }) => (
@@ -24,6 +26,7 @@ const Thresholds = ({
         key={`warning-${value.toString()}`}
         label={label}
         showTooltip={showTooltip}
+        size={size}
         thresholdType="warning"
         value={value}
         xScale={xScale}
@@ -35,6 +38,7 @@ const Thresholds = ({
         key={`critical-${value.toString()}`}
         label={label}
         showTooltip={showTooltip}
+        size={size}
         thresholdType="critical"
         value={value}
         xScale={xScale}

package/src/Graph/SingleBar/models.ts

@@ -1,6 +1,10 @@
 import { LineChartData, Thresholds } from '../common/models';
 
 export interface SingleBarProps {
+  baseColor?: string;
   data?: LineChartData;
+  displayAsRaw?: boolean;
+  showLabels?: boolean;
+  size?: 'medium' | 'small';
   thresholds: Thresholds;
 }

package/src/Graph/Text/Text.stories.tsx

@@ -52,3 +52,16 @@ export const critical: Story = {
   },
   render: Template
 };
+
+export const rawValue: Story = {
+  args: {
+    data: dataLastWeek,
+    displayAsRaw: true,
+    labels: {
+      critical: 'Critical',
+      warning: 'Warning'
+    },
+    thresholds: [0.5, 1.5]
+  },
+  render: Template
+};