From 780e6a4766d36e332f37af2e0eb5d64ee9a1967d Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Tue, 9 Sep 2025 23:48:40 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20Update=20DataTable=20compon?=
 =?UTF-8?q?ent=20to=20streamline=20props=20and=20enhance=20sorting=20icons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SettingsTabs/General/ArchivedChats.tsx    |  4 +-
 packages/client/src/components/DataTable.tsx  | 90 +++++++++++--------
 2 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx b/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx
index 588b7c0712..8bd569d8c6 100644
--- a/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx
@@ -287,15 +287,15 @@ export default function ArchivedChatsTable() {
           <DataTable
             columns={columns}
             data={allConversations}
+            isLoading={isLoading}
+            enableSearch={!!isSearchEnabled}
             filterColumn="title"
             onFilterChange={onFilterChange}
             filterValue={searchInput}
             fetchNextPage={handleFetchNextPage}
             hasNextPage={hasNextPage}
             isFetchingNextPage={isFetchingNextPage}
-            isLoading={isLoading}
             showCheckboxes={false}
-            enableSearch={!!isSearchEnabled}
             onSortChange={handleSort}
             sortBy={sortBy}
             sortDirection={sortDirection}
diff --git a/packages/client/src/components/DataTable.tsx b/packages/client/src/components/DataTable.tsx
index 56048c8af3..1b161e0df2 100644
--- a/packages/client/src/components/DataTable.tsx
+++ b/packages/client/src/components/DataTable.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useRef, useState, memo, useMemo } from 'react';
-import { ChevronUp, ChevronDown, ChevronsUpDown } from 'lucide-react';
+import { ArrowUp, ArrowDownUp } from 'lucide-react';
 import { useVirtualizer } from '@tanstack/react-virtual';
 import {
   Row,
@@ -55,26 +55,6 @@ const SelectionCheckbox = memo(
 
 SelectionCheckbox.displayName = 'SelectionCheckbox';
 
-interface DataTableProps<TData, TValue> {
-  columns: TableColumn<TData, TValue>[];
-  data: TData[];
-  onDelete?: (selectedRows: TData[]) => Promise<void>;
-  filterColumn?: string;
-  defaultSort?: SortingState;
-  columnVisibilityMap?: Record<string, string>;
-  className?: string;
-  pageSize?: number;
-  isFetchingNextPage?: boolean;
-  hasNextPage?: boolean;
-  fetchNextPage?: (options?: unknown) => Promise<unknown>;
-  enableRowSelection?: boolean;
-  showCheckboxes?: boolean;
-  onFilterChange?: (value: string) => void;
-  filterValue?: string;
-  isLoading?: boolean;
-  enableSearch?: boolean;
-}
-
 const TableRowComponent = <TData, TValue>({
   row,
   isSmallScreen,
@@ -186,33 +166,63 @@ const DeleteButton = memo(
   },
 );
 
+interface DataTableProps<TData, TValue> {
+  columns: TableColumn<TData, TValue>[];
+  data: TData[];
+
+  className?: string;
+  isLoading?: boolean;
+
+  enableRowSelection?: boolean;
+  showCheckboxes?: boolean;
+  onDelete?: (selectedRows: TData[]) => Promise<void>;
+
+  enableSearch?: boolean;
+  filterColumn?: string;
+  filterValue?: string;
+  onFilterChange?: (value: string) => void;
+
+  defaultSort?: SortingState;
+  columnVisibilityMap?: Record<string, string>;
+
+  pageSize?: number;
+  isFetchingNextPage?: boolean;
+  hasNextPage?: boolean;
+  fetchNextPage?: (options?: unknown) => Promise<unknown>;
+}
+
 export default function DataTable<TData, TValue>({
   columns,
   data,
-  onDelete,
-  filterColumn,
-  defaultSort = [],
+
   className = '',
+  isLoading,
+
+  enableRowSelection = true,
+  showCheckboxes = true,
+  onDelete,
+
+  enableSearch = true,
+  filterColumn,
+  filterValue,
+  onFilterChange,
+
+  defaultSort = [],
+
   isFetchingNextPage = false,
   hasNextPage = false,
   fetchNextPage,
-  enableRowSelection = true,
-  showCheckboxes = true,
-  onFilterChange,
-  filterValue,
-  isLoading,
-  enableSearch = true,
 }: DataTableProps<TData, TValue>) {
   const isSmallScreen = useMediaQuery('(max-width: 768px)');
   const tableContainerRef = useRef<HTMLDivElement>(null);
 
-  const [isDeleting, setIsDeleting] = useState(false);
-  const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
-  const [sorting, setSorting] = useState<SortingState>(defaultSort);
   const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
   const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({});
-  const [searchTerm, setSearchTerm] = useState(filterValue ?? '');
+  const [isDeleting, setIsDeleting] = useState(false);
   const [isSearching, setIsSearching] = useState(false);
+  const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});
+  const [searchTerm, setSearchTerm] = useState(filterValue ?? '');
+  const [sorting, setSorting] = useState<SortingState>(defaultSort);
 
   const tableColumns = useMemo(() => {
     if (!enableRowSelection || !showCheckboxes) {
@@ -408,12 +418,16 @@ export default function DataTable<TData, TValue>({
                             : flexRender(header.column.columnDef.header, header.getContext())}
                         </span>
                         {canSort && (
-                          <span className="ml-1">
+                          <span className="ml-1 transition-transform duration-200 ease-in-out">
                             {sortDir === false && (
-                              <ChevronsUpDown className="h-4 w-4 text-muted-foreground" />
+                              <ArrowDownUp className="h-4 w-4 text-muted-foreground hover:rotate-180" />
+                            )}
+                            {sortDir === 'asc' && (
+                              <ArrowUp className="h-4 w-4 rotate-0 text-primary" />
+                            )}
+                            {sortDir === 'desc' && (
+                              <ArrowUp className="h-4 w-4 rotate-180 text-primary" />
                             )}
-                            {sortDir === 'asc' && <ChevronUp className="h-4 w-4 text-primary" />}
-                            {sortDir === 'desc' && <ChevronDown className="h-4 w-4 text-primary" />}
                           </span>
                         )}
                       </div>