mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-28 05:06:13 +01:00
* refactor(OpenSidebar): removed useless classNames
* style(Header): update hover styles across various components for improved UI consistency
* style(Nav): update hover styles in AccountSettings and SearchBar for improved UI consistency
* style: update button classes for consistent hover effects and improved UI responsiveness
* style(Nav, OpenSidebar, Header, Convo): improve UI responsiveness and animation transitions
* style(PresetsMenu, NewChat): update icon sizes and improve component styling for better UI consistency
* style(Nav, Root): enhance sidebar mobile animations and responsiveness for better UI experience
* style(ExportAndShareMenu, BookmarkMenu): update icon sizes for improved UI consistency
* style: remove transition duration from button classes for improved UI responsiveness
* style(CustomMenu, ModelSelector): update background colors for improved UI consistency and responsiveness
* style(ExportAndShareMenu): update icon color for improved UI consistency
* style(TemporaryChat): refine button styles for improved UI consistency and responsiveness
* style(BookmarkNav): refactor to use DropdownPopup and remove BookmarkNavItems for improved UI consistency and functionality
* style(CustomMenu, EndpointItem): enhance UI elements for improved consistency and accessibility
* style(EndpointItem): adjust gap in icon container for improved layout consistency
* style(CustomMenu, EndpointItem): update focus ring color for improved UI consistency
* style(EndpointItem): update icon color for improved UI consistency in dark theme
* style: update focus styles for improved accessibility and consistency across components
* refactor(Nav): extract sidebar width to NAV_WIDTH constant
Centralize mobile (320px) and desktop (260px) sidebar widths in a single
exported constant to avoid magic numbers and ensure consistency.
* fix(BookmarkNav): memoize handlers used in useMemo
Wrap handleTagClick and handleClear in useCallback and add them to the
dropdownItems useMemo dependency array to prevent stale closures.
* feat: introduce FilterInput component and replace existing inputs with it across multiple components
* feat(DataTable): replace custom input with FilterInput component for improved filtering
* fix: Nested dialog overlay stacking issue
Fixes overlay appearing behind content when opening nested dialogs.
Introduced dynamic z-index calculation based on dialog depth using React context.
- First dialog: overlay z-50, content z-100
- Nested dialogs increment by 60: overlay z-110/content z-160, etc.
Preserves a11y escape key handling from #10975 and #10851.
Regression from #11008 (afb67fcf1) which increased content z-index
without adjusting overlay z-index for nested dialog scenarios.
* Refactor admin settings components to use a unified AdminSettingsDialog
- Removed redundant code from AdminSettings, MCPAdminSettings, and Memories AdminSettings components.
- Introduced AdminSettingsDialog component to handle permission management for different sections.
- Updated permission handling logic to use a consistent structure across components.
- Enhanced role selection and permission confirmation features in the new dialog.
- Improved UI consistency and maintainability by centralizing dialog functionality.
* refactor(Memory): memory management UI components and replace MemoryViewer with MemoryPanel
* refactor(Memory): enhance UI components for Memory dialogs and improve input styling
* refactor(Bookmarks): improve bookmark management UI with enhanced styling
* refactor(translations): remove redundant filter input and bookmark count entries
* refactor(Convo): integrate useShiftKey hook for enhanced keyboard interaction and improve UI responsiveness
335 lines
11 KiB
TypeScript
335 lines
11 KiB
TypeScript
import { useState, useCallback, useMemo, useRef } from 'react';
|
|
import { ArrowUpLeft } from 'lucide-react';
|
|
import {
|
|
Table,
|
|
Button,
|
|
TableRow,
|
|
TableHead,
|
|
TableBody,
|
|
TableCell,
|
|
FilterInput,
|
|
TableHeader,
|
|
useToastContext,
|
|
} from '@librechat/client';
|
|
import {
|
|
flexRender,
|
|
getCoreRowModel,
|
|
getFilteredRowModel,
|
|
getPaginationRowModel,
|
|
getSortedRowModel,
|
|
useReactTable,
|
|
type ColumnDef,
|
|
type SortingState,
|
|
type VisibilityState,
|
|
type ColumnFiltersState,
|
|
} from '@tanstack/react-table';
|
|
import {
|
|
fileConfig as defaultFileConfig,
|
|
checkOpenAIStorage,
|
|
mergeFileConfig,
|
|
megabyte,
|
|
isAssistantsEndpoint,
|
|
getEndpointFileConfig,
|
|
type TFile,
|
|
} from 'librechat-data-provider';
|
|
import { MyFilesModal } from '~/components/Chat/Input/Files/MyFilesModal';
|
|
import { useFileMapContext, useChatContext } from '~/Providers';
|
|
import { useLocalize, useUpdateFiles } from '~/hooks';
|
|
import { useGetFileConfig } from '~/data-provider';
|
|
|
|
interface DataTableProps<TData, TValue> {
|
|
columns: ColumnDef<TData, TValue>[];
|
|
data: TData[];
|
|
}
|
|
|
|
export default function DataTable<TData, TValue>({ columns, data }: DataTableProps<TData, TValue>) {
|
|
const localize = useLocalize();
|
|
const [sorting, setSorting] = useState<SortingState>([]);
|
|
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
|
|
const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({});
|
|
const [{ pageIndex, pageSize }, setPagination] = useState({ pageIndex: 0, pageSize: 10 });
|
|
const [showFilesModal, setShowFilesModal] = useState(false);
|
|
const manageFilesRef = useRef<HTMLButtonElement>(null);
|
|
|
|
const pagination = useMemo(
|
|
() => ({
|
|
pageIndex,
|
|
pageSize,
|
|
}),
|
|
[pageIndex, pageSize],
|
|
);
|
|
|
|
const table = useReactTable({
|
|
data,
|
|
columns,
|
|
state: {
|
|
sorting,
|
|
columnFilters,
|
|
columnVisibility,
|
|
pagination,
|
|
},
|
|
onSortingChange: setSorting,
|
|
onPaginationChange: setPagination,
|
|
getCoreRowModel: getCoreRowModel(),
|
|
getSortedRowModel: getSortedRowModel(),
|
|
onColumnFiltersChange: setColumnFilters,
|
|
getFilteredRowModel: getFilteredRowModel(),
|
|
onColumnVisibilityChange: setColumnVisibility,
|
|
getPaginationRowModel: getPaginationRowModel(),
|
|
defaultColumn: {
|
|
minSize: 0,
|
|
size: 10,
|
|
maxSize: 10,
|
|
enableResizing: true,
|
|
},
|
|
});
|
|
|
|
const fileMap = useFileMapContext();
|
|
const { showToast } = useToastContext();
|
|
const { setFiles, conversation } = useChatContext();
|
|
const { data: fileConfig = null } = useGetFileConfig({
|
|
select: (data) => mergeFileConfig(data),
|
|
});
|
|
const { addFile } = useUpdateFiles(setFiles);
|
|
|
|
const handleFileClick = useCallback(
|
|
(file: TFile) => {
|
|
if (!fileMap?.[file.file_id] || !conversation?.endpoint) {
|
|
showToast({
|
|
message: localize('com_ui_attach_error'),
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
const fileData = fileMap[file.file_id];
|
|
const endpoint = conversation.endpoint;
|
|
const endpointType = conversation.endpointType;
|
|
|
|
if (!fileData.source) {
|
|
return;
|
|
}
|
|
|
|
const isOpenAIStorage = checkOpenAIStorage(fileData.source);
|
|
const isAssistants = isAssistantsEndpoint(endpoint);
|
|
|
|
if (isOpenAIStorage && !isAssistants) {
|
|
showToast({
|
|
message: localize('com_ui_attach_error_openai'),
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (!isOpenAIStorage && isAssistants) {
|
|
showToast({
|
|
message: localize('com_ui_attach_warn_endpoint'),
|
|
status: 'warning',
|
|
});
|
|
}
|
|
|
|
const endpointFileConfig = getEndpointFileConfig({
|
|
fileConfig,
|
|
endpoint,
|
|
endpointType,
|
|
});
|
|
|
|
if (endpointFileConfig.disabled === true) {
|
|
showToast({
|
|
message: localize('com_ui_attach_error_disabled'),
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (fileData.bytes > (endpointFileConfig.fileSizeLimit ?? Number.MAX_SAFE_INTEGER)) {
|
|
showToast({
|
|
message: `${localize('com_ui_attach_error_size')} ${
|
|
(endpointFileConfig.fileSizeLimit ?? 0) / megabyte
|
|
} MB (${endpoint})`,
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (!defaultFileConfig.checkType(file.type, endpointFileConfig.supportedMimeTypes ?? [])) {
|
|
showToast({
|
|
message: `${localize('com_ui_attach_error_type')} ${file.type} (${endpoint})`,
|
|
status: 'error',
|
|
});
|
|
return;
|
|
}
|
|
|
|
addFile({
|
|
progress: 1,
|
|
attached: true,
|
|
file_id: fileData.file_id,
|
|
filepath: fileData.filepath,
|
|
preview: fileData.filepath,
|
|
type: fileData.type,
|
|
height: fileData.height,
|
|
width: fileData.width,
|
|
filename: fileData.filename,
|
|
source: fileData.source,
|
|
size: fileData.bytes,
|
|
metadata: fileData.metadata,
|
|
});
|
|
},
|
|
[addFile, fileMap, conversation, localize, showToast, fileConfig],
|
|
);
|
|
|
|
const filenameFilter = table.getColumn('filename')?.getFilterValue() as string;
|
|
|
|
return (
|
|
<div role="region" aria-label={localize('com_files_table')} className="mt-2 space-y-2">
|
|
<FilterInput
|
|
inputId="filename-filter"
|
|
label={localize('com_files_filter')}
|
|
value={filenameFilter ?? ''}
|
|
onChange={(event) => table.getColumn('filename')?.setFilterValue(event.target.value)}
|
|
/>
|
|
|
|
<div className="rounded-lg border border-border-light bg-transparent shadow-sm transition-colors">
|
|
<div className="overflow-x-auto">
|
|
<Table>
|
|
<TableHeader>
|
|
{table.getHeaderGroups().map((headerGroup) => (
|
|
<TableRow key={headerGroup.id} className="border-b border-border-light">
|
|
{headerGroup.headers.map((header, index) => (
|
|
<TableHead
|
|
key={header.id}
|
|
style={{ width: index === 0 ? '75%' : '25%' }}
|
|
className="bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary"
|
|
>
|
|
<div className="px-4">
|
|
{header.isPlaceholder
|
|
? null
|
|
: flexRender(header.column.columnDef.header, header.getContext())}
|
|
</div>
|
|
</TableHead>
|
|
))}
|
|
</TableRow>
|
|
))}
|
|
</TableHeader>
|
|
<TableBody>
|
|
{table.getRowModel().rows.length ? (
|
|
table.getRowModel().rows.map((row) => (
|
|
<TableRow
|
|
key={row.id}
|
|
data-state={row.getIsSelected() && 'selected'}
|
|
className="border-b border-border-light transition-colors hover:bg-surface-secondary [&:last-child]:border-0"
|
|
>
|
|
{row.getVisibleCells().map((cell) => {
|
|
const isFilenameCell = cell.column.id === 'filename';
|
|
|
|
return (
|
|
<TableCell
|
|
style={{
|
|
width: '150px',
|
|
maxWidth: '150px',
|
|
overflow: 'hidden',
|
|
textOverflow: 'ellipsis',
|
|
whiteSpace: 'nowrap',
|
|
}}
|
|
className={
|
|
isFilenameCell
|
|
? 'focus:outline-none focus-visible:outline-2 focus-visible:outline-offset-[-2px] focus-visible:outline-text-primary'
|
|
: ''
|
|
}
|
|
data-skip-refocus="true"
|
|
key={cell.id}
|
|
role={isFilenameCell ? 'button' : undefined}
|
|
tabIndex={isFilenameCell ? 0 : undefined}
|
|
onClick={(e) => {
|
|
if (isFilenameCell) {
|
|
const clickedElement = e.target as HTMLElement;
|
|
// Check if clicked element is within cell and not a button/link
|
|
if (
|
|
clickedElement.closest('td') &&
|
|
!clickedElement.closest('button, a')
|
|
) {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
handleFileClick(row.original as TFile);
|
|
}
|
|
}
|
|
}}
|
|
onKeyDown={(e) => {
|
|
if (isFilenameCell && (e.key === 'Enter' || e.key === ' ')) {
|
|
const clickedElement = e.target as HTMLElement;
|
|
if (
|
|
clickedElement.closest('td') &&
|
|
!clickedElement.closest('button, a')
|
|
) {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
handleFileClick(row.original as TFile);
|
|
}
|
|
}
|
|
}}
|
|
>
|
|
{flexRender(cell.column.columnDef.cell, cell.getContext())}
|
|
</TableCell>
|
|
);
|
|
})}
|
|
</TableRow>
|
|
))
|
|
) : (
|
|
<TableRow>
|
|
<TableCell
|
|
colSpan={columns.length}
|
|
className="h-24 text-center text-sm text-text-secondary"
|
|
>
|
|
{localize('com_files_no_results')}
|
|
</TableCell>
|
|
</TableRow>
|
|
)}
|
|
</TableBody>
|
|
</Table>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex items-center justify-between">
|
|
<Button
|
|
ref={manageFilesRef}
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => setShowFilesModal(true)}
|
|
aria-label={localize('com_sidepanel_manage_files')}
|
|
>
|
|
<ArrowUpLeft className="h-4 w-4" aria-hidden="true" />
|
|
<span className="ml-2">{localize('com_sidepanel_manage_files')}</span>
|
|
</Button>
|
|
|
|
<div className="flex items-center gap-2" role="navigation" aria-label="Pagination">
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => table.previousPage()}
|
|
disabled={!table.getCanPreviousPage()}
|
|
aria-label={localize('com_ui_prev')}
|
|
>
|
|
{localize('com_ui_prev')}
|
|
</Button>
|
|
<div aria-live="polite" className="text-sm">
|
|
{`${pageIndex + 1} / ${table.getPageCount()}`}
|
|
</div>
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => table.nextPage()}
|
|
disabled={!table.getCanNextPage()}
|
|
aria-label={localize('com_ui_next')}
|
|
>
|
|
{localize('com_ui_next')}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
<MyFilesModal
|
|
open={showFilesModal}
|
|
onOpenChange={setShowFilesModal}
|
|
triggerRef={manageFilesRef}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|