Skip to content

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

🧽 refactor: Remove Dead Client Components, Providers and Barrels (#17116)

Marco Berettad0149ccd9405
diff --git a/client/src/Providers/AgentsContext.tsx b/client/src/Providers/AgentsContext.tsx
deleted file mode 100644
index 0b16b3e2f4..0000000000
--- a/client/src/Providers/AgentsContext.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { createContext, useContext } from 'react';
-import { useForm, FormProvider } from 'react-hook-form';
-import type { UseFormReturn } from 'react-hook-form';
-import type { AgentForm } from '~/common';
-import { getDefaultAgentFormValues } from '~/utils';
-
-type AgentsContextType = UseFormReturn<AgentForm>;
-
-export const AgentsContext = createContext<AgentsContextType>({} as AgentsContextType);
-
-export function useAgentsContext() {
- const context = useContext(AgentsContext);
-
- if (context === undefined) {
- throw new Error('useAgentsContext must be used within an AgentsProvider');
- }
-
- return context;
-}
-
-export default function AgentsProvider({ children }) {
- const methods = useForm<AgentForm>({
- defaultValues: getDefaultAgentFormValues(),
- });
-
- return <FormProvider {...methods}>{children}</FormProvider>;
-}
diff --git a/client/src/Providers/AssistantsContext.tsx b/client/src/Providers/AssistantsContext.tsx
deleted file mode 100644
index adc2ce3ca8..0000000000
--- a/client/src/Providers/AssistantsContext.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { createContext, useContext } from 'react';
-import { useForm, FormProvider } from 'react-hook-form';
-import { defaultAssistantFormValues } from 'librechat-data-provider';
-import type { UseFormReturn } from 'react-hook-form';
-import type { AssistantForm } from '~/common';
-
-type AssistantsContextType = UseFormReturn<AssistantForm>;
-
-export const AssistantsContext = createContext<AssistantsContextType>({} as AssistantsContextType);
-
-export function useAssistantsContext() {
- const context = useContext(AssistantsContext);
-
- if (context === undefined) {
- throw new Error('useAssistantsContext must be used within an AssistantsProvider');
- }
-
- return context;
-}
-
-export default function AssistantsProvider({ children }) {
- const methods = useForm<AssistantForm>({
- defaultValues: defaultAssistantFormValues,
- });
-
- return <FormProvider {...methods}>{children}</FormProvider>;
-}
diff --git a/client/src/Providers/EditorContext.tsx b/client/src/Providers/EditorContext.tsx
index 16e73b6b46..05b41a1db4 100644
--- a/client/src/Providers/EditorContext.tsx
+++ b/client/src/Providers/EditorContext.tsx
@@ -253,16 +253,6 @@ export function useCodeState() {
return context;
}
-/**
- * @deprecated Use useMutationState() and/or useCodeState() instead
- * This hook causes components to re-render on every keystroke
- */
-export function useEditorContext() {
- const mutation = useMutationState();
- const code = useCodeState();
- return { ...mutation, ...code };
-}
-
/**
* The text an artifact's editing surface should show: its active buffer when
* the artifact owns it, the copy retained when another artifact's edit
diff --git a/client/src/Providers/MessagesViewContext.tsx b/client/src/Providers/MessagesViewContext.tsx
index c07c090614..47c56a8cdf 100644
--- a/client/src/Providers/MessagesViewContext.tsx
+++ b/client/src/Providers/MessagesViewContext.tsx
@@ -200,12 +200,3 @@ export function useOptionalMessagesConversation() {
const conversationId = context?.conversationId;
return useMemo(() => ({ conversation, conversationId }), [conversation, conversationId]);
}
-
-/** Hook for components that only need message state */
-export function useMessagesState() {
- const { index, latestMessageId, latestMessageDepth } = useMessagesViewContext();
- return useMemo(
- () => ({ index, latestMessageId, latestMessageDepth }),
- [index, latestMessageId, latestMessageDepth],
- );
-}
diff --git a/client/src/Providers/index.ts b/client/src/Providers/index.ts
index a0c3771c4f..3403d017df 100644
--- a/client/src/Providers/index.ts
+++ b/client/src/Providers/index.ts
@@ -1,5 +1,3 @@
-export { default as AssistantsProvider } from './AssistantsContext';
-export { default as AgentsProvider } from './AgentsContext';
export * from './ActivePanelContext';
export * from './AgentPanelContext';
export * from './ChatContext';
@@ -11,8 +9,6 @@ export * from './ChatFormContext';
export * from './BookmarkContext';
export * from './MessageContext';
export * from './AuthorContext';
-export * from './AssistantsContext';
-export * from './AgentsContext';
export * from './AssistantsMapContext';
export * from './AnnouncerContext';
export * from './AgentsMapContext';
diff --git a/client/src/a11y/LiveMessage.tsx b/client/src/a11y/LiveMessage.tsx
deleted file mode 100644
index b25b48f108..0000000000
--- a/client/src/a11y/LiveMessage.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React, { useEffect, useContext } from 'react';
-import AnnouncerContext from '~/Providers/AnnouncerContext';
-
-interface LiveMessageProps {
- message: string;
- 'aria-live': 'polite' | 'assertive';
- clearOnUnmount?: boolean | 'true' | 'false';
-}
-
-const LiveMessage: React.FC<LiveMessageProps> = ({
- message,
- 'aria-live': ariaLive,
- clearOnUnmount,
-}) => {
- const { announceAssertive, announcePolite } = useContext(AnnouncerContext);
-
- useEffect(() => {
- if (ariaLive === 'assertive') {
- announceAssertive({ message });
- } else if (ariaLive === 'polite') {
- announcePolite({ message });
- }
- }, [message, ariaLive, announceAssertive, announcePolite]);
-
- useEffect(() => {
- return () => {
- if (clearOnUnmount === true || clearOnUnmount === 'true') {
- announceAssertive({ message: '' });
- announcePolite({ message: '' });
- }
- };
- }, [clearOnUnmount, announceAssertive, announcePolite]);
-
- return null;
-};
-
-export default LiveMessage;
diff --git a/client/src/a11y/LiveMessenger.tsx b/client/src/a11y/LiveMessenger.tsx
deleted file mode 100644
index 3dd82232aa..0000000000
--- a/client/src/a11y/LiveMessenger.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import AnnouncerContext from '~/Providers/AnnouncerContext';
-
-interface LiveMessengerProps {
- children: (context: React.ContextType<typeof AnnouncerContext>) => React.ReactNode;
-}
-
-const LiveMessenger: React.FC<LiveMessengerProps> = ({ children }) => (
- <AnnouncerContext.Consumer>{(contextProps) => children(contextProps)}</AnnouncerContext.Consumer>
-);
-
-export default LiveMessenger;
diff --git a/client/src/a11y/MessageBlock.tsx b/client/src/a11y/MessageBlock.tsx
deleted file mode 100644
index 85485cd315..0000000000
--- a/client/src/a11y/MessageBlock.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-interface MessageBlockProps {
- message: string;
- 'aria-live': 'polite' | 'assertive';
-}
-
-const MessageBlock: React.FC<MessageBlockProps> = ({ message, 'aria-live': ariaLive }) => (
- <div className="sr-only" role="log" aria-live={ariaLive}>
- {message}
- </div>
-);
-
-export default MessageBlock;
diff --git a/client/src/common/types.ts b/client/src/common/types.ts
index f741ba17cc..3e0d75715a 100644
--- a/client/src/common/types.ts
+++ b/client/src/common/types.ts
@@ -409,22 +409,6 @@ export type TConfigProps = {
endpoint: t.EModelEndpoint | string;
};
-export type TDangerButtonProps = {
- id: string;
- confirmClear: boolean;
- className?: string;
- disabled?: boolean;
- showText?: boolean;
- mutation?: UseMutationResult<unknown>;
- onClick: () => void;
- infoTextCode: TranslationKeys;
- actionTextCode: TranslationKeys;
- dataTestIdInitial: string;
- dataTestIdConfirm: string;
- infoDescriptionCode?: TranslationKeys;
- confirmActionTextCode?: TranslationKeys;
-};
-
export type TDialogProps = {
open: boolean;
onOpenChange: (open: boolean) => void;
diff --git a/client/src/components/Agents/SmartLoader.tsx b/client/src/components/Agents/SmartLoader.tsx
index b857dd1978..36b31d635a 100644
--- a/client/src/components/Agents/SmartLoader.tsx
+++ b/client/src/components/Agents/SmartLoader.tsx
@@ -1,5 +1,4 @@
import React, { useState, useEffect } from 'react';
-import type { AgentListResponse } from 'librechat-data-provider';
interface SmartLoaderProps {
/** Whether the content is currently loading */
@@ -64,39 +63,4 @@ export const SmartLoader: React.FC<SmartLoaderProps> = ({
return <div className={className}>{children}</div>;
};
-/**
- * Hook to determine if we have meaningful data to show
- * Helps prevent loading states when we already have cached content
- */
-export const useHasData = (data: AgentListResponse | undefined): boolean => {
- if (!data) return false;
-
- // Type guard for object data
- if (typeof data === 'object' && data !== null) {
- // Check for agent list data (AgentListResponse shape, e.g. marketplace pages)
- const agents = data.data;
- if (Array.isArray(agents)) {
- return agents.length > 0;
- }
-
- // Check for agent list data
- if ('agents' in data) {
- const agents = (data as any).agents;
- return Array.isArray(agents) && agents.length > 0;
- }
-
- // Check for single agent data
- if ('id' in data || 'name' in data) {
- return true;
- }
- }
-
- // Check for categories data (array)
- if (Array.isArray(data)) {
- return data.length > 0;
- }
-
- return false;
-};
-
export default SmartLoader;
diff --git a/client/src/components/Agents/tests/Accessibility.spec.tsx b/client/src/components/Agents/tests/Accessibility.spec.tsx
index 1bacdb0cc7..2d799d72e4 100644
--- a/client/src/components/Agents/tests/Accessibility.spec.tsx
+++ b/client/src/components/Agents/tests/Accessibility.spec.tsx
@@ -133,7 +133,6 @@ jest.mock('~/utils/agents', () => ({
// Mock SmartLoader
jest.mock('../SmartLoader', () => ({
SmartLoader: ({ children, isLoading }: any) => (isLoading ? <div>Loading...</div> : children),
- useHasData: jest.fn(() => true),
}));
// Mock AgentDetailContent to avoid testing dialog internals
diff --git a/client/src/components/Agents/tests/SmartLoader.spec.tsx b/client/src/components/Agents/tests/SmartLoader.spec.tsx
index 3d2609c94b..2a86a18587 100644
--- a/client/src/components/Agents/tests/SmartLoader.spec.tsx
+++ b/client/src/components/Agents/tests/SmartLoader.spec.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { render, screen, waitFor, act } from '@testing-library/react';
-import { SmartLoader, useHasData } from '../SmartLoader';
+import { SmartLoader } from '../SmartLoader';
// Mock setTimeout and clearTimeout for testing
jest.useFakeTimers();
@@ -296,104 +296,3 @@ describe('SmartLoader', () => {
});
});
});
-
-describe('useHasData', () => {
- const TestComponent: React.FC<{ data: any }> = ({ data }) => {
- const hasData = useHasData(data);
- return <div data-testid="result">{hasData ? 'has-data' : 'no-data'}</div>;
- };
-
- it('returns false for null data', () => {
- render(<TestComponent data={null} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('returns false for undefined data', () => {
- render(<TestComponent data={undefined} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('detects empty data array (AgentListResponse) as no data', () => {
- render(
- <TestComponent
- data={{ object: 'list', data: [], first_id: '', last_id: '', has_more: false }}
- />,
- );
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('detects non-empty data array (AgentListResponse) as has data', () => {
- render(
- <TestComponent
- data={{
- object: 'list',
- data: [{ id: 'agent_1', name: 'Test Agent' }],
- first_id: 'agent_1',
- last_id: 'agent_1',
- has_more: false,
- }}
- />,
- );
- expect(screen.getByTestId('result')).toHaveTextContent('has-data');
- });
-
- it('detects invalid data property as no data', () => {
- render(<TestComponent data={{ data: 'not-array' }} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('detects empty agents array as no data', () => {
- render(<TestComponent data={{ agents: [] }} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('detects non-empty agents array as has data', () => {
- render(<TestComponent data={{ agents: [{ id: '1', name: 'Test' }] }} />);
- expect(screen.getByTestId('result')).toHaveTextContent('has-data');
- });
-
- it('detects invalid agents property as no data', () => {
- render(<TestComponent data={{ agents: 'not-array' }} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('detects empty array as no data', () => {
- render(<TestComponent data={[]} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('detects non-empty array as has data', () => {
- render(<TestComponent data={[{ name: 'category1' }]} />);
- expect(screen.getByTestId('result')).toHaveTextContent('has-data');
- });
-
- it('detects agent with id as has data', () => {
- render(<TestComponent data={{ id: '123', name: 'Test Agent' }} />);
- expect(screen.getByTestId('result')).toHaveTextContent('has-data');
- });
-
- it('detects agent with name only as has data', () => {
- render(<TestComponent data={{ name: 'Test Agent' }} />);
- expect(screen.getByTestId('result')).toHaveTextContent('has-data');
- });
-
- it('detects object without id or name as no data', () => {
- render(<TestComponent data={{ description: 'Some description' }} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('handles string data as no data', () => {
- render(<TestComponent data="some string" />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('handles number data as no data', () => {
- render(<TestComponent data={42} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-
- it('handles boolean data as no data', () => {
- render(<TestComponent data={true} />);
- expect(screen.getByTestId('result')).toHaveTextContent('no-data');
- });
-});
diff --git a/client/src/components/Artifacts/Code.tsx b/client/src/components/Artifacts/Code.tsx
deleted file mode 100644
index 225c94b014..0000000000
--- a/client/src/components/Artifacts/Code.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import React, { memo, useEffect, useRef, useState } from 'react';
-import rehypeKatex from 'rehype-katex';
-import ReactMarkdown from 'react-markdown';
-import rehypeHighlight from 'rehype-highlight';
-import { handleDoubleClick, langSubset } from '~/utils';
-
-type TCodeProps = {
- inline: boolean;
- className?: string;
- children: React.ReactNode;
-};
-
-export const code: React.ElementType = memo(({ inline, className, children }: TCodeProps) => {
- const match = /language-(\w+)/.exec(className ?? '');
- const lang = match && match[1];
-
- if (inline) {
- return (
- <code onDoubleClick={handleDoubleClick} className={className}>
- {children}
- </code>
- );
- }
-
- return <code className={`hljs language-${lang} !whitespace-pre`}>{children}</code>;
-});
-
-const rehypePlugins = [
- [rehypeKatex],
- [
- rehypeHighlight,
- {
- detect: true,
- ignoreMissing: true,
- subset: langSubset,
- },
- ],
-];
-
-export const CodeMarkdown = memo(
- ({ content = '', isSubmitting }: { content: string; isSubmitting: boolean }) => {
- const scrollRef = useRef<HTMLDivElement>(null);
- const [userScrolled, setUserScrolled] = useState(false);
-
- useEffect(() => {
- const scrollContainer = scrollRef.current;
- if (!scrollContainer) {
- return;
- }
-
- const handleScroll = () => {
- const { scrollTop, scrollHeight, clientHeight } = scrollContainer;
- const isNearBottom = scrollHeight - scrollTop - clientHeight < 50;
-
- if (!isNearBottom) {
- setUserScrolled(true);
- } else {
- setUserScrolled(false);
- }
- };
-
- scrollContainer.addEventListener('scroll', handleScroll);
-
- return () => {
- scrollContainer.removeEventListener('scroll', handleScroll);
- };
- }, []);
-
- useEffect(() => {
- const scrollContainer = scrollRef.current;
- if (!scrollContainer || !isSubmitting || userScrolled) {
- return;
- }
-
- scrollContainer.scrollTop = scrollContainer.scrollHeight;
- }, [content, isSubmitting, userScrolled]);
-
- return (
- <div ref={scrollRef} className="max-h-full overflow-y-auto">
- <ReactMarkdown
- /* @ts-expect-error — rehypePlugins type mismatch between react-markdown and unified PluggableList */
- rehypePlugins={rehypePlugins}
- components={
- { code } as {
- [key: string]: React.ElementType;
- }
- }
- >
- {content}
- </ReactMarkdown>
- </div>
- );
- },
-);
diff --git a/client/src/components/Auth/ApiErrorWatcher.tsx b/client/src/components/Auth/ApiErrorWatcher.tsx
deleted file mode 100644
index d9878a8ac0..0000000000
--- a/client/src/components/Auth/ApiErrorWatcher.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-import { useApiErrorBoundary } from '~/hooks/ApiErrorBoundaryContext';
-
-const ApiErrorWatcher = () => {
- const { error } = useApiErrorBoundary();
- const navigate = useNavigate();
- React.useEffect(() => {
- if (error?.response?.status === 500) {
- // do something with error
- // navigate('/login');
- }
- }, [error, navigate]);
-
- return null;
-};
-
-export default ApiErrorWatcher;
diff --git a/client/src/components/Auth/__tests__/Registration.spec.tsx b/client/src/components/Auth/__tests__/Registration.spec.tsx
index 5fc0f87654..6f9a0fb5a0 100644
--- a/client/src/components/Auth/__tests__/Registration.spec.tsx
+++ b/client/src/components/Auth/__tests__/Registration.spec.tsx
@@ -165,32 +165,6 @@ test('renders registration form', () => {
);
});
-// test('calls registerUser.mutate on registration', async () => {
-// const mutate = jest.fn();
-// const { getByTestId, getByRole, history } = setup({
-// // @ts-ignore - we don't need all parameters of the QueryObserverResult
-// useLoginUserReturnValue: {
-// isLoading: false,
-// mutate: mutate,
-// isError: false,
-// isSuccess: true,
-// },
-// });
-
-// await userEvent.type(getByRole('textbox', { name: /Full name/i }), 'John Doe');
-// await userEvent.type(getByRole('textbox', { name: /Username/i }), 'johndoe');
-// await userEvent.type(getByRole('textbox', { name: /Email/i }), '[email protected]');
-// await userEvent.type(getByTestId('password'), 'password');
-// await userEvent.type(getByTestId('confirm_password'), 'password');
-// await userEvent.click(getByRole('button', { name: /Submit registration/i }));
-
-// console.log(history);
-// waitFor(() => {
-// // expect(mutate).toHaveBeenCalled();
-// expect(history.location.pathname).toBe('/c/new');
-// });
-// });
-
test('shows validation error messages', async () => {
const { getByTestId, getAllByRole, getByRole } = setup();
await userEvent.type(getByRole('textbox', { name: /Full name/i }), 'J');
diff --git a/client/src/components/Auth/index.ts b/client/src/components/Auth/index.ts
index a7cd4fa2dc..bedf9bf002 100644
--- a/client/src/components/Auth/index.ts
+++ b/client/src/components/Auth/index.ts
@@ -2,7 +2,6 @@ export { default as Login } from './Login';
export { default as Registration } from './Registration';
export { default as ResetPassword } from './ResetPassword';
export { default as VerifyEmail } from './VerifyEmail';
-export { default as ApiErrorWatcher } from './ApiErrorWatcher';
export { default as RequestPasswordReset } from './RequestPasswordReset';
export { default as TwoFactorScreen } from './TwoFactorScreen';
export { default as TwoFactorSetupScreen } from './TwoFactorSetupScreen';
diff --git a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
deleted file mode 100644
index b2feb2ff2f..0000000000
--- a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { useCallback, useState } from 'react';
-import {
- Button,
- TrashIcon,
- Label,
- OGDialog,
- OGDialogTrigger,
- TooltipAnchor,
- OGDialogTemplate,
- useToastContext,
-} from '@librechat/client';
-import type { FC } from 'react';
-import { useDeleteConversationTagMutation } from '~/data-provider';
-import { NotificationSeverity } from '~/common';
-import { useLocalize } from '~/hooks';
-
-const DeleteBookmarkButton: FC<{
- bookmark: string;
- tabIndex?: number;
- onFocus?: () => void;
- onBlur?: () => void;
-}> = ({ bookmark, tabIndex = 0, onFocus, onBlur }) => {
- const localize = useLocalize();
- const { showToast } = useToastContext();
- const [open, setOpen] = useState(false);
-
- const deleteBookmarkMutation = useDeleteConversationTagMutation({
- onSuccess: () => {
- showToast({
- message: localize('com_ui_bookmarks_delete_success'),
- });
- },
- onError: () => {
- showToast({
- message: localize('com_ui_bookmarks_delete_error'),
- severity: NotificationSeverity.ERROR,
- });
- },
- });
-
- const confirmDelete = useCallback(async () => {
- await deleteBookmarkMutation.mutateAsync(bookmark);
- }, [bookmark, deleteBookmarkMutation]);
-
- return (
- <>
- <OGDialog open={open} onOpenChange={setOpen}>
- <OGDialogTrigger asChild>
- <TooltipAnchor
- description={localize('com_ui_delete')}
- render={
- <Button
- variant="ghost"
- aria-label={localize('com_ui_bookmarks_delete')}
- tabIndex={tabIndex}
- onFocus={onFocus}
- onBlur={onBlur}
- onClick={() => setOpen(!open)}
- size="icon-sm"
- >
- <TrashIcon />
- </Button>
- }
- />
- </OGDialogTrigger>
- <OGDialogTemplate
- showCloseButton={false}
- title={localize('com_ui_bookmarks_delete')}
- className="w-11/12 max-w-lg"
- main={
- <Label className="text-left text-sm font-medium">
- {localize('com_ui_bookmark_delete_confirm')} {bookmark}
- </Label>
- }
- selection={{
- selectHandler: confirmDelete,
- selectClasses:
- 'bg-surface-destructive hover:bg-surface-destructive-hover text-text-on-status',
- selectText: localize('com_ui_delete'),
- }}
- />
- </OGDialog>
- </>
- );
-};
-
-export default DeleteBookmarkButton;
diff --git a/client/src/components/Bookmarks/EditBookmarkButton.tsx b/client/src/components/Bookmarks/EditBookmarkButton.tsx
deleted file mode 100644
index 4e603f107d..0000000000
--- a/client/src/components/Bookmarks/EditBookmarkButton.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useState } from 'react';
-import { TooltipAnchor, OGDialogTrigger, EditIcon, Button } from '@librechat/client';
-import type { TConversationTag } from 'librechat-data-provider';
-import type { FC } from 'react';
-import BookmarkEditDialog from './BookmarkEditDialog';
-import { useLocalize } from '~/hooks';
-
-const EditBookmarkButton: FC<{
- bookmark: TConversationTag;
- tabIndex?: number;
- onFocus?: () => void;
- onBlur?: () => void;
-}> = ({ bookmark, tabIndex = 0, onFocus, onBlur }) => {
- const localize = useLocalize();
- const [open, setOpen] = useState(false);
-
- return (
- <BookmarkEditDialog
- context="EditBookmarkButton"
- bookmark={bookmark}
- open={open}
- setOpen={setOpen}
- >
- <OGDialogTrigger asChild>
- <TooltipAnchor
- description={localize('com_ui_edit')}
- render={
- <Button
- variant="ghost"
- aria-label={localize('com_ui_bookmarks_edit')}
- tabIndex={tabIndex}
- onFocus={onFocus}
- onBlur={onBlur}
- onClick={() => setOpen(!open)}
- size="icon-sm"
- >
- <EditIcon />
- </Button>
- }
- />
- </OGDialogTrigger>
- </BookmarkEditDialog>
- );
-};
-
-export default EditBookmarkButton;
diff --git a/client/src/components/Bookmarks/index.ts b/client/src/components/Bookmarks/index.ts
index 8b26e892c8..80d9b18151 100644
--- a/client/src/components/Bookmarks/index.ts
+++ b/client/src/components/Bookmarks/index.ts
@@ -1,5 +1,3 @@
-export { default as DeleteBookmarkButton } from './DeleteBookmarkButton';
-export { default as EditBookmarkButton } from './EditBookmarkButton';
export { default as BookmarkEditDialog } from './BookmarkEditDialog';
export { default as BookmarkItems } from './BookmarkItems';
export { default as BookmarkItem } from './BookmarkItem';
diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsx
index 20fdc2d4ab..b7794e52d6 100644
--- a/client/src/components/Chat/Input/ChatForm.tsx
+++ b/client/src/components/Chat/Input/ChatForm.tsx
@@ -91,26 +91,6 @@ import Bar from './Composer/Bar';
import Mention from './Mention';
import store from '~/store';
-export function toRestoredComposerFile(
- file: NonNullable<TMessage['files']>[number],
-): ExtendedFile | null {
- if (!file.file_id) {
- return null;
- }
- return {
- file_id: file.file_id,
- filename: file.filename,
- filepath: file.filepath,
- type: file.type ?? '',
- height: file.height,
- width: file.width,
- size: file.bytes ?? 0,
- progress: 1,
- attached: true,
- llmDeliveryPath: file.llmDeliveryPath,
- };
-}
-
interface ChatFormProps {
index: number;
placeholder?: string;
diff --git a/client/src/components/Chat/Input/Files/AttachFile.tsx b/client/src/components/Chat/Input/Files/AttachFile.tsx
deleted file mode 100644
index 50f230aab7..0000000000
--- a/client/src/components/Chat/Input/Files/AttachFile.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import React, { useRef } from 'react';
-import { FileUpload, TooltipAnchor, AttachmentIcon } from '@librechat/client';
-import type { TConversation } from 'librechat-data-provider';
-import type { ExtendedFile, FileSetter } from '~/common';
-import { useShortcutAriaKey, useShortcutHint } from '~/hooks/useKeyboardShortcuts';
-import { useFileHandlingNoChatContext, useLocalize } from '~/hooks';
-import { cn } from '~/utils';
-
-const AttachFile = ({
- disabled,
- files,
- setFiles,
- setFilesLoading,
- conversation,
-}: {
- disabled?: boolean | null;
- files: Map<string, ExtendedFile>;
- setFiles: FileSetter;
- setFilesLoading: React.Dispatch<React.SetStateAction<boolean>>;
- conversation: TConversation | null;
-}) => {
- const localize = useLocalize();
- const inputRef = useRef<HTMLInputElement>(null);
- const isUploadDisabled = disabled ?? false;
- const tooltipDescription = useShortcutHint('uploadFile', localize('com_sidepanel_attach_files'));
- const ariaKey = useShortcutAriaKey('uploadFile');
-
- const { handleFileChange } = useFileHandlingNoChatContext(undefined, {
- files,
- setFiles,
- setFilesLoading,
- conversation,
- });
-
- return (
- <FileUpload ref={inputRef} handleFileChange={handleFileChange}>
- <TooltipAnchor
- description={tooltipDescription}
- id="attach-file"
- disabled={isUploadDisabled}
- render={
- <button
- type="button"
- aria-label={localize('com_sidepanel_attach_files')}
- aria-keyshortcuts={ariaKey}
- disabled={isUploadDisabled}
- className={cn(
- 'size-theme-control rounded-theme-control-round duration-theme-fast hover:bg-surface-composer-hover focus-visible:ring-text-primary/50 flex items-center justify-center p-1 transition-colors focus-visible:ring-2 focus-visible:outline-hidden',
- )}
- onKeyDownCapture={(e) => {
- if (!inputRef.current) {
- return;
- }
- if (e.key === 'Enter' || e.key === ' ') {
- inputRef.current.value = '';
- inputRef.current.click();
- }
- }}
- onClick={() => {
- if (!inputRef.current) {
- return;
- }
- inputRef.current.value = '';
- inputRef.current.click();
- }}
- >
- <div className="flex w-full items-center justify-center gap-2">
- <AttachmentIcon />
- </div>
- </button>
- }
- />
- </FileUpload>
- );
-};
-
-export default React.memo(AttachFile);
diff --git a/client/src/components/Chat/Input/Files/Table/fakeData.ts b/client/src/components/Chat/Input/Files/Table/fakeData.ts
deleted file mode 100644
index 46f01bd0df..0000000000
--- a/client/src/components/Chat/Input/Files/Table/fakeData.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { FileSources } from 'librechat-data-provider';
-import type { TFile } from 'librechat-data-provider';
-
-export const files: TFile[] = [
- {
- _id: '65b004acd70ce86b9146e9dd',
- file_id: 'file-CbxzlOiGvaG2uwhuAdKXdUpX',
- __v: 0,
- bytes: 18740,
- createdAt: '2024-01-23T18:25:48.153Z',
- filename: 'dataset.xlsx',
- filepath: 'https://api.openai.com/v1/files/file-CbxzlOiGvaG2uwhuAdKXdUpX',
- object: 'file',
- source: FileSources.openai,
- temp_file_id: '63214c34-2d2c-445f-9c60-5cf04c15607c',
- type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
- updatedAt: '2024-01-23T18:25:48.153Z',
- usage: 0,
- user: '652ac880c4102a77fe54c5db',
- embedded: false,
- },
- {
- _id: '65b004abd70ce86b9146e861',
- file_id: '86fe0534-803c-4e88-b730-73ec4187742f',
- __v: 0,
- bytes: 3147861,
- createdAt: '2024-01-23T18:25:47.698Z',
- filename: 'img-337c49c7-fb1f-4a14-939d-40d12de11d5c.png',
- filepath: '/images/652ac880c4102a77fe54c5db/img-337c49c7-fb1f-4a14-939d-40d12de11d5c.png',
- height: 1024,
- object: 'file',
- source: FileSources.local,
- type: 'image/png',
- updatedAt: '2024-01-23T18:25:47.698Z',
- usage: 0,
- user: '652ac880c4102a77fe54c5db',
- width: 1024,
- embedded: false,
- },
- {
- _id: '65b00495d70ce86b9146adc1',
- file_id: 'e301fdff-6fae-48d3-a9a2-c7fe66357890',
- __v: 0,
- bytes: 3147861,
- createdAt: '2024-01-23T18:25:25.324Z',
- filename: 'img-459c76d1-16b7-48f9-9ff7-85ba6464e204.png',
- filepath: '/images/652ac880c4102a77fe54c5db/img-459c76d1-16b7-48f9-9ff7-85ba6464e204.png',
- height: 1024,
- object: 'file',
- source: FileSources.local,
- type: 'image/png',
- updatedAt: '2024-01-23T18:25:25.324Z',
- usage: 0,
- user: '652ac880c4102a77fe54c5db',
- width: 1024,
- embedded: false,
- },
- {
- _id: '65b00494d70ce86b9146ace6',
- file_id: '63cf2058-3ad1-4712-afbe-6b475119c33a',
- __v: 0,
- bytes: 3147861,
- createdAt: '2024-01-23T18:25:25.035Z',
- filename: 'img-c3fb2935-e578-4d72-b397-d1dcb122af67.png',
- filepath: '/images/652ac880c4102a77fe54c5db/img-c3fb2935-e578-4d72-b397-d1dcb122af67.png',
- height: 1024,
- object: 'file',
- source: FileSources.local,
- type: 'image/png',
- updatedAt: '2024-01-23T18:25:25.035Z',
- usage: 0,
- user: '652ac880c4102a77fe54c5db',
- width: 1024,
- embedded: false,
- },
-];
diff --git a/client/src/components/Chat/Input/Files/Table/index.ts b/client/src/components/Chat/Input/Files/Table/index.ts
index 0afb01b247..81bde62694 100644
--- a/client/src/components/Chat/Input/Files/Table/index.ts
+++ b/client/src/components/Chat/Input/Files/Table/index.ts
@@ -1,3 +1,2 @@
export { columns } from './Columns';
export { default as DataTable } from './DataTable';
-export { files } from './fakeData';
diff --git a/client/src/components/Chat/Input/__tests__/ChatForm.attachments.spec.tsx b/client/src/components/Chat/Input/__tests__/ChatForm.attachments.spec.tsx
index f3a0623507..d053229d04 100644
--- a/client/src/components/Chat/Input/__tests__/ChatForm.attachments.spec.tsx
+++ b/client/src/components/Chat/Input/__tests__/ChatForm.attachments.spec.tsx
@@ -13,10 +13,10 @@ import type { TFile, TFileUpload, TConversation } from 'librechat-data-provider'
import type { ChatFormValues, TAskFunction } from '~/common';
import type { TranslationKeys } from '~/hooks/useLocalize';
import { getDraft, getPendingDraftId, setDraft } from '~/utils';
-import ChatForm, { toRestoredComposerFile } from '../ChatForm';
import { ChatContext, ChatFormProvider } from '~/Providers';
import { AuthContextProvider } from '~/hooks/AuthContext';
import * as FileContainer from '../Files/FileContainer';
+import ChatForm from '../ChatForm';
import store from '~/store';
const mockUpload = jest.fn();
@@ -213,23 +213,6 @@ describe('ChatForm attachments', () => {
);
});
- test('preserves extracted-text delivery when restoring a queued attachment', () => {
- expect(
- toRestoredComposerFile({
- file_id: 'stored-doc',
- filename: 'report.docx',
- type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- llmDeliveryPath: 'text',
- }),
- ).toMatchObject({
- file_id: 'stored-doc',
- filename: 'report.docx',
- progress: 1,
- attached: true,
- llmDeliveryPath: 'text',
- });
- });
-
test('keeps the mic disabled until speech settings hydrate', async () => {
const pending = renderComposer({ speechSettingsInitialized: false });
const micName = 'Use microphone';
diff --git a/client/src/components/Chat/Input/__tests__/appearanceTokens.spec.ts b/client/src/components/Chat/Input/__tests__/appearanceTokens.spec.ts
index 9b597b509e..3573c233cf 100644
--- a/client/src/components/Chat/Input/__tests__/appearanceTokens.spec.ts
+++ b/client/src/components/Chat/Input/__tests__/appearanceTokens.spec.ts
@@ -13,7 +13,6 @@ const themedControls = [
* tap-target floor as well as the geometry. */
['DuringRunSendButton.tsx', ['composerSubmitClasses()']],
['TokenUsage/Popover.tsx', ['size-theme-control', 'rounded-theme-control-round']],
- ['Files/AttachFile.tsx', ['size-theme-control', 'rounded-theme-control-round']],
/** The context rail's pills share one recipe built on the composer control classes. */
['chip.ts', ['composerControlClasses()']],
['CodeApprovalMenu.tsx', ['chipClasses']],
diff --git a/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx b/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
index 720f780201..78fa1e141e 100644
--- a/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/CustomMenu.tsx
@@ -140,25 +140,6 @@ export const CustomMenuSeparator = React.forwardRef<HTMLHRElement, Ariakit.MenuS
},
);
-export interface CustomMenuGroupProps extends Ariakit.MenuGroupProps {
- label?: React.ReactNode;
-}
-
-export const CustomMenuGroup = React.forwardRef<HTMLDivElement, CustomMenuGroupProps>(
- function CustomMenuGroup({ label, ...props }, ref) {
- return (
- <Ariakit.MenuGroup ref={ref} {...props} className={cn('', props.className)}>
- {label && (
- <Ariakit.MenuGroupLabel className="cursor-default p-2 text-sm font-medium opacity-60 sm:py-1 sm:text-xs">
- {label}
- </Ariakit.MenuGroupLabel>
- )}
- {props.children}
- </Ariakit.MenuGroup>
- );
- },
-);
-
const SearchableContext = React.createContext(false);
export interface CustomMenuItemProps extends Omit<Ariakit.ComboboxItemProps, 'store'> {
diff --git a/client/src/components/Chat/Menus/UI/MenuItem.tsx b/client/src/components/Chat/Menus/UI/MenuItem.tsx
deleted file mode 100644
index 0b3d134107..0000000000
--- a/client/src/components/Chat/Menus/UI/MenuItem.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import type { FC } from 'react';
-import { cn } from '~/utils';
-
-type MenuItemProps = {
- title: string;
- value?: string;
- selected: boolean;
- description?: string;
- onClick?: () => void;
- hoverCondition?: boolean;
- hoverContent?: React.ReactNode;
- children?: React.ReactNode;
- icon?: React.ReactNode;
- className?: string;
- textClassName?: string;
- // hoverContent?: string;
-} & Record<string, unknown>;
-
-const MenuItem: FC<MenuItemProps> = ({
- title,
- // value,
- description,
- selected,
- // hoverCondition = true,
- // hoverContent,
- icon,
- className = '',
- textClassName = '',
- children,
- onClick,
- ...rest
-}) => {
- return (
- <div
- id={selected ? 'selected-endpoint' : undefined}
- role="option"
- aria-selected={selected}
- aria-label={title}
- data-testid="chat-menu-item"
- className={cn(
- 'group hover:bg-surface-hover m-1.5 flex cursor-pointer gap-2 rounded px-5 py-2.5 !pr-3 text-sm !opacity-100 focus:ring-0 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 md:min-w-[15rem]',
- className || '',
- )}
- tabIndex={0} // Change to 0 to make it focusable
- onClick={onClick}
- onKeyDown={(e) => {
- if (e.key === 'Enter' || e.key === ' ') {
- e.preventDefault();
- if (onClick) {
- onClick();
- }
- }
- }}
- {...rest}
- >
- <div className="flex grow items-center justify-between gap-2">
- <div>
- <div className={cn('flex items-center gap-1')}>
- {icon != null ? icon : null}
- <div className={cn('truncate', textClassName)}>
- {title}
- <div className="text-text-tertiary">{description}</div>
- </div>
- </div>
- </div>
- <div className="flex items-center gap-2">
- {children}
- {selected && (
- <svg
- width="24"
- height="24"
- viewBox="0 0 24 24"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- className="icon-md block"
- >
- <path
- fillRule="evenodd"
- clipRule="evenodd"
- d="M2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12ZM16.0755 7.93219C16.5272 8.25003 16.6356 8.87383 16.3178 9.32549L11.5678 16.0755C11.3931 16.3237 11.1152 16.4792 10.8123 16.4981C10.5093 16.517 10.2142 16.3973 10.0101 16.1727L7.51006 13.4227C7.13855 13.014 7.16867 12.3816 7.57733 12.0101C7.98598 11.6386 8.61843 11.6687 8.98994 12.0773L10.6504 13.9039L14.6822 8.17451C15 7.72284 15.6238 7.61436 16.0755 7.93219Z"
- fill="currentColor"
- />
- </svg>
- )}
- </div>
- </div>
- </div>
- );
-};
-
-export default MenuItem;
diff --git a/client/src/components/Chat/Menus/UI/TitleButton.tsx b/client/src/components/Chat/Menus/UI/TitleButton.tsx
deleted file mode 100644
index f03c93e94e..0000000000
--- a/client/src/components/Chat/Menus/UI/TitleButton.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useState } from 'react';
-import { ChevronDown } from 'lucide-react';
-import { Trigger } from '@radix-ui/react-popover';
-import { useLocalize } from '~/hooks';
-
-export default function TitleButton({ primaryText = '', secondaryText = '' }) {
- const localize = useLocalize();
- const [isExpanded, setIsExpanded] = useState(false);
-
- return (
- <Trigger asChild>
- <button
- className="group hover:bg-surface-hover data-[state=open]:bg-surface-hover flex cursor-pointer items-center gap-2 rounded-lg px-3 py-1.5 text-lg font-medium transition-colors duration-200"
- aria-label={localize('com_ui_endpoint_menu')}
- aria-expanded={isExpanded}
- role="combobox"
- aria-haspopup="listbox"
- aria-controls="llm-endpoint-menu"
- onClick={() => setIsExpanded(!isExpanded)}
- >
- <div>
- <span className="text-text-primary"> {primaryText} </span>
- {!!secondaryText && <span className="text-text-secondary">{secondaryText}</span>}
- </div>
- <ChevronDown className="text-text-secondary size-4" aria-hidden="true" />
- </button>
- </Trigger>
- );
-}
diff --git a/client/src/components/Chat/Menus/UI/index.ts b/client/src/components/Chat/Menus/UI/index.ts
index 80a24c1e72..888ca1afda 100644
--- a/client/src/components/Chat/Menus/UI/index.ts
+++ b/client/src/components/Chat/Menus/UI/index.ts
@@ -1,3 +1 @@
-export { default as MenuItem } from './MenuItem';
export { default as MenuSeparator } from './MenuSeparator';
-export { default as TitleButton } from './TitleButton';
diff --git a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
index 1c61c831ea..dadcdbd6dc 100644
--- a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
@@ -17,7 +17,7 @@ import ProgressText from './ProgressText';
import { scaleImage } from '~/utils';
function computeCancelled(
- isSubmitting: boolean | undefined,
+ isSubmitting: boolean,
initialProgress: number,
hasError: boolean,
runStepStatus?: PartMetadata['runStepStatus'],
@@ -26,21 +26,12 @@ function computeCancelled(
* The step's own terminal status wins when the run emitted one. Checked
* first and not gated on `hasError`, so output parsing cannot demote a step
* the run reported as stopped. Everything below is the pre-existing
- * inference, kept for messages saved before `on_run_step_closed` and for the
- * legacy path that has no submitting signal at all.
+ * inference, kept for messages saved before `on_run_step_closed`.
*/
if (runStepStatus != null) {
return runStepStatus === 'cancelled';
}
- if (isSubmitting !== undefined) {
- return (!isSubmitting && initialProgress < 1) || hasError;
- }
- // Legacy path: in-progress (0 < progress < 1) is never cancelled
- // because legacy image gen lacks a submitting signal.
- if (initialProgress < 1 && initialProgress > 0) {
- return false;
- }
- return hasError;
+ return (!isSubmitting && initialProgress < 1) || hasError;
}
export default function OpenAIImageGen({
@@ -54,7 +45,7 @@ export default function OpenAIImageGen({
runStepStatus,
}: {
initialProgress: number;
- isSubmitting?: boolean;
+ isSubmitting: boolean;
toolName?: string;
args: string | Record<string, unknown>;
output?: string | null;
@@ -82,9 +73,7 @@ export default function OpenAIImageGen({
/**
* Determines if the image generation was cancelled.
- * - Agent path (isSubmitting defined): cancelled if not submitting + incomplete, or on error.
- * - Legacy path (isSubmitting undefined): in-progress (0 < progress < 1) is never cancelled
- * because legacy image gen lacks a submitting signal — only errors cancel.
+ * Cancelled if not submitting + incomplete, or on error.
*/
const cancelled = computeCancelled(isSubmitting, initialProgress, hasError, runStepStatus);
/**
diff --git a/client/src/components/Chat/Messages/MinimalMessages.tsx b/client/src/components/Chat/Messages/MinimalMessages.tsx
deleted file mode 100644
index c2cdf5d4c0..0000000000
--- a/client/src/components/Chat/Messages/MinimalMessages.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-import { MessageSurfaceContext } from './ui/surface';
-import { cn } from '~/utils';
-
-const MinimalMessages = React.forwardRef(
- (
- props: { children: React.ReactNode; className?: string },
- ref: React.ForwardedRef<HTMLDivElement>,
- ) => {
- return (
- <div
- className={cn(
- 'bg-surface-secondary relative flex w-full grow overflow-hidden',
- props.className,
- )}
- >
- <div className="bg-surface-secondary relative h-full w-full flex-1 overflow-auto">
- <div className="flex h-full flex-col" role="presentation" tabIndex={0}>
- <div className="flex-1 overflow-hidden overflow-y-auto">
- <div className="relative h-full">
- <div
- ref={ref}
- className="overflow-y-auto"
- style={{
- height: '100%',
- width: '100%',
- }}
- >
- <div className="flex flex-col pb-9 text-sm">
- <MessageSurfaceContext.Provider value="bg-surface-secondary">
- {props.children}
- </MessageSurfaceContext.Provider>
- <div className="group h-0 w-full shrink-0" />
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- );
- },
-);
-
-export default MinimalMessages;
diff --git a/client/src/components/Chat/PullRequest/index.ts b/client/src/components/Chat/PullRequest/index.ts
index b87d27e106..505e79db72 100644
--- a/client/src/components/Chat/PullRequest/index.ts
+++ b/client/src/components/Chat/PullRequest/index.ts
@@ -1,3 +1,2 @@
export { default as PullRequestChip } from './Chip';
export { default as usePullRequestMenu } from './menu';
-export { default as PullRequestRowMark } from './RowMark';
diff --git a/client/src/components/Chat/Subagents/index.ts b/client/src/components/Chat/Subagents/index.ts
deleted file mode 100644
index 2eba22288f..0000000000
--- a/client/src/components/Chat/Subagents/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SubagentThreadPanel } from './SubagentThreadPanel';
diff --git a/client/src/components/Chat/Trace/__tests__/preview.test.ts b/client/src/components/Chat/Trace/__tests__/preview.test.ts
index 9760c4a7c8..6784ea54bb 100644
--- a/client/src/components/Chat/Trace/__tests__/preview.test.ts
+++ b/client/src/components/Chat/Trace/__tests__/preview.test.ts
@@ -1,13 +1,10 @@
import { ContentTypes } from 'librechat-data-provider';
import type { TMessage, TTraceRecord } from 'librechat-data-provider';
-import {
- buildPreviews,
- buildStepPreviews,
- buildPreviewIndex,
- buildMessagePreview,
-} from '../preview';
+import { buildPreviews, buildPreviewIndex, buildMessagePreview } from '../preview';
import { buildTraceModel } from '../model';
+const buildStepPreviews = (message: TMessage | undefined) => buildMessagePreview(message).steps;
+
const BASE = Date.UTC(2026, 8, 12, 11, 30, 0);
const at = (offsetMs: number) => new Date(BASE + offsetMs).toISOString();
diff --git a/client/src/components/Chat/Trace/preview.ts b/client/src/components/Chat/Trace/preview.ts
index c20b183b0d..6eedc3383f 100644
--- a/client/src/components/Chat/Trace/preview.ts
+++ b/client/src/components/Chat/Trace/preview.ts
@@ -218,10 +218,6 @@ export function buildMessagePreview(message: TMessage | undefined): MessagePrevi
return { steps, finalOnly, parallel, labels };
}
-export function buildStepPreviews(message: TMessage | undefined): StepPreview[] {
- return buildMessagePreview(message).steps;
-}
-
/**
* The one-line preview each ledger row shows beside its record's name, taken
* from the chat's own message rather than from the tracing backend: the text a
diff --git a/client/src/components/Conversations/ConvoOptions/index.js b/client/src/components/Conversations/ConvoOptions/index.js
deleted file mode 100644
index c294bb45ce..0000000000
--- a/client/src/components/Conversations/ConvoOptions/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-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/HoverToggle.tsx b/client/src/components/Conversations/HoverToggle.tsx
deleted file mode 100644
index 8a9f4beda5..0000000000
--- a/client/src/components/Conversations/HoverToggle.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { ToggleContext } from './ToggleContext';
-import { cn } from '~/utils';
-
-const HoverToggle = ({
- children,
- isActiveConvo,
- isPopoverActive,
- setIsPopoverActive,
- className = 'absolute bottom-0 right-0 top-0',
- onClick,
-}: {
- children: React.ReactNode;
- isActiveConvo: boolean;
- isPopoverActive: boolean;
- setIsPopoverActive: (isActive: boolean) => void;
- className?: string;
- onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;
-}) => {
- const setPopoverActive = (value: boolean) => setIsPopoverActive(value);
- return (
- <ToggleContext.Provider value={{ isPopoverActive, setPopoverActive }}>
- <div
- onClick={onClick}
- className={cn(
- 'peer text-text-primary items-center gap-1.5 rounded-r-lg pr-2 pl-2',
- isPopoverActive || isActiveConvo ? 'flex' : 'hidden group-hover:flex',
- isActiveConvo
- ? 'from-surface-secondary group-hover:from-surface-nav-selected from-85% to-transparent group-hover:bg-gradient-to-l'
- : 'from-surface-secondary hover:from-surface-nav-hover z-50 from-0% to-transparent hover:bg-gradient-to-l',
- isPopoverActive && !isActiveConvo ? 'from-surface-secondary' : '',
- className,
- )}
- >
- {children}
- </div>
- </ToggleContext.Provider>
- );
-};
-
-export default HoverToggle;
diff --git a/client/src/components/Conversations/Pages.tsx b/client/src/components/Conversations/Pages.tsx
deleted file mode 100644
index 329f16e9f3..0000000000
--- a/client/src/components/Conversations/Pages.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react';
-import { Button } from '@librechat/client';
-import { useLocalize } from '~/hooks';
-
-type TPagesProps = {
- pages: number;
- pageNumber: number;
- setPageNumber: (pageNumber: number) => void;
- nextPage: () => Promise<void>;
- previousPage: () => Promise<void>;
-};
-
-export default function Pages({
- pageNumber,
- pages,
- nextPage,
- previousPage,
- setPageNumber,
-}: TPagesProps) {
- const localize = useLocalize();
- const clickHandler =
- (func: () => Promise<void>) => async (e: React.MouseEvent<HTMLButtonElement>) => {
- e.preventDefault();
- await func();
- };
-
- if (pageNumber > pages) {
- setPageNumber(pages);
- }
-
- return pageNumber == 1 && pages == 1 ? null : (
- <div className="m-auto mb-2 mt-4 flex items-center justify-center gap-2">
- <Button
- variant="ghost"
- size="sm"
- aria-label={localize('com_ui_prev')}
- onClick={clickHandler(previousPage)}
- className={
- 'm-auto flex gap-2 text-text-primary disabled:text-text-tertiary' +
- (pageNumber <= 1 ? ' hidden-visibility' : '')
- }
- disabled={pageNumber <= 1}
- >
- &lt;
- </Button>
- <span className="flex-none text-text-tertiary">
- {pageNumber} / {pages}
- </span>
- <Button
- variant="ghost"
- size="sm"
- aria-label={localize('com_ui_next')}
- onClick={clickHandler(nextPage)}
- className={
- 'm-auto flex gap-2 text-text-primary disabled:text-text-tertiary' +
- (pageNumber >= pages ? ' hidden-visibility' : '')
- }
- disabled={pageNumber >= pages}
- >
- &gt;
- </Button>
- </div>
- );
-}
diff --git a/client/src/components/Conversations/ToggleContext.ts b/client/src/components/Conversations/ToggleContext.ts
deleted file mode 100644
index af85b85149..0000000000
--- a/client/src/components/Conversations/ToggleContext.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createContext, useContext } from 'react';
-
-const defaultFunction: (value: boolean) => void = () => ({});
-export const ToggleContext = createContext({
- setPopoverActive: defaultFunction,
- isPopoverActive: false,
-});
-
-export const useToggle = () => useContext(ToggleContext);
diff --git a/client/src/components/Conversations/focus.ts b/client/src/components/Conversations/focus.ts
index 408b884f47..2ce57b2927 100644
--- a/client/src/components/Conversations/focus.ts
+++ b/client/src/components/Conversations/focus.ts
@@ -64,13 +64,6 @@ export const resolveRowBeside = (row: HTMLElement | null): HTMLElement | null =>
export const focusableInRow = (row: HTMLElement | null): HTMLElement | null =>
row ? focusableWithin(row) : null;
-/** Resolves and focuses in one step, for removals that happen synchronously. */
-export const focusRowBeside = (row: HTMLElement | null): boolean => {
- const target = resolveRowBeside(row);
- target?.focus();
- return target != null && document.activeElement === target;
-};
-
/**
* Focuses the first surviving row in `scope`, falling back to the New Chat
* button. For removals that report back only once the row is already gone, so
diff --git a/client/src/components/Conversations/index.ts b/client/src/components/Conversations/index.ts
index 8dd22dc9f8..e9e5daddbf 100644
--- a/client/src/components/Conversations/index.ts
+++ b/client/src/components/Conversations/index.ts
@@ -1,4 +1,3 @@
export { default as Fork } from '../Chat/Messages/Fork';
-export { default as Pages } from './Pages';
export { default as Conversations } from './Conversations';
export * from './ConvoOptions';
diff --git a/client/src/components/Endpoints/AlternativeSettings.tsx b/client/src/components/Endpoints/AlternativeSettings.tsx
deleted file mode 100644
index 89c9742531..0000000000
--- a/client/src/components/Endpoints/AlternativeSettings.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useRecoilValue } from 'recoil';
-import { SettingsViews } from 'librechat-data-provider';
-import type { TSettingsProps } from '~/common';
-import { Advanced } from './Settings';
-import { cn } from '~/utils';
-import store from '~/store';
-
-export default function AlternativeSettings({
- conversation,
- setOption,
- isPreset = false,
- className = '',
-}: TSettingsProps) {
- const currentSettingsView = useRecoilValue(store.currentSettingsView);
- if (!conversation?.endpoint || currentSettingsView === SettingsViews.default) {
- return null;
- }
-
- return (
- <div
- className={cn(
- 'hide-scrollbar h-[min(31.25rem,70vh)] overflow-y-auto md:mb-2 md:h-[min(21.875rem,70vh)]',
- className,
- )}
- >
- <Advanced conversation={conversation} setOption={setOption} isPreset={isPreset} />
- </div>
- );
-}
diff --git a/client/src/components/Endpoints/Settings/Advanced.tsx b/client/src/components/Endpoints/Settings/Advanced.tsx
deleted file mode 100644
index 292b78a71f..0000000000
--- a/client/src/components/Endpoints/Settings/Advanced.tsx
+++ /dev/null
@@ -1,331 +0,0 @@
-import TextareaAutosize from 'react-textarea-autosize';
-import { ImageDetail, imageDetailNumeric, imageDetailValue } from 'librechat-data-provider';
-import {
- Input,
- Label,
- Switch,
- Slider,
- HoverCard,
- InputNumber,
- HoverCardTrigger,
-} from '@librechat/client';
-import type { ValueType } from '@rc-component/mini-decimal';
-import type { TModelSelectProps } from '~/common';
-import { cn, defaultTextProps, optionText, removeFocusOutlines } from '~/utils';
-import { useLocalize, useDebouncedInput } from '~/hooks';
-import OptionHover from './OptionHover';
-import { ESide } from '~/common';
-
-export default function Settings({
- conversation,
- setOption,
- readonly,
-}: Omit<TModelSelectProps, 'models'>) {
- /* This is an unfinished component for future update */
- const localize = useLocalize();
- const {
- endpoint,
- endpointType,
- chatGptLabel,
- promptPrefix,
- temperature,
- top_p: topP,
- frequency_penalty: freqP,
- presence_penalty: presP,
- resendFiles,
- imageDetail,
- } = conversation ?? {};
- const [setChatGptLabel, chatGptLabelValue] = useDebouncedInput({
- setOption,
- optionKey: 'chatGptLabel',
- initialValue: chatGptLabel,
- });
- const [setPromptPrefix, promptPrefixValue] = useDebouncedInput({
- setOption,
- optionKey: 'promptPrefix',
- initialValue: promptPrefix,
- });
- const [setTemperature, temperatureValue] = useDebouncedInput({
- setOption,
- optionKey: 'temperature',
- initialValue: temperature,
- });
- const [setTopP, topPValue] = useDebouncedInput({
- setOption,
- optionKey: 'top_p',
- initialValue: topP,
- });
- const [setFreqP, freqPValue] = useDebouncedInput({
- setOption,
- optionKey: 'frequency_penalty',
- initialValue: freqP,
- });
- const [setPresP, presPValue] = useDebouncedInput({
- setOption,
- optionKey: 'presence_penalty',
- initialValue: presP,
- });
-
- if (!conversation) {
- return null;
- }
-
- const setResendFiles = setOption('resendFiles');
- const setImageDetail = setOption('imageDetail');
-
- const optionEndpoint = endpointType ?? endpoint;
-
- return (
- <div className="grid grid-cols-5 gap-6">
- <div className="col-span-5 flex flex-col items-center justify-start gap-6 sm:col-span-3">
- <div className="grid w-full items-center gap-2">
- <Label htmlFor="chatGptLabel" className="text-left text-sm font-medium">
- {localize('com_endpoint_custom_name')}{' '}
- <small className="high-contrast:opacity-100 opacity-40">
- ({localize('com_endpoint_default_blank')})
- </small>
- </Label>
- <Input
- id="chatGptLabel"
- disabled={readonly}
- value={(chatGptLabelValue as string) || ''}
- onChange={setChatGptLabel}
- placeholder={localize('com_endpoint_openai_custom_name_placeholder')}
- className={cn(
- defaultTextProps,
- 'flex h-10 max-h-10 w-full resize-none px-3 py-2',
- removeFocusOutlines,
- )}
- />
- </div>
- <div className="grid w-full items-center gap-2">
- <Label htmlFor="promptPrefix" className="text-left text-sm font-medium">
- {localize('com_endpoint_prompt_prefix')}{' '}
- <small className="high-contrast:opacity-100 opacity-40">
- ({localize('com_endpoint_default_blank')})
- </small>
- </Label>
- <TextareaAutosize
- id="promptPrefix"
- disabled={readonly}
- value={(promptPrefixValue as string) || ''}
- onChange={setPromptPrefix}
- placeholder={localize('com_endpoint_openai_prompt_prefix_placeholder')}
- className={cn(
- defaultTextProps,
- 'flex max-h-[8.625rem] min-h-[6.25rem] w-full resize-none px-3 py-2',
- )}
- />
- </div>
- </div>
- <div className="col-span-5 flex flex-col items-center justify-start gap-6 px-3 sm:col-span-2">
- <HoverCard openDelay={300}>
- <HoverCardTrigger className="grid w-full items-center gap-2">
- <div className="flex justify-between">
- <Label htmlFor="temp-int" className="text-left text-sm font-medium">
- {localize('com_endpoint_temperature')}{' '}
- <small className="high-contrast:opacity-100 opacity-40">
- ({localize('com_endpoint_default_with_num', { 0: '1' })})
- </small>
- </Label>
- <InputNumber
- id="temp-int"
- disabled={readonly}
- value={temperatureValue as number}
- onChange={setTemperature as (value: ValueType | null) => void}
- max={2}
- min={0}
- step={0.01}
- controls={false}
- variant="option"
- className="w-12"
- />
- </div>
- <Slider
- disabled={readonly}
- value={[(temperatureValue as number) ?? 1]}
- onValueChange={(value) => setTemperature(value[0])}
- onDoubleClick={() => setTemperature(1)}
- max={2}
- min={0}
- step={0.01}
- className="flex h-4 w-full"
- aria-labelledby="temp-int"
- />
- </HoverCardTrigger>
- <OptionHover endpoint={optionEndpoint ?? ''} type="temp" side={ESide.Left} />
- </HoverCard>
- <HoverCard openDelay={300}>
- <HoverCardTrigger className="grid w-full items-center gap-2">
- <div className="flex justify-between">
- <Label htmlFor="top-p-int" className="text-left text-sm font-medium">
- {localize('com_endpoint_top_p')}{' '}
- <small className="high-contrast:opacity-100 opacity-40">
- ({localize('com_endpoint_default_with_num', { 0: '1' })})
- </small>
- </Label>
- <InputNumber
- id="top-p-int"
- disabled={readonly}
- value={topPValue as number}
- onChange={(value) => setTopP(Number(value))}
- max={1}
- min={0}
- step={0.01}
- controls={false}
- variant="option"
- className="w-12"
- />
- </div>
- <Slider
- disabled={readonly}
- value={[(topPValue as number) ?? 1]}
- onValueChange={(value) => setTopP(value[0])}
- onDoubleClick={() => setTopP(1)}
- max={1}
- min={0}
- step={0.01}
- className="flex h-4 w-full"
- aria-labelledby="top-p-int"
- />
- </HoverCardTrigger>
- <OptionHover endpoint={optionEndpoint ?? ''} type="topp" side={ESide.Left} />
- </HoverCard>
-
- <HoverCard openDelay={300}>
- <HoverCardTrigger className="grid w-full items-center gap-2">
- <div className="flex justify-between">
- <Label htmlFor="freq-penalty-int" className="text-left text-sm font-medium">
- {localize('com_endpoint_frequency_penalty')}{' '}
- <small className="high-contrast:opacity-100 opacity-40">
- ({localize('com_endpoint_default_with_num', { 0: '0' })})
- </small>
- </Label>
- <InputNumber
- id="freq-penalty-int"
- disabled={readonly}
- value={freqPValue as number}
- onChange={(value) => setFreqP(Number(value))}
- max={2}
- min={-2}
- step={0.01}
- controls={false}
- variant="option"
- className="w-12"
- />
- </div>
- <Slider
- disabled={readonly}
- value={[(freqPValue as number) ?? 0]}
- onValueChange={(value) => setFreqP(value[0])}
- onDoubleClick={() => setFreqP(0)}
- max={2}
- min={-2}
- step={0.01}
- className="flex h-4 w-full"
- aria-labelledby="freq-penalty-int"
- />
- </HoverCardTrigger>
- <OptionHover endpoint={optionEndpoint ?? ''} type="freq" side={ESide.Left} />
- </HoverCard>
-
- <HoverCard openDelay={300}>
- <HoverCardTrigger className="grid w-full items-center gap-2">
- <div className="flex justify-between">
- <Label htmlFor="pres-penalty-int" className="text-left text-sm font-medium">
- {localize('com_endpoint_presence_penalty')}{' '}
- <small className="high-contrast:opacity-100 opacity-40">
- ({localize('com_endpoint_default_with_num', { 0: '0' })})
- </small>
- </Label>
- <InputNumber
- id="pres-penalty-int"
- disabled={readonly}
- value={presPValue as number}
- onChange={(value) => setPresP(Number(value))}
- max={2}
- min={-2}
- step={0.01}
- controls={false}
- variant="option"
- className="w-12"
- />
- </div>
- <Slider
- disabled={readonly}
- value={[(presPValue as number) ?? 0]}
- onValueChange={(value) => setPresP(value[0])}
- onDoubleClick={() => setPresP(0)}
- max={2}
- min={-2}
- step={0.01}
- className="flex h-4 w-full"
- aria-labelledby="pres-penalty-int"
- />
- </HoverCardTrigger>
- <OptionHover endpoint={optionEndpoint ?? ''} type="pres" side={ESide.Left} />
- </HoverCard>
- <div className="w-full">
- <div className="mb-2 flex w-full justify-between gap-2">
- <Label
- htmlFor="resend-files"
- className="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
- >
- <small>{localize('com_endpoint_plug_resend_files')}</small>
- </Label>
- <Label
- htmlFor="image-detail-value"
- className="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
- >
- <small>{localize('com_endpoint_plug_image_detail')}</small>
- </Label>
- <Input
- id="image-detail-value"
- disabled={true}
- value={imageDetail ?? ImageDetail.auto}
- className={cn(
- defaultTextProps,
- optionText,
- 'border-border-light focus:ring-ring-primary flex rounded-md bg-transparent py-2 text-xs focus:ring-2 focus:ring-offset-2',
- 'group-hover/temp:border-border-light pointer-events-none max-h-5 w-12 border-0',
- )}
- />
- </div>
- <div className="flex w-full justify-between gap-2">
- <HoverCard openDelay={500}>
- <HoverCardTrigger>
- <Switch
- id="resend-files"
- checked={resendFiles ?? true}
- onCheckedChange={(checked: boolean) => setResendFiles(checked)}
- disabled={readonly}
- className="flex"
- aria-label={localize('com_endpoint_plug_resend_files')}
- />
- <OptionHover endpoint={optionEndpoint ?? ''} type="resend" side={ESide.Bottom} />
- </HoverCardTrigger>
- </HoverCard>
- <HoverCard openDelay={500}>
- <HoverCardTrigger className="flex w-[52%] md:w-[7.8125rem]">
- <Slider
- id="image-detail-slider"
- disabled={readonly}
- value={[
- imageDetailNumeric[imageDetail ?? ''] ?? imageDetailNumeric[ImageDetail.auto],
- ]}
- onValueChange={(value) => setImageDetail(imageDetailValue[value[0]])}
- onDoubleClick={() => setImageDetail(ImageDetail.auto)}
- max={2}
- min={0}
- step={1}
- aria-label={localize('com_endpoint_plug_image_detail')}
- />
- <OptionHover endpoint={optionEndpoint ?? ''} type="detail" side={ESide.Bottom} />
- </HoverCardTrigger>
- </HoverCard>
- </div>
- </div>
- </div>
- </div>
- );
-}
diff --git a/client/src/components/Endpoints/Settings/MultiView/GoogleSettings.tsx b/client/src/components/Endpoints/Settings/MultiView/GoogleSettings.tsx
index da78647842..3b7cc7eff2 100644
--- a/client/src/components/Endpoints/Settings/MultiView/GoogleSettings.tsx
+++ b/client/src/components/Endpoints/Settings/MultiView/GoogleSettings.tsx
@@ -1,7 +1,7 @@
-import Settings from '../Google';
-import Examples from '../Examples';
import { useSetIndexOptions } from '~/hooks';
import { useChatContext } from '~/Providers';
+import Examples from '../Examples';
+import Settings from '../Google';
export default function GoogleView({ conversation, models, isPreset = false }) {
const { optionSettings } = useChatContext();
diff --git a/client/src/components/Endpoints/Settings/index.ts b/client/src/components/Endpoints/Settings/index.ts
index 5804d8d466..ecf1017905 100644
--- a/client/src/components/Endpoints/Settings/index.ts
+++ b/client/src/components/Endpoints/Settings/index.ts
@@ -1,4 +1,3 @@
-export { default as Advanced } from './Advanced';
export { default as AssistantsSettings } from './Assistants';
export { default as BedrockSettings } from './Bedrock';
export { default as OpenAISettings } from './OpenAI';
diff --git a/client/src/components/Endpoints/index.ts b/client/src/components/Endpoints/index.ts
index f171b4074a..7f22d394ab 100644
--- a/client/src/components/Endpoints/index.ts
+++ b/client/src/components/Endpoints/index.ts
@@ -5,4 +5,3 @@ export { default as EndpointIcon } from './EndpointIcon';
export { default as ConvoIconURL } from './ConvoIconURL';
export { default as EndpointSettings } from './EndpointSettings';
export { default as SaveAsPresetDialog } from './SaveAsPresetDialog';
-export { default as AlternativeSettings } from './AlternativeSettings';
diff --git a/client/src/components/Input/ModelSelect/Anthropic.tsx b/client/src/components/Input/ModelSelect/Anthropic.tsx
deleted file mode 100644
index 34f623bc8a..0000000000
--- a/client/src/components/Input/ModelSelect/Anthropic.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { SelectDropDown } from '@librechat/client';
-import type { TModelSelectProps } from '~/common';
-import SelectDropDownPop from '~/components/Input/ModelSelect/SelectDropDownPop';
-import { cn, cardStyle } from '~/utils';
-
-export default function Anthropic({
- conversation,
- setOption,
- models,
- showAbove,
- popover = false,
-}: TModelSelectProps) {
- const Menu = popover ? SelectDropDownPop : SelectDropDown;
- return (
- <Menu
- value={conversation?.model ?? ''}
- setValue={setOption('model')}
- availableValues={models}
- showAbove={showAbove}
- showLabel={false}
- className={cn(
- cardStyle,
- 'z-50 flex h-[2.5rem] w-48 min-w-48 flex-none items-center justify-center px-4 ring-0 hover:cursor-pointer',
- )}
- />
- );
-}
diff --git a/client/src/components/Input/ModelSelect/ChatGPT.tsx b/client/src/components/Input/ModelSelect/ChatGPT.tsx
deleted file mode 100644
index 5b46670325..0000000000
--- a/client/src/components/Input/ModelSelect/ChatGPT.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { SelectDropDown } from '@librechat/client';
-import type { TModelSelectProps } from '~/common';
-import SelectDropDownPop from '~/components/Input/ModelSelect/SelectDropDownPop';
-import { cn, cardStyle } from '~/utils';
-
-export default function ChatGPT({
- conversation,
- setOption,
- models,
- showAbove,
- popover = false,
-}: TModelSelectProps) {
- if (!conversation) {
- return null;
- }
- const { conversationId, model } = conversation;
- if (conversationId !== 'new') {
- return null;
- }
- const Menu = popover ? SelectDropDownPop : SelectDropDown;
- return (
- <Menu
- value={model ?? ''}
- setValue={setOption('model')}
- availableValues={models}
- showAbove={showAbove}
- showLabel={false}
- className={cn(
- cardStyle,
- 'z-50 flex h-[2.5rem] w-60 min-w-48 flex-none items-center justify-center px-4 ring-0 hover:cursor-pointer',
- )}
- />
- );
-}
diff --git a/client/src/components/Input/ModelSelect/Google.tsx b/client/src/components/Input/ModelSelect/Google.tsx
deleted file mode 100644
index c6c8522e2a..0000000000
--- a/client/src/components/Input/ModelSelect/Google.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { SelectDropDown } from '@librechat/client';
-import type { TModelSelectProps } from '~/common';
-import SelectDropDownPop from '~/components/Input/ModelSelect/SelectDropDownPop';
-import { cn, cardStyle } from '~/utils';
-
-export default function Google({
- conversation,
- setOption,
- models,
- showAbove,
- popover = false,
-}: TModelSelectProps) {
- const Menu = popover ? SelectDropDownPop : SelectDropDown;
- return (
- <Menu
- value={conversation?.model ?? ''}
- setValue={setOption('model')}
- availableValues={models}
- showAbove={showAbove}
- showLabel={false}
- className={cn(
- cardStyle,
- 'z-50 flex h-[2.5rem] w-48 min-w-48 flex-none items-center justify-center px-4 ring-0 hover:cursor-pointer',
- )}
- />
- );
-}
diff --git a/client/src/components/Input/ModelSelect/ModelSelect.tsx b/client/src/components/Input/ModelSelect/ModelSelect.tsx
deleted file mode 100644
index f7a7b9c77b..0000000000
--- a/client/src/components/Input/ModelSelect/ModelSelect.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { resolveModelCatalogKey } from 'librechat-data-provider';
-import { useGetModelsQuery } from 'librechat-data-provider/react-query';
-import type { TConversation } from 'librechat-data-provider';
-import type { TSetOption } from '~/common';
-import { multiChatOptions } from './options';
-
-type TGoogleProps = {
- showExamples: boolean;
- isCodeChat: boolean;
-};
-
-type TSelectProps = {
- conversation: TConversation | null;
- setOption: TSetOption;
- extraProps?: TGoogleProps;
- showAbove?: boolean;
- popover?: boolean;
-};
-
-export default function ModelSelect({
- conversation,
- setOption,
- popover = false,
- showAbove = true,
-}: TSelectProps) {
- const modelsQuery = useGetModelsQuery();
-
- if (!conversation?.endpoint) {
- return null;
- }
-
- const { endpoint: _endpoint, endpointType } = conversation;
- const models = modelsQuery.data?.[resolveModelCatalogKey(_endpoint, modelsQuery.data)] ?? [];
- const endpoint = endpointType ?? _endpoint;
-
- const OptionComponent = multiChatOptions[endpoint];
-
- if (!OptionComponent) {
- return null;
- }
-
- return (
- <OptionComponent
- conversation={conversation}
- setOption={setOption}
- models={models}
- showAbove={showAbove}
- popover={popover}
- />
- );
-}
diff --git a/client/src/components/Input/ModelSelect/MultiSelectDropDown.tsx b/client/src/components/Input/ModelSelect/MultiSelectDropDown.tsx
deleted file mode 100644
index 9f986f0485..0000000000
--- a/client/src/components/Input/ModelSelect/MultiSelectDropDown.tsx
+++ /dev/null
@@ -1,229 +0,0 @@
-import React, { useState, useRef } from 'react';
-import { Wrench, ArrowRight } from 'lucide-react';
-import { CheckMark, useOnClickOutside, useMultiSearch } from '@librechat/client';
-import {
- Listbox,
- ListboxButton,
- Label,
- ListboxOptions,
- ListboxOption,
- Transition,
-} from '@headlessui/react';
-import type { TPlugin } from 'librechat-data-provider';
-import { cn } from '~/utils/';
-
-export type TMultiSelectDropDownProps = {
- title?: string;
- value: Array<{ icon?: string; name?: string; isButton?: boolean }>;
- disabled?: boolean;
- setSelected: (option: string) => void;
- availableValues: TPlugin[];
- showAbove?: boolean;
- showLabel?: boolean;
- containerClassName?: string;
- optionsClassName?: string;
- labelClassName?: string;
- isSelected: (value: string) => boolean;
- className?: string;
- searchPlaceholder?: string;
- optionValueKey?: string;
-};
-
-function MultiSelectDropDown({
- title = 'Plugins',
- value,
- disabled,
- setSelected,
- availableValues,
- showAbove = false,
- showLabel = true,
- containerClassName,
- optionsClassName = '',
- labelClassName = '',
- isSelected,
- className,
- searchPlaceholder,
- optionValueKey = 'value',
-}: TMultiSelectDropDownProps) {
- const [isOpen, setIsOpen] = useState(false);
- const menuRef = useRef(null);
- const excludeIds = ['select-plugin', 'plugins-label', 'selected-plugins'];
- useOnClickOutside(menuRef, () => setIsOpen(false), excludeIds);
-
- const handleSelect: (value: string) => void = (option) => {
- setSelected(option);
- setIsOpen(true);
- };
-
- // input will appear near the top of the menu, allowing correct filtering of different model menu items. This will
- // reset once the component is unmounted (as per a normal search)
- const [filteredValues, searchRender] = useMultiSearch<TPlugin[]>({
- availableOptions: availableValues,
- placeholder: searchPlaceholder,
- getTextKeyOverride: (option) => (option.name || '').toUpperCase(),
- });
-
- const hasSearchRender = Boolean(searchRender);
- const options = hasSearchRender ? filteredValues : availableValues;
-
- const transitionProps = { className: 'top-full mt-3' };
- if (showAbove) {
- transitionProps.className = 'bottom-full mb-3';
- }
- const openProps = { open: isOpen };
- return (
- <div className={cn('flex items-center justify-center gap-2', containerClassName ?? '')}>
- <div className="relative w-full">
- {/* the function typing is correct but there's still an issue here */}
- {/* @ts-ignore */}
- <Listbox value={value} onChange={handleSelect} disabled={disabled}>
- {() => (
- <>
- <ListboxButton
- className={cn(
- 'border-border-light bg-surface-secondary relative flex w-full cursor-default flex-col rounded-md border py-2 pr-10 pl-3 text-left focus:ring-0 focus:ring-offset-0 focus:outline-hidden sm:text-sm',
- className ?? '',
- )}
- id={excludeIds[0]}
- onClick={() => setIsOpen((prev) => !prev)}
- {...openProps}
- >
- {' '}
- {showLabel && (
- <Label
- className={cn('text-text-secondary block text-xs', labelClassName)}
- id={excludeIds[1]}
- data-headlessui-state=""
- >
- {title}
- </Label>
- )}
- <span className="inline-flex w-full truncate" id={excludeIds[2]}>
- <span
- className={cn(
- 'text-text-primary flex h-6 items-center gap-1 truncate text-sm',
- !showLabel ? 'text-xs' : '',
- )}
- >
- {!showLabel && title.length > 0 && (
- <span className="text-text-secondary text-xs">{title}:</span>
- )}
- <span className="flex h-6 items-center gap-1 truncate">
- <div className="flex gap-1">
- {value.map((v, i) => (
- <div
- key={i}
- className="relative"
- style={{ width: '1rem', height: '1rem' }}
- >
- {v.icon ? (
- <img
- src={v.icon}
- alt={`${v} logo`}
- className="bg-surface-fixed h-full w-full rounded-sm"
- />
- ) : (
- <Wrench className="bg-surface-fixed h-full w-full rounded-sm" />
- )}
- <div className="ring-border-light absolute inset-0 rounded-sm ring-1 ring-inset" />
- </div>
- ))}
- </div>
- </span>
- </span>
- </span>
- <span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
- <svg
- stroke="currentColor"
- fill="none"
- strokeWidth="2"
- viewBox="0 0 24 24"
- strokeLinecap="round"
- strokeLinejoin="round"
- className="text-text-tertiary h-4 w-4"
- height="1em"
- width="1em"
- xmlns="http://www.w3.org/2000/svg"
- style={showAbove ? { transform: 'scaleY(-1)' } : {}}
- >
- <polyline points="6 9 12 15 18 9"></polyline>
- </svg>
- </span>
- </ListboxButton>
- <Transition
- show={isOpen}
- as={React.Fragment}
- leave="transition ease-in duration-150"
- leaveFrom="opacity-100"
- leaveTo="opacity-0"
- {...transitionProps}
- >
- <ListboxOptions
- ref={menuRef}
- className={cn(
- 'bg-surface-secondary ring-border-light absolute z-50 mt-2 max-h-60 w-full overflow-auto rounded text-base text-xs ring-1 focus:outline-hidden md:w-[100%] dark:last:border-0',
- optionsClassName,
- )}
- >
- {searchRender}
- {options.map((option, i: number) => {
- if (!option) {
- return null;
- }
- const selected = isSelected(option[optionValueKey]);
- return (
- <ListboxOption
- key={i}
- value={option[optionValueKey]}
- className="group border-border-light text-text-primary hover:bg-surface-hover relative flex h-[2.625rem] cursor-pointer items-center overflow-hidden border-b pr-9 pl-3 select-none last:border-0"
- >
- <span className="flex items-center gap-1.5 truncate">
- {!option.isButton && (
- <span className="h-6 w-6 shrink-0">
- <div className="relative" style={{ width: '100%', height: '100%' }}>
- {option.icon ? (
- <img
- src={option.icon}
- alt={`${option.name} logo`}
- className="bg-surface-fixed h-full w-full rounded-sm"
- />
- ) : (
- <Wrench className="bg-surface-fixed h-full w-full rounded-sm" />
- )}
- <div className="ring-border-light absolute inset-0 rounded-sm ring-1 ring-inset"></div>
- </div>
- </span>
- )}
- <span
- className={cn(
- 'text-text-primary flex h-6 items-center gap-1',
- selected ? 'font-semibold' : '',
- )}
- >
- {option.name}
- </span>
- {option.isButton && (
- <span className="text-text-primary absolute inset-y-0 right-0 flex items-center pr-3">
- <ArrowRight />
- </span>
- )}
- {selected && !option.isButton && (
- <span className="text-text-primary absolute inset-y-0 right-0 flex items-center pr-3">
- <CheckMark />
- </span>
- )}
- </span>
- </ListboxOption>
- );
- })}
- </ListboxOptions>
- </Transition>
- </>
- )}
- </Listbox>
- </div>
- </div>
- );
-}
-
-export default MultiSelectDropDown;
diff --git a/client/src/components/Input/ModelSelect/MultiSelectPop.tsx b/client/src/components/Input/ModelSelect/MultiSelectPop.tsx
deleted file mode 100644
index 89a3a76b8e..0000000000
--- a/client/src/components/Input/ModelSelect/MultiSelectPop.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import { Wrench } from 'lucide-react';
-import { useMultiSearch } from '@librechat/client';
-import { Root, Trigger, Content, Portal } from '@radix-ui/react-popover';
-import type { TPlugin } from 'librechat-data-provider';
-import MenuItem from '~/components/Chat/Menus/UI/MenuItem';
-import { useLocalize } from '~/hooks';
-import { cn } from '~/utils/';
-
-type SelectDropDownProps = {
- title?: string;
- value: Array<{ icon?: string; name?: string; isButton?: boolean }>;
- disabled?: boolean;
- setSelected: (option: string) => void;
- availableValues: TPlugin[];
- showAbove?: boolean;
- showLabel?: boolean;
- containerClassName?: string;
- isSelected: (value: string) => boolean;
- className?: string;
- optionValueKey?: string;
- searchPlaceholder?: string;
-};
-
-function MultiSelectPop({
- title: _title = 'Plugins',
- value,
- setSelected,
- availableValues,
- showAbove = false,
- showLabel = true,
- containerClassName,
- isSelected,
- optionValueKey = 'value',
- searchPlaceholder,
-}: SelectDropDownProps) {
- const localize = useLocalize();
- const title = _title;
- const excludeIds = ['select-plugin', 'plugins-label', 'selected-plugins'];
-
- // Detemine if we should to convert this component into a searchable select
- const [filteredValues, searchRender] = useMultiSearch<TPlugin[]>({
- availableOptions: availableValues,
- placeholder: searchPlaceholder,
- getTextKeyOverride: (option) => (option.name || '').toUpperCase(),
- });
- const hasSearchRender = Boolean(searchRender);
- const options = hasSearchRender ? filteredValues : availableValues;
-
- return (
- <Root>
- <div className={cn('flex items-center justify-center gap-2', containerClassName ?? '')}>
- <div className="relative">
- <Trigger asChild>
- <button
- data-testid="select-dropdown-button"
- className={cn(
- 'border-border-light bg-surface-secondary relative flex flex-col rounded-md border py-2 pr-10 pl-3 text-left focus:ring-0 focus:ring-offset-0 focus:outline-hidden sm:text-sm',
- 'cursor-pointer font-normal',
- 'hover:bg-surface-hover data-[state=open]:bg-surface-hover',
- )}
- >
- {' '}
- {showLabel && <label className="text-text-secondary block text-xs">{title}</label>}
- <span className="inline-flex" id={excludeIds[2]}>
- <span
- className={cn(
- 'text-text-primary flex h-6 items-center gap-1 text-sm',
- !showLabel ? 'text-xs' : '',
- )}
- >
- {/* {!showLabel && title.length > 0 && (
- <span className="text-xs text-text-secondary">{title}:</span>
- )} */}
- <span className="flex items-center gap-1">
- <div className="flex gap-1">
- {value.length === 0 && localize('com_ui_none_selected')}
- {value.map((v, i) => (
- <div key={i} className="relative">
- {v.icon ? (
- <img src={v.icon} alt={`${v} logo`} className="icon-lg rounded-sm" />
- ) : (
- <Wrench className="icon-lg bg-surface-fixed rounded-sm" />
- )}
- <div className="ring-border-light absolute inset-0 rounded-sm ring-1 ring-inset" />
- </div>
- ))}
- </div>
- </span>
- </span>
- </span>
- <span className="absolute inset-y-0 right-0 flex items-center pr-2">
- <svg
- stroke="currentColor"
- fill="none"
- strokeWidth="2"
- viewBox="0 0 24 24"
- strokeLinecap="round"
- strokeLinejoin="round"
- className="text-text-tertiary h-4 w-4"
- height="1em"
- width="1em"
- xmlns="http://www.w3.org/2000/svg"
- style={showAbove ? { transform: 'scaleY(-1)' } : {}}
- >
- <polyline points="6 9 12 15 18 9"></polyline>
- </svg>
- </span>
- </button>
- </Trigger>
- <Portal>
- <Content
- side="bottom"
- align="center"
- className={cn(
- 'border-border-light bg-surface-secondary mt-2 max-h-[52vh] min-w-full overflow-hidden overflow-y-auto rounded-lg border shadow-lg',
- hasSearchRender && 'relative',
- )}
- >
- {searchRender}
- {options.map((option) => {
- if (!option) {
- return null;
- }
- const selected = isSelected(option[optionValueKey]);
- return (
- <MenuItem
- key={`${option[optionValueKey]}`}
- title={option.name}
- value={option[optionValueKey]}
- selected={selected}
- onClick={() => setSelected(option.pluginKey)}
- icon={
- option.icon ? (
- <img
- src={option.icon}
- alt={`${option.name} logo`}
- className="icon-sm mr-1 rounded-sm bg-cover"
- />
- ) : (
- <Wrench className="icon-sm bg-surface-secondary mr-1 rounded-sm bg-cover" />
- )
- }
- />
- );
- })}
- </Content>
- </Portal>
- </div>
- </div>
- </Root>
- );
-}
-
-export default MultiSelectPop;
diff --git a/client/src/components/Input/ModelSelect/OpenAI.tsx b/client/src/components/Input/ModelSelect/OpenAI.tsx
deleted file mode 100644
index 371af3a98a..0000000000
--- a/client/src/components/Input/ModelSelect/OpenAI.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { SelectDropDown } from '@librechat/client';
-import type { TModelSelectProps } from '~/common';
-import SelectDropDownPop from '~/components/Input/ModelSelect/SelectDropDownPop';
-import { cn, cardStyle } from '~/utils';
-
-export default function OpenAI({
- conversation,
- setOption,
- models,
- showAbove = true,
- popover = false,
-}: TModelSelectProps) {
- const Menu = popover ? SelectDropDownPop : SelectDropDown;
- return (
- <Menu
- value={conversation?.model ?? ''}
- setValue={setOption('model')}
- availableValues={models}
- showAbove={showAbove}
- showLabel={false}
- className={cn(
- cardStyle,
- 'z-50 flex h-[2.5rem] w-48 min-w-48 flex-none items-center justify-center px-4 hover:cursor-pointer',
- )}
- />
- );
-}
diff --git a/client/src/components/Input/ModelSelect/SelectDropDownPop.tsx b/client/src/components/Input/ModelSelect/SelectDropDownPop.tsx
deleted file mode 100644
index ce9b8be381..0000000000
--- a/client/src/components/Input/ModelSelect/SelectDropDownPop.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import React, { useState } from 'react';
-import { useMultiSearch } from '@librechat/client';
-import { Root, Trigger, Content, Portal } from '@radix-ui/react-popover';
-import type { Option } from '~/common';
-import MenuItem from '~/components/Chat/Menus/UI/MenuItem';
-import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
-
-type SelectDropDownProps = {
- id?: string;
- title?: string;
- value: string | null | Option;
- disabled?: boolean;
- setValue: (value: string) => void;
- availableValues: string[] | Option[];
- emptyTitle?: boolean;
- showAbove?: boolean;
- showLabel?: boolean;
- iconSide?: 'left' | 'right';
- renderOption?: () => React.ReactNode;
- footer?: React.ReactNode;
-};
-
-function SelectDropDownPop({
- title: _title,
- value,
- availableValues,
- setValue,
- showAbove = false,
- showLabel = true,
- emptyTitle = false,
- footer,
-}: SelectDropDownProps) {
- const localize = useLocalize();
- const [open, setOpen] = useState(false);
- const transitionProps = { className: 'top-full mt-3' };
- if (showAbove) {
- transitionProps.className = 'bottom-full mb-3';
- }
-
- let title = _title;
-
- if (emptyTitle) {
- title = '';
- } else if (!title) {
- title = localize('com_ui_model');
- }
-
- // Detemine if we should to convert this component into a searchable select. If we have enough elements, a search
- // input will appear near the top of the menu, allowing correct filtering of different model menu items. This will
- // reset once the component is unmounted (as per a normal search)
- const [filteredValues, searchRender] = useMultiSearch<string[] | Option[]>({
- availableOptions: availableValues,
- });
- const hasSearchRender = Boolean(searchRender);
- const options = hasSearchRender ? filteredValues : availableValues;
-
- const handleSelect = (selectedValue: string) => {
- setValue(selectedValue);
- setOpen(false);
- };
-
- return (
- <Root open={open} onOpenChange={setOpen}>
- <div className={'flex items-center justify-center gap-2'}>
- <div className={'relative w-full'}>
- <Trigger asChild>
- <button
- data-testid="select-dropdown-button"
- className={cn(
- 'border-border-light bg-surface-secondary relative flex cursor-pointer flex-col rounded-lg border py-2 pr-10 pl-3 text-left focus:ring-0 focus:ring-offset-0 sm:text-sm',
- 'hover:bg-surface-hover data-[state=open]:bg-surface-hover',
- 'max-w-[min(13.4375rem,90vw)] min-w-[min(12.5rem,90vw)] sm:max-w-full sm:min-w-full',
- )}
- aria-label={localize('com_ui_select_var', { 0: title })}
- aria-haspopup="false"
- >
- {' '}
- {showLabel && <label className="text-text-secondary block text-xs">{title}</label>}
- <span className="inline-flex w-full">
- <span
- className={cn(
- 'text-text-primary flex h-6 items-center gap-1 text-sm',
- !showLabel ? 'text-xs' : '',
- 'min-w-[4.6875rem] font-normal',
- )}
- >
- {typeof value !== 'string' && value ? (value.label ?? '') : (value ?? '')}
- </span>
- </span>
- <span className="absolute inset-y-0 right-0 flex items-center pr-2">
- <svg
- stroke="currentColor"
- fill="none"
- strokeWidth="2"
- viewBox="0 0 24 24"
- strokeLinecap="round"
- strokeLinejoin="round"
- className="text-text-tertiary h-4 w-4"
- height="1em"
- width="1em"
- xmlns="http://www.w3.org/2000/svg"
- style={showAbove ? { transform: 'scaleY(-1)' } : {}}
- >
- <polyline points="6 9 12 15 18 9"></polyline>
- </svg>
- </span>
- </button>
- </Trigger>
- <Portal>
- <Content
- side="bottom"
- align="start"
- className={cn(
- 'border-border-light bg-surface-secondary z-50 mt-2 mr-3 max-h-[52vh] w-full max-w-[85vw] overflow-hidden overflow-y-auto rounded-lg border shadow-lg sm:max-w-full lg:max-h-[52vh]',
- hasSearchRender && 'relative',
- )}
- >
- {searchRender}
- {options.map((option) => {
- if (typeof option === 'string') {
- return (
- <MenuItem
- key={option}
- title={option}
- value={option}
- selected={!!(value && value === option)}
- onClick={() => handleSelect(option)}
- />
- );
- }
- return (
- <MenuItem
- key={option.value}
- title={option.label}
- description={option.description}
- value={option.value}
- icon={option.icon}
- selected={!!(value && value === option.value)}
- onClick={() => handleSelect(option.value)}
- />
- );
- })}
- {footer}
- </Content>
- </Portal>
- </div>
- </div>
- </Root>
- );
-}
-
-export default SelectDropDownPop;
diff --git a/client/src/components/Input/ModelSelect/index.ts b/client/src/components/Input/ModelSelect/index.ts
deleted file mode 100644
index f56c24051b..0000000000
--- a/client/src/components/Input/ModelSelect/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ModelSelect } from './ModelSelect';
diff --git a/client/src/components/Input/ModelSelect/options.ts b/client/src/components/Input/ModelSelect/options.ts
deleted file mode 100644
index 318da5b066..0000000000
--- a/client/src/components/Input/ModelSelect/options.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { EModelEndpoint } from 'librechat-data-provider';
-import type { TModelSelectProps } from '~/common';
-import type { FC } from 'react';
-
-import OpenAI from './OpenAI';
-import Google from './Google';
-import Anthropic from './Anthropic';
-
-export const options: { [key: string]: FC<TModelSelectProps> } = {
- [EModelEndpoint.openAI]: OpenAI,
- [EModelEndpoint.custom]: OpenAI,
- [EModelEndpoint.bedrock]: OpenAI,
- [EModelEndpoint.azureOpenAI]: OpenAI,
- [EModelEndpoint.google]: Google,
- [EModelEndpoint.anthropic]: Anthropic,
-};
-
-export const multiChatOptions = {
- ...options,
-};
diff --git a/client/src/components/Input/SetKeyDialog/BedrockConfig.tsx b/client/src/components/Input/SetKeyDialog/BedrockConfig.tsx
index c36e741bcb..3e7eb2c96a 100644
--- a/client/src/components/Input/SetKeyDialog/BedrockConfig.tsx
+++ b/client/src/components/Input/SetKeyDialog/BedrockConfig.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { EModelEndpoint } from 'librechat-data-provider';
import { useFormContext, Controller } from 'react-hook-form';
-import { useLocalize } from '~/hooks';
import InputWithLabel from './InputWithLabel';
+import { useLocalize } from '~/hooks';
const BedrockConfig = ({
userProvideAccessKeyId,
diff --git a/client/src/components/Input/SetKeyDialog/OtherConfig.tsx b/client/src/components/Input/SetKeyDialog/OtherConfig.tsx
index fb45d58474..cd2b7812fd 100644
--- a/client/src/components/Input/SetKeyDialog/OtherConfig.tsx
+++ b/client/src/components/Input/SetKeyDialog/OtherConfig.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import InputWithLabel from './InputWithLabel';
import type { TConfigProps } from '~/common';
+import InputWithLabel from './InputWithLabel';
import { useLocalize } from '~/hooks';
const OtherConfig = ({ userKey, setUserKey, endpoint }: TConfigProps) => {
diff --git a/client/src/components/MCP/mcpServerUtils.ts b/client/src/components/MCP/mcpServerUtils.ts
index 47320a3ac7..1995107f2f 100644
--- a/client/src/components/MCP/mcpServerUtils.ts
+++ b/client/src/components/MCP/mcpServerUtils.ts
@@ -160,28 +160,6 @@ export function getStatusTextKey(
return keyMap[connectionState] || 'com_nav_mcp_status_unknown';
}
-/**
- * Determines if a server requires user action to connect.
- * Used to show action buttons and amber status color.
- */
-export function serverNeedsAction(
- serverStatus?: MCPServerStatus,
- _hasCustomUserVars?: boolean,
-): boolean {
- if (!serverStatus) return false;
- const { connectionState, requiresOAuth, requestScoped } = serverStatus;
-
- if (requestScoped && connectionState !== 'connecting') return false;
-
- // Needs OAuth authentication
- if (connectionState === 'disconnected' && requiresOAuth) return true;
-
- // Has error - needs retry
- if (connectionState === 'error') return true;
-
- return false;
-}
-
/**
* Request-scoped servers are usable without an idle transport connection once
* their authorization requirement is satisfied. Agent tooling uses this
diff --git a/client/src/components/Messages/Content/Container.tsx b/client/src/components/Messages/Content/Container.tsx
deleted file mode 100644
index 7572ff18d0..0000000000
--- a/client/src/components/Messages/Content/Container.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-// Container Component
-const Container = ({ children }: { children: React.ReactNode }) => (
- <div className="flex min-h-[1.25rem] grow flex-col items-start gap-4">{children}</div>
-);
-
-export default Container;
diff --git a/client/src/components/Messages/Content/SubRow.tsx b/client/src/components/Messages/Content/SubRow.tsx
deleted file mode 100644
index 9041cb50c9..0000000000
--- a/client/src/components/Messages/Content/SubRow.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-type TSubRowProps = {
- children: React.ReactNode;
- classes?: string;
- subclasses?: string;
- onClick?: () => void;
-};
-
-export default function SubRow({ children, classes = '', subclasses = '', onClick }: TSubRowProps) {
- return (
- <div className={`flex justify-between ${classes}`} onClick={onClick}>
- <div
- className={`flex items-center justify-center gap-1 self-center pt-2 text-xs ${subclasses}`}
- >
- {children}
- </div>
- </div>
- );
-}
diff --git a/client/src/components/Messages/Content/index.ts b/client/src/components/Messages/Content/index.ts
deleted file mode 100644
index 73238fe6bc..0000000000
--- a/client/src/components/Messages/Content/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SubRow } from './SubRow';
diff --git a/client/src/components/Nav/ExportConversation/index.ts b/client/src/components/Nav/ExportConversation/index.ts
deleted file mode 100644
index b5a5a2c89c..0000000000
--- a/client/src/components/Nav/ExportConversation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ExportModal } from './ExportModal';
diff --git a/client/src/components/Nav/NavLink.tsx b/client/src/components/Nav/NavLink.tsx
deleted file mode 100644
index e30cb69903..0000000000
--- a/client/src/components/Nav/NavLink.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { FC, forwardRef } from 'react';
-import { cn } from '~/utils/';
-
-interface Props {
- svg: () => JSX.Element;
- text: string;
- clickHandler?: React.MouseEventHandler<HTMLButtonElement>;
- className?: string;
- disabled?: boolean;
-}
-
-const NavLink: FC<Props> = forwardRef<HTMLButtonElement, Props>((props, ref) => {
- const { svg, text, clickHandler, disabled, className = '' } = props;
- const defaultProps: {
- className: string;
- onClick?: React.MouseEventHandler<HTMLButtonElement>;
- } = {
- className: cn(
- 'w-full flex gap-2 rounded p-2.5 text-sm cursor-pointer group items-center transition-colors duration-200 text-text-primary',
- className,
- {
- 'opacity-50 pointer-events-none': disabled,
- },
- ),
- };
-
- if (clickHandler) {
- defaultProps.onClick = clickHandler;
- }
-
- return (
- <button {...defaultProps} ref={ref}>
- {svg()}
- {text}
- </button>
- );
-});
-
-export default NavLink;
diff --git a/client/src/components/Nav/Settings/__tests__/Dialog.spec.tsx b/client/src/components/Nav/Settings/__tests__/Dialog.spec.tsx
index c2c7deefdd..67030c51c7 100644
--- a/client/src/components/Nav/Settings/__tests__/Dialog.spec.tsx
+++ b/client/src/components/Nav/Settings/__tests__/Dialog.spec.tsx
@@ -1,7 +1,7 @@
/* eslint-disable i18next/no-literal-string */
import userEvent from '@testing-library/user-event';
import { render, screen } from 'test/layout-test-utils';
-import { SettingsDialog } from '../index';
+import SettingsDialog from '../Dialog';
jest.mock('../Content', () =>
jest.fn(({ query }: { activeTab: string; query: string; ctx: unknown }) =>
diff --git a/client/src/components/Nav/Settings/index.ts b/client/src/components/Nav/Settings/index.ts
deleted file mode 100644
index c5d441a8d3..0000000000
--- a/client/src/components/Nav/Settings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SettingsDialog } from './Dialog';
diff --git a/client/src/components/Nav/SettingsTabs/DangerButton.tsx b/client/src/components/Nav/SettingsTabs/DangerButton.tsx
deleted file mode 100644
index 171e727cfb..0000000000
--- a/client/src/components/Nav/SettingsTabs/DangerButton.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { forwardRef } from 'react';
-import { CheckIcon } from 'lucide-react';
-import { Spinner, DialogButton, InfoHoverCard, ESide } from '@librechat/client';
-import type { ForwardedRef } from 'react';
-import type { TDangerButtonProps } from '~/common';
-import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
-
-const DangerButton = (props: TDangerButtonProps, ref: ForwardedRef<HTMLButtonElement>) => {
- const {
- id,
- onClick,
- mutation,
- disabled,
- confirmClear,
- infoTextCode,
- actionTextCode,
- className = '',
- showText = true,
- dataTestIdInitial,
- dataTestIdConfirm,
- infoDescriptionCode,
- confirmActionTextCode = 'com_ui_confirm_action',
- } = props;
- const localize = useLocalize();
-
- const renderMutation = (node: React.ReactNode | string) => {
- if (mutation && mutation.isLoading) {
- return <Spinner className="h-5 w-5" />;
- }
- return node;
- };
-
- return (
- <div className="flex items-center justify-between">
- {showText && (
- <div className={`flex items-center ${infoDescriptionCode ? 'space-x-2' : ''}`}>
- <div>{localize(infoTextCode)}</div>
- {infoDescriptionCode && <InfoHoverCard side={ESide.Bottom} text={infoDescriptionCode} />}
- </div>
- )}
- <DialogButton
- id={id}
- ref={ref}
- disabled={disabled}
- onClick={onClick}
- className={cn(
- 'btn relative border-none bg-surface-destructive text-text-on-status hover:bg-surface-destructive-hover',
- className,
- )}
- >
- {confirmClear ? (
- <div
- className="flex w-full items-center justify-center gap-2"
- id={`${id}-text`}
- data-testid={dataTestIdConfirm}
- >
- {renderMutation(<CheckIcon className="h-5 w-5" aria-hidden="true" />)}
- {mutation && mutation.isLoading ? null : localize(confirmActionTextCode)}
- </div>
- ) : (
- <div
- className="flex w-full items-center justify-center gap-2"
- id={`${id}-text`}
- data-testid={dataTestIdInitial}
- >
- {renderMutation(localize(actionTextCode))}
- </div>
- )}
- </DialogButton>
- </div>
- );
-};
-
-export default forwardRef(DangerButton);
diff --git a/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx b/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
index 73ab0345db..6d3c31c9bb 100644
--- a/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
@@ -1,8 +1,8 @@
import { useState, useRef, useCallback } from 'react';
import { Import } from 'lucide-react';
import { useQueryClient } from '@tanstack/react-query';
-import type { TStartupConfig } from 'librechat-data-provider';
import { Spinner, useToastContext, Label, Button } from '@librechat/client';
+import type { TStartupConfig } from 'librechat-data-provider';
import { startupConfigKey, useUploadConversationsMutation } from '~/data-provider';
import { NotificationSeverity } from '~/common';
import { useLocalize } from '~/hooks';
diff --git a/client/src/components/Nav/SettingsTabs/Speech/ConversationModeSwitch.spec.tsx b/client/src/components/Nav/SettingsTabs/Speech/ConversationModeSwitch.spec.tsx
index c57dc122fb..348bb7a419 100644
--- a/client/src/components/Nav/SettingsTabs/Speech/ConversationModeSwitch.spec.tsx
+++ b/client/src/components/Nav/SettingsTabs/Speech/ConversationModeSwitch.spec.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import '@testing-library/jest-dom/extend-expect';
-import { render, fireEvent } from 'test/layout-test-utils';
-import ConversationModeSwitch from './ConversationModeSwitch';
import { RecoilRoot } from 'recoil';
+import ConversationModeSwitch from './ConversationModeSwitch';
+import { render, fireEvent } from 'test/layout-test-utils';
describe('ConversationModeSwitch', () => {
/**
diff --git a/client/src/components/Nav/SettingsTabs/index.ts b/client/src/components/Nav/SettingsTabs/index.ts
deleted file mode 100644
index e94def7d5d..0000000000
--- a/client/src/components/Nav/SettingsTabs/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as About } from './About/About';
diff --git a/client/src/components/Nav/index.ts b/client/src/components/Nav/index.ts
deleted file mode 100644
index e56b67d0a5..0000000000
--- a/client/src/components/Nav/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './ExportConversation';
-export * from './SettingsTabs/';
-export { default as NavLink } from './NavLink';
-export { default as SearchBar } from './SearchBar';
-export { default as Settings } from './Settings';
diff --git a/client/src/components/Prompts/buttons/AlwaysMakeProd.tsx b/client/src/components/Prompts/buttons/AlwaysMakeProd.tsx
deleted file mode 100644
index 64d6bd60ec..0000000000
--- a/client/src/components/Prompts/buttons/AlwaysMakeProd.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useRecoilState } from 'recoil';
-import { Switch } from '@librechat/client';
-import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
-import store from '~/store';
-
-export default function AlwaysMakeProd({
- onCheckedChange,
- className = '',
-}: {
- onCheckedChange?: (value: boolean) => void;
- className?: string;
-}) {
- const [alwaysMakeProd, setAlwaysMakeProd] = useRecoilState<boolean>(store.alwaysMakeProd);
- const localize = useLocalize();
-
- const handleCheckedChange = (value: boolean) => {
- setAlwaysMakeProd(value);
- if (onCheckedChange) {
- onCheckedChange(value);
- }
- };
-
- return (
- <div className={cn('flex select-none items-center justify-end gap-2 text-xs', className)}>
- <Switch
- id="alwaysMakeProd"
- checked={alwaysMakeProd}
- onCheckedChange={handleCheckedChange}
- data-testid="alwaysMakeProd"
- aria-label={localize('com_nav_always_make_prod')}
- />
- <div>{localize('com_nav_always_make_prod')} </div>
- </div>
- );
-}
diff --git a/client/src/components/Prompts/buttons/index.ts b/client/src/components/Prompts/buttons/index.ts
index 775331f8f1..dbb29ab588 100644
--- a/client/src/components/Prompts/buttons/index.ts
+++ b/client/src/components/Prompts/buttons/index.ts
@@ -1,4 +1,3 @@
export { default as AdminSettings } from './AdminSettings';
-export { default as AlwaysMakeProd } from './AlwaysMakeProd';
export { default as AutoSendPrompt } from './AutoSendPrompt';
export { default as CreatePromptButton } from './CreatePromptButton';
diff --git a/client/src/components/Prompts/editor/Markdown.tsx b/client/src/components/Prompts/editor/Markdown.tsx
index 73d55a0080..6d2ee8f408 100644
--- a/client/src/components/Prompts/editor/Markdown.tsx
+++ b/client/src/components/Prompts/editor/Markdown.tsx
@@ -1,16 +1,4 @@
import React from 'react';
-import { handleDoubleClick } from '~/utils';
-
-export const CodeVariableGfm: React.ElementType = ({ children }: { children: React.ReactNode }) => {
- return (
- <code
- onDoubleClick={handleDoubleClick}
- className="bg-surface-primary-alt text-text-secondary rounded-md p-1 text-xs md:text-sm"
- >
- {children}
- </code>
- );
-};
const variableRegex = /{{(.*?)}}/g;
diff --git a/client/src/components/Prompts/editor/index.ts b/client/src/components/Prompts/editor/index.ts
index cd900b18d3..d0f9388f16 100644
--- a/client/src/components/Prompts/editor/index.ts
+++ b/client/src/components/Prompts/editor/index.ts
@@ -1,3 +1,3 @@
export { default as PromptEditor } from './PromptEditor';
-export { CodeVariableGfm, PromptVariableGfm } from './Markdown';
+export { PromptVariableGfm } from './Markdown';
export { default as VariablesDropdown } from './VariablesDropdown';
diff --git a/client/src/components/Prompts/forms/PromptLabelsForm.tsx b/client/src/components/Prompts/forms/PromptLabelsForm.tsx
deleted file mode 100644
index 6c8088a212..0000000000
--- a/client/src/components/Prompts/forms/PromptLabelsForm.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useState } from 'react';
-import { Input } from '@librechat/client';
-import { Cross1Icon } from '@radix-ui/react-icons';
-import type { TPrompt } from 'librechat-data-provider';
-import { useUpdatePromptLabels } from '~/data-provider';
-import { useLocalize } from '~/hooks';
-
-const PromptLabelsForm = ({ selectedPrompt }: { selectedPrompt?: TPrompt }) => {
- const localize = useLocalize();
- const [labelInput, setLabelInput] = useState<string>('');
- const [labels, setLabels] = useState<string[]>([]);
- const updatePromptLabelsMutation = useUpdatePromptLabels();
-
- const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
- setLabelInput(e.target.value);
- };
-
- const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
- // Ignore the Enter that commits an IME composition (see useTextarea.ts).
- if (
- e.key === 'Enter' &&
- !(e.nativeEvent.isComposing || e.keyCode === 229) &&
- labelInput.trim()
- ) {
- const newLabels = [...labels, labelInput.trim()];
- setLabels(newLabels);
- setLabelInput('');
- updatePromptLabelsMutation.mutate({
- id: selectedPrompt?._id || '',
- payload: { labels: newLabels },
- });
- }
- };
-
- return (
- <>
- <Input
- type="text"
- className="mb-4"
- placeholder={`+ ${localize('com_ui_add_labels')}`}
- value={labelInput}
- onChange={handleInputChange}
- onKeyDown={handleKeyDown}
- aria-label={localize('com_ui_add_labels')}
- />
- <h3 className="rounded-t-lg border border-border-medium px-4 text-base font-semibold text-text-primary">
- {localize('com_ui_labels')}
- </h3>
- <div className="mb-4 flex w-full flex-row flex-wrap rounded-b-lg border border-border-medium p-4">
- {labels.length ? (
- labels.map((label, index) => (
- <span
- className="mb-1 mr-1 flex items-center gap-x-2 rounded-full border px-2"
- key={index}
- >
- {label}
- <button
- type="button"
- onClick={() => {
- const newLabels = labels.filter((l) => l !== label);
- setLabels(newLabels);
- updatePromptLabelsMutation.mutate({
- id: selectedPrompt?._id || '',
- payload: { labels: newLabels },
- });
- }}
- className="cursor-pointer"
- aria-label={`${localize('com_ui_delete')} ${label}`}
- >
- <Cross1Icon aria-hidden="true" />
- </button>
- </span>
- ))
- ) : (
- <span className="rounded-full border px-2">{localize('com_ui_no_labels')}</span>
- )}
- </div>
- </>
- );
-};
-
-export default PromptLabelsForm;
diff --git a/client/src/components/Prompts/forms/index.ts b/client/src/components/Prompts/forms/index.ts
index 30e23acdfa..ac0a0a8fad 100644
--- a/client/src/components/Prompts/forms/index.ts
+++ b/client/src/components/Prompts/forms/index.ts
@@ -1,4 +1,3 @@
export { default as PromptForm } from './PromptForm';
export { default as VariableForm } from './VariableForm';
-export { default as PromptLabelsForm } from './PromptLabelsForm';
export { default as CreatePromptForm } from './CreatePromptForm';
diff --git a/client/src/components/Prompts/index.ts b/client/src/components/Prompts/index.ts
index 3728ea3b61..7ed76efc10 100644
--- a/client/src/components/Prompts/index.ts
+++ b/client/src/components/Prompts/index.ts
@@ -2,9 +2,9 @@ export { InlinePromptsView } from './layouts';
export { CategoryIcon, SkeletonForm } from './utils';
export { PromptName, Command, Description, CategorySelector } from './fields';
export { PreviewPrompt, DeleteVersion, VariableDialog, SharePrompt } from './dialogs';
-export { PromptForm, CreatePromptForm, VariableForm, PromptLabelsForm } from './forms';
-export { PromptEditor, VariablesDropdown, CodeVariableGfm, PromptVariableGfm } from './editor';
+export { PromptForm, CreatePromptForm, VariableForm } from './forms';
+export { PromptEditor, VariablesDropdown, PromptVariableGfm } from './editor';
export { PromptDetails, PromptVariables, PromptVersions } from './display';
export { GroupSidePanel as PromptSidePanel, PromptsAccordion, FilterPrompts } from './sidebar';
-export { List as PromptGroupsList, ChatGroupItem, ListCard, NoPromptGroup } from './lists';
-export { CreatePromptButton, AdminSettings, AlwaysMakeProd, AutoSendPrompt } from './buttons';
+export { List as PromptGroupsList, ChatGroupItem, NoPromptGroup } from './lists';
+export { CreatePromptButton, AdminSettings, AutoSendPrompt } from './buttons';
diff --git a/client/src/components/Prompts/lists/ListCard.tsx b/client/src/components/Prompts/lists/ListCard.tsx
deleted file mode 100644
index 3b186e3c98..0000000000
--- a/client/src/components/Prompts/lists/ListCard.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { useId } from 'react';
-import { Label } from '@librechat/client';
-import CategoryIcon from '../utils/CategoryIcon';
-import { useLocalize } from '~/hooks';
-
-export default function ListCard({
- category,
- name,
- snippet,
- onClick,
- children,
- icon,
-}: {
- category: string;
- name: string;
- snippet: string;
- onClick?: () => void;
- children?: React.ReactNode;
- icon?: React.ReactNode;
-}) {
- const id = useId();
- const localize = useLocalize();
- const snippetId = `${id}-snippet`;
- const titleId = `${id}-title`;
-
- const ariaLabel = category
- ? localize('com_ui_prompt_group_button', { name, category })
- : localize('com_ui_prompt_group_button_no_category', { name });
-
- return (
- <div className="text-1sm relative flex w-full cursor-pointer flex-col gap-2 rounded-xl px-3 pt-3 pb-4 text-start align-top">
- {onClick && (
- <button
- type="button"
- className="focus-visible:ring-ring-primary absolute inset-0 z-0 rounded-xl focus:outline-hidden focus-visible:ring-2"
- onClick={onClick}
- aria-label={ariaLabel}
- aria-describedby={snippetId}
- />
- )}
- <div className="flex w-full justify-between gap-2">
- <div className="flex min-w-0 flex-1 flex-row items-center gap-2 overflow-hidden">
- <CategoryIcon category={category} className="icon-md shrink-0" aria-hidden="true" />
- <Label
- id={titleId}
- className="min-w-0 truncate text-sm font-medium select-none"
- title={name}
- >
- {name}
- </Label>
- {icon}
- </div>
- <div className="relative z-10">{children}</div>
- </div>
- <div
- id={snippetId}
- className="ellipsis text-text-secondary max-w-full pt-1 text-sm text-balance select-none"
- >
- {snippet}
- </div>
- </div>
- );
-}
diff --git a/client/src/components/Prompts/lists/PromptGroupSkeleton.tsx b/client/src/components/Prompts/lists/PromptGroupSkeleton.tsx
index ac88d4fbf6..06a8402282 100644
--- a/client/src/components/Prompts/lists/PromptGroupSkeleton.tsx
+++ b/client/src/components/Prompts/lists/PromptGroupSkeleton.tsx
@@ -1,6 +1,6 @@
import { Skeleton } from '@librechat/client';
-/** Mirrors ListCard's stacked name and one-liner */
+/** Mirrors the stacked name and one-liner of a prompt group row */
export default function PromptGroupSkeleton({ count = 5 }: { count?: number }) {
return (
<div aria-hidden="true">
diff --git a/client/src/components/Prompts/lists/index.ts b/client/src/components/Prompts/lists/index.ts
index 6a28042fd9..3ed0ba50d3 100644
--- a/client/src/components/Prompts/lists/index.ts
+++ b/client/src/components/Prompts/lists/index.ts
@@ -1,4 +1,3 @@
export { default as List } from './List';
-export { default as ListCard } from './ListCard';
export { default as ChatGroupItem } from './ChatGroupItem';
export { default as NoPromptGroup } from './NoPromptGroup';
diff --git a/client/src/components/SidePanel/Bookmarks/index.ts b/client/src/components/SidePanel/Bookmarks/index.ts
deleted file mode 100644
index c9b2dba589..0000000000
--- a/client/src/components/SidePanel/Bookmarks/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { default as BookmarkPanel } from './BookmarkPanel';
-export { default as BookmarkTable } from './BookmarkTable';
-export { default as BookmarkList } from './BookmarkList';
-export { default as BookmarkCard } from './BookmarkCard';
-export { default as BookmarkCardActions } from './BookmarkCardActions';
-export { default as BookmarkEmptyState } from './BookmarkEmptyState';
diff --git a/client/src/components/SidePanel/Builder/ActionsTable/Columns.tsx b/client/src/components/SidePanel/Builder/ActionsTable/Columns.tsx
index 631b81c4a4..878dd8fdf7 100644
--- a/client/src/components/SidePanel/Builder/ActionsTable/Columns.tsx
+++ b/client/src/components/SidePanel/Builder/ActionsTable/Columns.tsx
@@ -7,27 +7,6 @@ export type Spec = {
domain: string;
};
-export const fakeData: Spec[] = [
- {
- name: 'listPets',
- method: 'get',
- path: '/pets',
- domain: 'petstore.swagger.io',
- },
- {
- name: 'createPets',
- method: 'post',
- path: '/pets',
- domain: 'petstore.swagger.io',
- },
- {
- name: 'showPetById',
- method: 'get',
- path: '/pets/{petId}',
- domain: 'petstore.swagger.io',
- },
-];
-
export const columns: ColumnDef<Spec>[] = [
{
header: 'Name',
@@ -41,14 +20,4 @@ export const columns: ColumnDef<Spec>[] = [
header: 'Path',
accessorKey: 'path',
},
- // {
- // header: '',
- // accessorKey: 'action',
- // // eslint-disable-next-line @typescript-eslint/no-unused-vars
- // cell: ({ row: _row }) => (
- // <button className="btn relative btn-neutral h-8 rounded-lg border-border-light font-medium">
- // <div className="flex w-full gap-2 items-center justify-center">Test</div>
- // </button>
- // ),
- // },
];
diff --git a/client/src/components/SidePanel/MCPBuilder/index.ts b/client/src/components/SidePanel/MCPBuilder/index.ts
deleted file mode 100644
index 074f579c3f..0000000000
--- a/client/src/components/SidePanel/MCPBuilder/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export { default } from './MCPBuilderPanel';
-export { default as MCPBuilderPanel } from './MCPBuilderPanel';
-export { default as MCPServerList } from './MCPServerList';
-export { default as MCPServerDialog } from './MCPServerDialog';
-export { default as MCPServerCard } from './MCPServerCard';
-export { default as MCPStatusBadge, getStatusDotColor } from './MCPStatusBadge';
-export { default as MCPCardActions } from './MCPCardActions';
diff --git a/client/src/components/SidePanel/Memories/index.ts b/client/src/components/SidePanel/Memories/index.ts
index 837704e497..12179bb1a3 100644
--- a/client/src/components/SidePanel/Memories/index.ts
+++ b/client/src/components/SidePanel/Memories/index.ts
@@ -1,10 +1 @@
export { default as MemoryPanel } from './MemoryPanel';
-export { default as MemoryViewer } from './MemoryPanel'; // Backward compatibility alias
-export { default as MemoryList } from './MemoryList';
-export { default as MemoryCard } from './MemoryCard';
-export { default as MemoryCardActions } from './MemoryCardActions';
-export { default as MemoryUsageBadge } from './MemoryUsageBadge';
-export { default as MemoryEmptyState } from './MemoryEmptyState';
-export { default as MemoryEditDialog } from './MemoryEditDialog';
-export { default as MemoryCreateDialog } from './MemoryCreateDialog';
-export { default as AdminSettings } from './AdminSettings';
diff --git a/client/src/components/SidePanel/Parameters/Panel.tsx b/client/src/components/SidePanel/Parameters/Panel.tsx
index 1f41bf40f9..b341779fc5 100644
--- a/client/src/components/SidePanel/Parameters/Panel.tsx
+++ b/client/src/components/SidePanel/Parameters/Panel.tsx
@@ -87,15 +87,6 @@ export default function Parameters() {
return;
}
- // const defaultValueMap = new Map();
- // const paramKeys = new Set(
- // parameters.map((setting) => {
- // if (setting.default != null) {
- // defaultValueMap.set(setting.key, setting.default);
- // }
- // return setting.key;
- // }),
- // );
const paramKeys = new Set(
parameters.filter((setting) => setting != null).map((setting) => setting.key),
);
@@ -109,13 +100,6 @@ export default function Parameters() {
const conversationKeys = Object.keys(updatedConversation);
const updatedKeys: string[] = [];
conversationKeys.forEach((key) => {
- // const defaultValue = defaultValueMap.get(key);
- // if (paramKeys.has(key) && defaultValue != null && prev[key] != null) {
- // updatedKeys.push(key);
- // updatedConversation[key] = defaultValue;
- // return;
- // }
-
if (paramKeys.has(key)) {
return;
}
diff --git a/client/src/components/Skills/layouts/index.ts b/client/src/components/Skills/layouts/index.ts
deleted file mode 100644
index 5c2b36bdc5..0000000000
--- a/client/src/components/Skills/layouts/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SkillsView } from './SkillsView';
diff --git a/client/src/components/Tools/index.ts b/client/src/components/Tools/index.ts
deleted file mode 100644
index d62248d2b3..0000000000
--- a/client/src/components/Tools/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ToolItem } from './ToolItem';
diff --git a/client/src/components/Web/Context.tsx b/client/src/components/Web/Context.tsx
index d2fec73732..9508936cf9 100644
--- a/client/src/components/Web/Context.tsx
+++ b/client/src/components/Web/Context.tsx
@@ -1,4 +1,4 @@
-import { createContext, useContext } from 'react';
+import { createContext } from 'react';
import type { SearchRefType, ValidSource, ResultReference } from 'librechat-data-provider';
import type * as t from './types';
import { useSearchContext } from '~/Providers';
@@ -13,11 +13,6 @@ export const CitationContext = createContext<CitationContextType>({
setHoveredCitationId: () => {},
});
-export function useHighlightState(citationId: string | undefined) {
- const { hoveredCitationId } = useContext(CitationContext);
- return citationId && hoveredCitationId === citationId;
-}
-
export type CitationSource = (ValidSource | ResultReference) & {
turn: number;
refType: string | SearchRefType;
diff --git a/client/src/components/index.ts b/client/src/components/index.ts
deleted file mode 100644
index 5ecdd1f344..0000000000
--- a/client/src/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './ui';
diff --git a/client/src/components/ui/index.ts b/client/src/components/ui/index.ts
index bbc8022214..98eb12c149 100644
--- a/client/src/components/ui/index.ts
+++ b/client/src/components/ui/index.ts
@@ -1,13 +1,11 @@
+/** Read by the shadcn lint (`componentImports` in eslint.config.mjs) to resolve these primitives' variants; keep it even without importers. */
export { Button, FieldMessage } from '@librechat/client';
export { default as Collapse } from './Collapse';
export { default as AutoHeight } from './AutoHeight';
-export { default as Description } from './Description';
-export { getPlainDescription, isHtmlDescription } from './Description';
-export { default as CustomIcon } from './CustomIcon';
export { default as PanelFooter } from './PanelFooter';
export { default as PanelContent } from './PanelContent';
export { default as PanelHeader } from './PanelHeader';
export { default as TermsAndConditionsModal } from './TermsAndConditionsModal';
export { default as AdminSettingsDialog } from './AdminSettingsDialog';
export { default as LocalizedDateRangePicker } from './LocalizedDateRangePicker';
-export type { PermissionConfig, AdminSettingsDialogProps } from './AdminSettingsDialog';
+export type { PermissionConfig } from './AdminSettingsDialog';
diff --git a/client/src/data-provider/prompts.ts b/client/src/data-provider/prompts.ts
index 29efaff61a..629c4f56a4 100644
--- a/client/src/data-provider/prompts.ts
+++ b/client/src/data-provider/prompts.ts
@@ -264,27 +264,6 @@ export const useDeletePromptGroup = (
});
};
-export const useUpdatePromptLabels = (
- options?: t.UpdatePromptLabelOptions,
-): UseMutationResult<
- t.TUpdatePromptLabelsResponse,
- unknown,
- t.TUpdatePromptLabelsRequest,
- unknown
-> => {
- const { onSuccess, ...rest } = options || {};
- return useMutation({
- mutationFn: (variables: t.TUpdatePromptLabelsRequest) =>
- dataService.updatePromptLabels(variables),
- ...rest,
- onSuccess: (response, variables, context) => {
- if (onSuccess) {
- onSuccess(response, variables, context);
- }
- },
- });
-};
-
export const useMakePromptProduction = (options?: t.MakePromptProductionOptions) => {
const queryClient = useQueryClient();
const { onSuccess, onError, onMutate } = options || {};
diff --git a/client/src/hooks/Input/useQueryParams.spec.ts b/client/src/hooks/Input/useQueryParams.spec.ts
index 87b66749e1..12c8e6e111 100644
--- a/client/src/hooks/Input/useQueryParams.spec.ts
+++ b/client/src/hooks/Input/useQueryParams.spec.ts
@@ -76,7 +76,6 @@ jest.mock('~/utils', () => {
// Only mock logger to suppress test output
logger: { log: jest.fn(), warn: jest.fn(), error: jest.fn() },
// Mock theme utilities that interact with DOM
- getInitialTheme: jest.fn(() => 'light'),
applyFontSize: jest.fn(),
};
});
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index 6cd25eb8c5..acf2621e2f 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -1126,7 +1126,6 @@
"com_ui_add_first_mcp_server": "Create your first MCP server to get started",
"com_ui_add_first_project": "Create a project to keep related conversations together",
"com_ui_add_first_prompt": "Create your first prompt to get started",
- "com_ui_add_labels": "Add Labels",
"com_ui_add_mcp": "Add MCP",
"com_ui_add_mcp_server": "Add MCP Server",
"com_ui_add_model_preset": "Add a model or preset for an additional response",
@@ -1717,7 +1716,6 @@
"com_ui_enabled": "Enabled",
"com_ui_endpoint": "Endpoint",
"com_ui_endpoint_filter_limit": "Endpoint limit reached ({{count}})",
- "com_ui_endpoint_menu": "LLM Endpoint Menu",
"com_ui_enter": "Enter",
"com_ui_enter_api_key": "Enter API Key",
"com_ui_enter_api_key_optional": "Enter API Key (optional)",
@@ -1931,7 +1929,6 @@
"com_ui_invoked_by": "Invoked by",
"com_ui_key": "Key",
"com_ui_key_required": "API key is required",
- "com_ui_labels": "Labels",
"com_ui_langfuse_beta_info": "This feature is in beta. Enabling this connection sends traces from all agents in your organization, along with feedback scores, to your Langfuse project.",
"com_ui_langfuse_destination": "Destination",
"com_ui_langfuse_destination_removed": "The saved Langfuse destination is no longer available. Disable the connection or select another destination.",
@@ -2367,7 +2364,6 @@
"com_ui_no_chats_match_filters": "No chats match your filters",
"com_ui_no_data": "Nothing here yet",
"com_ui_no_individual_resource_access": "No individual users or groups have access",
- "com_ui_no_labels": "No Labels",
"com_ui_no_mcp_servers": "No MCP servers yet",
"com_ui_no_mcp_servers_match": "No MCP servers match your filter",
"com_ui_no_memories": "No memories. Create them manually or prompt the AI to remember something",
diff --git a/client/src/routes/__tests__/skillsRoutes.spec.tsx b/client/src/routes/__tests__/skillsRoutes.spec.tsx
index 18feeec50b..45fe3bddc8 100644
--- a/client/src/routes/__tests__/skillsRoutes.spec.tsx
+++ b/client/src/routes/__tests__/skillsRoutes.spec.tsx
@@ -5,7 +5,6 @@ jest.mock('~/components/Auth', () => ({
VerifyEmail: () => null,
Registration: () => null,
ResetPassword: () => null,
- ApiErrorWatcher: () => null,
TwoFactorScreen: () => null,
TwoFactorSetupScreen: () => null,
RequestPasswordReset: () => null,
diff --git a/client/src/routes/index.tsx b/client/src/routes/index.tsx
index 58364a2d91..3373c92358 100644
--- a/client/src/routes/index.tsx
+++ b/client/src/routes/index.tsx
@@ -4,7 +4,6 @@ import {
VerifyEmail,
Registration,
ResetPassword,
- ApiErrorWatcher,
TwoFactorScreen,
TwoFactorSetupScreen,
RequestPasswordReset,
@@ -28,7 +27,6 @@ const AuthLayout = () => (
<WithRum>
<Outlet />
</WithRum>
- <ApiErrorWatcher />
</AuthContextProvider>
);
diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index 88ff682245..9b81369a85 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -229,11 +229,6 @@
"count": 2
}
},
- "client/src/components/Chat/Menus/UI/MenuItem.tsx": {
- "design/disabled-recipe": {
- "count": 1
- }
- },
"client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx": {
"shadcn/no-arbitrary-values": {
"count": 2
@@ -612,11 +607,6 @@
"count": 5
}
},
- "client/src/components/Conversations/Pages.tsx": {
- "shadcn/require-static-classes": {
- "count": 2
- }
- },
"client/src/components/Conversations/ProjectsSection.tsx": {
"shadcn/no-restyle": {
"count": 7
@@ -652,17 +642,6 @@
"count": 1
}
},
- "client/src/components/Endpoints/Settings/Advanced.tsx": {
- "design/disabled-recipe": {
- "count": 2
- },
- "shadcn/no-restyle": {
- "count": 18
- },
- "shadcn/require-static-classes": {
- "count": 4
- }
- },
"client/src/components/Endpoints/Settings/Assistants.tsx": {
"shadcn/no-restyle": {
"count": 1
@@ -813,11 +792,6 @@
"count": 9
}
},
- "client/src/components/Nav/NavLink.tsx": {
- "design/disabled-recipe": {
- "count": 1
- }
- },
"client/src/components/Nav/NavToggle.tsx": {
"shadcn/no-inline-styles": {
"count": 4
@@ -873,14 +847,6 @@
"count": 1
}
},
- "client/src/components/Nav/SettingsTabs/DangerButton.tsx": {
- "shadcn/no-restyle": {
- "count": 5
- },
- "shadcn/require-static-classes": {
- "count": 1
- }
- },
"client/src/components/Nav/SettingsTabs/Data/ArchiveAllChats.tsx": {
"shadcn/no-restyle": {
"count": 2
diff --git a/packages/client/src/components/DataTable/DataTable.hooks.spec.ts b/packages/client/src/components/DataTable/DataTable.hooks.spec.ts
index 166ffddea7..6863a20696 100644
--- a/packages/client/src/components/DataTable/DataTable.hooks.spec.ts
+++ b/packages/client/src/components/DataTable/DataTable.hooks.spec.ts
@@ -1,12 +1,5 @@
import { renderHook, act, waitFor } from '@testing-library/react';
-import type { TableColumn } from './DataTable.types';
-import {
- useDebounced,
- useOptimizedRowSelection,
- useColumnStyles,
- useKeyboardNavigation,
- useTableRowHeight,
-} from './DataTable.hooks';
+import { useDebounced, useOptimizedRowSelection, useTableRowHeight } from './DataTable.hooks';
describe('DataTable Hooks', () => {
describe('useDebounced', () => {
@@ -152,322 +145,6 @@ describe('DataTable Hooks', () => {
expect(selection).toEqual({ existing: true, new: true });
});
});
-
- describe('useColumnStyles', () => {
- let mockContainerRef: React.RefObject<HTMLDivElement>;
- let mockContainer: HTMLDivElement;
-
- beforeEach(() => {
- mockContainer = document.createElement('div');
- Object.defineProperty(mockContainer, 'clientWidth', {
- configurable: true,
- value: 1000,
- });
- mockContainerRef = { current: mockContainer };
- });
-
- it('should return empty object when container width is 0', () => {
- Object.defineProperty(mockContainer, 'clientWidth', { value: 0 });
-
- const columns: TableColumn<{ name: string }, string>[] = [
- { accessorKey: 'name', header: 'Name' },
- ];
-
- const { result } = renderHook(() => useColumnStyles(columns, false, mockContainerRef));
-
- expect(result.current).toEqual({});
- });
-
- it('should calculate fixed width columns', () => {
- const columns: TableColumn<{ name: string; status: string }, string>[] = [
- { accessorKey: 'name', header: 'Name', meta: { size: 200 } },
- { accessorKey: 'status', header: 'Status', meta: { size: 100 } },
- ];
-
- const { result } = renderHook(() => useColumnStyles(columns, false, mockContainerRef));
-
- expect(result.current.name).toBeDefined();
- expect(result.current.status).toBeDefined();
- });
-
- it('should distribute available width to flexible columns by priority', () => {
- const columns: TableColumn<{ col1: string; col2: string; col3: string }, string>[] = [
- { accessorKey: 'col1', header: 'Col 1', meta: { size: 200 } }, // fixed
- { accessorKey: 'col2', header: 'Col 2', meta: { priority: 2 } }, // flexible, priority 2
- { accessorKey: 'col3', header: 'Col 3', meta: { priority: 1 } }, // flexible, priority 1
- ];
-
- const { result } = renderHook(() => useColumnStyles(columns, false, mockContainerRef));
-
- // Available width = 1000 - 200 = 800
- // Total priority = 3
- // col2 should get 2/3 = ~533px
- // col3 should get 1/3 = ~266px
- expect(result.current.col2).toBeDefined();
- expect(result.current.col3).toBeDefined();
- });
-
- it('should handle mobile vs desktop sizes', () => {
- const columns: TableColumn<{ name: string }, string>[] = [
- { accessorKey: 'name', header: 'Name', meta: { size: 200, mobileSize: 150 } },
- ];
-
- // Desktop
- const { result: desktopResult } = renderHook(() =>
- useColumnStyles(columns, false, mockContainerRef),
- );
-
- // Mobile
- const { result: mobileResult } = renderHook(() =>
- useColumnStyles(columns, true, mockContainerRef),
- );
-
- // Mobile should use mobileSize if defined
- expect(mobileResult.current.name).toBeDefined();
- expect(desktopResult.current.name).toBeDefined();
- });
-
- it('should handle columns with id instead of accessorKey', () => {
- const columns: TableColumn<Record<string, unknown>, unknown>[] = [
- { id: 'custom-column', header: 'Custom', meta: { size: 150 } },
- ];
-
- const { result } = renderHook(() => useColumnStyles(columns, false, mockContainerRef));
-
- expect(result.current['custom-column']).toBeDefined();
- });
-
- it('should return empty object when container ref is null', () => {
- const nullRef = { current: null };
- const columns: TableColumn<{ name: string }, string>[] = [
- { accessorKey: 'name', header: 'Name' },
- ];
-
- const { result } = renderHook(() =>
- useColumnStyles(columns, false, nullRef as React.RefObject<HTMLDivElement>),
- );
-
- expect(result.current).toEqual({});
- });
- });
-
- describe('useKeyboardNavigation', () => {
- let mockTableRef: React.RefObject<HTMLDivElement>;
- let mockTable: HTMLDivElement;
- let mockOnRowSelect: jest.Mock;
-
- beforeEach(() => {
- mockTable = document.createElement('div');
- document.body.appendChild(mockTable);
- mockTableRef = { current: mockTable };
- mockOnRowSelect = jest.fn();
- });
-
- afterEach(() => {
- document.body.removeChild(mockTable);
- });
-
- const dispatchKeyEvent = (key: string, target?: HTMLElement) => {
- const event = new KeyboardEvent('keydown', {
- key,
- bubbles: true,
- cancelable: true,
- });
- (target || mockTable).dispatchEvent(event);
- };
-
- it('should initialize with focused index of -1', () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- expect(result.current.focusedRowIndex).toBe(-1);
- });
-
- it('should navigate down with ArrowDown key', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(0);
- });
-
- act(() => {
- dispatchKeyEvent('ArrowDown');
- });
-
- await waitFor(() => {
- expect(result.current.focusedRowIndex).toBe(1);
- });
- });
-
- it('should navigate up with ArrowUp key', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(5);
- });
-
- act(() => {
- dispatchKeyEvent('ArrowUp');
- });
-
- await waitFor(() => {
- expect(result.current.focusedRowIndex).toBe(4);
- });
- });
-
- it('should not go below 0 with ArrowUp', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(0);
- });
-
- act(() => {
- dispatchKeyEvent('ArrowUp');
- });
-
- await waitFor(() => {
- expect(result.current.focusedRowIndex).toBe(0);
- });
- });
-
- it('should not exceed row count with ArrowDown', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 5, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(4);
- });
-
- act(() => {
- dispatchKeyEvent('ArrowDown');
- });
-
- await waitFor(() => {
- expect(result.current.focusedRowIndex).toBe(4);
- });
- });
-
- it('should jump to first row with Home key', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(5);
- });
-
- act(() => {
- dispatchKeyEvent('Home');
- });
-
- await waitFor(() => {
- expect(result.current.focusedRowIndex).toBe(0);
- });
- });
-
- it('should jump to last row with End key', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(0);
- });
-
- act(() => {
- dispatchKeyEvent('End');
- });
-
- await waitFor(() => {
- expect(result.current.focusedRowIndex).toBe(9);
- });
- });
-
- it('should trigger onRowSelect with Enter key', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(3);
- });
-
- act(() => {
- dispatchKeyEvent('Enter');
- });
-
- await waitFor(() => {
- expect(mockOnRowSelect).toHaveBeenCalledWith(3);
- });
- });
-
- it('should trigger onRowSelect with Space key', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(2);
- });
-
- act(() => {
- dispatchKeyEvent(' ');
- });
-
- await waitFor(() => {
- expect(mockOnRowSelect).toHaveBeenCalledWith(2);
- });
- });
-
- it('should reset focused index with Escape key', async () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(5);
- });
-
- act(() => {
- dispatchKeyEvent('Escape');
- });
-
- await waitFor(() => {
- expect(result.current.focusedRowIndex).toBe(-1);
- });
- });
-
- it('should ignore events outside table', () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- const outsideElement = document.createElement('div');
- document.body.appendChild(outsideElement);
-
- act(() => {
- result.current.setFocusedRowIndex(0);
- });
-
- const event = new KeyboardEvent('keydown', {
- key: 'ArrowDown',
- bubbles: true,
- });
- outsideElement.dispatchEvent(event);
-
- // Should not change because event target is outside table
- expect(result.current.focusedRowIndex).toBe(0);
-
- document.body.removeChild(outsideElement);
- });
-
- it('should not call onRowSelect if focused index is -1', () => {
- renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- dispatchKeyEvent('Enter');
- });
-
- expect(mockOnRowSelect).not.toHaveBeenCalled();
- });
-
- it('should allow manual focus index setting', () => {
- const { result } = renderHook(() => useKeyboardNavigation(mockTableRef, 10, mockOnRowSelect));
-
- act(() => {
- result.current.setFocusedRowIndex(7);
- });
-
- expect(result.current.focusedRowIndex).toBe(7);
- });
- });
});
describe('useTableRowHeight', () => {
diff --git a/packages/client/src/components/DataTable/DataTable.hooks.ts b/packages/client/src/components/DataTable/DataTable.hooks.ts
index a2fa411e33..8e61b5d209 100644
--- a/packages/client/src/components/DataTable/DataTable.hooks.ts
+++ b/packages/client/src/components/DataTable/DataTable.hooks.ts
@@ -1,13 +1,4 @@
-import {
- useMemo,
- useState,
- useEffect,
- useSyncExternalStore,
- SetStateAction,
- Dispatch,
- CSSProperties,
-} from 'react';
-import type { TableColumn } from './DataTable.types';
+import { useState, useEffect, useSyncExternalStore, SetStateAction, Dispatch } from 'react';
export function useDebounced<T>(value: T, delay: number): T {
const [debounced, setDebounced] = useState(value);
@@ -27,130 +18,6 @@ export const useOptimizedRowSelection = (
return [selection, setSelection] as const;
};
-export const useColumnStyles = <TData, TValue>(
- columns: TableColumn<TData, TValue>[],
- isSmallScreen: boolean,
- containerRef: React.RefObject<HTMLDivElement>,
-): Record<string, CSSProperties> => {
- const [containerWidth, setContainerWidth] = useState(0);
-
- useEffect(() => {
- const container = containerRef.current;
- if (!container) return;
-
- const updateWidth = () => {
- setContainerWidth(container.clientWidth);
- };
-
- const resizeObserver = new ResizeObserver(updateWidth);
- resizeObserver.observe(container);
- updateWidth();
-
- return () => resizeObserver.disconnect();
- }, [containerRef]);
-
- return useMemo(() => {
- if (containerWidth === 0) {
- return {};
- }
-
- const styles: Record<string, React.CSSProperties> = {};
- let totalFixedWidth = 0;
- const flexibleColumns: (TableColumn<TData, TValue> & { priority: number })[] = [];
-
- columns.forEach((column) => {
- const key = String(column.id ?? column.accessorKey ?? '');
- const size = isSmallScreen ? column.meta?.mobileSize : column.meta?.size;
-
- if (size) {
- const width = parseInt(String(size), 10);
- totalFixedWidth += width;
- styles[key] = {
- width: size,
- minWidth: column.meta?.minWidth || size,
- };
- } else {
- flexibleColumns.push({ ...column, priority: column.meta?.priority ?? 1 });
- }
- });
-
- const availableWidth = containerWidth - totalFixedWidth;
- const totalPriority = flexibleColumns.reduce((sum, col) => sum + col.priority, 0);
-
- if (availableWidth > 0 && totalPriority > 0) {
- flexibleColumns.forEach((column) => {
- const key = String(column.id ?? column.accessorKey ?? '');
- const proportion = column.priority / totalPriority;
- const width = Math.max(Math.floor(availableWidth * proportion), 80); // min width of 80px
- styles[key] = {
- width: `${width}px`,
- minWidth: column.meta?.minWidth ?? `${isSmallScreen ? 60 : 80}px`,
- };
- });
- }
-
- return styles;
- }, [columns, containerWidth, isSmallScreen]);
-};
-
-export const useDynamicColumnWidths: <TData, TValue>(
- columns: TableColumn<TData, TValue>[],
- isSmallScreen: boolean,
- containerRef: React.RefObject<HTMLDivElement>,
-) => Record<string, CSSProperties> = useColumnStyles;
-
-export const useKeyboardNavigation = (
- tableRef: React.RefObject<HTMLDivElement>,
- rowCount: number,
- onRowSelect?: (index: number) => void,
-): {
- focusedRowIndex: number;
- setFocusedRowIndex: Dispatch<SetStateAction<number>>;
-} => {
- const [focusedRowIndex, setFocusedRowIndex] = useState<number>(-1);
-
- useEffect(() => {
- const handleKeyDown = (event: KeyboardEvent) => {
- if (!tableRef.current?.contains(event.target as Node)) return;
-
- switch (event.key) {
- case 'ArrowDown':
- event.preventDefault();
- setFocusedRowIndex((prev) => Math.min(prev + 1, rowCount - 1));
- break;
- case 'ArrowUp':
- event.preventDefault();
- setFocusedRowIndex((prev) => Math.max(prev - 1, 0));
- break;
- case 'Home':
- event.preventDefault();
- setFocusedRowIndex(0);
- break;
- case 'End':
- event.preventDefault();
- setFocusedRowIndex(rowCount - 1);
- break;
- case 'Enter':
- case ' ':
- if (focusedRowIndex >= 0 && onRowSelect) {
- event.preventDefault();
- onRowSelect(focusedRowIndex);
- }
- break;
- case 'Escape':
- setFocusedRowIndex(-1);
- (event.target as HTMLElement).blur();
- break;
- }
- };
-
- document.addEventListener('keydown', handleKeyDown);
- return () => document.removeEventListener('keydown', handleKeyDown);
- }, [tableRef, rowCount, focusedRowIndex, onRowSelect]);
-
- return { focusedRowIndex, setFocusedRowIndex };
-};
-
const DEFAULT_CELL_SPACE_PX = 16;
/**
diff --git a/packages/client/src/components/DataTable/DataTableErrorBoundary.spec.tsx b/packages/client/src/components/DataTable/DataTableErrorBoundary.spec.tsx
deleted file mode 100644
index 658fc9f706..0000000000
--- a/packages/client/src/components/DataTable/DataTableErrorBoundary.spec.tsx
+++ /dev/null
@@ -1,311 +0,0 @@
-import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
-import { DataTableErrorBoundary } from './DataTableErrorBoundary';
-
-// Mock the logger
-jest.mock('~/utils', () => ({
- logger: {
- error: jest.fn(),
- log: jest.fn(),
- warn: jest.fn(),
- },
-}));
-
-// Mock lucide-react
-jest.mock('lucide-react', () => ({
- RefreshCw: ({ className }: { className?: string }) => (
- <svg data-testid="refresh-icon" className={className} />
- ),
-}));
-
-// Mock the Button component
-jest.mock('../Button', () => ({
- Button: ({
- children,
- onClick,
- variant,
- className,
- 'aria-label': ariaLabel,
- }: {
- children: React.ReactNode;
- onClick?: () => void;
- variant?: string;
- className?: string;
- 'aria-label'?: string;
- }) => (
- <button
- onClick={onClick}
- data-variant={variant}
- className={className}
- aria-label={ariaLabel}
- data-testid="retry-button"
- >
- {children}
- </button>
- ),
-}));
-
-// Component that throws an error
-const ThrowingComponent = ({ shouldThrow }: { shouldThrow: boolean }) => {
- if (shouldThrow) {
- throw new Error('Test error message');
- }
- return <div data-testid="child-content">Child content</div>;
-};
-
-// Suppress console.error for expected errors during tests
-const originalConsoleError = console.error;
-beforeAll(() => {
- console.error = jest.fn();
-});
-
-afterAll(() => {
- console.error = originalConsoleError;
-});
-
-beforeEach(() => {
- jest.clearAllMocks();
-});
-
-describe('DataTableErrorBoundary', () => {
- it('should render children when no error', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={false} />
- </DataTableErrorBoundary>,
- );
-
- expect(screen.getByTestId('child-content')).toBeInTheDocument();
- expect(screen.getByText('Child content')).toBeInTheDocument();
- });
-
- it('should catch errors and display fallback UI', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- expect(screen.queryByTestId('child-content')).not.toBeInTheDocument();
- expect(screen.getByRole('alert')).toBeInTheDocument();
- });
-
- it('should show error title', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- // The title comes from localize which returns the key
- expect(screen.getByText('com_ui_table_error')).toBeInTheDocument();
- });
-
- it('should show error description', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- expect(screen.getByText('com_ui_table_error_description')).toBeInTheDocument();
- });
-
- it('should render retry button', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- expect(screen.getByTestId('retry-button')).toBeInTheDocument();
- expect(screen.getByText('com_ui_retry')).toBeInTheDocument();
- });
-
- it('should reset error state when retry button is clicked', () => {
- const { rerender } = render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- // Error state should be shown
- expect(screen.getByRole('alert')).toBeInTheDocument();
-
- // First rerender with non-throwing component (error boundary still shows fallback
- // because it hasn't reset yet)
- rerender(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={false} />
- </DataTableErrorBoundary>,
- );
-
- // Still showing error (because error boundary hasn't reset)
- expect(screen.getByRole('alert')).toBeInTheDocument();
-
- // Click retry to reset error boundary state
- fireEvent.click(screen.getByTestId('retry-button'));
-
- // Now children should render without throwing
- expect(screen.getByTestId('child-content')).toBeInTheDocument();
- });
-
- it('should call onError callback with error', () => {
- const mockOnError = jest.fn();
-
- render(
- <DataTableErrorBoundary onError={mockOnError}>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- expect(mockOnError).toHaveBeenCalledTimes(1);
- expect(mockOnError).toHaveBeenCalledWith(expect.any(Error));
- expect(mockOnError.mock.calls[0][0].message).toBe('Test error message');
- });
-
- it('should call onReset callback on retry', () => {
- const mockOnReset = jest.fn();
-
- render(
- <DataTableErrorBoundary onReset={mockOnReset}>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- fireEvent.click(screen.getByTestId('retry-button'));
-
- expect(mockOnReset).toHaveBeenCalledTimes(1);
- });
-
- it('should have proper ARIA attributes on error card', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- const alertElement = screen.getByRole('alert');
- expect(alertElement).toHaveAttribute('aria-live', 'assertive');
- expect(alertElement).toHaveAttribute('aria-labelledby', 'datatable-error-title');
- expect(alertElement).toHaveAttribute('aria-describedby', 'datatable-error-desc');
- });
-
- it('should have proper id on title element', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- const title = screen.getByText('com_ui_table_error');
- expect(title).toHaveAttribute('id', 'datatable-error-title');
- });
-
- it('should have proper id on description element', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- const description = screen.getByText('com_ui_table_error_description');
- expect(description).toHaveAttribute('id', 'datatable-error-desc');
- });
-
- it('should render refresh icon in error state', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- const refreshIcons = screen.getAllByTestId('refresh-icon');
- expect(refreshIcons.length).toBeGreaterThanOrEqual(1);
- });
-
- it('should have aria-label on retry button', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- const retryButton = screen.getByTestId('retry-button');
- expect(retryButton).toHaveAttribute('aria-label', 'Retry loading table');
- });
-
- it('should render with outline variant button', () => {
- render(
- <DataTableErrorBoundary>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- const retryButton = screen.getByTestId('retry-button');
- expect(retryButton).toHaveAttribute('data-variant', 'outline');
- });
-
- it('should handle multiple consecutive errors', () => {
- const mockOnError = jest.fn();
-
- const { rerender } = render(
- <DataTableErrorBoundary onError={mockOnError}>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- expect(mockOnError).toHaveBeenCalledTimes(1);
-
- // Reset and throw again
- fireEvent.click(screen.getByTestId('retry-button'));
-
- rerender(
- <DataTableErrorBoundary onError={mockOnError}>
- <ThrowingComponent shouldThrow={true} />
- </DataTableErrorBoundary>,
- );
-
- // Should have caught the error again
- expect(screen.getByRole('alert')).toBeInTheDocument();
- });
-
- it('should not call onError when no error occurs', () => {
- const mockOnError = jest.fn();
-
- render(
- <DataTableErrorBoundary onError={mockOnError}>
- <ThrowingComponent shouldThrow={false} />
- </DataTableErrorBoundary>,
- );
-
- expect(mockOnError).not.toHaveBeenCalled();
- });
-
- it('should handle children that return null', () => {
- const NullComponent = () => null;
-
- render(
- <DataTableErrorBoundary>
- <NullComponent />
- </DataTableErrorBoundary>,
- );
-
- // Should not show error state
- expect(screen.queryByRole('alert')).not.toBeInTheDocument();
- });
-
- it('should handle nested children', () => {
- render(
- <DataTableErrorBoundary>
- <div>
- <span>Nested content</span>
- <ThrowingComponent shouldThrow={false} />
- </div>
- </DataTableErrorBoundary>,
- );
-
- expect(screen.getByText('Nested content')).toBeInTheDocument();
- expect(screen.getByTestId('child-content')).toBeInTheDocument();
- });
-});
diff --git a/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx b/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx
deleted file mode 100644
index 009e8debba..0000000000
--- a/packages/client/src/components/DataTable/DataTableErrorBoundary.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import { Component, ErrorInfo, ReactNode, createRef } from 'react';
-import { JSX } from 'react/jsx-runtime';
-import { RefreshCw } from 'lucide-react';
-import { useLocalize } from '~/hooks';
-import { Button } from '../Button';
-import { logger } from '~/utils';
-
-/**
- * Error boundary specifically for DataTable component.
- * Catches JavaScript errors in the table rendering and provides a fallback UI.
- * Handles errors from virtualizer, cell renderers, fetch operations, and child components.
- */
-interface DataTableErrorBoundaryState {
- hasError: boolean;
- error?: Error;
-}
-
-interface DataTableErrorBoundaryProps {
- children: ReactNode;
- onError?: (error: Error) => void;
- onReset?: () => void;
-}
-interface DataTableErrorBoundaryInnerProps extends DataTableErrorBoundaryProps {
- localize: ReturnType<typeof useLocalize>;
-}
-
-class DataTableErrorBoundaryInner extends Component<
- DataTableErrorBoundaryInnerProps,
- DataTableErrorBoundaryState
-> {
- private errorCardRef = createRef<HTMLDivElement>();
-
- constructor(props: DataTableErrorBoundaryInnerProps) {
- super(props);
- this.state = { hasError: false };
- }
-
- static getDerivedStateFromError(error: Error): DataTableErrorBoundaryState {
- return { hasError: true, error };
- }
-
- componentDidCatch(error: Error, errorInfo: ErrorInfo) {
- logger.error('DataTable Error Boundary caught an error:', error, errorInfo);
- this.props.onError?.(error);
- }
-
- componentDidUpdate(
- _prevProps: DataTableErrorBoundaryInnerProps,
- prevState: DataTableErrorBoundaryState,
- ) {
- if (!prevState.hasError && this.state.hasError && this.errorCardRef.current) {
- this.errorCardRef.current.focus();
- }
- }
-
- /**
- * Reset the error state and attempt to re-render the children.
- * This can be used to retry after a table error (e.g., network retry).
- */
- private handleReset = () => {
- this.setState({ hasError: false, error: undefined });
- this.props.onReset?.();
- };
-
- render() {
- if (this.state.hasError) {
- return (
- <div className="flex h-full w-full flex-col items-center justify-center p-8">
- <div
- ref={this.errorCardRef}
- role="alert"
- aria-live="assertive"
- aria-labelledby="datatable-error-title"
- aria-describedby="datatable-error-desc"
- tabIndex={-1}
- className="border-border-light bg-surface-primary-alt before:bg-surface-destructive/80 focus:ring-focus-control relative w-full max-w-md overflow-hidden rounded-lg border p-6 shadow-xs outline-hidden before:absolute before:top-0 before:left-0 before:h-full before:w-1 focus:ring-2 focus:ring-offset-2"
- >
- <div className="flex items-center gap-2">
- <RefreshCw className="text-surface-destructive h-4 w-4" />
- <h3 id="datatable-error-title" className="text-text-primary text-sm font-medium">
- {this.props.localize('com_ui_table_error')}
- </h3>
- </div>
- <p id="datatable-error-desc" className="text-text-secondary mt-2 text-sm">
- {this.props.localize('com_ui_table_error_description')}
- </p>
- <div className="mt-4 flex justify-center">
- <Button
- variant="outline"
- onClick={this.handleReset}
- className="hover:bg-surface-hover dark:hover:bg-surface-active flex items-center gap-2 px-3 py-1.5 text-sm"
- aria-label="Retry loading table"
- >
- <RefreshCw className="h-3 w-3" />
- {this.props.localize('com_ui_retry')}
- </Button>
- </div>
- </div>
-
- {import.meta.env.MODE === 'development' && this.state.error && (
- <details className="bg-surface-secondary mt-4 max-w-md rounded-md p-3 text-xs">
- <summary className="text-text-primary cursor-pointer font-medium">
- {this.props.localize('com_ui_error_details')}
- </summary>
- <pre className="text-text-secondary mt-2 whitespace-pre-wrap">
- {this.state.error.message}
- </pre>
- </details>
- )}
- </div>
- );
- }
-
- return this.props.children;
- }
-}
-
-export function DataTableErrorBoundary(props: DataTableErrorBoundaryProps): JSX.Element {
- const localize = useLocalize();
- return <DataTableErrorBoundaryInner {...props} localize={localize} />;
-}
-
-export default DataTableErrorBoundary;
diff --git a/packages/client/src/components/DataTable/index.ts b/packages/client/src/components/DataTable/index.ts
deleted file mode 100644
index 03e6fb62a1..0000000000
--- a/packages/client/src/components/DataTable/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as DataTable } from './DataTable';
-export * from './DataTable.types';
-// Removed legacy DataTableSettings exports (store/context) as column resizing & dynamic sizing were deprecated.
diff --git a/packages/client/src/hooks/ThemeContext.old.tsx b/packages/client/src/hooks/ThemeContext.old.tsx
deleted file mode 100644
index d026868b76..0000000000
--- a/packages/client/src/hooks/ThemeContext.old.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-//ThemeContext.js
-// source: https://plainenglish.io/blog/light-and-dark-mode-in-react-web-application-with-tailwind-css-89674496b942
-import React, { createContext, useState, useEffect } from 'react';
-import { useSetAtom } from 'jotai';
-import { JSX } from 'react/jsx-runtime';
-import { getInitialTheme, applyFontSize } from '~/utils';
-import { fontSizeAtom } from '~/store';
-
-type ProviderValue = {
- theme: string;
- setTheme: React.Dispatch<React.SetStateAction<string>>;
-};
-
-const defaultContextValue: ProviderValue = {
- theme: getInitialTheme(),
- setTheme: () => {
- return;
- },
-};
-
-export const isDark = (theme: string): boolean => {
- if (theme === 'system') {
- return window.matchMedia('(prefers-color-scheme: dark)').matches;
- }
- return theme === 'dark';
-};
-
-export const ThemeContext: React.Context<ProviderValue> =
- createContext<ProviderValue>(defaultContextValue);
-
-export const ThemeProvider = ({
- initialTheme,
- children,
-}: {
- initialTheme?: string;
- children: React.ReactNode;
-}): JSX.Element => {
- const [theme, setTheme] = useState(getInitialTheme);
- const setFontSize = useSetAtom(fontSizeAtom);
-
- const rawSetTheme = (rawTheme: string) => {
- const root = window.document.documentElement;
- const darkMode = isDark(rawTheme);
-
- root.classList.remove(darkMode ? 'light' : 'dark');
- root.classList.add(darkMode ? 'dark' : 'light');
-
- localStorage.setItem('color-theme', rawTheme);
- };
-
- useEffect(() => {
- const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
- const changeThemeOnSystemChange = () => {
- rawSetTheme(mediaQuery.matches ? 'dark' : 'light');
- };
-
- mediaQuery.addEventListener('change', changeThemeOnSystemChange);
-
- return () => {
- mediaQuery.removeEventListener('change', changeThemeOnSystemChange);
- };
- }, []);
-
- useEffect(() => {
- const fontSize = localStorage.getItem('fontSize');
- if (fontSize == null) {
- setFontSize('text-base');
- applyFontSize('text-base');
- localStorage.setItem('fontSize', JSON.stringify('text-base'));
- return;
- }
- try {
- applyFontSize(JSON.parse(fontSize));
- } catch (error) {
- console.log(error);
- }
- // Reason: This effect should only run once, and `setFontSize` is a stable function
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, []);
-
- if (initialTheme) {
- rawSetTheme(initialTheme);
- }
-
- useEffect(() => {
- rawSetTheme(theme);
- }, [theme]);
-
- return <ThemeContext.Provider value={{ theme, setTheme }}>{children}</ThemeContext.Provider>;
-};