Skip to content

fix: incorrect group numbers #2319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2025
Merged

fix: incorrect group numbers #2319

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1752be0
fix: fix: incorrect group numbers
astandrik May 23, 2025
d6f5c3a
Update src/containers/Storage/PaginatedStorageNodes/GroupedStorageNod…
astandrik May 23, 2025
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
10 changes: 6 additions & 4 deletions src/containers/Nodes/PaginatedNodes/GroupedNodesComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ import {useSelectedColumns} from '../../../utils/hooks/useSelectedColumns';
import {NodesUptimeFilterValues} from '../../../utils/nodes';
import {TableGroup} from '../../Storage/TableGroup/TableGroup';
import {useExpandedGroups} from '../../Storage/TableGroup/useExpandedTableGroups';
import {NodesControls} from '../NodesControls/NodesControls';
import {NodesTable} from '../NodesTable';
import i18n from '../i18n';
import {b} from '../shared';
import {useNodesPageQueryParams} from '../useNodesPageQueryParams';

import {NodesControlsWithTableState} from './NodesControlsWithTableState';

interface NodeGroupProps {
name: string;
count: number;
Expand Down Expand Up @@ -172,12 +171,15 @@ export function GroupedNodesComponent({
<PaginatedTableWithLayout
initialState={initialState}
controls={
<NodesControlsWithTableState
withGroupBySelect={true}
<NodesControls
groupByParams={groupByParams}
withPeerRoleFilter={withPeerRoleFilter}
columnsToSelect={columnsToSelect}
handleSelectedColumnsUpdate={setColumns}
entitiesCountCurrent={found}
entitiesCountTotal={total}
entitiesLoading={isLoading}
withGroupBySelect
/>
}
error={error ? <ResponseError error={error} /> : null}
Expand Down
7 changes: 5 additions & 2 deletions src/containers/Storage/PaginatedStorageGroups/GroupedStorageGroupsComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import i18n from '../i18n';
import {b} from '../shared';
import {useStorageQueryParams} from '../useStorageQueryParams';

import {StorageGroupsControlsWithTableState} from './StorageGroupsControls';
import {StorageGroupsControls} from './StorageGroupsControls';

interface StorageGroupGroupProps {
name: string;
Expand Down Expand Up @@ -160,9 +160,12 @@ export function GroupedStorageGroupsComponent({
return (
<PaginatedTableWithLayout
controls={
<StorageGroupsControlsWithTableState
<StorageGroupsControls
withTypeSelector
withGroupBySelect
entitiesCountCurrent={found}
entitiesCountTotal={total}
entitiesLoading={isLoading}
columnsToSelect={columnsToSelect}
handleSelectedColumnsUpdate={setColumns}
/>
Expand Down
7 changes: 5 additions & 2 deletions src/containers/Storage/PaginatedStorageNodes/GroupedStorageNodesComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {b} from '../shared';
import {useStorageQueryParams} from '../useStorageQueryParams';
import {useStorageColumnsSettings} from '../utils';

import {StorageNodesControlsWithTableState} from './StorageNodesControls';
import {StorageNodesControls} from './StorageNodesControls';
import {useStorageNodesColumnsToSelect} from './useStorageNodesColumnsToSelect';

interface StorageNodeGroupProps {
Expand Down Expand Up @@ -161,9 +161,12 @@ export function GroupedStorageNodesComponent({
return (
<PaginatedTableWithLayout
controls={
<StorageNodesControlsWithTableState
<StorageNodesControls
withTypeSelector
withGroupBySelect
entitiesCountCurrent={found}
entitiesCountTotal={found}
entitiesLoading={isLoading}
columnsToSelect={columnsToSelect}
handleSelectedColumnsUpdate={setColumns}
/>
Expand Down
Loading