@centreon/ui 24.11.14 → 24.11.21

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

@@ -1,33 +1,39 @@
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 import {
   equals,
-  prop,
-  last,
+  has,
   isEmpty,
-  map,
   isNil,
-  pipe,
+  last,
+  map,
   not,
-  has,
-  omit
+  omit,
+  pipe,
+  prop,
+  uniqBy
 } from 'ramda';
 
 import { CircularProgress, useTheme } from '@mui/material';
 
 import { Props as AutocompleteFieldProps } from '..';
-import useIntersectionObserver from '../../../../utils/useIntersectionObserver';
 import { ListingModel, SelectEntry } from '../../../..';
-import Option from '../../Option';
 import {
   ConditionsSearchParameter,
   SearchParameter
 } from '../../../../api/buildListingEndpoint/models';
-import useDebounce from '../../../../utils/useDebounce';
 import useFetchQuery from '../../../../api/useFetchQuery';
-import { useDeepCompare } from '../../../../utils/useMemoComponent';
+import {
+  useDebounce,
+  useDeepCompare,
+  useIntersectionObserver
+} from '../../../../utils';
+import Option from '../../Option';
 
 export interface ConnectedAutoCompleteFieldProps<TData> {
+  allowUniqOption?: boolean;
+  baseEndpoint?: string;
+  changeIdValue: (item: TData) => number | string;
   conditionField?: keyof SelectEntry;
   field: string;
   getEndpoint: ({ search, page }) => string;
@@ -35,6 +41,7 @@ export interface ConnectedAutoCompleteFieldProps<TData> {
   getRequestHeaders?: HeadersInit;
   initialPage: number;
   labelKey?: string;
+  queryKey?: string;
   searchConditions?: Array<ConditionsSearchParameter>;
 }
 
@@ -53,6 +60,10 @@ const ConnectedAutocompleteField = (
     getRenderedOptionText = (option): string => option.name?.toString(),
     getRequestHeaders,
     displayOptionThumbnail,
+    queryKey,
+    allowUniqOption,
+    baseEndpoint,
+    changeIdValue,
     ...props
   }: ConnectedAutoCompleteFieldProps<TData> &
     Omit<AutocompleteFieldProps, 'options'>): JSX.Element => {
@@ -63,6 +74,9 @@ const ConnectedAutocompleteField = (
     const [searchParameter, setSearchParameter] = useState<
       SearchParameter | undefined
     >(undefined);
+
+    const [autocompleteChangedValue, setAutocompleteChangedValue] =
+      useState<Array<SelectEntry>>();
     const debounce = useDebounce({
       functionToDebounce: (value): void => {
         setSearchParameter(getSearchParameter(value));
@@ -77,6 +91,7 @@ const ConnectedAutocompleteField = (
     const { fetchQuery, isFetching, prefetchNextPage } = useFetchQuery<
       ListingModel<TData>
     >({
+      baseEndpoint,
       fetchHeaders: getRequestHeaders,
       getEndpoint: (params) => {
         return getEndpoint({
@@ -84,10 +99,16 @@ const ConnectedAutocompleteField = (
           search: searchParameter
         });
       },
-      getQueryKey: () => [`autocomplete-${props.label}`, page, searchParameter],
+      getQueryKey: () => [
+        `autocomplete-${queryKey || props.label}`,
+        page,
+        searchParameter
+      ],
       isPaginated: true,
       queryOptions: {
+        cacheTime: 0,
         enabled: false,
+        staleTime: 0,
         suspense: false
       }
     });
@@ -219,17 +240,24 @@ const ConnectedAutocompleteField = (
 
         const moreOptions = page > 1 ? options : [];
 
+        const formattedList = changeIdValue
+          ? newOptions.result.map((item) => ({
+              ...item,
+              id: changeIdValue(item)
+            }))
+          : newOptions.result;
+
         if (!isEmpty(labelKey) && !isNil(labelKey)) {
-          const list = newOptions.result.map((item) =>
+          const list = formattedList.map((item) =>
             renameKey({ key: labelKey, newKey: 'name', object: item })
           );
           setOptions(moreOptions.concat(list as Array<TData>));
 
           return;
         }
-        setOptions(moreOptions.concat(newOptions.result));
+        setOptions(moreOptions.concat(formattedList));
 
-        setOptions(moreOptions.concat(newOptions.result as Array<TData>));
+        setOptions(moreOptions.concat(formattedList as Array<TData>));
 
         const total = prop('total', newOptions.meta) || 1;
         const limit = prop('limit', newOptions.meta) || 1;
@@ -264,13 +292,23 @@ const ConnectedAutocompleteField = (
       }
     }, [optionsOpen]);
 
+    useEffect(
+      () => {
+        setSearchParameter(
+          !isEmpty(searchConditions)
+            ? { conditions: searchConditions }
+            : undefined
+        );
+      },
+      useDeepCompare([searchConditions])
+    );
+
     useEffect(() => {
-      setSearchParameter(
-        !isEmpty(searchConditions)
-          ? { conditions: searchConditions }
-          : undefined
-      );
-    }, useDeepCompare([searchConditions]));
+      if (!autocompleteChangedValue && !props?.value) {
+        return;
+      }
+      setSearchParameter(undefined);
+    }, [autocompleteChangedValue, props?.value]);
 
     useEffect(() => {
       if (!optionsOpen) {
@@ -285,8 +323,11 @@ const ConnectedAutocompleteField = (
         filterOptions={(opt): SelectEntry => opt}
         loading={isFetching}
         open={optionsOpen}
-        options={options}
+        options={
+          allowUniqOption ? uniqBy(getRenderedOptionText, options) : options
+        }
         renderOption={renderOptions}
+        onChange={(_, value) => setAutocompleteChangedValue(value)}
         onClose={(): void => setOptionsOpen(false)}
         onOpen={(): void => setOptionsOpen(true)}
         onTextChange={changeText}

package/src/InputField/Select/Autocomplete/Draggable/MultiConnected.tsx

@@ -1,5 +1,5 @@
-import MultiAutocompleteField from '../Multi';
 import ConnectedAutocompleteField from '../Connected';
+import MultiAutocompleteField from '../Multi';
 
 import DraggableAutocompleteField from '.';
 

package/src/InputField/Select/Autocomplete/Draggable/SortableList.tsx

@@ -1,6 +1,6 @@
-import { map, find, propEq } from 'ramda';
 import { rectIntersection } from '@dnd-kit/core';
 import { rectSortingStrategy } from '@dnd-kit/sortable';
+import { find, map, propEq } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 
 import { lighten } from '@mui/material';
@@ -49,7 +49,7 @@ const SortableList = ({
   const dragEnd = ({ items: newItems }): void =>
     changeItemsOrder(
       map(
-        (item) => find(propEq('id', item), items),
+        (item) => find(propEq(item, 'id'), items),
         newItems
       ) as Array<DraggableSelectEntry>
     );

package/src/InputField/Select/Autocomplete/Draggable/SortableListContent.tsx

@@ -1,11 +1,10 @@
-import * as React from 'react';
-
-import { findIndex, not, propEq } from 'ramda';
 import { DraggableSyntheticListeners } from '@dnd-kit/core';
 import clsx from 'clsx';
+import { findIndex, not, propEq } from 'ramda';
 
 import { Chip, Typography, useTheme } from '@mui/material';
 
+import { RefObject, useRef } from 'react';
 import { DraggableSelectEntry, SortableListProps } from './SortableList';
 
 interface ContentProps
@@ -14,7 +13,7 @@ interface ContentProps
   id: string;
   index: number;
   isDragging: boolean;
-  itemRef: React.RefObject<HTMLDivElement>;
+  itemRef: RefObject<HTMLDivElement>;
   listeners: DraggableSyntheticListeners;
   style;
 }
@@ -42,14 +41,14 @@ const SortableListContent = ({
     isDragging
   }: ContentProps): JSX.Element => {
     const theme = useTheme();
-    const labelItemRef = React.useRef<HTMLElement | null>(null);
+    const labelItemRef = useRef<HTMLElement | null>(null);
 
-    const mouseUp = (event: React.MouseEvent): void => {
+    const mouseUp = (event: MouseEvent): void => {
       if (not(event.shiftKey)) {
         return;
       }
 
-      const itemIndex = findIndex(propEq('id', id), items);
+      const itemIndex = findIndex(propEq(id, 'id'), items);
 
       itemHover?.(null);
       itemClick?.({ index: itemIndex, item: { createOption, id, name } });

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

@@ -1,7 +1,6 @@
 import { useState } from 'react';
 
 import { isNil, not } from 'ramda';
-import withMock from 'storybook-addon-mock';
 
 import { Tooltip, Typography } from '@mui/material';
 
@@ -9,13 +8,12 @@ import { SelectEntry } from '../..';
 import { buildListingEndpoint } from '../../../..';
 import { Listing } from '../../../../api/models';
 
-import MultiDraggableConnectedAutocompleteField from './MultiConnected';
 import MultiDraggableAutocompleteField from './Multi';
+import MultiDraggableConnectedAutocompleteField from './MultiConnected';
 
 import { ItemActionProps } from '.';
 
 export default {
-  decorators: [withMock],
   title: 'InputField/Autocomplete/Draggable'
 };
 
@@ -51,7 +49,7 @@ const mockSearch = (page: number): object => ({
   response: (request): Listing<SelectEntry> => {
     const { searchParams } = request;
 
-    return buildResult(parseInt(searchParams.page || '0', 10));
+    return buildResult(Number.parseInt(searchParams.page || '0', 10));
   },
   status: 200,
   url: `/endpoint?page=${page}&search=`
@@ -64,7 +62,7 @@ const getMockData = (): Array<object> => [
     response: (request): Listing<SelectEntry> => {
       const { searchParams } = request;
 
-      return buildResult(parseInt(searchParams.page || '0', 10));
+      return buildResult(Number.parseInt(searchParams.page || '0', 10));
     },
     status: 200,
     url: '/endpoint?page='
@@ -76,9 +74,9 @@ const getMockData = (): Array<object> => [
 ];
 
 const options = [
-  { id: `0`, name: 'First Entity' },
-  { id: `1`, name: 'Second Entity' },
-  { id: `2`, name: 'Third Entity' }
+  { id: '0', name: 'First Entity' },
+  { id: '1', name: 'Second Entity' },
+  { id: '2', name: 'Third Entity' }
 ];
 
 const MultiDraggable = (): JSX.Element => (

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

@@ -1,28 +1,27 @@
-import * as React from 'react';
-
 import {
-  remove,
+  F,
   equals,
-  pipe,
-  type,
-  last,
+  findIndex,
   inc,
-  F,
-  length,
   isEmpty,
   isNil,
+  last,
+  length,
   not,
-  findIndex,
+  pipe,
+  pluck,
   propEq,
-  pluck
+  remove,
+  type
 } from 'ramda';
 
 import { Typography } from '@mui/material';
 
-import { ConnectedAutoCompleteFieldProps } from '../Connected';
 import { Props as SingleAutocompletefieldProps } from '..';
 import TextField from '../../../Text';
+import { ConnectedAutoCompleteFieldProps } from '../Connected';
 
+import { ChangeEvent, useEffect, useState } from 'react';
 import SortableList, { DraggableSelectEntry } from './SortableList';
 
 export interface ItemActionProps {
@@ -61,13 +60,13 @@ const DraggableAutocomplete = (
       | ConnectedAutoCompleteFieldProps<string>
       | SingleAutocompletefieldProps
     )): JSX.Element => {
-    const [selectedValues, setSelectedValues] = React.useState<
+    const [selectedValues, setSelectedValues] = useState<
       Array<DraggableSelectEntry>
     >(initialValues || []);
-    const [totalValues, setTotalValues] = React.useState<number>(
+    const [totalValues, setTotalValues] = useState<number>(
       length(initialValues || [])
     );
-    const [inputText, setInputText] = React.useState<string | null>(null);
+    const [inputText, setInputText] = useState<string | null>(null);
 
     const onChangeSelectedValuesOrder = (newSelectedValues): void => {
       setSelectedValues(newSelectedValues);
@@ -77,7 +76,7 @@ const DraggableAutocomplete = (
     const deleteValue = (id): void => {
       itemHover?.(null);
       setSelectedValues((values: Array<DraggableSelectEntry>) => {
-        const index = findIndex(propEq('id', id), values);
+        const index = findIndex(propEq(id, 'id'), values);
 
         const newSelectedValues = remove(index, 1, values);
 
@@ -144,7 +143,7 @@ const DraggableAutocomplete = (
       );
     };
 
-    const changeInput = (e: React.ChangeEvent<HTMLInputElement>): void => {
+    const changeInput = (e: ChangeEvent<HTMLInputElement>): void => {
       if (pipe(isNil, not)(e)) {
         setInputText(e.target.value);
       }
@@ -193,7 +192,7 @@ const DraggableAutocomplete = (
       />
     );
 
-    React.useEffect(() => {
+    useEffect(() => {
       if (isNil(initialValues)) {
         return;
       }

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

@@ -1,7 +1,7 @@
-import { includes, map, prop, reject } from 'ramda';
+import { compose, includes, map, prop, reject, sortBy, toLower } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 
-import { Chip } from '@mui/material';
+import { Chip, ChipProps, Tooltip } 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,30 +32,48 @@ export interface Props
       UseAutocompleteProps<SelectEntry, Multiple, DisableClearable, FreeSolo>,
       'multiple'
     > {
+  chipProps?: ChipProps;
   disableSortedOptions?: boolean;
+  getOptionTooltipLabel?: (option) => string;
+  getTagLabel?: (option) => string;
+  optionProperty?: string;
 }
 
 const MultiAutocompleteField = ({
   value,
   options,
   disableSortedOptions = false,
+  optionProperty = 'name',
+  getOptionLabel = (option): string => option.name,
+  getTagLabel = (option): string => option[optionProperty],
+  getOptionTooltipLabel,
+  chipProps,
   ...props
 }: Props): JSX.Element => {
   const { classes } = useStyles();
 
   const renderTags = (renderedValue, getTagProps): Array<JSX.Element> =>
-    renderedValue.map((option, index) => (
-      <Chip
-        classes={{
-          deleteIcon: classes.deleteIcon,
-          root: classes.tag
-        }}
-        key={option.id}
-        label={option.name}
-        size="medium"
-        {...getTagProps({ index })}
-      />
-    ));
+    renderedValue.map((option, index) => {
+      return (
+        <Tooltip
+          key={option.id}
+          placement="top"
+          title={getOptionTooltipLabel?.(option)}
+        >
+          <Chip
+            classes={{
+              deleteIcon: classes.deleteIcon,
+              root: classes.tag
+            }}
+            label={getTagLabel(option)}
+            size="medium"
+            {...getTagProps({ index })}
+            {...chipProps}
+            onDelete={(event) => chipProps?.onDelete?.(event, option)}
+          />
+        </Tooltip>
+      );
+    });
 
   const getLimitTagsText = (more): JSX.Element => <Option>{`+${more}`}</Option>;
 
@@ -68,9 +85,11 @@ const MultiAutocompleteField = ({
     return includes(id, valueIds);
   };
 
+  const sortByName = sortBy(compose(toLower, prop(optionProperty)));
+
   const autocompleteOptions = disableSortedOptions
     ? options
-    : [...values, ...reject(isOptionSelected, options)];
+    : sortByName([...values, ...reject(isOptionSelected, options)]);
 
   return (
     <Autocomplete
@@ -84,7 +103,7 @@ const MultiAutocompleteField = ({
           key={option.id}
           {...(renderProps as React.HTMLAttributes<HTMLLIElement>)}
         >
-          <Option checkboxSelected={selected}>{option.name}</Option>
+          <Option checkboxSelected={selected}>{getOptionLabel(option)}</Option>
         </li>
       )}
       renderTags={renderTags}

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

@@ -3,8 +3,8 @@ import { useState } from 'react';
 import { equals, isEmpty } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 
-import { UseAutocompleteProps } from '@mui/material/useAutocomplete';
 import { Avatar, Chip, useTheme } from '@mui/material';
+import { UseAutocompleteProps } from '@mui/material/useAutocomplete';
 
 import { ThemeMode } from '@centreon/ui-context';
 

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

@@ -1,8 +1,7 @@
-import * as React from 'react';
-
 import EditIcon from '@mui/icons-material/Edit';
 import { InputAdornment } from '@mui/material';
 
+import { useState } from 'react';
 import AutocompleteField from '.';
 
 export default { title: 'InputField/Autocomplete' };
@@ -85,7 +84,7 @@ const AutoSizeAutocompleteField = ({
   endAdornment,
   customPadding
 }: AutoSizeAutocompleteFieldProps): JSX.Element => {
-  const [value, setValue] = React.useState(autoSizeOptions[1]);
+  const [value, setValue] = useState(null);
 
   const change = (_, newValue): void => {
     setValue(newValue);
@@ -108,12 +107,3 @@ const AutoSizeAutocompleteField = ({
 export const autoSize = (): JSX.Element => {
   return <AutoSizeAutocompleteField />;
 };
-
-export const autoSizeWithCustomPadding = (): JSX.Element => {
-  return (
-    <AutoSizeAutocompleteField
-      customPadding={5}
-      endAdornment={<EndAdornment />}
-    />
-  );
-};