mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 16:30:15 +01:00
* chore: add i18n localization comment for AlwaysMakeProd component * feat: enhance accessibility by adding aria-label and aria-labelledby to Switch component * feat: add aria-labels for accessibility in Agent and Assistant avatar buttons * fix: add switch aria-labels for accessibility in various components * feat: add aria-labels and localization keys for accessibility in DataTable, DataTableColumnHeader, and OGDialogTemplate components * chore: refactor out nested ternary * feat: add aria-label to DataTable filter button for My Files modal * feat: add aria-labels for Buttons and localization strings * feat: add aria-labels to Checkboxes in Agent Builder * feat: enhance accessibility by adding aria-label and aria-labelledby to Checkbox component * feat: add aria-label to FileSearchCheckbox in Agent Builder * feat: add aria-label to Prompts text input area * feat: enhance accessibility by adding aria-label and aria-labelledby to TextAreaAutosize component * feat: remove improper role: "list" prop from List in Conversations.tsx to enhance accessibility and stop aria rules conflicting within react-virtualized component * feat: enhance accessibility by allowing tab navigation and adding ring highlights for conversation title editing accept/reject buttons * feat: add aria-label to Copy Link button in the conversation share modal * feat: add title to QR code svg in conversation share modal to describe the image content * feat: enhance accessibility by making Agent Avatar upload keyboard navigable and round out highlight border on focus * feat: enhance accessibility by adding aria attributes around alerting users with screen readers to invalid email address inputs in the Agent Builder * feat: add aria-labels to buttons in Advanced panel of Agent Builder * feat: enhance accessibility by making FileUpload and Clear All buttons in PresetItems keyboard navigable * feat: enchance accessiblity by indexing view and delete button aria-labels in shared links management modal to their specific chat titles * feat: add border highlighting on focus for AnimatedSearchInput * feat: add category description to aria-labels for prompts in ListCard * feat: add proper scoping to rows and columns in table headers * feat: add localized aria-labelling to EditTextPart's TextAreaAutosize component and base dynamic paramters panel components and their supporting translation keys * feat: add localized aria-labels and aria-labelledBy to Checkbox components without them * feat: add localized aria-labeledBy for endpoint settings Sliders * feat: add localized aria-labels for TextareaAutosize components * chore: remove unused i18n string * feat: add localized aria-label for BookmarkForm Checkbox * fix: add stopPropagation onKeyDown for Preview and Edit menu items in prompts that was causing the prompts to inadvertently be sent when triggered with keyboard navigation when Auto-send Prompts was toggled on * fix: switch TableCell to TableHead for title cells according to harvard issue #789 * fix: add more descriptive localization key for file filter button in DataTable * chore: remove self-explanatory code comment from RenameForm * fix: remove stray bg-yellow highlight that was left in during debugging * fix: add aria-label to model configurator panel back button * fix: undo incorrect hoist of tool name split for aria-label and span in MCPInput --------- Co-authored-by: Danny Avila <danny@librechat.ai>
157 lines
5.8 KiB
TypeScript
157 lines
5.8 KiB
TypeScript
import React, { useCallback, useEffect, useState } from 'react';
|
|
import { BookmarkPlusIcon } from 'lucide-react';
|
|
import {
|
|
Table,
|
|
Input,
|
|
Button,
|
|
TableRow,
|
|
TableHead,
|
|
TableBody,
|
|
TableCell,
|
|
TableHeader,
|
|
OGDialogTrigger,
|
|
} from '@librechat/client';
|
|
import type { ConversationTagsResponse, TConversationTag } from 'librechat-data-provider';
|
|
import { BookmarkContext, useBookmarkContext } from '~/Providers/BookmarkContext';
|
|
import { BookmarkEditDialog } from '~/components/Bookmarks';
|
|
import BookmarkTableRow from './BookmarkTableRow';
|
|
import { useLocalize } from '~/hooks';
|
|
|
|
const removeDuplicates = (bookmarks: TConversationTag[]) => {
|
|
const seen = new Set();
|
|
return bookmarks.filter((bookmark) => {
|
|
const duplicate = seen.has(bookmark._id);
|
|
seen.add(bookmark._id);
|
|
return !duplicate;
|
|
});
|
|
};
|
|
|
|
const BookmarkTable = () => {
|
|
const localize = useLocalize();
|
|
const [rows, setRows] = useState<ConversationTagsResponse>([]);
|
|
const [pageIndex, setPageIndex] = useState(0);
|
|
const [searchQuery, setSearchQuery] = useState('');
|
|
const [open, setOpen] = useState(false);
|
|
const pageSize = 10;
|
|
|
|
const { bookmarks = [] } = useBookmarkContext();
|
|
|
|
useEffect(() => {
|
|
const _bookmarks = removeDuplicates(bookmarks).sort((a, b) => a.position - b.position);
|
|
setRows(_bookmarks);
|
|
}, [bookmarks]);
|
|
|
|
const moveRow = useCallback((dragIndex: number, hoverIndex: number) => {
|
|
setRows((prevTags: TConversationTag[]) => {
|
|
const updatedRows = [...prevTags];
|
|
const [movedRow] = updatedRows.splice(dragIndex, 1);
|
|
updatedRows.splice(hoverIndex, 0, movedRow);
|
|
return updatedRows.map((row, index) => ({ ...row, position: index }));
|
|
});
|
|
}, []);
|
|
|
|
const renderRow = useCallback(
|
|
(row: TConversationTag) => (
|
|
<BookmarkTableRow key={row._id} moveRow={moveRow} row={row} position={row.position} />
|
|
),
|
|
[moveRow],
|
|
);
|
|
|
|
const filteredRows = rows.filter(
|
|
(row) => row.tag && row.tag.toLowerCase().includes(searchQuery.toLowerCase()),
|
|
);
|
|
|
|
const currentRows = filteredRows.slice(pageIndex * pageSize, (pageIndex + 1) * pageSize);
|
|
|
|
return (
|
|
<BookmarkContext.Provider value={{ bookmarks }}>
|
|
<div role="region" aria-label={localize('com_ui_bookmarks')} className="mt-2 space-y-2">
|
|
<div className="flex items-center gap-4">
|
|
<Input
|
|
placeholder={localize('com_ui_bookmarks_filter')}
|
|
value={searchQuery}
|
|
onChange={(e) => setSearchQuery(e.target.value)}
|
|
aria-label={localize('com_ui_bookmarks_filter')}
|
|
/>
|
|
</div>
|
|
|
|
<div className="rounded-lg border border-border-light bg-transparent shadow-sm transition-colors">
|
|
<Table className="w-full table-fixed">
|
|
<TableHeader>
|
|
<TableRow className="border-b border-border-light">
|
|
<TableHead className="w-[70%] bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary">
|
|
<div>{localize('com_ui_bookmarks_title')}</div>
|
|
</TableHead>
|
|
<TableHead className="w-[30%] bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary">
|
|
<div>{localize('com_ui_bookmarks_count')}</div>
|
|
</TableHead>
|
|
<TableHead className="w-[40%] bg-surface-secondary py-3 text-left text-sm font-medium text-text-secondary">
|
|
<div>{localize('com_assistants_actions')}</div>
|
|
</TableHead>
|
|
</TableRow>
|
|
</TableHeader>
|
|
<TableBody>
|
|
{currentRows.length ? (
|
|
currentRows.map(renderRow)
|
|
) : (
|
|
<TableRow>
|
|
<TableCell colSpan={3} className="h-24 text-center text-sm text-text-secondary">
|
|
{localize('com_ui_no_bookmarks')}
|
|
</TableCell>
|
|
</TableRow>
|
|
)}
|
|
</TableBody>
|
|
</Table>
|
|
</div>
|
|
|
|
<div className="flex items-center justify-between">
|
|
<div className="flex justify-between gap-2">
|
|
<BookmarkEditDialog context="BookmarkPanel" open={open} setOpen={setOpen}>
|
|
<OGDialogTrigger asChild>
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
className="w-full gap-2 text-sm"
|
|
aria-label={localize('com_ui_bookmarks_new')}
|
|
onClick={() => setOpen(!open)}
|
|
>
|
|
<BookmarkPlusIcon className="size-4" />
|
|
<div className="break-all">{localize('com_ui_bookmarks_new')}</div>
|
|
</Button>
|
|
</OGDialogTrigger>
|
|
</BookmarkEditDialog>
|
|
</div>
|
|
<div className="flex items-center gap-2" role="navigation" aria-label="Pagination">
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() => setPageIndex((prev) => Math.max(prev - 1, 0))}
|
|
disabled={pageIndex === 0}
|
|
aria-label={localize('com_ui_prev')}
|
|
>
|
|
{localize('com_ui_prev')}
|
|
</Button>
|
|
<div aria-live="polite" className="text-sm">
|
|
{`${pageIndex + 1} / ${Math.ceil(filteredRows.length / pageSize)}`}
|
|
</div>
|
|
<Button
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={() =>
|
|
setPageIndex((prev) =>
|
|
(prev + 1) * pageSize < filteredRows.length ? prev + 1 : prev,
|
|
)
|
|
}
|
|
disabled={(pageIndex + 1) * pageSize >= filteredRows.length}
|
|
aria-label={localize('com_ui_next')}
|
|
>
|
|
{localize('com_ui_next')}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</BookmarkContext.Provider>
|
|
);
|
|
};
|
|
|
|
export default BookmarkTable;
|