Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🎨 style: bookmarks UI update (#3479)

Marco Beretta2d5f704695e1
diff --git a/client/src/components/Bookmarks/BookmarkEditDialog.tsx b/client/src/components/Bookmarks/BookmarkEditDialog.tsx
index b5acec6d17..a57b61088f 100644
--- a/client/src/components/Bookmarks/BookmarkEditDialog.tsx
+++ b/client/src/components/Bookmarks/BookmarkEditDialog.tsx
@@ -1,8 +1,7 @@
import React, { useRef, useState } from 'react';
-import { DialogTrigger } from '@radix-ui/react-dialog';
import { TConversationTag, TConversation } from 'librechat-data-provider';
-import DialogTemplate from '~/components/ui/DialogTemplate';
-import { Dialog, DialogButton } from '~/components/ui/';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
+import { OGDialog, OGDialogTrigger, OGDialogClose } from '~/components/ui/';
import BookmarkForm from './BookmarkForm';
import { useLocalize } from '~/hooks';
import { Spinner } from '../svg';
@@ -33,9 +32,9 @@ const BookmarkEditDialog = ({
};
return (
- <Dialog open={open} onOpenChange={setOpen}>
- <DialogTrigger asChild>{trigger}</DialogTrigger>
- <DialogTemplate
+ <OGDialog open={open} onOpenChange={setOpen}>
+ <OGDialogTrigger asChild>{trigger}</OGDialogTrigger>
+ <OGDialogTemplate
title="Bookmark"
className="w-11/12 sm:w-1/4"
showCloseButton={false}
@@ -51,18 +50,19 @@ const BookmarkEditDialog = ({
/>
}
buttons={
- <div className="mb-6 md:mb-2">
- <DialogButton
+ <OGDialogClose asChild>
+ <button
+ type="submit"
disabled={isLoading}
onClick={handleSubmitForm}
- className="bg-green-500 text-white hover:bg-green-600 dark:hover:bg-green-600"
+ className="btn rounded bg-green-500 font-bold text-white transition-all hover:bg-green-600"
>
{isLoading ? <Spinner /> : localize('com_ui_save')}
- </DialogButton>
- </div>
+ </button>
+ </OGDialogClose>
}
/>
- </Dialog>
+ </OGDialog>
);
};
diff --git a/client/src/components/Bookmarks/BookmarkForm.tsx b/client/src/components/Bookmarks/BookmarkForm.tsx
index 4a6702dd68..98b84362de 100644
--- a/client/src/components/Bookmarks/BookmarkForm.tsx
+++ b/client/src/components/Bookmarks/BookmarkForm.tsx
@@ -130,7 +130,7 @@ const BookmarkForm = ({
aria-invalid={!!errors.tag}
className={cn(
defaultTextProps,
- 'flex h-10 max-h-10 w-full resize-none border-gray-100 px-3 py-2 dark:border-gray-600',
+ 'flex h-10 max-h-10 w-full resize-none px-3 py-2',
removeFocusOutlines,
)}
placeholder=" "
@@ -158,7 +158,7 @@ const BookmarkForm = ({
/>
</div>
{conversation && (
- <div className="flex w-full items-center">
+ <div className="mt-2 flex w-full items-center">
<Controller
name="addToConversation"
control={control}
diff --git a/client/src/components/Bookmarks/BookmarkItem.tsx b/client/src/components/Bookmarks/BookmarkItem.tsx
index 2e4c7983d2..d5a214a494 100644
--- a/client/src/components/Bookmarks/BookmarkItem.tsx
+++ b/client/src/components/Bookmarks/BookmarkItem.tsx
@@ -32,7 +32,7 @@ const BookmarkItem: FC<MenuItemProps> = ({
<div
role="menuitem"
className={cn(
- 'group m-1.5 flex cursor-pointer gap-2 rounded px-1 py-2.5 !pr-3 text-sm !opacity-100 focus:ring-0 radix-disabled:pointer-events-none radix-disabled:opacity-50',
+ 'group m-1.5 flex cursor-pointer gap-2 rounded px-2 py-2.5 !pr-3 text-sm !opacity-100 focus:ring-0 radix-disabled:pointer-events-none radix-disabled:opacity-50',
'hover:bg-black/5 dark:hover:bg-white/5',
highlightSelected && selected && 'bg-black/5 dark:bg-white/5',
)}
@@ -58,8 +58,8 @@ const BookmarkItem: FC<MenuItemProps> = ({
<div className="flex items-center justify-end">
<span
className={cn(
- 'ml-auto w-9 min-w-max whitespace-nowrap rounded-full bg-white px-2.5 py-0.5 text-center text-xs font-medium leading-5 text-gray-600 ring-1 ring-inset ring-gray-200',
- 'dark:bg-gray-800 dark:text-white dark:ring-gray-100/50',
+ 'ml-auto w-9 min-w-max whitespace-nowrap rounded-md bg-white px-2.5 py-0.5 text-center text-xs font-medium leading-5 text-gray-600',
+ 'dark:bg-gray-800 dark:text-white',
)}
aria-hidden="true"
>
diff --git a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
index 442e9ad92c..a3a2d0b474 100644
--- a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
+++ b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
@@ -8,7 +8,12 @@ import { TrashIcon } from '~/components/svg';
import { Label } from '~/components/ui';
import { useLocalize } from '~/hooks';
-const DeleteBookmarkButton: FC<{ bookmark: string }> = ({ bookmark }) => {
+const DeleteBookmarkButton: FC<{
+ bookmark: string;
+ tabIndex?: number;
+ onFocus?: () => void;
+ onBlur?: () => void;
+}> = ({ bookmark, tabIndex = 0, onFocus, onBlur }) => {
const localize = useLocalize();
const { showToast } = useToastContext();
@@ -37,13 +42,17 @@ const DeleteBookmarkButton: FC<{ bookmark: string }> = ({ bookmark }) => {
title="Delete Bookmark"
confirmMessage={
<Label htmlFor="bookmark" className="text-left text-sm font-medium">
- {localize('com_ui_bookmark_delete_confirm')} : {bookmark}
+ {localize('com_ui_bookmark_delete_confirm')} {bookmark}
</Label>
}
confirm={confirmDelete}
- className="hover:text-gray-300 focus-visible:bg-gray-100 focus-visible:outline-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-gray-600 dark:focus-visible:bg-gray-600"
+ className="transition-color flex h-7 w-7 min-w-7 items-center justify-center rounded-lg duration-200 hover:bg-gray-200 dark:hover:bg-gray-700"
icon={<TrashIcon className="size-4" />}
+ tabIndex={tabIndex}
+ onFocus={onFocus}
+ onBlur={onBlur}
/>
);
};
+
export default DeleteBookmarkButton;
diff --git a/client/src/components/Bookmarks/EditBookmarkButton.tsx b/client/src/components/Bookmarks/EditBookmarkButton.tsx
index 7c4bb333ab..58f18d6677 100644
--- a/client/src/components/Bookmarks/EditBookmarkButton.tsx
+++ b/client/src/components/Bookmarks/EditBookmarkButton.tsx
@@ -3,21 +3,30 @@ import type { TConversationTag } from 'librechat-data-provider';
import BookmarkEditDialog from './BookmarkEditDialog';
import { EditIcon } from '~/components/svg';
import { useLocalize } from '~/hooks';
-
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '~/components/ui';
-const EditBookmarkButton: FC<{ bookmark: TConversationTag }> = ({ bookmark }) => {
+
+const EditBookmarkButton: FC<{
+ bookmark: TConversationTag;
+ tabIndex?: number;
+ onFocus?: () => void;
+ onBlur?: () => void;
+}> = ({ bookmark, tabIndex = 0, onFocus, onBlur }) => {
const localize = useLocalize();
return (
<BookmarkEditDialog
bookmark={bookmark}
trigger={
- <button className="size-4 hover:text-gray-300 focus-visible:bg-gray-100 focus-visible:outline-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-gray-600 dark:focus-visible:bg-gray-600">
+ <button
+ type="button"
+ className="transition-color flex h-7 w-7 min-w-7 items-center justify-center rounded-lg duration-200 hover:bg-gray-200 dark:hover:bg-gray-700"
+ tabIndex={tabIndex}
+ onFocus={onFocus}
+ onBlur={onBlur}
+ >
<TooltipProvider delayDuration={250}>
<Tooltip>
<TooltipTrigger asChild>
- <span>
- <EditIcon />
- </span>
+ <EditIcon />
</TooltipTrigger>
<TooltipContent side="top" sideOffset={0}>
{localize('com_ui_edit')}
diff --git a/client/src/components/Chat/Menus/Bookmarks/BookmarkMenuItems.tsx b/client/src/components/Chat/Menus/Bookmarks/BookmarkMenuItems.tsx
index 5ca5795b80..7d7d526aa6 100644
--- a/client/src/components/Chat/Menus/Bookmarks/BookmarkMenuItems.tsx
+++ b/client/src/components/Chat/Menus/Bookmarks/BookmarkMenuItems.tsx
@@ -58,7 +58,7 @@ export const BookmarkMenuItems: FC<{
trigger={
<div
role="menuitem"
- className="group m-1.5 flex cursor-pointer gap-2 rounded px-1 !pr-3.5 pb-2.5 pt-3 text-sm !opacity-100 hover:bg-black/5 focus:ring-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-white/5"
+ className="group m-1.5 flex cursor-pointer gap-2 rounded px-2 !pr-3.5 pb-2.5 pt-3 text-sm !opacity-100 hover:bg-black/5 focus:ring-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-white/5"
tabIndex={-1}
>
<div className="flex grow items-center justify-between gap-2">
diff --git a/client/src/components/SidePanel/Bookmarks/BookmarkPanel.tsx b/client/src/components/SidePanel/Bookmarks/BookmarkPanel.tsx
index 79216e75ba..97d0c02173 100644
--- a/client/src/components/SidePanel/Bookmarks/BookmarkPanel.tsx
+++ b/client/src/components/SidePanel/Bookmarks/BookmarkPanel.tsx
@@ -1,19 +1,14 @@
import { BookmarkPlusIcon } from 'lucide-react';
-import type { FC } from 'react';
import { useConversationTagsQuery, useRebuildConversationTagsMutation } from '~/data-provider';
-import { Button, Dialog, DialogContent, DialogHeader, DialogTitle } from '~/components/ui';
+import { Button } from '~/components/ui';
import { BookmarkContext } from '~/Providers/BookmarkContext';
import { BookmarkEditDialog } from '~/components/Bookmarks';
import BookmarkTable from './BookmarkTable';
import { Spinner } from '~/components/svg';
import { useLocalize } from '~/hooks';
-import { cn } from '~/utils/';
import HoverCardSettings from '~/components/Nav/SettingsTabs/HoverCardSettings';
-const BookmarkPanel: FC<{ open: boolean; onOpenChange: (open: boolean) => void }> = ({
- open,
- onOpenChange,
-}) => {
+const BookmarkPanel = () => {
const localize = useLocalize();
const { mutate, isLoading } = useRebuildConversationTagsMutation();
const { data } = useConversationTagsQuery();
@@ -21,52 +16,31 @@ const BookmarkPanel: FC<{ open: boolean; onOpenChange: (open: boolean) => void }
mutate({});
};
return (
- <Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent
- showCloseButton={true}
- className={cn(
- 'overflow-x-auto shadow-2xl dark:bg-gray-700 dark:text-white md:max-h-[600px] md:min-h-[373px] md:w-[680px]',
- )}
- >
- <DialogHeader>
- <DialogTitle className="text-lg font-medium leading-6 text-gray-900 dark:text-gray-200">
- {localize('com_ui_bookmarks')}
- </DialogTitle>
- </DialogHeader>
- <BookmarkContext.Provider value={{ bookmarks: data || [] }}>
- <div className="p-0 sm:p-6 sm:pt-4">
- <BookmarkTable />
- <div className="mt-5 sm:mt-4" />
- <div className="flex justify-between gap-2 pr-2 sm:pr-0">
- <Button variant="outline" onClick={rebuildTags} className="text-sm">
- {isLoading ? (
- <Spinner />
- ) : (
- <div className="flex gap-2">
- {localize('com_ui_bookmarks_rebuild')}
- <HoverCardSettings side="bottom" text="com_nav_info_bookmarks_rebuild" />
- </div>
- )}
- </Button>
-
+ <div className="h-auto max-w-full overflow-x-hidden">
+ <BookmarkContext.Provider value={{ bookmarks: data || [] }}>
+ <BookmarkTable />
+ <div className="flex justify-between gap-2">
+ <Button variant="outline" onClick={rebuildTags} className="w-50 text-sm">
+ {isLoading ? (
+ <Spinner />
+ ) : (
<div className="flex gap-2">
- <BookmarkEditDialog
- trigger={
- <Button variant="outline" onClick={rebuildTags} className="text-sm">
- <BookmarkPlusIcon className="mr-1 size-4" />
- <div className="break-all">{localize('com_ui_bookmarks_new')}</div>
- </Button>
- }
- />
- <Button variant="subtle" onClick={() => onOpenChange(!open)} className="text-sm">
- {localize('com_ui_close')}
- </Button>
+ {localize('com_ui_bookmarks_rebuild')}
+ <HoverCardSettings side="top" text="com_nav_info_bookmarks_rebuild" />
</div>
- </div>
- </div>
- </BookmarkContext.Provider>
- </DialogContent>
- </Dialog>
+ )}
+ </Button>
+ <BookmarkEditDialog
+ trigger={
+ <Button variant="outline" onClick={rebuildTags} className="w-full text-sm">
+ <BookmarkPlusIcon className="mr-1 size-4" />
+ <div className="break-all">{localize('com_ui_bookmarks_new')}</div>
+ </Button>
+ }
+ />
+ </div>
+ </BookmarkContext.Provider>
+ </div>
);
};
export default BookmarkPanel;
diff --git a/client/src/components/SidePanel/Bookmarks/BookmarkTable.tsx b/client/src/components/SidePanel/Bookmarks/BookmarkTable.tsx
index 884f5dca93..3ca213a844 100644
--- a/client/src/components/SidePanel/Bookmarks/BookmarkTable.tsx
+++ b/client/src/components/SidePanel/Bookmarks/BookmarkTable.tsx
@@ -1,13 +1,16 @@
import React, { useCallback, useEffect, useState } from 'react';
import type { ConversationTagsResponse, TConversationTag } from 'librechat-data-provider';
+import { Table, TableHeader, TableBody, TableRow, TableCell, Input, Button } from '~/components/ui';
import { BookmarkContext, useBookmarkContext } from '~/Providers/BookmarkContext';
import BookmarkTableRow from './BookmarkTableRow';
import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
const BookmarkTable = () => {
const localize = useLocalize();
const [rows, setRows] = useState<ConversationTagsResponse>([]);
+ const [pageIndex, setPageIndex] = useState(0);
+ const [searchQuery, setSearchQuery] = useState('');
+ const pageSize = 10;
const { bookmarks } = useBookmarkContext();
useEffect(() => {
@@ -27,30 +30,65 @@ const BookmarkTable = () => {
return <BookmarkTableRow key={row.tag} moveRow={moveRow} row={row} position={position} />;
}, []);
+ const filteredRows = rows.filter((row) =>
+ row.tag.toLowerCase().includes(searchQuery.toLowerCase()),
+ );
+
+ const currentRows = filteredRows.slice(pageIndex * pageSize, (pageIndex + 1) * pageSize);
+
return (
<BookmarkContext.Provider value={{ bookmarks }}>
- <div
- className={cn(
- 'container',
- 'relative h-[300px] overflow-auto',
- '-mx-4 w-auto ring-1 ring-gray-300 sm:mx-0 sm:rounded-lg',
- )}
- >
- <table className="min-w-full divide-gray-300">
- <thead className="sticky top-0 z-10 border-b bg-white">
- <tr className="text-left text-sm font-semibold text-gray-900">
- <th className="w-96 px-3 py-3.5 pl-6">
+ <div className="flex items-center gap-4 py-4">
+ <Input
+ placeholder={localize('com_ui_bookmarks_filter')}
+ value={searchQuery}
+ onChange={(e) => setSearchQuery(e.target.value)}
+ className="w-full dark:border-gray-700"
+ />
+ </div>
+ <div className="overflow-y-auto rounded-md border border-black/10 dark:border-white/10">
+ <Table className="table-fixed border-separate border-spacing-0">
+ <TableHeader>
+ <TableRow>
+ <TableCell className="w-full px-3 py-3.5 pl-6 dark:bg-gray-700">
<div>{localize('com_ui_bookmarks_title')}</div>
- </th>
- <th className="w-28 px-3 py-3.5 sm:pl-6">
+ </TableCell>
+ <TableCell className="w-full px-3 py-3.5 dark:bg-gray-700 sm:pl-6">
<div>{localize('com_ui_bookmarks_count')}</div>
- </th>
-
- <th className="flex-grow px-3 py-3.5 sm:pl-6"> </th>
- </tr>
- </thead>
- <tbody className="text-sm">{rows.map((row, i) => renderRow(row, i))}</tbody>
- </table>
+ </TableCell>
+ </TableRow>
+ </TableHeader>
+ <TableBody>{currentRows.map((row, i) => renderRow(row, i))}</TableBody>
+ </Table>
+ </div>
+ <div className="flex items-center justify-between py-4">
+ <div className="pl-1 text-gray-400">
+ {localize('com_ui_showing')} {pageIndex * pageSize + 1} -{' '}
+ {Math.min((pageIndex + 1) * pageSize, filteredRows.length)} {localize('com_ui_of')}{' '}
+ {filteredRows.length}
+ </div>
+ <div className="flex items-center space-x-2">
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => setPageIndex((prev) => Math.max(prev - 1, 0))}
+ disabled={pageIndex === 0}
+ >
+ {localize('com_ui_prev')}
+ </Button>
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() =>
+ setPageIndex((prev) =>
+ (prev + 1) * pageSize < filteredRows.length ? prev + 1 : prev,
+ )
+ }
+ disabled={(pageIndex + 1) * pageSize >= filteredRows.length}
+ >
+ {localize('com_ui_next')}
+ </Button>
+ </div>
</div>
</BookmarkContext.Provider>
);
diff --git a/client/src/components/SidePanel/Bookmarks/BookmarkTableRow.tsx b/client/src/components/SidePanel/Bookmarks/BookmarkTableRow.tsx
index 916a183043..9923fe7398 100644
--- a/client/src/components/SidePanel/Bookmarks/BookmarkTableRow.tsx
+++ b/client/src/components/SidePanel/Bookmarks/BookmarkTableRow.tsx
@@ -1,64 +1,22 @@
-import { useRef } from 'react';
+import React, { useState } from 'react';
import { useDrag, useDrop } from 'react-dnd';
-import type { FC } from 'react';
-import type { Identifier, XYCoord } from 'dnd-core';
import type { TConversationTag } from 'librechat-data-provider';
import { DeleteBookmarkButton, EditBookmarkButton } from '~/components/Bookmarks';
-import { useConversationTagMutation } from '~/data-provider';
-import { NotificationSeverity } from '~/common';
-import { useToastContext } from '~/Providers';
-import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
+import { TableRow, TableCell } from '~/components/ui';
-export const ItemTypes = {
- CARD: 'card',
-};
-
-export interface BookmarkItemProps {
- position: number;
- moveRow: (dragIndex: number, hoverIndex: number) => void;
+interface BookmarkTableRowProps {
row: TConversationTag;
+ moveRow: (dragIndex: number, hoverIndex: number) => void;
+ position: number;
}
-interface DragItem {
- index: number;
- id: string;
- type: string;
-}
-
-const BookmarkTableRow: FC<BookmarkItemProps> = ({ position, moveRow, row, ...rest }) => {
- const ref = useRef<HTMLTableRowElement>(null);
-
- const mutation = useConversationTagMutation(row.tag);
- const localize = useLocalize();
- const { showToast } = useToastContext();
+const BookmarkTableRow: React.FC<BookmarkTableRowProps> = ({ row, moveRow, position }) => {
+ const [isHovered, setIsHovered] = useState(false);
+ const ref = React.useRef<HTMLTableRowElement>(null);
- const handleDrop = (item: DragItem) => {
- const data = {
- ...row,
- position: item.index,
- };
- mutation.mutate(data, {
- onError: () => {
- showToast({
- message: localize('com_endpoint_preset_save_error'),
- severity: NotificationSeverity.ERROR,
- });
- },
- });
- };
-
- const [{ handlerId }, drop] = useDrop<DragItem, void, { handlerId: Identifier | null }>({
- accept: ItemTypes.CARD,
- collect(monitor) {
- return {
- handlerId: monitor.getHandlerId(),
- };
- },
- drop(item: DragItem, monitor) {
- handleDrop(item);
- },
- hover(item: DragItem, monitor) {
+ const [, drop] = useDrop({
+ accept: 'bookmark',
+ hover(item: { index: number }) {
if (!ref.current) {
return;
}
@@ -67,68 +25,60 @@ const BookmarkTableRow: FC<BookmarkItemProps> = ({ position, moveRow, row, ...re
if (dragIndex === hoverIndex) {
return;
}
-
- const hoverBoundingRect = ref.current?.getBoundingClientRect();
-
- const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
-
- const clientOffset = monitor.getClientOffset();
-
- const hoverClientY = (clientOffset as XYCoord).y - hoverBoundingRect.top;
-
- if (dragIndex < hoverIndex && hoverClientY < hoverMiddleY) {
- return;
- }
- if (dragIndex > hoverIndex && hoverClientY > hoverMiddleY) {
- return;
- }
-
moveRow(dragIndex, hoverIndex);
-
item.index = hoverIndex;
},
});
const [{ isDragging }, drag] = useDrag({
- type: ItemTypes.CARD,
- item: () => {
- return { id: row.tag, index: position };
- },
+ type: 'bookmark',
+ item: { index: position },
collect: (monitor) => ({
isDragging: monitor.isDragging(),
}),
});
- if (position > 0) {
- drag(drop(ref));
- }
+ drag(drop(ref));
return (
- <tr
- className={cn(
- 'group cursor-pointer gap-2 rounded text-sm hover:bg-black/5 focus:ring-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-white/5',
- isDragging ? 'opacity-0' : 'opacity-100',
- )}
- key={row.tag}
+ <TableRow
ref={ref}
- data-handler-id={handlerId}
- role="menuitem"
- tabIndex={-1}
- {...rest}
+ className="cursor-move hover:bg-gray-100 dark:hover:bg-gray-800"
+ style={{ opacity: isDragging ? 0.5 : 1 }}
+ onMouseEnter={() => setIsHovered(true)}
+ onMouseLeave={() => setIsHovered(false)}
>
- <td className="w-96 py-2 pl-6 pr-3">{row.tag}</td>
- <td className={cn('w-28 py-2 pl-4 pr-3 sm:pl-6')}>
- <span className="py-1">{row.count}</span>
- </td>
- <td className="flex-grow py-2 pl-4 pr-4 sm:pl-6">
- {position > 0 && (
- <div className="flex w-full items-center justify-end gap-2 py-1 text-gray-400">
- <EditBookmarkButton bookmark={row} />
- <DeleteBookmarkButton bookmark={row.tag} />
+ <TableCell className="w-full px-3 py-3.5 pl-6">
+ <div className="truncate">{row.tag}</div>
+ </TableCell>
+ <TableCell className="w-full px-3 py-3.5 sm:pl-6">
+ <div className="flex items-center justify-between py-1">
+ <div>{row.count}</div>
+ <div
+ className="flex items-center gap-2"
+ style={{
+ opacity: isHovered ? 1 : 0,
+ transition: 'opacity 0.1s ease-in-out',
+ }}
+ onFocus={() => setIsHovered(true)}
+ onBlur={() => setIsHovered(false)}
+ >
+ <EditBookmarkButton
+ bookmark={row}
+ tabIndex={0}
+ onFocus={() => setIsHovered(true)}
+ onBlur={() => setIsHovered(false)}
+ />
+ <DeleteBookmarkButton
+ bookmark={row.tag}
+ tabIndex={0}
+ onFocus={() => setIsHovered(true)}
+ onBlur={() => setIsHovered(false)}
+ />
</div>
- )}
- </td>
- </tr>
+ </div>
+ </TableCell>
+ </TableRow>
);
};
diff --git a/client/src/components/SidePanel/Builder/AssistantTool.tsx b/client/src/components/SidePanel/Builder/AssistantTool.tsx
index ff1d004ee0..7ebde003c5 100644
--- a/client/src/components/SidePanel/Builder/AssistantTool.tsx
+++ b/client/src/components/SidePanel/Builder/AssistantTool.tsx
@@ -88,7 +88,6 @@ export default function AssistantTool({
<OGDialogTemplate
showCloseButton={false}
title={localize('com_ui_delete_tool')}
- mainClassName="px-0"
className="max-w-[450px]"
main={
<Label className="text-left text-sm font-medium">
diff --git a/client/src/components/SidePanel/Files/PanelTable.tsx b/client/src/components/SidePanel/Files/PanelTable.tsx
index c75bf0774b..69f025a74d 100644
--- a/client/src/components/SidePanel/Files/PanelTable.tsx
+++ b/client/src/components/SidePanel/Files/PanelTable.tsx
@@ -72,12 +72,12 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
return (
<>
- <div className="flex items-center gap-4 px-2 py-4">
+ <div className="flex items-center gap-4 py-4">
<Input
placeholder={localize('com_files_filter')}
value={(table.getColumn('filename')?.getFilterValue() as string) ?? ''}
onChange={(event) => table.getColumn('filename')?.setFilterValue(event.target.value)}
- className="max-w-xs dark:border-gray-700"
+ className="w-full dark:border-gray-700"
/>
</div>
<div className="overflow-y-auto rounded-md border border-black/10 dark:border-white/10">
@@ -90,7 +90,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
<TableHead
key={header.id}
style={{ width: index === 0 ? '75%' : '25%' }}
- className="sticky top-0 h-auto border-b border-black/10 bg-white py-1 text-left font-medium text-gray-700 dark:border-white/10 dark:bg-gray-800 dark:text-gray-100"
+ className="sticky top-0 h-auto bg-white py-1 text-left font-medium text-gray-700 dark:bg-gray-700 dark:text-gray-100"
>
{header.isPlaceholder
? null
@@ -133,17 +133,19 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
</TableBody>
</Table>
</div>
- <div className="flex items-center justify-around space-x-2 py-4">
- <Button
- variant="outline"
- size="sm"
- onClick={() => setShowFiles(true)}
- className="flex gap-2"
- >
- <LucideArrowUpLeft className="icon-sm" />
- {localize('com_sidepanel_manage_files')}
- </Button>
- <div className="flex gap-2">
+ <div className="flex items-center justify-between py-4">
+ <div className="flex items-center">
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => setShowFiles(true)}
+ className="flex gap-2"
+ >
+ <LucideArrowUpLeft className="icon-sm" />
+ {localize('com_sidepanel_manage_files')}
+ </Button>
+ </div>
+ <div className="flex items-center gap-2">
<Button
variant="outline"
size="sm"
diff --git a/client/src/components/ui/OGDialogTemplate.tsx b/client/src/components/ui/OGDialogTemplate.tsx
index 4412f67f35..10bd8e112a 100644
--- a/client/src/components/ui/OGDialogTemplate.tsx
+++ b/client/src/components/ui/OGDialogTemplate.tsx
@@ -66,7 +66,7 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDi
<OGDialogTitle>{title}</OGDialogTitle>
{description && <OGDialogDescription className="">{description}</OGDialogDescription>}
</OGDialogHeader>
- <div className={cn('px-6', mainClassName)}>{main ? main : null}</div>
+ <div className={cn('px-0', mainClassName)}>{main ? main : null}</div>
<OGDialogFooter className={footerClassName}>
<div>{leftButtons ? leftButtons : null}</div>
<div className="flex h-auto gap-3">
diff --git a/client/src/components/ui/TooltipIcon.tsx b/client/src/components/ui/TooltipIcon.tsx
index f8a3263e36..399458c1b7 100644
--- a/client/src/components/ui/TooltipIcon.tsx
+++ b/client/src/components/ui/TooltipIcon.tsx
@@ -1,14 +1,14 @@
import { ReactElement } from 'react';
import {
- Dialog,
- DialogTrigger,
+ OGDialog,
+ OGDialogTrigger,
Label,
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from '~/components/ui';
-import DialogTemplate from '~/components/ui/DialogTemplate';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
import { CrossIcon } from '~/components/svg';
import { useLocalize } from '~/hooks';
@@ -20,6 +20,9 @@ export default function TooltipIcon({
confirm,
confirmMessage,
icon,
+ tabIndex,
+ onFocus,
+ onBlur,
}: {
disabled: boolean;
title: string;
@@ -28,6 +31,9 @@ export default function TooltipIcon({
confirm?: () => void;
confirmMessage?: ReactElement;
icon?: ReactElement;
+ tabIndex?: number;
+ onFocus?: () => void;
+ onBlur?: () => void;
}) {
const localize = useLocalize();
@@ -55,27 +61,29 @@ export default function TooltipIcon({
if (!confirmMessage) {
return (
- <button className={className} onClick={confirm}>
+ <button
+ className={className}
+ onClick={confirm}
+ tabIndex={tabIndex}
+ onFocus={onFocus}
+ onBlur={onBlur}
+ >
{disabled ? <CrossIcon /> : renderDeleteButton()}
</button>
);
}
return (
- <Dialog>
- <DialogTrigger asChild>
- <button className={className}>{disabled ? <CrossIcon /> : renderDeleteButton()}</button>
- </DialogTrigger>
- <DialogTemplate
+ <OGDialog>
+ <OGDialogTrigger asChild>
+ <button className={className} tabIndex={tabIndex} onFocus={onFocus} onBlur={onBlur}>
+ {disabled ? <CrossIcon /> : renderDeleteButton()}
+ </button>
+ </OGDialogTrigger>
+ <OGDialogTemplate
showCloseButton={false}
title={title}
className="max-w-[450px]"
- main={
- <>
- <div className="flex w-full flex-col items-center gap-2">
- <div className="grid w-full items-center gap-2">{confirmMessage}</div>
- </div>
- </>
- }
+ main={<Label className="text-left text-sm font-medium">{confirmMessage}</Label>}
selection={{
selectHandler: confirm,
selectClasses:
@@ -83,6 +91,6 @@ export default function TooltipIcon({
selectText: localize('com_ui_delete'),
}}
/>
- </Dialog>
+ </OGDialog>
);
}
diff --git a/client/src/hooks/Nav/useSideNavLinks.ts b/client/src/hooks/Nav/useSideNavLinks.ts
index 46dbd8b40e..6b90a98ea0 100644
--- a/client/src/hooks/Nav/useSideNavLinks.ts
+++ b/client/src/hooks/Nav/useSideNavLinks.ts
@@ -13,6 +13,7 @@ import {
} from 'librechat-data-provider';
import type { TConfig, TInterfaceConfig } from 'librechat-data-provider';
import type { NavLink } from '~/common';
+import BookmarkPanel from '~/components/SidePanel/Bookmarks/BookmarkPanel';
import PanelSwitch from '~/components/SidePanel/Builder/PanelSwitch';
import PromptsAccordion from '~/components/Prompts/PromptsAccordion';
// import Parameters from '~/components/SidePanel/Parameters/Panel';
@@ -26,14 +27,12 @@ export default function useSideNavLinks({
keyProvided,
endpoint,
interfaceConfig,
- manageBookmarks,
}: {
hidePanel: () => void;
assistants?: TConfig | null;
keyProvided: boolean;
endpoint?: EModelEndpoint | null;
interfaceConfig: Partial<TInterfaceConfig>;
- manageBookmarks: (e?: React.MouseEvent) => void;
}) {
const hasAccessToPrompts = useHasAccess({
permissionType: PermissionTypes.PROMPTS,
@@ -80,8 +79,8 @@ export default function useSideNavLinks({
title: 'com_sidepanel_conversation_tags',
label: '',
icon: Bookmark,
- onClick: manageBookmarks,
id: 'bookmarks',
+ Component: BookmarkPanel,
});
links.push({
@@ -100,7 +99,6 @@ export default function useSideNavLinks({
endpoint,
interfaceConfig.parameters,
hasAccessToPrompts,
- manageBookmarks,
]);
return Links;
diff --git a/client/src/localization/languages/Eng.ts b/client/src/localization/languages/Eng.ts
index bc8bde3dc7..a521360d94 100644
--- a/client/src/localization/languages/Eng.ts
+++ b/client/src/localization/languages/Eng.ts
@@ -307,6 +307,7 @@ export default {
com_ui_bookmarks_update_error: 'There was an error updating the bookmark',
com_ui_bookmarks_delete_error: 'There was an error deleting the bookmark',
com_ui_bookmarks_add_to_conversation: 'Add to current conversation',
+ com_ui_bookmarks_filter: 'Filter bookmarks...',
com_auth_error_login:
'Unable to login with the information provided. Please check your credentials and try again.',
com_auth_error_login_rl: