Bug 1808394: remove sorting from metrics table so query sort is prese…

…rved

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1808394

frontend/public/components/monitoring/metrics.tsx

@@ -23,9 +23,6 @@ import {
   TimesIcon,
 } from '@patternfly/react-icons';
 import {
-  IDecorator,
-  ISortBy,
-  sortable,
   Table,
   TableBody,
   TableGridBreakpoint,
@@ -606,7 +603,6 @@ const QueryTable_: React.FC<QueryTableProps> = ({
   const [error, setError] = React.useState();
   const [page, setPage] = React.useState(1);
   const [perPage, setPerPage] = React.useState(50);
-  const [sortBy, setSortBy] = React.useState<ISortBy>({ index: 1, direction: 'asc' });
 
   const safeFetch = React.useCallback(useSafeFetch(), []);
 
@@ -675,7 +671,6 @@ const QueryTable_: React.FC<QueryTableProps> = ({
 
   const cellProps = {
     props: { className: 'query-browser__table-cell' },
-    transforms: [sortable as (v: unknown) => IDecorator],
   };
 
   // TableBody's shouldComponentUpdate seems to struggle with SeriesButton, so add a unique key to help TableBody
@@ -722,17 +717,7 @@ const QueryTable_: React.FC<QueryTableProps> = ({
       ];
     }
 
-    // Sort Values column numerically and sort all the other columns alphabetically
-    const valuesColIndex = allLabelKeys.length + 1;
-    const sort =
-      sortBy.index === valuesColIndex
-        ? (cells) => {
-            const v = Number(cells[valuesColIndex]);
-            return Number.isNaN(v) ? 0 : v;
-          }
-        : sortBy.index;
-    const unsortedRows = _.map(result, rowMapper);
-    rows = _.orderBy(unsortedRows, [sort], [sortBy.direction]) as string[][];
+    rows = _.map(result, rowMapper) as string[][];
   }
 
   // Set the result table's break point based on the number of columns
@@ -749,8 +734,6 @@ const QueryTable_: React.FC<QueryTableProps> = ({
     breakPoint = 'grid2xl';
   }
 
-  const onSort = (e, i, direction) => setSortBy({ index: i, direction });
-
   const tableRows = rows.slice((page - 1) * perPage, page * perPage).map((cells) => ({ cells }));
 
   return (
@@ -759,9 +742,7 @@ const QueryTable_: React.FC<QueryTableProps> = ({
         aria-label="query results table"
         cells={columns}
         gridBreakPoint={TableGridBreakpoint[breakPoint]}
-        onSort={onSort}
         rows={tableRows}
-        sortBy={sortBy}
         variant={TableVariant.compact}
       >
         <TableHeader />