@centreon/ui 24.5.0 → 24.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "24.5.0",
+  "version": "24.5.2",
   "description": "Centreon UI Components",
   "scripts": {
     "update:deps": "pnpx npm-check-updates -i --format group",

package/src/Dashboard/Item.tsx

@@ -15,7 +15,6 @@ import { useMemoComponent } from '../utils';
 import { useDashboardItemStyles } from './Dashboard.styles';
 
 interface DashboardItemProps {
-  additionalMemoProps?: Array<unknown>;
   canMove?: boolean;
   children: ReactElement;
   className?: string;
@@ -40,8 +39,7 @@ const Item = forwardRef<HTMLDivElement, DashboardItemProps>(
       onTouchEnd,
       id,
       disablePadding = false,
-      canMove = false,
-      additionalMemoProps = []
+      canMove = false
     }: DashboardItemProps,
     ref: ForwardedRef<HTMLDivElement>
   ): ReactElement => {
@@ -94,14 +92,7 @@ const Item = forwardRef<HTMLDivElement, DashboardItemProps>(
           </Card>
         </div>
       ),
-      memoProps: [
-        style,
-        className,
-        header,
-        theme.palette.mode,
-        canMove,
-        ...additionalMemoProps
-      ]
+      memoProps: [style, className, header, theme.palette.mode, canMove]
     });
   }
 );

package/src/Dashboard/Layout.tsx

@@ -16,7 +16,6 @@ import Grid from './Grid';
 const ReactGridLayout = WidthProvider(GridLayout);
 
 interface DashboardLayoutProps<T> {
-  additionalMemoProps?: Array<unknown>;
   changeLayout?: (newLayout: Array<Layout>) => void;
   children: Array<JSX.Element>;
   displayGrid?: boolean;
@@ -29,8 +28,7 @@ const DashboardLayout = <T extends Layout>({
   changeLayout,
   displayGrid,
   layout,
-  isStatic = false,
-  additionalMemoProps = []
+  isStatic = false
 }: DashboardLayoutProps<T>): JSX.Element => {
   const { classes } = useDashboardLayoutStyles(isStatic);
 
@@ -74,7 +72,7 @@ const DashboardLayout = <T extends Layout>({
         </ParentSize>
       </ResponsiveHeight>
     ),
-    memoProps: [columns, layout, displayGrid, isStatic, ...additionalMemoProps]
+    memoProps: [columns, layout, displayGrid, isStatic]
   });
 };
 

package/src/Graph/Tree/DescendantNodes.tsx

