@centreon/ui 24.4.1-MON-34407-implement-the-status-chart-widget.26 → 24.4.1-MON-37085-fix-fullscreen.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "24.4.1-MON-34407-implement-the-status-chart-widget.26",
+  "version": "24.4.1-MON-37085-fix-fullscreen.2",
   "description": "Centreon UI Components",
   "scripts": {
     "eslint": "eslint ./src --ext .js,.jsx,.ts,.tsx --max-warnings 0",

package/src/Graph/BarStack/BarStack.stories.tsx

@@ -58,6 +58,11 @@ export const WithoutTitle: Story = {
   render: Template
 };
 
+export const WithPencentage: Story = {
+  args: { data, title: 'hosts', unit: 'percentage' },
+  render: Template
+};
+
 export const WithoutLegend: Story = {
   args: { data, displayLegend: false, title: 'hosts' },
 
@@ -69,11 +74,6 @@ export const withDisplayedValues: Story = {
   render: Template
 };
 
-export const WithPencentage: Story = {
-  args: { data, displayValues: true, title: 'hosts', unit: 'percentage' },
-  render: Template
-};
-
 export const WithTooltip: Story = {
   args: { TooltipContent, data, title: 'hosts' },
   render: Template

package/src/Graph/BarStack/BarStack.styles.ts

@@ -16,7 +16,7 @@ export const useBarStackStyles = makeStyles()((theme) => ({
   svgContainer: {
     alignItems: 'center',
     backgroundColor: theme.palette.background.panelGroups,
-    borderRadius: theme.spacing(1.25),
+    borderRadius: theme.shape.borderRadius,
     display: 'flex',
     justifyContent: 'center'
   },
@@ -31,7 +31,6 @@ export const useBarStackStyles = makeStyles()((theme) => ({
     fontSize: theme.typography.h6.fontSize,
     fontWeight: theme.typography.fontWeightMedium,
     margin: 0,
-    padding: 0,
-    textAlign: 'center'
+    padding: 0
   }
 }));

package/src/Graph/BarStack/ResponsiveBarStack.tsx

@@ -5,7 +5,6 @@ import { Group } from '@visx/group';
 import numeral from 'numeral';
 import { Text } from '@visx/text';
 import { useTranslation } from 'react-i18next';
-import { equals } from 'ramda';
 
 import { Typography } from '@mui/material';
 
@@ -13,7 +12,7 @@ import { Tooltip } from '../../components';
 import { LegendProps } from '../Legend/models';
 import { Legend as LegendComponent } from '../Legend';
 import { getValueByUnit } from '../common/utils';
-import { labelNoDataFound as defaultlabelNoDataFound } from '../translatedLabels';
+import { labelNoDataFound } from '../translatedLabels';
 
 import { BarStackProps } from './models';
 import { useBarStackStyles } from './BarStack.styles';
@@ -36,8 +35,7 @@ const BarStack = ({
   unit = 'number',
   displayValues,
   variant = 'vertical',
-  legendDirection = 'column',
-  labelNoDataFound = defaultlabelNoDataFound
+  legendDirection = 'column'
 }: BarStackProps & { height: number; width: number }): JSX.Element => {
   const { t } = useTranslation();
   const { classes } = useBarStackStyles();
@@ -92,7 +90,7 @@ const BarStack = ({
       >
         {title && (
           <div className={classes.title} data-testid="Title" ref={titleRef}>
-            {`${numeral(total).format('0a').toUpperCase()} `} {t(title)}
+            {`${numeral(total).format('0a').toUpperCase()} `} {title}
           </div>
         )}
         <div
@@ -119,20 +117,6 @@ const BarStack = ({
                 {(barStacks) =>
                   barStacks.map((barStack) =>
                     barStack.bars.map((bar) => {
-                      const shouldDisplayValues = (): boolean => {
-                        if (bar.height < 10) {
-                          return false;
-                        }
-
-                        return (
-                          (equals(unit, 'number') && bar.width > 10) ||
-                          (equals(unit, 'percentage') && bar.width > 25)
-                        );
-                      };
-
-                      const TextX = bar.x + bar.width / 2;
-                      const TextY = bar.y + bar.height / 2;
-
                       const onClick = (): void => {
                         onSingleBarClick?.(bar);
                       };
@@ -160,38 +144,40 @@ const BarStack = ({
                             isVerticalBar ? 'right-start' : 'bottom-start'
                           }
                         >
-                          <g data-testid={bar.key} onClick={onClick}>
+                          <g data-testid={bar.key}>
                             <rect
-                              cursor="pointer"
                               fill={bar.color}
                               height={
                                 isVerticalBar ? bar.height - 1 : bar.height
                               }
                               key={`bar-stack-${barStack.index}-${bar.index}`}
-                              ry={10}
+                              ry={5}
                               width={isVerticalBar ? bar.width : bar.width - 1}
                               x={bar.x}
                               y={bar.y}
+                              onClick={onClick}
                             />
-                            {displayValues && shouldDisplayValues() && (
-                              <Text
-                                cursor="pointer"
-                                data-testid="value"
-                                fill="#000"
-                                fontSize={12}
-                                fontWeight={600}
-                                textAnchor="middle"
-                                verticalAnchor="middle"
-                                x={TextX}
-                                y={TextY}
-                              >
-                                {getValueByUnit({
-                                  total,
-                                  unit,
-                                  value: barStack.bars[0].bar.data[barStack.key]
-                                })}
-                              </Text>
-                            )}
+                            {displayValues &&
+                              bar.height > 10 &&
+                              bar.width > 10 && (
+                                <Text
+                                  cursor="pointer"
+                                  data-testid="value"
+                                  fill="#000"
+                                  fontSize={12}
+                                  textAnchor="middle"
+                                  verticalAnchor="middle"
+                                  x={bar.x + bar.width / 2}
+                                  y={bar.y + bar.height / 2}
+                                >
+                                  {getValueByUnit({
+                                    total,
+                                    unit,
+                                    value:
+                                      barStack.bars[0].bar.data[barStack.key]
+                                  })}
+                                </Text>
+                              )}
                           </g>
                         </Tooltip>
                       );

package/src/Graph/BarStack/models.ts

@@ -10,7 +10,6 @@ export type BarStackProps = {
   data: Array<BarType>;
   displayLegend?: boolean;
   displayValues?: boolean;
-  labelNoDataFound?: string;
   legendDirection?: 'row' | 'column';
   onSingleBarClick?: (barData) => void;
   size?: number;

package/src/Graph/BarStack/useResponsiveBarStack.ts

@@ -55,7 +55,7 @@ const useResponsiveBarStack = ({
   const verticalGap = heightOfTitle > 0 ? 8 : 0;
 
   const svgWrapperWidth = isVerticalBar
-    ? size + 36
+    ? size + 24
     : width - widthOfLegend - horizontalGap;
 
   const svgContainerSize = {
@@ -72,7 +72,8 @@ const useResponsiveBarStack = ({
 
   const yScale = isVerticalBar
     ? scaleLinear({
-        domain: [0, total]
+        domain: [0, total],
+        nice: true
       })
     : scaleBand({
         domain: [0, 0],
@@ -85,7 +86,8 @@ const useResponsiveBarStack = ({
         padding: 0
       })
     : scaleLinear({
-        domain: [0, total]
+        domain: [0, total],
+        nice: true
       });
 
   const keys = pluck('label', data);

package/src/Graph/PieChart/ResponsivePie.tsx

@@ -13,7 +13,7 @@ import { Tooltip } from '../../components';
 import { Legend as LegendComponent } from '../Legend';
 import { LegendProps } from '../Legend/models';
 import { getValueByUnit } from '../common/utils';
-import { labelNoDataFound as defaultlabelNoDataFound } from '../translatedLabels';
+import { labelNoDataFound } from '../translatedLabels';
 
 import { PieProps } from './models';
 import { usePieStyles } from './PieChart.styles';
@@ -54,8 +54,7 @@ const ResponsivePie = ({
   onArcClick,
   displayValues,
   TooltipContent,
-  legendDirection = 'column',
-  labelNoDataFound = defaultlabelNoDataFound
+  legendDirection = 'column'
 }: PieProps & { height: number; width: number }): JSX.Element => {
   const { t } = useTranslation();
   const theme = useTheme();
@@ -110,7 +109,7 @@ const ResponsivePie = ({
       >
         {equals(variant, 'pie') && title && (
           <div className={classes.title} data-testid="Title" ref={titleRef}>
-            {`${numeral(total).format('0a').toUpperCase()} `} {t(title)}
+            {`${numeral(total).format('0a').toUpperCase()} `} {title}
           </div>
         )}
         <div
@@ -179,7 +178,6 @@ const ResponsivePie = ({
                       >
                         <g data-testid={arc.data.label} onClick={onClick}>
                           <path
-                            cursor="pointer"
                             d={pie.path(arc) as string}
                             fill={arc.data.color}
                           />
@@ -191,7 +189,6 @@ const ResponsivePie = ({
                                 dy=".33em"
                                 fill="#000"
                                 fontSize={12}
-                                fontWeight={600}
                                 pointerEvents="none"
                                 textAnchor="middle"
                                 x={x}
@@ -227,7 +224,7 @@ const ResponsivePie = ({
                     fill={theme.palette.text.primary}
                     textAnchor="middle"
                   >
-                    {t(title)}
+                    {title}
                   </Text>
                 </>
               )}

package/src/Graph/PieChart/models.ts

@@ -11,7 +11,6 @@ export interface PieProps {
   displayLegend?: boolean;
   displayValues?: boolean;
   innerRadius?: number;
-  labelNoDataFound?: string;
   legendDirection?: 'row' | 'column';
   onArcClick?: (ardata) => void;
   title?: string;

package/src/Graph/PieChart/useResponsivePie.ts

@@ -41,11 +41,12 @@ export const useResponsivePie = ({
   const horizontalGap = widthOfLegend > 0 ? 16 : 0;
   const verticalGap = heightOfTitle > 0 ? 8 : 0;
 
+  const svgWrapperWidth = width - widthOfLegend - horizontalGap;
+
   const svgContainerSize = Math.min(
     height - heightOfTitle - verticalGap,
     width - widthOfLegend - horizontalGap
   );
-  const svgWrapperWidth = svgContainerSize;
 
   const outerRadius = Math.min(32, svgContainerSize / 6);
 

package/src/utils/useFullscreen/Fullscreen.cypress.spec.tsx

@@ -22,6 +22,8 @@ const ChildComponent = (): JSX.Element => {
       <Button onClick={() => toggleFullscreen(document.body)}>
         {isFullscreenActivated ? labelExitFullscreen : labelEnterFullscreen}
       </Button>
+      <input id="input" />
+      <textarea id="textarea" />
     </div>
   );
 };
@@ -94,16 +96,35 @@ describe('Fullscreen', () => {
       .should('have.attr', 'data-fullscreenActivated', 'false')
       .should('have.attr', 'data-fullscreenEnabled', 'true');
 
-    cy.get('#test').realPress(['Alt', 'F']);
+    cy.get('#test').realPress(['F']);
 
     cy.get('#test')
       .should('have.attr', 'data-fullscreenActivated', 'true')
       .should('have.attr', 'data-fullscreenEnabled', 'true');
 
-    cy.get('#test').realPress(['Alt', 'F']);
+    cy.get('#test').realPress(['F']);
 
     cy.get('#test')
       .should('have.attr', 'data-fullscreenActivated', 'false')
       .should('have.attr', 'data-fullscreenEnabled', 'true');
   });
+
+  ['input', 'textarea'].forEach((tag) => {
+    it(`cannot toggle fullscreen feature using the shortcut when ${tag === 'input' ? 'an' : 'a'} ${tag} is focused`, () => {
+      initialize();
+
+      cy.get('#test')
+        .should('have.attr', 'data-fullscreenActivated', 'false')
+        .should('have.attr', 'data-fullscreenEnabled', 'true');
+
+      cy.get(`#${tag}`).focus();
+
+      cy.get('#test').realPress(['F']);
+
+      cy.get('#test')
+        .should('have.attr', 'data-fullscreenActivated', 'false')
+        .should('have.attr', 'data-fullscreenEnabled', 'true');
+      cy.get(`#${tag}`).should('have.value', 'F');
+    });
+  });
 });

package/src/utils/useFullscreen/useFullscreenListener.ts

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 
-import { equals } from 'ramda';
+import { equals, includes } from 'ramda';
 import { useSearchParams } from 'react-router-dom';
 
 import { useDeepCompare } from '../useMemoComponent';
@@ -16,7 +16,10 @@ export const useFullscreenListener = (): boolean => {
     useFullscreen();
 
   const toggle = (event: KeyboardEvent): void => {
-    if (!event.altKey || !equals(event.code, 'KeyF')) {
+    if (
+      includes(document.activeElement?.tagName, ['INPUT', 'TEXTAREA']) ||
+      !equals(event.code, 'KeyF')
+    ) {
       return;
     }