ydb-embedded-ui 22.3.0 → 22.5.0

package/dist/components/HoverPopup/HoverPopup.d.ts

@@ -4,14 +4,16 @@ type HoverPopupProps = {
     children: React.ReactNode;
     renderPopupContent: (controls: {
         onClose: VoidFunction;
+        holdOpen: () => VoidFunction;
     }) => React.ReactNode;
     showPopup?: boolean;
     anchorRef?: React.RefObject<HTMLElement>;
     onShowPopup?: VoidFunction;
     onHidePopup?: VoidFunction;
+    onClosePopup?: VoidFunction;
     delayOpen?: number;
     delayClose?: number;
     contentClassName?: string;
 } & Pick<PopupProps, 'placement' | 'offset'>;
-export declare const HoverPopup: ({ children, renderPopupContent, showPopup, offset, anchorRef, onShowPopup, onHidePopup, placement, contentClassName, delayClose, delayOpen, }: HoverPopupProps) => import("react/jsx-runtime").JSX.Element;
+export declare const HoverPopup: ({ children, renderPopupContent, showPopup, offset, anchorRef, onShowPopup, onHidePopup, onClosePopup, placement, contentClassName, delayClose, delayOpen, }: HoverPopupProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/HoverPopup/HoverPopup.js

@@ -5,27 +5,40 @@ import debounce from 'lodash/debounce';
 import { YDB_POPOVER_CLASS_NAME } from '../../utils/constants';
 import { useEventHandler } from '../../utils/hooks/useEventHandler';
 import { getPopupScrollContainer } from './getPopupScrollContainer';
+import { usePopupPriority } from './usePopupPriority';
 const DEBOUNCE_TIMEOUT = 100;
-function useVisibleAnchor(anchorElement, open) {
+function useVisibleAnchor(anchorElement, open, onHidden) {
     const [visibleAnchor, setVisibleAnchor] = React.useState(null);
+    // Mouse events can arrive before React renders the observer's next visibility state.
+    const visibleAnchorRef = React.useRef(null);
     React.useLayoutEffect(() => {
         setVisibleAnchor(null);
+        visibleAnchorRef.current = null;
         if (!open || !anchorElement) {
             return undefined;
         }
         const observer = new IntersectionObserver(([entry]) => {
-            setVisibleAnchor(entry.isIntersecting ? anchorElement : null);
+            visibleAnchorRef.current = entry.isIntersecting ? anchorElement : null;
+            setVisibleAnchor(visibleAnchorRef.current);
+            if (!entry.isIntersecting) {
+                onHidden();
+            }
         });
         observer.observe(anchorElement);
         return () => observer.disconnect();
-    }, [anchorElement, open]);
-    return anchorElement !== null && visibleAnchor === anchorElement;
+    }, [anchorElement, open, onHidden]);
+    return [anchorElement !== null && visibleAnchor === anchorElement, visibleAnchorRef];
 }
