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

package/src/RichTextEditor/plugins/FloatingLinkEditorPlugin.tsx

@@ -11,7 +11,7 @@ import { mergeRegister } from '@lexical/utils';
 import { useAtom, useAtomValue, useSetAtom } from 'jotai';
 import { $isLinkNode, TOGGLE_LINK_COMMAND } from '@lexical/link';
 import { useTranslation } from 'react-i18next';
-import { equals, isNil } from 'ramda';
+import { dec, equals, gt, isNil, replace } from 'ramda';
 
 import { Popper, IconButton, Paper, Link, Box } from '@mui/material';
 import EditIcon from '@mui/icons-material/Edit';
@@ -56,6 +56,7 @@ const FloatingLinkEditor = ({
     x: 0,
     y: 0
   });
+  const [editedUrl, setEditedUrl] = useState('');
 
   const [editMode, setEditMode] = useAtom(editLinkModeAtom);
   const [linkUrl, setLinkUrl] = useAtom(linkValueAtom);
@@ -65,9 +66,10 @@ const FloatingLinkEditor = ({
   const acceptOrCancelNewLinkValue = useCallback(
     (event): void => {
       const { value } = event.target;
-      if (event.key === 'Enter') {
-        event.preventDefault();
 
+      event.preventDefault();
+
+      if (event.key === 'Enter') {
         if (value !== '') {
           editor.dispatchCommand(TOGGLE_LINK_COMMAND, {
             target: openLinkInNewTab ? '_blank' : undefined,
@@ -75,14 +77,36 @@ const FloatingLinkEditor = ({
           });
         }
         setEditMode(false);
-      } else if (event.key === 'Escape') {
-        event.preventDefault();
+      }
+
+      if (event.key === 'Escape') {
         setEditMode(false);
       }
     },
     [setEditMode, setLinkUrl]
   );
 
+  const enterInEditMode = useCallback(() => {
+    setEditedUrl(linkUrl);
+    setEditMode(true);
+  }, [linkUrl]);
+
+  const changeValue = useCallback((event): void => {
+    const { value } = event.target;
+
+    const matched = value.match(/https?:\/\//g);
+
+    if (gt(matched.length, 1)) {
+      setEditedUrl(
+        replace(matched.join(''), matched[dec(matched.length)], value)
+      );
+
+      return;
+    }
+
+    setEditedUrl(value);
+  }, []);
+
   useEffect(() => {
     const isPositioned =
       rangeRect && (!equals(rangeRect.x, 0) || !equals(rangeRect.y, 0));
@@ -126,9 +150,9 @@ const FloatingLinkEditor = ({
           <InputField
             autoFocus
             dataTestId="InputLinkField"
-            defaultValue={linkUrl}
             label={t(labelInputLink)}
             size="small"
+            value={editedUrl}
             onBlur={(event): void => {
               const { value } = event.target;
 
@@ -139,7 +163,8 @@ const FloatingLinkEditor = ({
               }
               setEditMode(false);
             }}
-            onKeyDown={acceptOrCancelNewLinkValue}
+            onChange={changeValue}
+            onKeyUp={acceptOrCancelNewLinkValue}
           />
         ) : (
           <Box component="span" sx={{ margin: '10px' }}>
@@ -156,7 +181,7 @@ const FloatingLinkEditor = ({
               aria-label={labelEditLink}
               size="small"
               sx={{ marginLeft: '5px' }}
-              onClick={(): void => setEditMode(true)}
+              onClick={enterInEditMode}
             >
               <EditIcon fontSize="small" />
             </IconButton>

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

@@ -8,7 +8,8 @@ import MacrosButton from './MacrosButton';
 import BlockButtons from './BlockButtons';
 
 interface Props {
-  disabled?: boolean;
+  disabled: boolean;
+  displayBlockButtons: boolean;
   displayMacrosButton?: boolean;
   editable: boolean;
 }
@@ -33,15 +34,20 @@ export const useStyles = makeStyles()((theme) => ({
 const ToolbarPlugin = ({
   editable,
   displayMacrosButton,
-  disabled
+  disabled,
+  displayBlockButtons
 }: Props): JSX.Element | null => {
   const { classes } = useStyles();
 
   return editable ? (
     <div className={classes.container}>
       <UndoRedoButtons disabled={disabled} />
-      <Divider flexItem orientation="vertical" />
-      <BlockButtons disabled={disabled} />
+      {displayBlockButtons && (
+        <>
+          <Divider flexItem orientation="vertical" />
+          <BlockButtons disabled={disabled} />
+        </>
+      )}
       <Divider flexItem orientation="vertical" />
       <FormatButtons disabled={disabled} />
       {displayMacrosButton && (

package/src/ThemeProvider/index.tsx

@@ -48,8 +48,7 @@ const getInputBaseRootStyle = ({
 
   if (equals(size, 'compact')) {
     return {
-      padding: '8px 8px',
-      paddingRight: '0px'
+      padding: '0px 0px 0px 8px'
     };
   }
   if (equals(size, 'small')) {
@@ -75,7 +74,6 @@ const getInputBaseRootStyle = ({
 const getInputBaseInputStyle = ({ size }: InputBaseProps): CSSInterpolation => {
   if (equals(size, 'compact')) {
     return {
-      fontSize: 'x-small',
       minHeight: '32px'
     };
   }
@@ -123,6 +121,7 @@ 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,
@@ -189,7 +188,10 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
     },
     MuiInputBase: {
       styleOverrides: {
-        root: ({ ownerState }) => getInputBaseInputStyle(ownerState)
+        root: ({ ownerState, theme }) => ({
+          ...getInputBaseInputStyle(ownerState),
+          backgroundColor: theme.palette.background.paper
+        })
       }
     },
     MuiList: {

package/src/TopCounterElements/index.tsx

@@ -1,7 +1,6 @@
 export { default as TopCounterLayout } from './TopCounterLayout';
 export { default as TopCounterResourceCounters } from './ResourceCounters';
 export { default as TopCounterResourceSubMenu } from './ResourceSubMenu';
-export { default as StatusCounter } from './StatusCounter';
 export * from './formaters';
 export type { CounterProps } from './ResourceCounters';
 export type { SubMenuProps } from './ResourceSubMenu';

package/src/api/useFetchQuery/index.ts

@@ -90,14 +90,6 @@ const useFetchQuery = <T extends object>({
     }
   };
 
-  useEffect(() => {
-    return (): void => {
-      queryClient.cancelQueries(getQueryKey());
-    };
-  }, []);
-
-  manageError();
-
   const prefetchQuery = ({ endpointParams, queryKey }): void => {
     queryClient.prefetchQuery(
       queryKey,
@@ -162,6 +154,16 @@ const useFetchQuery = <T extends object>({
 
   const errorData = queryData.data as ResponseError | undefined;
 
+  useEffect(() => {
+    return (): void => {
+      queryClient.cancelQueries(getQueryKey());
+    };
+  }, []);
+
+  useEffect(() => {
+    manageError();
+  }, [queryData.data]);
+
   return {
     ...omit(['data'], queryData),
     data,

package/src/components/Inputs/Switch/Switch.stories.tsx

@@ -0,0 +1,22 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import Switch from './Switch';
+
+const meta: Meta<typeof Switch> = {
+  component: Switch
+};
+
+export default meta;
+type Story = StoryObj<typeof Switch>;
+
+export const notChecked: Story = {
+  args: {
+    checked: false
+  }
+};
+
+export const checked: Story = {
+  args: {
+    checked: true
+  }
+};

package/src/components/Inputs/Switch/Switch.styles.ts

@@ -0,0 +1,13 @@
+import { makeStyles } from 'tss-react/mui';
+
+export const useSwitchStyles = makeStyles()((theme) => ({
+  switch: {
+    '& .MuiSwitch-thumb': {
+      backgroundColor: theme.palette.common.white
+    },
+    '& span[data-checked="true"] + .MuiSwitch-track': {
+      backgroundColor: theme.palette.success.main,
+      opacity: 1
+    }
+  }
+}));

package/src/components/Inputs/Switch/Switch.tsx

@@ -0,0 +1,18 @@
+import { SwitchProps, Switch as MuiSwitch } from '@mui/material';
+
+import { useSwitchStyles } from './Switch.styles';
+
+const Switch = ({ checked, ...props }: SwitchProps): JSX.Element => {
+  const { classes } = useSwitchStyles();
+
+  return (
+    <MuiSwitch
+      checked={checked}
+      className={classes.switch}
+      data-checked={checked}
+      {...props}
+    />
+  );
+};
+
+export default Switch;

package/src/components/Inputs/index.ts

@@ -0,0 +1 @@
+export { default as Switch } from './Switch/Switch';

package/src/components/Modal/Modal.styles.ts

@@ -48,10 +48,12 @@ const useStyles = makeStyles<{
     }
   },
   modalActions: {
+    bottom: 0,
     display: 'flex',
     flexDirection: 'row',
     gap: theme.spacing(2),
-    justifyContent: 'flex-end'
+    justifyContent: 'flex-end',
+    position: 'sticky'
   },
   modalBody: {
     '& > p': {

package/src/components/index.ts

@@ -10,3 +10,4 @@ export * from './List';
 export * from './ItemComposition';
 export * from './Avatar';
 export * from './CollapsibleItem';
+export * from './Inputs';