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

package/src/Graph/Text/Text.tsx

@@ -4,7 +4,7 @@ import { Typography, useTheme } from '@mui/material';
 
 import { LineChartData, Thresholds } from '../common/models';
 import {
-  formatMetricValue,
+  formatMetricValueWithUnit,
   getMetricWithLatestData
 } from '../common/timeSeries';
 import { getColorFromDataAndTresholds } from '../common/utils';
@@ -12,7 +12,9 @@ import { getColorFromDataAndTresholds } from '../common/utils';
 import { useTextStyles } from './Text.styles';
 
 interface Props {
+  baseColor?: string;
   data?: LineChartData;
+  displayAsRaw?: boolean;
   labels: {
     critical: string;
     warning: string;
@@ -23,7 +25,9 @@ interface Props {
 export const Text = ({
   thresholds,
   data,
-  labels
+  displayAsRaw,
+  labels,
+  baseColor
 }: Props): JSX.Element | null => {
   const theme = useTheme();
   const { classes } = useTextStyles();
@@ -37,20 +41,21 @@ export const Text = ({
   const metricUnit = metric?.unit ?? '';
 
   const color = getColorFromDataAndTresholds({
+    baseColor,
     data: metricValue,
     theme,
     thresholds
   });
 
   const warningThresholdLabels = thresholds.warning.map(({ value }) =>
-    formatMetricValue({
+    formatMetricValueWithUnit({
       unit: metricUnit,
       value
     })
   );
 
   const criticalThresholdLabels = thresholds.critical.map(({ value }) =>
-    formatMetricValue({
+    formatMetricValueWithUnit({
       unit: metricUnit,
       value
     })
@@ -58,24 +63,26 @@ export const Text = ({
 
   return (
     <div className={classes.graphText}>
-      <Typography sx={{ color }} variant="h3">
-        {formatMetricValue({
-          unit: metricUnit,
-          value: metricValue
-        })}{' '}
-        {metricUnit}
+      <Typography sx={{ color }} variant="h2">
+        <strong>
+          {formatMetricValueWithUnit({
+            isRaw: displayAsRaw,
+            unit: metricUnit,
+            value: metricValue
+          })}
+        </strong>
       </Typography>
       {thresholds.enabled && (
         <div className={classes.thresholds}>
           <Typography sx={{ color: 'warning.main' }} variant="h5">
             {labels.warning}
             {': '}
-            {warningThresholdLabels.join(' - ')} {metricUnit}
+            {warningThresholdLabels.join(' - ')}
           </Typography>
           <Typography sx={{ color: 'error.main' }} variant="h5">
             {labels.critical}
             {': '}
-            {criticalThresholdLabels.join(' - ')} {metricUnit}
+            {criticalThresholdLabels.join(' - ')}
           </Typography>
         </div>
       )}

package/src/Graph/common/timeSeries/index.test.ts

@@ -335,10 +335,10 @@ describe('timeSeries', () => {
   describe(timeSeries.formatMetricValue, () => {
     const cases: Array<TestCase> = [
       [218857269, '', 1000, '218.86m'],
-      [218857269, '', 1024, '208.72M'],
+      [218857269, '', 1024, '208.72 M'],
       [0.12232323445, '', 1000, '0.12'],
-      [1024, 'B', 1000, '1K'],
-      [1024, 'B', 1024, '1K'],
+      [1024, 'B', 1000, '1 KB'],
+      [1024, 'B', 1024, '1 KB'],
       [null, 'B', 1024, null]
     ];
 
@@ -504,3 +504,106 @@ describe('timeSeries', () => {
     });
   });
 });
+
+describe('Format value with unit', () => {
+  const units = [
+    'B',
+    'bytes',
+    'bytespersecond',
+    'B/s',
+    'B/sec',
+    'o',
+    'octets',
+    'b/s',
+    'b',
+    'ms',
+    '%',
+    ''
+  ];
+
+  const getExpectedResult = (unit): string => {
+    if (unit === '') {
+      return '324.23m';
+    }
+
+    return `309.21 M${unit}`;
+  };
+
+  const humanReadableTestCases = units.map((unit) => {
+    if (unit === '%') {
+      return {
+        expectedResult: '45.56%',
+        unit,
+        value: 45.55678
+      };
+    }
+
+    if (unit === 'ms') {
+      return {
+        expectedResult: '34.23 seconds',
+        unit,
+        value: 34232
+      };
+    }
+
+    return {
+      expectedResult: getExpectedResult(unit),
+      unit,
+      value: 324234232.34233
+    };
+  });
+
+  const rawTestCases = units.map((unit) => {
+    if (unit === '%') {
+      return {
+        expectedResult: '45.55678%',
+        unit,
+        value: 45.55678
+      };
+    }
+
+    if (unit === 'ms') {
+      return {
+        expectedResult: '34232 ms',
+        unit,
+        value: 34232
+      };
+    }
+
+    return {
+      expectedResult:
+        unit === '' ? '324234232.34233 ' : `324234232.34233 ${unit}`,
+      unit,
+      value: 324234232.34233
+    };
+  });
+
+  describe('Format the value as human readable', () => {
+    it.each(humanReadableTestCases)(
+      'formats the value with $unit',
+      ({ value, unit, expectedResult }) => {
+        expect(
+          timeSeries.formatMetricValueWithUnit({
+            unit,
+            value
+          })
+        ).toEqual(expectedResult);
+      }
+    );
+  });
+
+  describe('Format the value as raw', () => {
+    it.each(rawTestCases)(
+      'formats the value with $unit',
+      ({ value, unit, expectedResult }) => {
+        expect(
+          timeSeries.formatMetricValueWithUnit({
+            isRaw: true,
+            unit,
+            value
+          })
+        ).toEqual(expectedResult);
+      }
+    );
+  });
+});

package/src/Graph/common/timeSeries/index.ts

@@ -28,7 +28,10 @@ import {
   lt,
   identity,
   head,
-  last
+  last,
+  cond,
+  always,
+  T
 } from 'ramda';
 
 import { margin } from '../../LineChart/common';
@@ -440,6 +443,37 @@ const getRightScale = ({
   });
 };
 
+const formatTime = (value: number): string => {
+  if (value < 1000) {
+    return `${numeral(value).format('0.[00]a')} ms`;
+  }
+
+  const t = numeral(value / 1000).format('0.[00]a');
+
+  return `${t} seconds`;
+};
+
+const registerMsUnitToNumeral = (): null => {
+  try {
+    numeral.register('format', 'milliseconds', {
+      format: (value) => {
+        return formatTime(value);
+      },
+      regexps: {
+        format: /(ms)/,
+        unformat: /(ms)/
+      },
+      unformat: () => ''
+    });
+
+    return null;
+  } catch (_) {
+    return null;
+  }
+};
+
+registerMsUnitToNumeral();
+
 const formatMetricValue = ({
   value,
   unit,
@@ -463,11 +497,14 @@ const formatMetricValue = ({
 
   const base1024 = base2Units.includes(unit) || Number(base) === 1024;
 
-  const formatSuffix = base1024 ? ' ib' : 'a';
+  const formatSuffix = cond([
+    [equals('ms'), always(' ms')],
+    [T, always(base1024 ? ' ib' : 'a')]
+  ])(unit);
 
   const formattedMetricValue = numeral(Math.abs(value))
     .format(`0.[00]${formatSuffix}`)
-    .replace(/\s|i|B/g, '');
+    .replace(/iB/g, unit);
 
   if (lt(value, 0)) {
     return `-${formattedMetricValue}`;
@@ -476,6 +513,31 @@ const formatMetricValue = ({
   return formattedMetricValue;
 };
 
+const formatMetricValueWithUnit = ({
+  value,
+  unit,
+  base = 1000,
+  isRaw = false
+}: FormatMetricValueProps & { isRaw?: boolean }): string | null => {
+  if (isNil(value)) {
+    return null;
+  }
+
+  if (isRaw) {
+    const unitText = equals('%', unit) ? unit : ` ${unit}`;
+
+    return `${value}${unitText}`;
+  }
+
+  if (equals('%', unit)) {
+    return `${numeral(Math.abs(value)).format('0.[00]')}%`;
+  }
+
+  const formattedMetricValue = formatMetricValue({ base, unit, value });
+
+  return formattedMetricValue;
+};
+
 const getStackedYScale = ({
   leftScale,
   rightScale
@@ -557,5 +619,6 @@ export {
   getStackedYScale,
   getTimeValue,
   bisectDate,
-  getMetricWithLatestData
+  getMetricWithLatestData,
+  formatMetricValueWithUnit
 };

package/src/Graph/common/timeSeries/models.ts

@@ -14,14 +14,17 @@ interface DsData {
 export interface Metric {
   average_value: number | null;
   crit: number | null;
-  data: Array<number>;
-  ds_data: DsData;
+  critical_high_threshold: number | null;
+  critical_low_threshold: number | null;
+  data: Array<number | null>;
+  ds_data?: DsData;
   legend: string;
   maximum_value: number | null;
   metric: string;
   minimum_value: number | null;
   unit: string;
-  warn: number | null;
+  warning_high_threshold: number | null;
+  warning_low_threshold: number | null;
 }
 
 type TimeSeries = { timeTick: string };

package/src/Graph/common/utils.ts

@@ -17,6 +17,7 @@ import { Theme } from '@mui/material';
 import { Thresholds } from './models';
 
 interface GetColorFromDataAndThresholdsProps {
+  baseColor?: string;
   data: number;
   theme: Theme;
   thresholds: Thresholds;
@@ -25,10 +26,11 @@ interface GetColorFromDataAndThresholdsProps {
 export const getColorFromDataAndTresholds = ({
   data,
   thresholds,
-  theme
+  theme,
+  baseColor
 }: GetColorFromDataAndThresholdsProps): string => {
   if (!thresholds.enabled) {
-    return theme.palette.success.main;
+    return baseColor || theme.palette.primary.main;
   }
 
   const criticalValues = pluck('value', thresholds.critical).sort();

package/src/InputField/Select/Autocomplete/Multi/index.tsx

@@ -1,7 +1,7 @@
 import { includes, map, prop, reject } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 
-import { Chip } from '@mui/material';
+import { Chip, ChipProps } from '@mui/material';
 import { UseAutocompleteProps } from '@mui/material/useAutocomplete';
 
 import Autocomplete, { Props as AutocompleteProps } from '..';
@@ -18,7 +18,6 @@ const useStyles = makeStyles()((theme) => ({
     width: theme.spacing(1.5)
   },
   tag: {
-    backgroundColor: theme.palette.divider,
     fontSize: theme.typography.caption.fontSize
   }
 }));
@@ -33,6 +32,7 @@ export interface Props
       UseAutocompleteProps<SelectEntry, Multiple, DisableClearable, FreeSolo>,
       'multiple'
     > {
+  chipProps?: ChipProps;
   disableSortedOptions?: boolean;
   getTagLabel?: (option) => string;
   optionProperty?: string;
@@ -45,6 +45,7 @@ const MultiAutocompleteField = ({
   optionProperty = 'name',
   getOptionLabel = (option): string => option.name,
   getTagLabel = (option): string => option[optionProperty],
+  chipProps,
   ...props
 }: Props): JSX.Element => {
   const { classes } = useStyles();
@@ -60,6 +61,7 @@ const MultiAutocompleteField = ({
         label={getTagLabel(option)}
         size="medium"
         {...getTagProps({ index })}
+        {...chipProps}
       />
     ));
 

package/src/InputField/Select/Autocomplete/index.tsx

@@ -32,6 +32,7 @@ export type Props = {
   displayPopupIcon?: boolean;
   endAdornment?: React.ReactElement;
   error?: string;
+  getOptionItemLabel?: (option) => string;
   hideInput?: boolean;
   label: string;
   loading?: boolean;
@@ -158,6 +159,7 @@ const AutocompleteField = ({
   autoSize = false,
   autoSizeDefaultWidth = 0,
   autoSizeCustomPadding,
+  getOptionItemLabel = (option) => option.name,
   ...autocompleteProps
 }: Props): JSX.Element => {
   const { classes, cx } = useStyles({ hideInput });
@@ -249,7 +251,7 @@ const AutocompleteField = ({
             <Option
               thumbnailUrl={displayOptionThumbnail ? option.url : undefined}
             >
-              {option.name}
+              {getOptionItemLabel(option)}
             </Option>
           </li>
         );

package/src/InputField/Text/index.tsx

@@ -1,6 +1,6 @@
 import { forwardRef, useCallback } from 'react';
 
-import { isNil } from 'ramda';
+import { equals, isNil } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 
 import {
@@ -9,7 +9,8 @@ import {
   TextFieldProps,
   Theme,
   Tooltip,
-  Typography
+  Typography,
+  Box
 } from '@mui/material';
 
 import { getNormalizedId } from '../../utils';
@@ -18,8 +19,9 @@ import useAutoSize from './useAutoSize';
 
 const useStyles = makeStyles<{ displayAsBlock: boolean }>()(
   (theme: Theme, { displayAsBlock }) => ({
-    compact: {
-      fontSize: 'x-small'
+    autoSizeCompact: {
+      paddingRight: theme.spacing(1),
+      paddingTop: theme.spacing(0.6)
     },
     hiddenText: {
       display: 'table',
@@ -140,7 +142,7 @@ const TextField = forwardRef(
     }, [innerValue, debounced, defaultValue]);
 
     return (
-      <>
+      <Box sx={{ width: autoSize ? 'auto' : '100%' }}>
         <Tooltip placement="top" title={tooltipTitle}>
           <MuiTextField
             data-testid={dataTestId}
@@ -162,7 +164,8 @@ const TextField = forwardRef(
               className: cx(
                 classes.inputBase,
                 {
-                  [classes.transparent]: transparent
+                  [classes.transparent]: transparent,
+                  [classes.autoSizeCompact]: autoSize && equals(size, 'compact')
                 },
                 className
               ),
@@ -195,7 +198,7 @@ const TextField = forwardRef(
             {rest.value || externalValueForAutoSize || innerValue}
           </Typography>
         )}
-      </>
+      </Box>
     );
   }
 );

package/src/RichTextEditor/ContentEditable.tsx

@@ -160,7 +160,6 @@ const ContentEditable = ({
         className,
         isFocused && classes.inputFocused
       )}
-      id={namespace}
     >
       {editable && isTextEmpty && (
         <Typography className={classes.placeholder}>

package/src/RichTextEditor/RichTextEditor.cypress.spec.tsx

@@ -56,7 +56,7 @@ describe('Rich Text Editor', () => {
         .should('be.visible')
         .and('have.value', '');
 
-      cy.get('#RichTextEditor').contains('Type here...');
+      cy.findByLabelText('RichTextEditor').parent().contains('Type here...');
     });
 
     it('displays changes with undo redo buttons', () => {
@@ -187,11 +187,6 @@ describe('Rich Text Editor', () => {
     });
 
     it('displays editor when editable props is false and an initialState exist', () => {
-      cy.get('[data-testid="RichTextEditor"]').should(
-        'have.attr',
-        'contenteditable',
-        'false'
-      );
       cy.findByLabelText('Undo').should('not.exist');
       cy.findByLabelText('Redo').should('not.exist');
       cy.findByLabelText('bold').should('not.exist');
@@ -216,11 +211,6 @@ describe('Rich Text Editor', () => {
     });
 
     it('displays editor when editable props is false and an initialState exist', () => {
-      cy.get('[data-testid="RichTextEditor"]').should(
-        'have.attr',
-        'contenteditable',
-        'false'
-      );
       cy.findByLabelText('Undo').should('be.disabled');
       cy.findByLabelText('Redo').should('be.disabled');
       cy.findByLabelText('bold').should('be.disabled');
@@ -245,12 +235,14 @@ describe('Rich Text Editor', () => {
       });
     });
     it('displays editor with custom namespace', () => {
-      cy.get('#CypressComponentTest > p').should('be.exist');
+      cy.get('[data-testid="CypressComponentTest"] > p').should('be.exist');
       cy.get('[data-testid="CypressComponentTest"]').should('be.exist');
     });
 
     it('displays editor with custom placeholder', () => {
-      cy.get('#CypressComponentTest > p').contains('Type Cypress test...');
+      cy.get('[data-testid="CypressComponentTest"]')
+        .parent()
+        .contains('Type Cypress test...');
     });
 
     it('displays editor with custom minimum input height', () => {

package/src/RichTextEditor/RichTextEditor.tsx

@@ -23,6 +23,7 @@ import FloatingLinkEditorPlugin from './plugins/FloatingLinkEditorPlugin';
 export interface RichTextEditorProps {
   contentClassName?: string;
   disabled?: boolean;
+  displayBlockButtons?: boolean;
   displayMacrosButton?: boolean;
   editable: boolean;
   editorState?: string;
@@ -132,9 +133,10 @@ const RichTextEditor = ({
   onBlur,
   contentClassName,
   displayMacrosButton = false,
-  disabled,
+  disabled = false,
   openLinkInNewTab = true,
-  initialize
+  initialize,
+  displayBlockButtons = true
 }: RichTextEditorProps): JSX.Element => {
   const { classes } = useStyles({ toolbarPositions });
 
@@ -174,6 +176,7 @@ const RichTextEditor = ({
         <div className={classes.toolbar}>
           <ToolbarPlugin
             disabled={disabled}
+            displayBlockButtons={displayBlockButtons}
             displayMacrosButton={displayMacrosButton}
             editable={editable}
           />

package/src/RichTextEditor/plugins/AutoLinkPlugin/index.tsx

@@ -1,7 +1,11 @@
+import { useEffect, useState } from 'react';
+
 import {
   AutoLinkPlugin,
   LinkMatcher
 } from '@lexical/react/LexicalAutoLinkPlugin';
+import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
+import { BLUR_COMMAND, COMMAND_PRIORITY_LOW, FOCUS_COMMAND } from 'lexical';
 
 interface LinkAttributes {
   rel?: null | string;
@@ -56,7 +60,42 @@ const AutoCompleteLinkPlugin = ({
   openLinkInNewTab
 }: {
   openLinkInNewTab: boolean;
-}): JSX.Element => {
+}): JSX.Element | null => {
+  const [editor] = useLexicalComposerContext();
+  const [hasFocus, setFocus] = useState(false);
+
+  useEffect(
+    () =>
+      editor.registerCommand(
+        BLUR_COMMAND,
+        () => {
+          setFocus(false);
+
+          return false;
+        },
+        COMMAND_PRIORITY_LOW
+      ),
+    []
+  );
+
+  useEffect(
+    () =>
+      editor.registerCommand(
+        FOCUS_COMMAND,
+        () => {
+          setFocus(true);
+
+          return false;
+        },
+        COMMAND_PRIORITY_LOW
+      ),
+    []
+  );
+
+  if (!hasFocus) {
+    return null;
+  }
+
   return <AutoLinkPlugin matchers={getMatchers(openLinkInNewTab)} />;
 };