ydb-embedded-ui 4.31.2 → 4.33.0

package/dist/components/CellWithPopover/CellWithPopover.scss

@@ -1,13 +1,20 @@
 .ydb-cell-with-popover {
     display: flex;
 
+    max-width: 100%;
+
     &__popover {
         display: inline-block;
         overflow: hidden;
 
         max-width: 100%;
 
+        vertical-align: middle;
         white-space: nowrap;
         text-overflow: ellipsis;
+
+        .yc-popover__handler {
+            display: inline;
+        }
     }
 }

package/dist/components/Loader/Loader.tsx

@@ -7,11 +7,12 @@ const b = cn('ydb-loader');
 
 interface LoaderProps {
     size?: LoaderSize;
+    className?: string;
 }
 
-export const Loader = ({size = 'm'}: LoaderProps) => {
+export const Loader = ({size = 'm', className}: LoaderProps) => {
     return (
-        <div className={b()}>
+        <div className={b(null, className)}>
             <KitLoader size={size} />
         </div>
     );

package/dist/components/MetricChart/MetricChart.tsx

@@ -6,13 +6,19 @@ import ChartKit, {settings} from '@gravity-ui/chartkit';
 import type {IResponseError} from '../../types/api/error';
 import type {TimeFrame} from '../../utils/timeframes';
 import {useAutofetcher} from '../../utils/hooks';
+
 import {COLORS} from '../../utils/versions';
 import {cn} from '../../utils/cn';
 
 import {Loader} from '../Loader';
 import {ResponseError} from '../Errors/ResponseError';
 
-import type {ChartOptions, MetricDescription, PreparedMetricsData} from './types';
+import type {
+    ChartOptions,
+    MetricDescription,
+    OnChartDataStatusChange,
+    PreparedMetricsData,
+} from './types';
 import {convertResponse} from './convertReponse';
 import {getDefaultDataFormatter} from './getDefaultDataFormatter';
 import {getChartData} from './getChartData';
@@ -102,6 +108,15 @@ interface DiagnosticsChartProps {
     width?: number;
 
     chartOptions?: ChartOptions;
+
+    onChartDataStatusChange?: OnChartDataStatusChange;
+
+    /**
+     * YAGR charts don't render correctly inside not visible elements\
+     * So if chart is used inside component with 'display:none', it will be empty, when visibility change\
+     * Pass isChartVisible prop to ensure proper chart render
+     */
+    isChartVisible?: boolean;
 }
 
 export const MetricChart = ({
@@ -112,6 +127,8 @@ export const MetricChart = ({
     width = 400,
     height = width / 1.5,
     chartOptions,
+    onChartDataStatusChange,
+    isChartVisible,
 }: DiagnosticsChartProps) => {
     const mounted = useRef(false);
 
@@ -127,6 +144,20 @@ export const MetricChart = ({
         initialChartState,
     );
 
+    useEffect(() => {
+        if (error) {
+            return onChartDataStatusChange?.('error');
+        }
+        if (loading && !wasLoaded) {
+            return onChartDataStatusChange?.('loading');
+        }
+        if (!loading && wasLoaded) {
+            return onChartDataStatusChange?.('success');
+        }
+
+        return undefined;
+    }, [loading, wasLoaded, error, onChartDataStatusChange]);
+
     const fetchChartData = useCallback(
         async (isBackground: boolean) => {
             dispatch(setChartDataLoading());
@@ -146,7 +177,9 @@ export const MetricChart = ({
                 });
 
                 // Hack to prevent setting value to state, if component unmounted
-                if (!mounted.current) return;
+                if (!mounted.current) {
+                    return;
+                }
 
                 // In some cases error could be in response with 200 status code
                 // It happens when request is OK, but chart data cannot be returned due to some reason
@@ -155,10 +188,14 @@ export const MetricChart = ({
                     const preparedData = convertResponse(response, metrics);
                     dispatch(setChartData(preparedData));
                 } else {
-                    dispatch(setChartError({statusText: response.error}));
+                    const err = {statusText: response.error};
+
+                    throw err;
                 }
             } catch (err) {
-                if (!mounted.current) return;
+                if (!mounted.current) {
+                    return;
+                }
 
                 dispatch(setChartError(err as IResponseError));
             }
@@ -175,6 +212,10 @@ export const MetricChart = ({
             return <Loader />;
         }
 
+        if (!isChartVisible) {
+            return null;
+        }
+
         return (
             <div className={b('chart')}>
                 <ChartKit type="yagr" data={convertedData} />

package/dist/components/MetricChart/index.ts

@@ -1,2 +1,2 @@
-export type {MetricDescription, Metric, ChartOptions} from './types';
+export * from './types';
 export {MetricChart} from './MetricChart';

package/dist/components/MetricChart/types.ts

@@ -30,3 +30,6 @@ export type ChartDataType = 'ms' | 'size';
 export interface ChartOptions {
     dataType?: ChartDataType;
 }
+
+export type ChartDataStatus = 'loading' | 'success' | 'error';
+export type OnChartDataStatusChange = (newStatus: ChartDataStatus) => void;

package/dist/components/VirtualTable/TableHead.tsx

@@ -1,14 +1,21 @@
-import {useState} from 'react';
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+
+import type {
+    HandleTableColumnsResize,
+    TableColumnsWidthSetup,
+} from '../../utils/hooks/useTableResize';
 
 import type {Column, OnSort, SortOrderType, SortParams} from './types';
 import {ASCENDING, DEFAULT_SORT_ORDER, DEFAULT_TABLE_ROW_HEIGHT, DESCENDING} from './constants';
 import {b} from './shared';
 
+const COLUMN_NAME_HTML_ATTRIBUTE = 'data-columnname';
+
 // Icon similar to original DataTable icons to keep the same tables across diferent pages and tabs
 const SortIcon = ({order}: {order?: SortOrderType}) => {
     return (
         <svg
-            className={b('icon', {desc: order === DESCENDING})}
+            className={b('sort-icon', {desc: order === DESCENDING})}
             viewBox="0 0 10 6"
             width="10"
             height="6"
@@ -27,7 +34,7 @@ interface ColumnSortIconProps {
 const ColumnSortIcon = ({sortOrder, sortable, defaultSortOrder}: ColumnSortIconProps) => {
     if (sortable) {
         return (
-            <span className={b('sort-icon', {shadow: !sortOrder})}>
+            <span className={b('sort-icon-container', {shadow: !sortOrder})}>
                 <SortIcon order={sortOrder || defaultSortOrder} />
             </span>
         );
@@ -36,9 +43,84 @@ const ColumnSortIcon = ({sortOrder, sortable, defaultSortOrder}: ColumnSortIconP
     }
 };
 
+interface TableHeadCellProps<T> {
+    column: Column<T>;
+    sortOrder?: SortOrderType;
+    defaultSortOrder: SortOrderType;
+    onSort?: (columnName: string) => void;
+    rowHeight: number;
+    onCellMount?: (element: Element) => void;
+    onCellUnMount?: (element: Element) => void;
+}
+
+export const TableHeadCell = <T,>({
+    column,
+    sortOrder,
+    defaultSortOrder,
+    onSort,
+    rowHeight,
+    onCellMount,
+    onCellUnMount,
+}: TableHeadCellProps<T>) => {
+    const cellWrapperRef = useRef<HTMLDivElement>(null);
+
+    useEffect(() => {
+        const cellWrapper = cellWrapperRef.current;
+        if (cellWrapper) {
+            onCellMount?.(cellWrapper);
+        }
+        return () => {
+            if (cellWrapper) {
+                onCellUnMount?.(cellWrapper);
+            }
+        };
+    }, [onCellMount, onCellUnMount]);
+
+    const content = column.header ?? column.name;
+
+    return (
+        <th>
+            <div
+                ref={cellWrapperRef}
+                className={b('head-cell-wrapper', {
+                    resizeable: column.resizeable,
+                })}
+                style={{
+                    height: `${rowHeight}px`,
+                    width: `${column.width}px`,
+                }}
+                {...{
+                    [COLUMN_NAME_HTML_ATTRIBUTE]: column.name,
+                }}
+            >
+                <div
+                    className={b(
+                        'head-cell',
+                        {align: column.align, sortable: column.sortable},
+                        column.className,
+                    )}
+                    onClick={() => {
+                        if (column.sortable) {
+                            onSort?.(column.name);
+                        }
+                    }}
+                >
+                    <div className={b('head-cell-content')}>{content}</div>
+                    <ColumnSortIcon
+                        sortOrder={sortOrder}
+                        sortable={column.sortable}
+                        defaultSortOrder={defaultSortOrder}
+                    />
+                </div>
+            </div>
+        </th>
+    );
+};
+
 interface TableHeadProps<T> {
     columns: Column<T>[];
     onSort?: OnSort;
+    onColumnsResize?: HandleTableColumnsResize;
     defaultSortOrder?: SortOrderType;
     rowHeight?: number;
 }
@@ -46,11 +128,44 @@ interface TableHeadProps<T> {
 export const TableHead = <T,>({
     columns,
     onSort,
+    onColumnsResize,
     defaultSortOrder = DEFAULT_SORT_ORDER,
     rowHeight = DEFAULT_TABLE_ROW_HEIGHT,
 }: TableHeadProps<T>) => {
     const [sortParams, setSortParams] = useState<SortParams>({});
 
+    const isTableResizeable = Boolean(onColumnsResize);
+
+    const resizeObserver: ResizeObserver | undefined = useMemo(() => {
+        if (!isTableResizeable) {
+            return undefined;
+        }
+
+        return new ResizeObserver((entries) => {
+            const columnsWidth: TableColumnsWidthSetup = {};
+            entries.forEach((entry) => {
+                // @ts-ignore ignore custrom property usage
+                const id = entry.target.attributes[COLUMN_NAME_HTML_ATTRIBUTE]?.value;
+                columnsWidth[id] = entry.contentRect.width;
+            });
+
+            onColumnsResize?.(columnsWidth);
+        });
+    }, [onColumnsResize, isTableResizeable]);
+
+    const handleCellMount = useCallback(
+        (element: Element) => {
+            resizeObserver?.observe(element);
+        },
+        [resizeObserver],
+    );
+    const handleCellUnMount = useCallback(
+        (element: Element) => {
+            resizeObserver?.unobserve(element);
+        },
+        [resizeObserver],
+    );
+
     const handleSort = (columnId: string) => {
         let newSortParams: SortParams = {};
 
@@ -95,34 +210,20 @@ export const TableHead = <T,>({
             <thead className={b('head')}>
                 <tr>
                     {columns.map((column) => {
-                        const content = column.header ?? column.name;
                         const sortOrder =
                             sortParams.columnId === column.name ? sortParams.sortOrder : undefined;
 
                         return (
-                            <th
+                            <TableHeadCell
                                 key={column.name}
-                                className={b(
-                                    'th',
-                                    {align: column.align, sortable: column.sortable},
-                                    column.className,
-                                )}
-                                style={{
-                                    height: `${rowHeight}px`,
-                                }}
-                                onClick={() => {
-                                    handleSort(column.name);
-                                }}
-                            >
-                                <div className={b('head-cell')}>
-                                    {content}
-                                    <ColumnSortIcon
-                                        sortOrder={sortOrder}
-                                        sortable={column.sortable}
-                                        defaultSortOrder={defaultSortOrder}
-                                    />
-                                </div>
-                            </th>
+                                column={column}
+                                sortOrder={sortOrder}
+                                defaultSortOrder={defaultSortOrder}
+                                onSort={handleSort}
+                                rowHeight={rowHeight}
+                                onCellMount={handleCellMount}
+                                onCellUnMount={handleCellUnMount}
+                            />
                         );
                     })}
                 </tr>

package/dist/components/VirtualTable/TableRow.tsx

@@ -8,14 +8,25 @@ import {b} from './shared';
 
 interface TableCellProps {
     height: number;
+    width: number;
     align?: AlignType;
     children: ReactNode;
     className?: string;
 }
 
-const TableRowCell = ({children, className, height, align = DEFAULT_ALIGN}: TableCellProps) => {
+const TableRowCell = ({
+    children,
+    className,
+    height,
+    width,
+    align = DEFAULT_ALIGN,
+}: TableCellProps) => {
+    // Additional maxWidth to ensure overflow hidden for <td>
     return (
-        <td className={b('td', {align: align}, className)} style={{height: `${height}px`}}>
+        <td
+            className={b('row-cell', {align: align}, className)}
+            style={{height: `${height}px`, width: `${width}px`, maxWidth: `${width}px`}}
+        >
             {children}
         </td>
     );
@@ -35,6 +46,7 @@ export const LoadingTableRow = <T,>({index, columns, height}: LoadingTableRowPro
                     <TableRowCell
                         key={`${column.name}${index}`}
                         height={height}
+                        width={column.width}
                         align={column.align}
                         className={column.className}
                     >
@@ -64,6 +76,7 @@ export const TableRow = <T,>({row, index, columns, getRowClassName, height}: Tab
                     <TableRowCell
                         key={`${column.name}${index}`}
                         height={height}
+                        width={column.width}
                         align={column.align}
                         className={column.className}
                     >

package/dist/components/VirtualTable/VirtualTable.scss

@@ -6,8 +6,6 @@
     --virtual-table-cell-vertical-padding: 5px;
     --virtual-table-cell-horizontal-padding: 10px;
 
-    --virtual-table-sort-icon-space: 18px;
-
     --virtual-table-border-color: var(--g-color-base-generic-hover);
     --virtual-table-hover-color: var(--g-color-base-float-hover);
 
@@ -21,6 +19,10 @@
         table-layout: fixed;
         border-spacing: 0;
         border-collapse: separate;
+
+        th {
+            padding: 0;
+        }
     }
 
     &__row {
@@ -40,96 +42,96 @@
         @include sticky-top();
     }
 
-    &__th {
-        position: relative;
-
-        padding: var(--virtual-table-cell-vertical-padding)
-            var(--virtual-table-cell-horizontal-padding);
-
-        font-weight: bold;
-        cursor: default;
-        text-align: left;
+    &__sort-icon-container {
+        display: flex;
+        justify-content: center;
 
-        border-bottom: $cell-border;
+        color: inherit;
 
-        &_sortable {
-            cursor: pointer;
+        &_shadow {
+            opacity: 0.15;
+        }
+    }
 
-            #{$block}__head-cell {
-                padding-right: var(--virtual-table-sort-icon-space);
-            }
+    &__sort-icon {
+        &_desc {
+            transform: rotate(180deg);
+        }
+    }
 
-            &#{$block}__th_align_right {
-                #{$block}__head-cell {
-                    padding-right: 0;
-                    padding-left: var(--virtual-table-sort-icon-space);
-                }
+    &__head-cell-wrapper {
+        display: flex;
+        overflow-x: hidden;
 
-                #{$block}__sort-icon {
-                    right: auto;
-                    left: 0;
+        border-bottom: $cell-border;
 
-                    transform: translate(0, -50%) scaleX(-1);
-                }
-            }
+        &_resizeable {
+            resize: horizontal;
         }
     }
 
     &__head-cell {
-        position: relative;
-
-        display: inline-block;
-        overflow: hidden;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
 
-        box-sizing: border-box;
+        width: 100%;
         max-width: 100%;
+        padding: var(--virtual-table-cell-vertical-padding)
+            var(--virtual-table-cell-horizontal-padding);
 
-        vertical-align: top;
-        white-space: nowrap;
-        text-overflow: ellipsis;
+        &_align {
+            &_left {
+                justify-content: left;
+            }
+            &_center {
+                justify-content: center;
+            }
+            &_right {
+                justify-content: right;
+            }
+        }
     }
 
-    &__sort-icon {
-        position: absolute;
-        top: 50%;
-        right: 0;
-
-        display: inline-flex;
+    &__head-cell {
+        gap: 8px;
 
-        color: inherit;
+        font-weight: bold;
+        cursor: default;
 
-        transform: translate(0, -50%);
+        &_sortable {
+            cursor: pointer;
 
-        &_shadow {
-            opacity: 0.15;
+            &#{$block}__head-cell_align_right {
+                flex-direction: row-reverse;
+            }
         }
     }
 
-    &__icon {
-        vertical-align: top;
+    // Separate head cell content class for correct text ellipsis overflow
+    &__head-cell-content {
+        overflow: hidden;
 
-        &_desc {
-            transform: rotate(180deg);
-        }
+        width: min-content;
+
+        white-space: nowrap;
+        text-overflow: ellipsis;
     }
 
-    &__td {
-        overflow: hidden;
+    &__row-cell {
+        display: table-cell;
+        overflow-x: hidden;
 
+        width: 100%;
+        max-width: 100%;
         padding: var(--virtual-table-cell-vertical-padding)
             var(--virtual-table-cell-horizontal-padding);
 
+        vertical-align: middle;
         white-space: nowrap;
         text-overflow: ellipsis;
 
         border-bottom: $cell-border;
-    }
-
-    &__td,
-    &__th {
-        height: 40px;
-
-        vertical-align: middle;
 
         &_align {
             &_left {

package/dist/components/VirtualTable/VirtualTable.tsx

@@ -1,5 +1,7 @@
 import {useState, useReducer, useRef, useCallback, useEffect} from 'react';
 
+import type {HandleTableColumnsResize} from '../../utils/hooks/useTableResize';
+
 import type {IResponseError} from '../../types/api/error';
 import {getArray} from '../../utils';
 
@@ -45,9 +47,12 @@ interface VirtualTableProps<T> {
     rowHeight?: number;
     parentContainer?: Element | null;
     initialSortParams?: SortParams;
+    onColumnsResize?: HandleTableColumnsResize;
+
     renderControls?: RenderControls;
     renderEmptyDataMessage?: RenderEmptyDataMessage;
     renderErrorMessage?: RenderErrorMessage;
+
     dependencyArray?: unknown[]; // Fully reload table on params change
 }
 
@@ -59,6 +64,7 @@ export const VirtualTable = <T,>({
     rowHeight = DEFAULT_TABLE_ROW_HEIGHT,
     parentContainer,
     initialSortParams,
+    onColumnsResize,
     renderControls,
     renderEmptyDataMessage,
     renderErrorMessage,
@@ -258,7 +264,11 @@ export const VirtualTable = <T,>({
     const renderTable = () => {
         return (
             <table className={b('table')}>
-                <TableHead columns={columns} onSort={handleSort} />
+                <TableHead
+                    columns={columns}
+                    onSort={handleSort}
+                    onColumnsResize={onColumnsResize}
+                />
                 {renderData()}
             </table>
         );

package/dist/components/VirtualTable/types.ts

@@ -28,6 +28,7 @@ export interface Column<T> {
     header?: ReactNode;
     className?: string;
     sortable?: boolean;
+    resizeable?: boolean;
     render: (props: {row: T; index: number}) => ReactNode;
     width: number;
     align: AlignType;

package/dist/components/VirtualTable/useIntersectionObserver.ts

@@ -6,6 +6,7 @@ import {DEFAULT_INTERSECTION_OBSERVER_MARGIN} from './constants';
 interface UseIntersectionObserverProps {
     onEntry: OnEntry;
     onLeave: OnLeave;
+    /** Intersection observer calculate margins based on container element properties */
     parentContainer?: Element | null;
 }