fix: fields required in all groups and nodes requests (#1515)

artemmufazalov · web-flow · commit a9f79a31ced8 · 2024-10-23T07:12:42.000Z
diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx
@@ -107,6 +107,7 @@ export const Storage = ({database, viewContext, nodeId, groupId, pDiskId}: Stora
             groupId,
             pDiskId,
             shouldUseGroupsHandler: groupsHandlerAvailable,
+            fieldsRequired: 'all',
         },
         {
             skip: !isGroups || !capabilitiesLoaded,
diff --git a/src/containers/StorageGroupPage/StorageGroupPage.tsx b/src/containers/StorageGroupPage/StorageGroupPage.tsx
@@ -40,7 +40,9 @@ export function StorageGroupPage() {
     const shouldUseGroupsHandler = useStorageGroupsHandlerAvailable();
     const capabilitiesLoaded = useCapabilitiesLoaded();
     const groupQuery = storageApi.useGetStorageGroupsInfoQuery(
-        valueIsDefined(groupId) ? {groupId, shouldUseGroupsHandler, with: 'all'} : skipToken,
+        valueIsDefined(groupId)
+            ? {groupId, shouldUseGroupsHandler, with: 'all', fieldsRequired: 'all'}
+            : skipToken,
         {
             pollingInterval: autoRefreshInterval,
             skip: !capabilitiesLoaded,
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByCpu.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByCpu.tsx
@@ -5,22 +5,27 @@ import {
     getHostColumn,
     getNodeIdColumn,
 } from '../../../../../components/nodesColumns/columns';
-import {NODES_COLUMNS_WIDTH_LS_KEY} from '../../../../../components/nodesColumns/constants';
+import {
+    NODES_COLUMNS_TO_DATA_FIELDS,
+    NODES_COLUMNS_WIDTH_LS_KEY,
+} from '../../../../../components/nodesColumns/constants';
 import type {GetNodesColumnsParams} from '../../../../../components/nodesColumns/types';
 import {nodesApi} from '../../../../../store/reducers/nodes/nodes';
 import type {NodesPreparedEntity} from '../../../../../store/reducers/nodes/types';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
+import type {NodesRequiredField} from '../../../../../types/api/nodes';
 import {TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../../utils/constants';
 import {useAutoRefreshInterval, useSearchQuery} from '../../../../../utils/hooks';
+import {getRequiredDataFields} from '../../../../../utils/tableUtils/getRequiredDataFields';
 import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
 import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
 import {getSectionTitle} from '../getSectionTitle';
 import i18n from '../i18n';
 
 export function getTopNodesByCpuColumns(
     params: GetNodesColumnsParams,
-): Column<NodesPreparedEntity>[] {
+): [Column<NodesPreparedEntity>[], NodesRequiredField[]] {
     const hostColumn = {...getHostColumn<NodesPreparedEntity>(params), width: undefined};
 
     const columns = [
@@ -29,10 +34,15 @@ export function getTopNodesByCpuColumns(
         hostColumn,
     ];
 
-    return columns.map((column) => ({
+    const preparedColumns = columns.map((column) => ({
         ...column,
         sortable: false,
     }));
+
+    const columnsIds = preparedColumns.map((column) => column.name);
+    const dataFieldsRequired = getRequiredDataFields(columnsIds, NODES_COLUMNS_TO_DATA_FIELDS);
+
+    return [preparedColumns, dataFieldsRequired];
 }
 
 interface TopNodesByCpuProps {
@@ -44,7 +54,7 @@ export function TopNodesByCpu({tenantName, additionalNodesProps}: TopNodesByCpuP
     const query = useSearchQuery();
 
     const [autoRefreshInterval] = useAutoRefreshInterval();
-    const columns = getTopNodesByCpuColumns({
+    const [columns, fieldsRequired] = getTopNodesByCpuColumns({
         getNodeRef: additionalNodesProps?.getNodeRef,
         database: tenantName,
     });
@@ -55,6 +65,8 @@ export function TopNodesByCpu({tenantName, additionalNodesProps}: TopNodesByCpuP
             type: 'any',
             sort: '-CPU',
             limit: TENANT_OVERVIEW_TABLES_LIMIT,
+            tablets: false,
+            fieldsRequired,
         },
         {pollingInterval: autoRefreshInterval},
     );
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByLoad.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByLoad.tsx
@@ -6,20 +6,27 @@ import {
     getNodeIdColumn,
     getVersionColumn,
 } from '../../../../../components/nodesColumns/columns';
-import {NODES_COLUMNS_WIDTH_LS_KEY} from '../../../../../components/nodesColumns/constants';
+import {
+    NODES_COLUMNS_TO_DATA_FIELDS,
+    NODES_COLUMNS_WIDTH_LS_KEY,
+} from '../../../../../components/nodesColumns/constants';
 import type {GetNodesColumnsParams} from '../../../../../components/nodesColumns/types';
 import {nodesApi} from '../../../../../store/reducers/nodes/nodes';
 import type {NodesPreparedEntity} from '../../../../../store/reducers/nodes/types';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
+import type {NodesRequiredField} from '../../../../../types/api/nodes';
 import {TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../../utils/constants';
 import {useAutoRefreshInterval, useSearchQuery} from '../../../../../utils/hooks';
+import {getRequiredDataFields} from '../../../../../utils/tableUtils/getRequiredDataFields';
 import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
 import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
 import {getSectionTitle} from '../getSectionTitle';
 import i18n from '../i18n';
 
-function getTopNodesByLoadColumns(params: GetNodesColumnsParams): Column<NodesPreparedEntity>[] {
+function getTopNodesByLoadColumns(
+    params: GetNodesColumnsParams,
+): [Column<NodesPreparedEntity>[], NodesRequiredField[]] {
     const hostColumn = {
         ...getHostColumn<NodesPreparedEntity>(params),
         width: undefined,
@@ -32,10 +39,15 @@ function getTopNodesByLoadColumns(params: GetNodesColumnsParams): Column<NodesPr
         getVersionColumn<NodesPreparedEntity>(),
     ];
 
-    return columns.map((column) => ({
+    const preparedColumns = columns.map((column) => ({
         ...column,
         sortable: false,
     }));
+
+    const columnsIds = preparedColumns.map((column) => column.name);
+    const dataFieldsRequired = getRequiredDataFields(columnsIds, NODES_COLUMNS_TO_DATA_FIELDS);
+
+    return [preparedColumns, dataFieldsRequired];
 }
 
 interface TopNodesByLoadProps {
@@ -47,7 +59,7 @@ export function TopNodesByLoad({tenantName, additionalNodesProps}: TopNodesByLoa
     const query = useSearchQuery();
 
     const [autoRefreshInterval] = useAutoRefreshInterval();
-    const columns = getTopNodesByLoadColumns({
+    const [columns, fieldsRequired] = getTopNodesByLoadColumns({
         getNodeRef: additionalNodesProps?.getNodeRef,
         database: tenantName,
     });
@@ -58,6 +70,8 @@ export function TopNodesByLoad({tenantName, additionalNodesProps}: TopNodesByLoa
             type: 'any',
             sort: '-LoadAverage',
             limit: TENANT_OVERVIEW_TABLES_LIMIT,
+            tablets: false,
+            fieldsRequired,
         },
         {pollingInterval: autoRefreshInterval},
     );
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/TopNodesByMemory.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/TopNodesByMemory.tsx
@@ -10,20 +10,27 @@ import {
     getTabletsColumn,
     getUptimeColumn,
 } from '../../../../../components/nodesColumns/columns';
-import {NODES_COLUMNS_WIDTH_LS_KEY} from '../../../../../components/nodesColumns/constants';
+import {
+    NODES_COLUMNS_TO_DATA_FIELDS,
+    NODES_COLUMNS_WIDTH_LS_KEY,
+} from '../../../../../components/nodesColumns/constants';
 import type {GetNodesColumnsParams} from '../../../../../components/nodesColumns/types';
 import {nodesApi} from '../../../../../store/reducers/nodes/nodes';
 import type {NodesPreparedEntity} from '../../../../../store/reducers/nodes/types';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
 import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
+import type {NodesRequiredField} from '../../../../../types/api/nodes';
 import {TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../../utils/constants';
 import {useAutoRefreshInterval, useSearchQuery} from '../../../../../utils/hooks';
+import {getRequiredDataFields} from '../../../../../utils/tableUtils/getRequiredDataFields';
 import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
 import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
 import {getSectionTitle} from '../getSectionTitle';
 import i18n from '../i18n';
 
-function getTopNodesByMemoryColumns(params: GetNodesColumnsParams): Column<NodesPreparedEntity>[] {
+function getTopNodesByMemoryColumns(
+    params: GetNodesColumnsParams,
+): [Column<NodesPreparedEntity>[], NodesRequiredField[]] {
     const memoryColumn = {
         ...getMemoryColumn<NodesPreparedEntity>(),
         header: i18n('column-header.process'),
@@ -40,10 +47,15 @@ function getTopNodesByMemoryColumns(params: GetNodesColumnsParams): Column<Nodes
         getTabletsColumn<NodesPreparedEntity>(params),
     ];
 
-    return columns.map((column) => ({
+    const preparedColumns = columns.map((column) => ({
         ...column,
         sortable: false,
     }));
+
+    const columnsIds = preparedColumns.map((column) => column.name);
+    const dataFieldsRequired = getRequiredDataFields(columnsIds, NODES_COLUMNS_TO_DATA_FIELDS);
+
+    return [preparedColumns, dataFieldsRequired];
 }
 
 interface TopNodesByMemoryProps {
@@ -55,7 +67,7 @@ export function TopNodesByMemory({tenantName, additionalNodesProps}: TopNodesByM
     const query = useSearchQuery();
 
     const [autoRefreshInterval] = useAutoRefreshInterval();
-    const columns = getTopNodesByMemoryColumns({
+    const [columns, fieldsRequired] = getTopNodesByMemoryColumns({
         getNodeRef: additionalNodesProps?.getNodeRef,
         database: tenantName,
     });
@@ -67,6 +79,7 @@ export function TopNodesByMemory({tenantName, additionalNodesProps}: TopNodesByM
             tablets: true,
             sort: '-Memory',
             limit: TENANT_OVERVIEW_TABLES_LIMIT,
+            fieldsRequired,
         },
         {pollingInterval: autoRefreshInterval},
     );
diff --git a/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopGroups.tsx b/src/containers/Tenant/Diagnostics/TenantOverview/TenantStorage/TopGroups.tsx
@@ -4,15 +4,30 @@ import {
 } from '../../../../../store/reducers/capabilities/hooks';
 import {storageApi} from '../../../../../store/reducers/storage/storage';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
+import type {GroupsRequiredField} from '../../../../../types/api/storage';
 import {TENANT_OVERVIEW_TABLES_LIMIT} from '../../../../../utils/constants';
 import {useAutoRefreshInterval, useSearchQuery} from '../../../../../utils/hooks';
+import {getRequiredDataFields} from '../../../../../utils/tableUtils/getRequiredDataFields';
 import {getStorageTopGroupsColumns} from '../../../../Storage/StorageGroups/columns/columns';
-import {STORAGE_GROUPS_COLUMNS_WIDTH_LS_KEY} from '../../../../Storage/StorageGroups/columns/constants';
+import {
+    GROUPS_COLUMNS_TO_DATA_FIELDS,
+    STORAGE_GROUPS_COLUMNS_WIDTH_LS_KEY,
+} from '../../../../Storage/StorageGroups/columns/constants';
+import type {StorageGroupsColumn} from '../../../../Storage/StorageGroups/columns/types';
 import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
 import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
 import {getSectionTitle} from '../getSectionTitle';
 import i18n from '../i18n';
 
+function getColumns(): [StorageGroupsColumn[], GroupsRequiredField[]] {
+    const preparedColumns = getStorageTopGroupsColumns();
+
+    const columnsIds = preparedColumns.map((column) => column.name);
+    const dataFieldsRequired = getRequiredDataFields(columnsIds, GROUPS_COLUMNS_TO_DATA_FIELDS);
+
+    return [preparedColumns, dataFieldsRequired];
+}
+
 interface TopGroupsProps {
     tenant?: string;
 }
@@ -24,7 +39,7 @@ export function TopGroups({tenant}: TopGroupsProps) {
     const groupsHandlerAvailable = useStorageGroupsHandlerAvailable();
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
-    const columns = getStorageTopGroupsColumns();
+    const [columns, fieldsRequired] = getColumns();
 
     const {currentData, isFetching, error} = storageApi.useGetStorageGroupsInfoQuery(
         {
@@ -33,6 +48,7 @@ export function TopGroups({tenant}: TopGroupsProps) {
             with: 'all',
             limit: TENANT_OVERVIEW_TABLES_LIMIT,
             shouldUseGroupsHandler: groupsHandlerAvailable,
+            fieldsRequired,
         },
         {
             pollingInterval: autoRefreshInterval,
diff --git a/src/services/api.ts b/src/services/api.ts
@@ -251,7 +251,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
         );
     }
     getStorageGroups(
-        {nodeId, pDiskId, groupId, fieldsRequired = 'all', filter, ...params}: GroupsRequestParams,
+        {nodeId, pDiskId, groupId, fieldsRequired, filter, ...params}: GroupsRequestParams,
         {concurrentId, signal}: AxiosOptions = {},
     ) {
         const preparedNodeId = Array.isArray(nodeId)
diff --git a/src/utils/tableUtils/getRequiredDataFields.ts b/src/utils/tableUtils/getRequiredDataFields.ts
@@ -11,5 +11,5 @@ export function getRequiredDataFields<ColumnId extends string, RequiredField ext
         return fields;
     }, new Set<RequiredField>());
 
-    return Array.from(requiredFieldsSet);
+    return Array.from(requiredFieldsSet).sort();
 }

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ export const Storage = ({database, viewContext, nodeId, groupId, pDiskId}: Stora`
`107`	`107`	`groupId,`
`108`	`108`	`pDiskId,`
`109`	`109`	`shouldUseGroupsHandler: groupsHandlerAvailable,`
	`110`	`+ fieldsRequired: 'all',`
`110`	`111`	`},`
`111`	`112`	`{`
`112`	`113`	`skip: !isGroups \|\| !capabilitiesLoaded,`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {`
`251`	`251`	`);`
`252`	`252`	`}`
`253`	`253`	`getStorageGroups(`
`254`		`- {nodeId, pDiskId, groupId, fieldsRequired = 'all', filter, ...params}: GroupsRequestParams,`
	`254`	`+ {nodeId, pDiskId, groupId, fieldsRequired, filter, ...params}: GroupsRequestParams,`
`255`	`255`	`{concurrentId, signal}: AxiosOptions = {},`
`256`	`256`	`) {`
`257`	`257`	`const preparedNodeId = Array.isArray(nodeId)`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ export function getRequiredDataFields<ColumnId extends string, RequiredField ext`
`11`	`11`	`return fields;`
`12`	`12`	`}, new Set<RequiredField>());`
`13`	`13`
`14`		`- return Array.from(requiredFieldsSet);`
	`14`	`+ return Array.from(requiredFieldsSet).sort();`
`15`	`15`	`}`