Skip to content

fix(storage): preserve node search fields with grouping #4155

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
kkdras merged 1 commit into from
Jul 27, 2026
Merged

fix(storage): preserve node search fields with grouping #4155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion src/containers/Storage/PaginatedStorageNodes/GroupedStorageNodesComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ import React from 'react';
import {ResponseError} from '../../../components/Errors/ResponseError';
import {PaginatedTableWithLayout} from '../../../components/PaginatedTable/PaginatedTableWithLayout';
import {TableColumnSetup} from '../../../components/TableColumnSetup/TableColumnSetup';
import {NODES_COLUMNS_TO_DATA_FIELDS} from '../../../components/nodesColumns/constants';
import {storageApi} from '../../../store/reducers/storage/storage';
import type {NodesGroupByField} from '../../../types/api/nodes';
import type {NodesGroupByField, NodesRequiredField} from '../../../types/api/nodes';
import {useAutoRefreshInterval} from '../../../utils/hooks';
import {NodesUptimeFilterValues} from '../../../utils/nodes';
import {renderPaginatedTableErrorMessage} from '../../../utils/renderPaginatedTableErrorMessage';
import {getRequiredDataFields} from '../../../utils/tableUtils/getRequiredDataFields';
import type {PaginatedStorageProps} from '../PaginatedStorage';
import {PaginatedStorageNodesTable} from '../PaginatedStorageNodesTable/PaginatedStorageNodesTable';
import {TableGroup} from '../TableGroup/TableGroup';
Expand All @@ -20,6 +22,8 @@ import {useStorageColumnsSettings} from '../utils';
import {StorageNodesControls} from './StorageNodesControls';
import {useStorageNodesColumnsToSelect} from './useStorageNodesColumnsToSelect';

const NODE_SEARCH_FIELDS_REQUIRED = new Set<NodesRequiredField>(['Host', 'NodeName']);

interface StorageNodeGroupProps {
name: string;
count: number;
Expand Down Expand Up @@ -108,6 +112,15 @@ export function GroupedStorageNodesComponent({
columnsSettings,
});

const searchFieldsRequired = React.useMemo(() => {
const activeFieldsRequired = getRequiredDataFields(
columnsToShow.map(({name}) => name),
NODES_COLUMNS_TO_DATA_FIELDS,
);

return activeFieldsRequired.filter((field) => NODE_SEARCH_FIELDS_REQUIRED.has(field));
}, [columnsToShow]);

const {currentData, isFetching, error} = storageApi.useGetStorageNodesInfoQuery(
{
database,
Expand All @@ -116,6 +129,7 @@ export function GroupedStorageNodesComponent({
node_id: nodeId,
group_id: groupId,
group: storageNodesGroupByParam,
fieldsRequired: nodesSearchValue.trim() ? searchFieldsRequired : undefined,
},
{
pollingInterval: autoRefreshInterval,
Expand Down
Loading