mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-12 21:48:51 +01:00
* fix: add basePath pattern to support login/register and image paths * Fix linter errors * refactor: Update import statements for getBasePath and isEnabled, and add path utility functions with tests - Refactored imports in addImages.js and StableDiffusion.js to use getBasePath from '@librechat/api'. - Consolidated isEnabled and getBasePath imports in validateImageRequest.js. - Introduced new path utility functions in path.ts and corresponding unit tests in path.spec.ts to validate base path extraction logic. * fix: Update domain server base URL in MarkdownComponents and refactor authentication redirection logic - Changed the domain server base URL in MarkdownComponents.tsx to use the API base URL. - Refactored the useAuthRedirect hook to utilize React Router's navigate for redirection instead of window.location, ensuring a smoother SPA experience. - Added unit tests for the useAuthRedirect hook to verify authentication redirection behavior. * test: Mock isEnabled in validateImages.spec.js for improved test isolation - Updated validateImages.spec.js to mock the isEnabled function from @librechat/api, ensuring that tests can run independently of the actual implementation. - Cleared the DOMAIN_CLIENT environment variable before tests to avoid interference with basePath resolution. --------- Co-authored-by: Danny Avila <danny@librechat.ai>
188 lines
5.4 KiB
TypeScript
188 lines
5.4 KiB
TypeScript
import React, { memo, useMemo, useRef, useEffect } from 'react';
|
|
import { useRecoilValue } from 'recoil';
|
|
import { useToastContext } from '@librechat/client';
|
|
import { PermissionTypes, Permissions, apiBaseUrl } from 'librechat-data-provider';
|
|
import CodeBlock from '~/components/Messages/Content/CodeBlock';
|
|
import useHasAccess from '~/hooks/Roles/useHasAccess';
|
|
import { useFileDownload } from '~/data-provider';
|
|
import { useCodeBlockContext } from '~/Providers';
|
|
import { handleDoubleClick } from '~/utils';
|
|
import { useLocalize } from '~/hooks';
|
|
import store from '~/store';
|
|
|
|
type TCodeProps = {
|
|
inline?: boolean;
|
|
className?: string;
|
|
children: React.ReactNode;
|
|
};
|
|
|
|
export const code: React.ElementType = memo(({ className, children }: TCodeProps) => {
|
|
const canRunCode = useHasAccess({
|
|
permissionType: PermissionTypes.RUN_CODE,
|
|
permission: Permissions.USE,
|
|
});
|
|
const match = /language-(\w+)/.exec(className ?? '');
|
|
const lang = match && match[1];
|
|
const isMath = lang === 'math';
|
|
const isSingleLine = typeof children === 'string' && children.split('\n').length === 1;
|
|
|
|
const { getNextIndex, resetCounter } = useCodeBlockContext();
|
|
const blockIndex = useRef(getNextIndex(isMath || isSingleLine)).current;
|
|
|
|
useEffect(() => {
|
|
resetCounter();
|
|
}, [children, resetCounter]);
|
|
|
|
if (isMath) {
|
|
return <>{children}</>;
|
|
} else if (isSingleLine) {
|
|
return (
|
|
<code onDoubleClick={handleDoubleClick} className={className}>
|
|
{children}
|
|
</code>
|
|
);
|
|
} else {
|
|
return (
|
|
<CodeBlock
|
|
lang={lang ?? 'text'}
|
|
codeChildren={children}
|
|
blockIndex={blockIndex}
|
|
allowExecution={canRunCode}
|
|
/>
|
|
);
|
|
}
|
|
});
|
|
|
|
export const codeNoExecution: React.ElementType = memo(({ className, children }: TCodeProps) => {
|
|
const match = /language-(\w+)/.exec(className ?? '');
|
|
const lang = match && match[1];
|
|
|
|
if (lang === 'math') {
|
|
return children;
|
|
} else if (typeof children === 'string' && children.split('\n').length === 1) {
|
|
return (
|
|
<code onDoubleClick={handleDoubleClick} className={className}>
|
|
{children}
|
|
</code>
|
|
);
|
|
} else {
|
|
return <CodeBlock lang={lang ?? 'text'} codeChildren={children} allowExecution={false} />;
|
|
}
|
|
});
|
|
|
|
type TAnchorProps = {
|
|
href: string;
|
|
children: React.ReactNode;
|
|
};
|
|
|
|
export const a: React.ElementType = memo(({ href, children }: TAnchorProps) => {
|
|
const user = useRecoilValue(store.user);
|
|
const { showToast } = useToastContext();
|
|
const localize = useLocalize();
|
|
|
|
const {
|
|
file_id = '',
|
|
filename = '',
|
|
filepath,
|
|
} = useMemo(() => {
|
|
const pattern = new RegExp(`(?:files|outputs)/${user?.id}/([^\\s]+)`);
|
|
const match = href.match(pattern);
|
|
if (match && match[0]) {
|
|
const path = match[0];
|
|
const parts = path.split('/');
|
|
const name = parts.pop();
|
|
const file_id = parts.pop();
|
|
return { file_id, filename: name, filepath: path };
|
|
}
|
|
return { file_id: '', filename: '', filepath: '' };
|
|
}, [user?.id, href]);
|
|
|
|
const { refetch: downloadFile } = useFileDownload(user?.id ?? '', file_id);
|
|
const props: { target?: string; onClick?: React.MouseEventHandler } = { target: '_new' };
|
|
|
|
if (!file_id || !filename) {
|
|
return (
|
|
<a href={href} {...props}>
|
|
{children}
|
|
</a>
|
|
);
|
|
}
|
|
|
|
const handleDownload = async (event: React.MouseEvent<HTMLAnchorElement>) => {
|
|
event.preventDefault();
|
|
try {
|
|
const stream = await downloadFile();
|
|
if (stream.data == null || stream.data === '') {
|
|
console.error('Error downloading file: No data found');
|
|
showToast({
|
|
status: 'error',
|
|
message: localize('com_ui_download_error'),
|
|
});
|
|
return;
|
|
}
|
|
const link = document.createElement('a');
|
|
link.href = stream.data;
|
|
link.setAttribute('download', filename);
|
|
document.body.appendChild(link);
|
|
link.click();
|
|
document.body.removeChild(link);
|
|
window.URL.revokeObjectURL(stream.data);
|
|
} catch (error) {
|
|
console.error('Error downloading file:', error);
|
|
}
|
|
};
|
|
|
|
props.onClick = handleDownload;
|
|
props.target = '_blank';
|
|
|
|
const domainServerBaseUrl = `${apiBaseUrl()}/api`;
|
|
|
|
return (
|
|
<a
|
|
href={
|
|
filepath?.startsWith('files/')
|
|
? `${domainServerBaseUrl}/${filepath}`
|
|
: `${domainServerBaseUrl}/files/${filepath}`
|
|
}
|
|
{...props}
|
|
>
|
|
{children}
|
|
</a>
|
|
);
|
|
});
|
|
|
|
type TParagraphProps = {
|
|
children: React.ReactNode;
|
|
};
|
|
|
|
export const p: React.ElementType = memo(({ children }: TParagraphProps) => {
|
|
return <p className="mb-2 whitespace-pre-wrap">{children}</p>;
|
|
});
|
|
|
|
type TImageProps = {
|
|
src?: string;
|
|
alt?: string;
|
|
title?: string;
|
|
className?: string;
|
|
style?: React.CSSProperties;
|
|
};
|
|
|
|
export const img: React.ElementType = memo(({ src, alt, title, className, style }: TImageProps) => {
|
|
// Get the base URL from the API endpoints
|
|
const baseURL = apiBaseUrl();
|
|
|
|
// If src starts with /images/, prepend the base URL
|
|
const fixedSrc = useMemo(() => {
|
|
if (!src) return src;
|
|
|
|
// If it's already an absolute URL or doesn't start with /images/, return as is
|
|
if (src.startsWith('http') || src.startsWith('data:') || !src.startsWith('/images/')) {
|
|
return src;
|
|
}
|
|
|
|
// Prepend base URL to the image path
|
|
return `${baseURL}${src}`;
|
|
}, [src, baseURL]);
|
|
|
|
return <img src={fixedSrc} alt={alt} title={title} className={className} style={style} />;
|
|
});
|