@centreon/ui 24.4.8 → 24.4.10

package/src/components/DataTable/DataTable.styles.ts

@@ -10,6 +10,9 @@ const useStyles = makeStyles()((theme) => ({
       gridGap: theme.spacing(2.5),
       gridTemplateColumns: `repeat(auto-fill, ${theme.spacing(45)})`
     },
+    '&[data-variant="listing"]': {
+      height: '100%'
+    },
     '&[data-variant][data-is-empty="true"]': {
       display: 'flex',
       justifyContent: 'center',

package/src/components/DataTable/DataTable.tsx

@@ -1,11 +1,11 @@
-import React, { ReactElement, ReactNode } from 'react';
+import { ReactElement, ReactNode } from 'react';
 
 import { useStyles } from './DataTable.styles';
 
 type DataTableProps = {
-  children: ReactNode | Array<ReactNode>;
+  children?: ReactNode | Array<ReactNode>;
   isEmpty?: boolean;
-  variant?: 'grid';
+  variant: 'grid' | 'listing';
 };
 
 /** *

package/src/components/DataTable/Item/DataTableItem.styles.ts

@@ -1,13 +1,18 @@
 import { makeStyles } from 'tss-react/mui';
 
 const useStyles = makeStyles()((theme) => ({
+  actions: {
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between'
+  },
   dataTableItem: {
     '& .MuiCardActionArea-root': {
       alignItems: 'flex-start',
       display: 'flex',
       flexDirection: 'column',
       height: '100%',
-      justifyContent: 'space-between'
+      justifyContent: 'flex-start'
     },
     '& .MuiCardActions-root': {
       '& > span': {
@@ -15,13 +20,13 @@ const useStyles = makeStyles()((theme) => ({
         gap: theme.spacing(1)
       },
       display: 'flex',
-
       justifyContent: 'space-between'
     },
     borderRadius: theme.shape.borderRadius,
     display: 'flex',
     flexDirection: 'column',
     height: '186px',
+    justifyContent: 'space-between',
     p: {
       color: theme.palette.text.secondary,
       letterSpacing: '0',

package/src/components/DataTable/Item/DataTableItem.tsx

@@ -22,7 +22,7 @@ export interface DataTableItemProps {
   description?: string;
   hasActions?: boolean;
   hasCardAction?: boolean;
-  labelsDelete: {
+  labelsDelete?: {
     cancel: string;
     confirm: {
       label: string;
@@ -76,7 +76,7 @@ const DataTableItem = forwardRef(
         {hasActions && (
           <MuiCardActions>
             <span>
-              {onDelete && (
+              {onDelete && labelsDelete && (
                 <ConfirmationTooltip
                   confirmVariant="error"
                   labels={labelsDelete}

package/src/components/DataTable/index.ts

@@ -2,9 +2,11 @@ import { DataTable as DataTableRoot } from './DataTable';
 import { DataTableItem } from './Item/DataTableItem';
 import { DataTableItemSkeleton } from './Item/DataTableItemSkeleton';
 import { DataTableEmptyState } from './EmptyState/DataTableEmptyState';
+import { DataListing } from './DataListing';
 
 export const DataTable = Object.assign(DataTableRoot, {
   EmptyState: DataTableEmptyState,
   Item: DataTableItem,
-  ItemSkeleton: DataTableItemSkeleton
+  ItemSkeleton: DataTableItemSkeleton,
+  Listing: DataListing
 });

package/src/components/Form/AccessRights/__fixtures__/contactAccessRight.mock.ts

@@ -7,6 +7,8 @@ import {
   RoleResource
 } from '../AccessRights.resource';
 
+faker.seed(42);
+
 export const rolesMock = (): Array<RoleResource> => [
   { role: 'viewer' },
   { role: 'editor' }

package/src/components/Form/AccessRights/useAccessRightsForm.utils.ts

@@ -36,6 +36,6 @@ export const createInitialState = (
           contactAccessRight,
           state: 'unchanged',
           stateHistory: []
-        } as ContactAccessRightStateResource)
+        }) as ContactAccessRightStateResource
     )
     .sort(sortOnAddedStateFirstAndContactName);

package/src/components/Form/Dashboard/DashboardForm.tsx

@@ -1,7 +1,8 @@
 import { ReactElement, useCallback, useMemo } from 'react';
 
-import * as Yup from 'yup';
+import { string, number, object } from 'yup';
 import { useTranslation } from 'react-i18next';
+import { equals } from 'ramda';
 
 import { InputType } from '../../../Form/Inputs/models';
 import { Form, FormProps } from '../../../Form';
@@ -84,8 +85,8 @@ const DashboardForm = ({
         }
       ],
       submit: (values, bag) => onSubmit?.(values, bag),
-      validationSchema: Yup.object().shape({
-        description: Yup.string()
+      validationSchema: object({
+        description: string()
           .label(labels?.entity?.description || '')
           .max(
             180,
@@ -93,17 +94,19 @@ const DashboardForm = ({
               `${p.label} ${t(labelMustBeMost)} ${p.max} ${t(labelCharacters)}`
           )
           .nullable(),
-        globalRefreshInterval: Yup.object().shape({
-          interval: Yup.number().when('type', {
-            is: 'global',
-            otherwise: Yup.number().nullable(),
-            then: Yup.number()
-              .min(1, ({ min }) => t(labelMustBeAtLeast, { min }))
-              .required(t(labelRequired) as string)
+        globalRefreshInterval: object({
+          interval: number().when('type', ([type], schema) => {
+            if (equals(type, 'manual')) {
+              schema
+                .min(1, ({ min }) => t(labelMustBeAtLeast, { min }))
+                .required(t(labelRequired) as string);
+            }
+
+            return schema.nullable();
           }),
-          type: Yup.string()
+          type: string()
         }),
-        name: Yup.string()
+        name: string()
           .label(labels?.entity?.name)
           .min(3, ({ min, label }) => t(labelMustBeAtLeast, { label, min }))
           .max(50, ({ max, label }) => t(labelMustBeMost, { label, max }))

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

@@ -49,14 +49,15 @@ const useStyles = makeStyles<{
     }
   },
   modalActions: {
-    bottom: 0,
+    '&[data-fixed="true"]': {
+      position: 'fixed'
+    },
     bottom: theme.spacing(2),
     display: 'flex',
     flexDirection: 'row',
     gap: theme.spacing(2),
     justifyContent: 'flex-end',
-    position: 'fixed',
-    right: theme.spacing(2)
+    right: theme.spacing(2.5)
   },
   modalBody: {
     '& > p': {

package/src/components/Modal/ModalActions.tsx

@@ -8,6 +8,7 @@ export type ModalActionsProps = {
   children?: React.ReactNode;
   disabled?: boolean;
   isDanger?: boolean;
+  isFixed?: boolean;
   labels?: ModalActionsLabels;
   onCancel?: () => void;
   onConfirm?: () => void;
@@ -24,12 +25,13 @@ const ModalActions = ({
   onCancel,
   onConfirm,
   isDanger = false,
-  disabled
+  disabled,
+  isFixed
 }: ModalActionsProps): ReactElement => {
   const { classes } = useStyles();
 
   return (
-    <div className={classes.modalActions}>
+    <div className={classes.modalActions} data-fixed={isFixed}>
       {children || (
         <>
           <Button

package/src/index.ts

@@ -162,4 +162,6 @@ export * from './Graph/common/timeSeries';
 
 export { default as TimePeriods } from './TimePeriods';
 export { default as SimpleCustomTimePeriod } from './TimePeriods/CustomTimePeriod/SimpleCustomTimePeriod';
+export { default as DateTimePickerInput } from './TimePeriods/DateTimePickerInput';
 export * from './ParentSize';
+export { default as Subtitle } from './Typography/Subtitle';

package/src/queryParameters/url/index.ts

@@ -1,4 +1,4 @@
-import { fromPairs } from 'ramda';
+import { fromPairs, startsWith } from 'ramda';
 
 import { QueryParameter } from '../models';
 
@@ -25,6 +25,10 @@ const getUrlQueryParameters = <
 
   const entries = [...urlParams.entries()].map<[string, string]>(
     ([key, value]) => {
+      if (startsWith('/', value)) {
+        return [key, value];
+      }
+
       return [key, JSON.parse(value)];
     }
   );

package/src/utils/index.ts

@@ -3,7 +3,6 @@ export * from './getNormalizedId';
 export * from './statuses';
 export * from './typedMemo';
 export * from './useCopyToClipboard';
-export * from './useDateTimePickerAdapter';
 export * from './useDebounce';
 export * from './useDeepCallback';
 export * from './useDeepMemo';
@@ -20,3 +19,4 @@ export * from './useInfiniteScrollListing';
 export * from './useLicenseExpirationWarning';
 export * from './useRefreshInterval';
 export * from './centreonBaseURL';
+export * from './usePluralizedTranslation';

package/src/utils/{useLicenseExpirationWarning.cypress.spec.tsx → useLicenseExpirationWarning.test.tsx}

@@ -1,6 +1,13 @@
 import dayjs from 'dayjs';
+import { renderHook } from '@testing-library/react';
 
-import { TestQueryProvider, Method, SnackbarProvider } from '@centreon/ui';
+import {
+  getFetchCall,
+  mockResponse,
+  resetMocks,
+  waitFor
+} from '../../test/testRenderer';
+import TestQueryProvider from '../api/TestQueryProvider';
 
 import { labelLicenseWarning } from './translatedLabel';
 
@@ -79,59 +86,63 @@ const getMockedResponse = (expirationDate): object => ({
 });
 
 const mockRequest = ({ expirationDate }: { expirationDate }): void => {
-  cy.interceptAPIRequest({
-    alias: 'getLicenseInformations',
-    method: Method.GET,
-    path: '**internal.php?object=centreon_module&action=list',
-    response: getMockedResponse(expirationDate)
+  resetMocks();
+  mockResponse({
+    data: getMockedResponse(expirationDate)
   });
 };
 
-const TestComponent = (): JSX.Element => {
-  useLicenseExpirationWarning({
-    module: 'centreon-autodiscovery-server'
-  });
+const showMessage = jest.fn();
 
-  return <div />;
-};
-
-const TestWithQueryProvider = (): JSX.Element => {
-  return (
-    <TestQueryProvider>
-      <SnackbarProvider>
-        <TestComponent />
-      </SnackbarProvider>
-    </TestQueryProvider>
-  );
-};
+jest.mock('../Snackbar/useSnackbar', () => ({
+  __esModule: true,
+  default: jest
+    .fn()
+    .mockImplementation(() => ({ showWarningMessage: showMessage }))
+}));
 
 const initialize = (): void => {
-  cy.viewport('macbook-13');
-
-  cy.mount({
-    Component: <TestWithQueryProvider />
-  });
+  renderHook(
+    () =>
+      useLicenseExpirationWarning({
+        module: 'centreon-autodiscovery-server'
+      }),
+    {
+      wrapper: TestQueryProvider
+    }
+  );
 };
 
 const currentDate = dayjs();
 
 describe('License', () => {
-  beforeEach(initialize);
-
   it('does not display any warning message when the license expires in more than 15 days from the current date', () => {
     mockRequest({ expirationDate: currentDate.add(20, 'day') });
+    initialize();
 
-    cy.waitForRequest('@getLicenseInformations');
+    waitFor(() => {
+      expect(getFetchCall(0)).toEqual(
+        'internal.php?object=centreon_module&action=list'
+      );
+    });
 
-    cy.findByText(
-      labelLicenseWarning('centreon-autodiscovery-server', 20)
-    ).should('not.exist');
+    expect(showMessage).not.toHaveBeenCalled();
   });
+
   it('displays a warning message when the license expires within 15 days', () => {
     mockRequest({ expirationDate: currentDate.add(10.5, 'day') });
-
-    cy.findByText(labelLicenseWarning('centreon-autodiscovery-server', 10));
-
-    cy.makeSnapshot();
+    initialize();
+
+    waitFor(() => {
+      expect(getFetchCall(0)).toEqual(
+        'internal.php?object=centreon_module&action=list'
+      );
+    });
+
+    waitFor(() => {
+      expect(showMessage).toHaveBeenCalledWith(
+        labelLicenseWarning('centreon-autodiscovery-server', 10)
+      );
+    });
   });
 });

package/src/utils/useLicenseExpirationWarning.ts

@@ -19,7 +19,7 @@ export const useLicenseExpirationWarning = ({ module }: Props): void => {
   const { t } = useTranslation();
   const { showWarningMessage } = useSnackbar();
 
-  const { fetchQuery } = useFetchQuery({
+  const { data } = useFetchQuery({
     getEndpoint: () => extensionsEndpoint,
     getQueryKey: () => [module]
   });
@@ -28,25 +28,25 @@ export const useLicenseExpirationWarning = ({ module }: Props): void => {
 
   const getExpirationDate = pipe(
     path(['result', 'module', 'entities']),
-    find(propEq('id', module)),
+    find(propEq(module, 'id')),
     path(['license', 'expiration_date'])
   ) as (data) => string;
 
   useEffect(() => {
-    fetchQuery().then((response) => {
-      const expirationDate = getExpirationDate(response);
-      if (isNil(expirationDate)) {
-        return;
-      }
-
-      const daysUntilExpiration = dayjs(expirationDate).diff(
-        currentDate,
-        'day'
-      );
-
-      if (lt(daysUntilExpiration, 15)) {
-        showWarningMessage(t(labelLicenseWarning(module, daysUntilExpiration)));
-      }
-    });
-  }, []);
+    if (isNil(data)) {
+      return;
+    }
+
+    const expirationDate = getExpirationDate(data);
+
+    if (isNil(expirationDate)) {
+      return;
+    }
+
+    const daysUntilExpiration = dayjs(expirationDate).diff(currentDate, 'day');
+
+    if (lt(daysUntilExpiration, 15)) {
+      showWarningMessage(t(labelLicenseWarning(module, daysUntilExpiration)));
+    }
+  }, [data]);
 };

package/src/utils/usePluralizedTranslation.ts

@@ -0,0 +1,21 @@
+import { useTranslation } from 'react-i18next';
+import pluralize from 'pluralize';
+
+interface TProps {
+  count: number;
+  label: string;
+}
+
+export const usePluralizedTranslation = (): {
+  pluralizedT: (props: TProps) => string;
+} => {
+  const translation = useTranslation();
+
+  const pluralizedT = ({ label, count }: TProps): string => {
+    return pluralize(translation.t(label), count);
+  };
+
+  return {
+    pluralizedT
+  };
+};

package/src/screens/dashboard/DashboardsDetail.stories.tsx

@@ -1,108 +0,0 @@
-/* eslint-disable  @typescript-eslint/no-non-null-assertion */
-import React, { ReactElement } from 'react';
-
-import { Meta } from '@storybook/react';
-
-import {
-  Add as AddIcon,
-  Settings as SettingsIcon,
-  Share as ShareIcon
-} from '@mui/icons-material';
-
-import {
-  Button,
-  IconButton,
-  Menu,
-  PageHeader,
-  PageLayout
-} from '../../components';
-
-const meta: Meta = {
-  args: {
-    actions: {}
-  },
-  parameters: {
-    layout: 'fullscreen'
-  },
-  title: 'screens/Dashboards detail'
-};
-
-export default meta;
-
-const DefaultView = (args): ReactElement => {
-  const { data } = args;
-
-  return (
-    <PageLayout>
-      <PageLayout.Header>
-        <PageHeader>
-          <PageHeader.Main>
-            <PageHeader.Menu>
-              <Menu>
-                <Menu.Button />
-                <Menu.Items>
-                  <Menu.Item>Menu Item</Menu.Item>
-                  <Menu.Item>Menu Item</Menu.Item>
-                  <Menu.Item>Menu Item</Menu.Item>
-                  <Menu.Divider />
-                  <Menu.Item>
-                    <Button
-                      icon={<AddIcon />}
-                      iconVariant="start"
-                      variant="ghost"
-                    >
-                      Add item
-                    </Button>
-                  </Menu.Item>
-                </Menu.Items>
-              </Menu>
-            </PageHeader.Menu>
-            <PageHeader.Title
-              description={data.dashboard.description}
-              title={data.dashboard.name}
-            />
-          </PageHeader.Main>
-        </PageHeader>
-      </PageLayout.Header>
-      <PageLayout.Body>
-        <PageLayout.Actions>
-          <IconButton
-            aria-label="edit"
-            data-testid="edit"
-            icon={<SettingsIcon />}
-            size="small"
-            variant="ghost"
-          />
-          <IconButton
-            aria-label="share"
-            data-testid="share"
-            icon={<ShareIcon />}
-            size="small"
-            variant="ghost"
-          />
-        </PageLayout.Actions>
-      </PageLayout.Body>
-    </PageLayout>
-  );
-};
-
-export const Default = {
-  args: {
-    data: {
-      dashboard: {
-        description:
-          'Description et culpa sit commodo ea enim excepteur elit. Velit irure velit tempor culpa commodo eu adipisicing eu proident ullamco.',
-        id: 1,
-        name: 'Dashboard 1'
-      }
-    }
-  },
-  render: DefaultView
-};
-
-export const AsEditLayoutState = {
-  args: {
-    ...Default.args
-  },
-  render: DefaultView
-};