Skip to content

Commit 341bd3d

Browse files
committed
chore!: remove storage tables for paginated tables
1 parent bc8acee commit 341bd3d

File tree

16 files changed

+53
-374
lines changed

16 files changed

+53
-374
lines changed

src/containers/Cluster/Cluster.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {cn} from '../../utils/cn';
2727
import {useTypedDispatch, useTypedSelector} from '../../utils/hooks';
2828
import {parseVersionsToVersionToColorMap} from '../../utils/versions';
2929
import {Nodes} from '../Nodes/Nodes';
30-
import {StorageWrapper} from '../Storage/StorageWrapper';
30+
import {PaginatedStorage} from '../Storage/PaginatedStorage';
3131
import {TabletsTable} from '../Tablets/TabletsTable';
3232
import {Tenants} from '../Tenants/Tenants';
3333
import {Versions} from '../Versions/Versions';
@@ -199,7 +199,7 @@ export function Cluster({
199199
getLocationObjectFromHref(getClusterPath(clusterTabsIds.storage)).pathname
200200
}
201201
>
202-
<StorageWrapper parentRef={container} />
202+
<PaginatedStorage parentRef={container} />
203203
</Route>
204204
<Route
205205
path={

src/containers/Node/Node.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {nodeApi} from '../../store/reducers/node/node';
2020
import type {AdditionalNodesProps} from '../../types/additionalProps';
2121
import {cn} from '../../utils/cn';
2222
import {useAutoRefreshInterval, useTypedDispatch} from '../../utils/hooks';
23-
import {StorageWrapper} from '../Storage/StorageWrapper';
23+
import {PaginatedStorage} from '../Storage/PaginatedStorage';
2424
import {Tablets} from '../Tablets';
2525

2626
import type {NodeTab} from './NodePages';
@@ -142,7 +142,13 @@ export function Node(props: NodeProps) {
142142
case STORAGE: {
143143
return (
144144
<div className={b('storage')} ref={container}>
145-
<StorageWrapper nodeId={nodeId} parentRef={container} />
145+
<PaginatedStorage
146+
nodeId={nodeId}
147+
parentRef={container}
148+
viewContext={{
149+
nodeId: nodeId?.toString(),
150+
}}
151+
/>
146152
</div>
147153
);
148154
}

src/containers/PDiskPage/PDiskPage.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {valueIsDefined} from '../../utils';
2525
import {cn} from '../../utils/cn';
2626
import {getPDiskId, getSeverityColor} from '../../utils/disks/helpers';
2727
import {useAutoRefreshInterval, useTypedDispatch, useTypedSelector} from '../../utils/hooks';
28-
import {StorageWrapper} from '../Storage/StorageWrapper';
28+
import {PaginatedStorage} from '../Storage/PaginatedStorage';
2929

3030
import {DecommissionButton} from './DecommissionButton/DecommissionButton';
3131
import {DecommissionLabel} from './DecommissionLabel/DecommissionLabel';
@@ -246,7 +246,15 @@ export function PDiskPage() {
246246
}
247247
case 'storage': {
248248
return pDiskParamsDefined ? (
249-
<StorageWrapper nodeId={nodeId} pDiskId={pDiskId} parentRef={containerRef} />
249+
<PaginatedStorage
250+
nodeId={nodeId}
251+
pDiskId={pDiskId}
252+
parentRef={containerRef}
253+
viewContext={{
254+
nodeId: nodeId?.toString(),
255+
pDiskId: pDiskId?.toString(),
256+
}}
257+
/>
250258
) : null;
251259
}
252260
default:

src/containers/Storage/PaginatedStorage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export interface PaginatedStorageProps {
1010
groupId?: string | number;
1111
pDiskId?: string | number;
1212

13-
viewContext: StorageViewContext;
13+
viewContext?: StorageViewContext;
1414

1515
parentRef: React.RefObject<HTMLElement>;
1616

@@ -25,15 +25,15 @@ export const PaginatedStorage = (props: PaginatedStorageProps) => {
2525
if (isNodes) {
2626
return (
2727
<PaginatedStorageNodes
28-
initialEntitiesCount={getStorageNodesInitialEntitiesCount(props.viewContext)}
28+
initialEntitiesCount={getStorageNodesInitialEntitiesCount(props.viewContext ?? {})}
2929
{...props}
3030
/>
3131
);
3232
}
3333

3434
return (
3535
<PaginatedStorageGroups
36-
initialEntitiesCount={getStorageGroupsInitialEntitiesCount(props.viewContext)}
36+
initialEntitiesCount={getStorageGroupsInitialEntitiesCount(props.viewContext ?? {})}
3737
{...props}
3838
/>
3939
);

src/containers/Storage/PaginatedStorageGroups.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function StorageGroupsComponent({
6464

6565
const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
6666
visibleEntities,
67-
viewContext,
67+
viewContext: viewContext ?? {},
6868
});
6969

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

114114
const {columnsToShow, columnsToSelect, setColumns} = useStorageGroupsSelectedColumns({
115115
visibleEntities,
116-
viewContext,
116+
viewContext: viewContext ?? {},
117117
});
118118

119119
const {currentData, isFetching, error} = storageApi.useGetStorageGroupsInfoQuery(

src/containers/Storage/PaginatedStorageNodes.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function StorageNodesComponent({
7171

7272
const {columnsToShow, columnsToSelect, setColumns} = useStorageNodesColumnsToSelect({
7373
database,
74-
viewContext,
74+
viewContext: viewContext ?? {},
7575
});
7676

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

120120
const {columnsToShow, columnsToSelect, setColumns} = useStorageNodesColumnsToSelect({
121121
database,
122-
viewContext,
122+
viewContext: viewContext ?? {},
123123
});
124124

125125
const {currentData, isFetching, error} = storageApi.useGetStorageNodesInfoQuery(
@@ -208,7 +208,7 @@ function useStorageNodesColumnsToSelect({
208208
viewContext,
209209
}: {
210210
database?: string;
211-
viewContext: StorageViewContext;
211+
viewContext?: StorageViewContext;
212212
}) {
213213
const {balancer} = useClusterBaseInfo();
214214
const {additionalNodesProps} = useAdditionalNodeProps({balancer});
@@ -218,6 +218,6 @@ function useStorageNodesColumnsToSelect({
218218
additionalNodesProps,
219219
visibleEntities,
220220
database,
221-
viewContext,
221+
viewContext: viewContext ?? {},
222222
});
223223
}

src/containers/Storage/Storage.tsx

Lines changed: 0 additions & 236 deletions
This file was deleted.

0 commit comments

Comments
 (0)