fix: more fixes

Author: astandrik

src/containers/Tenant/Diagnostics/TopQueries/RunningQueriesData.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 
 import type {Column} from '@gravity-ui/react-data-table';
 import {TableColumnSetup} from '@gravity-ui/uikit';
-import {isEqual} from 'lodash';
 
 import {DrawerWrapper} from '../../../../components/Drawer';
 import {DrawerControlType} from '../../../../components/Drawer/Drawer';
@@ -152,7 +151,7 @@ export const RunningQueriesData = ({
                         loading={isFetching && currentData === undefined}
                         settings={TOP_QUERIES_TABLE_SETTINGS}
                         onRowClick={onRowClick}
-                        rowClassName={(row) => b('row', {active: isEqual(row, selectedRow)})}
+                        rowClassName={(row) => b('row', {active: row === selectedRow})}
                         sortOrder={tableSort}
                         onSort={handleTableSort}
                     />

src/containers/Tenant/Diagnostics/TopQueries/TopQueriesData.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 
 import type {Column} from '@gravity-ui/react-data-table';
 import {Select, TableColumnSetup} from '@gravity-ui/uikit';
-import {isEqual} from 'lodash';
 
 import type {DateRangeValues} from '../../../../components/DateRange';
 import {DateRange} from '../../../../components/DateRange';
@@ -30,10 +29,10 @@ import {
     TOP_QUERIES_SELECTED_COLUMNS_LS_KEY,
 } from './columns/constants';
 import {DEFAULT_TIME_FILTER_VALUE, TIME_FRAME_OPTIONS} from './constants';
-import {useGetSelectedRowTableSort} from './hooks/useGetSelectedRowTableSort';
 import {useSetSelectedTopQueryRowFromParams} from './hooks/useSetSelectedTopQueryRowFromParams';
+import {useTopQueriesSort} from './hooks/useTopQueriesSort';
 import i18n from './i18n';
-import {TOP_QUERIES_TABLE_SETTINGS, useTopQueriesSort} from './utils';
+import {TOP_QUERIES_TABLE_SETTINGS} from './utils';
 import {generateShareableUrl} from './utils/generateShareableUrl';
 
 const b = cn('kv-top-queries');
@@ -75,8 +74,7 @@ export const TopQueriesData = ({
         REQUIRED_TOP_QUERIES_COLUMNS,
     );
 
-    const initialTableSort = useGetSelectedRowTableSort();
-    const {tableSort, handleTableSort, backendSort} = useTopQueriesSort(initialTableSort);
+    const {tableSort, handleTableSort, backendSort} = useTopQueriesSort();
     const {currentData, isFetching, isLoading, error} = topQueriesApi.useGetTopQueriesQuery(
         {
             database: tenantName,
@@ -98,10 +96,10 @@ export const TopQueriesData = ({
 
     const getTopQueryUrl = React.useCallback(() => {
         if (selectedRow) {
-            return generateShareableUrl(selectedRow, tableSort);
+            return generateShareableUrl(selectedRow);
         }
         return '';
-    }, [selectedRow, tableSort]);
+    }, [selectedRow]);
 
     const renderDrawerContent = React.useCallback(() => {
         if (!isDrawerVisible) {
@@ -190,7 +188,7 @@ export const TopQueriesData = ({
                         loading={isFetching && currentData === undefined}
                         settings={TOP_QUERIES_TABLE_SETTINGS}
                         onRowClick={onRowClick}
-                        rowClassName={(row) => b('row', {active: isEqual(row, selectedRow)})}
+                        rowClassName={(row) => b('row', {active: row === selectedRow})}
                         sortOrder={tableSort}
                         onSort={handleTableSort}
                     />

src/containers/Tenant/Diagnostics/TopQueries/hooks/useGetSelectedRowTableSort.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import type {Settings, SortOrder} from '@gravity-ui/react-data-table';
+import type {Settings} from '@gravity-ui/react-data-table';
 import DataTable from '@gravity-ui/react-data-table';
 
 import type {InfoViewerItem} from '../../../../components/InfoViewer';
@@ -11,11 +11,7 @@ import {prepareBackendSortFieldsFromTableSort, useTableSort} from '../../../../u
 import {formatToMs, parseUsToMs} from '../../../../utils/timeParsers';
 import {QUERY_TABLE_SETTINGS} from '../../utils/constants';
 
-import {
-    QUERIES_COLUMNS_IDS,
-    getRunningQueriesColumnSortField,
-    getTopQueriesColumnSortField,
-} from './columns/constants';
+import {QUERIES_COLUMNS_IDS, getRunningQueriesColumnSortField} from './columns/constants';
 import columnsI18n from './columns/i18n';
 
 export const TOP_QUERIES_TABLE_SETTINGS: Settings = {
@@ -24,24 +20,6 @@ export const TOP_QUERIES_TABLE_SETTINGS: Settings = {
     externalSort: true,
 };
 
-export function useTopQueriesSort(initialSort?: SortOrder[]) {
-    const [tableSort, handleTableSort] = useTableSort({
-        initialSortColumn: initialSort?.[0]?.columnId || QUERIES_COLUMNS_IDS.CPUTime,
-        initialSortOrder: initialSort?.[0]?.order || DataTable.DESCENDING,
-        multiple: true,
-        fixedOrderType: DataTable.DESCENDING,
-    });
-
-    return {
-        tableSort,
-        handleTableSort,
-        backendSort: React.useMemo(
-            () => prepareBackendSortFieldsFromTableSort(tableSort, getTopQueriesColumnSortField),
-            [tableSort],
-        ),
-    };
-}
-
 export function createQueryInfoItems(data: KeyValueRow): InfoViewerItem[] {
     const items: InfoViewerItem[] = [];
 

src/containers/Tenant/Diagnostics/TopQueries/utils.ts

@@ -1,16 +1,13 @@
-import type {SortOrder} from '@gravity-ui/react-data-table';
-
 import type {KeyValueRow} from '../../../../../types/api/query';
 
 import {getTopQueryRowQueryParams} from './getTopQueryRowQueryParams';
 
 /**
  * Generates a shareable URL with query parameters for a top query row
  * @param row The top query row data
- * @param tableSort Optional sort configuration to include in the URL
- * @returns A shareable URL string with the row's parameters and sort order encoded in the URL
+ * @returns A shareable URL string with the row's parameters encoded in the URL
  */
-export function generateShareableUrl(row: KeyValueRow, tableSort?: SortOrder[]): string {
+export function generateShareableUrl(row: KeyValueRow): string {
     const params = getTopQueryRowQueryParams(row);
 
     const url = new URL(window.location.href);
@@ -25,7 +22,6 @@ export function generateShareableUrl(row: KeyValueRow, tableSort?: SortOrder[]):
                 intervalEnd: params.intervalEnd || undefined,
                 endTime: params.endTime || undefined,
                 queryHash: params.queryHash || undefined,
-                tableSort: tableSort || undefined,
             }),
         ),
     );