@centreon/ui 25.10.15 → 25.10.16

package/package.json

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

package/src/Dashboard/Item.tsx

@@ -1,28 +1,29 @@
+import { Card, useTheme } from '@mui/material';
+
+import { useAtomValue } from 'jotai';
+import { equals, isNil, omit, type } from 'ramda';
 import {
-  CSSProperties,
-  ForwardedRef,
-  MouseEvent,
-  ReactElement,
-  forwardRef,
+  type CSSProperties,
+  type MouseEvent,
+  type ReactElement,
+  RefObject,
   useEffect,
   useMemo
 } from 'react';
 
-import { useAtomValue } from 'jotai';
-import { equals, isNil, omit, type } from 'ramda';
-
-import { Card, useTheme } from '@mui/material';
-import LoadingSkeleton from '../LoadingSkeleton';
 import ExpandableContainer from '../components/ExpandableContainer';
-import { Parameters } from '../components/ExpandableContainer/models';
+import type { Parameters } from '../components/ExpandableContainer/models';
 import { useMemoComponent, useViewportIntersection } from '../utils';
-import { useDashboardItemStyles } from './Dashboard.styles';
 import { isResizingItemAtom } from './atoms';
+import { useDashboardItemStyles } from './Dashboard.styles';
 
 interface DashboardItemProps {
   additionalMemoProps?: Array<unknown>;
   canMove?: boolean;
-  children: ReactElement;
+  children: Array<
+    | ReactElement
+    | (({ isInViewport }: { isInViewport: boolean }) => ReactElement)
+  >;
   className?: string;
   disablePadding?: boolean;
   header?: ReactElement | ((params: Parameters) => ReactElement);
@@ -31,148 +32,140 @@ interface DashboardItemProps {
   onMouseUp?: (e: MouseEvent<HTMLDivElement>) => void;
   onTouchEnd?: (e) => void;
   style?: CSSProperties;
+  ref?: RefObject<HTMLDivElement>;
 }
 
-const Item = forwardRef<HTMLDivElement, DashboardItemProps>(
-  (
-    {
-      children,
-      style,
-      className,
-      header,
-      onMouseDown,
-      onMouseUp,
-      onTouchEnd,
-      id,
-      disablePadding = false,
-      canMove = false,
-      additionalMemoProps = []
-    }: DashboardItemProps,
-    ref: ForwardedRef<HTMLDivElement>
-  ): ReactElement => {
-    const { isInViewport, setElement } = useViewportIntersection({
-      rootMargin: '140px 0px 140px 0px'
-    });
-    const hasHeader = !isNil(header);
-
-    const { classes, cx } = useDashboardItemStyles({ hasHeader });
-    const theme = useTheme();
-
-    const isResizingItem = useAtomValue(isResizingItemAtom);
-
-    const isResizing = useMemo(
-      () => equals(id, isResizingItem),
-      [isResizingItem, id]
-    );
-
-    const sanitizedReactGridLayoutClassName = useMemo(
-      () => (isResizing ? className : className?.replace(' resizing ', '')),
-      [className, isResizing]
-    );
-
-    const listeners = {
-      onMouseDown,
-      onMouseUp,
-      onTouchEnd
-    };
-
-    const cardContainerListeners = !hasHeader ? listeners : {};
-
-    useEffect(() => {
-      if (isNil(ref?.current)) {
-        return;
-      }
-
-      setElement(ref.current);
-    }, [ref]);
-
-    const newTransform =
-      style?.transform &&
-      `translate3d(${style.transform.match(/translate\(([a-z0-9\ \,\-]+)\)/)[1]}, 0px)`;
-
-    return useMemoComponent({
-      Component: (
-        <div
-          {...cardContainerListeners}
-          className={sanitizedReactGridLayoutClassName}
-          ref={ref}
-          style={{
-            ...omit(['transform'], style || {}),
-            transform: newTransform
-          }}
-        >
-          <ExpandableContainer>
-            {({ isExpanded, label, key, ...rest }) => {
-              const canControl = isExpanded ? false : canMove;
-
-              const childrenHeader = equals(type(header), 'Function')
-                ? (header as (params: Parameters) => ReactElement)({
-                    isExpanded,
-                    label,
-                    ref,
-                    key,
-                    ...rest
-                  })
-                : header;
-
-              return (
-                <div key={key} className={classes.widgetSubContainer}>
-                  <Card
-                    className={classes.widgetContainer}
-                    data-padding={!disablePadding}
-                  >
-                    {childrenHeader && (
-                      <div
-                        className={classes.widgetHeader}
-                        data-can-move={canControl}
-                      >
-                        {canControl && (
-                          <div
-                            {...listeners}
-                            className={classes.widgetHeaderDraggable}
-                            data-testid={`${id}_move_panel`}
-                          />
-                        )}
-                        {childrenHeader}
-                      </div>
-                    )}
+const Item = ({
+  children,
+  style,
+  className,
+  header,
+  onMouseDown,
+  onMouseUp,
+  onTouchEnd,
+  id,
+  disablePadding = false,
+  canMove = false,
+  additionalMemoProps = [],
+  ref
+}: DashboardItemProps): ReactElement => {
+  const { isInViewport, setElement } = useViewportIntersection({
+    rootMargin: '140px 0px 140px 0px'
+  });
+  const hasHeader = !isNil(header);
+
+  const { classes, cx } = useDashboardItemStyles({ hasHeader });
+  const theme = useTheme();
+
+  const isResizingItem = useAtomValue(isResizingItemAtom);
+
+  const isResizing = useMemo(
+    () => equals(id, isResizingItem),
+    [isResizingItem, id]
+  );
+
+  const sanitizedReactGridLayoutClassName = useMemo(
+    () => (isResizing ? className : className?.replace(' resizing ', '')),
+    [className, isResizing]
+  );
+
+  const listeners = {
+    onMouseDown,
+    onMouseUp,
+    onTouchEnd
+  };
+
+  const cardContainerListeners = !hasHeader ? listeners : {};
+
+  useEffect(() => {
+    if (isNil(ref?.current)) {
+      return;
+    }
+
+    setElement(ref.current);
+  }, [ref, setElement]);
+
+  const newTransform =
+    style?.transform &&
+    `translate3d(${style.transform.match(/translate\(([a-z0-9 ,-]+)\)/)?.[1]}, 0px)`;
+
+  return useMemoComponent({
+    Component: (
+      <div
+        {...cardContainerListeners}
+        className={sanitizedReactGridLayoutClassName}
+        ref={ref}
+        style={{
+          ...omit(['transform'], style || {}),
+          transform: newTransform
+        }}
+      >
+        <ExpandableContainer>
+          {({ isExpanded, label, key, ...rest }) => {
+            const canControl = isExpanded ? false : canMove;
+
+            const childrenHeader = equals(type(header), 'Function')
+              ? (header as (params: Parameters) => ReactElement)({
+                  isExpanded,
+                  key,
+                  label,
+                  ref: ref as RefObject<HTMLDivElement>,
+                  ...rest
+                })
+              : (header as ReactElement);
+
+            return (
+              <div className={classes.widgetSubContainer} key={key}>
+                <Card
+                  className={classes.widgetContainer}
+                  data-padding={!disablePadding}
+                >
+                  {childrenHeader && (
                     <div
-                      className={cx(
-                        classes.widgetContent,
-                        !disablePadding && classes.widgetPadding
-                      )}
+                      className={classes.widgetHeader}
+                      data-can-move={canControl}
                     >
-                      {!isInViewport ? (
-                        <LoadingSkeleton
-                          animation={false}
-                          data-widget-skeleton={id}
-                          height="100%"
-                          width="100%"
+                      {canControl && (
+                        <div
+                          {...listeners}
+                          className={classes.widgetHeaderDraggable}
+                          data-testid={`${id}_move_panel`}
                         />
-                      ) : (
-                        children
                       )}
+                      {childrenHeader}
                     </div>
-                  </Card>
-                </div>
-              );
-            }}
-          </ExpandableContainer>
-        </div>
-      ),
-      memoProps: isInViewport
-        ? [
-            style,
-            className,
-            header,
-            theme.palette.mode,
-            canMove,
-            isInViewport,
-            ...additionalMemoProps
-          ]
-        : [isInViewport, theme.palette.mode, style]
-    });
-  }
-);
+                  )}
+                  <div
+                    className={cx(
+                      classes.widgetContent,
+                      !disablePadding && classes.widgetPadding
+                    )}
+                  >
+                    {children.map((child) =>
+                      typeof child === 'function'
+                        ? child({ isInViewport })
+                        : child
+                    )}
+                  </div>
+                </Card>
+              </div>
+            );
+          }}
+        </ExpandableContainer>
+      </div>
+    ),
+    memoProps: isInViewport
+      ? [
+          style,
+          className,
+          header,
+          theme.palette.mode,
+          canMove,
+          isInViewport,
+          ...additionalMemoProps
+        ]
+      : [isInViewport, theme.palette.mode, style]
+  });
+};
 
 export default Item;

package/src/api/useGraphQuery/index.ts

@@ -37,6 +37,7 @@ interface UseMetricsQueryProps {
     timePeriodType: number;
   };
   isEnabled?: boolean;
+  enforceIsEnabled?: boolean;
 }
 
 interface UseMetricsQueryState {
@@ -103,7 +104,8 @@ const useGraphQuery = ({
   refreshCount,
   bypassQueryParams = false,
   prefix,
-  isEnabled = true
+  isEnabled = true,
+  enforceIsEnabled
 }: UseMetricsQueryProps): UseMetricsQueryState => {
   const timePeriodToUse = equals(timePeriod?.timePeriodType, -1)
     ? {
@@ -161,9 +163,10 @@ const useGraphQuery = ({
     ],
     queryOptions: {
       enabled:
-        areResourcesFullfilled(resources) &&
-        !isEmpty(definedMetrics) &&
-        isEnabled,
+        enforceIsEnabled ??
+        (areResourcesFullfilled(resources) &&
+          !isEmpty(definedMetrics) &&
+          isEnabled),
       refetchInterval: refreshInterval,
       suspense: false
     },

package/src/utils/useViewportIntersection.ts

@@ -18,10 +18,9 @@ export const useViewportIntersection = (
       observer.current.disconnect();
     }
 
-    observer.current = new window.IntersectionObserver(
-      ([newEntry]) => setEntry(newEntry),
-      options
-    );
+    observer.current = new window.IntersectionObserver(([newEntry]) => {
+      setEntry(newEntry);
+    }, options);
 
     if (element) {
       observer.current.observe(element);