@@ -65,7 +65,6 @@ const DescendantNodes = <TData extends BaseProp>({
       <Group key={key} left={left} top={top}>
         <foreignObject
           height={nodeSize.height}
-          style={{ userSelect: 'none' }}
           width={nodeSize.width}
           x={-nodeSize.width / 2}
           y={-nodeSize.height / 2}

package/src/Graph/Tree/Links.tsx

@@ -1,10 +1,5 @@
-import {
-  LinkHorizontal,
-  LinkHorizontalStep,
-  LinkHorizontalLine
-} from '@visx/shape';
+import { LinkHorizontal } from '@visx/shape';
 import { HierarchyPointLink } from '@visx/hierarchy/lib/types';
-import { always, cond, equals, T } from 'ramda';
 
 import { useTheme } from '@mui/material';
 
@@ -14,12 +9,6 @@ interface Props<TData> extends Pick<TreeProps<TData>, 'treeLink'> {
   links: Array<HierarchyPointLink<Node<TData>>>;
 }
 
-const getLinkComponent = cond([
-  [equals('line'), always(LinkHorizontalLine)],
-  [equals('step'), always(LinkHorizontalStep)],
-  [T, always(LinkHorizontal)]
-]);
-
 const Links = <TData extends BaseProp>({
   links,
   treeLink
@@ -35,12 +24,10 @@ const Links = <TData extends BaseProp>({
       .descendants()
       .map((ancestor) => ancestor.data.data.id);
 
-    const LinkComponent = getLinkComponent(treeLink?.type);
-
     const key = `${link.source.data.data.id}-${link.source.data.data.name}-${ancestorIds}_${link.target.data.data.id}-${link.target.data.data.name}-${descendantIds}`;
 
     return (
-      <LinkComponent
+      <LinkHorizontal
         data={link}
         data-testid={`${link.source.data.data.id}_to_${link.target.data.data.id}`}
         fill="none"

package/src/Graph/Tree/Tree.cypress.spec.tsx

@@ -168,28 +168,4 @@ describe('Complex data tree', () => {
 
     cy.makeSnapshot();
   });
-
-  it('displays the tree with step links when a prop is set', () => {
-    initializeStandaloneTree({
-      treeLink: {
-        type: 'step'
-      }
-    });
-
-    cy.contains('T').should('be.visible');
-
-    cy.makeSnapshot();
-  });
-
-  it('displays the tree with line links when a prop is set', () => {
-    initializeStandaloneTree({
-      treeLink: {
-        type: 'line'
-      }
-    });
-
-    cy.contains('T').should('be.visible');
-
-    cy.makeSnapshot();
-  });
 });

package/src/Graph/Tree/Tree.stories.tsx

@@ -82,21 +82,6 @@ export const WithDefaultExpandFilter: Story = {
   render: StandaloneTreeTemplate
 };
 
-export const WithStepLink: Story = {
-  args: {
-    children: SimpleContent,
-    node: {
-      height: 90,
-      width: 90
-    },
-    tree: simpleData,
-    treeLink: {
-      type: 'step'
-    }
-  },
-  render: StandaloneTreeTemplate
-};
-
 export const WithCustomLinks: Story = {
   args: {
     children: SimpleContent,
@@ -110,8 +95,7 @@ export const WithCustomLinks: Story = {
       getStrokeDasharray: ({ target }) =>
         target.status === 'ok' ? '5,5' : '0',
       getStrokeOpacity: ({ target }) => (target.status === 'ok' ? 0.8 : 1),
-      getStrokeWidth: ({ target }) => (target.status === 'ok' ? 1 : 2),
-      type: 'line'
+      getStrokeWidth: ({ target }) => (target.status === 'ok' ? 1 : 2)
     }
   },
   render: StandaloneTreeTemplate

package/src/Graph/Tree/models.ts

@@ -14,8 +14,6 @@ export interface BaseProp {
   name: string;
 }
 
-export type Link = 'curve' | 'line' | 'step';
-
 export interface ChildrenProps<TData> {
   ancestors: Array<Node<TData>>;
   depth: number;
@@ -50,6 +48,5 @@ export interface TreeProps<TData> {
     ) => string | number | undefined;
     getStrokeOpacity?: (props: LinkProps<TData>) => string | number | undefined;
     getStrokeWidth?: (props: LinkProps<TData>) => string | number | undefined;
-    type?: Link;
   };
 }

package/src/TopCounterElements/TopCounterLayout.tsx

@@ -1,11 +1,11 @@
-import { useEffect, useState } from 'react';
+import { useState, useEffect } from 'react';
 
 import { makeStyles } from 'tss-react/mui';
 
-import ExpandLessIcon from '@mui/icons-material/ExpandLess';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import type { SvgIcon } from '@mui/material';
+import ExpandLessIcon from '@mui/icons-material/ExpandLess';
 import { Badge, ClickAwayListener } from '@mui/material';
+import type { SvgIcon } from '@mui/material';
 
 import useCloseOnLegacyPage from './useCloseOnLegacyPage';
 
@@ -115,6 +115,7 @@ const TopCounterLayout = ({
 }: TopCounterLayoutProps): JSX.Element => {
   const { classes, cx } = useStyles();
   const [toggled, setToggled] = useState(false);
+
   const subMenuId = title.replace(/[^A-Za-z]/, '-');
   useCloseOnLegacyPage({ setToggled });
 

package/src/TopCounterElements/useCloseOnLegacyPage.tsx

@@ -1,6 +1,5 @@
 import { Dispatch, SetStateAction, useEffect } from 'react';
 
-import { isNil } from 'ramda';
 import { useLocation } from 'react-router-dom';
 
 interface Props {
@@ -15,23 +14,21 @@ const useCloseOnLegacyPage = ({ setToggled }: Props): void => {
   };
 
   useEffect(() => {
-    const iframe = document.getElementById(
-      'main-content'
-    ) as HTMLIFrameElement | null;
+    const iframe = document.getElementById('main-content') as HTMLIFrameElement;
 
-    if (!isLegacyRoute || isNil(iframe)) {
+    if (!isLegacyRoute) {
       return () => undefined;
     }
 
     const closeSubMenuOnLegacyPage = (): void => {
-      iframe?.contentWindow?.document?.addEventListener('click', closeSubMenu);
+      iframe.contentWindow?.document?.addEventListener('click', closeSubMenu);
     };
 
-    iframe?.addEventListener('load', closeSubMenuOnLegacyPage);
+    iframe.addEventListener('load', closeSubMenuOnLegacyPage);
 
     return () => {
-      iframe?.removeEventListener('load', closeSubMenuOnLegacyPage);
-      iframe?.contentWindow?.document?.removeEventListener(
+      iframe.removeEventListener('load', closeSubMenuOnLegacyPage);
+      iframe.contentWindow?.document?.removeEventListener(
         'click',
         closeSubMenu
       );

package/src/api/useGraphQuery/index.ts

@@ -24,7 +24,6 @@ interface CustomTimePeriod {
 interface UseMetricsQueryProps {
   baseEndpoint: string;
   bypassMetricsExclusion?: boolean;
-  bypassQueryParams?: boolean;
   includeAllResources?: boolean;
   metrics: Array<Metric>;
   refreshCount?: number;
@@ -91,8 +90,7 @@ const useGraphQuery = ({
     timePeriodType: 1
   },
   refreshInterval = false,
-  refreshCount,
-  bypassQueryParams = false
+  refreshCount
 }: UseMetricsQueryProps): UseMetricsQueryState => {
   const timePeriodToUse = equals(timePeriod?.timePeriodType, -1)
     ? {
@@ -116,10 +114,6 @@ const useGraphQuery = ({
     isLoading
   } = useFetchQuery<PerformanceGraphData>({
     getEndpoint: () => {
-      if (bypassQueryParams) {
-        return baseEndpoint;
-      }
-
       const endpoint = buildListingEndpoint({
         baseEndpoint,
         parameters: {

package/src/components/Form/AccessRights/AccessRights.cypress.spec.tsx

@@ -15,11 +15,11 @@ import {
 
 const initialize = ({
   initialValues = simpleAccessRights,
-  loading = false
+  loading = false,
+  link = 'link'
 }): unknown => {
   const cancel = cy.stub();
   const save = cy.stub();
-  const change = cy.stub();
 
   cy.interceptAPIRequest({
     alias: 'getContacts',
@@ -47,10 +47,10 @@ const initialize = ({
               }}
               initialValues={initialValues}
               labels={labels}
+              link={link}
               loading={loading}
               roles={roles}
               submit={save}
-              onChange={change}
             />
           </Provider>
         </TestQueryProvider>
@@ -60,7 +60,6 @@ const initialize = ({
 
   return {
     cancel,
-    change,
     save
   };
 };
@@ -75,12 +74,21 @@ describe('Access rights', () => {
     cy.findByLabelText('Add a contact').should('be.visible');
     cy.findByTestId('add_role').should('be.disabled');
     cy.findByTestId('add').should('be.disabled');
+    cy.findByLabelText('Copy link').should('be.visible');
     cy.findByLabelText('Cancel').should('be.visible');
     cy.findByLabelText('Save').should('be.visible');
 
     cy.makeSnapshot();
   });
 
+  it('displays the access rights without link', () => {
+    initialize({ link: null });
+
+    cy.findByLabelText('Copy link').should('not.exist');
+
+    cy.makeSnapshot();
+  });
+
   it('displays the access rights with an empty list', () => {
     initialize({ initialValues: emptyAccessRights });
 
@@ -89,7 +97,7 @@ describe('Access rights', () => {
     cy.makeSnapshot();
   });
 
-  it('displays the access rights list', () => {
+  it('displays the access rights with an empty list', () => {
     initialize({});
 
     simpleAccessRights.forEach(({ name, email, isContactGroup, role }) => {
@@ -362,26 +370,4 @@ describe('Access rights', () => {
 
     cy.makeSnapshot();
   });
-
-  it('calls the change function when the corresponding prop is set and the form is updated', () => {
-    const { change } = initialize({});
-
-    cy.contains(labels.add.contact).click();
-    cy.findByLabelText(labels.add.autocompleteContact).click();
-
-    cy.waitForRequest('@getContacts');
-
-    cy.contains('Entity 10').click();
-
-    cy.findByTestId('add').click();
-
-    cy.contains('Entity 10').should('be.visible');
-
-    cy.findByTestId('role-Entity 10').should('have.value', 'viewer');
-    cy.contains(labels.list.added)
-      .should('be.visible')
-      .then(() => {
-        expect(change).to.have.callCount(2);
-      });
-  });
 });

package/src/components/Form/AccessRights/AccessRights.stories.tsx

@@ -47,6 +47,7 @@ export const Default: Story = {
     },
     initialValues: defaultAccessRights,
     labels,
+    link: 'link',
     roles,
     submit: () => undefined
   },
@@ -62,6 +63,7 @@ export const AccessRightsWithStates: Story = {
     },
     initialValues: accessRightsWithStates,
     labels,
+    link: 'link',
     roles,
     submit: () => undefined
   },
@@ -77,6 +79,22 @@ export const withEmptyState: Story = {
     },
     initialValues: emptyAccessRights,
     labels,
+    link: 'link',
+    roles,
+    submit: () => undefined
+  },
+  render: Template
+};
+
+export const withoutLink: Story = {
+  args: {
+    cancel: () => undefined,
+    endpoints: {
+      contact: '/contact',
+      contactGroup: '/contactGroup'
+    },
+    initialValues: defaultAccessRights,
+    labels,
     roles,
     submit: () => undefined
   },
@@ -92,6 +110,7 @@ export const loading: Story = {
     },
     initialValues: emptyAccessRights,
     labels,
+    link: 'link',
     loading: true,
     roles,
     submit: () => undefined

package/src/components/Form/AccessRights/AccessRights.styles.ts

@@ -5,6 +5,6 @@ export const useAccessRightsStyles = makeStyles()((theme) => ({
     display: 'flex',
     flexDirection: 'column',
     gap: theme.spacing(3),
-    width: '100%'
+    maxWidth: '520px'
   }
 }));

package/src/components/Form/AccessRights/AccessRights.tsx

@@ -8,17 +8,16 @@ import Provider from './Provider';
 import ShareInput from './ShareInput/ShareInput';
 import Stats from './Stats/Stats';
 import { AccessRightInitialValues, Endpoints, Labels } from './models';
-import { useAccessRightsChange } from './useAccessRightsChange';
 import { useAccessRightsInitValues } from './useAccessRightsInitValues';
 
 interface Props {
-  cancel?: ({ dirty, values }) => void;
+  cancel: ({ dirty, values }) => void;
   endpoints: Endpoints;
   initialValues: Array<AccessRightInitialValues>;
   isSubmitting?: boolean;
   labels: Labels;
+  link?: string;
   loading?: boolean;
-  onChange?: (values: Array<AccessRightInitialValues>) => void;
   roles: Array<SelectEntry>;
   submit: (values: Array<AccessRightInitialValues>) => Promise<void>;
 }
@@ -29,14 +28,13 @@ export const AccessRights = ({
   endpoints,
   submit,
   cancel,
+  link,
   loading,
   labels,
-  isSubmitting,
-  onChange
+  isSubmitting
 }: Props): JSX.Element => {
   const { classes } = useAccessRightsStyles();
   const clear = useAccessRightsInitValues({ initialValues });
-  useAccessRightsChange(onChange);
 
   return (
     <div className={classes.container}>
@@ -48,6 +46,7 @@ export const AccessRights = ({
         clear={clear}
         isSubmitting={isSubmitting}
         labels={labels.actions}
+        link={link}
         submit={submit}
       />
     </div>

package/src/components/Form/AccessRights/Actions/Actions.styles.ts

@@ -1,10 +1,14 @@
 import { makeStyles } from 'tss-react/mui';
 
 export const useActionsStyles = makeStyles()((theme) => ({
+  actions: {
+    backgroundColor: theme.palette.background.paper,
+    display: 'flex',
+    justifyContent: 'space-between'
+  },
   cancelAndSave: {
     display: 'flex',
-    flexDirection: 'row',
-    gap: theme.spacing(2),
-    justifyContent: 'flex-end'
+    flex: 'row',
+    gap: theme.spacing(2)
   }
 }));

package/src/components/Form/AccessRights/Actions/Actions.tsx

@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
 
+import LinkIcon from '@mui/icons-material/Link';
 import { CircularProgress } from '@mui/material';
 
 import { Button } from '../../..';
@@ -9,10 +10,11 @@ import { useActions } from './useActions';
 import { useActionsStyles } from './Actions.styles';
 
 interface Props {
-  cancel?: ({ dirty, values }) => void;
+  cancel: ({ dirty, values }) => void;
   clear: () => void;
   isSubmitting?: boolean;
   labels: Labels['actions'];
+  link?: string;
   submit: (values: Array<AccessRightInitialValues>) => Promise<void>;
 }
 
@@ -20,15 +22,17 @@ const Actions = ({
   labels,
   cancel,
   submit,
+  link,
   isSubmitting,
   clear
 }: Props): JSX.Element => {
   const { t } = useTranslation();
   const { classes } = useActionsStyles();
 
-  const { dirty, save, formattedValues } = useActions({
+  const { dirty, copyLink, save, formattedValues } = useActions({
     clear,
     labels,
+    link,
     submit
   });
 
@@ -37,8 +41,21 @@ const Actions = ({
   };
 
   return (
-    <div className={classes.cancelAndSave}>
-      {cancel && (
+    <div className={classes.actions}>
+      {link ? (
+        <Button
+          aria-label={t(labels.copyLink)}
+          icon={<LinkIcon />}
+          iconVariant="start"
+          variant="ghost"
+          onClick={copyLink}
+        >
+          {t(labels.copyLink)}
+        </Button>
+      ) : (
+        <div />
+      )}
+      <div className={classes.cancelAndSave}>
         <Button
           aria-label={t(labels.cancel)}
           variant="secondary"
@@ -46,17 +63,17 @@ const Actions = ({
         >
           {t(labels.cancel)}
         </Button>
-      )}
-      <Button
-        aria-label={t(labels.save)}
-        disabled={isSubmitting || !dirty}
-        icon={isSubmitting ? <CircularProgress size={24} /> : null}
-        iconVariant={isSubmitting ? 'start' : 'none'}
-        variant="primary"
-        onClick={save}
-      >
-        {t(labels.save)}
-      </Button>
+        <Button
+          aria-label={t(labels.save)}
+          disabled={isSubmitting || !dirty}
+          icon={isSubmitting ? <CircularProgress size={24} /> : null}
+          iconVariant={isSubmitting ? 'start' : 'none'}
+          variant="primary"
+          onClick={save}
+        >
+          {t(labels.save)}
+        </Button>
+      </div>
     </div>
   );
 };

package/src/components/Form/AccessRights/Actions/useActions.ts

@@ -1,32 +1,64 @@
 import { useAtomValue } from 'jotai';
-import { equals } from 'ramda';
+import { equals, omit } from 'ramda';
 
 import { initialValuesAtom, valuesAtom } from '../atoms';
-import { AccessRightInitialValues, Labels } from '../models';
-import { formatValue, formatValueForSubmition } from '../utils';
+import { AccessRight, AccessRightInitialValues, Labels } from '../models';
+import { useCopyToClipboard } from '../../../..';
+
+const formatValue = (accessRight: AccessRight): AccessRightInitialValues => {
+  return omit(['isAdded', 'isUpdated', 'isRemoved'], accessRight);
+};
+
+const formatValueForSubmition = (
+  accessRight: AccessRight
+): AccessRightInitialValues => {
+  return {
+    ...formatValue(accessRight),
+    id: Number((accessRight.id as string).split('_')[1])
+  };
+};
 
 interface Props {
   clear: () => void;
   labels: Labels['actions'];
+  link?: string;
   submit: (values: Array<AccessRightInitialValues>) => Promise<void>;
 }
 
 interface UseActionsState {
+  copyLink: () => void;
   dirty: boolean;
   formattedValues: Array<AccessRightInitialValues>;
   save: () => void;
 }
 
-export const useActions = ({ submit, clear }: Props): UseActionsState => {
+export const useActions = ({
+  link,
+  labels,
+  submit,
+  clear
+}: Props): UseActionsState => {
   const values = useAtomValue(valuesAtom);
   const initialValues = useAtomValue(initialValuesAtom);
 
+  const { copy } = useCopyToClipboard({
+    errorMessage: labels.copyError,
+    successMessage: labels.copySuccess
+  });
+
   const formattedValues = values
     .filter(({ isRemoved }) => !isRemoved)
     .map(formatValue);
 
   const dirty = !equals(initialValues, formattedValues);
 
+  const copyLink = (): void => {
+    if (!link) {
+      return;
+    }
+    copy(link);
+  };
+
   const save = (): void => {
     submit(
       values.filter(({ isRemoved }) => !isRemoved).map(formatValueForSubmition)
@@ -39,6 +71,7 @@ export const useActions = ({ submit, clear }: Props): UseActionsState => {
   };
 
   return {
+    copyLink,
     dirty,
     formattedValues,
     save

package/src/components/Form/AccessRights/models.ts

@@ -16,6 +16,9 @@ export interface AccessRight extends AccessRightInitialValues {
 export interface Labels {
   actions: {
     cancel: string;
+    copyError: string;
+    copyLink: string;
+    copySuccess: string;
     save: string;
   };
   add: {

package/src/components/Form/AccessRights/storiesData.ts

@@ -105,6 +105,9 @@ export const buildResult = (isGroup): Listing<SelectEntry> => ({
 export const labels: Labels = {
   actions: {
     cancel: 'Cancel',
+    copyError: 'Failed to copy',
+    copyLink: 'Copy link',
+    copySuccess: 'Copied',
     save: 'Save'
   },
   add: {