@centreon/ui 24.9.4 → 24.9.6

package/src/Snackbar/index.tsx

@@ -1,33 +1,28 @@
-import { SnackbarContent, useSnackbar } from 'notistack';
+import * as React from 'react';
+
+import { useSnackbar, SnackbarContent } from 'notistack';
 import { isNil, not } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 
+import { IconButton, Alert } from '@mui/material';
 import IconClose from '@mui/icons-material/Close';
-import { Alert, IconButton } from '@mui/material';
-
-import { sanitizedHTML } from '../utils';
 
-import { forwardRef, useEffect, useRef } from 'react';
 import Severity from './Severity';
 
-const useStyles = makeStyles()((theme) => ({
+const useStyles = makeStyles()({
   alertIcon: {
-    paddingTop: theme.spacing(1.25)
+    paddingTop: '10px'
   },
   closeIcon: {
     fontSize: 20,
     opacity: 0.9
   },
   message: {
-    '& a': {
-      color: theme.palette.primary.main,
-      textDecoration: 'none'
-    },
     display: 'flex',
     flexDirection: 'column',
     justifyContent: 'center'
   }
-}));
+});
 
 export interface SnackbarProps {
   id: string | number;
@@ -35,16 +30,16 @@ export interface SnackbarProps {
   severity: Severity;
 }
 
-const Snackbar = forwardRef(
+const Snackbar = React.forwardRef(
   (
     { message, id, severity }: SnackbarProps,
     ref: React.ForwardedRef<HTMLDivElement>
   ): JSX.Element => {
     const { classes } = useStyles();
     const { closeSnackbar } = useSnackbar();
-    const timeoutId = useRef<NodeJS.Timeout | undefined>();
+    const timeoutId = React.useRef<number | undefined>();
 
-    useEffect((): void => {
+    React.useEffect((): void => {
       timeoutId.current = setTimeout(() => {
         closeSnackbar(id);
       }, 6000);
@@ -52,14 +47,10 @@ const Snackbar = forwardRef(
 
     const close = (): void => {
       if (not(isNil(timeoutId.current))) {
-        clearTimeout(timeoutId.current);
+        clearTimeout(timeoutId.current as number);
       }
       closeSnackbar(id);
     };
-    const sanitizedMessage = sanitizedHTML({ initialContent: message });
-
-    const formatedMessage =
-      typeof message === 'string' ? <div>{sanitizedMessage}</div> : message;
 
     return (
       <SnackbarContent ref={ref}>
@@ -78,7 +69,7 @@ const Snackbar = forwardRef(
           severity={severity}
           variant="filled"
         >
-          {formatedMessage}
+          {message}
         </Alert>
       </SnackbarContent>
     );

package/src/Snackbar/useSnackbar.tsx

@@ -2,8 +2,6 @@ import { useSnackbar as useNotistackSnackbar } from 'notistack';
 
 import { Typography } from '@mui/material';
 
-import { sanitizedHTML } from '../utils';
-
 import Severity from './Severity';
 
 import Snackbar from '.';
@@ -61,9 +59,7 @@ const useSnackbar = (): UseSnackbar => {
         <div>
           {formattedMessages.map((errorMessage, index) => (
             <Typography key={messageKeys[index]} variant="body2">
-              {sanitizedHTML({
-                initialContent: errorMessage
-              })}
+              {errorMessage}
             </Typography>
           ))}
         </div>

package/src/SortableItems/Item.tsx

@@ -1,12 +1,12 @@
-import { ForwardedRef, forwardRef } from 'react';
+import * as React from 'react';
 
 interface Props extends Record<string, unknown> {
   Content: (props) => JSX.Element;
   isInDragOverlay?: boolean;
 }
 
-const Item = forwardRef(
-  ({ Content, ...props }: Props, ref: ForwardedRef<HTMLDivElement>) => {
+const Item = React.forwardRef(
+  ({ Content, ...props }: Props, ref: React.ForwardedRef<HTMLDivElement>) => {
     return <Content {...props} itemRef={ref} />;
   }
 );

package/src/SortableItems/SortableItem.tsx

@@ -1,8 +1,8 @@
+import { props } from 'ramda';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { props } from 'ramda';
 
-import { useMemoComponent } from '../utils';
+import useMemoComponent from '../utils/useMemoComponent';
 
 import Item from './Item';
 
@@ -56,8 +56,7 @@ const SortableItem = ({
       transform,
       props(itemProps, rest),
       ...memoProps,
-      ...additionalProps,
-      ...Object.values(rest)
+      ...additionalProps
     ]
   });
 };

package/src/SortableItems/index.stories.tsx

@@ -1,18 +1,19 @@
+import * as React from 'react';
+
+import { ComponentMeta, ComponentStory } from '@storybook/react';
 import { DraggableSyntheticListeners, rectIntersection } from '@dnd-kit/core';
 import {
-  SortingStrategy,
   horizontalListSortingStrategy,
   rectSortingStrategy,
+  SortingStrategy,
   verticalListSortingStrategy
 } from '@dnd-kit/sortable';
-import { ComponentMeta, ComponentStory } from '@storybook/react';
 import { not } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 
+import { Paper, Typography, Grid, IconButton } from '@mui/material';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
-import { Grid, IconButton, Paper, Typography } from '@mui/material';
 
-import { RefObject } from 'react';
 import SortableItems, { RootComponentProps } from '.';
 
 export default {
@@ -88,7 +89,7 @@ const useContentStyles = makeStyles<StylesProps>()((theme, { isDragging }) => ({
 interface ContentProps extends Entity {
   attributes;
   isDragging: boolean;
-  itemRef: RefObject<HTMLDivElement>;
+  itemRef: React.RefObject<HTMLDivElement>;
   listeners: DraggableSyntheticListeners;
   style;
 }

package/src/SortableItems/index.tsx

@@ -1,44 +1,49 @@
+import * as React from 'react';
+
 import {
-  CollisionDetection,
   DndContext,
-  DragEndEvent,
-  DragOverEvent,
   DragOverlay,
-  DragStartEvent,
-  DraggableSyntheticListeners,
-  KeyboardSensor,
   MouseSensor,
-  Over,
+  KeyboardSensor,
   PointerSensor,
   useSensor,
-  useSensors
+  useSensors,
+  CollisionDetection,
+  DraggableSyntheticListeners,
+  DragOverEvent,
+  DragStartEvent,
+  DragEndEvent,
+  Over
 } from '@dnd-kit/core';
-import { SortableContext, SortingStrategy } from '@dnd-kit/sortable';
 import {
-  path,
+  SortableContext,
+  sortableKeyboardCoordinates,
+  SortingStrategy
+} from '@dnd-kit/sortable';
+import {
   equals,
   find,
   indexOf,
   isNil,
   move,
   not,
-  pick,
+  path,
   pipe,
-  pluck,
-  propEq
+  propEq,
+  pick,
+  pluck
 } from 'ramda';
 
 import { useTheme } from '@mui/material';
 
-import { RefObject, useEffect, useState } from 'react';
-import Item from './Item';
 import SortableItem from './SortableItem';
+import Item from './Item';
 
 interface ContentProps {
   attributes;
   index;
   isDragging: boolean;
-  itemRef: RefObject<HTMLDivElement>;
+  itemRef: React.RefObject<HTMLDivElement>;
   listeners: DraggableSyntheticListeners;
   style;
 }
@@ -105,13 +110,14 @@ const SortableItems = <T extends { [propertyToFilterItemsOn]: string }>({
   const getItemsIds = (): Array<string> =>
     pluck(propertyToFilterItemsOn, items);
 
-  const [activeId, setActiveId] = useState<string | null>(null);
-  const [sortableItemsIds, setSortableItemsIds] = useState(getItemsIds());
+  const [activeId, setActiveId] = React.useState<string | null>(null);
+  const [sortableItemsIds, setSortableItemsIds] = React.useState(getItemsIds());
 
   const sensors = useSensors(
     useSensor(MouseSensor),
     useSensor(PointerSensor),
     useSensor(KeyboardSensor, {
+      coordinateGetter: sortableKeyboardCoordinates,
       keyboardCodes: {
         cancel: ['Escape'],
         end: ['Space', 'Enter'],
@@ -163,11 +169,11 @@ const SortableItems = <T extends { [propertyToFilterItemsOn]: string }>({
   };
 
   const getItemById = (id): T | undefined =>
-    find(propEq(id, propertyToFilterItemsOn), items);
+    find(propEq(propertyToFilterItemsOn, id), items);
 
   const activeItem = getItemById(activeId) as Record<string, unknown>;
 
-  useEffect(() => {
+  React.useEffect(() => {
     if (not(updateSortableItemsOnItemsChange)) {
       return;
     }

package/src/StatusChip/index.tsx

@@ -5,7 +5,7 @@ import { makeStyles } from 'tss-react/mui';
 
 import { Chip, ChipProps } from '@mui/material';
 
-import { SeverityCode, getStatusColors } from '../utils/statuses';
+import { getStatusColors, SeverityCode } from '../utils/statuses';
 
 export type Props = {
   clickable?: boolean;

package/src/StoryBookThemeProvider/index.tsx

@@ -1,35 +1,36 @@
-import { ReactElement, useMemo } from 'react';
-
-import {
-  CssBaseline,
-  ThemeProvider as MuiThemeProvider,
-  StyledEngineProvider,
-  createTheme
-} from '@mui/material';
-
-import { ThemeMode } from '@centreon/ui-context';
-
-import { getTheme } from '../ThemeProvider';
-
-interface Props {
-  children: ReactElement;
-  themeMode: ThemeMode;
-}
-
-const StoryBookThemeProvider = ({
-  children,
-  themeMode
-}: Props): JSX.Element => {
-  const theme = useMemo(() => createTheme(getTheme(themeMode)), [themeMode]);
-
-  return (
-    <StyledEngineProvider injectFirst>
-      <MuiThemeProvider theme={theme}>
-        {children}
-        <CssBaseline />
-      </MuiThemeProvider>
-    </StyledEngineProvider>
-  );
-};
-
-export default StoryBookThemeProvider;
+import * as React from 'react';
+import { useMemo } from 'react';
+
+import {
+  ThemeProvider as MuiThemeProvider,
+  StyledEngineProvider,
+  createTheme,
+  CssBaseline
+} from '@mui/material';
+
+import { ThemeMode } from '@centreon/ui-context';
+
+import { getTheme } from '../ThemeProvider';
+
+interface Props {
+  children: React.ReactElement;
+  themeMode: ThemeMode;
+}
+
+const StoryBookThemeProvider = ({
+  children,
+  themeMode
+}: Props): JSX.Element => {
+  const theme = useMemo(() => createTheme(getTheme(themeMode)), [themeMode]);
+
+  return (
+    <StyledEngineProvider injectFirst>
+      <MuiThemeProvider theme={theme}>
+        {children}
+        <CssBaseline />
+      </MuiThemeProvider>
+    </StyledEngineProvider>
+  );
+};
+
+export default StoryBookThemeProvider;

package/src/ThemeProvider/index.tsx

@@ -1,30 +1,27 @@
+import * as React from 'react';
+
 import { useAtomValue } from 'jotai';
-import { equals } from 'ramda';
 import { CSSInterpolation } from 'tss-react';
+import { equals } from 'ramda';
 
 import {
-  ButtonProps,
-  InputBaseProps,
   ThemeProvider as MuiThemeProvider,
-  StyledEngineProvider,
   Theme,
-  createTheme
+  StyledEngineProvider,
+  createTheme,
+  InputBaseProps,
+  ButtonProps
 } from '@mui/material';
-import { autocompleteClasses } from '@mui/material/Autocomplete';
 import CssBaseline from '@mui/material/CssBaseline';
+import { autocompleteClasses } from '@mui/material/Autocomplete';
 import { ThemeOptions } from '@mui/material/styles/createTheme';
 
 import { ThemeMode, userAtom } from '@centreon/ui-context';
 
-import RobotoBoldWoff2 from '../fonts/roboto-bold-webfont.woff2';
-import RobotoLightWoff2 from '../fonts/roboto-light-webfont.woff2';
-import RobotoMediumWoff2 from '../fonts/roboto-medium-webfont.woff2';
-import RobotoRegularWoff2 from '../fonts/roboto-regular-webfont.woff2';
-
-import { ReactNode, useMemo } from 'react';
 import { getPalette } from './palettes';
 
 declare module '@mui/styles/defaultTheme' {
+  // eslint-disable-next-line @typescript-eslint/no-empty-interface
   interface DefaultTheme extends Theme {}
 }
 
@@ -47,7 +44,8 @@ const getInputBaseRootStyle = ({
 
   if (equals(size, 'compact')) {
     return {
-      padding: '0px 0px 0px 8px'
+      padding: '8px 8px',
+      paddingRight: '0px'
     };
   }
   if (equals(size, 'small')) {
@@ -73,6 +71,7 @@ const getInputBaseRootStyle = ({
 const getInputBaseInputStyle = ({ size }: InputBaseProps): CSSInterpolation => {
   if (equals(size, 'compact')) {
     return {
+      fontSize: 'x-small',
       minHeight: '32px'
     };
   }
@@ -120,7 +119,6 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
     MuiChip: {
       styleOverrides: {
         root: ({ ownerState, theme }) => ({
-          backgroundColor: !ownerState.color && theme.palette.divider,
           ...(equals(ownerState.size, 'medium') && {
             borderRadius: theme.spacing(1.25),
             fontSize: theme.typography.body2.fontSize,
@@ -149,7 +147,7 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
         ::-webkit-scrollbar {
           height: ${theme.spacing(1)};
           width: ${theme.spacing(1)};
-          background-color: transparent;
+          background-color: ${theme.palette.background.default};
         }
         ::-webkit-scrollbar-thumb {
           background-color: ${
@@ -175,7 +173,6 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
           padding: 0;
           width: 100%;
           height: 100%;
-          text-rendering: optimizeLegibility;
         }
         body {
           background-color: ${theme.palette.background.paper};
@@ -183,41 +180,11 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
           padding: 0;
           width: 100%;
         }
-        #root {
-          background-color: ${theme.palette.background.paper};
-        }
-        @font-face {
-          font-family: 'Roboto';
-          font-style: normal;
-          font-weight: 300;
-          src: local('Roboto'), local('Roboto-Light'), url(${RobotoLightWoff2}) format('woff2');
-        }
-        @font-face {
-          font-family: 'Roboto';
-          font-style: normal;
-          font-weight: 400;
-          src: local('Roboto'), local('Roboto-Regular'), url(${RobotoRegularWoff2}) format('woff2');
-        }
-        @font-face {
-          font-family: 'Roboto';
-          font-style: normal;
-          font-weight: 500;
-          src: local('Roboto'), local('Roboto-Medium'), url(${RobotoMediumWoff2}) format('woff2');
-        }
-        @font-face {
-          font-family: 'Roboto';
-          font-style: normal;
-          font-weight: 700;
-          src: local('Roboto'), local('Roboto-Bold'), url(${RobotoBoldWoff2}) format('woff2');
-        }
       `
     },
     MuiInputBase: {
       styleOverrides: {
-        root: ({ ownerState, theme }) => ({
-          ...getInputBaseInputStyle(ownerState),
-          backgroundColor: theme.palette.background.paper
-        })
+        root: ({ ownerState }) => getInputBaseInputStyle(ownerState)
       }
     },
     MuiList: {
@@ -286,19 +253,18 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
     },
     caption: {
       fontSize: '0.625rem'
-    },
-    fontFamily: 'Roboto, Arial'
+    }
   }
 });
 
 interface Props {
-  children: ReactNode;
+  children: React.ReactNode;
 }
 
 const ThemeProvider = ({ children }: Props): JSX.Element => {
   const { themeMode } = useAtomValue(userAtom);
 
-  const theme = useMemo(
+  const theme = React.useMemo(
     () => createTheme(getTheme(themeMode || ThemeMode.light)),
     [themeMode]
   );