@centreon/ui 24.5.7 → 24.5.9

package/src/api/useRequest/index.ts

@@ -1,12 +1,15 @@
 import { useState, useEffect } from 'react';
 
+import 'ulog';
 import axios from 'axios';
 import { pathOr, defaultTo, path, includes, or } from 'ramda';
+import anylogger from 'anylogger';
 import { JsonDecoder } from 'ts.data.json';
 
 import useCancelTokenSource from '../useCancelTokenSource';
 import useSnackbar from '../../Snackbar/useSnackbar';
-import { errorLog, warnLog } from '../logger';
+
+const log = anylogger('API Request');
 
 export interface RequestParams<TResult> {
   decoder?: JsonDecoder.Decoder<TResult>;
@@ -38,7 +41,7 @@ const useRequest = <TResult>({
   }, []);
 
   const showRequestErrorMessage = (error): void => {
-    errorLog(error.message);
+    log.error(error);
 
     const message = or(
       pathOr(undefined, ['response', 'data', 'message'], error),
@@ -65,7 +68,7 @@ const useRequest = <TResult>({
       .catch((error) => {
         setSending(false);
         if (axios.isCancel(error)) {
-          warnLog(error);
+          log.warn(error);
 
           throw error;
         }

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/ShareInput/ShareInput.tsx

@@ -68,7 +68,6 @@ const ShareInput = ({ labels, endpoints, roles }: Props): JSX.Element => {
           data-testid="add"
           disabled={isNil(selectedContact)}
           icon={<AddCircleIcon />}
-          size="small"
           onClick={add}
         />
       </div>

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: {

package/src/components/Form/Dashboard/DashboardForm.stories.ts

@@ -0,0 +1,39 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { DashboardForm } from './DashboardForm';
+
+const meta: Meta<typeof DashboardForm> = {
+  component: DashboardForm
+};
+
+export default meta;
+type Story = StoryObj<typeof DashboardForm>;
+
+export const Default: Story = {
+  args: {
+    labels: {
+      actions: {
+        cancel: 'Cancel',
+        submit: {
+          create: 'Create',
+          update: 'Update'
+        }
+      },
+      entity: {
+        description: 'Description',
+        name: 'Name'
+      }
+    }
+  }
+};
+
+export const AsUpdateVariant: Story = {
+  args: {
+    ...Default.args,
+    resource: {
+      description: 'Description 1',
+      name: 'Dashboard 1'
+    },
+    variant: 'update'
+  }
+};

package/src/components/Form/Dashboard/translatedLabels.ts

@@ -1,3 +1,4 @@
+// TODO use i18n conventions for translation (interpolation, plurals, etc.) and setup for storybook (only works in FE atm.)
 export const labelMustBeMost = '{{label}} can be at most {{max}} characters';
 export const labelMustBeAtLeast =
   '{{label}} should be at least {{min}} characters long';

package/src/components/List/Item/ListItem.styles.ts

@@ -18,10 +18,10 @@ export const useStyles = makeStyles()((theme) => ({
     display: 'flex',
     flexGrow: 1,
     gap: theme.spacing(2),
+    maxWidth: '520px',
     overflow: 'hidden',
     paddingBottom: theme.spacing(1),
-    paddingTop: theme.spacing(1),
-    width: '100%'
+    paddingTop: theme.spacing(1)
   },
   secondary: {
     alignItems: 'center',

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

@@ -9,7 +9,7 @@ const useStyles = makeStyles<{
   modal: {
     '& .MuiDialog-paper': {
       gap: theme.spacing(2),
-      padding: theme.spacing(2.5)
+      padding: theme.spacing(2)
     },
     '&[data-size="fullscreen"]': {
       zIndex: 0
@@ -35,8 +35,8 @@ const useStyles = makeStyles<{
       transition: theme.transitions.create('left')
     },
     '&[data-size="large"] .MuiDialog-paper': {
-      maxWidth: '604px',
-      width: '604px'
+      maxWidth: '640px',
+      width: '640px'
     },
     '&[data-size="medium"] .MuiDialog-paper': {
       width: '520px'
@@ -52,7 +52,6 @@ const useStyles = makeStyles<{
   modalActions: {
     '&[data-fixed="true"]': {
       background: theme.palette.background.paper,
-      padding: theme.spacing(1, 2.5, 2.5, 0),
       position: 'fixed',
       width: '100%'
     },
@@ -61,7 +60,7 @@ const useStyles = makeStyles<{
     flexDirection: 'row',
     gap: theme.spacing(2),
     justifyContent: 'flex-end',
-    padding: theme.spacing(1, 0, 0, 0),
+    padding: theme.spacing(1, 2.5, 2.5, 0),
     right: 0,
     zIndex: theme.zIndex.modal
   },
@@ -70,6 +69,7 @@ const useStyles = makeStyles<{
       '&:first-of-type': {
         margin: theme.spacing(0, 0, 1, 0)
       },
+      color: theme.palette.text.secondary,
       margin: theme.spacing(1, 0, 1, 0),
       width: '90%'
     }

package/src/components/Zoom/Minimap.tsx

@@ -16,7 +16,6 @@ interface Props extends Omit<UseMinimapProps, 'minimapScale' | 'scale'> {
     left: number;
     top: number;
   };
-  id?: number | string;
   isDraggingFromContainer: boolean;
 }
 
@@ -27,8 +26,7 @@ const Minimap = ({
   width,
   contentClientRect,
   isDraggingFromContainer,
-  diffBetweenContentAndSvg,
-  id
+  diffBetweenContentAndSvg
 }: Props): JSX.Element => {
   const { classes } = useZoomStyles();
 
@@ -84,7 +82,7 @@ const Minimap = ({
   );
 
   return (
-    <g className={classes.minimap} clipPath={`url(#zoom-clip-${id})`}>
+    <g className={classes.minimap} clipPath="url(#zoom-clip)">
       <rect
         className={classes.minimapBackground}
         height={finalHeight}