Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/containers/Cluster/Cluster.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {cn} from '../../utils/cn';
import {useTypedDispatch, useTypedSelector} from '../../utils/hooks';
import {parseVersionsToVersionToColorMap} from '../../utils/versions';
import {Nodes} from '../Nodes/Nodes';
import {StorageWrapper} from '../Storage/StorageWrapper';
import {PaginatedStorage} from '../Storage/PaginatedStorage';
import {TabletsTable} from '../Tablets/TabletsTable';
import {Tenants} from '../Tenants/Tenants';
import {Versions} from '../Versions/Versions';
Expand Down Expand Up @@ -199,7 +199,7 @@ export function Cluster({
getLocationObjectFromHref(getClusterPath(clusterTabsIds.storage)).pathname
}
>
<StorageWrapper parentRef={container} />
<PaginatedStorage parentRef={container} />
</Route>
<Route
path={
Expand Down
10 changes: 8 additions & 2 deletions src/containers/Node/Node.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {nodeApi} from '../../store/reducers/node/node';
import type {AdditionalNodesProps} from '../../types/additionalProps';
import {cn} from '../../utils/cn';
import {useAutoRefreshInterval, useTypedDispatch} from '../../utils/hooks';
import {StorageWrapper} from '../Storage/StorageWrapper';
import {PaginatedStorage} from '../Storage/PaginatedStorage';
import {Tablets} from '../Tablets';

import type {NodeTab} from './NodePages';
Expand Down Expand Up @@ -142,7 +142,13 @@ export function Node(props: NodeProps) {
case STORAGE: {
return (
<div className={b('storage')} ref={container}>
<StorageWrapper nodeId={nodeId} parentRef={container} />
<PaginatedStorage
nodeId={nodeId}
parentRef={container}
viewContext={{
nodeId: nodeId?.toString(),
}}
/>
</div>
);
}
Expand Down
12 changes: 10 additions & 2 deletions src/containers/PDiskPage/PDiskPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {valueIsDefined} from '../../utils';
import {cn} from '../../utils/cn';
import {getPDiskId, getSeverityColor} from '../../utils/disks/helpers';
import {useAutoRefreshInterval, useTypedDispatch, useTypedSelector} from '../../utils/hooks';
import {StorageWrapper} from '../Storage/StorageWrapper';
import {PaginatedStorage} from '../Storage/PaginatedStorage';

import {DecommissionButton} from './DecommissionButton/DecommissionButton';
import {DecommissionLabel} from './DecommissionLabel/DecommissionLabel';
Expand Down Expand Up @@ -246,7 +246,15 @@ export function PDiskPage() {
}
case 'storage': {
return pDiskParamsDefined ? (
<StorageWrapper nodeId={nodeId} pDiskId={pDiskId} parentRef={containerRef} />
<PaginatedStorage
nodeId={nodeId}
pDiskId={pDiskId}
parentRef={containerRef}
viewContext={{
nodeId: nodeId?.toString(),
pDiskId: pDiskId?.toString(),
}}
/>
) : null;
}
default:
Expand Down
6 changes: 3 additions & 3 deletions src/containers/Storage/PaginatedStorage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export interface PaginatedStorageProps {
groupId?: string | number;
pDiskId?: string | number;

viewContext: StorageViewContext;
viewContext?: StorageViewContext;

parentRef: React.RefObject<HTMLElement>;

Expand All @@ -25,15 +25,15 @@ export const PaginatedStorage = (props: PaginatedStorageProps) => {
if (isNodes) {
return (
<PaginatedStorageNodes
initialEntitiesCount={getStorageNodesInitialEntitiesCount(props.viewContext)}
initialEntitiesCount={getStorageNodesInitialEntitiesCount(props.viewContext ?? {})}
{...props}
/>
);
}

return (
<PaginatedStorageGroups
initialEntitiesCount={getStorageGroupsInitialEntitiesCount(props.viewContext)}
initialEntitiesCount={getStorageGroupsInitialEntitiesCount(props.viewContext ?? {})}
{...props}
/>
);
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Storage/PaginatedStorageGroups.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function StorageGroupsComponent({

const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
visibleEntities,
viewContext,
viewContext: viewContext ?? {},
});

const renderControls: RenderControls = ({totalEntities, foundEntities, inited}) => {
Expand Down Expand Up @@ -113,7 +113,7 @@ function GroupedStorageGroupsComponent({

const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
visibleEntities,
viewContext,
viewContext: viewContext ?? {},
});

const {currentData, isFetching, error} = storageApi.useGetStorageGroupsInfoQuery(
Expand Down
8 changes: 4 additions & 4 deletions src/containers/Storage/PaginatedStorageNodes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function StorageNodesComponent({

const {columnsToShow, columnsToSelect, setColumns} = useStorageNodesColumnsToSelect({
database,
viewContext,
viewContext: viewContext ?? {},
});

const renderControls: RenderControls = ({totalEntities, foundEntities, inited}) => {
Expand Down Expand Up @@ -119,7 +119,7 @@ function GroupedStorageNodesComponent({

const {columnsToShow, columnsToSelect, setColumns} = useStorageNodesColumnsToSelect({
database,
viewContext,
viewContext: viewContext ?? {},
});

const {currentData, isFetching, error} = storageApi.useGetStorageNodesInfoQuery(
Expand Down Expand Up @@ -208,7 +208,7 @@ function useStorageNodesColumnsToSelect({
viewContext,
}: {
database?: string;
viewContext: StorageViewContext;
viewContext?: StorageViewContext;
}) {
const {balancer} = useClusterBaseInfo();
const {additionalNodesProps} = useAdditionalNodeProps({balancer});
Expand All @@ -218,6 +218,6 @@ function useStorageNodesColumnsToSelect({
additionalNodesProps,
visibleEntities,
database,
viewContext,
viewContext: viewContext ?? {},
});
}
236 changes: 0 additions & 236 deletions src/containers/Storage/Storage.tsx

This file was deleted.

Loading
Loading