Skip to content

Commit 93e8c52

Browse files
fix(TenantNetwork): use correct settings for tables (#2639)
1 parent 03d315a commit 93e8c52

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

src/containers/Tenant/Diagnostics/TenantOverview/TenantNetwork/TopNodesByPing.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import {NODES_COLUMNS_WIDTH_LS_KEY} from '../../../../../components/nodesColumns
33
import {nodesApi} from '../../../../../store/reducers/nodes/nodes';
44
import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
55
import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
6-
import {TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../../utils/constants';
6+
import {
7+
TENANT_OVERVIEW_TABLES_LIMIT,
8+
TENANT_OVERVIEW_TABLES_SETTINGS,
9+
} from '../../../../../utils/constants';
710
import {useAutoRefreshInterval, useSearchQuery} from '../../../../../utils/hooks';
811
import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
912
import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
@@ -12,11 +15,6 @@ import i18n from '../i18n';
1215

1316
import {getTopNodesByPingColumns} from './columns';
1417

15-
const TENANT_OVERVIEW_TABLES_SETTINGS = {
16-
stripedRows: false,
17-
sortable: false,
18-
};
19-
2018
interface TopNodesByPingProps {
2119
tenantName: string;
2220
additionalNodesProps?: AdditionalNodesProps;
@@ -37,7 +35,7 @@ export function TopNodesByPing({tenantName, additionalNodesProps}: TopNodesByPin
3735
sort: '-PingTime',
3836
limit: TENANT_OVERVIEW_TABLES_LIMIT,
3937
tablets: false,
40-
fieldsRequired: fieldsRequired as any,
38+
fieldsRequired: fieldsRequired,
4139
},
4240
{pollingInterval: autoRefreshInterval},
4341
);

src/containers/Tenant/Diagnostics/TenantOverview/TenantNetwork/TopNodesBySkew.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import {NODES_COLUMNS_WIDTH_LS_KEY} from '../../../../../components/nodesColumns
33
import {nodesApi} from '../../../../../store/reducers/nodes/nodes';
44
import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
55
import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
6-
import {TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../../utils/constants';
6+
import {
7+
TENANT_OVERVIEW_TABLES_LIMIT,
8+
TENANT_OVERVIEW_TABLES_SETTINGS,
9+
} from '../../../../../utils/constants';
710
import {useAutoRefreshInterval, useSearchQuery} from '../../../../../utils/hooks';
811
import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
912
import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
@@ -12,11 +15,6 @@ import i18n from '../i18n';
1215

1316
import {getTopNodesBySkewColumns} from './columns';
1417

15-
const TENANT_OVERVIEW_TABLES_SETTINGS = {
16-
stripedRows: false,
17-
sortable: false,
18-
};
19-
2018
interface TopNodesBySkewProps {
2119
tenantName: string;
2220
additionalNodesProps?: AdditionalNodesProps;
@@ -37,7 +35,7 @@ export function TopNodesBySkew({tenantName, additionalNodesProps}: TopNodesBySke
3735
sort: '-ClockSkew',
3836
limit: TENANT_OVERVIEW_TABLES_LIMIT,
3937
tablets: false,
40-
fieldsRequired: fieldsRequired as any,
38+
fieldsRequired: fieldsRequired,
4139
},
4240
{pollingInterval: autoRefreshInterval},
4341
);

src/containers/Tenant/Diagnostics/TenantOverview/TenantNetwork/columns.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ import {
55
getPingTimeColumn,
66
getUptimeColumn,
77
} from '../../../../../components/nodesColumns/columns';
8-
import {
9-
NODES_COLUMNS_TO_DATA_FIELDS,
10-
isSortableNodesColumn,
11-
} from '../../../../../components/nodesColumns/constants';
8+
import {NODES_COLUMNS_TO_DATA_FIELDS} from '../../../../../components/nodesColumns/constants';
129
import type {GetNodesColumnsParams} from '../../../../../components/nodesColumns/types';
1310
import type {NodesPreparedEntity} from '../../../../../store/reducers/nodes/types';
1411
import {getRequiredDataFields} from '../../../../../utils/tableUtils/getRequiredDataFields';
@@ -28,7 +25,7 @@ export function getTopNodesByPingColumns(params: GetNodesColumnsParams) {
2825
return [
2926
columns.map((column) => ({
3027
...column,
31-
sortable: isSortableNodesColumn(column.name),
28+
sortable: false,
3229
})),
3330
fieldsRequired,
3431
] as const;
@@ -48,7 +45,7 @@ export function getTopNodesBySkewColumns(params: GetNodesColumnsParams) {
4845
return [
4946
columns.map((column) => ({
5047
...column,
51-
sortable: isSortableNodesColumn(column.name),
48+
sortable: false,
5249
})),
5350
fieldsRequired,
5451
] as const;

0 commit comments

Comments
 (0)