-export const HoverPopup = ({ children, renderPopupContent, showPopup, offset, anchorRef, onShowPopup, onHidePopup, placement = ['top', 'bottom', 'left', 'right'], contentClassName, delayClose = DEBOUNCE_TIMEOUT, delayOpen = DEBOUNCE_TIMEOUT, }) => {
+export const HoverPopup = ({ children, renderPopupContent, showPopup, offset, anchorRef, onShowPopup, onHidePopup, onClosePopup, placement = ['top', 'bottom', 'left', 'right'], contentClassName, delayClose = DEBOUNCE_TIMEOUT, delayOpen = DEBOUNCE_TIMEOUT, }) => {
     const [isPopupVisible, setIsPopupVisible] = React.useState(false);
     const [isPopupContentHovered, setIsPopupContentHovered] = React.useState(false);
     const [isFocused, setIsFocused] = React.useState(false);
+    const [hoverClosing, setHoverClosing] = React.useState(false);
+    const dialogHoldRef = React.useRef(null);
     const anchor = React.useRef(null);
+    const popupContent = React.useRef(null);
+    const { activate, zIndex } = usePopupPriority();
+    const bringToFront = useEventHandler(() => activate((anchorRef === null || anchorRef === void 0 ? void 0 : anchorRef.current) || anchor.current));
     const reportedOpenRef = React.useRef(false);
     const reportOpen = useEventHandler((nextOpen, force = false) => {
         if (!force && reportedOpenRef.current === nextOpen) {
@@ -43,28 +56,97 @@ export const HoverPopup = ({ children, renderPopupContent, showPopup, offset, an
         setIsPopupVisible(true);
         reportOpen(true);
     }, delayOpen), [delayOpen, reportOpen]);
-    const hidePopup = React.useCallback(() => {
+    const hidePopup = useEventHandler(() => {
+        if (dialogHoldRef.current || isFocused) {
+            return;
+        }
+        setHoverClosing(open && visibleAnchorRef.current === anchorElement);
         setIsPopupVisible(false);
-    }, []);
-    const debouncedHandleHidePopup = React.useMemo(() => debounce(() => {
-        hidePopup();
         reportOpen(false);
-    }, delayClose), [delayClose, reportOpen, hidePopup]);
+    });
+    const debouncedHandleHidePopup = React.useMemo(() => debounce(hidePopup, delayClose), [delayClose, hidePopup]);
     React.useEffect(() => {
         return () => {
             debouncedHandleShowPopup.cancel();
             debouncedHandleHidePopup.cancel();
+            dialogHoldRef.current = null;
         };
     }, [debouncedHandleShowPopup, debouncedHandleHidePopup]);
     const closePopup = React.useCallback(() => {
         debouncedHandleShowPopup.cancel();
         debouncedHandleHidePopup.cancel();
+        dialogHoldRef.current = null;
         setIsPopupVisible(false);
         setIsPopupContentHovered(false);
         setIsFocused(false);
+        setHoverClosing(false);
         reportOpen(false, true);
-    }, [debouncedHandleHidePopup, debouncedHandleShowPopup, reportOpen]);
-    const onMouseEnter = () => {
+        onClosePopup === null || onClosePopup === void 0 ? void 0 : onClosePopup();
+    }, [debouncedHandleHidePopup, debouncedHandleShowPopup, onClosePopup, reportOpen]);
+    const hideClippedPopup = useEventHandler(() => {
+        debouncedHandleShowPopup.cancel();
+        setIsPopupContentHovered(false);
+        setIsFocused(false);
+        setHoverClosing(false);
+        debouncedHandleHidePopup();
+    });
+    const internalOpen = isPopupVisible || isPopupContentHovered || isFocused;
+    const open = Boolean(internalOpen || showPopup);
+    const anchorElement = (anchorRef === null || anchorRef === void 0 ? void 0 : anchorRef.current) || anchor.current;
+    // Release only this popup's hover source; a hovered peer can keep the pair open.
+    const [isAnchorVisible, visibleAnchorRef] = useVisibleAnchor(anchorElement, open || hoverClosing, hideClippedPopup);
+    const container = getPopupScrollContainer(anchorElement);
+    React.useEffect(() => {
+        if (!hoverClosing || !anchorElement) {
+            return undefined;
+        }
+        // Escape may close this popup through its paired sibling's handler.
+        const preventHoverReturn = (event) => {
+            if (event.key === 'Escape') {
+                setHoverClosing(false);
+            }
+        };
+        const doc = anchorElement.ownerDocument;
+        doc.addEventListener('keydown', preventHoverReturn, true);
+        return () => doc.removeEventListener('keydown', preventHoverReturn, true);
+    }, [anchorElement, hoverClosing]);
+    const resumeHover = useEventHandler(() => {
+        var _a;
+        const contentHovered = Boolean((_a = popupContent.current) === null || _a === void 0 ? void 0 : _a.matches(':hover'));
+        const hovered = visibleAnchorRef.current === anchorElement &&
+            ((anchorElement === null || anchorElement === void 0 ? void 0 : anchorElement.matches(':hover')) || contentHovered);
+        debouncedHandleShowPopup.cancel();
+        debouncedHandleHidePopup.cancel();
+        setIsFocused(false);
+        setIsPopupContentHovered(Boolean(hovered && contentHovered));
+        if (hovered) {
+            setIsPopupVisible(true);
+            reportOpen(true);
+        }
+        else {
+            debouncedHandleHidePopup();
+        }
+    });
+    const holdOpen = () => {
+        const interaction = {};
+        dialogHoldRef.current = interaction;
+        debouncedHandleShowPopup.cancel();
+        debouncedHandleHidePopup.cancel();
+        setIsFocused(false);
+        setIsPopupVisible(true);
+        reportOpen(true);
+        return () => {
+            if (dialogHoldRef.current === interaction) {
+                dialogHoldRef.current = null;
+                resumeHover();
+            }
+        };
+    };
+    const onMouseEnter = (event) => {
+        if (event.buttons !== 0) {
+            return;
+        }
+        bringToFront();
         debouncedHandleHidePopup.cancel();
         debouncedHandleShowPopup();
     };
@@ -72,42 +154,63 @@ export const HoverPopup = ({ children, renderPopupContent, showPopup, offset, an
         debouncedHandleShowPopup.cancel();
         debouncedHandleHidePopup();
     };
-    const onPopupMouseEnter = React.useCallback(() => {
+    const onPopupMouseEnter = React.useCallback((event) => {
+        if ((!open && !hoverClosing) || visibleAnchorRef.current !== anchorElement) {
+            return;
+        }
+        if (event.buttons === 0) {
+            bringToFront();
+        }
         debouncedHandleHidePopup.cancel();
+        setHoverClosing(false);
+        setIsPopupVisible(true);
         setIsPopupContentHovered(true);
         reportOpen(true);
-    }, [reportOpen, debouncedHandleHidePopup]);
+    }, [
+        bringToFront,
+        reportOpen,
+        debouncedHandleHidePopup,
+        open,
+        hoverClosing,
+        visibleAnchorRef,
+        anchorElement,
+    ]);
     const onPopupMouseLeave = React.useCallback(() => {
         setIsPopupContentHovered(false);
         debouncedHandleHidePopup();
     }, [debouncedHandleHidePopup]);
     const onPopupContextMenu = React.useCallback(() => {
+        if (dialogHoldRef.current || !open || visibleAnchorRef.current !== anchorElement) {
+            return;
+        }
+        bringToFront();
         setIsFocused(true);
         reportOpen(true);
-    }, [reportOpen]);
-    const onPopupBlur = React.useCallback(() => {
-        setIsFocused(false);
-    }, []);
+    }, [bringToFront, reportOpen, open, visibleAnchorRef, anchorElement]);
+    const onPopupBlur = useEventHandler(() => {
+        if (isFocused && !dialogHoldRef.current) {
+            resumeHover();
+        }
+    });
     const onPopupEscapeKeyDown = React.useCallback(() => {
-        closePopup();
+        if (!dialogHoldRef.current) {
+            closePopup();
+        }
     }, [closePopup]);
-    const internalOpen = isPopupVisible || isPopupContentHovered || isFocused;
-    const open = Boolean(internalOpen || showPopup);
-    const anchorElement = (anchorRef === null || anchorRef === void 0 ? void 0 : anchorRef.current) || anchor.current;
-    // Clipping a paired disk must not clear the shared hover state via onHidePopup.
-    const isAnchorVisible = useVisibleAnchor(anchorElement, open);
-    const container = getPopupScrollContainer(anchorElement);
-    return (_jsxs(React.Fragment, { children: [_jsx("span", { ref: anchor, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, children: children }), anchorElement ? (_jsx(Popup, { container: container, 
+    return (_jsxs(React.Fragment, { children: [_jsx("span", { ref: anchor, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, children: children }), anchorElement ? (_jsx(Popup, { container: container, zIndex: zIndex, 
                 // Keep portal typography when the page uses a different font.
                 floatingStyles: { fontFamily: 'var(--g-text-body-font-family)' }, anchorElement: anchorElement, onOpenChange: (_open, _event, reason) => {
                     if (reason === 'escape-key') {
                         onPopupEscapeKeyDown();
                     }
+                    else if (reason === 'outside-press') {
+                        onPopupBlur();
+                    }
                 }, placement: placement, 
                 // Exiting popups must not expand the page when their anchors scroll offscreen.
-                strategy: "fixed", returnFocus: false, hasArrow: true, open: open && isAnchorVisible, 
+                strategy: "fixed", returnFocus: false, hasArrow: true, open: open && isAnchorVisible, onTransitionOutComplete: () => setHoverClosing(false), 
                 // bigger offset for easier switching to neighbour nodes
                 // matches the default offset for popup with arrow out of a sense of beauty
-                offset: offset || { mainAxis: 12, crossAxis: 0 }, children: _jsx("div", { className: contentClassName, onContextMenu: onPopupContextMenu, onMouseEnter: onPopupMouseEnter, onMouseLeave: onPopupMouseLeave, onBlur: onPopupBlur, children: _jsx("div", { className: YDB_POPOVER_CLASS_NAME, children: renderPopupContent({ onClose: closePopup }) }) }) })) : null] }));
+                offset: offset || { mainAxis: 12, crossAxis: 0 }, children: _jsx("div", { ref: popupContent, className: contentClassName, onContextMenu: onPopupContextMenu, onMouseEnter: onPopupMouseEnter, onMouseLeave: onPopupMouseLeave, onBlur: onPopupBlur, children: _jsx("div", { className: YDB_POPOVER_CLASS_NAME, children: renderPopupContent({ onClose: closePopup, holdOpen }) }) }) })) : null] }));
 };
 //# sourceMappingURL=HoverPopup.js.map

package/dist/components/HoverPopup/HoverPopup.js.map

@@ -1 +1 @@
-{"version":3,"file":"HoverPopup.js","sourceRoot":"","sources":["../../../src/components/HoverPopup/HoverPopup.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"HoverPopup.js","sourceRoot":"","sources":["../../../src/components/HoverPopup/HoverPopup.tsx"],"names":[],"mappings":"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"}

package/dist/components/HoverPopup/usePopupPriority.d.ts

@@ -0,0 +1,4 @@
+export declare function usePopupPriority(): {
+    activate: (element: HTMLElement | null) => void;
+    zIndex: number;
+};

package/dist/components/HoverPopup/usePopupPriority.js

@@ -0,0 +1,30 @@
+import React from 'react';
+// Only the previously active popup needs updating when another one is entered.
+const activePopups = new WeakMap();
+export function usePopupPriority() {
+    const [active, setActive] = React.useState(false);
+    const documentRef = React.useRef();
+    const deactivate = React.useCallback(() => setActive(false), []);
+    const activate = React.useCallback((element) => {
+        if (!element) {
+            return;
+        }
+        const doc = element.ownerDocument;
+        const previous = activePopups.get(doc);
+        if (previous !== deactivate) {
+            previous === null || previous === void 0 ? void 0 : previous();
+            activePopups.set(doc, deactivate);
+        }
+        documentRef.current = doc;
+        setActive(true);
+    }, [deactivate]);
+    React.useEffect(() => () => {
+        const doc = documentRef.current;
+        if (doc && activePopups.get(doc) === deactivate) {
+            activePopups.delete(doc);
+        }
+    }, [deactivate]);
+    // Keep tooltips, menus and modal dialogs (Gravity UI's default 1000) above cards.
+    return { activate, zIndex: active ? 999 : 998 };
+}
+//# sourceMappingURL=usePopupPriority.js.map

package/dist/components/HoverPopup/usePopupPriority.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"usePopupPriority.js","sourceRoot":"","sources":["../../../src/components/HoverPopup/usePopupPriority.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,+EAA+E;AAC/E,MAAM,YAAY,GAAG,IAAI,OAAO,EAA0B,CAAC;AAE3D,MAAM,UAAU,gBAAgB;IAC5B,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,EAAY,CAAC;IAC7C,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAC9B,CAAC,OAA2B,EAAE,EAAE;QAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QACD,MAAM,GAAG,GAAG,OAAO,CAAC,aAAa,CAAC;QAClC,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YAC1B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,EAAI,CAAC;YACb,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACtC,CAAC;QACD,WAAW,CAAC,OAAO,GAAG,GAAG,CAAC;QAC1B,SAAS,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,EACD,CAAC,UAAU,CAAC,CACf,CAAC;IAEF,KAAK,CAAC,SAAS,CACX,GAAG,EAAE,CAAC,GAAG,EAAE;QACP,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC;QAChC,IAAI,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,UAAU,EAAE,CAAC;YAC9C,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACL,CAAC,EACD,CAAC,UAAU,CAAC,CACf,CAAC;IAEF,kFAAkF;IAClF,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAC,CAAC;AAClD,CAAC"}

package/dist/components/MemoryViewer/MemoryViewer.d.ts

@@ -3,10 +3,12 @@ import type { FormatProgressViewerValues } from '../../utils/progress';
 import './MemoryViewer.scss';
 export interface MemoryProgressViewerProps {
     stats: TMemoryStats;
+    memoryUsed?: string;
+    memoryLimit?: string;
     className?: string;
     warningThreshold?: number;
     dangerThreshold?: number;
     formatValues: FormatProgressViewerValues;
     percents?: boolean;
 }
-export declare function MemoryViewer({ stats, percents, formatValues, className, warningThreshold, dangerThreshold, }: MemoryProgressViewerProps): import("react/jsx-runtime").JSX.Element;
+export declare function MemoryViewer({ stats, memoryUsed, memoryLimit, percents, formatValues, className, warningThreshold, dangerThreshold, }: MemoryProgressViewerProps): "—" | import("react/jsx-runtime").JSX.Element;

package/dist/components/MemoryViewer/MemoryViewer.js

@@ -2,12 +2,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DefinitionList, Flex, useTheme } from '@gravity-ui/uikit';
 import { formatBytes } from '../../utils/bytesParsers';
 import { cn } from '../../utils/cn';
-import { GIGABYTE } from '../../utils/constants';
+import { EMPTY_DATA_PLACEHOLDER, GIGABYTE } from '../../utils/constants';
+import { getNodeMemory } from '../../utils/memory';
 import { calculateProgressStatus } from '../../utils/progress';
-import { isNumeric } from '../../utils/utils';
+import { isNumeric, parseOptionalNonNegativeNumber } from '../../utils/utils';
 import { HoverPopup } from '../HoverPopup/HoverPopup';
 import { ProgressViewer } from '../ProgressViewer/ProgressViewer';
-import { calculateAllocatedMemory, getMemorySegments } from './utils';
+import { getMemorySegments } from './utils';
 import './MemoryViewer.scss';
 const MIN_VISIBLE_MEMORY_SHARE = 1;
 const MIN_VISIBLE_MEMORY_VALUE = 0.01 * GIGABYTE;
@@ -28,21 +29,25 @@ const formatDetailedValues = (value, total) => {
         }),
     ];
 };
