@centreon/ui 24.7.6 → 24.7.7

package/src/Listing/Cell/DataCell.styles.ts

@@ -0,0 +1,27 @@
+import { makeStyles } from 'tss-react/mui';
+
+const useStyles = makeStyles()((theme) => ({
+  cell: {
+    alignItems: 'center',
+    display: 'flex',
+    height: '100%',
+    overflow: 'hidden',
+    whiteSpace: 'nowrap'
+  },
+  clickable: {
+    cursor: 'default'
+  },
+  componentColumn: {
+    width: theme.spacing(2.75)
+  },
+  rowNotHovered: {
+    color: theme.palette.text.secondary
+  },
+  text: {
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap'
+  }
+}));
+
+export { useStyles };

package/src/Listing/Cell/DataCell.tsx

@@ -1,13 +1,11 @@
 import { memo } from 'react';
 
 import { equals, props } from 'ramda';
-import { makeStyles } from 'tss-react/mui';
 
 import { Tooltip } from '@mui/material';
 
 import { ListingVariant } from '@centreon/ui-context';
 
-import DraggableIcon from '../Header/SortableCell/DraggableIcon';
 import {
   Column,
   ColumnType,
@@ -17,46 +15,24 @@ import {
 import useStyleTable from '../useStyleTable';
 
 import EllipsisTypography from './EllipsisTypography';
+import { useStyles } from './DataCell.styles';
 
 import Cell from '.';
 
 interface Props {
-  areColumnsEditable: boolean;
   column: Column;
   disableRowCondition: (row) => boolean;
   getHighlightRowCondition?: (row) => boolean;
   isRowHovered: boolean;
   isRowSelected: boolean;
+  labelCollapse?: string;
+  labelExpand?: string;
+  listingVariant?: ListingVariant;
   row?;
   rowColorConditions?: Array<RowColorCondition>;
-  viewMode?: ListingVariant;
+  subItemsRowProperty?: string;
 }
 
-const useStyles = makeStyles()((theme) => ({
-  cell: {
-    alignItems: 'center',
-    backgroundColor: 'transparent',
-    display: 'flex',
-    height: '100%',
-    overflow: 'hidden',
-    whiteSpace: 'nowrap'
-  },
-  componentColumn: {
-    width: theme.spacing(2.75)
-  },
-  headerCell: {
-    padding: theme.spacing(0, 0, 0, 1)
-  },
-  rowNotHovered: {
-    color: theme.palette.text.secondary
-  },
-  text: {
-    overflow: 'hidden',
-    textOverflow: 'ellipsis',
-    whiteSpace: 'nowrap'
-  }
-}));
-
 const DataCell = ({
   row,
   column,
@@ -64,26 +40,31 @@ const DataCell = ({
   isRowHovered,
   rowColorConditions,
   disableRowCondition,
-  viewMode,
+  listingVariant,
   getHighlightRowCondition,
-  areColumnsEditable
+  subItemsRowProperty,
+  labelCollapse,
+  labelExpand
 }: Props): JSX.Element | null => {
-  const { dataStyle } = useStyleTable({ viewMode });
-  const { classes } = useStyles();
+  const { classes, cx } = useStyles();
+  const { dataStyle } = useStyleTable({ listingVariant });
 
   const commonCellProps = {
-    align: 'left' as const,
     disableRowCondition,
+    displaySubItemsCaret: column.displaySubItemsCaret,
     isRowHovered,
+    labelCollapse,
+    labelExpand,
     row,
-    rowColorConditions
+    rowColorConditions,
+    subItemsRowProperty
   };
 
   const isRowHighlighted = getHighlightRowCondition?.(row);
 
   const cellByColumnType = {
     [ColumnType.string]: (): JSX.Element => {
-      const { getFormattedString, isTruncated, getColSpan } = column;
+      const { getFormattedString, isTruncated, getColSpan, align } = column;
 
       const colSpan = getColSpan?.(isRowSelected);
 
@@ -102,25 +83,24 @@ const DataCell = ({
 
       return (
         <Cell
+          className={classes.cell}
           isRowHighlighted={isRowHighlighted}
+          listingVariant={listingVariant}
           style={{
+            alignItems: align,
             gridColumn
           }}
-          viewMode={viewMode}
           {...commonCellProps}
         >
           {isTruncated && (
             <Tooltip title={formattedString}>{typography}</Tooltip>
           )}
-          <>
-            {areColumnsEditable && <DraggableIcon />}
-            {!isTruncated && typography}
-          </>
+          {!isTruncated && typography}
         </Cell>
       );
     },
     [ColumnType.component]: (): JSX.Element | null => {
-      const { getHiddenCondition, clickable } = column;
+      const { getHiddenCondition, clickable, align } = column;
       const Component = column.Component as (
         props: ComponentColumnProps
       ) => JSX.Element;
@@ -128,13 +108,31 @@ const DataCell = ({
       const isCellHidden = getHiddenCondition?.(isRowSelected);
 
       if (isCellHidden) {
-        return null;
+        return (
+          <Cell
+            className={classes.cell}
+            isRowHighlighted={isRowHighlighted}
+            listingVariant={listingVariant}
+            onClick={(e): void => {
+              if (!clickable) {
+                return;
+              }
+              e.preventDefault();
+              e.stopPropagation();
+            }}
+            {...commonCellProps}
+          />
+        );
       }
 
       return (
         <Cell
+          className={cx(classes.cell, clickable && classes.clickable)}
           isRowHighlighted={isRowHighlighted}
-          viewMode={viewMode}
+          listingVariant={listingVariant}
+          style={{
+            alignItems: align
+          }}
           onClick={(e): void => {
             if (!clickable) {
               return;
@@ -144,31 +142,25 @@ const DataCell = ({
           }}
           {...commonCellProps}
         >
-          <>
-            {areColumnsEditable && (
-              <DraggableIcon className={classes.componentColumn} />
-            )}
-
-            <Component
-              isHovered={isRowHovered}
-              isSelected={isRowSelected}
-              renderEllipsisTypography={({
-                className,
-                formattedString
-              }): JSX.Element => {
-                return (
-                  <EllipsisTypography
-                    className={className}
-                    dataStyle={dataStyle}
-                    disableRowCondition={disableRowCondition(row)}
-                    formattedString={formattedString}
-                    isRowHovered={isRowHovered}
-                  />
-                );
-              }}
-              row={row}
-            />
-          </>
+          <Component
+            isHovered={isRowHovered}
+            isSelected={isRowSelected}
+            renderEllipsisTypography={({
+              className,
+              formattedString
+            }): JSX.Element => {
+              return (
+                <EllipsisTypography
+                  className={className}
+                  dataStyle={dataStyle}
+                  disableRowCondition={disableRowCondition(row)}
+                  formattedString={formattedString}
+                  isRowHovered={isRowHovered}
+                />
+              );
+            }}
+            row={row}
+          />
         </Cell>
       );
     }
@@ -248,7 +240,7 @@ const MemoizedDataCell = memo<Props>(
 
     // Explicitely prevent the component from rendering.
     if (nextRenderComponentCondition === false) {
-      return equals(prevProps.viewMode, nextProps.viewMode);
+      return equals(prevProps.listingVariant, nextProps.listingVariant);
     }
 
     const previousRowProps = previousRowMemoProps
@@ -259,6 +251,7 @@ const MemoizedDataCell = memo<Props>(
       : nextProps.row;
 
     return (
+      equals(prevProps.row, nextProps.row) &&
       equals(previousIsComponentHovered, nextIsComponentHovered) &&
       equals(prevProps.isRowHovered, nextProps.isRowHovered) &&
       equals(previousFormattedString, nextFormattedString) &&
@@ -280,8 +273,8 @@ const MemoizedDataCell = memo<Props>(
         nextProps.disableRowCondition(nextProps.row)
       ) &&
       equals(previousIsRowHighlighted, nextIsRowHighlighted) &&
-      equals(prevProps.viewMode, nextProps.viewMode) &&
-      equals(prevProps.areColumnsEditable, nextProps.areColumnsEditable)
+      equals(prevProps.listingVariant, nextProps.listingVariant) &&
+      equals(prevProps.subItemsRowProperty, nextProps.subItemsRowProperty)
     );
   }
 );

package/src/Listing/Cell/index.tsx

@@ -1,9 +1,11 @@
 import * as React from 'react';
 
-import { isNil, omit } from 'ramda';
+import { append, equals, includes, isNil, omit, reject } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 import { CSSObject } from 'tss-react';
+import { useAtom } from 'jotai';
 
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import {
   alpha,
   TableCell,
@@ -14,7 +16,9 @@ import {
 
 import { ListingVariant } from '@centreon/ui-context';
 
+import { IconButton } from '../..';
 import { getTextStyleByViewMode } from '../useStyleTable';
+import { subItemsPivotsAtom } from '../tableAtoms';
 
 import { Props as DataCellProps } from './DataCell';
 
@@ -50,7 +54,7 @@ const getBackgroundColor = ({
 
 interface StylesProps extends Props {
   isRowHighlighted?: boolean;
-  viewMode?: ListingVariant;
+  listingVariant?: ListingVariant;
 }
 
 interface GetRowHighlightStyleProps {
@@ -77,9 +81,20 @@ const useStyles = makeStyles<StylesProps>()(
       rowColorConditions,
       disableRowCondition,
       isRowHighlighted,
-      viewMode
+      listingVariant
     }
   ) => ({
+    caret: {
+      transition: theme.transitions.create('transform', {
+        duration: theme.transitions.duration.short
+      })
+    },
+    caretLess: {
+      transform: 'rotate3d(0,0,1,0deg)'
+    },
+    caretMore: {
+      transform: 'rotate3d(0,0,1,180deg)'
+    },
     root: {
       alignItems: 'center',
       backgroundColor: getBackgroundColor({
@@ -97,9 +112,9 @@ const useStyles = makeStyles<StylesProps>()(
       },
       height: '100%',
       overflow: 'hidden',
-      ...getTextStyleByViewMode({ theme, viewMode }),
+      ...getTextStyleByViewMode({ listingVariant, theme }),
       p: getRowHighlightStyle({ isRowHighlighted, theme }),
-      padding: 0,
+      padding: theme.spacing(0, 1),
       whiteSpace: 'nowrap'
     }
   })
@@ -111,15 +126,57 @@ interface Props
       'isRowHovered' | 'row' | 'rowColorConditions' | 'disableRowCondition'
     >,
     TableCellProps {
+  displaySubItemsCaret?: boolean;
   isRowHighlighted?: boolean;
-  viewMode?: ListingVariant;
+  labelCollapse?: string;
+  labelExpand?: string;
+  listingVariant?: ListingVariant;
+  subItemsRowProperty?: string;
 }
 
-const Cell = (props: Props): JSX.Element => {
+const isPivotExistInTheList = (
+  id
+): ((list: Array<number | string>) => boolean) => includes(id);
+
+const handleSubItems = ({
+  currentSubItemsPivots,
+  id
+}): Array<number | string> => {
+  if (isPivotExistInTheList(id)(currentSubItemsPivots)) {
+    return reject(equals(id), currentSubItemsPivots);
+  }
+
+  return append(id, currentSubItemsPivots);
+};
+
+const Cell = ({
+  displaySubItemsCaret,
+  subItemsRowProperty,
+  labelCollapse,
+  labelExpand,
+  ...props
+}: Props): JSX.Element => {
   const { classes, cx } = useStyles(props);
 
+  const [subItemsPivots, setSubItemsPivots] = useAtom(subItemsPivotsAtom);
+
   const { children } = props;
 
+  const rowId = props.row?.id;
+
+  const click = (e): void => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    setSubItemsPivots((currentSubItemsPivots) =>
+      handleSubItems({ currentSubItemsPivots, id: rowId })
+    );
+  };
+
+  const isSubItemsExpanded = isPivotExistInTheList(rowId)(subItemsPivots);
+
+  const hasSubItems = subItemsRowProperty && props.row[subItemsRowProperty];
+
   return (
     <TableCell
       classes={{
@@ -133,11 +190,28 @@ const Cell = (props: Props): JSX.Element => {
           'rowColorConditions',
           'disableRowCondition',
           'isRowHighlighted',
-          'viewMode'
+          'listingVariant'
         ],
         props
       )}
     >
+      {displaySubItemsCaret && hasSubItems && (
+        <IconButton
+          ariaLabel={`${isSubItemsExpanded ? labelCollapse : labelExpand} ${
+            props.row.id
+          }`}
+          size="small"
+          onClick={click}
+        >
+          <ExpandMoreIcon
+            className={cx(
+              classes.caret,
+              isSubItemsExpanded ? classes.caretMore : classes.caretLess
+            )}
+            fontSize="small"
+          />
+        </IconButton>
+      )}
       {children}
     </TableCell>
   );

package/src/Listing/EmptyResult/EmptyResult.tsx

@@ -0,0 +1,13 @@
+import React from 'react';
+
+import { EmptyRow } from '../Row/EmptyRow';
+
+interface EmptyResultProps {
+  label: string;
+}
+
+const EmptyResult = ({ label }: EmptyResultProps): JSX.Element => (
+  <EmptyRow>{label}</EmptyRow>
+);
+
+export { EmptyResult };

package/src/Listing/Header/Cell/ListingHeaderCell.styles.ts

@@ -0,0 +1,71 @@
+import { makeStyles } from 'tss-react/mui';
+
+import { ListingVariant } from '@centreon/ui-context';
+
+import { getTextStyleByViewMode } from '../../useStyleTable';
+
+interface StylesProps {
+  isDragging?: boolean;
+  isInDragOverlay?: boolean;
+  listingVariant?: ListingVariant;
+}
+
+const useStyles = makeStyles<StylesProps>()(
+  (theme, { isDragging, isInDragOverlay, listingVariant }) => ({
+    active: {
+      '&, &:hover, &:focus': {
+        color: theme.palette.common.white
+      },
+      '&.Mui-active': {
+        '& .MuiTableSortLabel-icon': {
+          color: theme.palette.common.white
+        },
+        color: theme.palette.common.white
+      }
+    },
+    content: {
+      alignItems: 'center',
+      borderRadius: isDragging && isInDragOverlay ? theme.spacing(0.5) : 0,
+      color: theme.palette.common.white,
+      display: 'flex',
+      height: '100%',
+      justifyContent: 'space-between'
+    },
+    dragHandle: {
+      '&, &.Mui-focus, &:focus': {
+        color: theme.palette.common.white
+      },
+      color: theme.palette.common.white,
+
+      cursor: isDragging ? 'grabbing' : 'grab',
+      opacity: 0,
+      padding: 0
+    },
+    simpleHeaderCellContent: {
+      alignItems: 'center',
+      display: 'inline-flex',
+      marginRight: theme.spacing(2),
+      userSelect: 'none'
+    },
+    tableCell: {
+      backgroundColor: isInDragOverlay
+        ? 'transparent'
+        : theme.palette.background.listingHeader,
+      borderBottom: 'none',
+      height: 'inherit',
+      padding: theme.spacing(0, 1),
+      ...getTextStyleByViewMode({ listingVariant, theme }),
+      '&:hover, &:focus-within, &[data-isdragging=true]': {
+        '& .dragHandle': {
+          opacity: 1
+        }
+      },
+      '&[data-isindragoverlay=true]': {
+        display: 'block',
+        opacity: 0.7
+      }
+    }
+  })
+);
+
+export { useStyles, StylesProps };

package/src/Listing/Header/{SortableCell/Content.tsx → Cell/ListingHeaderCell.tsx}

@@ -1,7 +1,6 @@
 import * as React from 'react';
 
 import { always, and, equals, ifElse, isNil } from 'ramda';
-import { makeStyles } from 'tss-react/mui';
 
 import {
   TableCell,
@@ -10,61 +9,12 @@ import {
   Tooltip
 } from '@mui/material';
 
-import { ListingVariant } from '@centreon/ui-context';
-
 import { Props as ListingProps } from '../..';
 import { Column } from '../../models';
-import HeaderLabel from '../Label';
-import { getTextStyleByViewMode } from '../../useStyleTable';
-
-import DraggableIcon from './DraggableIcon';
-
-type StylesProps = Pick<Props, 'isDragging' | 'isInDragOverlay' | 'viewMode'>;
+import HeaderLabel from '../_internals/Label';
+import { DraggableIconButton } from '../_internals/DraggableIconButton';
 
-const useStyles = makeStyles<StylesProps>()(
-  (theme, { isDragging, isInDragOverlay, viewMode }) => ({
-    active: {
-      '&.Mui-active': {
-        '& .MuiTableSortLabel-icon': {
-          color: theme.palette.common.white
-        },
-        color: theme.palette.common.white
-      },
-      '&:hover': {
-        '& .MuiTableSortLabel-icon': {
-          opacity: 1
-        },
-        color: theme.palette.common.white
-      }
-    },
-    content: {
-      alignItems: 'center',
-      borderRadius: isDragging && isInDragOverlay ? theme.spacing(0.5) : 0,
-      color: theme.palette.common.white,
-      display: 'flex',
-      minHeight: theme.spacing(3)
-    },
-    dragHandle: {
-      alignSelf: 'center',
-      cursor: isDragging ? 'grabbing' : 'grab',
-      display: 'flex',
-      outline: 'none'
-    },
-    simpleHeaderCellContent: {
-      alignItems: 'center',
-      display: 'inline-flex',
-      marginRight: theme.spacing(2)
-    },
-    tableCell: {
-      backgroundColor: isInDragOverlay
-        ? 'transparent'
-        : theme.palette.background.listingHeader,
-      borderBottom: 'none',
-      padding: 0,
-      ...getTextStyleByViewMode({ theme, viewMode })
-    }
-  })
-);
+import { StylesProps, useStyles } from './ListingHeaderCell.styles';
 
 type Props = Pick<
   ListingProps<unknown>,
@@ -73,14 +23,11 @@ type Props = Pick<
   areColumnsEditable: boolean;
   className: string;
   column: Column;
-  isDragging?: boolean;
-  isInDragOverlay?: boolean;
   itemRef: React.RefObject<HTMLDivElement>;
   style;
-  viewMode?: ListingVariant;
-};
+} & StylesProps;
 
-const SortableHeaderCellContent = ({
+const ListingHeaderCell = ({
   column,
   columnConfiguration,
   sortField,
@@ -91,16 +38,14 @@ const SortableHeaderCellContent = ({
   style,
   isInDragOverlay,
   areColumnsEditable,
-  viewMode,
+  listingVariant,
   ...props
 }: Props): JSX.Element => {
   const { classes, cx } = useStyles({
     isDragging,
     isInDragOverlay,
-    viewMode
+    listingVariant
   });
-  const [cellHovered, setCellHovered] = React.useState(false);
-
   const columnLabel = column.shortLabel || column.label;
 
   const columnSortField = column.sortField || column.id;
@@ -119,14 +64,6 @@ const SortableHeaderCellContent = ({
     });
   };
 
-  const mouseOver = (): void => {
-    setCellHovered(true);
-  };
-
-  const mouseOut = (): void => {
-    setCellHovered(false);
-  };
-
   const headerContent = (
     <Tooltip placement="top" title={getTooltipLabel(column.shortLabel)}>
       <HeaderLabel>{columnLabel}</HeaderLabel>
@@ -137,22 +74,12 @@ const SortableHeaderCellContent = ({
     <TableCell
       className={classes.tableCell}
       component={'div' as unknown as React.ElementType<TableCellBaseProps>}
+      data-isdragging={isDragging}
+      data-isindragoverlay={isInDragOverlay}
       ref={itemRef}
       style={style}
-      onMouseOut={mouseOut}
-      onMouseOver={mouseOver}
     >
       <div className={classes.content}>
-        {columnConfiguration?.sortable && areColumnsEditable && (
-          <DraggableIcon
-            visible={cellHovered}
-            {...props}
-            isInteractive
-            className={cx({ [classes.dragHandle]: cellHovered })}
-            columnLabel={columnLabel}
-          />
-        )}
-
         {column.sortable ? (
           <TableSortLabel
             active={sortField === columnSortField}
@@ -166,9 +93,17 @@ const SortableHeaderCellContent = ({
         ) : (
           <div className={classes.simpleHeaderCellContent}>{headerContent}</div>
         )}
+
+        {columnConfiguration?.sortable && areColumnsEditable && (
+          <DraggableIconButton
+            {...props}
+            className={cx(classes.dragHandle, 'dragHandle')}
+            columnLabel={columnLabel}
+          />
+        )}
       </div>
     </TableCell>
   );
 };
 
-export default SortableHeaderCellContent;
+export default ListingHeaderCell;