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
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
📜 refactor: Optimize Conversation History Nav with Cursor Pagination (#5785)
Marco Beretta650e9b4f6c7e
diff --git a/api/app/clients/OpenAIClient.js b/api/app/clients/OpenAIClient.jsindex 6cebdff146..91c99e438e 100644--- a/api/app/clients/OpenAIClient.js+++ b/api/app/clients/OpenAIClient.js@@ -1469,6 +1469,11 @@ ${convo}});}+ if (openai.abortHandler && abortController.signal) {+ abortController.signal.removeEventListener('abort', openai.abortHandler);+ openai.abortHandler = undefined;+ }+if (!chatCompletion && UnexpectedRoleError) {throw new Error('OpenAI error: Invalid final message: OpenAI expects final message to include role=assistant',diff --git a/api/models/Conversation.js b/api/models/Conversation.jsindex dd6ef9bde1..1515a28259 100644--- a/api/models/Conversation.js+++ b/api/models/Conversation.js@@ -88,11 +88,13 @@ module.exports = {*/saveConvo: async (req, { conversationId, newConversationId, ...convo }, metadata) => {try {- if (metadata && metadata?.context) {+ if (metadata?.context) {logger.debug(`[saveConvo] ${metadata.context}`);}+const messages = await getMessages({ conversationId }, '_id');const update = { ...convo, messages, user: req.user.id };+if (newConversationId) {update.conversationId = newConversationId;}@@ -148,75 +150,100 @@ module.exports = {throw new Error('Failed to save conversations in bulk.');}},- getConvosByPage: async (user, pageNumber = 1, pageSize = 25, isArchived = false, tags) => {- const query = { user };+ getConvosByCursor: async (+ user,+ { cursor, limit = 25, isArchived = false, tags, search, order = 'desc' } = {},+ ) => {+ const filters = [{ user }];+if (isArchived) {- query.isArchived = true;+ filters.push({ isArchived: true });} else {- query.$or = [{ isArchived: false }, { isArchived: { $exists: false } }];+ filters.push({ $or: [{ isArchived: false }, { isArchived: { $exists: false } }] });}+if (Array.isArray(tags) && tags.length > 0) {- query.tags = { $in: tags };+ filters.push({ tags: { $in: tags } });}- query.$and = [{ $or: [{ expiredAt: null }, { expiredAt: { $exists: false } }] }];+ filters.push({ $or: [{ expiredAt: null }, { expiredAt: { $exists: false } }] });++ if (search) {+ try {+ const meiliResults = await Conversation.meiliSearch(search);+ const matchingIds = Array.isArray(meiliResults.hits)+ ? meiliResults.hits.map((result) => result.conversationId)+ : [];+ if (!matchingIds.length) {+ return { conversations: [], nextCursor: null };+ }+ filters.push({ conversationId: { $in: matchingIds } });+ } catch (error) {+ logger.error('[getConvosByCursor] Error during meiliSearch', error);+ return { message: 'Error during meiliSearch' };+ }+ }++ if (cursor) {+ filters.push({ updatedAt: { $lt: new Date(cursor) } });+ }++ const query = filters.length === 1 ? filters[0] : { $and: filters };try {- const totalConvos = (await Conversation.countDocuments(query)) || 1;- const totalPages = Math.ceil(totalConvos / pageSize);const convos = await Conversation.find(query)- .sort({ updatedAt: -1 })- .skip((pageNumber - 1) * pageSize)- .limit(pageSize)+ .select('conversationId endpoint title createdAt updatedAt user')+ .sort({ updatedAt: order === 'asc' ? 1 : -1 })+ .limit(limit + 1).lean();- return { conversations: convos, pages: totalPages, pageNumber, pageSize };++ let nextCursor = null;+ if (convos.length > limit) {+ const lastConvo = convos.pop();+ nextCursor = lastConvo.updatedAt.toISOString();+ }++ return { conversations: convos, nextCursor };} catch (error) {- logger.error('[getConvosByPage] Error getting conversations', error);+ logger.error('[getConvosByCursor] Error getting conversations', error);return { message: 'Error getting conversations' };}},- getConvosQueried: async (user, convoIds, pageNumber = 1, pageSize = 25) => {+ getConvosQueried: async (user, convoIds, cursor = null, limit = 25) => {try {- if (!convoIds || convoIds.length === 0) {- return { conversations: [], pages: 1, pageNumber, pageSize };+ if (!convoIds?.length) {+ return { conversations: [], nextCursor: null, convoMap: {} };}- const cache = {};- const convoMap = {};- const promises = [];-- convoIds.forEach((convo) =>- promises.push(- Conversation.findOne({- user,- conversationId: convo.conversationId,- $or: [{ expiredAt: { $exists: false } }, { expiredAt: null }],- }).lean(),- ),- );+ const conversationIds = convoIds.map((convo) => convo.conversationId);- const results = (await Promise.all(promises)).filter(Boolean);+ const results = await Conversation.find({+ user,+ conversationId: { $in: conversationIds },+ $or: [{ expiredAt: { $exists: false } }, { expiredAt: null }],+ }).lean();- results.forEach((convo, i) => {- const page = Math.floor(i / pageSize) + 1;- if (!cache[page]) {- cache[page] = [];- }- cache[page].push(convo);+ results.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt));++ let filtered = results;+ if (cursor && cursor !== 'start') {+ const cursorDate = new Date(cursor);+ filtered = results.filter((convo) => new Date(convo.updatedAt) < cursorDate);+ }++ const limited = filtered.slice(0, limit + 1);+ let nextCursor = null;+ if (limited.length > limit) {+ const lastConvo = limited.pop();+ nextCursor = lastConvo.updatedAt.toISOString();+ }++ const convoMap = {};+ limited.forEach((convo) => {convoMap[convo.conversationId] = convo;});- const totalPages = Math.ceil(results.length / pageSize);- cache.pages = totalPages;- cache.pageSize = pageSize;- return {- cache,- conversations: cache[pageNumber] || [],- pages: totalPages || 1,- pageNumber,- pageSize,- convoMap,- };+ return { conversations: limited, nextCursor, convoMap };} catch (error) {logger.error('[getConvosQueried] Error getting conversations', error);return { message: 'Error fetching conversations' };@@ -257,10 +284,26 @@ module.exports = {* logger.error(result); // { n: 5, ok: 1, deletedCount: 5, messages: { n: 10, ok: 1, deletedCount: 10 } }*/deleteConvos: async (user, filter) => {- let toRemove = await Conversation.find({ ...filter, user }).select('conversationId');- const ids = toRemove.map((instance) => instance.conversationId);- let deleteCount = await Conversation.deleteMany({ ...filter, user });- deleteCount.messages = await deleteMessages({ conversationId: { $in: ids } });- return deleteCount;+ try {+ const userFilter = { ...filter, user };++ const conversations = await Conversation.find(userFilter).select('conversationId');+ const conversationIds = conversations.map((c) => c.conversationId);++ if (!conversationIds.length) {+ throw new Error('Conversation not found or already deleted.');+ }++ const deleteConvoResult = await Conversation.deleteMany(userFilter);++ const deleteMessagesResult = await deleteMessages({+ conversationId: { $in: conversationIds },+ });++ return { ...deleteConvoResult, messages: deleteMessagesResult };+ } catch (error) {+ logger.error('[deleteConvos] Error deleting conversations and messages', error);+ throw error;+ }},};diff --git a/api/package.json b/api/package.jsonindex 33fb734122..90e6d3d40a 100644--- a/api/package.json+++ b/api/package.json@@ -39,7 +39,7 @@"@aws-sdk/s3-request-presigner": "^3.758.0","@azure/identity": "^4.7.0","@azure/search-documents": "^12.0.0",- "@azure/storage-blob": "^12.26.0",+ "@azure/storage-blob": "^12.27.0","@google/generative-ai": "^0.23.0","@googleapis/youtube": "^20.0.0","@keyv/redis": "^4.3.3",@@ -48,7 +48,7 @@"@langchain/google-genai": "^0.2.2","@langchain/google-vertexai": "^0.2.3","@langchain/textsplitters": "^0.1.0",- "@librechat/agents": "^2.4.17",+ "@librechat/agents": "^2.4.20","@librechat/data-schemas": "*","@waylaidwanderer/fetch-event-source": "^3.0.1","axios": "^1.8.2",diff --git a/api/server/middleware/abortMiddleware.js b/api/server/middleware/abortMiddleware.jsindex b10f6586f9..b5a7c4eb90 100644--- a/api/server/middleware/abortMiddleware.js+++ b/api/server/middleware/abortMiddleware.js@@ -108,8 +108,8 @@ async function abortMessage(req, res) {res.send(JSON.stringify(finalEvent));}-const handleAbort = () => {- return async (req, res) => {+const handleAbort = function () {+ return async function (req, res) {try {if (isEnabled(process.env.LIMIT_CONCURRENT_MESSAGES)) {await clearPendingReq({ userId: req.user.id });diff --git a/api/server/routes/convos.js b/api/server/routes/convos.jsindex a4d81e24e6..2473eb68f9 100644--- a/api/server/routes/convos.js+++ b/api/server/routes/convos.js@@ -1,16 +1,17 @@const multer = require('multer');const express = require('express');const { CacheKeys, EModelEndpoint } = require('librechat-data-provider');-const { getConvosByPage, deleteConvos, getConvo, saveConvo } = require('~/models/Conversation');+const { getConvosByCursor, deleteConvos, getConvo, saveConvo } = require('~/models/Conversation');const { forkConversation, duplicateConversation } = require('~/server/utils/import/fork');const { storage, importFileFilter } = require('~/server/routes/files/multer');const requireJwtAuth = require('~/server/middleware/requireJwtAuth');const { importConversations } = require('~/server/utils/import');const { createImportLimiters } = require('~/server/middleware');const { deleteToolCalls } = require('~/models/ToolCall');+const { isEnabled, sleep } = require('~/server/utils');const getLogStores = require('~/cache/getLogStores');-const { sleep } = require('~/server/utils');const { logger } = require('~/config');+const assistantClients = {[EModelEndpoint.azureAssistants]: require('~/server/services/Endpoints/azureAssistants'),[EModelEndpoint.assistants]: require('~/server/services/Endpoints/assistants'),@@ -20,28 +21,30 @@ const router = express.Router();router.use(requireJwtAuth);router.get('/', async (req, res) => {- let pageNumber = req.query.pageNumber || 1;- pageNumber = parseInt(pageNumber, 10);-- if (isNaN(pageNumber) || pageNumber < 1) {- return res.status(400).json({ error: 'Invalid page number' });- }-- let pageSize = req.query.pageSize || 25;- pageSize = parseInt(pageSize, 10);+ const limit = parseInt(req.query.limit, 10) || 25;+ const cursor = req.query.cursor;+ const isArchived = isEnabled(req.query.isArchived);+ const search = req.query.search ? decodeURIComponent(req.query.search) : undefined;+ const order = req.query.order || 'desc';- if (isNaN(pageSize) || pageSize < 1) {- return res.status(400).json({ error: 'Invalid page size' });- }- const isArchived = req.query.isArchived === 'true';let tags;if (req.query.tags) {tags = Array.isArray(req.query.tags) ? req.query.tags : [req.query.tags];- } else {- tags = undefined;}- res.status(200).send(await getConvosByPage(req.user.id, pageNumber, pageSize, isArchived, tags));+ try {+ const result = await getConvosByCursor(req.user.id, {+ cursor,+ limit,+ isArchived,+ tags,+ search,+ order,+ });+ res.status(200).json(result);+ } catch (error) {+ res.status(500).json({ error: 'Error fetching conversations' });+ }});router.get('/:conversationId', async (req, res) => {@@ -76,22 +79,28 @@ router.post('/gen_title', async (req, res) => {}});-router.post('/clear', async (req, res) => {+router.delete('/', async (req, res) => {let filter = {};const { conversationId, source, thread_id, endpoint } = req.body.arg;- if (conversationId) {- filter = { conversationId };++ // Prevent deletion of all conversations+ if (!conversationId && !source && !thread_id && !endpoint) {+ return res.status(400).json({+ error: 'no parameters provided',+ });}- if (source === 'button' && !conversationId) {+ if (conversationId) {+ filter = { conversationId };+ } else if (source === 'button') {return res.status(200).send('No conversationId provided');}if (- typeof endpoint != 'undefined' &&+ typeof endpoint !== 'undefined' &&Object.prototype.propertyIsEnumerable.call(assistantClients, endpoint)) {- /** @type {{ openai: OpenAI}} */+ /** @type {{ openai: OpenAI }} */const { openai } = await assistantClients[endpoint].initializeClient({ req, res });try {const response = await openai.beta.threads.del(thread_id);@@ -101,9 +110,6 @@ router.post('/clear', async (req, res) => {}}- // for debugging deletion source- // logger.debug('source:', source);-try {const dbResponse = await deleteConvos(req.user.id, filter);await deleteToolCalls(req.user.id, filter.conversationId);@@ -114,6 +120,17 @@ router.post('/clear', async (req, res) => {}});+router.delete('/all', async (req, res) => {+ try {+ const dbResponse = await deleteConvos(req.user.id, {});+ await deleteToolCalls(req.user.id);+ res.status(201).json(dbResponse);+ } catch (error) {+ logger.error('Error clearing conversations', error);+ res.status(500).send('Error clearing conversations');+ }+});+router.post('/update', async (req, res) => {const update = req.body.arg;diff --git a/api/server/routes/search.js b/api/server/routes/search.jsindex 0341a241df..109fc7996a 100644--- a/api/server/routes/search.js+++ b/api/server/routes/search.js@@ -4,9 +4,9 @@ const { MeiliSearch } = require('meilisearch');const { Conversation, getConvosQueried } = require('~/models/Conversation');const requireJwtAuth = require('~/server/middleware/requireJwtAuth');const { cleanUpPrimaryKeyValue } = require('~/lib/utils/misc');+const { Message, getMessage } = require('~/models/Message');const { reduceHits } = require('~/lib/utils/reduceHits');const { isEnabled } = require('~/server/utils');-const { Message } = require('~/models/Message');const keyvRedis = require('~/cache/keyvRedis');const { logger } = require('~/config');@@ -27,25 +27,24 @@ router.get('/sync', async function (req, res) {router.get('/', async function (req, res) {try {- let user = req.user.id ?? '';- const { q } = req.query;- const pageNumber = req.query.pageNumber || 1;- const key = `${user}:search:${q}`;+ const user = req.user.id ?? '';+ const { q, cursor = 'start' } = req.query;+ const key = `${user}:search:${q}:${cursor}`;const cached = await cache.get(key);if (cached) {logger.debug('[/search] cache hit: ' + key);- const { pages, pageSize, messages } = cached;- res- .status(200)- .send({ conversations: cached[pageNumber], pages, pageNumber, pageSize, messages });- return;+ return res.status(200).send(cached);}- const messages = (await Message.meiliSearch(q, undefined, true)).hits;- const titles = (await Conversation.meiliSearch(q)).hits;+ const [messageResults, titleResults] = await Promise.all([+ Message.meiliSearch(q, undefined, true),+ Conversation.meiliSearch(q),+ ]);+ const messages = messageResults.hits;+ const titles = titleResults.hits;const sortedHits = reduceHits(messages, titles);- const result = await getConvosQueried(user, sortedHits, pageNumber);+ const result = await getConvosQueried(user, sortedHits, cursor);const activeMessages = [];for (let i = 0; i < messages.length; i++) {@@ -55,20 +54,53 @@ router.get('/', async function (req, res) {}if (result.convoMap[message.conversationId]) {const convo = result.convoMap[message.conversationId];- const { title, chatGptLabel, model } = convo;- message = { ...message, ...{ title, chatGptLabel, model } };- activeMessages.push(message);++ const dbMessage = await getMessage({ user, messageId: message.messageId });+ activeMessages.push({+ ...message,+ title: convo.title,+ conversationId: message.conversationId,+ model: convo.model,+ isCreatedByUser: dbMessage?.isCreatedByUser,+ endpoint: dbMessage?.endpoint,+ iconURL: dbMessage?.iconURL,+ });+ }+ }++ const activeConversations = [];+ for (const convId in result.convoMap) {+ const convo = result.convoMap[convId];++ if (convo.isArchived) {+ continue;}++ activeConversations.push({+ title: convo.title,+ user: convo.user,+ conversationId: convo.conversationId,+ endpoint: convo.endpoint,+ endpointType: convo.endpointType,+ model: convo.model,+ createdAt: convo.createdAt,+ updatedAt: convo.updatedAt,+ });}- result.messages = activeMessages;+if (result.cache) {result.cache.messages = activeMessages;+ result.cache.conversations = activeConversations;cache.set(key, result.cache, expiration);- delete result.cache;}- delete result.convoMap;- res.status(200).send(result);+ const response = {+ nextCursor: result.nextCursor ?? null,+ messages: activeMessages,+ conversations: activeConversations,+ };++ res.status(200).send(response);} catch (error) {logger.error('[/search] Error while searching messages & conversations', error);res.status(500).send({ message: 'Error searching' });diff --git a/client/package.json b/client/package.jsonindex db82362a18..52dc95a581 100644--- a/client/package.json+++ b/client/package.json@@ -118,6 +118,7 @@"@testing-library/user-event": "^14.4.3","@types/jest": "^29.5.14","@types/js-cookie": "^3.0.6",+ "@types/lodash": "^4.17.15","@types/node": "^20.3.0","@types/react": "^18.2.11","@types/react-dom": "^18.2.4",diff --git a/client/src/Providers/SearchContext.tsx b/client/src/Providers/SearchContext.tsxindex 678818aa18..b767be2ce1 100644--- a/client/src/Providers/SearchContext.tsx+++ b/client/src/Providers/SearchContext.tsx@@ -1,6 +1,5 @@import { createContext, useContext } from 'react';-import useSearch from '~/hooks/Conversations/useSearch';-type SearchContextType = ReturnType<typeof useSearch>;+import { UseSearchMessagesResult } from '~/hooks/Conversations/useSearch';-export const SearchContext = createContext<SearchContextType>({} as SearchContextType);+export const SearchContext = createContext<UseSearchMessagesResult>({} as UseSearchMessagesResult);export const useSearchContext = () => useContext(SearchContext);diff --git a/client/src/common/types.ts b/client/src/common/types.tsindex 3551436ee8..02eeccb626 100644--- a/client/src/common/types.ts+++ b/client/src/common/types.ts@@ -548,7 +548,8 @@ export type TResData = TBaseResData & {responseMessage: t.TMessage;};-export type TFinalResData = TBaseResData & {+export type TFinalResData = Omit<TBaseResData, 'conversation'> & {+ conversation: Partial<t.TConversation> & Pick<t.TConversation, 'conversationId'>;requestMessage?: t.TMessage;responseMessage?: t.TMessage;};diff --git a/client/src/components/Audio/Voices.tsx b/client/src/components/Audio/Voices.tsxindex acd07a26c6..7d8b3f9655 100644--- a/client/src/components/Audio/Voices.tsx+++ b/client/src/components/Audio/Voices.tsx@@ -29,6 +29,7 @@ export function BrowserVoiceDropdown() {onChange={handleVoiceChange}sizeClasses="min-w-[200px] !max-w-[400px] [--anchor-max-width:400px]"testId="BrowserVoiceDropdown"+ className="rounded-xl"/></div>);@@ -57,6 +58,7 @@ export function ExternalVoiceDropdown() {onChange={handleVoiceChange}sizeClasses="min-w-[200px] !max-w-[400px] [--anchor-max-width:400px]"testId="ExternalVoiceDropdown"+ className="rounded-xl"/></div>);diff --git a/client/src/components/Bookmarks/BookmarkItem.tsx b/client/src/components/Bookmarks/BookmarkItem.tsxindex 92a6df0b54..60698a3165 100644--- a/client/src/components/Bookmarks/BookmarkItem.tsx+++ b/client/src/components/Bookmarks/BookmarkItem.tsx@@ -34,19 +34,22 @@ const BookmarkItem: FC<MenuItemProps> = ({ tag, selected, handleSubmit, icon, ..if (icon != null) {return icon;}+if (isLoading) {return <Spinner className="size-4" />;}+if (selected) {return <BookmarkFilledIcon className="size-4" />;}+return <BookmarkIcon className="size-4" />;};return (<MenuItemaria-label={tag as string}- className="group flex w-full gap-2 rounded-lg p-2.5 text-sm text-text-primary transition-colors duration-200 focus:outline-none data-[focus]:bg-surface-secondary data-[focus]:ring-2 data-[focus]:ring-primary"+ className="group flex w-full gap-2 rounded-lg p-2.5 text-sm text-text-primary transition-colors duration-200 focus:outline-none data-[focus]:bg-surface-hover data-[focus-visible]:ring-2 data-[focus-visible]:ring-primary"{...rest}as="button"onClick={clickHandler}diff --git a/client/src/components/Chat/AddMultiConvo.tsx b/client/src/components/Chat/AddMultiConvo.tsxindex 24c1d7cb16..79131dfdb0 100644--- a/client/src/components/Chat/AddMultiConvo.tsx+++ b/client/src/components/Chat/AddMultiConvo.tsx@@ -12,7 +12,6 @@ function AddMultiConvo() {const localize = useLocalize();const clickHandler = () => {-const { title: _t, ...convo } = conversation ?? ({} as TConversation);setAddedConvo({...convo,@@ -42,7 +41,7 @@ function AddMultiConvo() {role="button"onClick={clickHandler}data-testid="parameters-button"- className="inline-flex size-10 flex-shrink-0 items-center justify-center rounded-lg border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"+ className="inline-flex size-10 flex-shrink-0 items-center justify-center rounded-xl border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"><PlusCircle size={16} aria-label="Plus Icon" /></TooltipAnchor>diff --git a/client/src/components/Chat/ExportAndShareMenu.tsx b/client/src/components/Chat/ExportAndShareMenu.tsxindex 954393abaa..7f37ebbc72 100644--- a/client/src/components/Chat/ExportAndShareMenu.tsx+++ b/client/src/components/Chat/ExportAndShareMenu.tsx@@ -79,7 +79,7 @@ export default function ExportAndShareMenu({<Ariakit.MenuButtonid="export-menu-button"aria-label="Export options"- className="inline-flex size-10 flex-shrink-0 items-center justify-center rounded-lg border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"+ className="inline-flex size-10 flex-shrink-0 items-center justify-center rounded-xl border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"><UploadclassName="icon-md text-text-secondary"diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsxindex 5398115cda..e2adbbd0fa 100644--- a/client/src/components/Chat/Input/ChatForm.tsx+++ b/client/src/components/Chat/Input/ChatForm.tsx@@ -85,8 +85,15 @@ const ChatForm = memo(({ index = 0 }: { index?: number }) => {() => conversation?.endpointType ?? conversation?.endpoint,[conversation?.endpointType, conversation?.endpoint],);+ const conversationId = useMemo(+ () => conversation?.conversationId ?? Constants.NEW_CONVO,+ [conversation?.conversationId],+ );- const isRTL = useMemo(() => chatDirection === 'rtl', [chatDirection.toLowerCase()]);+ const isRTL = useMemo(+ () => (chatDirection != null ? chatDirection?.toLowerCase() === 'rtl' : false),+ [chatDirection],+ );const invalidAssistant = useMemo(() =>isAssistantsEndpoint(endpoint) &&@@ -110,10 +117,10 @@ const ChatForm = memo(({ index = 0 }: { index?: number }) => {}, [isCollapsed]);useAutoSave({- conversationId: conversation?.conversationId,- textAreaRef,files,setFiles,+ textAreaRef,+ conversationId,});const { submitMessage, submitPrompt } = useSubmitMessage();@@ -166,7 +173,7 @@ const ChatForm = memo(({ index = 0 }: { index?: number }) => {const handleSaveBadges = useCallback(() => {setIsEditingBadges(false);setBackupBadges([]);- }, []);+ }, [setIsEditingBadges, setBackupBadges]);const handleCancelBadges = useCallback(() => {if (backupBadges.length > 0) {@@ -174,7 +181,7 @@ const ChatForm = memo(({ index = 0 }: { index?: number }) => {}setIsEditingBadges(false);setBackupBadges([]);- }, [backupBadges, setBadges]);+ }, [backupBadges, setBadges, setIsEditingBadges]);const isMoreThanThreeRows = visualRowCount > 3;@@ -195,8 +202,9 @@ const ChatForm = memo(({ index = 0 }: { index?: number }) => {'mx-auto flex flex-row gap-3 sm:px-2',maximizeChatSpace ? 'w-full max-w-full' : 'md:max-w-3xl xl:max-w-4xl',centerFormOnLanding &&- (!conversation?.conversationId || conversation?.conversationId === Constants.NEW_CONVO) &&- !isSubmitting+ (conversationId == null || conversationId === Constants.NEW_CONVO) &&+ !isSubmitting &&+ conversation?.messages?.length === 0? 'transition-all duration-200 sm:mb-28': 'sm:mb-10',)}@@ -290,7 +298,7 @@ const ChatForm = memo(({ index = 0 }: { index?: number }) => {</div><BadgeRowshowEphemeralBadges={!isAgentsEndpoint(endpoint) && !isAssistantsEndpoint(endpoint)}- conversationId={conversation?.conversationId ?? Constants.NEW_CONVO}+ conversationId={conversationId}onChange={setBadges}isInChat={Array.isArray(conversation?.messages) && conversation.messages.length >= 1diff --git a/client/src/components/Chat/Menus/BookmarkMenu.tsx b/client/src/components/Chat/Menus/BookmarkMenu.tsxindex 326d1dcd4a..48945a577e 100644--- a/client/src/components/Chat/Menus/BookmarkMenu.tsx+++ b/client/src/components/Chat/Menus/BookmarkMenu.tsx@@ -170,7 +170,7 @@ const BookmarkMenu: FC = () => {id="bookmark-menu-button"aria-label={localize('com_ui_bookmarks_add')}className={cn(- 'mt-text-sm flex size-10 flex-shrink-0 items-center justify-center gap-2 rounded-lg border border-border-light text-sm transition-colors duration-200 hover:bg-surface-hover',+ 'mt-text-sm flex size-10 flex-shrink-0 items-center justify-center gap-2 rounded-xl border border-border-light text-sm transition-colors duration-200 hover:bg-surface-hover',isMenuOpen ? 'bg-surface-hover' : '',)}data-testid="bookmark-menu"diff --git a/client/src/components/Chat/Menus/PresetsMenu.tsx b/client/src/components/Chat/Menus/PresetsMenu.tsxindex 224a006d59..a0d0790f99 100644--- a/client/src/components/Chat/Menus/PresetsMenu.tsx+++ b/client/src/components/Chat/Menus/PresetsMenu.tsx@@ -30,7 +30,7 @@ const PresetsMenu: FC = () => {tabIndex={0}role="button"data-testid="presets-button"- className="inline-flex size-10 flex-shrink-0 items-center justify-center rounded-lg border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"+ className="inline-flex size-10 flex-shrink-0 items-center justify-center rounded-xl border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"><BookCopy size={16} aria-label="Preset Icon" /></TooltipAnchor>diff --git a/client/src/components/Chat/Messages/SearchButtons.tsx b/client/src/components/Chat/Messages/SearchButtons.tsxindex c9feada2fa..9707767ad6 100644--- a/client/src/components/Chat/Messages/SearchButtons.tsx+++ b/client/src/components/Chat/Messages/SearchButtons.tsx@@ -1,8 +1,8 @@import { Link } from 'lucide-react';import type { TMessage } from 'librechat-data-provider';import { useLocalize, useNavigateToConvo } from '~/hooks';+import { findConversationInInfinite } from '~/utils';import { useSearchContext } from '~/Providers';-import { getConversationById } from '~/utils';export default function SearchButtons({ message }: { message: TMessage }) {const localize = useLocalize();@@ -17,7 +17,7 @@ export default function SearchButtons({ message }: { message: TMessage }) {const clickHandler = (event: React.MouseEvent<HTMLButtonElement>) => {event.preventDefault();- const conversation = getConversationById(searchQueryRes?.data, conversationId);+ const conversation = findConversationInInfinite(searchQueryRes?.data, conversationId);if (!conversation) {return;}diff --git a/client/src/components/Chat/Messages/SearchMessage.tsx b/client/src/components/Chat/Messages/SearchMessage.tsxindex 30db3ac092..c7ac2c69c3 100644--- a/client/src/components/Chat/Messages/SearchMessage.tsx+++ b/client/src/components/Chat/Messages/SearchMessage.tsx@@ -10,7 +10,30 @@ import SubRow from './SubRow';import { cn } from '~/utils';import store from '~/store';-export default function Message({ message }: Pick<TMessageProps, 'message'>) {+const MessageAvatar = ({ iconData }: { iconData: TMessageIcon }) => (+ <div className="relative flex flex-shrink-0 flex-col items-end">+ <div className="pt-0.5">+ <div className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">+ <Icon iconData={iconData} />+ </div>+ </div>+ </div>+);++const MessageBody = ({ message, messageLabel, fontSize }) => (+ <div+ className={cn('relative flex w-11/12 flex-col', message.isCreatedByUser ? '' : 'agent-turn')}+ >+ <div className={cn('select-none font-semibold', fontSize)}>{messageLabel}</div>+ <SearchContent message={message} />+ <SubRow classes="text-xs">+ <MinimalHoverButtons message={message} />+ <SearchButtons message={message} />+ </SubRow>+ </div>+);++export default function SearchMessage({ message }: Pick<TMessageProps, 'message'>) {const UsernameDisplay = useRecoilValue<boolean>(store.UsernameDisplay);const fontSize = useRecoilValue(store.fontSize);const { user } = useAuthContext();@@ -18,60 +41,42 @@ export default function Message({ message }: Pick<TMessageProps, 'message'>) {const iconData: TMessageIcon = useMemo(() => ({- endpoint: message?.endpoint,- model: message?.model,+ endpoint: message?.endpoint ?? '',+ model: message?.model ?? '',iconURL: message?.iconURL ?? '',- isCreatedByUser: message?.isCreatedByUser,+ isCreatedByUser: message?.isCreatedByUser ?? false,}),- [message?.model, message?.iconURL, message?.endpoint, message?.isCreatedByUser],+ [message?.endpoint, message?.model, message?.iconURL, message?.isCreatedByUser],);+ const messageLabel = useMemo(() => {+ if (message?.isCreatedByUser) {+ return UsernameDisplay+ ? (user?.name ?? '') || (user?.username ?? '')+ : localize('com_user_message');+ }+ return message?.sender ?? '';+ }, [+ message?.isCreatedByUser,+ message?.sender,+ UsernameDisplay,+ user?.name,+ user?.username,+ localize,+ ]);+if (!message) {return null;}- const { isCreatedByUser } = message;-- let messageLabel = '';- if (isCreatedByUser) {- messageLabel = UsernameDisplay- ? (user?.name ?? '') || (user?.username ?? '')- : localize('com_user_message');- } else {- messageLabel = message.sender ?? '';- }-return (- <>- <div className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent">- <div className="m-auto justify-center p-4 py-2 md:gap-6 ">- <div className="final-completion group mx-auto flex flex-1 gap-3 md:max-w-3xl md:px-5 lg:max-w-[40rem] lg:px-1 xl:max-w-[48rem] xl:px-5">- <div className="relative flex flex-shrink-0 flex-col items-end">- <div>- <div className="pt-0.5">- <div className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">- <Icon iconData={iconData} />- </div>- </div>- </div>- </div>- <div- className={cn('relative flex w-11/12 flex-col', isCreatedByUser ? '' : 'agent-turn')}- >- <div className={cn('select-none font-semibold', fontSize)}>{messageLabel}</div>- <div className="flex-col gap-1 md:gap-3">- <div className="flex max-w-full flex-grow flex-col gap-0">- <SearchContent message={message} />- </div>- </div>- <SubRow classes="text-xs">- <MinimalHoverButtons message={message} />- <SearchButtons message={message} />- </SubRow>- </div>- </div>+ <div className="text-token-text-primary w-full bg-transparent">+ <div className="m-auto p-4 py-2 md:gap-6">+ <div className="final-completion group mx-auto flex flex-1 gap-3 md:max-w-3xl md:px-5 lg:max-w-[40rem] lg:px-1 xl:max-w-[48rem] xl:px-5">+ <MessageAvatar iconData={iconData} />+ <MessageBody message={message} messageLabel={messageLabel} fontSize={fontSize} /></div></div>- </>+ </div>);}diff --git a/client/src/components/Chat/TemporaryChat.tsx b/client/src/components/Chat/TemporaryChat.tsxindex 13c05bee6c..25985e8192 100644--- a/client/src/components/Chat/TemporaryChat.tsx+++ b/client/src/components/Chat/TemporaryChat.tsx@@ -37,34 +37,28 @@ export function TemporaryChat() {return (<div className="relative flex flex-wrap items-center gap-2">- <div className="badge-icon h-full">- <TooltipAnchor- description={localize(temporaryBadge.label)}- render={- <motion.button- onClick={handleBadgeToggle}+ <TooltipAnchor+ description={localize(temporaryBadge.label)}+ render={+ <button+ onClick={handleBadgeToggle}aria-label={localize(temporaryBadge.label)}- className={cn(- 'inline-flex size-10 flex-shrink-0 items-center justify-center rounded-lg border border-border-light text-text-primary transition-all ease-in-out hover:bg-surface-tertiary',- isTemporary- ? 'bg-surface-active shadow-md'- : 'bg-transparent shadow-sm hover:bg-surface-hover hover:shadow-md',- 'active:scale-95 active:shadow-inner',- )}- transition={{ type: 'tween', duration: 0.1, ease: 'easeOut' }}- >- {temporaryBadge.icon && (- <temporaryBadge.icon- className={cn(- 'relative h-5 w-5 md:h-4 md:w-4',- !temporaryBadge.label && 'mx-auto',- )}- />- )}- </motion.button>- }- />- </div>+ className={cn(+ 'inline-flex size-10 flex-shrink-0 items-center justify-center rounded-xl border border-border-light text-text-primary transition-all ease-in-out hover:bg-surface-tertiary',+ isTemporary+ ? 'bg-surface-active shadow-md'+ : 'bg-transparent shadow-sm hover:bg-surface-hover hover:shadow-md',+ 'active:shadow-inner',+ )}+ >+ {temporaryBadge.icon && (+ <temporaryBadge.icon+ className={cn('relative h-5 w-5 md:h-4 md:w-4', !temporaryBadge.label && 'mx-auto')}+ />+ )}+ </button>+ }+ /></div>);}diff --git a/client/src/components/Conversations/Conversations.tsx b/client/src/components/Conversations/Conversations.tsxindex 67d79c704c..cec289405a 100644--- a/client/src/components/Conversations/Conversations.tsx+++ b/client/src/components/Conversations/Conversations.tsx@@ -1,67 +1,203 @@-import { useMemo, memo } from 'react';+import { useMemo, memo, type FC, useCallback } from 'react';+import throttle from 'lodash/throttle';import { parseISO, isToday } from 'date-fns';+import { List, AutoSizer, CellMeasurer, CellMeasurerCache } from 'react-virtualized';+import { useLocalize, TranslationKeys, useMediaQuery } from '~/hooks';import { TConversation } from 'librechat-data-provider';-import { useLocalize, TranslationKeys } from '~/hooks';import { groupConversationsByDate } from '~/utils';+import { Spinner } from '~/components/svg';import Convo from './Convo';-const Conversations = ({- conversations,- moveToTop,- toggleNav,-}: {+interface ConversationsProps {conversations: Array<TConversation | null>;moveToTop: () => void;toggleNav: () => void;-}) => {+ containerRef: React.RefObject<HTMLDivElement | List>;+ loadMoreConversations: () => void;+ isFetchingNextPage: boolean;+ isSearchLoading: boolean;+}++const LoadingSpinner = memo(() => (+ <Spinner className="m-1 mx-auto mb-4 h-4 w-4 text-text-primary" />+));++const DateLabel: FC<{ groupName: string }> = memo(({ groupName }) => {const localize = useLocalize();+ return (+ <div className="mt-2 pl-2 pt-1 text-text-secondary" style={{ fontSize: '0.7rem' }}>+ {localize(groupName as TranslationKeys) || groupName}+ </div>+ );+});++DateLabel.displayName = 'DateLabel';++type FlattenedItem =+ | { type: 'header'; groupName: string }+ | { type: 'convo'; convo: TConversation };++const MemoizedConvo = memo(+ ({+ conversation,+ retainView,+ toggleNav,+ isLatestConvo,+ }: {+ conversation: TConversation;+ retainView: () => void;+ toggleNav: () => void;+ isLatestConvo: boolean;+ }) => {+ return (+ <Convo+ conversation={conversation}+ retainView={retainView}+ toggleNav={toggleNav}+ isLatestConvo={isLatestConvo}+ />+ );+ },+ (prevProps, nextProps) => {+ return (+ prevProps.conversation.conversationId === nextProps.conversation.conversationId &&+ prevProps.conversation.title === nextProps.conversation.title &&+ prevProps.isLatestConvo === nextProps.isLatestConvo &&+ prevProps.conversation.endpoint === nextProps.conversation.endpoint+ );+ },+);++const Conversations: FC<ConversationsProps> = ({+ conversations: rawConversations,+ moveToTop,+ toggleNav,+ containerRef,+ loadMoreConversations,+ isFetchingNextPage,+ isSearchLoading,+}) => {+ const isSmallScreen = useMediaQuery('(max-width: 768px)');+ const convoHeight = isSmallScreen ? 44 : 34;++ const filteredConversations = useMemo(+ () => rawConversations.filter(Boolean) as TConversation[],+ [rawConversations],+ );+const groupedConversations = useMemo(- () => groupConversationsByDate(conversations),- [conversations],+ () => groupConversationsByDate(filteredConversations),+ [filteredConversations],);+const firstTodayConvoId = useMemo(() =>- conversations.find((convo) => convo && convo.updatedAt && isToday(parseISO(convo.updatedAt)))- ?.conversationId,- [conversations],+ filteredConversations.find((convo) => convo.updatedAt && isToday(parseISO(convo.updatedAt)))+ ?.conversationId ?? undefined,+ [filteredConversations],);- return (- <div className="text-token-text-primary flex flex-col gap-2 pb-2 text-sm">- <div>- <span>- {groupedConversations.map(([groupName, convos]) => (- <div key={groupName}>- <div- className="text-text-secondary"- style={{- fontSize: '0.7rem',- marginTop: '20px',- marginBottom: '5px',- paddingLeft: '10px',- }}- >- {localize(groupName as TranslationKeys) || groupName}- </div>- {convos.map((convo, i) => (- <Convo- key={`${groupName}-${convo.conversationId}-${i}`}- isLatestConvo={convo.conversationId === firstTodayConvoId}- conversation={convo}+ const flattenedItems = useMemo(() => {+ const items: FlattenedItem[] = [];+ groupedConversations.forEach(([groupName, convos]) => {+ items.push({ type: 'header', groupName });+ items.push(...convos.map((convo) => ({ type: 'convo' as const, convo })));+ });+ return items;+ }, [groupedConversations]);++ const cache = useMemo(+ () =>+ new CellMeasurerCache({+ fixedWidth: true,+ defaultHeight: convoHeight,+ keyMapper: (index) => {+ const item = flattenedItems[index];+ return item.type === 'header' ? `header-${index}` : `convo-${item.convo.conversationId}`;+ },+ }),+ [flattenedItems, convoHeight],+ );++ const rowRenderer = useCallback(+ ({ index, key, parent, style }) => {+ const item = flattenedItems[index];+ return (+ <CellMeasurer cache={cache} columnIndex={0} key={key} parent={parent} rowIndex={index}>+ {({ registerChild }) => (+ <div ref={registerChild} style={style}>+ {item.type === 'header' ? (+ <DateLabel groupName={item.groupName} />+ ) : (+ <MemoizedConvo+ conversation={item.convo}retainView={moveToTop}toggleNav={toggleNav}+ isLatestConvo={item.convo.conversationId === firstTodayConvoId}/>- ))}- <div- style={{- marginTop: '5px',- marginBottom: '5px',- }}- />+ )}</div>- ))}- </span>- </div>+ )}+ </CellMeasurer>+ );+ },+ [cache, flattenedItems, firstTodayConvoId, moveToTop, toggleNav],+ );++ const getRowHeight = useCallback(+ ({ index }: { index: number }) => cache.getHeight(index, 0),+ [cache],+ );++ const throttledLoadMore = useMemo(+ () => throttle(loadMoreConversations, 300),+ [loadMoreConversations],+ );++ const handleRowsRendered = useCallback(+ ({ stopIndex }: { stopIndex: number }) => {+ if (stopIndex >= flattenedItems.length - 2) {+ throttledLoadMore();+ }+ },+ [flattenedItems.length, throttledLoadMore],+ );++ return (+ <div className="relative flex h-full flex-col pb-2 text-sm text-text-primary">+ {isSearchLoading ? (+ <div className="flex flex-1 items-center justify-center">+ <Spinner className="text-text-primary" />+ <span className="ml-2 text-text-primary">Loading...</span>+ </div>+ ) : (+ <div className="flex-1">+ <AutoSizer>+ {({ width, height }) => (+ <List+ ref={containerRef as React.RefObject<List>}+ width={width}+ height={height}+ deferredMeasurementCache={cache}+ rowCount={flattenedItems.length}+ rowHeight={getRowHeight}+ rowRenderer={rowRenderer}+ overscanRowCount={10}+ className="outline-none"+ style={{ outline: 'none' }}+ role="list"+ aria-label="Conversations"+ onRowsRendered={handleRowsRendered}+ />+ )}+ </AutoSizer>+ </div>+ )}+ {isFetchingNextPage && !isSearchLoading && (+ <div className="mt-2">+ <LoadingSpinner />+ </div>+ )}</div>);};diff --git a/client/src/components/Conversations/Convo.tsx b/client/src/components/Conversations/Convo.tsxindex b0e6e06636..b31cfb5a55 100644--- a/client/src/components/Conversations/Convo.tsx+++ b/client/src/components/Conversations/Convo.tsx@@ -1,28 +1,26 @@-import React, { useState, useEffect, useRef, useMemo, useCallback } from 'react';+import React, { useState, useEffect, useRef, useMemo } from 'react';import { useRecoilValue } from 'recoil';-import { Check, X } from 'lucide-react';import { useParams } from 'react-router-dom';import { Constants } from 'librechat-data-provider';-import type { MouseEvent, FocusEvent, KeyboardEvent } from 'react';import type { TConversation } from 'librechat-data-provider';import { useNavigateToConvo, useMediaQuery, useLocalize } from '~/hooks';import { useUpdateConversationMutation } from '~/data-provider';import EndpointIcon from '~/components/Endpoints/EndpointIcon';import { useGetEndpointsQuery } from '~/data-provider';import { NotificationSeverity } from '~/common';-import { useToastContext } from '~/Providers';import { ConvoOptions } from './ConvoOptions';+import { useToastContext } from '~/Providers';+import RenameForm from './RenameForm';+import ConvoLink from './ConvoLink';import { cn } from '~/utils';import store from '~/store';-type KeyEvent = KeyboardEvent<HTMLInputElement>;--type ConversationProps = {+interface ConversationProps {conversation: TConversation;retainView: () => void;toggleNav: () => void;isLatestConvo: boolean;-};+}export default function Conversation({conversation,@@ -31,27 +29,81 @@ export default function Conversation({isLatestConvo,}: ConversationProps) {const params = useParams();+ const localize = useLocalize();+ const { showToast } = useToastContext();const currentConvoId = useMemo(() => params.conversationId, [params.conversationId]);const updateConvoMutation = useUpdateConversationMutation(currentConvoId ?? '');const activeConvos = useRecoilValue(store.allConversationsSelector);const { data: endpointsConfig } = useGetEndpointsQuery();const { navigateWithLastTools } = useNavigateToConvo();- const { showToast } = useToastContext();- const { conversationId, title } = conversation;- const inputRef = useRef<HTMLInputElement | null>(null);- const [titleInput, setTitleInput] = useState(title);+ const isSmallScreen = useMediaQuery('(max-width: 768px)');+ const { conversationId, title = '' } = conversation;++ const [titleInput, setTitleInput] = useState(title || '');const [renaming, setRenaming] = useState(false);const [isPopoverActive, setIsPopoverActive] = useState(false);- const isSmallScreen = useMediaQuery('(max-width: 768px)');- const localize = useLocalize();- const clickHandler = async (event: MouseEvent<HTMLAnchorElement>) => {- if (event.button === 0 && (event.ctrlKey || event.metaKey)) {- toggleNav();+ const previousTitle = useRef(title);++ useEffect(() => {+ if (title !== previousTitle.current) {+ setTitleInput(title as string);+ previousTitle.current = title;+ }+ }, [title]);++ const isActiveConvo = useMemo(() => {+ if (conversationId === Constants.NEW_CONVO) {+ return currentConvoId === Constants.NEW_CONVO;+ }++ if (currentConvoId !== Constants.NEW_CONVO) {+ return currentConvoId === conversationId;+ } else {+ const latestConvo = activeConvos?.[0];+ return latestConvo === conversationId;+ }+ }, [currentConvoId, conversationId, activeConvos]);++ const handleRename = () => {+ setIsPopoverActive(false);+ setTitleInput(title as string);+ setRenaming(true);+ };++ const handleRenameSubmit = async (newTitle: string) => {+ if (!conversationId || newTitle === title) {+ setRenaming(false);return;}- event.preventDefault();+ try {+ await updateConvoMutation.mutateAsync({+ conversationId,+ title: newTitle.trim() || localize('com_ui_untitled'),+ });+ setRenaming(false);+ } catch (error) {+ setTitleInput(title as string);+ showToast({+ message: localize('com_ui_rename_failed'),+ severity: NotificationSeverity.ERROR,+ showIcon: true,+ });+ setRenaming(false);+ }+ };++ const handleCancelRename = () => {+ setTitleInput(title as string);+ setRenaming(false);+ };++ const handleNavigation = (ctrlOrMetaKey: boolean) => {+ if (ctrlOrMetaKey) {+ toggleNav();+ return;+ }if (currentConvoId === conversationId || isPopoverActive) {return;@@ -59,138 +111,68 @@ export default function Conversation({toggleNav();- // set document titleif (typeof title === 'string' && title.length > 0) {document.title = title;}- /* Note: Latest Message should not be reset if existing convo */+navigateWithLastTools(conversation,!(conversationId ?? '') || conversationId === Constants.NEW_CONVO,);};- const renameHandler = useCallback(() => {- setIsPopoverActive(false);- setTitleInput(title);- setRenaming(true);- }, [title]);-- useEffect(() => {- if (renaming && inputRef.current) {- inputRef.current.focus();- }- }, [renaming]);-- const onRename = useCallback(- (e: MouseEvent<HTMLButtonElement> | FocusEvent<HTMLInputElement> | KeyEvent) => {- e.preventDefault();- setRenaming(false);- if (titleInput === title) {- return;- }- if (typeof conversationId !== 'string' || conversationId === '') {- return;- }-- updateConvoMutation.mutate(- { conversationId, title: titleInput ?? '' },- {- onError: () => {- setTitleInput(title);- showToast({- message: 'Failed to rename conversation',- severity: NotificationSeverity.ERROR,- showIcon: true,- });- },- },- );- },- [title, titleInput, conversationId, showToast, updateConvoMutation],- );-- const handleKeyDown = useCallback(- (e: KeyEvent) => {- if (e.key === 'Escape') {- setTitleInput(title);- setRenaming(false);- } else if (e.key === 'Enter') {- onRename(e);- }- },- [title, onRename],- );-- const cancelRename = useCallback(- (e: MouseEvent<HTMLButtonElement>) => {- e.preventDefault();- setTitleInput(title);- setRenaming(false);- },- [title],- );-- const isActiveConvo: boolean = useMemo(- () =>- currentConvoId === conversationId ||- (isLatestConvo &&- currentConvoId === 'new' &&- activeConvos[0] != null &&- activeConvos[0] !== 'new'),- [currentConvoId, conversationId, isLatestConvo, activeConvos],- );+ const convoOptionsProps = {+ title,+ retainView,+ renameHandler: handleRename,+ isActiveConvo,+ conversationId,+ isPopoverActive,+ setIsPopoverActive,+ };return (<divclassName={cn(- 'group relative mt-2 flex h-9 w-full items-center rounded-lg hover:bg-surface-active-alt',- isActiveConvo ? 'bg-surface-active-alt' : '',- isSmallScreen ? 'h-12' : '',+ 'group relative flex h-12 w-full items-center rounded-lg transition-colors duration-200 md:h-9',+ isActiveConvo ? 'bg-surface-active-alt' : 'hover:bg-surface-active-alt',)}+ role="listitem"+ tabIndex={0}+ onClick={(e) => {+ if (renaming) {+ return;+ }+ if (e.button === 0) {+ handleNavigation(e.ctrlKey || e.metaKey);+ }+ }}+ onKeyDown={(e) => {+ if (renaming) {+ return;+ }+ if (e.key === 'Enter') {+ handleNavigation(false);+ }+ }}+ style={{ cursor: renaming ? 'default' : 'pointer' }}+ data-testid="convo-item">{renaming ? (- <div className="absolute inset-0 z-20 flex w-full items-center rounded-lg bg-surface-active-alt p-1.5">- <input- ref={inputRef}- type="text"- className="w-full rounded bg-transparent p-0.5 text-sm leading-tight focus-visible:outline-none"- value={titleInput ?? ''}- onChange={(e) => setTitleInput(e.target.value)}- onKeyDown={handleKeyDown}- aria-label={`${localize('com_ui_rename')} ${localize('com_ui_chat')}`}- />- <div className="flex gap-1">- <button- onClick={cancelRename}- aria-label={`${localize('com_ui_cancel')} ${localize('com_ui_rename')}`}- >- <X- aria-hidden={true}- className="h-4 w-4 transition-colors duration-200 ease-in-out hover:opacity-70"- />- </button>- <button- onClick={onRename}- aria-label={`${localize('com_ui_submit')} ${localize('com_ui_rename')}`}- >- <Check- aria-hidden={true}- className="h-4 w-4 transition-colors duration-200 ease-in-out hover:opacity-70"- />- </button>- </div>- </div>+ <RenameForm+ titleInput={titleInput}+ setTitleInput={setTitleInput}+ onSubmit={handleRenameSubmit}+ onCancel={handleCancelRename}+ localize={localize}+ />) : (- <a- href={`/c/${conversationId}`}- data-testid="convo-item"- onClick={clickHandler}- className={cn(- 'flex grow cursor-pointer items-center gap-2 overflow-hidden whitespace-nowrap break-all rounded-lg px-2 py-2',- isActiveConvo ? 'bg-surface-active-alt' : '',- )}- title={title ?? ''}+ <ConvoLink+ isActiveConvo={isActiveConvo}+ title={title}+ onRename={handleRename}+ isSmallScreen={isSmallScreen}+ localize={localize}><EndpointIconconversation={conversation}@@ -198,23 +180,7 @@ export default function Conversation({size={20}context="menu-item"/>- <div- className="relative line-clamp-1 flex-1 grow overflow-hidden"- onDoubleClick={(e) => {- e.preventDefault();- e.stopPropagation();- setTitleInput(title);- setRenaming(true);- }}- >- {title}- </div>- {isActiveConvo ? (- <div className="absolute bottom-0 right-0 top-0 w-20 rounded-r-lg bg-gradient-to-l" />- ) : (- <div className="absolute bottom-0 right-0 top-0 w-20 rounded-r-lg bg-gradient-to-l from-surface-primary-alt from-0% to-transparent group-hover:from-surface-active-alt group-hover:from-40%" />- )}- </a>+ </ConvoLink>)}<divclassName={cn(@@ -224,17 +190,7 @@ export default function Conversation({: 'hidden group-focus-within:flex group-hover:flex',)}>- {!renaming && (- <ConvoOptions- title={title}- retainView={retainView}- renameHandler={renameHandler}- isActiveConvo={isActiveConvo}- conversationId={conversationId}- isPopoverActive={isPopoverActive}- setIsPopoverActive={setIsPopoverActive}- />- )}+ {!renaming && <ConvoOptions {...convoOptionsProps} />}</div></div>);diff --git a/client/src/components/Conversations/ConvoLink.tsx b/client/src/components/Conversations/ConvoLink.tsxnew file mode 100644index 0000000000..4e8d5888e4--- /dev/null+++ b/client/src/components/Conversations/ConvoLink.tsx@@ -0,0 +1,61 @@+import React from 'react';+import { cn } from '~/utils';++interface ConvoLinkProps {+ isActiveConvo: boolean;+ title: string | null;+ onRename: () => void;+ isSmallScreen: boolean;+ localize: (key: any, options?: any) => string;+ children: React.ReactNode;+}++const ConvoLink: React.FC<ConvoLinkProps> = ({+ isActiveConvo,+ title,+ onRename,+ isSmallScreen,+ localize,+ children,+}) => {+ return (+ <div+ className={cn(+ 'flex grow items-center gap-2 overflow-hidden rounded-lg px-2',+ isActiveConvo ? 'bg-surface-active-alt' : '',+ )}+ title={title ?? undefined}+ aria-current={isActiveConvo ? 'page' : undefined}+ style={{ width: '100%' }}+ >+ {children}+ <div+ className="relative flex-1 grow overflow-hidden whitespace-nowrap"+ style={{ textOverflow: 'clip' }}+ onDoubleClick={(e) => {+ if (isSmallScreen) {+ return;+ }+ e.preventDefault();+ e.stopPropagation();+ onRename();+ }}+ role="button"+ aria-label={isSmallScreen ? undefined : localize('com_ui_double_click_to_rename')}+ >+ {title || localize('com_ui_untitled')}+ </div>+ <div+ className={cn(+ 'absolute bottom-0 right-0 top-0 w-20 rounded-r-lg bg-gradient-to-l',+ isActiveConvo+ ? 'from-surface-active-alt'+ : 'from-surface-primary-alt from-0% to-transparent group-hover:from-surface-active-alt group-hover:from-40%',+ )}+ aria-hidden="true"+ />+ </div>+ );+};++export default ConvoLink;diff --git a/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx b/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsxindex c9b697ece3..d367dd3963 100644--- a/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx+++ b/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx@@ -1,12 +1,17 @@-import { useState, useId, useRef, memo } from 'react';+import { useState, useId, useRef, memo, useCallback, useMemo } from 'react';import * as Menu from '@ariakit/react/menu';+import { useParams, useNavigate } from 'react-router-dom';import { Ellipsis, Share2, Copy, Archive, Pen, Trash } from 'lucide-react';import type { MouseEvent } from 'react';-import type * as t from '~/common';-import { useDuplicateConversationMutation, useGetStartupConfig } from '~/data-provider';-import { useLocalize, useArchiveHandler, useNavigateToConvo } from '~/hooks';+import {+ useDuplicateConversationMutation,+ useGetStartupConfig,+ useArchiveConvoMutation,+} from '~/data-provider';+import { useLocalize, useNavigateToConvo, useNewConvo } from '~/hooks';import { useToastContext, useChatContext } from '~/Providers';-import { DropdownPopup } from '~/components/ui';+import { DropdownPopup, Spinner } from '~/components';+import { NotificationSeverity } from '~/common';import DeleteButton from './DeleteButton';import ShareButton from './ShareButton';import { cn } from '~/utils';@@ -31,14 +36,49 @@ function ConvoOptions({const localize = useLocalize();const { index } = useChatContext();const { data: startupConfig } = useGetStartupConfig();- const archiveHandler = useArchiveHandler(conversationId, true, retainView);const { navigateToConvo } = useNavigateToConvo(index);const { showToast } = useToastContext();++ const navigate = useNavigate();+ const { conversationId: currentConvoId } = useParams();+ const { newConversation } = useNewConvo();+const shareButtonRef = useRef<HTMLButtonElement>(null);const deleteButtonRef = useRef<HTMLButtonElement>(null);const [showShareDialog, setShowShareDialog] = useState(false);const [showDeleteDialog, setShowDeleteDialog] = useState(false);+ const archiveConvoMutation = useArchiveConvoMutation();++ const archiveHandler = async () => {+ const convoId = conversationId ?? '';++ if (!convoId) {+ return;+ }++ archiveConvoMutation.mutate(+ { conversationId: convoId, isArchived: true },+ {+ onSuccess: () => {+ if (currentConvoId === convoId || currentConvoId === 'new') {+ newConversation();+ navigate('/c/new', { replace: true });+ }+ retainView();+ setIsPopoverActive(false);+ },+ onError: () => {+ showToast({+ message: localize('com_ui_archive_error'),+ severity: NotificationSeverity.ERROR,+ showIcon: true,+ });+ },+ },+ );+ };+const duplicateConversation = useDuplicateConversationMutation({onSuccess: (data) => {navigateToConvo(data.conversation);@@ -46,6 +86,7 @@ function ConvoOptions({message: localize('com_ui_duplication_success'),status: 'success',});+ setIsPopoverActive(false);},onMutate: () => {showToast({@@ -61,56 +102,118 @@ function ConvoOptions({},});- const shareHandler = () => {+ const isDuplicateLoading = duplicateConversation.isLoading;+ const isArchiveLoading = archiveConvoMutation.isLoading;++ const handleShareClick = useCallback(() => {setShowShareDialog(true);- };+ }, []);- const deleteHandler = () => {+ const handleDeleteClick = useCallback(() => {setShowDeleteDialog(true);- };+ }, []);++ const handleArchiveClick = useCallback(async () => {+ const convoId = conversationId ?? '';+ if (!convoId) {+ return;+ }- const duplicateHandler = () => {- setIsPopoverActive(false);+ archiveConvoMutation.mutate(+ { conversationId: convoId, isArchived: true },+ {+ onSuccess: () => {+ if (currentConvoId === convoId || currentConvoId === 'new') {+ newConversation();+ navigate('/c/new', { replace: true });+ }+ retainView();+ setIsPopoverActive(false);+ },+ onError: () => {+ showToast({+ message: localize('com_ui_archive_error'),+ severity: NotificationSeverity.ERROR,+ showIcon: true,+ });+ },+ },+ );+ }, [+ conversationId,+ currentConvoId,+ archiveConvoMutation,+ navigate,+ newConversation,+ retainView,+ setIsPopoverActive,+ showToast,+ localize,+ ]);++ const handleDuplicateClick = useCallback(() => {duplicateConversation.mutate({conversationId: conversationId ?? '',});- };+ }, [conversationId, duplicateConversation]);- const dropdownItems: t.MenuItemProps[] = [- {- label: localize('com_ui_share'),- onClick: shareHandler,- icon: <Share2 className="icon-sm mr-2 text-text-primary" />,- show: startupConfig && startupConfig.sharedLinksEnabled,- /** NOTE: THE FOLLOWING PROPS ARE REQUIRED FOR MENU ITEMS THAT OPEN DIALOGS */- hideOnClick: false,- ref: shareButtonRef,- render: (props) => <button {...props} />,- },- {- label: localize('com_ui_rename'),- onClick: renameHandler,- icon: <Pen className="icon-sm mr-2 text-text-primary" />,- },- {- label: localize('com_ui_duplicate'),- onClick: duplicateHandler,- icon: <Copy className="icon-sm mr-2 text-text-primary" />,- },- {- label: localize('com_ui_archive'),- onClick: archiveHandler,- icon: <Archive className="icon-sm mr-2 text-text-primary" />,- },- {- label: localize('com_ui_delete'),- onClick: deleteHandler,- icon: <Trash className="icon-sm mr-2 text-text-primary" />,- hideOnClick: false,- ref: deleteButtonRef,- render: (props) => <button {...props} />,- },- ];+ const dropdownItems = useMemo(+ () => [+ {+ label: localize('com_ui_share'),+ onClick: handleShareClick,+ icon: <Share2 className="icon-sm mr-2 text-text-primary" />,+ show: startupConfig && startupConfig.sharedLinksEnabled,+ hideOnClick: false,+ ref: shareButtonRef,+ render: (props) => <button {...props} />,+ },+ {+ label: localize('com_ui_rename'),+ onClick: renameHandler,+ icon: <Pen className="icon-sm mr-2 text-text-primary" />,+ },+ {+ label: localize('com_ui_duplicate'),+ onClick: handleDuplicateClick,+ hideOnClick: false,+ icon: isDuplicateLoading ? (+ <Spinner className="size-4" />+ ) : (+ <Copy className="icon-sm mr-2 text-text-primary" />+ ),+ },+ {+ label: localize('com_ui_archive'),+ onClick: handleArchiveClick,+ hideOnClick: false,+ icon: isArchiveLoading ? (+ <Spinner className="size-4" />+ ) : (+ <Archive className="icon-sm mr-2 text-text-primary" />+ ),+ },+ {+ label: localize('com_ui_delete'),+ onClick: handleDeleteClick,+ icon: <Trash className="icon-sm mr-2 text-text-primary" />,+ hideOnClick: false,+ ref: deleteButtonRef,+ render: (props) => <button {...props} />,+ },+ ],+ [+ localize,+ handleShareClick,+ startupConfig,+ renameHandler,+ handleDuplicateClick,+ isDuplicateLoading,+ handleArchiveClick,+ isArchiveLoading,+ handleDeleteClick,+ ],+ );const menuId = useId();@@ -129,6 +232,7 @@ function ConvoOptions({? 'opacity-100': 'opacity-0 focus:opacity-100 group-focus-within:opacity-100 group-hover:opacity-100 data-[open]:opacity-100',)}+ onClick={(e) => e.stopPropagation()}><Ellipsis className="icon-md text-text-secondary" aria-hidden={true} /></Menu.MenuButton>@@ -158,4 +262,11 @@ function ConvoOptions({);}-export default memo(ConvoOptions);+export default memo(ConvoOptions, (prevProps, nextProps) => {+ return (+ prevProps.conversationId === nextProps.conversationId &&+ prevProps.title === nextProps.title &&+ prevProps.isPopoverActive === nextProps.isPopoverActive &&+ prevProps.isActiveConvo === nextProps.isActiveConvo+ );+});diff --git a/client/src/components/Conversations/ConvoOptions/DeleteButton.tsx b/client/src/components/Conversations/ConvoOptions/DeleteButton.tsxindex 281b95bd70..ec1a387d8d 100644--- a/client/src/components/Conversations/ConvoOptions/DeleteButton.tsx+++ b/client/src/components/Conversations/ConvoOptions/DeleteButton.tsx@@ -1,12 +1,21 @@-import React, { useCallback } from 'react';+import React, { useCallback, useState } from 'react';import { QueryKeys } from 'librechat-data-provider';import { useQueryClient } from '@tanstack/react-query';import { useParams, useNavigate } from 'react-router-dom';import type { TMessage } from 'librechat-data-provider';+import {+ Label,+ OGDialog,+ OGDialogTitle,+ OGDialogContent,+ OGDialogHeader,+ Button,+ Spinner,+} from '~/components';import { useDeleteConversationMutation } from '~/data-provider';-import OGDialogTemplate from '~/components/ui/OGDialogTemplate';import { useLocalize, useNewConvo } from '~/hooks';-import { OGDialog, Label } from '~/components';+import { NotificationSeverity } from '~/common';+import { useToastContext } from '~/Providers';type DeleteButtonProps = {conversationId: string;@@ -18,10 +27,12 @@ type DeleteButtonProps = {};export function DeleteConversationDialog({+ setShowDeleteDialog,conversationId,retainView,title,}: {+ setShowDeleteDialog: (value: boolean) => void;conversationId: string;retainView: () => void;title: string;@@ -29,17 +40,26 @@ export function DeleteConversationDialog({const localize = useLocalize();const navigate = useNavigate();const queryClient = useQueryClient();+ const { showToast } = useToastContext();const { newConversation } = useNewConvo();const { conversationId: currentConvoId } = useParams();- const deleteConvoMutation = useDeleteConversationMutation({+ const deleteMutation = useDeleteConversationMutation({onSuccess: () => {+ setShowDeleteDialog(false);if (currentConvoId === conversationId || currentConvoId === 'new') {newConversation();navigate('/c/new', { replace: true });}retainView();},+ onError: () => {+ showToast({+ message: localize('com_ui_convo_delete_error'),+ severity: NotificationSeverity.ERROR,+ showIcon: true,+ });+ },});const confirmDelete = useCallback(() => {@@ -47,32 +67,29 @@ export function DeleteConversationDialog({const thread_id = messages?.[messages.length - 1]?.thread_id;const endpoint = messages?.[messages.length - 1]?.endpoint;- deleteConvoMutation.mutate({ conversationId, thread_id, endpoint, source: 'button' });- }, [conversationId, deleteConvoMutation, queryClient]);+ deleteMutation.mutate({ conversationId, thread_id, endpoint, source: 'button' });+ }, [conversationId, deleteMutation, queryClient]);return (- <OGDialogTemplate- showCloseButton={false}- title={localize('com_ui_delete_conversation')}- 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">- <Label htmlFor="dialog-confirm-delete" className="text-left text-sm font-medium">- {localize('com_ui_delete_confirm')} <strong>{title}</strong>- </Label>- </div>- </div>- </>- }- selection={{- selectHandler: confirmDelete,- selectClasses:- 'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white',- selectText: localize('com_ui_delete'),- }}- />+ <OGDialogContent+ title={localize('com_ui_delete_confirm') + ' ' + title}+ className="w-11/12 max-w-md"+ >+ <OGDialogHeader>+ <OGDialogTitle>{localize('com_ui_delete_conversation')}</OGDialogTitle>+ </OGDialogHeader>+ <div>+ {localize('com_ui_delete_confirm')} <strong>{title}</strong> ?+ </div>+ <div className="flex justify-end gap-4 pt-4">+ <Button aria-label="cancel" variant="outline" onClick={() => setShowDeleteDialog(false)}>+ {localize('com_ui_cancel')}+ </Button>+ <Button variant="destructive" onClick={confirmDelete} disabled={deleteMutation.isLoading}>+ {deleteMutation.isLoading ? <Spinner /> : localize('com_ui_delete')}+ </Button>+ </div>+ </OGDialogContent>);}@@ -84,7 +101,7 @@ export default function DeleteButton({setShowDeleteDialog,triggerRef,}: DeleteButtonProps) {- if (showDeleteDialog === undefined && setShowDeleteDialog === undefined) {+ if (showDeleteDialog === undefined || setShowDeleteDialog === undefined) {return null;}@@ -93,8 +110,9 @@ export default function DeleteButton({}return (- <OGDialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog} triggerRef={triggerRef}>+ <OGDialog open={showDeleteDialog!} onOpenChange={setShowDeleteDialog!} triggerRef={triggerRef}><DeleteConversationDialog+ setShowDeleteDialog={setShowDeleteDialog}conversationId={conversationId}retainView={retainView}title={title}diff --git a/client/src/components/Conversations/ConvoOptions/index.js b/client/src/components/Conversations/ConvoOptions/index.jsnew file mode 100644index 0000000000..c294bb45ce--- /dev/null+++ b/client/src/components/Conversations/ConvoOptions/index.js@@ -0,0 +1,4 @@+export * from './DeleteButton';+export { default as ShareButton } from './ShareButton';+export { default as SharedLinkButton } from './SharedLinkButton';+export { default as ConvoOptions } from './ConvoOptions';diff --git a/client/src/components/Conversations/RenameForm.tsx b/client/src/components/Conversations/RenameForm.tsxnew file mode 100644index 0000000000..e392215dc4--- /dev/null+++ b/client/src/components/Conversations/RenameForm.tsx@@ -0,0 +1,77 @@+import React, { useEffect, useRef } from 'react';+import { Check, X } from 'lucide-react';+import type { KeyboardEvent } from 'react';++interface RenameFormProps {+ titleInput: string;+ setTitleInput: (value: string) => void;+ onSubmit: (title: string) => void;+ onCancel: () => void;+ localize: (key: any, options?: any) => string;+}++const RenameForm: React.FC<RenameFormProps> = ({+ titleInput,+ setTitleInput,+ onSubmit,+ onCancel,+ localize,+}) => {+ const inputRef = useRef<HTMLInputElement>(null);++ useEffect(() => {+ if (inputRef.current) {+ inputRef.current.focus();+ inputRef.current.select();+ }+ }, []);++ const handleKeyDown = (e: KeyboardEvent<HTMLInputElement>) => {+ switch (e.key) {+ case 'Escape':+ onCancel();+ break;+ case 'Enter':+ onSubmit(titleInput);+ break;+ }+ };++ return (+ <div+ className="absolute inset-0 z-20 flex w-full items-center rounded-lg bg-surface-active-alt p-1.5"+ role="form"+ aria-label={localize('com_ui_rename_conversation')}+ >+ <input+ ref={inputRef}+ type="text"+ className="w-full rounded bg-transparent p-0.5 text-sm leading-tight focus-visible:outline-none"+ value={titleInput}+ onChange={(e) => setTitleInput(e.target.value)}+ onKeyDown={handleKeyDown}+ onBlur={() => onSubmit(titleInput)}+ maxLength={100}+ aria-label={localize('com_ui_new_conversation_title')}+ />+ <div className="flex gap-1" role="toolbar">+ <button+ onClick={() => onCancel()}+ className="p-1 hover:opacity-70 focus:outline-none focus:ring-2"+ aria-label={localize('com_ui_cancel')}+ >+ <X className="h-4 w-4" aria-hidden="true" />+ </button>+ <button+ onClick={() => onSubmit(titleInput)}+ className="p-1 hover:opacity-70 focus:outline-none focus:ring-2"+ aria-label={localize('com_ui_save')}+ >+ <Check className="h-4 w-4" aria-hidden="true" />+ </button>+ </div>+ </div>+ );+};++export default RenameForm;diff --git a/client/src/components/Nav/AccountSettings.tsx b/client/src/components/Nav/AccountSettings.tsxindex 70bf90d7c4..7d4e6576c2 100644--- a/client/src/components/Nav/AccountSettings.tsx+++ b/client/src/components/Nav/AccountSettings.tsx@@ -30,7 +30,7 @@ function AccountSettings() {<Select.Selectaria-label={localize('com_nav_account_settings')}data-testid="nav-user"- className="mt-text-sm flex h-auto w-full items-center gap-2 rounded-xl p-2 text-sm transition-all duration-200 ease-in-out hover:bg-accent"+ className="mt-text-sm flex h-auto w-full items-center gap-2 rounded-xl p-2 text-sm transition-all duration-200 ease-in-out hover:bg-surface-hover"><div className="-ml-0.9 -mt-0.8 h-8 w-8 flex-shrink-0"><div className="relative flex">diff --git a/client/src/components/Nav/Bookmarks/BookmarkNav.tsx b/client/src/components/Nav/Bookmarks/BookmarkNav.tsxindex c1de20f1ad..fa8ab06d6a 100644--- a/client/src/components/Nav/Bookmarks/BookmarkNav.tsx+++ b/client/src/components/Nav/Bookmarks/BookmarkNav.tsx@@ -33,7 +33,7 @@ const BookmarkNav: FC<BookmarkNavProps> = ({ tags, setTags, isSmallScreen }: Boodata-testid="bookmark-menu"><div className="h-7 w-7 flex-shrink-0">- <div className="relative flex h-full items-center justify-center rounded-full border border-border-medium bg-surface-primary-alt text-text-primary">+ <div className="relative flex h-full items-center justify-center text-text-primary">{tags.length > 0 ? (<BookmarkFilledIcon className="h-4 w-4" aria-hidden="true" />) : (@@ -45,7 +45,7 @@ const BookmarkNav: FC<BookmarkNavProps> = ({ tags, setTags, isSmallScreen }: Boo{tags.length > 0 ? tags.join(', ') : localize('com_ui_bookmarks')}</div></MenuButton>- <MenuItems className="absolute left-0 top-full z-[100] mt-1 w-full translate-y-0 overflow-hidden rounded-lg bg-surface-active-alt p-1.5 shadow-lg outline-none">+ <MenuItems className="absolute left-0 top-full z-[100] mt-1 w-full translate-y-0 overflow-hidden rounded-lg bg-surface-secondary p-1.5 shadow-lg outline-none">{data && conversation && (<BookmarkContext.Provider value={{ bookmarks: data.filter((tag) => tag.count > 0) }}><BookmarkNavItemsdiff --git a/client/src/components/Nav/Nav.spec.tsx b/client/src/components/Nav/Nav.spec.tsxdeleted file mode 100644index 0e3114a633..0000000000--- a/client/src/components/Nav/Nav.spec.tsx+++ /dev/null@@ -1,102 +0,0 @@-import 'test/resizeObserver.mock';-import 'test/matchMedia.mock';-import 'test/localStorage.mock';--import React from 'react';-import { BrowserRouter } from 'react-router-dom';-import { RecoilRoot } from 'recoil';-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';-import { render } from '@testing-library/react';-import '@testing-library/jest-dom/extend-expect';--import { AuthContextProvider } from '~/hooks/AuthContext';-import { SearchContext } from '~/Providers';-import Nav from './Nav';--const renderNav = ({ search, navVisible, setNavVisible }) => {- const queryClient = new QueryClient({- defaultOptions: {- queries: {- retry: false,- },- },- });-- return render(- <RecoilRoot>- <BrowserRouter>- <QueryClientProvider client={queryClient}>- <AuthContextProvider>- <SearchContext.Provider value={search}>- <Nav navVisible={navVisible} setNavVisible={setNavVisible} />- </SearchContext.Provider>- </AuthContextProvider>- </QueryClientProvider>- </BrowserRouter>- </RecoilRoot>,- );-};--const mockMatchMedia = (mediaQueryList?: string[]) => {- mediaQueryList = mediaQueryList || [];-- Object.defineProperty(window, 'matchMedia', {- writable: true,- value: jest.fn().mockImplementation((query) => ({- matches: mediaQueryList.includes(query),- media: query,- onchange: null,- addEventListener: jest.fn(),- removeEventListener: jest.fn(),- dispatchEvent: jest.fn(),- })),- });-};--describe('Nav', () => {- beforeEach(() => {- mockMatchMedia();- });-- it('renders visible', () => {- const { getByTestId } = renderNav({- search: { data: [], pageNumber: 1 },- navVisible: true,- setNavVisible: jest.fn(),- });-- expect(getByTestId('nav')).toBeVisible();- });-- it('renders hidden', async () => {- const { getByTestId } = renderNav({- search: { data: [], pageNumber: 1 },- navVisible: false,- setNavVisible: jest.fn(),- });-- expect(getByTestId('nav')).not.toBeVisible();- });-- it('renders hidden when small screen is detected', async () => {- mockMatchMedia(['(max-width: 768px)']);-- const navVisible = true;- const mockSetNavVisible = jest.fn();-- const { getByTestId } = renderNav({- search: { data: [], pageNumber: 1 },- navVisible: navVisible,- setNavVisible: mockSetNavVisible,- });-- // nav is initially visible- expect(getByTestId('nav')).toBeVisible();-- // when small screen is detected, the nav is hidden- expect(mockSetNavVisible.mock.calls).toHaveLength(1);- const updatedNavVisible = mockSetNavVisible.mock.calls[0][0](navVisible);- expect(updatedNavVisible).not.toEqual(navVisible);- expect(updatedNavVisible).toBeFalsy();- });-});diff --git a/client/src/components/Nav/Nav.tsx b/client/src/components/Nav/Nav.tsxindex 98b630ae6b..33d8d55065 100644--- a/client/src/components/Nav/Nav.tsx+++ b/client/src/components/Nav/Nav.tsx@@ -1,7 +1,12 @@-import { useCallback, useEffect, useState, useMemo, memo } from 'react';+import { useCallback, useEffect, useState, useMemo, memo, lazy, Suspense, useRef } from 'react';import { useRecoilValue } from 'recoil';import { PermissionTypes, Permissions } from 'librechat-data-provider';-import type { ConversationListResponse } from 'librechat-data-provider';+import type {+ TConversation,+ ConversationListResponse,+ SearchConversationListResponse,+} from 'librechat-data-provider';+import type { InfiniteQueryObserverResult } from '@tanstack/react-query';import {useLocalize,useHasAccess,@@ -12,213 +17,260 @@ import {} from '~/hooks';import { useConversationsInfiniteQuery } from '~/data-provider';import { Conversations } from '~/components/Conversations';-import BookmarkNav from './Bookmarks/BookmarkNav';-import AccountSettings from './AccountSettings';import { useSearchContext } from '~/Providers';-import { Spinner } from '~/components/svg';-import SearchBar from './SearchBar';+import { Spinner } from '~/components';import NavToggle from './NavToggle';+import SearchBar from './SearchBar';import NewChat from './NewChat';import { cn } from '~/utils';import store from '~/store';-const Nav = ({- navVisible,- setNavVisible,-}: {- navVisible: boolean;- setNavVisible: React.Dispatch<React.SetStateAction<boolean>>;-}) => {- const localize = useLocalize();- const { isAuthenticated } = useAuthContext();-- const [navWidth, setNavWidth] = useState('260px');- const [isHovering, setIsHovering] = useState(false);- const isSmallScreen = useMediaQuery('(max-width: 768px)');- const [newUser, setNewUser] = useLocalStorage('newUser', true);- const [isToggleHovering, setIsToggleHovering] = useState(false);-- const hasAccessToBookmarks = useHasAccess({- permissionType: PermissionTypes.BOOKMARKS,- permission: Permissions.USE,- });-- const handleMouseEnter = useCallback(() => {- setIsHovering(true);- }, []);-- const handleMouseLeave = useCallback(() => {- setIsHovering(false);- }, []);-- useEffect(() => {- if (isSmallScreen) {- const savedNavVisible = localStorage.getItem('navVisible');- if (savedNavVisible === null) {- toggleNavVisible();- }- setNavWidth('320px');- } else {- setNavWidth('260px');- }- }, [isSmallScreen]);-- const [showLoading, setShowLoading] = useState(false);- const isSearchEnabled = useRecoilValue(store.isSearchEnabled);-- const { pageNumber, searchQuery, setPageNumber, searchQueryRes } = useSearchContext();- const [tags, setTags] = useState<string[]>([]);- const { data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } =- useConversationsInfiniteQuery(+const BookmarkNav = lazy(() => import('./Bookmarks/BookmarkNav'));+const AccountSettings = lazy(() => import('./AccountSettings'));++const NAV_WIDTH_DESKTOP = '260px';+const NAV_WIDTH_MOBILE = '320px';++const NavMask = memo(+ ({ navVisible, toggleNavVisible }: { navVisible: boolean; toggleNavVisible: () => void }) => (+ <div+ id="mobile-nav-mask-toggle"+ role="button"+ tabIndex={0}+ className={`nav-mask ${navVisible ? 'active' : ''}`}+ onClick={toggleNavVisible}+ onKeyDown={(e) => {+ if (e.key === 'Enter' || e.key === ' ') {+ toggleNavVisible();+ }+ }}+ aria-label="Toggle navigation"+ />+ ),+);++const MemoNewChat = memo(NewChat);++const Nav = memo(+ ({+ navVisible,+ setNavVisible,+ }: {+ navVisible: boolean;+ setNavVisible: React.Dispatch<React.SetStateAction<boolean>>;+ }) => {+ const localize = useLocalize();+ const { isAuthenticated } = useAuthContext();++ const [navWidth, setNavWidth] = useState(NAV_WIDTH_DESKTOP);+ const isSmallScreen = useMediaQuery('(max-width: 768px)');+ const [newUser, setNewUser] = useLocalStorage('newUser', true);+ const [isToggleHovering, setIsToggleHovering] = useState(false);+ const [showLoading, setShowLoading] = useState(false);+ const [tags, setTags] = useState<string[]>([]);++ const hasAccessToBookmarks = useHasAccess({+ permissionType: PermissionTypes.BOOKMARKS,+ permission: Permissions.USE,+ });++ const isSearchEnabled = useRecoilValue(store.isSearchEnabled);+ const isSearchTyping = useRecoilValue(store.isSearchTyping);+ const { searchQuery, searchQueryRes } = useSearchContext();++ const { data, fetchNextPage, isFetchingNextPage, refetch } = useConversationsInfiniteQuery({- pageNumber: pageNumber.toString(),isArchived: false,tags: tags.length === 0 ? undefined : tags,},- { enabled: isAuthenticated },+ {+ enabled: isAuthenticated,+ staleTime: 30000,+ cacheTime: 300000,+ },);- useEffect(() => {- // When a tag is selected, refetch the list of conversations related to that tag- refetch();- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [tags]);- const { containerRef, moveToTop } = useNavScrolling<ConversationListResponse>({- setShowLoading,- hasNextPage: searchQuery ? searchQueryRes?.hasNextPage : hasNextPage,- fetchNextPage: searchQuery ? searchQueryRes?.fetchNextPage : fetchNextPage,- isFetchingNextPage: searchQuery- ? searchQueryRes?.isFetchingNextPage ?? false- : isFetchingNextPage,- });-- const conversations = useMemo(- () =>- (searchQuery ? searchQueryRes?.data : data)?.pages.flatMap((page) => page.conversations) ||- [],- [data, searchQuery, searchQueryRes?.data],- );-- const toggleNavVisible = () => {- setNavVisible((prev: boolean) => {- localStorage.setItem('navVisible', JSON.stringify(!prev));- return !prev;++ const computedHasNextPage = useMemo(() => {+ if (searchQuery && searchQueryRes?.data) {+ const pages = searchQueryRes.data.pages;+ return pages[pages.length - 1]?.nextCursor !== null;+ } else if (data?.pages && data.pages.length > 0) {+ const lastPage: ConversationListResponse = data.pages[data.pages.length - 1];+ return lastPage.nextCursor !== null;+ }+ return false;+ }, [searchQuery, searchQueryRes?.data, data?.pages]);++ const outerContainerRef = useRef<HTMLDivElement>(null);+ const listRef = useRef<any>(null);++ const { moveToTop } = useNavScrolling<+ ConversationListResponse | SearchConversationListResponse+ >({+ setShowLoading,+ fetchNextPage: async (options?) => {+ if (computedHasNextPage) {+ if (searchQuery && searchQueryRes) {+ const pages = searchQueryRes.data?.pages;+ if (pages && pages.length > 0 && pages[pages.length - 1]?.nextCursor !== null) {+ return searchQueryRes.fetchNextPage(options);+ }+ } else {+ return fetchNextPage(options);+ }+ }+ return Promise.resolve(+ {} as InfiniteQueryObserverResult<+ SearchConversationListResponse | ConversationListResponse,+ unknown+ >,+ );+ },+ isFetchingNext: searchQuery+ ? (searchQueryRes?.isFetchingNextPage ?? false)+ : isFetchingNextPage,});- if (newUser) {- setNewUser(false);- }- };-- const itemToggleNav = () => {- if (isSmallScreen) {- toggleNavVisible();- }- };-- return (- <>- <div- data-testid="nav"- className={- 'nav active max-w-[320px] flex-shrink-0 overflow-x-hidden bg-surface-primary-alt md:max-w-[260px]'++ const conversations = useMemo(() => {+ if (searchQuery && searchQueryRes?.data) {+ return searchQueryRes.data.pages.flatMap(+ (page) => page.conversations ?? [],+ ) as TConversation[];+ }+ return data ? data.pages.flatMap((page) => page.conversations) : [];+ }, [data, searchQuery, searchQueryRes?.data]);++ const toggleNavVisible = useCallback(() => {+ setNavVisible((prev: boolean) => {+ localStorage.setItem('navVisible', JSON.stringify(!prev));+ return !prev;+ });+ if (newUser) {+ setNewUser(false);+ }+ }, [newUser, setNavVisible, setNewUser]);++ const itemToggleNav = useCallback(() => {+ if (isSmallScreen) {+ toggleNavVisible();+ }+ }, [isSmallScreen, toggleNavVisible]);++ useEffect(() => {+ if (isSmallScreen) {+ const savedNavVisible = localStorage.getItem('navVisible');+ if (savedNavVisible === null) {+ toggleNavVisible();}- style={{- width: navVisible ? navWidth : '0px',- visibility: navVisible ? 'visible' : 'hidden',- transition: 'width 0.2s, visibility 0.2s',- }}- >- <div className="h-full w-[320px] md:w-[260px]">- <div className="flex h-full min-h-0 flex-col">- <div- className={cn(- 'flex h-full min-h-0 flex-col transition-opacity',- isToggleHovering && !isSmallScreen ? 'opacity-50' : 'opacity-100',- )}- >+ setNavWidth(NAV_WIDTH_MOBILE);+ } else {+ setNavWidth(NAV_WIDTH_DESKTOP);+ }+ }, [isSmallScreen, toggleNavVisible]);++ useEffect(() => {+ refetch();+ }, [tags, refetch]);++ const loadMoreConversations = useCallback(() => {+ if (isFetchingNextPage || !computedHasNextPage) {+ return;+ }++ fetchNextPage();+ }, [isFetchingNextPage, computedHasNextPage, fetchNextPage]);++ const subHeaders = useMemo(+ () => (+ <>+ {isSearchEnabled === true && <SearchBar isSmallScreen={isSmallScreen} />}+ {hasAccessToBookmarks && (+ <>+ <div className="mt-1.5" />+ <Suspense fallback={null}>+ <BookmarkNav tags={tags} setTags={setTags} isSmallScreen={isSmallScreen} />+ </Suspense>+ </>+ )}+ </>+ ),+ [isSearchEnabled, hasAccessToBookmarks, isSmallScreen, tags, setTags],+ );++ const isSearchLoading =+ !!searchQuery &&+ (isSearchTyping ||+ (searchQueryRes?.isLoading ?? false) ||+ (searchQueryRes?.isFetching ?? false));++ return (+ <>+ <div+ data-testid="nav"+ className={cn(+ 'nav active max-w-[320px] flex-shrink-0 overflow-x-hidden bg-surface-primary-alt',+ 'md:max-w-[260px]',+ )}+ style={{+ width: navVisible ? navWidth : '0px',+ visibility: navVisible ? 'visible' : 'hidden',+ transition: 'width 0.2s, visibility 0.2s',+ }}+ >+ <div className="h-full w-[320px] md:w-[260px]">+ <div className="flex h-full flex-col"><divclassName={cn(- 'scrollbar-trigger relative h-full w-full flex-1 items-start border-white/20',+ 'flex h-full flex-col transition-opacity',+ isToggleHovering && !isSmallScreen ? 'opacity-50' : 'opacity-100',)}>- <nav- id="chat-history-nav"- aria-label={localize('com_ui_chat_history')}- className="flex h-full w-full flex-col px-3 pb-3.5"- >- <div- className={cn(- '-mr-2 flex-1 flex-col overflow-y-auto pr-2 transition-opacity duration-500',- isHovering ? '' : 'scrollbar-transparent',- )}- onMouseEnter={handleMouseEnter}- onMouseLeave={handleMouseLeave}- ref={containerRef}+ <div className="flex h-full flex-col">+ <nav+ id="chat-history-nav"+ aria-label={localize('com_ui_chat_history')}+ className="flex h-full flex-col px-3 pb-3.5">- <NewChat- toggleNav={itemToggleNav}- isSmallScreen={isSmallScreen}- subHeaders={- <>- {isSearchEnabled === true && (- <SearchBar- setPageNumber={setPageNumber}- isSmallScreen={isSmallScreen}- />- )}- {hasAccessToBookmarks === true && (- <>- <div className="mt-1.5" />- <BookmarkNav- tags={tags}- setTags={setTags}- isSmallScreen={isSmallScreen}- />- </>- )}- </>- }- />-- <Conversations- conversations={conversations}- moveToTop={moveToTop}- toggleNav={itemToggleNav}- />- {(isFetchingNextPage || showLoading) && (- <Spinner className={cn('m-1 mx-auto mb-4 h-4 w-4 text-text-primary')} />- )}- </div>- <AccountSettings />- </nav>+ <div className="flex flex-1 flex-col" ref={outerContainerRef}>+ <MemoNewChat+ toggleNav={itemToggleNav}+ isSmallScreen={isSmallScreen}+ subHeaders={subHeaders}+ />+ <Conversations+ conversations={conversations}+ moveToTop={moveToTop}+ toggleNav={itemToggleNav}+ containerRef={listRef}+ loadMoreConversations={loadMoreConversations}+ isFetchingNextPage={isFetchingNextPage || showLoading}+ isSearchLoading={isSearchLoading}+ />+ </div>+ <Suspense fallback={null}>+ <AccountSettings />+ </Suspense>+ </nav>+ </div></div></div></div></div>- </div>- <NavToggle- isHovering={isToggleHovering}- setIsHovering={setIsToggleHovering}- onToggle={toggleNavVisible}- navVisible={navVisible}- className="fixed left-0 top-1/2 z-40 hidden md:flex"- />- {isSmallScreen && (- <div- id="mobile-nav-mask-toggle"- role="button"- tabIndex={0}- className={`nav-mask ${navVisible ? 'active' : ''}`}- onClick={toggleNavVisible}- onKeyDown={(e) => {- if (e.key === 'Enter' || e.key === ' ') {- toggleNavVisible();- }- }}- aria-label="Toggle navigation"++ <NavToggle+ isHovering={isToggleHovering}+ setIsHovering={setIsToggleHovering}+ onToggle={toggleNavVisible}+ navVisible={navVisible}+ className="fixed left-0 top-1/2 z-40 hidden md:flex"/>- )}- </>- );-};-export default memo(Nav);+ {isSmallScreen && <NavMask navVisible={navVisible} toggleNavVisible={toggleNavVisible} />}+ </>+ );+ },+);++Nav.displayName = 'Nav';++export default Nav;diff --git a/client/src/components/Nav/NewChat.tsx b/client/src/components/Nav/NewChat.tsxindex c31a19b679..6cf88605bb 100644--- a/client/src/components/Nav/NewChat.tsx+++ b/client/src/components/Nav/NewChat.tsx@@ -1,3 +1,4 @@+import React, { useMemo, useCallback } from 'react';import { Search } from 'lucide-react';import { useRecoilValue } from 'recoil';import { useNavigate } from 'react-router-dom';@@ -13,10 +14,24 @@ import { NewChatIcon } from '~/components/svg';import { cn } from '~/utils';import store from '~/store';-const NewChatButtonIcon = ({ conversation }: { conversation: TConversation | null }) => {+const NewChatButtonIcon = React.memo(({ conversation }: { conversation: TConversation | null }) => {const searchQuery = useRecoilValue(store.searchQuery);const { data: endpointsConfig } = useGetEndpointsQuery();+ const computedIcon = useMemo(() => {+ if (searchQuery) {+ return null;+ }+ let { endpoint = '' } = conversation ?? {};+ const iconURL = conversation?.iconURL ?? '';+ endpoint = getIconEndpoint({ endpointsConfig, iconURL, endpoint });+ const endpointType = getEndpointField(endpointsConfig, endpoint, 'type');+ const endpointIconURL = getEndpointField(endpointsConfig, endpoint, 'iconURL');+ const iconKey = getIconKey({ endpoint, endpointsConfig, endpointType, endpointIconURL });+ const Icon = icons[iconKey];+ return { iconURL, endpoint, endpointType, endpointIconURL, Icon };+ }, [searchQuery, conversation, endpointsConfig]);+if (searchQuery) {return (<div className="shadow-stroke relative flex h-7 w-7 items-center justify-center rounded-full bg-white text-black dark:bg-white">@@ -25,14 +40,11 @@ const NewChatButtonIcon = ({ conversation }: { conversation: TConversation | nul);}- let { endpoint = '' } = conversation ?? {};- const iconURL = conversation?.iconURL ?? '';- endpoint = getIconEndpoint({ endpointsConfig, iconURL, endpoint });+ if (!computedIcon) {+ return null;+ }- const endpointType = getEndpointField(endpointsConfig, endpoint, 'type');- const endpointIconURL = getEndpointField(endpointsConfig, endpoint, 'iconURL');- const iconKey = getIconKey({ endpoint, endpointsConfig, endpointType, endpointIconURL });- const Icon = icons[iconKey];+ const { iconURL, endpoint, endpointIconURL, Icon } = computedIcon;return (<div className="h-7 w-7 flex-shrink-0">@@ -45,13 +57,12 @@ const NewChatButtonIcon = ({ conversation }: { conversation: TConversation | nul/>) : (<div className="shadow-stroke relative flex h-full items-center justify-center rounded-full bg-white text-black">- {endpoint && Icon != null && (+ {endpoint && Icon && (<Iconsize={41}context="nav"className="h-2/3 w-2/3"endpoint={endpoint}- endpointType={endpointType}iconURL={endpointIconURL}/>)}@@ -59,7 +70,7 @@ const NewChatButtonIcon = ({ conversation }: { conversation: TConversation | nul)}</div>);-};+});export default function NewChat({index = 0,@@ -77,21 +88,23 @@ export default function NewChat({const { newConversation: newConvo } = useNewConvo(index);const navigate = useNavigate();const localize = useLocalize();-const { conversation } = store.useCreateConversationAtom(index);- const clickHandler = (event: React.MouseEvent<HTMLAnchorElement>) => {- if (event.button === 0 && !(event.ctrlKey || event.metaKey)) {- event.preventDefault();- queryClient.setQueryData<TMessage[]>(- [QueryKeys.messages, conversation?.conversationId ?? Constants.NEW_CONVO],- [],- );- newConvo();- navigate('/c/new');- toggleNav();- }- };+ const clickHandler = useCallback(+ (event: React.MouseEvent<HTMLAnchorElement>) => {+ if (event.button === 0 && !(event.ctrlKey || event.metaKey)) {+ event.preventDefault();+ queryClient.setQueryData<TMessage[]>(+ [QueryKeys.messages, conversation?.conversationId ?? Constants.NEW_CONVO],+ [],+ );+ newConvo();+ navigate('/c/new');+ toggleNav();+ }+ },+ [queryClient, conversation, newConvo, navigate, toggleNav],+ );return (<div className="sticky left-0 right-0 top-0 z-50 bg-surface-primary-alt pt-3.5">diff --git a/client/src/components/Nav/SearchBar.tsx b/client/src/components/Nav/SearchBar.tsxindex 10ebca3ff8..018d3d1ea1 100644--- a/client/src/components/Nav/SearchBar.tsx+++ b/client/src/components/Nav/SearchBar.tsx@@ -11,14 +11,13 @@ import store from '~/store';type SearchBarProps = {isSmallScreen?: boolean;- setPageNumber: React.Dispatch<React.SetStateAction<number>>;};const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) => {const localize = useLocalize();const location = useLocation();const queryClient = useQueryClient();- const { setPageNumber, isSmallScreen } = props;+ const { isSmallScreen } = props;const [text, setText] = useState('');const [showClearIcon, setShowClearIcon] = useState(false);@@ -27,13 +26,13 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =const clearConvoState = store.useClearConvoState();const setSearchQuery = useSetRecoilState(store.searchQuery);const setIsSearching = useSetRecoilState(store.isSearching);+ const setIsSearchTyping = useSetRecoilState(store.isSearchTyping);const clearSearch = useCallback(() => {- setPageNumber(1);if (location.pathname.includes('/search')) {newConversation({ disableFocus: true });}- }, [newConversation, setPageNumber, location.pathname]);+ }, [newConversation, location.pathname]);const clearText = useCallback(() => {setShowClearIcon(false);@@ -61,15 +60,22 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =[queryClient, clearConvoState, setSearchQuery],);- // TODO: make the debounce time configurable via yaml- const debouncedSendRequest = useMemo(() => debounce(sendRequest, 350), [sendRequest]);+ const debouncedSendRequest = useMemo(+ () =>+ debounce((value: string) => {+ sendRequest(value);+ }, 350),+ [sendRequest, setIsSearchTyping],+ );- const onChange = (e: React.FormEvent<HTMLInputElement>) => {- const { value } = e.target as HTMLInputElement;+ const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {+ const value = e.target.value;setShowClearIcon(value.length > 0);setText(value);+ setSearchQuery(value);+ setIsSearchTyping(true);+ // debounce only the API calldebouncedSendRequest(value);- setIsSearching(true);};return (@@ -80,9 +86,7 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =isSmallScreen === true ? 'mb-2 h-14 rounded-2xl' : '',)}>- {- <Search className="absolute left-3 h-4 w-4 text-text-secondary group-focus-within:text-text-primary group-hover:text-text-primary" />- }+ <Search className="absolute left-3 h-4 w-4 text-text-secondary group-focus-within:text-text-primary group-hover:text-text-primary" /><inputtype="text"className="m-0 mr-0 w-full border-none bg-transparent p-0 pl-7 text-sm leading-tight placeholder-text-secondary placeholder-opacity-100 focus-visible:outline-none group-focus-within:placeholder-text-primary group-hover:placeholder-text-primary"diff --git a/client/src/components/Nav/Settings.tsx b/client/src/components/Nav/Settings.tsxindex 77123460ca..8ecae5a572 100644--- a/client/src/components/Nav/Settings.tsx+++ b/client/src/components/Nav/Settings.tsx@@ -47,7 +47,11 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {}};- const settingsTabs: { value: SettingsTabValues; icon: React.JSX.Element; label: TranslationKeys }[] = [+ const settingsTabs: {+ value: SettingsTabValues;+ icon: React.JSX.Element;+ label: TranslationKeys;+ }[] = [{value: SettingsTabValues.GENERAL,icon: <GearIcon />,@@ -144,7 +148,7 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {<line x1="18" x2="6" y1="6" y2="18"></line><line x1="6" x2="18" y1="6" y2="18"></line></svg>- <span className="sr-only">Close</span>+ <span className="sr-only">{localize('com_ui_close')}</span></button></DialogTitle><div className="max-h-[550px] overflow-auto px-6 md:max-h-[400px] md:min-h-[400px] md:w-[680px]">@@ -168,10 +172,10 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {<Tabs.Triggerkey={value}className={cn(- 'group relative z-10 m-1 flex items-center justify-start gap-2 px-2 py-1.5 transition-all duration-200 ease-in-out',+ 'group relative z-10 m-1 flex items-center justify-start gap-2 rounded-xl px-2 py-1.5 transition-all duration-200 ease-in-out',isSmallScreen- ? 'flex-1 justify-center text-nowrap rounded-xl p-1 px-3 text-sm text-text-secondary radix-state-active:bg-surface-hover radix-state-active:text-text-primary'- : 'rounded-md bg-transparent text-text-primary radix-state-active:bg-surface-tertiary',+ ? 'flex-1 justify-center text-nowrap p-1 px-3 text-sm text-text-secondary radix-state-active:bg-surface-hover radix-state-active:text-text-primary'+ : 'bg-transparent text-text-secondary radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary',)}value={value}ref={(el) => (tabRefs.current[value] = el)}diff --git a/client/src/components/Nav/SettingsTabs/Chat/FontSizeSelector.tsx b/client/src/components/Nav/SettingsTabs/Chat/FontSizeSelector.tsxindex b442c86cdc..a8fd26082f 100644--- a/client/src/components/Nav/SettingsTabs/Chat/FontSizeSelector.tsx+++ b/client/src/components/Nav/SettingsTabs/Chat/FontSizeSelector.tsx@@ -30,6 +30,7 @@ export default function FontSizeSelector() {onChange={handleChange}testId="font-size-selector"sizeClasses="w-[150px]"+ className="rounded-xl"/></div>);diff --git a/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx b/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsxindex 2e83f4d2d1..218606f8b7 100644--- a/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx+++ b/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx@@ -1,7 +1,7 @@import { useCallback, useState, useMemo, useEffect } from 'react';import { Link } from 'react-router-dom';import debounce from 'lodash/debounce';-import { TrashIcon, MessageSquare, ArrowUpDown } from 'lucide-react';+import { TrashIcon, MessageSquare, ArrowUpDown, ArrowUp, ArrowDown } from 'lucide-react';import type { SharedLinkItem, SharedLinksListParams } from 'librechat-data-provider';import {OGDialog,@@ -9,10 +9,11 @@ import {OGDialogContent,OGDialogHeader,OGDialogTitle,- Button,TooltipAnchor,+ Button,Label,-} from '~/components/ui';+ Spinner,+} from '~/components';import { useDeleteSharedLinkMutation, useSharedLinksQuery } from '~/data-provider';import OGDialogTemplate from '~/components/ui/OGDialogTemplate';import { useLocalize, useMediaQuery } from '~/hooks';@@ -20,7 +21,6 @@ import DataTable from '~/components/ui/DataTable';import { NotificationSeverity } from '~/common';import { useToastContext } from '~/Providers';import { formatDate } from '~/utils';-import { Spinner } from '~/components/svg';const PAGE_SIZE = 25;@@ -37,6 +37,7 @@ export default function SharedLinks() {const { showToast } = useToastContext();const isSmallScreen = useMediaQuery('(max-width: 768px)');const [queryParams, setQueryParams] = useState<SharedLinksListParams>(DEFAULT_PARAMS);+ const [deleteRow, setDeleteRow] = useState<SharedLinkItem | null>(null);const [isDeleteOpen, setIsDeleteOpen] = useState(false);const [isOpen, setIsOpen] = useState(false);@@ -144,8 +145,6 @@ export default function SharedLinks() {await fetchNextPage();}, [fetchNextPage, hasNextPage, isFetchingNextPage]);- const [deleteRow, setDeleteRow] = useState<SharedLinkItem | null>(null);-const confirmDelete = useCallback(() => {if (deleteRow) {handleDelete([deleteRow]);@@ -157,21 +156,30 @@ export default function SharedLinks() {() => [{accessorKey: 'title',- header: ({ column }) => {+ header: () => {+ const isSorted = queryParams.sortBy === 'title';+ const sortDirection = queryParams.sortDirection;return (<Buttonvariant="ghost"className="px-2 py-0 text-xs hover:bg-surface-hover sm:px-2 sm:py-2 sm:text-sm"- onClick={() => handleSort('title', column.getIsSorted() === 'asc' ? 'desc' : 'asc')}+ onClick={() =>+ handleSort('title', isSorted && sortDirection === 'asc' ? 'desc' : 'asc')+ }>{localize('com_ui_name')}- <ArrowUpDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ {isSorted && sortDirection === 'asc' && (+ <ArrowUp className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ )}+ {isSorted && sortDirection === 'desc' && (+ <ArrowDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ )}+ {!isSorted && <ArrowUpDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />}</Button>);},cell: ({ row }) => {const { title, shareId } = row.original;-return (<div className="flex items-center gap-2"><Link@@ -193,17 +201,25 @@ export default function SharedLinks() {},{accessorKey: 'createdAt',- header: ({ column }) => {+ header: () => {+ const isSorted = queryParams.sortBy === 'createdAt';+ const sortDirection = queryParams.sortDirection;return (<Buttonvariant="ghost"className="px-2 py-0 text-xs hover:bg-surface-hover sm:px-2 sm:py-2 sm:text-sm"onClick={() =>- handleSort('createdAt', column.getIsSorted() === 'asc' ? 'desc' : 'asc')+ handleSort('createdAt', isSorted && sortDirection === 'asc' ? 'desc' : 'asc')}>{localize('com_ui_date')}- <ArrowUpDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ {isSorted && sortDirection === 'asc' && (+ <ArrowUp className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ )}+ {isSorted && sortDirection === 'desc' && (+ <ArrowDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ )}+ {!isSorted && <ArrowUpDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />}</Button>);},@@ -240,7 +256,7 @@ export default function SharedLinks() {<MessageSquare className="size-4" /></Button>}- ></TooltipAnchor>+ /><TooltipAnchordescription={localize('com_ui_delete')}render={@@ -256,12 +272,12 @@ export default function SharedLinks() {<TrashIcon className="size-4" /></Button>}- ></TooltipAnchor>+ /></div>),},],- [isSmallScreen, localize],+ [isSmallScreen, localize, queryParams, handleSort],);return (@@ -291,6 +307,7 @@ export default function SharedLinks() {showCheckboxes={false}onFilterChange={debouncedFilterChange}filterValue={queryParams.search}+ isLoading={isLoading}/></OGDialogContent></OGDialog>diff --git a/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx b/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsxindex ad6d3a6c9e..3904d3d554 100644--- a/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx+++ b/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx@@ -1,15 +1,17 @@-import { useLocalize } from '~/hooks';-import OGDialogTemplate from '~/components/ui/OGDialogTemplate';+import { useState } from 'react';import { OGDialog, OGDialogTrigger, Button } from '~/components';+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';import ArchivedChatsTable from './ArchivedChatsTable';+import { useLocalize } from '~/hooks';export default function ArchivedChats() {const localize = useLocalize();+ const [isOpen, setIsOpen] = useState(false);return (<div className="flex items-center justify-between"><div>{localize('com_nav_archived_chats')}</div>- <OGDialog>+ <OGDialog open={isOpen} onOpenChange={setIsOpen}><OGDialogTrigger asChild><Button variant="outline" aria-label="Archived chats">{localize('com_ui_manage')}@@ -19,7 +21,7 @@ export default function ArchivedChats() {title={localize('com_nav_archived_chats')}className="max-w-[1000px]"showCancelButton={false}- main={<ArchivedChatsTable />}+ main={<ArchivedChatsTable isOpen={isOpen} onOpenChange={setIsOpen} />}/></OGDialog></div>diff --git a/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx b/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsxindex 3b24fe80b6..535548ea5e 100644--- a/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx+++ b/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx@@ -1,287 +1,308 @@-import { useState, useCallback, useMemo } from 'react';+import { useState, useCallback, useMemo, useEffect } from 'react';+import debounce from 'lodash/debounce';+import { TrashIcon, ArchiveRestore, ArrowUp, ArrowDown, ArrowUpDown } from 'lucide-react';+import type { ConversationListParams, TConversation } from 'librechat-data-provider';import {- Search,- TrashIcon,- ChevronLeft,- ChevronRight,- // ChevronsLeft,- // ChevronsRight,- MessageCircle,- ArchiveRestore,-} from 'lucide-react';-import type { TConversation } from 'librechat-data-provider';-import {- Table,- Input,Button,- TableRow,- Skeleton,OGDialog,- Separator,- TableCell,- TableBody,- TableHead,- TableHeader,+ OGDialogContent,+ OGDialogHeader,+ OGDialogTitle,+ Label,TooltipAnchor,- OGDialogTrigger,+ Spinner,} from '~/components';-import { useConversationsInfiniteQuery, useArchiveConvoMutation } from '~/data-provider';-import { DeleteConversationDialog } from '~/components/Conversations/ConvoOptions';-import { useAuthContext, useLocalize, useMediaQuery } from '~/hooks';-import { cn } from '~/utils';+import {+ useArchiveConvoMutation,+ useConversationsInfiniteQuery,+ useDeleteConversationMutation,+} from '~/data-provider';+import { useLocalize, useMediaQuery } from '~/hooks';+import { MinimalIcon } from '~/components/Endpoints';+import DataTable from '~/components/ui/DataTable';+import { NotificationSeverity } from '~/common';+import { useToastContext } from '~/Providers';+import { formatDate } from '~/utils';-export default function ArchivedChatsTable() {+const DEFAULT_PARAMS: ConversationListParams = {+ isArchived: true,+ sortBy: 'createdAt',+ sortDirection: 'desc',+ search: '',+};++export default function ArchivedChatsTable({+ onOpenChange,+}: {+ onOpenChange: (isOpen: boolean) => void;+}) {const localize = useLocalize();- const { isAuthenticated } = useAuthContext();const isSmallScreen = useMediaQuery('(max-width: 768px)');- const [isOpened, setIsOpened] = useState(false);- const [currentPage, setCurrentPage] = useState(1);- const [searchQuery, setSearchQuery] = useState('');+ const { showToast } = useToastContext();- const { data, isLoading, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } =- useConversationsInfiniteQuery(- { pageNumber: currentPage.toString(), isArchived: true },- { enabled: isAuthenticated && isOpened },- );- const mutation = useArchiveConvoMutation();- const handleUnarchive = useCallback(- (conversationId: string) => {- mutation.mutate({ conversationId, isArchived: false });- },- [mutation],- );+ const [isDeleteOpen, setIsDeleteOpen] = useState(false);+ const [queryParams, setQueryParams] = useState<ConversationListParams>(DEFAULT_PARAMS);+ const [deleteConversation, setDeleteConversation] = useState<TConversation | null>(null);- const conversations = useMemo(- () => data?.pages[currentPage - 1]?.conversations ?? [],- [data, currentPage],- );- const totalPages = useMemo(() => Math.ceil(Number(data?.pages[0].pages ?? 1)) ?? 1, [data]);+ const { data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch, isLoading } =+ useConversationsInfiniteQuery(queryParams, {+ staleTime: 0,+ cacheTime: 5 * 60 * 1000,+ refetchOnWindowFocus: false,+ refetchOnMount: false,+ });- const handleChatClick = useCallback((conversationId: string) => {- if (!conversationId) {- return;- }- window.open(`/c/${conversationId}`, '_blank');+ const handleSort = useCallback((sortField: string, sortOrder: 'asc' | 'desc') => {+ setQueryParams((prev) => ({+ ...prev,+ sortBy: sortField as 'title' | 'createdAt',+ sortDirection: sortOrder,+ }));}, []);- const handlePageChange = useCallback(- (newPage: number) => {- setCurrentPage(newPage);- if (!(hasNextPage ?? false)) {- return;- }- fetchNextPage({ pageParam: newPage });- },- [fetchNextPage, hasNextPage],+ const handleFilterChange = useCallback((value: string) => {+ const encodedValue = encodeURIComponent(value.trim());+ setQueryParams((prev) => ({+ ...prev,+ search: encodedValue,+ }));+ }, []);++ const debouncedFilterChange = useMemo(+ () => debounce(handleFilterChange, 300),+ [handleFilterChange],);- const handleSearch = useCallback((query: string) => {- setSearchQuery(query);- setCurrentPage(1);- }, []);+ useEffect(() => {+ return () => {+ debouncedFilterChange.cancel();+ };+ }, [debouncedFilterChange]);- const getRandomWidth = () => Math.floor(Math.random() * (400 - 170 + 1)) + 170;+ const allConversations = useMemo(() => {+ if (!data?.pages) {+ return [];+ }+ return data.pages.flatMap((page) => page?.conversations?.filter(Boolean) ?? []);+ }, [data?.pages]);- const skeletons = Array.from({ length: 11 }, (_, index) => {- const randomWidth = getRandomWidth();- return (- <div key={index} className="flex h-10 w-full items-center">- <div className="flex w-[410px] items-center">- <Skeleton className="h-4" style={{ width: `${randomWidth}px` }} />- </div>- <div className="flex flex-grow justify-center">- <Skeleton className="h-4 w-28" />- </div>- <div className="mr-2 flex justify-end">- <Skeleton className="h-4 w-12" />- </div>- </div>- );+ const deleteMutation = useDeleteConversationMutation({+ onSuccess: async () => {+ setIsDeleteOpen(false);+ await refetch();+ },+ onError: (error: unknown) => {+ showToast({+ message: localize('com_ui_archive_delete_error') as string,+ severity: NotificationSeverity.ERROR,+ });+ },});- if (isLoading || isFetchingNextPage) {- return <div className="text-text-secondary">{skeletons}</div>;- }+ const unarchiveMutation = useArchiveConvoMutation({+ onSuccess: async () => {+ await refetch();+ },+ onError: (error: unknown) => {+ showToast({+ message: localize('com_ui_unarchive_error') as string,+ severity: NotificationSeverity.ERROR,+ });+ },+ });- if (!data || (conversations.length === 0 && totalPages === 0)) {- return <div className="text-text-secondary">{localize('com_nav_archived_chats_empty')}</div>;- }+ const handleFetchNextPage = useCallback(async () => {+ if (!hasNextPage || isFetchingNextPage) {+ return;+ }+ await fetchNextPage();+ }, [fetchNextPage, hasNextPage, isFetchingNextPage]);- return (- <div- className={cn(- 'grid w-full gap-2',- 'flex-1 flex-col overflow-y-auto pr-2 transition-opacity duration-500',- 'max-h-[629px]',- )}- onMouseEnter={() => setIsOpened(true)}- >- <div className="flex items-center">- <Search className="size-4 text-text-secondary" />- <Input- type="text"- placeholder={localize('com_nav_search_placeholder')}- value={searchQuery}- onChange={(e) => handleSearch(e.target.value)}- className="w-full border-none placeholder:text-text-secondary"- />- </div>- <Separator />- {conversations.length === 0 ? (- <div className="mt-4 text-text-secondary">{localize('com_nav_no_search_results')}</div>- ) : (- <>- <Table>- <TableHeader>- <TableRow>- <TableHead className={cn('p-4', isSmallScreen ? 'w-[70%]' : 'w-[50%]')}>- {localize('com_nav_archive_name')}- </TableHead>- {!isSmallScreen && (- <TableHead className="w-[35%] p-1">- {localize('com_nav_archive_created_at')}- </TableHead>- )}- <TableHead className={cn('p-1 text-right', isSmallScreen ? 'w-[30%]' : 'w-[15%]')}>- {localize('com_assistants_actions')}- </TableHead>- </TableRow>- </TableHeader>- <TableBody>- {conversations.map((conversation: TConversation) => (- <TableRow key={conversation.conversationId} className="hover:bg-transparent">- <TableCell className="py-3 text-text-primary">- <button- type="button"- className="flex max-w-full"- aria-label="Open conversation in a new tab"- onClick={() => {- const conversationId = conversation.conversationId ?? '';- if (!conversationId) {- return;- }- handleChatClick(conversationId);- }}- >- <MessageCircle className="mr-1 h-5 min-w-[20px]" />- <u className="truncate">{conversation.title}</u>- </button>- </TableCell>- {!isSmallScreen && (- <TableCell className="p-1">- <div className="flex justify-between">- <div className="flex justify-start text-text-secondary">- {new Date(conversation.createdAt).toLocaleDateString('en-US', {- month: 'short',- day: 'numeric',- year: 'numeric',- })}- </div>- </div>- </TableCell>- )}- <TableCell- className={cn(- 'flex items-center gap-1 p-1',- isSmallScreen ? 'justify-end' : 'justify-end gap-2',+ const columns = useMemo(+ () => [+ {+ accessorKey: 'title',+ header: () => {+ const isSorted = queryParams.sortBy === 'title';+ const sortDirection = queryParams.sortDirection;+ return (+ <Button+ variant="ghost"+ className="px-2 py-0 text-xs hover:bg-surface-hover sm:px-2 sm:py-2 sm:text-sm"+ onClick={() =>+ handleSort('title', isSorted && sortDirection === 'asc' ? 'desc' : 'asc')+ }+ >+ {localize('com_nav_archive_name')}+ {isSorted && sortDirection === 'asc' && (+ <ArrowUp className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ )}+ {isSorted && sortDirection === 'desc' && (+ <ArrowDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ )}+ {!isSorted && <ArrowUpDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />}+ </Button>+ );+ },+ cell: ({ row }) => {+ const { conversationId, title } = row.original;+ return (+ <button+ type="button"+ className="flex items-center gap-2 truncate"+ onClick={() => window.open(`/c/${conversationId}`, '_blank')}+ >+ <MinimalIcon+ endpoint={row.original.endpoint}+ size={28}+ isCreatedByUser={false}+ iconClassName="size-4"+ />+ <span className="underline">{title}</span>+ </button>+ );+ },+ meta: {+ size: isSmallScreen ? '70%' : '50%',+ mobileSize: '70%',+ },+ },+ {+ accessorKey: 'createdAt',+ header: () => {+ const isSorted = queryParams.sortBy === 'createdAt';+ const sortDirection = queryParams.sortDirection;+ return (+ <Button+ variant="ghost"+ className="px-2 py-0 text-xs hover:bg-surface-hover sm:px-2 sm:py-2 sm:text-sm"+ onClick={() =>+ handleSort('createdAt', isSorted && sortDirection === 'asc' ? 'desc' : 'asc')+ }+ >+ {localize('com_nav_archive_created_at')}+ {isSorted && sortDirection === 'asc' && (+ <ArrowUp className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ )}+ {isSorted && sortDirection === 'desc' && (+ <ArrowDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />+ )}+ {!isSorted && <ArrowUpDown className="ml-2 h-3 w-4 sm:h-4 sm:w-4" />}+ </Button>+ );+ },+ cell: ({ row }) => formatDate(row.original.createdAt?.toString() ?? '', isSmallScreen),+ meta: {+ size: isSmallScreen ? '30%' : '35%',+ mobileSize: '30%',+ },+ },+ {+ accessorKey: 'actions',+ header: () => (+ <Label className="px-2 py-0 text-xs sm:px-2 sm:py-2 sm:text-sm">+ {localize('com_assistants_actions')}+ </Label>+ ),+ cell: ({ row }) => {+ const conversation = row.original;+ return (+ <div className="flex items-center gap-2">+ <TooltipAnchor+ description={localize('com_ui_unarchive')}+ render={+ <Button+ variant="ghost"+ className="h-8 w-8 p-0 hover:bg-surface-hover"+ onClick={() =>+ unarchiveMutation.mutate({+ conversationId: conversation.conversationId,+ isArchived: false,+ })+ }+ title={localize('com_ui_unarchive')}+ disabled={unarchiveMutation.isLoading}+ >+ {unarchiveMutation.isLoading ? (+ <Spinner />+ ) : (+ <ArchiveRestore className="size-4" />)}+ </Button>+ }+ />+ <TooltipAnchor+ description={localize('com_ui_delete')}+ render={+ <Button+ variant="ghost"+ className="h-8 w-8 p-0 hover:bg-surface-hover"+ onClick={() => {+ setDeleteConversation(row.original);+ setIsDeleteOpen(true);+ }}+ title={localize('com_ui_delete')}>- <TooltipAnchor- description={localize('com_ui_unarchive')}- render={- <Button- type="button"- aria-label="Unarchive conversation"- variant="ghost"- size="icon"- className={cn('size-8', isSmallScreen && 'size-7')}- onClick={() => {- const conversationId = conversation.conversationId ?? '';- if (!conversationId) {- return;- }- handleUnarchive(conversationId);- }}- >- <ArchiveRestore className={cn('size-4', isSmallScreen && 'size-3.5')} />- </Button>- }- />+ <TrashIcon className="size-4" />+ </Button>+ }+ />+ </div>+ );+ },+ meta: {+ size: '15%',+ mobileSize: '25%',+ },+ },+ ],+ [handleSort, isSmallScreen, localize, queryParams, unarchiveMutation],+ );- <OGDialog>- <OGDialogTrigger asChild>- <TooltipAnchor- description={localize('com_ui_delete')}- render={- <Button- type="button"- aria-label="Delete archived conversation"- variant="ghost"- size="icon"- className={cn('size-8', isSmallScreen && 'size-7')}- >- <TrashIcon className={cn('size-4', isSmallScreen && 'size-3.5')} />- </Button>- }- />- </OGDialogTrigger>- <DeleteConversationDialog- conversationId={conversation.conversationId ?? ''}- retainView={refetch}- title={conversation.title ?? ''}- />- </OGDialog>- </TableCell>- </TableRow>- ))}- </TableBody>- </Table>+ return (+ <>+ <DataTable+ columns={columns}+ data={allConversations}+ filterColumn="title"+ onFilterChange={debouncedFilterChange}+ filterValue={queryParams.search}+ fetchNextPage={handleFetchNextPage}+ hasNextPage={hasNextPage}+ isFetchingNextPage={isFetchingNextPage}+ isLoading={isLoading}+ showCheckboxes={false}+ manualSorting={true} // Ensures server-side sorting+ />- <div className="flex items-center justify-end gap-6 px-2 py-4">- <div className="text-sm font-bold text-text-primary">- {localize('com_ui_page')} {currentPage} {localize('com_ui_of')} {totalPages}- </div>- <div className="flex space-x-2">- {/* <Button- variant="outline"- size="icon"- aria-label="Go to the previous 10 pages"- onClick={() => handlePageChange(Math.max(currentPage - 10, 1))}- disabled={currentPage === 1}- >- <ChevronsLeft className="size-4" />- </Button> */}- <Button- variant="outline"- size="icon"- aria-label="Go to the previous page"- onClick={() => handlePageChange(Math.max(currentPage - 1, 1))}- disabled={currentPage === 1}- >- <ChevronLeft className="size-4" />- </Button>- <Button- variant="outline"- size="icon"- aria-label="Go to the next page"- onClick={() => handlePageChange(Math.min(currentPage + 1, totalPages))}- disabled={currentPage === totalPages}- >- <ChevronRight className="size-4" />- </Button>- {/* <Button- variant="outline"- size="icon"- aria-label="Go to the next 10 pages"- onClick={() => handlePageChange(Math.min(currentPage + 10, totalPages))}- disabled={currentPage === totalPages}- >- <ChevronsRight className="size-4" />- </Button> */}- </div>+ <OGDialog open={isDeleteOpen} onOpenChange={onOpenChange}>+ <OGDialogContent+ title={localize('com_ui_delete_confirm') + ' ' + (deleteConversation?.title ?? '')}+ className="w-11/12 max-w-md"+ >+ <OGDialogHeader>+ <OGDialogTitle>+ {localize('com_ui_delete_confirm')} <strong>{deleteConversation?.title}</strong>+ </OGDialogTitle>+ </OGDialogHeader>+ <div className="flex justify-end gap-4 pt-4">+ <Button aria-label="cancel" variant="outline" onClick={() => setIsDeleteOpen(false)}>+ {localize('com_ui_cancel')}+ </Button>+ <Button+ variant="destructive"+ onClick={() =>+ deleteMutation.mutate({+ conversationId: deleteConversation?.conversationId ?? '',+ })+ }+ disabled={deleteMutation.isLoading}+ >+ {deleteMutation.isLoading ? <Spinner /> : localize('com_ui_delete')}+ </Button></div>- </>- )}- </div>+ </OGDialogContent>+ </OGDialog>+ </>);}diff --git a/client/src/components/Nav/SettingsTabs/General/General.tsx b/client/src/components/Nav/SettingsTabs/General/General.tsxindex 340219e74d..a49eaa4528 100644--- a/client/src/components/Nav/SettingsTabs/General/General.tsx+++ b/client/src/components/Nav/SettingsTabs/General/General.tsx@@ -59,6 +59,7 @@ export const ThemeSelector = ({options={themeOptions}sizeClasses="w-[180px]"testId="theme-selector"+ className="rounded-xl"/></div>);@@ -112,6 +113,7 @@ export const LangSelector = ({onChange={onChange}sizeClasses="[--anchor-max-height:256px]"options={languageOptions}+ className="rounded-xl"/></div>);diff --git a/client/src/components/Nav/SettingsTabs/Speech/STT/EngineSTTDropdown.tsx b/client/src/components/Nav/SettingsTabs/Speech/STT/EngineSTTDropdown.tsxindex 0f59c85d49..c63145f0ca 100644--- a/client/src/components/Nav/SettingsTabs/Speech/STT/EngineSTTDropdown.tsx+++ b/client/src/components/Nav/SettingsTabs/Speech/STT/EngineSTTDropdown.tsx@@ -32,6 +32,7 @@ const EngineSTTDropdown: React.FC<EngineSTTDropdownProps> = ({ external }) => {options={endpointOptions}sizeClasses="w-[180px]"testId="EngineSTTDropdown"+ className="rounded-xl"/></div>);diff --git a/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx b/client/src/components/Nav/SettingsTabs/Speech/Speech.tsxindex 137c449383..11743cb0ed 100644--- a/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx+++ b/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx@@ -20,12 +20,14 @@ import {EngineSTTDropdown,DecibelSelector,} from './STT';+import { useOnClickOutside, useMediaQuery, useLocalize } from '~/hooks';import ConversationModeSwitch from './ConversationModeSwitch';-import { useOnClickOutside, useMediaQuery } from '~/hooks';import { cn, logger } from '~/utils';import store from '~/store';function Speech() {+ const localize = useLocalize();+const [confirmClear, setConfirmClear] = useState(false);const { data } = useGetCustomConfigSpeechQuery();const isSmallScreen = useMediaQuery('(max-width: 767px)');@@ -158,7 +160,7 @@ function Speech() {style={{ userSelect: 'none' }}><Lightbulb />- Simple+ {localize('com_ui_simple')}</Tabs.Trigger><Tabs.TriggeronClick={() => setAdvancedMode(true)}@@ -171,7 +173,7 @@ function Speech() {style={{ userSelect: 'none' }}><Cog />- Advanced+ {localize('com_ui_advanced')}</Tabs.Trigger></Tabs.List></div>diff --git a/client/src/components/Nav/SettingsTabs/Speech/TTS/EngineTTSDropdown.tsx b/client/src/components/Nav/SettingsTabs/Speech/TTS/EngineTTSDropdown.tsxindex 7d8a9f5755..eb85c942e6 100644--- a/client/src/components/Nav/SettingsTabs/Speech/TTS/EngineTTSDropdown.tsx+++ b/client/src/components/Nav/SettingsTabs/Speech/TTS/EngineTTSDropdown.tsx@@ -33,6 +33,7 @@ const EngineTTSDropdown: React.FC<EngineTTSDropdownProps> = ({ external }) => {sizeClasses="w-[180px]"anchor="bottom start"testId="EngineTTSDropdown"+ className="rounded-xl"/></div>);diff --git a/client/src/components/ui/DataTable.tsx b/client/src/components/ui/DataTable.tsxindex 9a6d99b72c..7fda04d1d5 100644--- a/client/src/components/ui/DataTable.tsx+++ b/client/src/components/ui/DataTable.tsx@@ -1,4 +1,5 @@import React, { useCallback, useEffect, useRef, useState, memo, useMemo } from 'react';+import { useRecoilValue } from 'recoil';import { useVirtualizer } from '@tanstack/react-virtual';import {Row,@@ -23,11 +24,13 @@ import {TableHead,TableHeader,AnimatedSearchInput,+ Skeleton,} from './';import { TrashIcon, Spinner } from '~/components/svg';import { useLocalize, useMediaQuery } from '~/hooks';-import { cn } from '~/utils';import { LocalizeFunction } from '~/common';+import { cn } from '~/utils';+import store from '~/store';type TableColumn<TData, TValue> = ColumnDef<TData, TValue> & {meta?: {@@ -77,6 +80,7 @@ interface DataTableProps<TData, TValue> {showCheckboxes?: boolean;onFilterChange?: (value: string) => void;filterValue?: string;+ isLoading?: boolean;}const TableRowComponent = <TData, TValue>({@@ -103,17 +107,11 @@ const TableRowComponent = <TData, TValue>({return (<TableRowdata-state={row.getIsSelected() ? 'selected' : undefined}- className={`- motion-safe:animate-fadeIn border-b- border-border-light transition-all duration-300- ease-out- hover:bg-surface-secondary- ${isSearching ? 'opacity-50' : 'opacity-100'}- ${isSearching ? 'scale-98' : 'scale-100'}- `}+ className="motion-safe:animate-fadeIn border-b border-border-light transition-all duration-300 ease-out hover:bg-surface-secondary"style={{animationDelay: `${index * 20}ms`,transform: `translateY(${isSearching ? '4px' : '0'})`,+ opacity: isSearching ? 0.5 : 1,}}>{row.getVisibleCells().map((cell) => {@@ -132,12 +130,7 @@ const TableRowComponent = <TData, TValue>({return (<TableCellkey={cell.id}- className={`- w-0 max-w-0 px-2 py-1 align-middle text-xs- transition-all duration-300 sm:px-4- sm:py-2 sm:text-sm- ${isSearching ? 'blur-[0.3px]' : 'blur-0'}- `}+ className="w-0 max-w-0 px-2 py-1 align-middle text-xs transition-all duration-300 sm:px-4 sm:py-2 sm:text-sm"style={getColumnStyle(cell.column.columnDef as TableColumn<TData, TValue>,isSmallScreen,@@ -178,7 +171,7 @@ const DeleteButton = memo(isDeleting: boolean;disabled: boolean;isSmallScreen: boolean;- localize:LocalizeFunction;+ localize: LocalizeFunction;}) => {if (!onDelete) {return null;@@ -217,12 +210,14 @@ export default function DataTable<TData, TValue>({showCheckboxes = true,onFilterChange,filterValue,+ isLoading,}: DataTableProps<TData, TValue>) {const localize = useLocalize();const isSmallScreen = useMediaQuery('(max-width: 768px)');const tableContainerRef = useRef<HTMLDivElement>(null);- const [isDeleting, setIsDeleting] = useState(false);+ const [isDeleting, setIsDeleting] = useState(false);+ const isSearchEnabled = useRecoilValue(store.isSearchEnabled);const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({});const [sorting, setSorting] = useState<SortingState>(defaultSort);const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);@@ -342,10 +337,35 @@ export default function DataTable<TData, TValue>({}}, [onDelete, table]);+ const getRandomWidth = () => Math.floor(Math.random() * (410 - 170 + 1)) + 170;++ const skeletons = Array.from({ length: 13 }, (_, index) => {+ const randomWidth = getRandomWidth();+ const firstDataColumnIndex = tableColumns[0]?.id === 'select' ? 1 : 0;++ return (+ <TableRow key={index} className="motion-safe:animate-fadeIn border-b border-border-light">+ {tableColumns.map((column, columnIndex) => {+ const style = getColumnStyle(column as TableColumn<TData, TValue>, isSmallScreen);+ const isFirstDataColumn = columnIndex === firstDataColumnIndex;++ return (+ <TableCell key={column.id} className="px-2 py-1 sm:px-4 sm:py-2" style={style}>+ <Skeleton+ className="h-6"+ style={isFirstDataColumn ? { width: `${randomWidth}px` } : { width: '100%' }}+ />+ </TableCell>+ );+ })}+ </TableRow>+ );+ });+return (<div className={cn('flex h-full flex-col gap-4', className)}>{/* Table controls */}- <div className="flex flex-wrap items-center gap-2 py-2 sm:gap-4 sm:py-4">+ <div className="flex flex-wrap items-center gap-2 sm:gap-4">{enableRowSelection && showCheckboxes && (<DeleteButtononDelete={handleDelete}@@ -355,7 +375,7 @@ export default function DataTable<TData, TValue>({localize={localize}/>)}- {filterColumn !== undefined && table.getColumn(filterColumn) && (+ {filterColumn !== undefined && table.getColumn(filterColumn) && isSearchEnabled && (<div className="relative flex-1"><AnimatedSearchInputvalue={searchTerm}@@ -411,6 +431,8 @@ export default function DataTable<TData, TValue>({</tr>)}+ {isLoading && skeletons}+{virtualRows.map((virtualRow) => {const row = rows[virtualRow.index];return (diff --git a/client/src/data-provider/Tools/queries.ts b/client/src/data-provider/Tools/queries.tsindex e438e3d53e..1aea8e9f5a 100644--- a/client/src/data-provider/Tools/queries.ts+++ b/client/src/data-provider/Tools/queries.ts@@ -34,6 +34,7 @@ export const useGetToolCalls = <TData = t.ToolCallResults>(enabled:conversationId.length > 0 &&conversationId !== Constants.NEW_CONVO &&+ conversationId !== Constants.PENDING_CONVO &&conversationId !== Constants.SEARCH,...config,},diff --git a/client/src/data-provider/mutations.ts b/client/src/data-provider/mutations.tsindex fb772f7a0d..c82db6e28b 100644--- a/client/src/data-provider/mutations.ts+++ b/client/src/data-provider/mutations.ts@@ -7,19 +7,16 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';import { dataService, MutationKeys, QueryKeys, defaultOrderQuery } from 'librechat-data-provider';import type { InfiniteData, UseMutationResult } from '@tanstack/react-query';import type * as t from 'librechat-data-provider';-import { useConversationTagsQuery, useConversationsInfiniteQuery } from './queries';-import useUpdateTagsInConvo from '~/hooks/Conversations/useUpdateTagsInConvo';-import { updateConversationTag } from '~/utils/conversationTags';-import { normalizeData } from '~/utils/collection';import {logger,/* Conversations */- addConversation,- updateConvoFields,- updateConversation,- deleteConversation,- clearConversationStorage,+ addConvoToAllQueries,+ updateConvoInAllQueries,+ removeConvoFromAllQueries,} from '~/utils';+import useUpdateTagsInConvo from '~/hooks/Conversations/useUpdateTagsInConvo';+import { updateConversationTag } from '~/utils/conversationTags';+import { useConversationTagsQuery } from './queries';export type TGenTitleMutation = UseMutationResult<t.TGenTitleResponse,@@ -28,29 +25,19 @@ export type TGenTitleMutation = UseMutationResult<unknown>;-/** Conversations */export const useGenTitleMutation = (): TGenTitleMutation => {const queryClient = useQueryClient();return useMutation((payload: t.TGenTitleRequest) => dataService.genTitle(payload), {onSuccess: (response, vars) => {queryClient.setQueryData([QueryKeys.conversation, vars.conversationId],- (convo: t.TConversation | undefined) => {- if (!convo) {- return convo;- }- return { ...convo, title: response.title };- },+ (convo: t.TConversation | undefined) =>+ convo ? { ...convo, title: response.title } : convo,);- queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- return updateConvoFields(convoData, {- conversationId: vars.conversationId,- title: response.title,- } as t.TConversation);- });+ updateConvoInAllQueries(queryClient, vars.conversationId, (c) => ({+ ...c,+ title: response.title,+ }));document.title = response.title;},});@@ -70,20 +57,12 @@ export const useUpdateConversationMutation = ({onSuccess: (updatedConvo) => {queryClient.setQueryData([QueryKeys.conversation, id], updatedConvo);- queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- return updateConversation(convoData, updatedConvo);- });+ updateConvoInAllQueries(queryClient, id, () => updatedConvo);},},);};-/**- * Add or remove tags for a conversation- */export const useTagConversationMutation = (conversationId: string,options?: t.updateTagsInConvoOptions,@@ -95,12 +74,8 @@ export const useTagConversationMutation = (dataService.addTagToConversation(conversationId, payload),{onSuccess: (updatedTags, ...rest) => {- // Because the logic for calculating the bookmark count is complex,- // the client does not perform the calculation,- // but instead refetch the data from the API.query.refetch();updateTagsInConversation(conversationId, updatedTags);-options?.onSuccess?.(updatedTags, ...rest);},onError: options?.onError,@@ -109,8 +84,8 @@ export const useTagConversationMutation = ();};-export const useArchiveConversationMutation = (- id: string,+export const useArchiveConvoMutation = (+ options?: t.ArchiveConversationOptions,): UseMutationResult<t.TArchiveConversationResponse,unknown,@@ -118,118 +93,73 @@ export const useArchiveConversationMutation = (unknown> => {const queryClient = useQueryClient();- const { refetch } = useConversationsInfiniteQuery();- const { refetch: archiveRefetch } = useConversationsInfiniteQuery({- pageNumber: '1', // dummy value not used to refetch- isArchived: true,- });+ const convoQueryKey = [QueryKeys.allConversations];+ const archivedConvoQueryKey = [QueryKeys.archivedConversations];+ const { onMutate, onError, onSettled, onSuccess, ..._options } = options || {};+return useMutation((payload: t.TArchiveConversationRequest) => dataService.archiveConversation(payload),{- onSuccess: (_data, vars) => {+ onMutate,+ onSuccess: (_data, vars, context) => {const isArchived = vars.isArchived === true;- if (isArchived) {- queryClient.setQueryData([QueryKeys.conversation, id], null);- } else {- queryClient.setQueryData([QueryKeys.conversation, id], _data);- }- queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- const pageSize = convoData.pages[0].pageSize as number;+ removeConvoFromAllQueries(queryClient, vars.conversationId);- return normalizeData(- isArchived ? deleteConversation(convoData, id) : addConversation(convoData, _data),- 'conversations',- pageSize,- );- });+ const archivedQueries = queryClient+ .getQueryCache()+ .findAll([QueryKeys.archivedConversations], { exact: false });- if (isArchived) {- const current = queryClient.getQueryData<t.ConversationData>([- QueryKeys.allConversations,- ]);- refetch({ refetchPage: (page, index) => index === (current?.pages.length ?? 1) - 1 });+ for (const query of archivedQueries) {+ queryClient.setQueryData<InfiniteData<ConversationListResponse>>(+ query.queryKey,+ (oldData) => {+ if (!oldData) {+ return oldData;+ }+ if (isArchived) {+ return {+ ...oldData,+ pages: [+ {+ ...oldData.pages[0],+ conversations: [_data, ...oldData.pages[0].conversations],+ },+ ...oldData.pages.slice(1),+ ],+ };+ } else {+ return {+ ...oldData,+ pages: oldData.pages.map((page) => ({+ ...page,+ conversations: page.conversations.filter(+ (conv) => conv.conversationId !== vars.conversationId,+ ),+ })),+ };+ }+ },+ );}- queryClient.setQueryData<t.ConversationData>(- [QueryKeys.archivedConversations],- (convoData) => {- if (!convoData) {- return convoData;- }- const pageSize = convoData.pages[0].pageSize as number;- return normalizeData(- isArchived ? addConversation(convoData, _data) : deleteConversation(convoData, id),- 'conversations',- pageSize,- );- },+ queryClient.setQueryData(+ [QueryKeys.conversation, vars.conversationId],+ isArchived ? null : _data,);- if (!isArchived) {- const currentArchive = queryClient.getQueryData<t.ConversationData>([- QueryKeys.archivedConversations,- ]);- archiveRefetch({- refetchPage: (page, index) => index === (currentArchive?.pages.length ?? 1) - 1,- });- }+ onSuccess?.(_data, vars, context);},- },- );-};--export const useArchiveConvoMutation = (options?: t.ArchiveConvoOptions) => {- const queryClient = useQueryClient();- const { onSuccess, ..._options } = options ?? {};-- return useMutation<t.TArchiveConversationResponse, unknown, t.TArchiveConversationRequest>(- (payload: t.TArchiveConversationRequest) => dataService.archiveConversation(payload),- {- onSuccess: (_data, vars) => {- const { conversationId } = vars;- const isArchived = vars.isArchived === true;- if (isArchived) {- queryClient.setQueryData([QueryKeys.conversation, conversationId], null);- } else {- queryClient.setQueryData([QueryKeys.conversation, conversationId], _data);- }-- queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- const pageSize = convoData.pages[0].pageSize as number;- return normalizeData(- isArchived- ? deleteConversation(convoData, conversationId)- : addConversation(convoData, _data),- 'conversations',- pageSize,- );+ onError,+ onSettled: () => {+ queryClient.invalidateQueries({+ queryKey: convoQueryKey,+ refetchPage: (_, index) => index === 0,+ });+ queryClient.invalidateQueries({+ queryKey: archivedConvoQueryKey,+ refetchPage: (_, index) => index === 0,});-- queryClient.setQueryData<t.ConversationData>(- [QueryKeys.archivedConversations],- (convoData) => {- if (!convoData) {- return convoData;- }- const pageSize = convoData.pages[0].pageSize as number;- return normalizeData(- isArchived- ? addConversation(convoData, _data)- : deleteConversation(convoData, conversationId),- 'conversations',- pageSize,- );- },- );-- onSuccess?.(_data, vars);},..._options,},@@ -457,20 +387,21 @@ export const useDeleteTagInConversations = () => {QueryKeys.allConversations,]);- const conversationIdsWithTag = [] as string[];+ const conversationIdsWithTag: string[] = [];- // remove deleted tag from conversations+ // Remove deleted tag from conversationsconst newData = JSON.parse(JSON.stringify(data)) as InfiniteData<ConversationListResponse>;for (let pageIndex = 0; pageIndex < newData.pages.length; pageIndex++) {const page = newData.pages[pageIndex];page.conversations = page.conversations.map((conversation) => {if (- conversation.conversationId != null &&conversation.conversationId &&- conversation.tags?.includes(deletedTag) === true+ 'tags' in conversation &&+ Array.isArray(conversation.tags) &&+ conversation.tags.includes(deletedTag)) {conversationIdsWithTag.push(conversation.conversationId);- conversation.tags = conversation.tags.filter((t) => t !== deletedTag);+ conversation.tags = conversation.tags.filter((tag: string) => tag !== deletedTag);}return conversation;});@@ -487,8 +418,8 @@ export const useDeleteTagInConversations = () => {QueryKeys.conversation,conversationId,]);- if (conversationData && conversationData.tags) {- conversationData.tags = conversationData.tags.filter((t) => t !== deletedTag);+ if (conversationData && 'tags' in conversationData && Array.isArray(conversationData.tags)) {+ conversationData.tags = conversationData.tags.filter((tag: string) => tag !== deletedTag);queryClient.setQueryData<t.TConversation>([QueryKeys.conversation, conversationId],conversationData,@@ -498,7 +429,7 @@ export const useDeleteTagInConversations = () => {};return deleteTagInAllConversation;};-// Delete a tag+export const useDeleteConversationTagMutation = (options?: t.DeleteConversationTagOptions,): UseMutationResult<t.TConversationTagResponse, unknown, string, void> => {@@ -532,40 +463,67 @@ export const useDeleteConversationMutation = (unknown> => {const queryClient = useQueryClient();- const { refetch } = useConversationsInfiniteQuery();- const { onSuccess, ..._options } = options || {};+return useMutation(- (payload: t.TDeleteConversationRequest) => dataService.deleteConversation(payload),+ (payload: t.TDeleteConversationRequest) =>+ dataService.deleteConversation(payload) as Promise<t.TDeleteConversationResponse>,{- onSuccess: (_data, vars, context) => {- const conversationId = vars.conversationId ?? '';- if (!conversationId) {- return;+ onMutate: async () => {+ await queryClient.cancelQueries([QueryKeys.allConversations]);+ await queryClient.cancelQueries([QueryKeys.archivedConversations]);+ // could store old state if needed for rollback+ },+ onError: () => {+ // TODO: CHECK THIS, no-op; restore if needed+ },+ onSuccess: (data, vars, context) => {+ if (vars.conversationId) {+ removeConvoFromAllQueries(queryClient, vars.conversationId);}- const handleDelete = (convoData: t.ConversationData | undefined) => {- if (!convoData) {- return convoData;- }- return normalizeData(- deleteConversation(convoData, conversationId),- 'conversations',- Number(convoData.pages[0].pageSize),+ // Also remove from all archivedConversations caches+ const archivedQueries = queryClient+ .getQueryCache()+ .findAll([QueryKeys.archivedConversations], { exact: false });++ for (const query of archivedQueries) {+ queryClient.setQueryData<InfiniteData<ConversationListResponse>>(+ query.queryKey,+ (oldData) => {+ if (!oldData) {+ return oldData;+ }+ return {+ ...oldData,+ pages: oldData.pages+ .map((page) => ({+ ...page,+ conversations: page.conversations.filter(+ (conv) => conv.conversationId !== vars.conversationId,+ ),+ }))+ .filter((page) => page.conversations.length > 0),+ };+ },);- };+ }- queryClient.setQueryData([QueryKeys.conversation, conversationId], null);- queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], handleDelete);- queryClient.setQueryData<t.ConversationData>(- [QueryKeys.archivedConversations],- handleDelete,- );- const current = queryClient.getQueryData<t.ConversationData>([QueryKeys.allConversations]);- refetch({ refetchPage: (page, index) => index === (current?.pages.length ?? 1) - 1 });- onSuccess?.(_data, vars, context);- clearConversationStorage(conversationId);+ queryClient.removeQueries({+ queryKey: [QueryKeys.conversation, vars.conversationId],+ exact: true,+ });++ queryClient.invalidateQueries({+ queryKey: [QueryKeys.allConversations],+ refetchPage: (_, index) => index === 0,+ });+ queryClient.invalidateQueries({+ queryKey: [QueryKeys.archivedConversations],+ refetchPage: (_, index) => index === 0,+ });++ options?.onSuccess?.(data, vars, context);},- ..._options,},);};@@ -577,24 +535,23 @@ export const useDuplicateConversationMutation = (const { onSuccess, ..._options } = options ?? {};return useMutation((payload) => dataService.duplicateConversation(payload), {onSuccess: (data, vars, context) => {- const originalId = vars.conversationId ?? '';- if (originalId.length === 0) {+ const duplicatedConversation = data.conversation;+ if (!duplicatedConversation?.conversationId) {return;}queryClient.setQueryData(- [QueryKeys.conversation, data.conversation.conversationId],- data.conversation,+ [QueryKeys.conversation, duplicatedConversation.conversationId],+ duplicatedConversation,);- queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- return addConversation(convoData, data.conversation);- });- queryClient.setQueryData<t.TMessage[]>(- [QueryKeys.messages, data.conversation.conversationId],+ addConvoToAllQueries(queryClient, duplicatedConversation);+ queryClient.setQueryData(+ [QueryKeys.messages, duplicatedConversation.conversationId],data.messages,);+ queryClient.invalidateQueries({+ queryKey: [QueryKeys.allConversations],+ refetchPage: (_, index) => index === 0,+ });onSuccess?.(data, vars, context);},..._options,@@ -606,25 +563,25 @@ export const useForkConvoMutation = (): UseMutationResult<t.TForkConvoResponse, unknown, t.TForkConvoRequest, unknown> => {const queryClient = useQueryClient();const { onSuccess, ..._options } = options || {};+return useMutation((payload: t.TForkConvoRequest) => dataService.forkConversation(payload), {onSuccess: (data, vars, context) => {if (!vars.conversationId) {return;}- queryClient.setQueryData(- [QueryKeys.conversation, data.conversation.conversationId],- data.conversation,- );- queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- return addConversation(convoData, data.conversation);+ const forkedConversation = data.conversation;+ const forkedConversationId = forkedConversation.conversationId;+ if (!forkedConversationId) {+ return;+ }++ queryClient.setQueryData([QueryKeys.conversation, forkedConversationId], forkedConversation);+ addConvoToAllQueries(queryClient, forkedConversation);+ queryClient.setQueryData([QueryKeys.messages, forkedConversationId], data.messages);+ queryClient.invalidateQueries({+ queryKey: [QueryKeys.allConversations],+ refetchPage: (_, index) => index === 0,});- queryClient.setQueryData<t.TMessage[]>(- [QueryKeys.messages, data.conversation.conversationId],- data.messages,- );onSuccess?.(data, vars, context);},..._options,@@ -899,7 +856,6 @@ export const useUploadAssistantAvatarMutation = (unknown // context> => {return useMutation([MutationKeys.assistantAvatarUpload], {-mutationFn: ({ postCreation, ...variables }: t.AssistantAvatarVariables) =>dataService.uploadAssistantAvatar(variables),...(options || {}),diff --git a/client/src/data-provider/queries.ts b/client/src/data-provider/queries.tsindex 96f7a87e5f..7fdc91ece0 100644--- a/client/src/data-provider/queries.ts+++ b/client/src/data-provider/queries.ts@@ -5,9 +5,9 @@ import {defaultOrderQuery,defaultAssistantsVersion,} from 'librechat-data-provider';-import { useRecoilValue } from 'recoil';import { useQuery, useInfiniteQuery, useQueryClient } from '@tanstack/react-query';import type {+ InfiniteData,UseInfiniteQueryOptions,QueryObserverResult,UseQueryOptions,@@ -19,6 +19,8 @@ import type {TPlugin,ConversationListResponse,ConversationListParams,+ SearchConversationListResponse,+ SearchConversationListParams,Assistant,AssistantListParams,AssistantListResponse,@@ -28,8 +30,6 @@ import type {SharedLinksListParams,SharedLinksResponse,} from 'librechat-data-provider';-import { findPageForConversation } from '~/utils';-import store from '~/store';export const useGetPresetsQuery = (config?: UseQueryOptions<TPreset[]>,@@ -63,25 +63,23 @@ export const useGetConvoIdQuery = (config?: UseQueryOptions<t.TConversation>,): QueryObserverResult<t.TConversation> => {const queryClient = useQueryClient();+return useQuery<t.TConversation>([QueryKeys.conversation, id],() => {- const defaultQuery = () => dataService.getConversationById(id);- const convosQuery = queryClient.getQueryData<t.ConversationData>([- QueryKeys.allConversations,- ]);-- if (!convosQuery) {- return defaultQuery();- }-- const { pageIndex, index } = findPageForConversation(convosQuery, { conversationId: id });-- if (pageIndex > -1 && index > -1) {- return convosQuery.pages[pageIndex].conversations[index];+ // Try to find in all fetched infinite pages+ const convosQuery = queryClient.getQueryData<+ InfiniteData<import('~/utils').ConversationCursorData>+ >([QueryKeys.allConversations]);+ const found = convosQuery?.pages+ .flatMap((page) => page.conversations)+ .find((c) => c.conversationId === id);++ if (found) {+ return found;}-- return defaultQuery();+ // Otherwise, fetch from API+ return dataService.getConversationById(id);},{refetchOnWindowFocus: false,@@ -93,19 +91,21 @@ export const useGetConvoIdQuery = (};export const useSearchInfiniteQuery = (- params?: ConversationListParams & { searchQuery?: string },- config?: UseInfiniteQueryOptions<ConversationListResponse, unknown>,+ params?: SearchConversationListParams,+ config?: UseInfiniteQueryOptions<SearchConversationListResponse, unknown>,) => {- return useInfiniteQuery<ConversationListResponse, unknown>(- [QueryKeys.searchConversations, params], // Include the searchQuery in the query key- ({ pageParam = '1' }) =>- dataService.listConversationsByQuery({ ...params, pageNumber: pageParam }),+ return useInfiniteQuery<SearchConversationListResponse, unknown>(+ [QueryKeys.searchConversations, params],+ ({ pageParam = null }) =>+ dataService+ .listConversations({+ ...params,+ search: params?.search ?? '',+ cursor: pageParam?.toString(),+ })+ .then((res) => ({ ...res })) as Promise<SearchConversationListResponse>,{- getNextPageParam: (lastPage) => {- const currentPageNumber = Number(lastPage.pageNumber);- const totalPages = Number(lastPage.pages);- return currentPageNumber < totalPages ? currentPageNumber + 1 : undefined;- },+ getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined,refetchOnWindowFocus: false,refetchOnReconnect: false,refetchOnMount: false,@@ -115,33 +115,31 @@ export const useSearchInfiniteQuery = (};export const useConversationsInfiniteQuery = (- params?: ConversationListParams,+ params: ConversationListParams,config?: UseInfiniteQueryOptions<ConversationListResponse, unknown>,) => {- const queriesEnabled = useRecoilValue<boolean>(store.queriesEnabled);- return useInfiniteQuery<ConversationListResponse, unknown>(- params?.isArchived === true ? [QueryKeys.archivedConversations] : [QueryKeys.allConversations],- ({ pageParam = '' }) =>+ const { isArchived, sortBy, sortDirection, tags, search } = params;++ return useInfiniteQuery<ConversationListResponse>({+ queryKey: [+ isArchived ? QueryKeys.archivedConversations : QueryKeys.allConversations,+ { isArchived, sortBy, sortDirection, tags, search },+ ],+ queryFn: ({ pageParam }) =>dataService.listConversations({- ...params,- pageNumber: pageParam?.toString(),- isArchived: params?.isArchived ?? false,- tags: params?.tags || [],+ isArchived,+ sortBy,+ sortDirection,+ tags,+ search,+ cursor: pageParam?.toString(),}),- {- getNextPageParam: (lastPage) => {- const currentPageNumber = Number(lastPage.pageNumber);- const totalPages = Number(lastPage.pages); // Convert totalPages to a number- // If the current page number is less than total pages, return the next page number- return currentPageNumber < totalPages ? currentPageNumber + 1 : undefined;- },- refetchOnWindowFocus: false,- refetchOnReconnect: false,- refetchOnMount: false,- ...config,- enabled: (config?.enabled ?? true) === true && queriesEnabled,- },- );+ getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined,+ keepPreviousData: true,+ staleTime: 5 * 60 * 1000, // 5 minutes+ cacheTime: 30 * 60 * 1000, // 30 minutes+ ...config,+ });};export const useSharedLinksQuery = (diff --git a/client/src/hooks/Chat/useChatFunctions.ts b/client/src/hooks/Chat/useChatFunctions.tsindex d511a13597..c8a0018569 100644--- a/client/src/hooks/Chat/useChatFunctions.ts+++ b/client/src/hooks/Chat/useChatFunctions.ts@@ -15,6 +15,7 @@ import type {TConversation,TEndpointOption,TEndpointsConfig,+ EndpointSchemaKey,} from 'librechat-data-provider';import type { SetterOrUpdater } from 'recoil';import type { TAskFunction, ExtendedFile } from '~/common';@@ -160,8 +161,8 @@ export default function useChatFunctions({// set the endpoint optionconst convo = parseCompactConvo({- endpoint,- endpointType,+ endpoint: endpoint as EndpointSchemaKey,+ endpointType: endpointType as EndpointSchemaKey,conversation: conversation ?? {},});diff --git a/client/src/hooks/Conversations/index.ts b/client/src/hooks/Conversations/index.tsindex b580e504fd..8eb0709997 100644--- a/client/src/hooks/Conversations/index.ts+++ b/client/src/hooks/Conversations/index.ts@@ -3,7 +3,6 @@ export { default as usePresets } from './usePresets';export { default as useGetSender } from './useGetSender';export { default as useDefaultConvo } from './useDefaultConvo';export { default as useGenerateConvo } from './useGenerateConvo';-export { default as useArchiveHandler } from './useArchiveHandler';export { default as useDebouncedInput } from './useDebouncedInput';export { default as useBookmarkSuccess } from './useBookmarkSuccess';export { default as useNavigateToConvo } from './useNavigateToConvo';diff --git a/client/src/hooks/Conversations/useArchiveHandler.ts b/client/src/hooks/Conversations/useArchiveHandler.tsdeleted file mode 100644index 1da6f8e203..0000000000--- a/client/src/hooks/Conversations/useArchiveHandler.ts+++ /dev/null@@ -1,51 +0,0 @@-import { useParams, useNavigate } from 'react-router-dom';-import type { MouseEvent, FocusEvent, KeyboardEvent } from 'react';-import { useArchiveConversationMutation } from '~/data-provider';-import { NotificationSeverity } from '~/common';-import { useToastContext } from '~/Providers';-import useLocalize, { TranslationKeys } from '../useLocalize';-import useNewConvo from '../useNewConvo';--export default function useArchiveHandler(- conversationId: string | null,- shouldArchive: boolean,- retainView: () => void,-) {- const localize = useLocalize();- const navigate = useNavigate();- const { showToast } = useToastContext();- const { newConversation } = useNewConvo();- const { conversationId: currentConvoId } = useParams();-- const archiveConvoMutation = useArchiveConversationMutation(conversationId ?? '');-- return async (e?: MouseEvent | FocusEvent | KeyboardEvent) => {- if (e) {- e.preventDefault();- }- const convoId = conversationId ?? '';- if (!convoId) {- return;- }- const label: TranslationKeys = shouldArchive ? 'com_ui_archive_error' : 'com_ui_unarchive_error';- archiveConvoMutation.mutate(- { conversationId: convoId, isArchived: shouldArchive },- {- onSuccess: () => {- if (currentConvoId === convoId || currentConvoId === 'new') {- newConversation();- navigate('/c/new', { replace: true });- }- retainView();- },- onError: () => {- showToast({- message: localize(label),- severity: NotificationSeverity.ERROR,- showIcon: true,- });- },- },- );- };-}diff --git a/client/src/hooks/Conversations/useSearch.ts b/client/src/hooks/Conversations/useSearch.tsindex 753f9d9822..0d74e5dfd0 100644--- a/client/src/hooks/Conversations/useSearch.ts+++ b/client/src/hooks/Conversations/useSearch.ts@@ -1,16 +1,24 @@-import { useEffect, useState, useCallback } from 'react';+import { useEffect, useCallback, useState } from 'react';import { useRecoilValue, useSetRecoilState } from 'recoil';import { useNavigate, useLocation } from 'react-router-dom';import type { UseInfiniteQueryResult } from '@tanstack/react-query';-import type { ConversationListResponse } from 'librechat-data-provider';+import type { SearchConversationListResponse } from 'librechat-data-provider';import { useSearchInfiniteQuery, useGetSearchEnabledQuery } from '~/data-provider';import useNewConvo from '~/hooks/useNewConvo';import store from '~/store';-export default function useSearchMessages({ isAuthenticated }: { isAuthenticated: boolean }) {+export interface UseSearchMessagesResult {+ searchQuery: string;+ searchQueryRes: UseInfiniteQueryResult<SearchConversationListResponse, unknown> | undefined;+}++export default function useSearchMessages({+ isAuthenticated,+}: {+ isAuthenticated: boolean;+}): UseSearchMessagesResult {const navigate = useNavigate();const location = useLocation();- const [pageNumber, setPageNumber] = useState(1);const { switchToConversation } = useNewConvo();const searchPlaceholderConversation = useCallback(() => {switchToConversation({@@ -25,11 +33,20 @@ export default function useSearchMessages({ isAuthenticated }: { isAuthenticatedconst searchQuery = useRecoilValue(store.searchQuery);const setIsSearchEnabled = useSetRecoilState(store.isSearchEnabled);+ const [debouncedSearchQuery, setDebouncedSearchQuery] = useState(searchQuery);++ useEffect(() => {+ const handler = setTimeout(() => {+ setDebouncedSearchQuery(searchQuery);+ }, 350); // 350ms debounce+ return () => clearTimeout(handler);+ }, [searchQuery]);+const searchEnabledQuery = useGetSearchEnabledQuery({ enabled: isAuthenticated });const searchQueryRes = useSearchInfiniteQuery(- { pageNumber: pageNumber.toString(), searchQuery: searchQuery, isArchived: false },- { enabled: isAuthenticated && !!searchQuery.length },- ) as UseInfiniteQueryResult<ConversationListResponse, unknown> | undefined;+ { nextCursor: null, search: debouncedSearchQuery, pageSize: 20 },+ { enabled: isAuthenticated && !!debouncedSearchQuery },+ ) as UseInfiniteQueryResult<SearchConversationListResponse, unknown> | undefined;useEffect(() => {if (searchQuery && searchQuery.length > 0) {@@ -64,16 +81,22 @@ export default function useSearchMessages({ isAuthenticated }: { isAuthenticated);useEffect(() => {- //we use isInitialLoading here instead of isLoading because query is disabled by default+ // we use isInitialLoading here instead of isLoading because query is disabled by defaultif (searchQueryRes?.data) {onSearchSuccess();}}, [searchQueryRes?.data, searchQueryRes?.isInitialLoading, onSearchSuccess]);+ const setIsSearchTyping = useSetRecoilState(store.isSearchTyping);++ useEffect(() => {+ if (!searchQueryRes?.isLoading && !searchQueryRes?.isFetching) {+ setIsSearchTyping(false);+ }+ }, [searchQueryRes?.isLoading, searchQueryRes?.isFetching, setIsSearchTyping]);+return {- pageNumber,searchQuery,- setPageNumber,searchQueryRes,};}diff --git a/client/src/hooks/Conversations/useUpdateTagsInConvo.ts b/client/src/hooks/Conversations/useUpdateTagsInConvo.tsindex ebbefe955f..815278bcf7 100644--- a/client/src/hooks/Conversations/useUpdateTagsInConvo.ts+++ b/client/src/hooks/Conversations/useUpdateTagsInConvo.ts@@ -3,7 +3,7 @@ import { QueryKeys } from 'librechat-data-provider';import type { ConversationListResponse } from 'librechat-data-provider';import type { InfiniteData } from '@tanstack/react-query';import type t from 'librechat-data-provider';-import { updateConvoFields } from '~/utils/convos';+import { updateConvoFieldsInfinite } from '~/utils/convos';const useUpdateTagsInConvo = () => {const queryClient = useQueryClient();@@ -24,19 +24,25 @@ const useUpdateTagsInConvo = () => {tags,} as t.TConversation;queryClient.setQueryData([QueryKeys.conversation, conversationId], updatedConvo);- queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- return updateConvoFields(- convoData,- {- conversationId: currentConvo.conversationId,- tags: updatedConvo.tags,- } as t.TConversation,- true,- );- });+ queryClient.setQueryData<InfiniteData<ConversationListResponse>>(+ [QueryKeys.allConversations],+ (convoData) => {+ if (!convoData) {+ return convoData;+ }+ return {+ ...convoData,+ pages: convoData.pages.map((page) => ({+ ...page,+ conversations: page.conversations.map((conversation) =>+ conversation.conversationId === (currentConvo.conversationId ?? '')+ ? { ...conversation, tags: updatedConvo.tags }+ : conversation,+ ),+ })),+ };+ },+ );};// update the tag to newTag in all conversations when a tag is updated to a newTag@@ -54,9 +60,15 @@ const useUpdateTagsInConvo = () => {for (let pageIndex = 0; pageIndex < newData.pages.length; pageIndex++) {const page = newData.pages[pageIndex];page.conversations = page.conversations.map((conversation) => {- if (conversation.conversationId && conversation.tags?.includes(tag)) {- conversationIdsWithTag.push(conversation.conversationId);- conversation.tags = conversation.tags.map((t) => (t === tag ? newTag : t));+ if (+ conversation.conversationId &&+ 'tags' in conversation &&+ Array.isArray((conversation as { tags?: string[] }).tags) &&+ (conversation as { tags?: string[] }).tags?.includes(tag)+ ) {+ (conversation as { tags: string[] }).tags = (conversation as { tags: string[] }).tags.map(+ (t: string) => (t === tag ? newTag : t),+ );}return conversation;});diff --git a/client/src/hooks/Input/useAutoSave.ts b/client/src/hooks/Input/useAutoSave.tsindex 233a175a53..93232bc91c 100644--- a/client/src/hooks/Input/useAutoSave.ts+++ b/client/src/hooks/Input/useAutoSave.ts@@ -36,8 +36,8 @@ const decodeBase64 = (base64String: string): string => {export const useAutoSave = ({conversationId,textAreaRef,- files,setFiles,+ files,}: {conversationId?: string | null;textAreaRef?: React.RefObject<HTMLTextAreaElement>;@@ -106,7 +106,7 @@ export const useAutoSave = ({return;}// Save the draft of the current conversation before switching- if (textAreaRef.current.value === '') {+ if (textAreaRef.current.value === '' || textAreaRef.current.value.length === 1) {clearDraft(id);} else {localStorage.setItem(@@ -126,8 +126,7 @@ export const useAutoSave = ({return;}- const handleInput = debounce((e: React.ChangeEvent<HTMLTextAreaElement>) => {- const value = e.target.value;+ const handleInput = debounce((value: string) => {if (value && value.length > 1) {localStorage.setItem(`${LocalStorageKeys.TEXT_DRAFT}${conversationId}`,@@ -138,14 +137,19 @@ export const useAutoSave = ({}}, 750);+ const eventListener = (e: Event) => {+ const target = e.target as HTMLTextAreaElement;+ handleInput(target.value);+ };+const textArea = textAreaRef?.current;if (textArea) {- textArea.addEventListener('input', handleInput);+ textArea.addEventListener('input', eventListener);}return () => {if (textArea) {- textArea.removeEventListener('input', handleInput);+ textArea.removeEventListener('input', eventListener);}handleInput.cancel();};diff --git a/client/src/hooks/Nav/useNavScrolling.ts b/client/src/hooks/Nav/useNavScrolling.tsindex f32154cb08..6c7621c73a 100644--- a/client/src/hooks/Nav/useNavScrolling.ts+++ b/client/src/hooks/Nav/useNavScrolling.ts@@ -3,26 +3,33 @@ import React, { useCallback, useEffect, useRef } from 'react';import type { FetchNextPageOptions, InfiniteQueryObserverResult } from '@tanstack/react-query';export default function useNavScrolling<TData>({- hasNextPage,- isFetchingNextPage,+ nextCursor,+ isFetchingNext,setShowLoading,fetchNextPage,}: {- hasNextPage?: boolean;- isFetchingNextPage: boolean;+ nextCursor?: string | null;+ isFetchingNext: boolean;setShowLoading: React.Dispatch<React.SetStateAction<boolean>>;- fetchNextPage:- | ((- options?: FetchNextPageOptions | undefined,- ) => Promise<InfiniteQueryObserverResult<TData, unknown>>)- | undefined;+ fetchNextPage?: (+ options?: FetchNextPageOptions | undefined,+ ) => Promise<InfiniteQueryObserverResult<TData, unknown>>;}) {const scrollPositionRef = useRef<number | null>(null);const containerRef = useRef<HTMLDivElement | null>(null);// eslint-disable-next-line react-hooks/exhaustive-depsconst fetchNext = useCallback(- throttle(() => (fetchNextPage != null ? fetchNextPage() : () => ({})), 750, { leading: true }),+ throttle(+ () => {+ if (fetchNextPage) {+ return fetchNextPage();+ }+ return Promise.resolve();+ },+ 750,+ { leading: true },+ ),[fetchNextPage],);@@ -31,14 +38,14 @@ export default function useNavScrolling<TData>({const { scrollTop, clientHeight, scrollHeight } = containerRef.current;const nearBottomOfList = scrollTop + clientHeight >= scrollHeight * 0.97;- if (nearBottomOfList && hasNextPage === true && !isFetchingNextPage) {+ if (nearBottomOfList && nextCursor != null && !isFetchingNext) {setShowLoading(true);fetchNext();} else {setShowLoading(false);}}- }, [hasNextPage, isFetchingNextPage, fetchNext, setShowLoading]);+ }, [nextCursor, isFetchingNext, fetchNext, setShowLoading]);useEffect(() => {const container = containerRef.current;@@ -47,16 +54,18 @@ export default function useNavScrolling<TData>({}return () => {- container?.removeEventListener('scroll', handleScroll);+ if (container) {+ container.removeEventListener('scroll', handleScroll);+ }};- }, [handleScroll, fetchNext]);+ }, [handleScroll]);const moveToTop = useCallback(() => {const container = containerRef.current;if (container) {scrollPositionRef.current = container.scrollTop;}- }, [containerRef, scrollPositionRef]);+ }, []);return {containerRef,diff --git a/client/src/hooks/SSE/useEventHandlers.ts b/client/src/hooks/SSE/useEventHandlers.tsindex 75a918fb57..cddf170671 100644--- a/client/src/hooks/SSE/useEventHandlers.ts+++ b/client/src/hooks/SSE/useEventHandlers.ts@@ -13,22 +13,19 @@ import {ContentTypes,isAssistantsEndpoint,} from 'librechat-data-provider';-import type {- TMessage,- TConversation,- EventSubmission,- ConversationData,-} from 'librechat-data-provider';-import type { SetterOrUpdater, Resetter } from 'recoil';+import type { TMessage, TConversation, EventSubmission } from 'librechat-data-provider';import type { TResData, TFinalResData, ConvoGenerator } from '~/common';+import type { InfiniteData } from '@tanstack/react-query';import type { TGenTitleMutation } from '~/data-provider';+import type { SetterOrUpdater, Resetter } from 'recoil';+import type { ConversationCursorData } from '~/utils';import {scrollToEnd,- addConversation,+ addConvoToAllQueries,+ updateConvoInAllQueries,+ removeConvoFromAllQueries,+ findConversationInInfinite,getAllContentText,- deleteConversation,- updateConversation,- getConversationById,} from '~/utils';import useAttachmentHandler from '~/hooks/SSE/useAttachmentHandler';import useContentHandler from '~/hooks/SSE/useContentHandler';@@ -128,6 +125,37 @@ const createErrorMessage = ({return tMessageSchema.parse(errorMessage);};+export const getConvoTitle = ({+ parentId,+ queryClient,+ currentTitle,+ conversationId,+}: {+ parentId?: string | null;+ queryClient: ReturnType<typeof useQueryClient>;+ currentTitle?: string | null;+ conversationId?: string | null;+}): string | null | undefined => {+ if (+ parentId !== Constants.NO_PARENT &&+ (currentTitle?.toLowerCase().includes('new chat') ?? false)+ ) {+ const currentConvo = queryClient.getQueryData<TConversation>([+ QueryKeys.conversation,+ conversationId,+ ]);+ if (currentConvo?.title) {+ return currentConvo.title;+ }+ const convos = queryClient.getQueryData<InfiniteData<ConversationCursorData>>([+ QueryKeys.allConversations,+ ]);+ const cachedConvo = findConversationInInfinite(convos, conversationId ?? '');+ return cachedConvo?.title ?? currentConvo?.title ?? null;+ }+ return currentTitle;+};+export default function useEventHandlers({genTitle,setMessages,@@ -186,7 +214,6 @@ export default function useEventHandlers({text,plugin: plugin ?? null,plugins: plugins ?? [],- // unfinished: true},]);} else {@@ -198,7 +225,6 @@ export default function useEventHandlers({text,plugin: plugin ?? null,plugins: plugins ?? [],- // unfinished: true},]);}@@ -210,7 +236,6 @@ export default function useEventHandlers({(data: TResData, submission: EventSubmission) => {const { requestMessage, responseMessage, conversation } = data;const { messages, isRegenerate = false } = submission;-const convoUpdate =(conversation as TConversation | null) ?? (submission.conversation as TConversation);@@ -229,12 +254,7 @@ export default function useEventHandlers({const isNewConvo = conversation.conversationId !== submission.conversation.conversationId;if (isNewConvo) {- queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- return deleteConversation(convoData, submission.conversation.conversationId as string);- });+ removeConvoFromAllQueries(queryClient, submission.conversation.conversationId as string);}// refresh title@@ -246,11 +266,7 @@ export default function useEventHandlers({if (setConversation && !isAddedRequest) {setConversation((prevState) => {- const update = {- ...prevState,- ...convoUpdate,- };-+ const update = { ...prevState, ...convoUpdate };return update;});}@@ -264,7 +280,6 @@ export default function useEventHandlers({(data: TSyncData, submission: EventSubmission) => {const { conversationId, thread_id, responseMessage, requestMessage } = data;const { initialResponse, messages: _messages, userMessage } = submission;-const messages = _messages.filter((msg) => msg.messageId !== userMessage.messageId);setMessages([@@ -284,17 +299,13 @@ export default function useEventHandlers({let update = {} as TConversation;if (setConversation && !isAddedRequest) {setConversation((prevState) => {- let title = prevState?.title;const parentId = requestMessage.parentMessageId;- if (- parentId !== Constants.NO_PARENT &&- (title?.toLowerCase().includes('new chat') ?? false)- ) {- const convos = queryClient.getQueryData<ConversationData>([QueryKeys.allConversations]);- const cachedConvo = getConversationById(convos, conversationId);- title = cachedConvo?.title;- }-+ const title = getConvoTitle({+ parentId,+ queryClient,+ conversationId,+ currentTitle: prevState?.title,+ });update = tConvoUpdateSchema.parse({...prevState,conversationId,@@ -302,20 +313,14 @@ export default function useEventHandlers({title,messages: [requestMessage.messageId, responseMessage.messageId],}) as TConversation;-return update;});- queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- if (requestMessage.parentMessageId === Constants.NO_PARENT) {- return addConversation(convoData, update);- } else {- return updateConversation(convoData, update);- }- });+ if (requestMessage.parentMessageId === Constants.NO_PARENT) {+ addConvoToAllQueries(queryClient, update);+ } else {+ updateConvoInAllQueries(queryClient, update.conversationId!, (_c) => update);+ }} else if (setConversation) {setConversation((prevState) => {update = tConvoUpdateSchema.parse({@@ -371,39 +376,28 @@ export default function useEventHandlers({}if (setConversation && !isAddedRequest) {setConversation((prevState) => {- let title = prevState?.title;const parentId = isRegenerate ? userMessage.overrideParentMessageId : parentMessageId;- if (- parentId !== Constants.NO_PARENT &&- (title?.toLowerCase().includes('new chat') ?? false)- ) {- const convos = queryClient.getQueryData<ConversationData>([QueryKeys.allConversations]);- const cachedConvo = getConversationById(convos, conversationId);- title = cachedConvo?.title;- }-+ const title = getConvoTitle({+ parentId,+ queryClient,+ conversationId,+ currentTitle: prevState?.title,+ });update = tConvoUpdateSchema.parse({...prevState,conversationId,title,}) as TConversation;-return update;});- if (isTemporary) {- return;- }- queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }+ if (!isTemporary) {if (parentMessageId === Constants.NO_PARENT) {- return addConversation(convoData, update);+ addConvoToAllQueries(queryClient, update);} else {- return updateConversation(convoData, update);+ updateConvoInAllQueries(queryClient, update.conversationId!, (_c) => update);}- });+ }} else if (setConversation) {setConversation((prevState) => {update = tConvoUpdateSchema.parse({@@ -417,7 +411,6 @@ export default function useEventHandlers({if (resetLatestMessage) {resetLatestMessage();}-scrollToEnd(() => setAbortScroll(false));},[@@ -447,18 +440,13 @@ export default function useEventHandlers({const currentMessages = getMessages();/* Early return if messages are empty; i.e., the user navigated away */if (!currentMessages || currentMessages.length === 0) {- return setIsSubmitting(false);+ setIsSubmitting(false);+ return;}/* a11y announcements */- announcePolite({- message: 'end',- isStatus: true,- });-- announcePolite({- message: getAllContentText(responseMessage),- });+ announcePolite({ message: 'end', isStatus: true });+ announcePolite({ message: getAllContentText(responseMessage) });/* Update messages; if assistants endpoint, client doesn't receive responseMessage */if (runMessages) {@@ -471,12 +459,7 @@ export default function useEventHandlers({const isNewConvo = conversation.conversationId !== submissionConvo.conversationId;if (isNewConvo) {- queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- return deleteConversation(convoData, submissionConvo.conversationId as string);- });+ removeConvoFromAllQueries(queryClient, submissionConvo.conversationId as string);}/* Refresh title */@@ -500,13 +483,18 @@ export default function useEventHandlers({setConversation((prevState) => {const update = {...prevState,- ...conversation,+ ...(conversation as TConversation),};-if (prevState?.model != null && prevState.model !== submissionConvo.model) {update.model = prevState.model;}-+ const cachedConvo = queryClient.getQueryData<TConversation>([+ QueryKeys.conversation,+ conversation.conversationId,+ ]);+ if (!cachedConvo) {+ queryClient.setQueryData([QueryKeys.conversation, conversation.conversationId], update);+ }return update;});}@@ -530,7 +518,6 @@ export default function useEventHandlers({const errorHandler = useCallback(({ data, submission }: { data?: TResData; submission: EventSubmission }) => {const { messages, userMessage, initialResponse } = submission;-setCompleted((prev) => new Set(prev.add(initialResponse.messageId)));const conversationId =@@ -595,7 +582,6 @@ export default function useEventHandlers({return;}- console.log('Error:', data);const errorResponse = tMessageSchema.parse({...data,error: true,@@ -619,11 +605,28 @@ export default function useEventHandlers({const abortConversation = useCallback(async (conversationId = '', submission: EventSubmission, messages?: TMessage[]) => {const runAbortKey = `${conversationId}:${messages?.[messages.length - 1]?.messageId ?? ''}`;- console.log({ conversationId, submission, messages, runAbortKey });const { endpoint: _endpoint, endpointType } =(submission.conversation as TConversation | null) ?? {};const endpoint = endpointType ?? _endpoint;- if (!isAssistantsEndpoint(endpoint)) {+ if (+ !isAssistantsEndpoint(endpoint) &&+ messages?.[messages.length - 1] != null &&+ messages[messages.length - 2] != null+ ) {+ const requestMessage = messages[messages.length - 2];+ const responseMessage = messages[messages.length - 1];+ finalHandler(+ {+ conversation: {+ conversationId,+ },+ requestMessage,+ responseMessage,+ },+ submission,+ );+ return;+ } else if (!isAssistantsEndpoint(endpoint)) {if (newConversation) {newConversation({template: { conversationId: conversationId || v4() },@@ -651,7 +654,6 @@ export default function useEventHandlers({const contentType = response.headers.get('content-type');if (contentType != null && contentType.includes('application/json')) {const data = await response.json();- console.log(`[aborted] RESPONSE STATUS: ${response.status}`, data);if (response.status === 404) {setIsSubmitting(false);return;@@ -662,16 +664,6 @@ export default function useEventHandlers({cancelHandler(data, submission);}} else if (response.status === 204 || response.status === 200) {- const responseMessage = {- ...submission.initialResponse,- };-- const data = {- requestMessage: submission.userMessage,- responseMessage: responseMessage,- conversation: submission.conversation,- };- console.log(`[aborted] RESPONSE STATUS: ${response.status}`, data);setIsSubmitting(false);} else {throw new Error(@@ -682,8 +674,6 @@ export default function useEventHandlers({);}} catch (error) {- console.error('Error cancelling request');- console.error(error);const errorResponse = createErrorMessage({getMessages,submission,diff --git a/client/src/hooks/SSE/useSSE.ts b/client/src/hooks/SSE/useSSE.tsindex 7d733cfb73..4042479415 100644--- a/client/src/hooks/SSE/useSSE.ts+++ b/client/src/hooks/SSE/useSSE.ts@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';import { v4 } from 'uuid';import { SSE } from 'sse.js';import { useSetRecoilState } from 'recoil';+import { useQueryClient } from '@tanstack/react-query';import {request,Constants,@@ -12,12 +13,18 @@ import {removeNullishValues,isAssistantsEndpoint,} from 'librechat-data-provider';-import type { EventSubmission, TMessage, TPayload, TSubmission } from 'librechat-data-provider';+import type {+ EventSubmission,+ TConversation,+ TMessage,+ TPayload,+ TSubmission,+} from 'librechat-data-provider';import type { EventHandlerParams } from './useEventHandlers';import type { TResData } from '~/common';import { useGenTitleMutation, useGetStartupConfig, useGetUserBalance } from '~/data-provider';+import useEventHandlers, { getConvoTitle } from './useEventHandlers';import { useAuthContext } from '~/hooks/AuthContext';-import useEventHandlers from './useEventHandlers';import store from '~/store';const clearDraft = (conversationId?: string | null) => {@@ -46,6 +53,7 @@ export default function useSSE(isAddedRequest = false,runIndex = 0,) {+ const queryClient = useQueryClient();const genTitle = useGenTitleMutation();const setActiveRunId = useSetRecoilState(store.activeRunFamily(runIndex));@@ -99,6 +107,30 @@ export default function useSSE(let { userMessage } = submission;const payloadData = createPayload(submission);+ /**+ * Helps clear text immediately on submission instead of+ * restoring draft, which gets deleted on generation end+ * */+ const parentId = submission?.isRegenerate+ ? userMessage.overrideParentMessageId+ : userMessage.parentMessageId;+ setConversation?.((prev: TConversation | null) => {+ if (!prev) {+ return null;+ }+ const title =+ getConvoTitle({+ parentId,+ queryClient,+ currentTitle: prev?.title,+ conversationId: prev?.conversationId,+ }) ?? '';+ return {+ ...prev,+ title,+ conversationId: Constants.PENDING_CONVO as string,+ };+ });let { payload } = payloadData;if (isAssistantsEndpoint(payload.endpoint) || isAgentsEndpoint(payload.endpoint)) {payload = removeNullishValues(payload) as TPayload;@@ -250,5 +282,6 @@ export default function useSSE(sse.dispatchEvent(e);}};+ // eslint-disable-next-line react-hooks/exhaustive-deps}, [submission]);}diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.jsonindex 660fb25508..5db6f0688a 100644--- a/client/src/locales/en/translation.json+++ b/client/src/locales/en/translation.json@@ -285,7 +285,6 @@"com_nav_archive_created_at": "Date Archived","com_nav_archive_name": "Name","com_nav_archived_chats": "Archived chats",- "com_nav_archived_chats_empty": "You have no archived conversations.","com_nav_at_command": "@-Command","com_nav_at_command_description": "Toggle command \"@\" for switching endpoints, models, presets, etc.","com_nav_audio_play_error": "Error playing audio: {{0}}",@@ -390,7 +389,6 @@"com_nav_maximize_chat_space": "Maximize chat space","com_nav_modular_chat": "Enable switching Endpoints mid-conversation","com_nav_my_files": "My Files",- "com_nav_no_search_results": "No search results found","com_nav_not_supported": "Not Supported","com_nav_open_sidebar": "Open sidebar","com_nav_playback_rate": "Audio Playback Rate",@@ -486,8 +484,10 @@"com_ui_analyzing": "Analyzing","com_ui_analyzing_finished": "Finished analyzing","com_ui_api_key": "API Key",+ "com_ui_convo_delete_error": "Failed to delete conversation","com_ui_archive": "Archive","com_ui_archive_error": "Failed to archive conversation",+ "com_ui_archive_delete_error": "Failed to delete archived conversation","com_ui_artifact_click": "Click to open","com_ui_artifacts": "Artifacts","com_ui_artifacts_toggle": "Toggle Artifacts UI",@@ -664,6 +664,10 @@"com_ui_generating": "Generating...","com_ui_global_group": "something needs to go here. was empty","com_ui_go_back": "Go back",+ "com_ui_untitled": "Untitled",+ "com_ui_new_conversation_title": "New Conversation Title",+ "com_ui_rename_conversation": "Rename Conversation",+ "com_ui_rename_failed": "Failed to rename conversation","com_ui_go_to_conversation": "Go to conversation","com_ui_good_afternoon": "Good afternoon","com_ui_good_evening": "Good evening",@@ -712,9 +716,9 @@"com_ui_no_bookmarks": "it seems like you have no bookmarks yet. Click on a chat and add a new one","com_ui_no_category": "No category","com_ui_no_changes": "No changes to update",- "com_ui_no_data": "something needs to go here. was empty",+ "com_ui_no_data": "No data","com_ui_no_terms_content": "No terms and conditions content to display",- "com_ui_no_valid_items": "something needs to go here. was empty",+ "com_ui_no_valid_items": "No valid items","com_ui_none": "None","com_ui_not_used": "Not Used","com_ui_nothing_found": "Nothing found",diff --git a/client/src/routes/ChatRoute.tsx b/client/src/routes/ChatRoute.tsxindex 729c90e467..3e66ed8c13 100644--- a/client/src/routes/ChatRoute.tsx+++ b/client/src/routes/ChatRoute.tsx@@ -1,4 +1,4 @@-import { useEffect } from 'react';+import { useEffect, useRef } from 'react';import { useParams } from 'react-router-dom';import { Constants, EModelEndpoint } from 'librechat-data-provider';import { useGetModelsQuery } from 'librechat-data-provider/react-query';@@ -38,6 +38,11 @@ export default function ChatRoute() {const { hasSetConversation, conversation } = store.useCreateConversationAtom(index);const { newConversation } = useNewConvo();+ // Reset the guard flag whenever conversationId changes+ useEffect(() => {+ hasSetConversation.current = false;+ }, [conversationId]);+const modelsQuery = useGetModelsQuery({enabled: isAuthenticated,refetchOnMount: 'always',@@ -122,6 +127,7 @@ export default function ChatRoute() {endpointsQuery.data,modelsQuery.data,assistantListMap,+ conversationId,]);if (endpointsQuery.isLoading || modelsQuery.isLoading) {diff --git a/client/src/routes/Search.tsx b/client/src/routes/Search.tsxindex 5d944a6fe3..a96ba2e229 100644--- a/client/src/routes/Search.tsx+++ b/client/src/routes/Search.tsx@@ -1,40 +1,73 @@-import { useMemo } from 'react';+import { useEffect, useMemo } from 'react';+import type { FetchNextPageOptions } from '@tanstack/react-query';+import { useToastContext, useSearchContext, useFileMapContext } from '~/Providers';import MinimalMessagesWrapper from '~/components/Chat/Messages/MinimalMessages';import SearchMessage from '~/components/Chat/Messages/SearchMessage';-import { useSearchContext, useFileMapContext } from '~/Providers';import { useNavScrolling, useLocalize } from '~/hooks';+import { Spinner } from '~/components';import { buildTree } from '~/utils';+import { useRecoilValue } from 'recoil';+import store from '~/store';export default function Search() {const localize = useLocalize();const fileMap = useFileMapContext();+ const { showToast } = useToastContext();const { searchQuery, searchQueryRes } = useSearchContext();+ const isSearchTyping = useRecoilValue(store.isSearchTyping);const { containerRef } = useNavScrolling({+ nextCursor: searchQueryRes?.data?.pages[searchQueryRes.data.pages.length - 1]?.nextCursor,setShowLoading: () => ({}),- hasNextPage: searchQueryRes?.hasNextPage,- fetchNextPage: searchQueryRes?.fetchNextPage,- isFetchingNextPage: searchQueryRes?.isFetchingNextPage ?? false,+ fetchNextPage: searchQueryRes?.fetchNextPage+ ? (options?: FetchNextPageOptions) => searchQueryRes.fetchNextPage(options)+ : undefined,+ isFetchingNext: searchQueryRes?.isFetchingNextPage ?? false,});+ useEffect(() => {+ if (searchQueryRes?.error) {+ showToast({ message: 'An error occurred during search', status: 'error' });+ }+ }, [searchQueryRes?.error, showToast]);+const messages = useMemo(() => {const msgs = searchQueryRes?.data?.pages.flatMap((page) => page.messages) || [];const dataTree = buildTree({ messages: msgs, fileMap });- return dataTree?.length === 0 ? null : dataTree ?? null;+ return dataTree?.length === 0 ? null : (dataTree ?? null);}, [fileMap, searchQueryRes?.data?.pages]);if (!searchQuery || !searchQueryRes?.data) {return null;}+ if (isSearchTyping || searchQueryRes.isInitialLoading || searchQueryRes.isLoading) {+ return (+ <div className="absolute inset-0 flex items-center justify-center">+ <Spinner className="text-text-primary" />+ </div>+ );+ }+return (- <MinimalMessagesWrapper ref={containerRef} className="pt-4">+ <MinimalMessagesWrapper ref={containerRef} className="relative flex h-full pt-4">{(messages && messages.length == 0) || messages == null ? (- <div className="my-auto flex h-full w-full items-center justify-center gap-1 bg-white p-3 text-lg text-gray-500 dark:border-gray-800/50 dark:bg-gray-800 dark:text-gray-300">- {localize('com_ui_nothing_found')}+ <div className="absolute inset-0 flex items-center justify-center">+ <div className="rounded-lg bg-white p-6 text-lg text-gray-500 dark:border-gray-800/50 dark:bg-gray-800 dark:text-gray-300">+ {localize('com_ui_nothing_found')}+ </div></div>) : (- messages.map((message) => <SearchMessage key={message.messageId} message={message} />)+ <>+ {messages.map((msg) => (+ <SearchMessage key={msg.messageId} message={msg} />+ ))}+ {searchQueryRes.isFetchingNextPage && (+ <div className="flex justify-center py-4">+ <Spinner className="text-text-primary" />+ </div>+ )}+ </>)}<div className="absolute bottom-0 left-0 right-0 h-[5%] bg-gradient-to-t from-gray-50 to-transparent dark:from-gray-800" /></MinimalMessagesWrapper>diff --git a/client/src/store/search.ts b/client/src/store/search.tsindex 77c4d9be4f..e9b7ee9f2e 100644--- a/client/src/store/search.ts+++ b/client/src/store/search.ts@@ -15,8 +15,14 @@ const isSearching = atom({default: false,});+const isSearchTyping = atom({+ key: 'isSearchTyping',+ default: false,+});+export default {isSearchEnabled,searchQuery,isSearching,+ isSearchTyping,};diff --git a/client/src/utils/convos.spec.ts b/client/src/utils/convos.spec.tsindex 1b1dd5d583..cf02925992 100644--- a/client/src/utils/convos.spec.ts+++ b/client/src/utils/convos.spec.ts@@ -1,13 +1,18 @@-import { Constants } from 'librechat-data-provider';-import type { TConversation, ConversationData } from 'librechat-data-provider';+import { QueryClient } from '@tanstack/react-query';+import type { TConversation, InfiniteData } from 'librechat-data-provider';import {dateKeys,- addConversation,- updateConvoFields,- updateConversation,- deleteConversation,- findPageForConversation,+ storeEndpointSettings,+ addConversationToInfinitePages,+ updateInfiniteConvoPage,+ findConversationInInfinite,+ removeConvoFromInfinitePages,groupConversationsByDate,+ updateConvoFieldsInfinite,+ addConvoToAllQueries,+ updateConvoInAllQueries,+ removeConvoFromAllQueries,+ addConversationToAllConversationsQueries,} from './convos';import { convoData } from './convos.fakeData';import { normalizeData } from './collection';@@ -26,9 +31,9 @@ describe('Conversation Utilities', () => {const conversations = [{ conversationId: '1', updatedAt: '2023-04-01T12:00:00Z' },{ conversationId: '2', updatedAt: new Date().toISOString() },- { conversationId: '3', updatedAt: new Date(Date.now() - 86400000).toISOString() }, // 86400 seconds ago = yesterday- { conversationId: '4', updatedAt: new Date(Date.now() - 86400000 * 2).toISOString() }, // 2 days ago (previous 7 days)- { conversationId: '5', updatedAt: new Date(Date.now() - 86400000 * 8).toISOString() }, // 8 days ago (previous 30 days)+ { conversationId: '3', updatedAt: new Date(Date.now() - 86400000).toISOString() },+ { conversationId: '4', updatedAt: new Date(Date.now() - 86400000 * 2).toISOString() },+ { conversationId: '5', updatedAt: new Date(Date.now() - 86400000 * 8).toISOString() },];const grouped = groupConversationsByDate(conversations as TConversation[]);expect(grouped[0][0]).toBe(dateKeys.today);@@ -43,84 +48,20 @@ describe('Conversation Utilities', () => {expect(grouped[4][1]).toHaveLength(1);});- it('groups conversations correctly across multiple years', () => {- const fixedDate = new Date('2023-07-15T12:00:00Z');- const conversations = [- { conversationId: '1', updatedAt: '2023-07-15T10:00:00Z' }, // Today- { conversationId: '2', updatedAt: '2023-07-14T12:00:00Z' }, // Yesterday- { conversationId: '3', updatedAt: '2023-07-08T12:00:00Z' }, // This week- { conversationId: '4', updatedAt: '2023-07-01T12:00:00Z' }, // This month (within last 30 days)- { conversationId: '5', updatedAt: '2023-06-01T12:00:00Z' }, // Last month- { conversationId: '6', updatedAt: '2023-01-01T12:00:00Z' }, // This year, January- { conversationId: '7', updatedAt: '2022-12-01T12:00:00Z' }, // Last year, December- { conversationId: '8', updatedAt: '2022-06-01T12:00:00Z' }, // Last year, June- { conversationId: '9', updatedAt: '2021-12-01T12:00:00Z' }, // Two years ago- { conversationId: '10', updatedAt: '2020-06-01T12:00:00Z' }, // Three years ago- ];-- // Mock Date.now- const originalDateNow = Date.now;- Date.now = jest.fn(() => fixedDate.getTime());-- const grouped = groupConversationsByDate(conversations as TConversation[]);-- // Restore Date.now- Date.now = originalDateNow;-- const expectedGroups = [- dateKeys.today,- dateKeys.yesterday,- dateKeys.previous7Days,- dateKeys.previous30Days,- dateKeys.june,- dateKeys.january,- ' 2022',- ' 2021',- ' 2020',- ];-- expect(grouped.map(([key]) => key)).toEqual(expectedGroups);-- // Helper function to safely get group length- const getGroupLength = (key: string) => grouped.find(([k]) => k === key)?.[1]?.length ?? 0;-- // Check specific group contents- expect(getGroupLength(dateKeys.today)).toBe(1);- expect(getGroupLength(dateKeys.yesterday)).toBe(1);- expect(getGroupLength(dateKeys.previous7Days)).toBe(1);- expect(getGroupLength(dateKeys.previous30Days)).toBe(1);- expect(getGroupLength(dateKeys.june)).toBe(1);- expect(getGroupLength(dateKeys.january)).toBe(1);- expect(getGroupLength(' 2022')).toBe(2); // December and June 2022- expect(getGroupLength(' 2021')).toBe(1);- expect(getGroupLength(' 2020')).toBe(1);-- // Check that all conversations are accounted for- const totalGroupedConversations = grouped.reduce(- (total, [, convos]) => total + convos.length,- 0,- );- expect(totalGroupedConversations).toBe(conversations.length);- });-- it('returns an empty array for no conversations', () => {- expect(groupConversationsByDate([])).toEqual([]);- });-it('skips conversations with duplicate conversationIds', () => {const conversations = [- { conversationId: '1', updatedAt: '2023-12-01T12:00:00Z' }, // " 2023"- { conversationId: '2', updatedAt: '2023-11-25T12:00:00Z' }, // " 2023"- { conversationId: '1', updatedAt: '2023-11-20T12:00:00Z' }, // Should be skipped because of duplicate ID- { conversationId: '3', updatedAt: '2022-12-01T12:00:00Z' }, // " 2022"+ { conversationId: '1', updatedAt: '2023-12-01T12:00:00Z' },+ { conversationId: '2', updatedAt: '2023-11-25T12:00:00Z' },+ { conversationId: '1', updatedAt: '2023-11-20T12:00:00Z' },+ { conversationId: '3', updatedAt: '2022-12-01T12:00:00Z' },];const grouped = groupConversationsByDate(conversations as TConversation[]);expect(grouped).toEqual(expect.arrayContaining([- expect.arrayContaining([' 2023', expect.arrayContaining(conversations.slice(0, 2))]),- expect.arrayContaining([' 2022', expect.arrayContaining([conversations[3]])]),+ [' 2023', expect.arrayContaining([conversations[0], conversations[1]])],+ [' 2022', expect.arrayContaining([conversations[3]])],]),);@@ -132,22 +73,25 @@ describe('Conversation Utilities', () => {it('sorts conversations by month correctly', () => {const conversations = [- { conversationId: '1', updatedAt: '2023-01-01T12:00:00Z' }, // January 2023- { conversationId: '2', updatedAt: '2023-12-01T12:00:00Z' }, // December 2023- { conversationId: '3', updatedAt: '2023-02-01T12:00:00Z' }, // February 2023- { conversationId: '4', updatedAt: '2023-11-01T12:00:00Z' }, // November 2023- { conversationId: '5', updatedAt: '2022-12-01T12:00:00Z' }, // December 2022+ { conversationId: '1', updatedAt: '2023-01-01T12:00:00Z' },+ { conversationId: '2', updatedAt: '2023-12-01T12:00:00Z' },+ { conversationId: '3', updatedAt: '2023-02-01T12:00:00Z' },+ { conversationId: '4', updatedAt: '2023-11-01T12:00:00Z' },+ { conversationId: '5', updatedAt: '2022-12-01T12:00:00Z' },];const grouped = groupConversationsByDate(conversations as TConversation[]);- // Check if the years are in the correct order (most recent first)- expect(grouped.map(([key]) => key)).toEqual([' 2023', ' 2022']);+ // Now expect grouping by year for 2023 and 2022+ const expectedGroups = [' 2023', ' 2022'];+ expect(grouped.map(([key]) => key)).toEqual(expectedGroups);- // Check if conversations within 2023 are sorted correctly by month+ // Check if conversations within 2023 are sorted correctly by updatedAt descendingconst conversationsIn2023 = grouped[0][1];- const monthsIn2023 = conversationsIn2023.map((c) => new Date(c.updatedAt).getMonth());- expect(monthsIn2023).toEqual([11, 10, 1, 0]); // December (11), November (10), February (1), January (0)+ const sorted = [...conversationsIn2023].sort(+ (a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),+ );+ expect(conversationsIn2023).toEqual(sorted);// Check if the conversation from 2022 is in its own groupexpect(grouped[1][1].length).toBe(1);@@ -156,19 +100,19 @@ describe('Conversation Utilities', () => {it('handles conversations from multiple years correctly', () => {const conversations = [- { conversationId: '1', updatedAt: '2023-01-01T12:00:00Z' }, // January 2023- { conversationId: '2', updatedAt: '2022-12-01T12:00:00Z' }, // December 2022- { conversationId: '3', updatedAt: '2021-06-01T12:00:00Z' }, // June 2021- { conversationId: '4', updatedAt: '2023-06-01T12:00:00Z' }, // June 2023- { conversationId: '5', updatedAt: '2021-12-01T12:00:00Z' }, // December 2021+ { conversationId: '1', updatedAt: '2023-01-01T12:00:00Z' },+ { conversationId: '2', updatedAt: '2022-12-01T12:00:00Z' },+ { conversationId: '3', updatedAt: '2021-06-01T12:00:00Z' },+ { conversationId: '4', updatedAt: '2023-06-01T12:00:00Z' },+ { conversationId: '5', updatedAt: '2021-12-01T12:00:00Z' },];const grouped = groupConversationsByDate(conversations as TConversation[]);expect(grouped.map(([key]) => key)).toEqual([' 2023', ' 2022', ' 2021']);- expect(grouped[0][1].map((c) => new Date(c.updatedAt).getMonth())).toEqual([5, 0]); // June, January- expect(grouped[1][1].map((c) => new Date(c.updatedAt).getMonth())).toEqual([11]); // December- expect(grouped[2][1].map((c) => new Date(c.updatedAt).getMonth())).toEqual([11, 5]); // December, June+ expect(grouped[0][1].map((c) => new Date(c.updatedAt).getFullYear())).toEqual([2023, 2023]);+ expect(grouped[1][1].map((c) => new Date(c.updatedAt).getFullYear())).toEqual([2022]);+ expect(grouped[2][1].map((c) => new Date(c.updatedAt).getFullYear())).toEqual([2021, 2021]);});it('handles conversations from the same month correctly', () => {@@ -185,28 +129,6 @@ describe('Conversation Utilities', () => {expect(grouped[0][1].map((c) => c.conversationId)).toEqual(['3', '2', '1']);});- it('handles conversations from today, yesterday, and previous days correctly', () => {- const today = new Date();- const yesterday = new Date(today);- yesterday.setDate(yesterday.getDate() - 1);- const twoDaysAgo = new Date(today);- twoDaysAgo.setDate(twoDaysAgo.getDate() - 2);-- const conversations = [- { conversationId: '1', updatedAt: today.toISOString() },- { conversationId: '2', updatedAt: yesterday.toISOString() },- { conversationId: '3', updatedAt: twoDaysAgo.toISOString() },- ];-- const grouped = groupConversationsByDate(conversations as TConversation[]);-- expect(grouped.map(([key]) => key)).toEqual([- dateKeys.today,- dateKeys.yesterday,- dateKeys.previous7Days,- ]);- });-it('handles conversations with null or undefined updatedAt correctly', () => {const conversations = [{ conversationId: '1', updatedAt: '2023-06-01T12:00:00Z' },@@ -216,17 +138,11 @@ describe('Conversation Utilities', () => {const grouped = groupConversationsByDate(conversations as TConversation[]);- expect(grouped.length).toBe(2); // One group for 2023 and one for today (null/undefined dates)+ expect(grouped.length).toBe(2);expect(grouped[0][0]).toBe(dateKeys.today);- expect(grouped[0][1].length).toBe(2); // Two conversations with null/undefined dates+ expect(grouped[0][1].length).toBe(2);expect(grouped[1][0]).toBe(' 2023');- expect(grouped[1][1].length).toBe(1); // One conversation from 2023- });-- it('handles an empty array of conversations', () => {- const grouped = groupConversationsByDate([]);-- expect(grouped).toEqual([]);+ expect(grouped[1][1].length).toBe(1);});it('correctly groups and sorts conversations for every month of the year', () => {@@ -259,205 +175,22 @@ describe('Conversation Utilities', () => {const grouped = groupConversationsByDate(conversations as TConversation[]);- // Check that we have two year groups- expect(grouped.length).toBe(2);-- // Check 2023 months- const group2023 = grouped.find(([key]) => key === ' 2023') ?? [];+ // All 2023 conversations should be in a single group+ const group2023 = grouped.find(([key]) => key === ' 2023');expect(group2023).toBeDefined();- const grouped2023 = group2023[1];- expect(grouped2023?.length).toBe(12);- expect(grouped2023?.map((c) => new Date(c.updatedAt).getMonth())).toEqual([- 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,- ]);+ expect(group2023![1].length).toBe(12);- // Check 2022 months- const group2022 = grouped.find(([key]) => key === ' 2022') ?? [];+ // All 2022 conversations should be in a single group+ const group2022 = grouped.find(([key]) => key === ' 2022');expect(group2022).toBeDefined();- const grouped2022 = group2022[1];- expect(grouped2022?.length).toBe(12);- expect(grouped2022?.map((c) => new Date(c.updatedAt).getMonth())).toEqual([- 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,- ]);+ expect(group2022![1].length).toBe(12);// Check that all conversations are accounted for- const totalGroupedConversations =- // eslint-disable-next-line @typescript-eslint/no-unused-vars- grouped.reduce((total, [_, convos]) => total + convos.length, 0);- expect(totalGroupedConversations).toBe(conversations.length);-- // Check that the years are in the correct order- const yearOrder = grouped.map(([key]) => key);- expect(yearOrder).toEqual([' 2023', ' 2022']);- });- });-- describe('addConversation', () => {- it('adds a new conversation to the top of the list', () => {- const data = { pages: [{ conversations: [] }] };- const newConversation = {- conversationId: Constants.NEW_CONVO,- updatedAt: '2023-04-02T12:00:00Z',- };- const newData = addConversation(- data as unknown as ConversationData,- newConversation as TConversation,- );- expect(newData.pages[0].conversations).toHaveLength(1);- expect(newData.pages[0].conversations[0].conversationId).toBe(Constants.NEW_CONVO);- });- });-- describe('updateConversation', () => {- it('updates an existing conversation and moves it to the top', () => {- const initialData = {- pages: [- {- conversations: [- { conversationId: '1', updatedAt: '2023-04-01T12:00:00Z' },- { conversationId: '2', updatedAt: '2023-04-01T13:00:00Z' },- ],- },- ],- };- const updatedConversation = { conversationId: '1', updatedAt: '2023-04-02T12:00:00Z' };- const newData = updateConversation(- initialData as unknown as ConversationData,- updatedConversation as TConversation,- );- expect(newData.pages[0].conversations).toHaveLength(2);- expect(newData.pages[0].conversations[0].conversationId).toBe('1');- });- });-- describe('updateConvoFields', () => {- it('updates specific fields of a conversation', () => {- const initialData = {- pages: [- {- conversations: [- { conversationId: '1', title: 'Old Title', updatedAt: '2023-04-01T12:00:00Z' },- ],- },- ],- };- const updatedFields = { conversationId: '1', title: 'New Title' };- const newData = updateConvoFields(- initialData as ConversationData,- updatedFields as TConversation,- );- expect(newData.pages[0].conversations[0].title).toBe('New Title');- });- });-- describe('deleteConversation', () => {- it('removes a conversation by id', () => {- const initialData = {- pages: [- {- conversations: [- { conversationId: '1', updatedAt: '2023-04-01T12:00:00Z' },- { conversationId: '2', updatedAt: '2023-04-01T13:00:00Z' },- ],- },- ],- };- const newData = deleteConversation(initialData as ConversationData, '1');- expect(newData.pages[0].conversations).toHaveLength(1);- expect(newData.pages[0].conversations[0].conversationId).not.toBe('1');- });- });-- describe('findPageForConversation', () => {- it('finds the correct page and index for a given conversation', () => {- const data = {- pages: [- {- conversations: [- { conversationId: '1', updatedAt: '2023-04-01T12:00:00Z' },- { conversationId: '2', updatedAt: '2023-04-02T13:00:00Z' },- ],- },- ],- };- const { pageIndex, index } = findPageForConversation(data as ConversationData, {- conversationId: '2',- });- expect(pageIndex).toBe(0);- expect(index).toBe(1);- });- });-});--describe('Conversation Utilities with Fake Data', () => {- describe('groupConversationsByDate', () => {- it('correctly groups conversations from fake data by date', () => {- const { pages } = convoData;- const allConversations = pages.flatMap((p) => p.conversations);- const grouped = groupConversationsByDate(allConversations);-- expect(grouped).toHaveLength(1);- expect(grouped[0][1]).toBeInstanceOf(Array);- });- });-- describe('addConversation', () => {- it('adds a new conversation to the existing fake data', () => {- const newConversation = {- conversationId: Constants.NEW_CONVO,- updatedAt: new Date().toISOString(),- } as TConversation;- const initialLength = convoData.pages[0].conversations.length;- const newData = addConversation(convoData, newConversation);- expect(newData.pages[0].conversations.length).toBe(initialLength + 1);- expect(newData.pages[0].conversations[0].conversationId).toBe(Constants.NEW_CONVO);- });- });-- describe('updateConversation', () => {- it('updates an existing conversation within fake data', () => {- const updatedConversation = {- ...convoData.pages[0].conversations[0],- title: 'Updated Title',- };- const newData = updateConversation(convoData, updatedConversation);- expect(newData.pages[0].conversations[0].title).toBe('Updated Title');- });- });-- describe('updateConvoFields', () => {- it('updates specific fields of a conversation in fake data', () => {- const updatedFields = {- conversationId: convoData.pages[0].conversations[0].conversationId,- title: 'Partially Updated Title',- };- const newData = updateConvoFields(convoData, updatedFields as TConversation);- const updatedConversation = newData.pages[0].conversations.find(- (c) => c.conversationId === updatedFields.conversationId,- );- expect(updatedConversation?.title).toBe('Partially Updated Title');- });- });-- describe('deleteConversation', () => {- it('removes a conversation by id from fake data', () => {- const conversationIdToDelete = convoData.pages[0].conversations[0].conversationId as string;- const newData = deleteConversation(convoData, conversationIdToDelete);- const deletedConvoExists = newData.pages[0].conversations.some(- (c) => c.conversationId === conversationIdToDelete,+ const totalGroupedConversations = grouped.reduce(+ (total, [_, convos]) => total + convos.length,+ 0,);- expect(deletedConvoExists).toBe(false);- });- });-- describe('findPageForConversation', () => {- it('finds the correct page and index for a given conversation in fake data', () => {- const targetConversation = convoData.pages[0].conversations[0];- const { pageIndex, index } = findPageForConversation(convoData, {- conversationId: targetConversation.conversationId as string,- });- expect(pageIndex).toBeGreaterThanOrEqual(0);- expect(index).toBeGreaterThanOrEqual(0);+ expect(totalGroupedConversations).toBe(conversations.length);});});@@ -627,4 +360,277 @@ describe('Conversation Utilities with Fake Data', () => {expect(normalizedData.pageParams).toHaveLength(2);});});++ describe('InfiniteData helpers', () => {+ const makeConversation = (id: string, updatedAt?: string) => ({+ conversationId: id,+ updatedAt: updatedAt || new Date().toISOString(),+ });++ const makePage = (conversations: any[], nextCursor: string | null = null) => ({+ conversations,+ nextCursor,+ });++ describe('findConversationInInfinite', () => {+ it('finds a conversation by id in InfiniteData', () => {+ const data = {+ pages: [+ makePage([makeConversation('1'), makeConversation('2')]),+ makePage([makeConversation('3')]),+ ],+ pageParams: [],+ };+ const found = findConversationInInfinite(data, '2');+ expect(found).toBeDefined();+ expect(found?.conversationId).toBe('2');+ });++ it('returns undefined if conversation not found', () => {+ const data = {+ pages: [makePage([makeConversation('1')])],+ pageParams: [],+ };+ expect(findConversationInInfinite(data, 'notfound')).toBeUndefined();+ });++ it('returns undefined if data is undefined', () => {+ expect(findConversationInInfinite(undefined, '1')).toBeUndefined();+ });+ });++ describe('updateInfiniteConvoPage', () => {+ it('updates a conversation in InfiniteData', () => {+ const data = {+ pages: [makePage([makeConversation('1', '2023-01-01T00:00:00Z'), makeConversation('2')])],+ pageParams: [],+ };+ const updater = (c: any) => ({ ...c, updatedAt: '2024-01-01T00:00:00Z' });+ const updated = updateInfiniteConvoPage(data, '1', updater);+ expect(updated?.pages[0].conversations[0].updatedAt).toBe('2024-01-01T00:00:00Z');+ });++ it('returns original data if conversation not found', () => {+ const data = {+ pages: [makePage([makeConversation('1')])],+ pageParams: [],+ };+ const updater = (c: any) => ({ ...c, foo: 'bar' });+ const updated = updateInfiniteConvoPage(data, 'notfound', updater);+ expect(updated).toEqual(data);+ });++ it('returns undefined if data is undefined', () => {+ expect(updateInfiniteConvoPage(undefined, '1', (c) => c)).toBeUndefined();+ });+ });++ describe('addConversationToInfinitePages', () => {+ it('adds a conversation to the first page', () => {+ const data = {+ pages: [makePage([makeConversation('1')])],+ pageParams: [],+ };+ const newConvo = makeConversation('new');+ const updated = addConversationToInfinitePages(data, newConvo);+ expect(updated.pages[0].conversations[0].conversationId).toBe('new');+ expect(updated.pages[0].conversations[1].conversationId).toBe('1');+ });++ it('creates new InfiniteData if data is undefined', () => {+ const newConvo = makeConversation('new');+ const updated = addConversationToInfinitePages(undefined, newConvo);+ expect(updated.pages[0].conversations[0].conversationId).toBe('new');+ expect(updated.pageParams).toEqual([undefined]);+ });+ });++ describe('removeConvoFromInfinitePages', () => {+ it('removes a conversation by id', () => {+ const data = {+ pages: [+ makePage([makeConversation('1'), makeConversation('2')]),+ makePage([makeConversation('3')]),+ ],+ pageParams: [],+ };+ const updated = removeConvoFromInfinitePages(data, '2');+ expect(updated?.pages[0].conversations.map((c) => c.conversationId)).toEqual(['1']);+ });++ it('removes empty pages after deletion', () => {+ const data = {+ pages: [makePage([makeConversation('1')]), makePage([makeConversation('2')])],+ pageParams: [],+ };+ const updated = removeConvoFromInfinitePages(data, '2');+ expect(updated?.pages.length).toBe(1);+ expect(updated?.pages[0].conversations[0].conversationId).toBe('1');+ });++ it('returns original data if data is undefined', () => {+ expect(removeConvoFromInfinitePages(undefined, '1')).toBeUndefined();+ });+ });++ describe('updateConvoFieldsInfinite', () => {+ it('updates fields and bumps to front if keepPosition is false', () => {+ const data = {+ pages: [+ makePage([makeConversation('1'), makeConversation('2')]),+ makePage([makeConversation('3')]),+ ],+ pageParams: [],+ };+ const updated = updateConvoFieldsInfinite(+ data,+ { conversationId: '2', title: 'new' },+ false,+ );+ expect(updated?.pages[0].conversations[0].conversationId).toBe('2');+ expect(updated?.pages[0].conversations[0].title).toBe('new');+ });++ it('updates fields and keeps position if keepPosition is true', () => {+ const data = {+ pages: [makePage([makeConversation('1'), makeConversation('2')])],+ pageParams: [],+ };+ const updated = updateConvoFieldsInfinite(+ data,+ { conversationId: '2', title: 'stay' },+ true,+ );+ expect(updated?.pages[0].conversations[1].title).toBe('stay');+ });++ it('returns original data if conversation not found', () => {+ const data = {+ pages: [makePage([makeConversation('1')])],+ pageParams: [],+ };+ const updated = updateConvoFieldsInfinite(+ data,+ { conversationId: 'notfound', title: 'x' },+ false,+ );+ expect(updated).toEqual(data);+ });++ it('returns original data if data is undefined', () => {+ expect(+ updateConvoFieldsInfinite(undefined, { conversationId: '1', title: 'x' }, false),+ ).toBeUndefined();+ });+ });++ describe('storeEndpointSettings', () => {+ beforeEach(() => {+ localStorage.clear();+ });++ it('stores model for endpoint', () => {+ const conversation = {+ conversationId: '1',+ endpoint: 'openai',+ model: 'gpt-3',+ };+ storeEndpointSettings(conversation as any);+ const stored = JSON.parse(localStorage.getItem('lastModel') || '{}');+ expect([undefined, 'gpt-3']).toContain(stored.openai);+ });++ it('stores secondaryModel for gptPlugins endpoint', () => {+ const conversation = {+ conversationId: '1',+ endpoint: 'gptPlugins',+ model: 'gpt-4',+ agentOptions: { model: 'plugin-model' },+ };+ storeEndpointSettings(conversation as any);+ const stored = JSON.parse(localStorage.getItem('lastModel') || '{}');+ expect([undefined, 'gpt-4']).toContain(stored.gptPlugins);+ expect([undefined, 'plugin-model']).toContain(stored.secondaryModel);+ });++ it('does nothing if conversation is null', () => {+ storeEndpointSettings(null);+ expect(localStorage.getItem('lastModel')).toBeNull();+ });++ it('does nothing if endpoint is missing', () => {+ storeEndpointSettings({ conversationId: '1', model: 'x' } as any);+ expect(localStorage.getItem('lastModel')).toBeNull();+ });+ });++ describe('QueryClient helpers', () => {+ let queryClient: QueryClient;+ let convoA: TConversation;+ let convoB: TConversation;++ beforeEach(() => {+ queryClient = new QueryClient();+ convoA = {+ conversationId: 'a',+ updatedAt: '2024-01-01T12:00:00Z',+ createdAt: '2024-01-01T10:00:00Z',+ endpoint: 'openai',+ model: 'gpt-3',+ title: 'Conversation A',+ } as TConversation;+ convoB = {+ conversationId: 'b',+ updatedAt: '2024-01-02T12:00:00Z',+ endpoint: 'openai',+ model: 'gpt-3',+ } as TConversation;+ queryClient.setQueryData(['allConversations'], {+ pages: [{ conversations: [convoA], nextCursor: null }],+ pageParams: [],+ });+ });++ it('addConvoToAllQueries adds new on top if not present', () => {+ addConvoToAllQueries(queryClient, convoB);+ const data = queryClient.getQueryData<InfiniteData<any>>(['allConversations']);+ expect(data!.pages[0].conversations[0].conversationId).toBe('b');+ expect(data!.pages[0].conversations.length).toBe(2);+ });++ it('addConvoToAllQueries does not duplicate', () => {+ addConvoToAllQueries(queryClient, convoA);+ const data = queryClient.getQueryData<InfiniteData<any>>(['allConversations']);+ expect(data!.pages[0].conversations.filter((c) => c.conversationId === 'a').length).toBe(1);+ });++ it('updateConvoInAllQueries updates correct convo', () => {+ updateConvoInAllQueries(queryClient, 'a', (c) => ({ ...c, model: 'gpt-4' }));+ const data = queryClient.getQueryData<InfiniteData<any>>(['allConversations']);+ expect(data!.pages[0].conversations[0].model).toBe('gpt-4');+ });++ it('removeConvoFromAllQueries deletes conversation', () => {+ removeConvoFromAllQueries(queryClient, 'a');+ const data = queryClient.getQueryData<InfiniteData<any>>(['allConversations']);+ expect(data!.pages.length).toBe(0);+ });++ it('addConversationToAllConversationsQueries works with multiple pages', () => {+ queryClient.setQueryData(['allConversations', 'other'], {+ pages: [{ conversations: [], nextCursor: null }],+ pageParams: [],+ });+ addConversationToAllConversationsQueries(queryClient, convoB);++ const mainData = queryClient.getQueryData<InfiniteData<any>>(['allConversations']);+ const otherData = queryClient.getQueryData<InfiniteData<any>>([+ 'allConversations',+ 'other',+ ]);+ expect(mainData!.pages[0].conversations[0].conversationId).toBe('b');+ expect(otherData!.pages[0].conversations[0].conversationId).toBe('b');+ });+ });+ });});diff --git a/client/src/utils/convos.ts b/client/src/utils/convos.tsindex e288d814ed..43704d930b 100644--- a/client/src/utils/convos.ts+++ b/client/src/utils/convos.ts@@ -8,17 +8,12 @@ import {startOfYear,isWithinInterval,} from 'date-fns';-import { EModelEndpoint, LocalStorageKeys } from 'librechat-data-provider';-import type {- TConversation,- ConversationData,- GroupedConversations,- ConversationListResponse,-} from 'librechat-data-provider';--import { addData, deleteData, updateData, findPage } from './collection';-import { InfiniteData } from '@tanstack/react-query';+import { QueryClient } from '@tanstack/react-query';+import { EModelEndpoint, LocalStorageKeys, QueryKeys } from 'librechat-data-provider';+import type { TConversation, GroupedConversations } from 'librechat-data-provider';+import type { InfiniteData } from '@tanstack/react-query';+// Date group helpersexport const dateKeys = {today: 'com_ui_date_today',yesterday: 'com_ui_date_yesterday',@@ -73,11 +68,7 @@ const monthOrderMap = new Map([['february', 1],['january', 0],]);--const dateKeysReverse = Object.fromEntries(- Object.entries(dateKeys).map(([key, value]) => [value, key]),-);-+const dateKeysReverse = Object.fromEntries(Object.entries(dateKeys).map(([k, v]) => [v, k]));const dateGroupsSet = new Set([dateKeys.today,dateKeys.yesterday,@@ -91,7 +82,6 @@ export const groupConversationsByDate = (if (!Array.isArray(conversations)) {return [];}-const seenConversationIds = new Set();const groups = new Map();const now = new Date(Date.now());@@ -108,7 +98,6 @@ export const groupConversationsByDate = (} else {date = now;}-const groupName = getGroupName(date);if (!groups.has(groupName)) {groups.set(groupName, []);@@ -117,15 +106,12 @@ export const groupConversationsByDate = (});const sortedGroups = new Map();-- // Add date groups firstdateGroupsSet.forEach((group) => {if (groups.has(group)) {sortedGroups.set(group, groups.get(group));}});- // Sort and add year/month groupsconst yearMonthGroups = Array.from(groups.keys()).filter((group) => !dateGroupsSet.has(group)).sort((a, b) => {@@ -133,141 +119,285 @@ export const groupConversationsByDate = (if (yearA !== yearB) {return yearB - yearA;}-const [monthA, monthB] = [dateKeysReverse[a], dateKeysReverse[b]];- const bOrder = monthOrderMap.get(monthB) ?? -1;- const aOrder = monthOrderMap.get(monthA) ?? -1;+ const bOrder = monthOrderMap.get(monthB) ?? -1,+ aOrder = monthOrderMap.get(monthA) ?? -1;return bOrder - aOrder;});-yearMonthGroups.forEach((group) => {sortedGroups.set(group, groups.get(group));});- // Sort conversations within each groupsortedGroups.forEach((conversations) => {conversations.sort((a: TConversation, b: TConversation) =>new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),);});-return Array.from(sortedGroups, ([key, value]) => [key, value]);};-export const addConversation = (- data: InfiniteData<ConversationListResponse>,- newConversation: TConversation,-): ConversationData => {- return addData<ConversationListResponse, TConversation>(- data,- 'conversations',- newConversation,- (page) =>- page.conversations.findIndex((c) => c.conversationId === newConversation.conversationId),- );+export type ConversationCursorData = {+ conversations: TConversation[];+ nextCursor?: string | null;};-export function findPageForConversation(- data: ConversationData,- conversation: TConversation | { conversationId: string },-) {- return findPage<ConversationListResponse>(data, (page) =>- page.conversations.findIndex((c) => c.conversationId === conversation.conversationId),- );+// === InfiniteData helpers for cursor-based convo queries ===++export function findConversationInInfinite(+ data: InfiniteData<ConversationCursorData> | undefined,+ conversationId: string,+): TConversation | undefined {+ if (!data) {+ return undefined;+ }+ for (const page of data.pages) {+ const found = page.conversations.find((c) => c.conversationId === conversationId);+ if (found) {+ return found;+ }+ }+ return undefined;}-export const updateConversation = (- data: InfiniteData<ConversationListResponse>,- newConversation: TConversation,-): ConversationData => {- return updateData<ConversationListResponse, TConversation>(- data,- 'conversations',- newConversation,- (page) =>- page.conversations.findIndex((c) => c.conversationId === newConversation.conversationId),- );-};+export function updateInfiniteConvoPage(+ data: InfiniteData<ConversationCursorData> | undefined,+ conversationId: string,+ updater: (c: TConversation) => TConversation,+): InfiniteData<ConversationCursorData> | undefined {+ if (!data) {+ return data;+ }+ return {+ ...data,+ pages: data.pages.map((page) => ({+ ...page,+ conversations: page.conversations.map((c) =>+ c.conversationId === conversationId ? updater(c) : c,+ ),+ })),+ };+}-export const updateConvoFields = (- data: ConversationData,- updatedConversation: Partial<TConversation> & Pick<TConversation, 'conversationId'>,- keepPosition = false,-): ConversationData => {- const newData = JSON.parse(JSON.stringify(data));- const { pageIndex, index } = findPageForConversation(- newData,- updatedConversation as { conversationId: string },- );- if (pageIndex !== -1 && index !== -1) {- const oldConversation = newData.pages[pageIndex].conversations[index] as TConversation;+export function addConversationToInfinitePages(+ data: InfiniteData<ConversationCursorData> | undefined,+ newConversation: TConversation,+): InfiniteData<ConversationCursorData> {+ if (!data) {+ return {+ pageParams: [undefined],+ pages: [{ conversations: [newConversation], nextCursor: null }],+ };+ }+ return {+ ...data,+ pages: [+ { ...data.pages[0], conversations: [newConversation, ...data.pages[0].conversations] },+ ...data.pages.slice(1),+ ],+ };+}- /**- * Do not change the position of the conversation if the tags are updated.- */- if (keepPosition) {- const updatedConvo = {- ...oldConversation,- ...updatedConversation,- };- newData.pages[pageIndex].conversations[index] = updatedConvo;- } else {- const updatedConvo = {- ...oldConversation,- ...updatedConversation,- updatedAt: new Date().toISOString(),+export function addConversationToAllConversationsQueries(+ queryClient: QueryClient,+ newConversation: TConversation,+) {+ // Find all keys that start with QueryKeys.allConversations+ const queries = queryClient+ .getQueryCache()+ .findAll([QueryKeys.allConversations], { exact: false });++ for (const query of queries) {+ queryClient.setQueryData<InfiniteData<ConversationCursorData>>(query.queryKey, (old) => {+ if (+ !old ||+ old.pages[0].conversations.some((c) => c.conversationId === newConversation.conversationId)+ ) {+ return old;+ }+ return {+ ...old,+ pages: [+ {+ ...old.pages[0],+ conversations: [newConversation, ...old.pages[0].conversations],+ },+ ...old.pages.slice(1),+ ],};- newData.pages[pageIndex].conversations.splice(index, 1);- newData.pages[0].conversations.unshift(updatedConvo);- }+ });}+}- return newData;-};--export const deleteConversation = (- data: ConversationData,+export function removeConvoFromInfinitePages(+ data: InfiniteData<ConversationCursorData> | undefined,conversationId: string,-): ConversationData => {- return deleteData<ConversationListResponse, ConversationData>(data, 'conversations', (page) =>- page.conversations.findIndex((c) => c.conversationId === conversationId),- );-};--export const getConversationById = (- data: ConversationData | undefined,- conversationId: string | null,-): TConversation | undefined => {- if (!data || !(conversationId ?? '')) {- return undefined;+): InfiniteData<ConversationCursorData> | undefined {+ if (!data) {+ return data;}+ return {+ ...data,+ pages: data.pages+ .map((page) => ({+ ...page,+ conversations: page.conversations.filter((c) => c.conversationId !== conversationId),+ }))+ .filter((page) => page.conversations.length > 0),+ };+}- for (const page of data.pages) {- const conversation = page.conversations.find((c) => c.conversationId === conversationId);- if (conversation) {- return conversation;+// Used for partial update (e.g., title, etc.), updating AND possibly bumping to front of visible convos+export function updateConvoFieldsInfinite(+ data: InfiniteData<ConversationCursorData> | undefined,+ updatedConversation: Partial<TConversation> & { conversationId: string },+ keepPosition = false,+): InfiniteData<ConversationCursorData> | undefined {+ if (!data) {+ return data;+ }+ let found: TConversation | undefined;+ let pageIdx = -1,+ convoIdx = -1;+ for (let i = 0; i < data.pages.length; ++i) {+ const idx = data.pages[i].conversations.findIndex(+ (c) => c.conversationId === updatedConversation.conversationId,+ );+ if (idx !== -1) {+ pageIdx = i;+ convoIdx = idx;+ found = data.pages[i].conversations[idx];+ break;}}- return undefined;-};+ if (!found) {+ return data;+ }++ if (keepPosition) {+ return {+ ...data,+ pages: data.pages.map((page, pi) =>+ pi === pageIdx+ ? {+ ...page,+ conversations: page.conversations.map((c, ci) =>+ ci === convoIdx ? { ...c, ...updatedConversation } : c,+ ),+ }+ : page,+ ),+ };+ } else {+ const patched = { ...found, ...updatedConversation, updatedAt: new Date().toISOString() };+ const pages = data.pages.map((page) => ({+ ...page,+ conversations: page.conversations.filter((c) => c.conversationId !== patched.conversationId),+ }));++ pages[0].conversations = [patched, ...pages[0].conversations];++ const finalPages = pages.filter((page) => page.conversations.length > 0);+ return { ...data, pages: finalPages };+ }+}export function storeEndpointSettings(conversation: TConversation | null) {if (!conversation) {return;}const { endpoint, model, agentOptions } = conversation;-if (!endpoint) {return;}-const lastModel = JSON.parse(localStorage.getItem(LocalStorageKeys.LAST_MODEL) ?? '{}');lastModel[endpoint] = model;-if (endpoint === EModelEndpoint.gptPlugins) {lastModel.secondaryModel = agentOptions?.model ?? model ?? '';}-localStorage.setItem(LocalStorageKeys.LAST_MODEL, JSON.stringify(lastModel));}++// Add+export function addConvoToAllQueries(queryClient: QueryClient, newConvo: TConversation) {+ const queries = queryClient+ .getQueryCache()+ .findAll([QueryKeys.allConversations], { exact: false });++ for (const query of queries) {+ queryClient.setQueryData<InfiniteData<ConversationCursorData>>(query.queryKey, (oldData) => {+ if (!oldData) {+ return oldData;+ }+ if (+ oldData.pages.some((p) =>+ p.conversations.some((c) => c.conversationId === newConvo.conversationId),+ )+ ) {+ return oldData;+ }+ return {+ ...oldData,+ pages: [+ {+ ...oldData.pages[0],+ conversations: [newConvo, ...oldData.pages[0].conversations],+ },+ ...oldData.pages.slice(1),+ ],+ };+ });+ }+}++// Update+export function updateConvoInAllQueries(+ queryClient: QueryClient,+ conversationId: string,+ updater: (c: TConversation) => TConversation,+) {+ const queries = queryClient+ .getQueryCache()+ .findAll([QueryKeys.allConversations], { exact: false });++ for (const query of queries) {+ queryClient.setQueryData<InfiniteData<ConversationCursorData>>(query.queryKey, (oldData) => {+ if (!oldData) {+ return oldData;+ }+ return {+ ...oldData,+ pages: oldData.pages.map((page) => ({+ ...page,+ conversations: page.conversations.map((c) =>+ c.conversationId === conversationId ? updater(c) : c,+ ),+ })),+ };+ });+ }+}++// Remove+export function removeConvoFromAllQueries(queryClient: QueryClient, conversationId: string) {+ const queries = queryClient+ .getQueryCache()+ .findAll([QueryKeys.allConversations], { exact: false });++ for (const query of queries) {+ queryClient.setQueryData<InfiniteData<ConversationCursorData>>(query.queryKey, (oldData) => {+ if (!oldData) {+ return oldData;+ }+ return {+ ...oldData,+ pages: oldData.pages+ .map((page) => ({+ ...page,+ conversations: page.conversations.filter((c) => c.conversationId !== conversationId),+ }))+ .filter((page) => page.conversations.length > 0),+ };+ });+ }+}diff --git a/package-lock.json b/package-lock.jsonindex 018972e8d6..f3a8d6dfa9 100644--- a/package-lock.json+++ b/package-lock.json@@ -55,7 +55,7 @@"@aws-sdk/s3-request-presigner": "^3.758.0","@azure/identity": "^4.7.0","@azure/search-documents": "^12.0.0",- "@azure/storage-blob": "^12.26.0",+ "@azure/storage-blob": "^12.27.0","@google/generative-ai": "^0.23.0","@googleapis/youtube": "^20.0.0","@keyv/redis": "^4.3.3",@@ -64,7 +64,7 @@"@langchain/google-genai": "^0.2.2","@langchain/google-vertexai": "^0.2.3","@langchain/textsplitters": "^0.1.0",- "@librechat/agents": "^2.4.17",+ "@librechat/agents": "^2.4.20","@librechat/data-schemas": "*","@waylaidwanderer/fetch-event-source": "^3.0.1","axios": "^1.8.2",@@ -711,31 +711,6 @@"@langchain/core": ">=0.3.39 <0.4.0"}},- "api/node_modules/@librechat/agents": {- "version": "2.4.17",- "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-2.4.17.tgz",- "integrity": "sha512-lGgOqovIqzaFtO3wUe8LShckJYmFGxa/RAn1edUxmQgK76F4QK53POFivzQhYUxso9z4SNvu1b8q/+vq7lWYaw==",- "dependencies": {- "@langchain/anthropic": "^0.3.16",- "@langchain/aws": "^0.1.7",- "@langchain/community": "^0.3.39",- "@langchain/core": "^0.3.43",- "@langchain/deepseek": "^0.0.1",- "@langchain/google-genai": "^0.2.2",- "@langchain/google-vertexai": "^0.2.3",- "@langchain/langgraph": "^0.2.62",- "@langchain/mistralai": "^0.2.0",- "@langchain/ollama": "^0.2.0",- "@langchain/openai": "^0.5.4",- "@langchain/xai": "^0.0.2",- "dotenv": "^16.4.7",- "https-proxy-agent": "^7.0.6",- "nanoid": "^3.3.7"- },- "engines": {- "node": ">=14.0.0"- }- },"api/node_modules/@types/node": {"version": "18.19.14","resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.14.tgz",@@ -1279,6 +1254,7 @@"@testing-library/user-event": "^14.4.3","@types/jest": "^29.5.14","@types/js-cookie": "^3.0.6",+ "@types/lodash": "^4.17.15","@types/node": "^20.3.0","@types/react": "^18.2.11","@types/react-dom": "^18.2.4",@@ -17628,11 +17604,12 @@}},"node_modules/@langchain/langgraph": {- "version": "0.2.63",- "resolved": "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-0.2.63.tgz",- "integrity": "sha512-gmivnxybyBQkR7lpoBz8emrWRt9jFp0csrlDZTI/SlMJ5F+3DvxbsRyH2edI0RPzL7XpiW9QnFGCLMp6wfGblw==",+ "version": "0.2.64",+ "resolved": "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-0.2.64.tgz",+ "integrity": "sha512-M6lh8ekDoZVCLdA10jeqIsU58LODDzXpP38aeXil5A5pg31IJp5L8O4yBfbp8mRobVX+Bbga5R5ZRyQBQl6NTg==",+ "license": "MIT","dependencies": {- "@langchain/langgraph-checkpoint": "~0.0.16",+ "@langchain/langgraph-checkpoint": "~0.0.17","@langchain/langgraph-sdk": "~0.0.32","uuid": "^10.0.0","zod": "^3.23.8"@@ -17651,9 +17628,10 @@}},"node_modules/@langchain/langgraph-checkpoint": {- "version": "0.0.16",- "resolved": "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-0.0.16.tgz",- "integrity": "sha512-B50l7w9o9353drHsdsD01vhQrCJw0eqvYeXid7oKeoj1Yye+qY90r97xuhiflaYCZHM5VEo2oaizs8oknerZsQ==",+ "version": "0.0.17",+ "resolved": "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-0.0.17.tgz",+ "integrity": "sha512-6b3CuVVYx+7x0uWLG+7YXz9j2iBa+tn2AXvkLxzEvaAsLE6Sij++8PPbS2BZzC+S/FPJdWsz6I5bsrqL0BYrCA==",+ "license": "MIT","dependencies": {"uuid": "^10.0.0"},@@ -17672,6 +17650,7 @@"https://github.com/sponsors/broofa","https://github.com/sponsors/ctavan"],+ "license": "MIT","bin": {"uuid": "dist/bin/uuid"}@@ -17680,6 +17659,7 @@"version": "0.0.66","resolved": "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-0.0.66.tgz","integrity": "sha512-l0V4yfKXhHaTRK/1bKMfZ14k3wWZu27DWTlCUnbYJvdo7os5srhONgPCOqQgpazhi5EhXbW2EVgeu/wLW2zH6Q==",+ "license": "MIT","dependencies": {"@types/json-schema": "^7.0.15","p-queue": "^6.6.2",@@ -17707,6 +17687,7 @@"https://github.com/sponsors/broofa","https://github.com/sponsors/ctavan"],+ "license": "MIT","bin": {"uuid": "dist/bin/uuid"}@@ -17866,132 +17847,736 @@"@lezer/common": "^1.0.0"}},- "node_modules/@librechat/backend": {- "resolved": "api",- "link": true- },- "node_modules/@librechat/data-schemas": {- "resolved": "packages/data-schemas",- "link": true- },- "node_modules/@librechat/frontend": {- "resolved": "client",- "link": true- },- "node_modules/@microsoft/eslint-formatter-sarif": {- "version": "3.1.0",- "resolved": "https://registry.npmjs.org/@microsoft/eslint-formatter-sarif/-/eslint-formatter-sarif-3.1.0.tgz",- "integrity": "sha512-/mn4UXziHzGXnKCg+r8HGgPy+w4RzpgdoqFuqaKOqUVBT5x2CygGefIrO4SusaY7t0C4gyIWMNu6YQT6Jw64Cw==",- "dev": true,+ "node_modules/@librechat/agents": {+ "version": "2.4.20",+ "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-2.4.20.tgz",+ "integrity": "sha512-Wnrx123ZSrGkYE9P/pdXpWmPp+XPsAWrTwk3H3l1nN3UXLqb2E75V3i8UEoFvTMkya006p76+Rt/fHNT9y9E5w==","license": "MIT","dependencies": {- "eslint": "^8.9.0",- "jschardet": "latest",- "lodash": "^4.17.14",- "utf8": "^3.0.0"+ "@langchain/anthropic": "^0.3.16",+ "@langchain/aws": "^0.1.7",+ "@langchain/community": "^0.3.39",+ "@langchain/core": "^0.3.43",+ "@langchain/deepseek": "^0.0.1",+ "@langchain/google-genai": "^0.2.2",+ "@langchain/google-vertexai": "^0.2.3",+ "@langchain/langgraph": "^0.2.62",+ "@langchain/mistralai": "^0.2.0",+ "@langchain/ollama": "^0.2.0",+ "@langchain/openai": "^0.5.4",+ "@langchain/xai": "^0.0.2",+ "dotenv": "^16.4.7",+ "https-proxy-agent": "^7.0.6",+ "nanoid": "^3.3.7"},"engines": {- "node": ">= 14"+ "node": ">=14.0.0"}},- "node_modules/@microsoft/eslint-formatter-sarif/node_modules/@eslint/eslintrc": {- "version": "2.1.4",- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",- "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",- "dev": true,+ "node_modules/@librechat/agents/node_modules/@langchain/community": {+ "version": "0.3.40",+ "resolved": "https://registry.npmjs.org/@langchain/community/-/community-0.3.40.tgz",+ "integrity": "sha512-UvpEebdFKJsjFBKeUOvvYHOEFsUcjZnyU1qNirtDajwjzTJlszXtv+Mq8F6w5mJsznpI9x7ZMNzAqydVxMG5hA==","license": "MIT","dependencies": {- "ajv": "^6.12.4",- "debug": "^4.3.2",- "espree": "^9.6.0",- "globals": "^13.19.0",- "ignore": "^5.2.0",- "import-fresh": "^3.2.1",+ "@langchain/openai": ">=0.2.0 <0.6.0",+ "binary-extensions": "^2.2.0",+ "expr-eval": "^2.0.2",+ "flat": "^5.0.2","js-yaml": "^4.1.0",- "minimatch": "^3.1.2",- "strip-json-comments": "^3.1.1"- },- "engines": {- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"+ "langchain": ">=0.2.3 <0.3.0 || >=0.3.4 <0.4.0",+ "langsmith": ">=0.2.8 <0.4.0",+ "uuid": "^10.0.0",+ "zod": "^3.22.3",+ "zod-to-json-schema": "^3.22.5"},- "funding": {- "url": "https://opencollective.com/eslint"- }- },- "node_modules/@microsoft/eslint-formatter-sarif/node_modules/@eslint/js": {- "version": "8.57.1",- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",- "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",- "dev": true,- "license": "MIT","engines": {- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"- }- },- "node_modules/@microsoft/eslint-formatter-sarif/node_modules/ajv": {- "version": "6.12.6",- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",- "dev": true,- "license": "MIT",- "dependencies": {- "fast-deep-equal": "^3.1.1",- "fast-json-stable-stringify": "^2.0.0",- "json-schema-traverse": "^0.4.1",- "uri-js": "^4.2.2"+ "node": ">=18"},- "funding": {- "type": "github",- "url": "https://github.com/sponsors/epoberezkin"- }- },- "node_modules/@microsoft/eslint-formatter-sarif/node_modules/eslint": {- "version": "8.57.1",- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",- "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",- "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",- "dev": true,- "license": "MIT",- "dependencies": {- "@eslint-community/eslint-utils": "^4.2.0",- "@eslint-community/regexpp": "^4.6.1",- "@eslint/eslintrc": "^2.1.4",- "@eslint/js": "8.57.1",- "@humanwhocodes/config-array": "^0.13.0",- "@humanwhocodes/module-importer": "^1.0.1",- "@nodelib/fs.walk": "^1.2.8",- "@ungap/structured-clone": "^1.2.0",- "ajv": "^6.12.4",- "chalk": "^4.0.0",- "cross-spawn": "^7.0.2",- "debug": "^4.3.2",- "doctrine": "^3.0.0",- "escape-string-regexp": "^4.0.0",- "eslint-scope": "^7.2.2",- "eslint-visitor-keys": "^3.4.3",- "espree": "^9.6.1",- "esquery": "^1.4.2",- "esutils": "^2.0.2",- "fast-deep-equal": "^3.1.3",- "file-entry-cache": "^6.0.1",- "find-up": "^5.0.0",- "glob-parent": "^6.0.2",- "globals": "^13.19.0",- "graphemer": "^1.4.0",+ "peerDependencies": {+ "@arcjet/redact": "^v1.0.0-alpha.23",+ "@aws-crypto/sha256-js": "^5.0.0",+ "@aws-sdk/client-bedrock-agent-runtime": "^3.749.0",+ "@aws-sdk/client-bedrock-runtime": "^3.749.0",+ "@aws-sdk/client-dynamodb": "^3.749.0",+ "@aws-sdk/client-kendra": "^3.749.0",+ "@aws-sdk/client-lambda": "^3.749.0",+ "@aws-sdk/client-s3": "^3.749.0",+ "@aws-sdk/client-sagemaker-runtime": "^3.749.0",+ "@aws-sdk/client-sfn": "^3.749.0",+ "@aws-sdk/credential-provider-node": "^3.388.0",+ "@azure/search-documents": "^12.0.0",+ "@azure/storage-blob": "^12.15.0",+ "@browserbasehq/sdk": "*",+ "@browserbasehq/stagehand": "^1.0.0",+ "@clickhouse/client": "^0.2.5",+ "@cloudflare/ai": "*",+ "@datastax/astra-db-ts": "^1.0.0",+ "@elastic/elasticsearch": "^8.4.0",+ "@getmetal/metal-sdk": "*",+ "@getzep/zep-cloud": "^1.0.6",+ "@getzep/zep-js": "^0.9.0",+ "@gomomento/sdk": "^1.51.1",+ "@gomomento/sdk-core": "^1.51.1",+ "@google-ai/generativelanguage": "*",+ "@google-cloud/storage": "^6.10.1 || ^7.7.0",+ "@gradientai/nodejs-sdk": "^1.2.0",+ "@huggingface/inference": "^2.6.4",+ "@huggingface/transformers": "^3.2.3",+ "@ibm-cloud/watsonx-ai": "*",+ "@lancedb/lancedb": "^0.12.0",+ "@langchain/core": ">=0.2.21 <0.4.0",+ "@layerup/layerup-security": "^1.5.12",+ "@libsql/client": "^0.14.0",+ "@mendable/firecrawl-js": "^1.4.3",+ "@mlc-ai/web-llm": "*",+ "@mozilla/readability": "*",+ "@neondatabase/serverless": "*",+ "@notionhq/client": "^2.2.10",+ "@opensearch-project/opensearch": "*",+ "@pinecone-database/pinecone": "*",+ "@planetscale/database": "^1.8.0",+ "@premai/prem-sdk": "^0.3.25",+ "@qdrant/js-client-rest": "^1.8.2",+ "@raycast/api": "^1.55.2",+ "@rockset/client": "^0.9.1",+ "@smithy/eventstream-codec": "^2.0.5",+ "@smithy/protocol-http": "^3.0.6",+ "@smithy/signature-v4": "^2.0.10",+ "@smithy/util-utf8": "^2.0.0",+ "@spider-cloud/spider-client": "^0.0.21",+ "@supabase/supabase-js": "^2.45.0",+ "@tensorflow-models/universal-sentence-encoder": "*",+ "@tensorflow/tfjs-converter": "*",+ "@tensorflow/tfjs-core": "*",+ "@upstash/ratelimit": "^1.1.3 || ^2.0.3",+ "@upstash/redis": "^1.20.6",+ "@upstash/vector": "^1.1.1",+ "@vercel/kv": "*",+ "@vercel/postgres": "*",+ "@writerai/writer-sdk": "^0.40.2",+ "@xata.io/client": "^0.28.0",+ "@zilliz/milvus2-sdk-node": ">=2.3.5",+ "apify-client": "^2.7.1",+ "assemblyai": "^4.6.0",+ "azion": "^1.11.1",+ "better-sqlite3": ">=9.4.0 <12.0.0",+ "cassandra-driver": "^4.7.2",+ "cborg": "^4.1.1",+ "cheerio": "^1.0.0-rc.12",+ "chromadb": "*",+ "closevector-common": "0.1.3",+ "closevector-node": "0.1.6",+ "closevector-web": "0.1.6",+ "cohere-ai": "*",+ "convex": "^1.3.1",+ "crypto-js": "^4.2.0",+ "d3-dsv": "^2.0.0",+ "discord.js": "^14.14.1",+ "dria": "^0.0.3",+ "duck-duck-scrape": "^2.2.5",+ "epub2": "^3.0.1",+ "fast-xml-parser": "*",+ "firebase-admin": "^11.9.0 || ^12.0.0",+ "google-auth-library": "*",+ "googleapis": "*",+ "hnswlib-node": "^3.0.0",+ "html-to-text": "^9.0.5",+ "ibm-cloud-sdk-core": "*","ignore": "^5.2.0",- "imurmurhash": "^0.1.4",- "is-glob": "^4.0.0",- "is-path-inside": "^3.0.3",- "js-yaml": "^4.1.0",- "json-stable-stringify-without-jsonify": "^1.0.1",- "levn": "^0.4.1",- "lodash.merge": "^4.6.2",- "minimatch": "^3.1.2",- "natural-compare": "^1.4.0",- "optionator": "^0.9.3",- "strip-ansi": "^6.0.1",- "text-table": "^0.2.0"- },+ "interface-datastore": "^8.2.11",+ "ioredis": "^5.3.2",+ "it-all": "^3.0.4",+ "jsdom": "*",+ "jsonwebtoken": "^9.0.2",+ "llmonitor": "^0.5.9",+ "lodash": "^4.17.21",+ "lunary": "^0.7.10",+ "mammoth": "^1.6.0",+ "mariadb": "^3.4.0",+ "mem0ai": "^2.1.8",+ "mongodb": ">=5.2.0",+ "mysql2": "^3.9.8",+ "neo4j-driver": "*",+ "notion-to-md": "^3.1.0",+ "officeparser": "^4.0.4",+ "openai": "*",+ "pdf-parse": "1.1.1",+ "pg": "^8.11.0",+ "pg-copy-streams": "^6.0.5",+ "pickleparser": "^0.2.1",+ "playwright": "^1.32.1",+ "portkey-ai": "^0.1.11",+ "puppeteer": "*",+ "pyodide": ">=0.24.1 <0.27.0",+ "redis": "*",+ "replicate": "*",+ "sonix-speech-recognition": "^2.1.1",+ "srt-parser-2": "^1.2.3",+ "typeorm": "^0.3.20",+ "typesense": "^1.5.3",+ "usearch": "^1.1.1",+ "voy-search": "0.6.2",+ "weaviate-ts-client": "*",+ "web-auth-library": "^1.0.3",+ "word-extractor": "*",+ "ws": "^8.14.2",+ "youtubei.js": "*"+ },+ "peerDependenciesMeta": {+ "@arcjet/redact": {+ "optional": true+ },+ "@aws-crypto/sha256-js": {+ "optional": true+ },+ "@aws-sdk/client-bedrock-agent-runtime": {+ "optional": true+ },+ "@aws-sdk/client-bedrock-runtime": {+ "optional": true+ },+ "@aws-sdk/client-dynamodb": {+ "optional": true+ },+ "@aws-sdk/client-kendra": {+ "optional": true+ },+ "@aws-sdk/client-lambda": {+ "optional": true+ },+ "@aws-sdk/client-s3": {+ "optional": true+ },+ "@aws-sdk/client-sagemaker-runtime": {+ "optional": true+ },+ "@aws-sdk/client-sfn": {+ "optional": true+ },+ "@aws-sdk/credential-provider-node": {+ "optional": true+ },+ "@aws-sdk/dsql-signer": {+ "optional": true+ },+ "@azure/search-documents": {+ "optional": true+ },+ "@azure/storage-blob": {+ "optional": true+ },+ "@browserbasehq/sdk": {+ "optional": true+ },+ "@clickhouse/client": {+ "optional": true+ },+ "@cloudflare/ai": {+ "optional": true+ },+ "@datastax/astra-db-ts": {+ "optional": true+ },+ "@elastic/elasticsearch": {+ "optional": true+ },+ "@getmetal/metal-sdk": {+ "optional": true+ },+ "@getzep/zep-cloud": {+ "optional": true+ },+ "@getzep/zep-js": {+ "optional": true+ },+ "@gomomento/sdk": {+ "optional": true+ },+ "@gomomento/sdk-core": {+ "optional": true+ },+ "@google-ai/generativelanguage": {+ "optional": true+ },+ "@google-cloud/storage": {+ "optional": true+ },+ "@gradientai/nodejs-sdk": {+ "optional": true+ },+ "@huggingface/inference": {+ "optional": true+ },+ "@huggingface/transformers": {+ "optional": true+ },+ "@lancedb/lancedb": {+ "optional": true+ },+ "@layerup/layerup-security": {+ "optional": true+ },+ "@libsql/client": {+ "optional": true+ },+ "@mendable/firecrawl-js": {+ "optional": true+ },+ "@mlc-ai/web-llm": {+ "optional": true+ },+ "@mozilla/readability": {+ "optional": true+ },+ "@neondatabase/serverless": {+ "optional": true+ },+ "@notionhq/client": {+ "optional": true+ },+ "@opensearch-project/opensearch": {+ "optional": true+ },+ "@pinecone-database/pinecone": {+ "optional": true+ },+ "@planetscale/database": {+ "optional": true+ },+ "@premai/prem-sdk": {+ "optional": true+ },+ "@qdrant/js-client-rest": {+ "optional": true+ },+ "@raycast/api": {+ "optional": true+ },+ "@rockset/client": {+ "optional": true+ },+ "@smithy/eventstream-codec": {+ "optional": true+ },+ "@smithy/protocol-http": {+ "optional": true+ },+ "@smithy/signature-v4": {+ "optional": true+ },+ "@smithy/util-utf8": {+ "optional": true+ },+ "@spider-cloud/spider-client": {+ "optional": true+ },+ "@supabase/supabase-js": {+ "optional": true+ },+ "@tensorflow-models/universal-sentence-encoder": {+ "optional": true+ },+ "@tensorflow/tfjs-converter": {+ "optional": true+ },+ "@tensorflow/tfjs-core": {+ "optional": true+ },+ "@upstash/ratelimit": {+ "optional": true+ },+ "@upstash/redis": {+ "optional": true+ },+ "@upstash/vector": {+ "optional": true+ },+ "@vercel/kv": {+ "optional": true+ },+ "@vercel/postgres": {+ "optional": true+ },+ "@writerai/writer-sdk": {+ "optional": true+ },+ "@xata.io/client": {+ "optional": true+ },+ "@zilliz/milvus2-sdk-node": {+ "optional": true+ },+ "apify-client": {+ "optional": true+ },+ "assemblyai": {+ "optional": true+ },+ "azion": {+ "optional": true+ },+ "better-sqlite3": {+ "optional": true+ },+ "cassandra-driver": {+ "optional": true+ },+ "cborg": {+ "optional": true+ },+ "cheerio": {+ "optional": true+ },+ "chromadb": {+ "optional": true+ },+ "closevector-common": {+ "optional": true+ },+ "closevector-node": {+ "optional": true+ },+ "closevector-web": {+ "optional": true+ },+ "cohere-ai": {+ "optional": true+ },+ "convex": {+ "optional": true+ },+ "crypto-js": {+ "optional": true+ },+ "d3-dsv": {+ "optional": true+ },+ "discord.js": {+ "optional": true+ },+ "dria": {+ "optional": true+ },+ "duck-duck-scrape": {+ "optional": true+ },+ "epub2": {+ "optional": true+ },+ "fast-xml-parser": {+ "optional": true+ },+ "firebase-admin": {+ "optional": true+ },+ "google-auth-library": {+ "optional": true+ },+ "googleapis": {+ "optional": true+ },+ "hnswlib-node": {+ "optional": true+ },+ "html-to-text": {+ "optional": true+ },+ "ignore": {+ "optional": true+ },+ "interface-datastore": {+ "optional": true+ },+ "ioredis": {+ "optional": true+ },+ "it-all": {+ "optional": true+ },+ "jsdom": {+ "optional": true+ },+ "jsonwebtoken": {+ "optional": true+ },+ "llmonitor": {+ "optional": true+ },+ "lodash": {+ "optional": true+ },+ "lunary": {+ "optional": true+ },+ "mammoth": {+ "optional": true+ },+ "mariadb": {+ "optional": true+ },+ "mem0ai": {+ "optional": true+ },+ "mongodb": {+ "optional": true+ },+ "mysql2": {+ "optional": true+ },+ "neo4j-driver": {+ "optional": true+ },+ "notion-to-md": {+ "optional": true+ },+ "officeparser": {+ "optional": true+ },+ "pdf-parse": {+ "optional": true+ },+ "pg": {+ "optional": true+ },+ "pg-copy-streams": {+ "optional": true+ },+ "pickleparser": {+ "optional": true+ },+ "playwright": {+ "optional": true+ },+ "portkey-ai": {+ "optional": true+ },+ "puppeteer": {+ "optional": true+ },+ "pyodide": {+ "optional": true+ },+ "redis": {+ "optional": true+ },+ "replicate": {+ "optional": true+ },+ "sonix-speech-recognition": {+ "optional": true+ },+ "srt-parser-2": {+ "optional": true+ },+ "typeorm": {+ "optional": true+ },+ "typesense": {+ "optional": true+ },+ "usearch": {+ "optional": true+ },+ "voy-search": {+ "optional": true+ },+ "weaviate-ts-client": {+ "optional": true+ },+ "web-auth-library": {+ "optional": true+ },+ "word-extractor": {+ "optional": true+ },+ "ws": {+ "optional": true+ },+ "youtubei.js": {+ "optional": true+ }+ }+ },+ "node_modules/@librechat/agents/node_modules/@langchain/openai": {+ "version": "0.5.5",+ "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.5.5.tgz",+ "integrity": "sha512-QwdZrWcx6FB+UMKQ6+a0M9ZXzeUnZCwXP7ltqCCycPzdfiwxg3TQ6WkSefdEyiPpJcVVq/9HZSxrzGmf18QGyw==",+ "license": "MIT",+ "dependencies": {+ "js-tiktoken": "^1.0.12",+ "openai": "^4.87.3",+ "zod": "^3.22.4",+ "zod-to-json-schema": "^3.22.3"+ },+ "engines": {+ "node": ">=18"+ },+ "peerDependencies": {+ "@langchain/core": ">=0.3.39 <0.4.0"+ }+ },+ "node_modules/@librechat/agents/node_modules/agent-base": {+ "version": "7.1.3",+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",+ "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",+ "license": "MIT",+ "engines": {+ "node": ">= 14"+ }+ },+ "node_modules/@librechat/agents/node_modules/https-proxy-agent": {+ "version": "7.0.6",+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",+ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",+ "license": "MIT",+ "dependencies": {+ "agent-base": "^7.1.2",+ "debug": "4"+ },+ "engines": {+ "node": ">= 14"+ }+ },+ "node_modules/@librechat/agents/node_modules/uuid": {+ "version": "10.0.0",+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",+ "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",+ "funding": [+ "https://github.com/sponsors/broofa",+ "https://github.com/sponsors/ctavan"+ ],+ "license": "MIT",+ "bin": {+ "uuid": "dist/bin/uuid"+ }+ },+ "node_modules/@librechat/backend": {+ "resolved": "api",+ "link": true+ },+ "node_modules/@librechat/data-schemas": {+ "resolved": "packages/data-schemas",+ "link": true+ },+ "node_modules/@librechat/frontend": {+ "resolved": "client",+ "link": true+ },+ "node_modules/@microsoft/eslint-formatter-sarif": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/@microsoft/eslint-formatter-sarif/-/eslint-formatter-sarif-3.1.0.tgz",+ "integrity": "sha512-/mn4UXziHzGXnKCg+r8HGgPy+w4RzpgdoqFuqaKOqUVBT5x2CygGefIrO4SusaY7t0C4gyIWMNu6YQT6Jw64Cw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "eslint": "^8.9.0",+ "jschardet": "latest",+ "lodash": "^4.17.14",+ "utf8": "^3.0.0"+ },+ "engines": {+ "node": ">= 14"+ }+ },+ "node_modules/@microsoft/eslint-formatter-sarif/node_modules/@eslint/eslintrc": {+ "version": "2.1.4",+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",+ "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "ajv": "^6.12.4",+ "debug": "^4.3.2",+ "espree": "^9.6.0",+ "globals": "^13.19.0",+ "ignore": "^5.2.0",+ "import-fresh": "^3.2.1",+ "js-yaml": "^4.1.0",+ "minimatch": "^3.1.2",+ "strip-json-comments": "^3.1.1"+ },+ "engines": {+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"+ },+ "funding": {+ "url": "https://opencollective.com/eslint"+ }+ },+ "node_modules/@microsoft/eslint-formatter-sarif/node_modules/@eslint/js": {+ "version": "8.57.1",+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",+ "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"+ }+ },+ "node_modules/@microsoft/eslint-formatter-sarif/node_modules/ajv": {+ "version": "6.12.6",+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "fast-deep-equal": "^3.1.1",+ "fast-json-stable-stringify": "^2.0.0",+ "json-schema-traverse": "^0.4.1",+ "uri-js": "^4.2.2"+ },+ "funding": {+ "type": "github",+ "url": "https://github.com/sponsors/epoberezkin"+ }+ },+ "node_modules/@microsoft/eslint-formatter-sarif/node_modules/eslint": {+ "version": "8.57.1",+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",+ "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",+ "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@eslint-community/eslint-utils": "^4.2.0",+ "@eslint-community/regexpp": "^4.6.1",+ "@eslint/eslintrc": "^2.1.4",+ "@eslint/js": "8.57.1",+ "@humanwhocodes/config-array": "^0.13.0",+ "@humanwhocodes/module-importer": "^1.0.1",+ "@nodelib/fs.walk": "^1.2.8",+ "@ungap/structured-clone": "^1.2.0",+ "ajv": "^6.12.4",+ "chalk": "^4.0.0",+ "cross-spawn": "^7.0.2",+ "debug": "^4.3.2",+ "doctrine": "^3.0.0",+ "escape-string-regexp": "^4.0.0",+ "eslint-scope": "^7.2.2",+ "eslint-visitor-keys": "^3.4.3",+ "espree": "^9.6.1",+ "esquery": "^1.4.2",+ "esutils": "^2.0.2",+ "fast-deep-equal": "^3.1.3",+ "file-entry-cache": "^6.0.1",+ "find-up": "^5.0.0",+ "glob-parent": "^6.0.2",+ "globals": "^13.19.0",+ "graphemer": "^1.4.0",+ "ignore": "^5.2.0",+ "imurmurhash": "^0.1.4",+ "is-glob": "^4.0.0",+ "is-path-inside": "^3.0.3",+ "js-yaml": "^4.1.0",+ "json-stable-stringify-without-jsonify": "^1.0.1",+ "levn": "^0.4.1",+ "lodash.merge": "^4.6.2",+ "minimatch": "^3.1.2",+ "natural-compare": "^1.4.0",+ "optionator": "^0.9.3",+ "strip-ansi": "^6.0.1",+ "text-table": "^0.2.0"+ },"bin": {"eslint": "bin/eslint.js"},@@ -22981,6 +23566,13 @@"@types/node": "*"}},+ "node_modules/@types/lodash": {+ "version": "4.17.16",+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz",+ "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==",+ "dev": true,+ "license": "MIT"+ },"node_modules/@types/mdast": {"version": "4.0.4","resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",diff --git a/packages/data-provider/src/api-endpoints.ts b/packages/data-provider/src/api-endpoints.tsindex 142ed9ba20..f839f903b4 100644--- a/packages/data-provider/src/api-endpoints.ts+++ b/packages/data-provider/src/api-endpoints.ts@@ -1,5 +1,24 @@import type { AssistantsEndpoint } from './schemas';+// Testing this buildQuery function+const buildQuery = (params: Record<string, unknown>): string => {+ const query = Object.entries(params)+ .filter(([, value]) => {+ if (Array.isArray(value)) {+ return value.length > 0;+ }+ return value !== undefined && value !== null && value !== '';+ })+ .map(([key, value]) => {+ if (Array.isArray(value)) {+ return value.map((v) => `${key}=${encodeURIComponent(v)}`).join('&');+ }+ return `${key}=${encodeURIComponent(String(value))}`;+ })+ .join('&');+ return query ? `?${query}` : '';+};+export const health = () => '/health';export const user = () => '/api/user';@@ -43,10 +62,24 @@ export const abortRequest = (endpoint: string) => `/api/ask/${endpoint}/abort`;export const conversationsRoot = '/api/convos';-export const conversations = (pageNumber: string, isArchived?: boolean, tags?: string[]) =>- `${conversationsRoot}?pageNumber=${pageNumber}${- isArchived === true ? '&isArchived=true' : ''- }${tags?.map((tag) => `&tags=${tag}`).join('')}`;+export const conversations = (+ isArchived?: boolean,+ sortBy?: 'title' | 'createdAt' | 'updatedAt',+ sortDirection?: 'asc' | 'desc',+ tags?: string[],+ search?: string,+ cursor?: string,+) => {+ const params = {+ isArchived,+ sortBy,+ sortDirection,+ tags,+ search,+ cursor,+ };+ return `${conversationsRoot}${buildQuery(params)}`;+};export const conversationById = (id: string) => `${conversationsRoot}/${id}`;@@ -54,7 +87,9 @@ export const genTitle = () => `${conversationsRoot}/gen_title`;export const updateConversation = () => `${conversationsRoot}/update`;-export const deleteConversation = () => `${conversationsRoot}/clear`;+export const deleteConversation = () => `${conversationsRoot}`;++export const deleteAllConversation = () => `${conversationsRoot}/all`;export const importConversation = () => `${conversationsRoot}/import`;@@ -62,8 +97,8 @@ export const forkConversation = () => `${conversationsRoot}/fork`;export const duplicateConversation = () => `${conversationsRoot}/duplicate`;-export const search = (q: string, pageNumber: string) =>- `/api/search?q=${q}&pageNumber=${pageNumber}`;+export const search = (q: string, cursor?: string | null) =>+ `/api/search?q=${q}${cursor ? `&cursor=${cursor}` : ''}`;export const searchEnabled = () => '/api/search/enable';@@ -244,4 +279,4 @@ export const verifyTwoFactor = () => '/api/auth/2fa/verify';export const confirmTwoFactor = () => '/api/auth/2fa/confirm';export const disableTwoFactor = () => '/api/auth/2fa/disable';export const regenerateBackupCodes = () => '/api/auth/2fa/backup/regenerate';-export const verifyTwoFactorTemp = () => '/api/auth/2fa/verify-temp';\ No newline at end of file+export const verifyTwoFactorTemp = () => '/api/auth/2fa/verify-temp';diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.tsindex fcbaef074f..9742114a37 100644--- a/packages/data-provider/src/config.ts+++ b/packages/data-provider/src/config.ts@@ -1228,6 +1228,8 @@ export enum Constants {NO_PARENT = '00000000-0000-0000-0000-000000000000',/** Standard value for the initial conversationId before a request is sent */NEW_CONVO = 'new',+ /** Standard value for the temporary conversationId after a request is sent and before the server responds */+ PENDING_CONVO = 'PENDING',/** Standard value for the conversationId used for search queries */SEARCH = 'search',/** Fixed, encoded domain length for Azure OpenAI Assistants Function name parsing. */diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.tsindex 78700e7419..2469774b93 100644--- a/packages/data-provider/src/data-service.ts+++ b/packages/data-provider/src/data-service.ts@@ -31,7 +31,10 @@ export function deleteUser(): Promise<s.TPreset> {}export function getMessagesByConvoId(conversationId: string): Promise<s.TMessage[]> {- if (conversationId === 'new') {+ if (+ conversationId === config.Constants.NEW_CONVO ||+ conversationId === config.Constants.PENDING_CONVO+ ) {return Promise.resolve([]);}return request.get(endpoints.messages(conversationId));@@ -589,46 +592,34 @@ export function forkConversation(payload: t.TForkConvoRequest): Promise<t.TForkC}export function deleteConversation(payload: t.TDeleteConversationRequest) {- //todo: this should be a DELETE request- return request.post(endpoints.deleteConversation(), { arg: payload });+ return request.deleteWithOptions(endpoints.deleteConversation(), { data: { arg: payload } });}export function clearAllConversations(): Promise<unknown> {- return request.post(endpoints.deleteConversation(), { arg: {} });+ return request.delete(endpoints.deleteAllConversation());}export const listConversations = (params?: q.ConversationListParams,): Promise<q.ConversationListResponse> => {- // Assuming params has a pageNumber property- const pageNumber = (params?.pageNumber ?? '1') || '1'; // Default to page 1 if not provided- const isArchived = params?.isArchived ?? false; // Default to false if not provided- const tags = params?.tags || []; // Default to an empty array if not provided- return request.get(endpoints.conversations(pageNumber, isArchived, tags));-};--export const listConversationsByQuery = (- params?: q.ConversationListParams & { searchQuery?: string },-): Promise<q.ConversationListResponse> => {- const pageNumber = (params?.pageNumber ?? '1') || '1'; // Default to page 1 if not provided- const searchQuery = params?.searchQuery ?? ''; // If no search query is provided, default to an empty string- // Update the endpoint to handle a search query- if (searchQuery !== '') {- return request.get(endpoints.search(searchQuery, pageNumber));+ const isArchived = params?.isArchived ?? false;+ const sortBy = params?.sortBy;+ const sortDirection = params?.sortDirection;+ const tags = params?.tags || [];+ const search = params?.search || '';+ const cursor = params?.cursor;++ if (search !== '' && isArchived === false) {+ return request.get(endpoints.search(search, cursor));} else {- return request.get(endpoints.conversations(pageNumber));+ return request.get(+ endpoints.conversations(isArchived, sortBy, sortDirection, tags, search, cursor),+ );}};-export const searchConversations = async (- q: string,- pageNumber: string,-): Promise<t.TSearchResults> => {- return request.get(endpoints.search(q, pageNumber));-};--export function getConversations(pageNumber: string): Promise<t.TGetConversationsResponse> {- return request.get(endpoints.conversations(pageNumber));+export function getConversations(cursor: string): Promise<t.TGetConversationsResponse> {+ return request.get(endpoints.conversations(undefined, undefined, undefined, [], '', cursor));}export function getConversationById(id: string): Promise<s.TConversation> {@@ -779,15 +770,11 @@ export function enableTwoFactor(): Promise<t.TEnable2FAResponse> {return request.get(endpoints.enableTwoFactor());}-export function verifyTwoFactor(- payload: t.TVerify2FARequest,-): Promise<t.TVerify2FAResponse> {+export function verifyTwoFactor(payload: t.TVerify2FARequest): Promise<t.TVerify2FAResponse> {return request.post(endpoints.verifyTwoFactor(), payload);}-export function confirmTwoFactor(- payload: t.TVerify2FARequest,-): Promise<t.TVerify2FAResponse> {+export function confirmTwoFactor(payload: t.TVerify2FARequest): Promise<t.TVerify2FAResponse> {return request.post(endpoints.confirmTwoFactor(), payload);}@@ -803,4 +790,4 @@ export function verifyTwoFactorTemp(payload: t.TVerify2FATempRequest,): Promise<t.TVerify2FATempResponse> {return request.post(endpoints.verifyTwoFactorTemp(), payload);-}\ No newline at end of file+}diff --git a/packages/data-provider/src/parsers.ts b/packages/data-provider/src/parsers.tsindex a644f7301c..4be2eba51e 100644--- a/packages/data-provider/src/parsers.ts+++ b/packages/data-provider/src/parsers.ts@@ -29,7 +29,7 @@ type EndpointSchema =| typeof compactAgentsSchema| typeof bedrockInputSchema;-type EndpointSchemaKey = Exclude<EModelEndpoint, EModelEndpoint.chatGPTBrowser>;+export type EndpointSchemaKey = Exclude<EModelEndpoint, EModelEndpoint.chatGPTBrowser>;const endpointSchemas: Record<EndpointSchemaKey, EndpointSchema> = {[EModelEndpoint.openAI]: openAISchema,diff --git a/packages/data-provider/src/react-query/react-query-service.ts b/packages/data-provider/src/react-query/react-query-service.tsindex 03a37d99a7..4ddb5a6ea5 100644--- a/packages/data-provider/src/react-query/react-query-service.ts+++ b/packages/data-provider/src/react-query/react-query-service.ts@@ -4,7 +4,7 @@ import type {UseMutationResult,QueryObserverResult,} from '@tanstack/react-query';-import { initialModelsConfig } from '../config';+import { Constants, initialModelsConfig } from '../config';import { defaultOrderQuery } from '../types/assistants';import * as dataService from '../data-service';import * as m from '../types/mutations';@@ -70,6 +70,10 @@ export const useGetSharedLinkQuery = ([QueryKeys.sharedLinks, conversationId],() => dataService.getSharedLink(conversationId),{+ enabled:+ !!conversationId &&+ conversationId !== Constants.NEW_CONVO &&+ conversationId !== Constants.PENDING_CONVO,refetchOnWindowFocus: false,refetchOnReconnect: false,refetchOnMount: false,@@ -242,23 +246,6 @@ export const useDeletePresetMutation = (): UseMutationResult<});};-export const useSearchQuery = (- searchQuery: string,- pageNumber: string,- config?: UseQueryOptions<t.TSearchResults>,-): QueryObserverResult<t.TSearchResults> => {- return useQuery<t.TSearchResults>(- [QueryKeys.searchResults, pageNumber, searchQuery],- () => dataService.searchConversations(searchQuery, pageNumber),- {- refetchOnWindowFocus: false,- refetchOnReconnect: false,- refetchOnMount: false,- ...config,- },- );-};-export const useUpdateTokenCountMutation = (): UseMutationResult<t.TUpdateTokenCountResponse,unknown,diff --git a/packages/data-provider/src/schemas.ts b/packages/data-provider/src/schemas.tsindex f3335a8942..65187afbe1 100644--- a/packages/data-provider/src/schemas.ts+++ b/packages/data-provider/src/schemas.ts@@ -655,6 +655,8 @@ export const tPresetSchema = tConversationSchemaexport const tConvoUpdateSchema = tConversationSchema.merge(z.object({endpoint: extendedModelEndpointSchema.nullable(),+ createdAt: z.string().optional(),+ updatedAt: z.string().optional(),}),);diff --git a/packages/data-provider/src/types/mutations.ts b/packages/data-provider/src/types/mutations.tsindex e2f358cf7f..72d98b81b6 100644--- a/packages/data-provider/src/types/mutations.ts+++ b/packages/data-provider/src/types/mutations.ts@@ -164,6 +164,11 @@ export type DeleteConversationOptions = MutationOptions<types.TDeleteConversationRequest>;+export type ArchiveConversationOptions = MutationOptions<+ types.TArchiveConversationResponse,+ types.TArchiveConversationRequest+>;+export type DuplicateConvoOptions = MutationOptions<types.TDuplicateConvoResponse,types.TDuplicateConvoRequestdiff --git a/packages/data-provider/src/types/queries.ts b/packages/data-provider/src/types/queries.tsindex 4487728bbc..d6ae0a1af9 100644--- a/packages/data-provider/src/types/queries.ts+++ b/packages/data-provider/src/types/queries.ts@@ -11,25 +11,38 @@ export type Conversation = {conversations: s.TConversation[];};-// Parameters for listing conversations (e.g., for pagination)export type ConversationListParams = {- limit?: number;- before?: string | null;- after?: string | null;- order?: 'asc' | 'desc';- pageNumber: string;- conversationId?: string;+ cursor?: string;isArchived?: boolean;+ sortBy?: 'title' | 'createdAt' | 'updatedAt';+ sortDirection?: 'asc' | 'desc';tags?: string[];+ search?: string;};-// Type for the response from the conversation list API+export type MinimalConversation = Pick<+ s.TConversation,+ 'conversationId' | 'endpoint' | 'title' | 'createdAt' | 'updatedAt' | 'user'+>;+export type ConversationListResponse = {- conversations: s.TConversation[];- pageNumber: string;- pageSize: string | number;- pages: string | number;+ conversations: MinimalConversation[];+ mwssages?: s.TMessage[];+ nextCursor: string | null;+};++export type SearchConversationListParams = {+ nextCursor?: string | null;+ pageSize?: number;+ search: string;+};++export type SearchConversation = Pick<s.TConversation, 'conversationId' | 'title' | 'user'>;++export type SearchConversationListResponse = {+ conversations: SearchConversation[];messages: s.TMessage[];+ nextCursor: string | null;};export type ConversationData = InfiniteData<ConversationListResponse>;