-export function MemoryViewer({ stats, percents, formatValues, className, warningThreshold, dangerThreshold, }) {
-    var _a;
-    const memoryUsage = (_a = stats.AnonRss) !== null && _a !== void 0 ? _a : calculateAllocatedMemory(stats);
-    const capacity = stats.HardLimit;
+export function MemoryViewer({ stats, memoryUsed, memoryLimit, percents, formatValues, className, warningThreshold, dangerThreshold, }) {
+    const { memoryUsed: memoryUsage, memoryLimit: capacity } = getNodeMemory({
+        MemoryStats: stats,
+        MemoryUsed: memoryUsed,
+        MemoryLimit: memoryLimit,
+    });
     const theme = useTheme();
-    let fillWidth = Math.floor((parseFloat(String(memoryUsage)) / parseFloat(String(capacity))) * 100) || 0;
-    fillWidth = fillWidth > 100 ? 100 : fillWidth;
+    if (memoryUsage === undefined) {
+        return EMPTY_DATA_PLACEHOLDER;
+    }
+    const fillWidth = capacity === undefined ? 0 : Math.min(100, Math.floor((memoryUsage / capacity) * 100));
     let valueText = memoryUsage, capacityText = capacity, divider = '/';
-    if (percents) {
+    if (percents && capacity !== undefined) {
         valueText = fillWidth + '%';
         capacityText = '';
         divider = '';
     }
     else if (formatValues) {
-        [valueText, capacityText] = formatValues(Number(memoryUsage), Number(capacity));
+        [valueText, capacityText] = formatValues(memoryUsage, capacity);
     }
     const renderContent = () => {
         if (isNumeric(capacity)) {
@@ -51,12 +56,16 @@ export function MemoryViewer({ stats, percents, formatValues, className, warning
         return valueText;
     };
     const calculateMemoryShare = (segmentSize) => {
-        if (!memoryUsage) {
+        if (!memoryUsage || capacity === undefined) {
             return 0;
         }
-        return (segmentSize / parseFloat(String(capacity))) * 100;
+        return (segmentSize / capacity) * 100;
     };
-    const memorySegments = getMemorySegments(stats, Number(memoryUsage));
+    // Without anonymous RSS, the backend's MemoryUsed excludes allocator caches.
+    const memorySegments = getMemorySegments(stats, memoryUsage, {
+        allocatorCachesIncludedInUsage: parseOptionalNonNegativeNumber(stats.AnonRss) !== undefined,
+        memoryLimit: capacity,
+    });
     const status = calculateProgressStatus({
         fillWidth,
         warningThreshold,
@@ -69,8 +78,8 @@ export function MemoryViewer({ stats, percents, formatValues, className, warning
                     size: 'gb',
                     withSizeLabel: true,
                     precision: 2,
-                })) }, label))) })), children: _jsx("div", { className: b({ theme, status }, className), children: _jsxs("div", { className: b('progress-container'), children: [memorySegments
-                        .filter(({ isInfo }) => !isInfo)
+                })) }, label))) })), children: _jsx("div", { className: b({ theme, status }, className), children: _jsxs("div", { className: capacity === undefined ? undefined : b('progress-container'), children: [memorySegments
+                        .filter(({ isInfo }) => !isInfo && capacity !== undefined)
                         .map((segment) => {
                         if (segment.value < MIN_VISIBLE_MEMORY_VALUE) {
                             return null;

package/dist/components/MemoryViewer/MemoryViewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryViewer.js","sourceRoot":"","sources":["../../../src/components/MemoryViewer/MemoryViewer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MemoryViewer.js","sourceRoot":"","sources":["../../../src/components/MemoryViewer/MemoryViewer.tsx"],"names":[],"mappings":"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"}

package/dist/components/MemoryViewer/i18n/en.json

@@ -5,8 +5,9 @@
     "text_memtable": "MemTable",
     "text_query-execution": "Query Execution",
     "text_usage": "Usage",
-    "text_soft-limit": "Soft Limit",
-    "text_hard-limit": "Hard Limit",
+    "text_soft-limit": "Memory Controller Soft Limit",
+    "text_hard-limit": "Memory Controller Hard Limit",
     "text_other": "Other",
-    "text_memory-details": "Memory Details"
+    "text_memory-details": "Memory Details",
+    "text_memory-limit": "Memory Limit"
 }

package/dist/components/MemoryViewer/i18n/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (key: "text_external-consumption" | "text_allocator-caches" | "text_shared-cache" | "text_memtable" | "text_query-execution" | "text_usage" | "text_soft-limit" | "text_hard-limit" | "text_other" | "text_memory-details", params?: import("@gravity-ui/i18n").Params) => string;
+declare const _default: (key: "text_external-consumption" | "text_allocator-caches" | "text_shared-cache" | "text_memtable" | "text_query-execution" | "text_usage" | "text_soft-limit" | "text_hard-limit" | "text_other" | "text_memory-details" | "text_memory-limit", params?: import("@gravity-ui/i18n").Params) => string;
 export default _default;

package/dist/components/MemoryViewer/utils.d.ts

@@ -1,5 +1,4 @@
 import type { TMemoryStats } from '../../types/api/nodes';
-export declare function calculateAllocatedMemory(stats: TMemoryStats): string;
 export interface MemorySegment {
     label: string;
     key: string;
@@ -9,4 +8,7 @@ export interface MemorySegment {
 }
 export declare const MEMORY_SEGMENT_COLORS: Record<string, string>;
 export declare function getMemorySegmentColor(key: string): string;
-export declare function getMemorySegments(stats: TMemoryStats, memoryUsage: number): MemorySegment[];
+export declare function getMemorySegments(stats: TMemoryStats, memoryUsage: number, { allocatorCachesIncludedInUsage, memoryLimit, }?: {
+    allocatorCachesIncludedInUsage?: boolean;
+    memoryLimit?: number;
+}): MemorySegment[];

package/dist/components/MemoryViewer/utils.js

@@ -1,10 +1,5 @@
-import { isNumeric } from '../../utils/utils';
+import { isNumeric, parseOptionalNonNegativeNumber } from '../../utils/utils';
 import i18n from './i18n';
-export function calculateAllocatedMemory(stats) {
-    const allocatedMemory = getMaybeNumber(stats.AllocatedMemory) || 0;
-    const allocatorCaches = getMaybeNumber(stats.AllocatorCachesMemory) || 0;
-    return String(allocatedMemory + allocatorCaches);
-}
 function getMaybeNumber(value) {
     return isNumeric(value) ? parseFloat(String(value)) : undefined;
 }
@@ -19,7 +14,7 @@ export const MEMORY_SEGMENT_COLORS = {
 export function getMemorySegmentColor(key) {
     return MEMORY_SEGMENT_COLORS[key] || MEMORY_SEGMENT_COLORS['Other'];
 }
-export function getMemorySegments(stats, memoryUsage) {
+export function getMemorySegments(stats, memoryUsage, { allocatorCachesIncludedInUsage = true, memoryLimit, } = {}) {
     const segments = [
         {
             label: i18n('text_shared-cache'),
@@ -46,10 +41,10 @@ export function getMemorySegments(stats, memoryUsage) {
             label: i18n('text_allocator-caches'),
             key: 'AllocatorCachesMemory',
             value: getMaybeNumber(stats.AllocatorCachesMemory),
-            isInfo: false,
+            isInfo: !allocatorCachesIncludedInUsage,
         },
     ];
-    const nonInfoSegments = segments.filter((segment) => segment.value !== undefined);
+    const nonInfoSegments = segments.filter((segment) => !segment.isInfo && segment.value !== undefined);
     const sumNonInfoSegments = nonInfoSegments.reduce((acc, segment) => acc + segment.value, 0);
     const otherMemory = Math.max(0, memoryUsage - sumNonInfoSegments);
     segments.push({
@@ -68,15 +63,20 @@ export function getMemorySegments(stats, memoryUsage) {
         key: 'Usage',
         value: memoryUsage,
         isInfo: true,
+    }, {
+        label: i18n('text_memory-limit'),
+        key: 'MemoryLimit',
+        value: memoryLimit,
+        isInfo: true,
     }, {
         label: i18n('text_soft-limit'),
         key: 'SoftLimit',
-        value: getMaybeNumber(stats.SoftLimit),
+        value: parseOptionalNonNegativeNumber(stats.SoftLimit) || undefined,
         isInfo: true,
     }, {
         label: i18n('text_hard-limit'),
         key: 'HardLimit',
-        value: getMaybeNumber(stats.HardLimit),
+        value: parseOptionalNonNegativeNumber(stats.HardLimit) || undefined,
         isInfo: true,
     });
     return segments.filter((segment) => segment.value !== undefined);

package/dist/components/MemoryViewer/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/MemoryViewer/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/components/MemoryViewer/utils.ts"],"names":[],"mappings":"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"}

package/dist/components/PDiskInfo/PDiskInfo.d.ts

@@ -1,13 +1,8 @@
 import type { PreparedPDisk } from '../../utils/disks/types';
-interface GetPDiskInfoOptions<T extends PreparedPDisk> {
-    pDisk?: T;
-    nodeId?: number | string | null;
-    withPDiskPageLink?: boolean;
-    hasDeveloperUi?: boolean;
-    capacityMetricsEnabled?: boolean;
-}
-interface PDiskInfoProps<T extends PreparedPDisk> extends GetPDiskInfoOptions<T> {
+import './PDiskInfo.scss';
+interface PDiskInfoProps {
+    pDisk?: PreparedPDisk;
     className?: string;
 }
-export declare function PDiskInfo<T extends PreparedPDisk>({ pDisk, nodeId, withPDiskPageLink, className, }: PDiskInfoProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function PDiskInfo({ pDisk, className }: PDiskInfoProps): import("react/jsx-runtime").JSX.Element;
 export {};