@centreon/ui 24.4.1-MON-21278-Delete-a-basic-token.11 → 24.4.1-MON-33898.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "24.4.1-MON-21278-Delete-a-basic-token.11",
+  "version": "24.4.1-MON-33898.15",
   "description": "Centreon UI Components",
   "scripts": {
     "eslint": "eslint ./src --ext .js,.jsx,.ts,.tsx --max-warnings 0",

package/src/Button/Icon/index.stories.tsx

@@ -4,7 +4,7 @@ import { makeStyles } from 'tss-react/mui';
 import AccessibilityIcon from '@mui/icons-material/Accessibility';
 import { Theme } from '@mui/material';
 
-import IconButton from '.';
+import { IconButton } from '.';
 
 const useStyles = makeStyles()((theme: Theme) => ({
   root: {

package/src/Button/Icon/index.tsx

@@ -38,7 +38,7 @@ type Props = {
     | 'top-start';
 } & IconButtonProps;
 
-const IconButton = ({
+export const IconButton = ({
   title = '',
   ariaLabel,
   className,

package/src/Dialog/Confirm/index.tsx

@@ -1,4 +1,4 @@
-import { ButtonProps, DialogContentText, Typography } from '@mui/material';
+import { DialogContentText, Typography } from '@mui/material';
 
 import Dialog, { Props as DialogProps } from '..';
 
@@ -6,23 +6,15 @@ type Props = DialogProps & {
   children?: JSX.Element;
   labelMessage?: string | null;
   labelSecondMessage?: string | null;
-  restCancelButtonProps?: ButtonProps;
-  restConfirmButtonProps?: ButtonProps;
 };
 
 const Confirm = ({
   labelMessage,
   labelSecondMessage,
   children,
-  restCancelButtonProps,
-  restConfirmButtonProps,
   ...rest
 }: Props): JSX.Element => (
-  <Dialog
-    restCancelButtonProps={restCancelButtonProps}
-    restConfirmButtonProps={restConfirmButtonProps}
-    {...rest}
-  >
+  <Dialog {...rest}>
     <DialogContentText>
       {labelMessage && <Typography>{labelMessage}</Typography>}
       {labelSecondMessage && <Typography>{labelSecondMessage}</Typography>}

package/src/Dialog/index.tsx

@@ -9,8 +9,7 @@ import {
   DialogContent,
   DialogActions,
   DialogProps,
-  CircularProgress,
-  ButtonProps
+  CircularProgress
 } from '@mui/material';
 
 import { DataTestAttributes } from '../@types/data-attributes';
@@ -49,8 +48,6 @@ export type Props = {
   onClose?: () => void;
   onConfirm: (event, value?) => void;
   open: boolean;
-  restCancelButtonProps?: ButtonProps;
-  restConfirmButtonProps?: ButtonProps;
   submitting?: boolean;
 } & DialogProps &
   DataTestAttributes;
@@ -73,8 +70,6 @@ const Dialog = ({
   dialogContentClassName,
   dialogActionsClassName,
   dialogConfirmButtonClassName,
-  restCancelButtonProps,
-  restConfirmButtonProps,
   ...rest
 }: Props): JSX.Element => {
   const { classes, cx } = useStyles({ contentWidth });
@@ -106,7 +101,6 @@ const Dialog = ({
             data-testid="Cancel"
             disabled={cancelDisabled}
             onClick={onCancel}
-            {...restCancelButtonProps}
           >
             {labelCancel}
           </Button>
@@ -119,7 +113,6 @@ const Dialog = ({
           disabled={confirmDisabled}
           endIcon={submitting && <CircularProgress size={15} />}
           onClick={onConfirm}
-          {...restConfirmButtonProps}
         >
           {labelConfirm}
         </Button>

package/src/InputField/Select/IconPopover/index.tsx

@@ -15,7 +15,7 @@ import {
 } from '@mui/material';
 import IconReset from '@mui/icons-material/RotateLeft';
 
-import IconButton from '../../../Button/Icon';
+import { IconButton } from '../../..';
 import Option from '../Option';
 import { SelectEntry } from '..';
 

package/src/Listing/ActionBar/index.tsx

@@ -9,10 +9,9 @@ import Divider from '@mui/material/Divider';
 
 import { userAtom, ListingVariant } from '@centreon/ui-context';
 
-import { ListingProps } from '../..';
+import { ListingProps, IconButton } from '../..';
 import { labelOf, labelRowsPerPage } from '../translatedLabels';
 import { useMemoComponent } from '../../utils';
-import IconButton from '../../Button/Icon/index';
 
 import StyledPagination from './Pagination';
 import PaginationActions from './PaginationActions';

package/src/Panel/index.tsx

@@ -9,7 +9,7 @@ import { makeStyles } from 'tss-react/mui';
 import { Paper, Slide, Divider, AppBar, Tabs } from '@mui/material';
 import IconClose from '@mui/icons-material/Clear';
 
-import IconButton from '../Button/Icon';
+import { IconButton } from '..';
 
 import { minTabHeight } from './Tab';
 

package/src/TimePeriods/CustomTimePeriod/CompactCustomTimePeriod.styles.ts

@@ -12,21 +12,22 @@ const useStyles = makeStyles()((theme) => ({
   },
   containerDates: {
     display: 'flex',
+    gap: theme.spacing(0.5),
     [theme.breakpoints.down('sm')]: {
-      flexDirection: 'column',
-      gap: theme.spacing(0.5)
+      columnGap: theme.spacing(0.5),
+      flexDirection: 'column'
     }
   },
   date: {
-    minWidth: theme.spacing(12),
+    minWidth: theme.spacing(12.5),
     textAlign: 'start'
   },
   error: {
     textAlign: 'center'
   },
   label: {
-    minWidth: theme.spacing(3.5),
-    textAlign: 'end'
+    minWidth: theme.spacing(3),
+    textAlign: 'start'
   },
 
   picker: {
@@ -38,7 +39,7 @@ const useStyles = makeStyles()((theme) => ({
   },
   timeContainer: {
     alignItems: 'center',
-    columnGap: theme.spacing(0.5),
+    columnGap: theme.spacing(1),
     display: 'flex',
     flexDirection: 'row',
     [theme.breakpoints.down('sm')]: {

package/src/TimePeriods/ResolutionTimePeriod.cypress.spec.tsx

@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-import 'dayjs/locale/en';
+import 'dayjs/locale/fr';
 import localizedFormatPlugin from 'dayjs/plugin/localizedFormat';
 import timezonePlugin from 'dayjs/plugin/timezone';
 import utcPlugin from 'dayjs/plugin/utc';
@@ -19,18 +19,18 @@ dayjs.extend(localizedFormatPlugin);
 
 const data = [
   {
-    locale: 'en_US',
-    resolution: { height: 590, width: 500 },
+    locale: 'fr_FR',
+    resolution: { height: 720, width: 500 },
     timezone: 'Europe/Paris'
   },
   {
-    locale: 'en_US',
-    resolution: { height: 590, width: 200 },
+    locale: 'fr_FR',
+    resolution: { height: 720, width: 200 },
     timezone: 'Europe/Paris'
   },
   {
-    locale: 'en_US',
-    resolution: { height: 590, width: 1024 },
+    locale: 'fr_FR',
+    resolution: { height: 720, width: 1024 },
     timezone: 'Europe/Paris'
   }
 ];
@@ -45,7 +45,7 @@ data.forEach((item) =>
 
       store.set(userAtom, {
         ...retrievedUser,
-        locale: 'en_US',
+        locale: 'fr_FR',
         timezone: 'Europe/Paris'
       });
 
@@ -59,10 +59,7 @@ data.forEach((item) =>
     });
 
     it(`displays correctly the dates design when screen resolution is ${width}px`, () => {
-      cy.makeSnapshotWithCustomResolution({
-        resolution: { height, width },
-        title: `${width}px`
-      });
+      cy.makeSnapshot(`${width}px`);
     });
   })
 );

package/src/components/Form/{AccessRightsV2 → AccessRights}/AccessRights.cypress.spec.tsx

@@ -347,4 +347,27 @@ describe('Access rights', () => {
 
     cy.makeSnapshot();
   });
+
+  it('resets the role to "viewer" when the "editor" role is selected and a contact with "viewer" right is selected', () => {
+    initialize({});
+
+    cy.findByLabelText(labels.add.autocompleteContact).click();
+
+    cy.waitForRequest('@getContacts');
+
+    cy.contains('Entity 10').click();
+
+    cy.findByTestId('add_role').parent().click();
+    cy.get('li[data-value="editor"]').click();
+
+    cy.findByLabelText(labels.add.autocompleteContact).click();
+
+    cy.waitForRequest('@getContacts');
+
+    cy.contains('Entity 11').click();
+
+    cy.findByTestId('add_role').should('have.value', 'viewer');
+
+    cy.makeSnapshot();
+  });
 });

package/src/components/Form/{AccessRightsV2 → AccessRights}/ShareInput/ContactSwitch.tsx

@@ -7,11 +7,14 @@ import { ContactType, Labels } from '../models';
 import { contactTypeAtom } from '../atoms';
 import { Subtitle } from '../../../..';
 
+import { useContactSwitchStyles } from './ShareInput.styles';
+
 interface Props {
   labels: Labels['add'];
 }
 
 const ContactSwitch = ({ labels }: Props): JSX.Element => {
+  const { classes } = useContactSwitchStyles();
   const { t } = useTranslation();
 
   const setContactType = useSetAtom(contactTypeAtom);
@@ -23,7 +26,12 @@ const ContactSwitch = ({ labels }: Props): JSX.Element => {
   return (
     <>
       <Subtitle>{t(labels.title)}</Subtitle>
-      <RadioGroup row defaultValue={ContactType.Contact} onChange={change}>
+      <RadioGroup
+        row
+        className={classes.inputs}
+        defaultValue={ContactType.Contact}
+        onChange={change}
+      >
         <FormControlLabel
           control={<Radio />}
           label={labels.contact}

package/src/components/Form/{AccessRightsV2 → AccessRights}/ShareInput/ShareInput.styles.ts

@@ -7,3 +7,11 @@ export const useShareInputStyles = makeStyles()((theme) => ({
     gridTemplateColumns: `1fr min-content min-content`
   }
 }));
+
+export const useContactSwitchStyles = makeStyles()((theme) => ({
+  inputs: {
+    display: 'flex',
+    flexDirection: 'row',
+    gap: theme.spacing(2)
+  }
+}));

package/src/components/Form/{AccessRightsV2 → AccessRights}/ShareInput/useShareInput.tsx

@@ -40,6 +40,10 @@ const useShareInput = (endpoints: Endpoints): UseShareInputState => {
 
   const selectContact = (_, entry): void => {
     setSelectedContact(entry);
+    if (equals('editor', entry.most_permissive_role)) {
+      return;
+    }
+    setSelectedRole('viewer');
   };
 
   const add = (): void => {

package/src/components/Form/{AccessRightsV2 → AccessRights}/models.ts

@@ -2,6 +2,7 @@ export interface AccessRightInitialValues {
   email?: string;
   id: number | string;
   isContactGroup: boolean;
+  most_permissive_role?: 'editor' | 'viewer';
   name: string;
   role: string;
 }

package/src/components/Form/{AccessRightsV2 → AccessRights}/storiesData.ts

@@ -88,6 +88,7 @@ const buildEntities = (from, isGroup): Array<SelectEntry> => {
     .map((_, index) => ({
       email: isGroup ? undefined : faker.internet.email(),
       id: 1000 + index,
+      most_permissive_role: index % 3 === 0 ? 'editor' : 'viewer',
       name: `Entity ${isGroup ? 'Group' : ''} ${from + index}`
     }));
 };

package/src/components/Form/index.ts

@@ -1,4 +1,4 @@
 export * from './Form.models';
 export * from './Dashboard';
-export * from './AccessRights';
-export { default as AccessRightsV2 } from './AccessRightsV2/AccessRights';
+export { default as AccessRights } from './AccessRights/AccessRights';
+export { default as AccessRightsV2 } from './AccessRights/AccessRights';

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

@@ -1,45 +0,0 @@
-export type ContactAccessRightState =
-  | 'added'
-  | 'updated'
-  | 'removed'
-  | 'unchanged';
-
-export type ContactAccessRightStateResource = {
-  contactAccessRight: ContactAccessRightResource;
-  state: ContactAccessRightState;
-  stateHistory: Array<ContactAccessRightState>;
-};
-
-export type ContactAccessRightResource = {
-  contact: ContactResource | ContactGroupResource | null;
-  role: RoleResource['role'];
-};
-
-export type ContactResource = {
-  email?: string;
-  id?: number | string;
-  name: string;
-  type: 'contact';
-};
-
-export const isContactResource = (
-  resource: ContactResource | ContactGroupResource | null
-): resource is ContactResource => {
-  return resource?.type === 'contact';
-};
-
-export type ContactGroupResource = {
-  id?: number | string;
-  name: string;
-  type: 'contact_group';
-};
-
-export const isContactGroupResource = (
-  resource: ContactResource | ContactGroupResource | null
-): resource is ContactResource => {
-  return resource?.type === 'contact_group';
-};
-
-export type RoleResource = {
-  role: 'viewer' | 'editor' | string;
-};

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

@@ -1,59 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-
-import { AccessRightsForm } from './AccessRightsForm';
-import { Default as DefaultContactAccessRightsListStory } from './List/ContactAccessRightsList.stories';
-import { Default as DefaultContactAccessRightInputStory } from './Input/ContactAccessRightInput.stories';
-import { ContactAccessRightsListProps } from './List/ContactAccessRightsList';
-import { ContactAccessRightInputProps } from './Input/ContactAccessRightInput';
-import {
-  contactAccessRightsMock,
-  contactsAndGroupsMock
-} from './__fixtures__/contactAccessRight.mock';
-
-const meta: Meta<typeof AccessRightsForm> = {
-  component: AccessRightsForm
-};
-
-export default meta;
-type Story = StoryObj<typeof AccessRightsForm>;
-
-export const Default: Story = {
-  args: {
-    initialValues: contactAccessRightsMock(12),
-    labels: {
-      actions: {
-        cancel: 'Cancel',
-        copyLink: 'Copy link',
-        copyLinkMessages: {
-          error: 'Unable to copy link',
-          success: 'Link copied'
-        },
-        submit: 'Update'
-      },
-      input: {
-        ...DefaultContactAccessRightInputStory.args?.labels
-      } as ContactAccessRightInputProps['labels'],
-      list: {
-        ...DefaultContactAccessRightsListStory.args?.labels
-      } as ContactAccessRightsListProps['labels'],
-      stats: {
-        added: 'added',
-        removed: 'removed',
-        updated: 'updated'
-      }
-    },
-    options: {
-      contacts: contactsAndGroupsMock(25),
-      roles: [{ role: 'viewer' }, { role: 'editor' }]
-    },
-    resourceLink: 'https://app.centreon.com/resource/1'
-  }
-};
-
-export const AsEmptyState: Story = {
-  args: {
-    labels: Default.args?.labels,
-    options: Default.args?.options,
-    resourceLink: Default.args?.resourceLink
-  }
-};

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

@@ -1,21 +0,0 @@
-import { makeStyles } from 'tss-react/mui';
-
-const useStyles = makeStyles()((theme) => ({
-  accessRightsForm: {
-    display: 'flex',
-    flexDirection: 'column',
-    gap: theme.spacing(6),
-
-    maxWidth: '520px',
-    paddingTop: theme.spacing(3),
-
-    width: '100%'
-  },
-  accessRightsFormList: {
-    display: 'flex',
-    flexDirection: 'column',
-    gap: theme.spacing(1)
-  }
-}));
-
-export { useStyles };

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

@@ -1,67 +0,0 @@
-import { ReactElement } from 'react';
-
-import { useStyles } from './AccessRightsForm.styles';
-import {
-  AccessRightsFormProvider,
-  AccessRightsFormProviderProps
-} from './useAccessRightsForm';
-import {
-  ContactAccessRightInput,
-  ContactAccessRightInputProps
-} from './Input/ContactAccessRightInput';
-import {
-  ContactAccessRightsList,
-  ContactAccessRightsListProps
-} from './List/ContactAccessRightsList';
-import {
-  AccessRightsFormActions,
-  AccessRightsFormActionsProps
-} from './AccessRightsFormActions';
-import {
-  AccessRightsStats,
-  AccessRightsStatsProps
-} from './Stats/AccessRightsStats';
-
-export type AccessRightsFormProps = {
-  labels: AccessRightsFormLabels;
-  onCancel?: AccessRightsFormActionsProps['onCancel'];
-  resourceLink: string;
-} & Pick<
-  AccessRightsFormProviderProps,
-  'initialValues' | 'onSubmit' | 'options' | 'loadingStatus'
->;
-
-export type AccessRightsFormLabels = {
-  actions: AccessRightsFormActionsProps['labels'];
-  input: ContactAccessRightInputProps['labels'];
-  list: ContactAccessRightsListProps['labels'];
-  stats: AccessRightsStatsProps['labels'];
-};
-
-const AccessRightsForm = ({
-  labels,
-  onCancel,
-  resourceLink,
-  ...providerProps
-}: AccessRightsFormProps): ReactElement => {
-  const { classes } = useStyles();
-
-  return (
-    <AccessRightsFormProvider {...providerProps}>
-      <div className={classes.accessRightsForm}>
-        <ContactAccessRightInput labels={labels.input} />
-        <span className={classes.accessRightsFormList}>
-          <ContactAccessRightsList labels={labels.list} />
-          <AccessRightsStats labels={labels.stats} />
-        </span>
-        <AccessRightsFormActions
-          labels={labels.actions}
-          resourceLink={resourceLink}
-          onCancel={onCancel}
-        />
-      </div>
-    </AccessRightsFormProvider>
-  );
-};
-
-export { AccessRightsForm };

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

@@ -1,80 +0,0 @@
-import { ReactElement } from 'react';
-
-import { Link as LinkIcon } from '@mui/icons-material';
-
-import { Button } from '../../Button';
-import { useStyles } from '../Form.styles';
-import { useCopyToClipboard } from '../../../utils';
-
-import { useAccessRightsForm } from './useAccessRightsForm';
-
-export type AccessRightsFormActionsProps = {
-  labels: AccessRightsFormActionsLabels;
-  onCancel?: () => void;
-  resourceLink: string;
-};
-
-type AccessRightsFormActionsLabels = {
-  cancel: string;
-  copyLink: string;
-  copyLinkMessages: {
-    error: string;
-    success: string;
-  };
-  submit: string;
-};
-
-const AccessRightsFormActions = ({
-  labels,
-  onCancel,
-  resourceLink
-}: AccessRightsFormActionsProps): ReactElement => {
-  const { classes } = useStyles();
-  const { isDirty, submit } = useAccessRightsForm();
-  const { copy } = useCopyToClipboard({
-    errorMessage: labels.copyLinkMessages.error,
-    successMessage: labels.copyLinkMessages.success
-  });
-
-  return (
-    <div className={classes.actions}>
-      <span>
-        <Button
-          aria-label={labels.copyLink}
-          data-testid="copy-link"
-          icon={<LinkIcon />}
-          iconVariant="start"
-          size="small"
-          variant="ghost"
-          onClick={() => copy(resourceLink)}
-        >
-          {labels.copyLink}
-        </Button>
-      </span>
-      <span>
-        <Button
-          aria-label={labels.cancel}
-          data-testid="cancel"
-          size="medium"
-          variant="secondary"
-          onClick={() => onCancel?.()}
-        >
-          {labels.cancel}
-        </Button>
-        <Button
-          aria-label={labels.submit}
-          data-testid="submit"
-          disabled={!isDirty}
-          size="medium"
-          type="submit"
-          variant="primary"
-          onClick={submit}
-        >
-          {labels.submit}
-        </Button>
-      </span>
-    </div>
-  );
-};
-
-export { AccessRightsFormActions };

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

@@ -1,31 +0,0 @@
-import { ReactElement } from 'react';
-
-import { useFormikContext } from 'formik';
-
-import { Add as AddIcon } from '@mui/icons-material';
-
-import { ContactAccessRightResource } from '../AccessRights.resource';
-import { IconButton } from '../../../Button';
-
-type AddActionProps = {
-  label?: string;
-};
-
-const AddAction = ({ label }: AddActionProps): ReactElement => {
-  const { dirty, isValid, submitForm } =
-    useFormikContext<Partial<ContactAccessRightResource>>();
-
-  return (
-    <IconButton
-      aria-label={label}
-      data-testid="add"
-      disabled={!dirty || !isValid}
-      icon={<AddIcon />}
-      size="medium"
-      variant="primary"
-      onClick={submitForm}
-    />
-  );
-};
-
-export { AddAction };