Skip to content

Commit b12599e

Browse files
authored
chore!: only pagination tables in storage (#1745)
1 parent 189174a commit b12599e

File tree

25 files changed

+491
-492
lines changed

25 files changed

+491
-492
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: 1 addition & 1 deletion
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

src/containers/Storage/PaginatedStorageNodes.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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});

src/containers/Storage/Storage.tsx

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

src/containers/Storage/StorageGroups/columns/hooks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from './constants';
1515
import type {GetStorageGroupsColumnsParams} from './types';
1616

17-
export function useGetStorageGroupsColumns(viewContext: StorageViewContext) {
17+
export function useGetStorageGroupsColumns(viewContext?: StorageViewContext) {
1818
return React.useMemo(() => {
1919
return getStorageGroupsColumns({viewContext});
2020
}, [viewContext]);

src/containers/Storage/StorageGroups/columns/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import type {StorageViewContext} from '../../types';
55
export type StorageGroupsColumn = Column<PreparedStorageGroup>;
66

77
export interface GetStorageColumnsData {
8-
viewContext: StorageViewContext;
8+
viewContext?: StorageViewContext;
99
}
1010

1111
export interface GetStorageGroupsColumnsParams {
1212
visibleEntities?: VisibleEntities;
13-
viewContext: StorageViewContext;
13+
viewContext?: StorageViewContext;
1414
}
1515

1616
export type StorageColumnsGetter = (data?: GetStorageColumnsData) => StorageGroupsColumn[];

0 commit comments

Comments
 (0)