Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-01-26 04:06:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: merge conflicts

Browse source
This commit is contained in:
Marco Beretta 2025-07-26 03:07:03 +02:00
parent 22035bbf95
commit 80d406b629
No known key found for this signature in database
GPG key ID: D918033D8E74CC11
5 changed files with 309 additions and 6239 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/components/ui/MCP/CustomUserVarsSection.tsx
View file

@ -1,8 +1,8 @@
import React, { useMemo } from 'react';
import { useForm, Controller } from 'react-hook-form';
import { Input, Label, Button } from '~/components/ui';
import { useLocalize } from '~/hooks';
import { Input, Label, Button } from '@librechat/client';
import { useMCPAuthValuesQuery } from '~/data-provider/Tools/queries';
import { useLocalize } from '~/hooks';
export interface CustomUserVarConfig {
title: string;

4
client/src/components/ui/MCP/MCPConfigDialog.tsx
View file

@ -7,9 +7,9 @@ import {
OGDialogHeader,
OGDialogTitle,
OGDialogDescription,
} from '~/components/ui/OriginalDialog';
import CustomUserVarsSection from './CustomUserVarsSection';
} from '@librechat/client';
import ServerInitializationSection from './ServerInitializationSection';
import CustomUserVarsSection from './CustomUserVarsSection';
import { useLocalize } from '~/hooks';
export interface ConfigFieldDetail {

4
client/src/components/ui/MCP/ServerInitializationSection.tsx
View file

@ -1,7 +1,7 @@
import { RefreshCw, Link } from 'lucide-react';
import React, { useState, useCallback } from 'react';
import { Button } from '@librechat/client';
import { RefreshCw, Link } from 'lucide-react';
import { useMCPServerInitialization } from '~/hooks/MCP/useMCPServerInitialization';
import { Button } from '~/components/ui';
import { useLocalize } from '~/hooks';
interface ServerInitializationSectionProps {

4
client/src/hooks/MCP/useMCPServerInitialization.ts
View file

@ -1,12 +1,12 @@
import { useCallback, useState, useEffect, useMemo } from 'react';
import { useQueryClient } from '@tanstack/react-query';
import { useToastContext } from '@librechat/client';
import { QueryKeys } from 'librechat-data-provider';
import { useQueryClient } from '@tanstack/react-query';
import {
useReinitializeMCPServerMutation,
useCancelMCPOAuthMutation,
} from 'librechat-data-provider/react-query';
import { useMCPConnectionStatusQuery } from '~/data-provider/Tools/queries';
import { useToastContext } from '~/Providers';
import { useLocalize } from '~/hooks';
import { logger } from '~/utils';

6532
package-lock.json generated
View file

File diff suppressed because it is too large Load diff