fix: better code

Author: astandrik

src/components/QueryResultTable/QueryResultTable.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 import DataTable from '@gravity-ui/react-data-table';
 import type {Column, Settings} from '@gravity-ui/react-data-table';
 
-import {INDEX_COLUMN} from '../../store/reducers/query/query';
 import type {ColumnType, KeyValueRow} from '../../types/api/query';
 import {cn} from '../../utils/cn';
 import {DEFAULT_TABLE_SETTINGS} from '../../utils/constants';
@@ -22,6 +21,7 @@ const TABLE_SETTINGS: Settings = {
     ...DEFAULT_TABLE_SETTINGS,
     stripedRows: true,
     sortable: false,
+    displayIndices: true,
 };
 
 export const b = cn('ydb-query-result-table');
@@ -96,16 +96,11 @@ export const QueryResultTable = (props: QueryResultTableProps) => {
         return <div className={b('message')}>{i18n('empty')}</div>;
     }
 
-    const settings = {
-        ...TABLE_SETTINGS,
-        displayIndices: columns.filter(({name}) => INDEX_COLUMN.name === name).length === 0,
-    };
-
     return (
         <ResizeableDataTable
             data={data}
             columns={columns}
-            settings={settings}
+            settings={TABLE_SETTINGS}
             // prevent accessing row.id in case it is present but is not the PK (i.e. may repeat)
             rowKey={getRowIndex}
             visibleRowIndex={getVisibleRowIndex}

src/store/reducers/query/query.ts

@@ -4,7 +4,6 @@ import {createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
 import {settingsManager} from '../../../services/settings';
-import type {ColumnType} from '../../../types/api/query';
 import {TracingLevelNumber} from '../../../types/api/query';
 import type {QueryAction, QueryRequestParams, QuerySettings} from '../../../types/store/query';
 import type {StreamDataChunk} from '../../../types/store/streaming';
@@ -24,7 +23,6 @@ import type {QueryResult, QueryState} from './types';
 import {getActionAndSyntaxFromQueryMode, getQueryInHistory} from './utils';
 
 const MAXIMUM_QUERIES_IN_HISTORY = 20;
-export const INDEX_COLUMN: ColumnType = {name: '#', type: 'Uint64'};
 
 const queriesHistoryInitial = settingsManager.readUserSettingsValue(
     QUERIES_HISTORY_KEY,

src/store/reducers/query/streamingReducers.ts

@@ -9,7 +9,6 @@ import {parseResult} from '../../../utils/query';
 
 import {preparePlanData} from './preparePlanData';
 import {prepareQueryData} from './prepareQueryData';
-import {INDEX_COLUMN} from './query';
 import type {QueryState} from './types';
 
 export const setStreamSession = (state: QueryState, action: PayloadAction<SessionChunk>) => {
@@ -131,14 +130,11 @@ export const addStreamingChunks = (state: QueryState, action: PayloadAction<Stre
         });
 
         if (columns && !resultSet.columns?.length) {
-            resultSet.columns = [INDEX_COLUMN, ...columns];
+            resultSet.columns = columns;
         }
 
-        const startIndex = resultSet.result?.length || 1;
         const safeRows = rows || [];
-        const indexedRows = safeRows.map((row, index) => [startIndex + index, ...row]);
-        const formattedRows = parseResult(indexedRows, resultSet.columns || []);
-
-        resultSet.result = [...(resultSet.result || []), ...formattedRows];
+        const formattedRows = parseResult(safeRows, resultSet.columns || []);
+        resultSet.result?.push(...formattedRows);
     }
 };