From bce5a778b826598a17f19ad1fa4feee32886a784 Mon Sep 17 00:00:00 2001
From: Pavel Makarichev <vixtir90@gmail.com>
Date: Tue, 2 Sep 2025 21:38:36 +0300
Subject: [PATCH] FE: Add server side sorting to Schemas

---
 frontend/src/components/Schemas/List/List.tsx | 23 +++++++++++++++----
 frontend/src/components/Schemas/Schemas.tsx   | 22 ++++++++++--------
 frontend/src/lib/hooks/api/schemas.ts         | 15 +++++++++++-
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Schemas/List/List.tsx b/frontend/src/components/Schemas/List/List.tsx
index 345cb71ad..9fdfe9dab 100644
--- a/frontend/src/components/Schemas/List/List.tsx
+++ b/frontend/src/components/Schemas/List/List.tsx
@@ -13,7 +13,13 @@ import Search from 'components/common/Search/Search';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import Table, { LinkCell } from 'components/common/NewTable';
 import { ColumnDef } from '@tanstack/react-table';
-import { Action, SchemaSubject, ResourceType } from 'generated-sources';
+import {
+  Action,
+  SchemaSubject,
+  ResourceType,
+  SchemaColumnsToSort,
+  SortOrder,
+} from 'generated-sources';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { PER_PAGE } from 'lib/constants';
 import { useGetSchemas } from 'lib/hooks/api/schemas';
@@ -27,7 +33,7 @@ const List: React.FC = () => {
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const {
-    isFetching,
+    isInitialLoading,
     isError,
     data = { pageCount: 1, schemas: [] as SchemaSubject[] },
   } = useGetSchemas({
@@ -35,6 +41,10 @@ const List: React.FC = () => {
     page: Number(searchParams.get('page') || 1),
     perPage: Number(searchParams.get('perPage') || PER_PAGE),
     search: searchParams.get('q') || '',
+    orderBy: (searchParams.get('sortBy') as SchemaColumnsToSort) ?? undefined,
+    sortOrder:
+      (searchParams.get('sortDirection')?.toUpperCase() as SortOrder) ||
+      undefined,
   });
 
   const columns = React.useMemo<ColumnDef<SchemaSubject>[]>(
@@ -53,7 +63,12 @@ const List: React.FC = () => {
       },
       { header: 'Id', accessorKey: 'id', size: 120 },
       { header: 'Type', accessorKey: 'schemaType', size: 120 },
-      { header: 'Version', accessorKey: 'version', size: 120 },
+      {
+        header: 'Version',
+        accessorKey: 'version',
+        size: 120,
+        enableSorting: false,
+      },
       {
         header: 'Compatibility',
         accessorKey: 'compatibilityLevel',
@@ -86,7 +101,7 @@ const List: React.FC = () => {
       <ControlPanelWrapper hasInput>
         <Search placeholder="Search by Schema Name" />
       </ControlPanelWrapper>
-      {isFetching || isError ? (
+      {isInitialLoading || isError ? (
         <PageLoader />
       ) : (
         <Table
diff --git a/frontend/src/components/Schemas/Schemas.tsx b/frontend/src/components/Schemas/Schemas.tsx
index 39f058e62..69cc20953 100644
--- a/frontend/src/components/Schemas/Schemas.tsx
+++ b/frontend/src/components/Schemas/Schemas.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Suspense } from 'react';
 import { Route, Routes } from 'react-router-dom';
 import {
   clusterSchemaEditRelativePath,
@@ -6,21 +6,25 @@ import {
   clusterSchemaSchemaDiffRelativePath,
   RouteParams,
 } from 'lib/paths';
-import List from 'components/Schemas/List/List';
 import Details from 'components/Schemas/Details/Details';
 import New from 'components/Schemas/New/New';
 import Edit from 'components/Schemas/Edit/Edit';
 import Diff from 'components/Schemas/Diff/Diff';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+
+const List = React.lazy(() => import('./List/List'));
 
 const Schemas: React.FC = () => {
   return (
-    <Routes>
-      <Route index element={<List />} />
-      <Route path={clusterSchemaNewRelativePath} element={<New />} />
-      <Route path={RouteParams.subject} element={<Details />} />
-      <Route path={clusterSchemaEditRelativePath} element={<Edit />} />
-      <Route path={clusterSchemaSchemaDiffRelativePath} element={<Diff />} />
-    </Routes>
+    <Suspense fallback={<PageLoader />}>
+      <Routes>
+        <Route index element={<List />} />
+        <Route path={clusterSchemaNewRelativePath} element={<New />} />
+        <Route path={RouteParams.subject} element={<Details />} />
+        <Route path={clusterSchemaEditRelativePath} element={<Edit />} />
+        <Route path={clusterSchemaSchemaDiffRelativePath} element={<Diff />} />
+      </Routes>
+    </Suspense>
   );
 };
 
diff --git a/frontend/src/lib/hooks/api/schemas.ts b/frontend/src/lib/hooks/api/schemas.ts
index aeb1ed9a6..f87bf074f 100644
--- a/frontend/src/lib/hooks/api/schemas.ts
+++ b/frontend/src/lib/hooks/api/schemas.ts
@@ -45,15 +45,28 @@ export function useGetSchemas({
   page,
   perPage,
   search,
+  orderBy,
+  sortOrder,
 }: GetSchemasRequest) {
   return useQuery<SchemaSubjectsResponse>({
-    queryKey: [SCHEMA_QUERY_KEY, clusterName, page, perPage, search],
+    queryKey: [
+      SCHEMA_QUERY_KEY,
+      clusterName,
+      page,
+      perPage,
+      search,
+      sortOrder,
+      orderBy,
+    ],
+    keepPreviousData: true,
     queryFn: () =>
       schemasApiClient.getSchemas({
         clusterName,
         page,
         perPage,
         search: search || undefined,
+        sortOrder,
+        orderBy,
       }),
   });
 }