mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* docs: make_your_own.md formatting fix for mkdocs * feat: add express-mongo-sanitize feat: add login/registration rate limiting * chore: remove unnecessary console log * wip: remove token handling from localStorage to encrypted DB solution * refactor: minor change to UserService * fix mongo query and add keys route to server * fix backend controllers and simplify schema/crud * refactor: rename token to key to separate from access/refresh tokens, setTokenDialog -> setKeyDialog * refactor(schemas): TEndpointOption token -> key * refactor(api): use new encrypted key retrieval system * fix(SetKeyDialog): fix key prop error * fix(abortMiddleware): pass random UUID if messageId is not generated yet for proper error display on frontend * fix(getUserKey): wrong prop passed in arg, adds error handling * fix: prevent message without conversationId from saving to DB, prevents branching on the frontend to a new top-level branch * refactor: change wording of multiple display messages * refactor(checkExpiry -> checkUserKeyExpiry): move to UserService file * fix: type imports from common * refactor(SubmitButton): convert to TS * refactor(key.ts): change localStorage map key name * refactor: add new custom tailwind classes to better match openAI colors * chore: remove unnecessary warning and catch ScreenShot error * refactor: move userKey frontend logic to hooks and remove use of localStorage and instead query the DB * refactor: invalidate correct query key, memoize userKey hook, conditionally render SetKeyDialog to avoid unnecessary calls, refactor SubmitButton props and useEffect for showing 'provide key first' * fix(SetKeyDialog): use enum-like object for expiry values feat(Dropdown): add optionsClassName to dynamically change dropdown options container classes * fix: handle edge case where user had provided a key but the server changes to env variable for keys * refactor(OpenAI/titleConvo): move titling to client to retain authorized credentials in message lifecycle for titling * fix(azure): handle user_provided keys correctly for azure * feat: send user Id to OpenAI to differentiate users in completion requests * refactor(OpenAI/titleConvo): adding tokens helps minimize LLM from using the language in title response * feat: add delete endpoint for keys * chore: remove throttling of title * feat: add 'Data controls' to Settings, add 'Revoke' keys feature in Key Dialog and Data controls * refactor: reorganize PluginsClient files in langchain format * feat: use langchain for titling convos * chore: cleanup titling convo, with fallback to original method, escape braces, use only snippet for language detection * refactor: move helper functions to appropriate langchain folders for reusability * fix: userProvidesKey handling for gptPlugins * fix: frontend handling of plugins key * chore: cleanup logging and ts-ignore SSE * fix: forwardRef misuse in DangerButton * fix(GoogleConfig/FileUpload): localize errors and simplify validation with zod * fix: cleanup google logging and fix user provided key handling * chore: remove titling from google * chore: removing logging from browser endpoint * wip: fix menu flicker * feat: useLocalStorage hook * feat: add Tooltip for UI * refactor(EndpointMenu): utilize Tooltip and useLocalStorage, remove old 'New Chat' slide-over * fix(e2e): use testId for endpoint menu trigger * chore: final touches to EndpointMenu before future refactor to declutter component * refactor(localization): change select endpoint to open menu and add translations * chore: add final prop to error message response * ci: minor edits to facilitate testing * ci: new e2e test which tests for new key setting/revoking features
201 lines
8.4 KiB
TypeScript
201 lines
8.4 KiB
TypeScript
import React, { useState, useRef } from 'react';
|
|
import { Listbox, Transition } from '@headlessui/react';
|
|
import { Wrench, ArrowRight } from 'lucide-react';
|
|
import { CheckMark } from '~/components/svg';
|
|
import useOnClickOutside from '~/hooks/useOnClickOutside';
|
|
import { cn } from '~/utils/';
|
|
import type { TPlugin } from 'librechat-data-provider';
|
|
|
|
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;
|
|
isSelected: (value: string) => boolean;
|
|
className?: string;
|
|
optionValueKey?: string;
|
|
};
|
|
|
|
function MultiSelectDropDown({
|
|
title = 'Plugins',
|
|
value,
|
|
disabled,
|
|
setSelected,
|
|
availableValues,
|
|
showAbove = false,
|
|
showLabel = true,
|
|
containerClassName,
|
|
isSelected,
|
|
className,
|
|
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);
|
|
};
|
|
|
|
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 */}
|
|
<Listbox value={value} onChange={handleSelect} disabled={disabled}>
|
|
{() => (
|
|
<>
|
|
<Listbox.Button
|
|
className={cn(
|
|
'relative flex w-full cursor-default flex-col rounded-md border border-black/10 bg-white py-2 pl-3 pr-10 text-left focus:outline-none focus:ring-0 focus:ring-offset-0 dark:border-white/20 dark:bg-gray-800 sm:text-sm',
|
|
className ?? '',
|
|
)}
|
|
id={excludeIds[0]}
|
|
onClick={() => setIsOpen((prev) => !prev)}
|
|
{...openProps}
|
|
>
|
|
{' '}
|
|
{showLabel && (
|
|
<Listbox.Label
|
|
className="block text-xs text-gray-700 dark:text-gray-500"
|
|
id={excludeIds[1]}
|
|
data-headlessui-state=""
|
|
>
|
|
{title}
|
|
</Listbox.Label>
|
|
)}
|
|
<span className="inline-flex w-full truncate" id={excludeIds[2]}>
|
|
<span
|
|
className={cn(
|
|
'flex h-6 items-center gap-1 truncate text-sm text-gray-900 dark:text-white',
|
|
!showLabel ? 'text-xs' : '',
|
|
)}
|
|
>
|
|
{!showLabel && title.length > 0 && (
|
|
<span className="text-xs text-gray-700 dark:text-gray-500">{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: '16px', height: '16px' }}
|
|
>
|
|
{v.icon ? (
|
|
<img
|
|
src={v.icon}
|
|
alt={`${v} logo`}
|
|
className="h-full w-full rounded-sm bg-white"
|
|
/>
|
|
) : (
|
|
<Wrench className="h-full w-full rounded-sm bg-white" />
|
|
)}
|
|
<div className="absolute inset-0 rounded-sm ring-1 ring-inset ring-black/10" />
|
|
</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="h-4 w-4 text-gray-400"
|
|
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>
|
|
</Listbox.Button>
|
|
<Transition
|
|
show={isOpen}
|
|
as={React.Fragment}
|
|
leave="transition ease-in duration-150"
|
|
leaveFrom="opacity-100"
|
|
leaveTo="opacity-0"
|
|
{...transitionProps}
|
|
>
|
|
<Listbox.Options
|
|
ref={menuRef}
|
|
className="absolute z-50 mt-2 max-h-60 w-full overflow-auto rounded bg-white text-base text-xs ring-1 ring-black/10 focus:outline-none dark:bg-gray-800 dark:ring-white/20 dark:last:border-0 md:w-[100%]"
|
|
>
|
|
{availableValues.map((option, i: number) => {
|
|
if (!option) {
|
|
return null;
|
|
}
|
|
const selected = isSelected(option[optionValueKey]);
|
|
return (
|
|
<Listbox.Option
|
|
key={i}
|
|
value={option[optionValueKey]}
|
|
className="group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden border-b border-black/10 pl-3 pr-9 text-gray-900 last:border-0 hover:bg-gray-20 dark:border-white/20 dark:text-white dark:hover:bg-gray-700"
|
|
>
|
|
<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="h-full w-full rounded-sm bg-white"
|
|
/>
|
|
) : (
|
|
<Wrench className="h-full w-full rounded-sm bg-white" />
|
|
)}
|
|
<div className="absolute inset-0 rounded-sm ring-1 ring-inset ring-black/10"></div>
|
|
</div>
|
|
</span>
|
|
)}
|
|
<span
|
|
className={cn(
|
|
'flex h-6 items-center gap-1 text-gray-800 dark:text-gray-100',
|
|
selected ? 'font-semibold' : '',
|
|
)}
|
|
>
|
|
{option.name}
|
|
</span>
|
|
{option.isButton && (
|
|
<span className="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-800 dark:text-gray-100">
|
|
<ArrowRight />
|
|
</span>
|
|
)}
|
|
{selected && !option.isButton && (
|
|
<span className="absolute inset-y-0 right-0 flex items-center pr-3 text-gray-800 dark:text-gray-100">
|
|
<CheckMark />
|
|
</span>
|
|
)}
|
|
</span>
|
|
</Listbox.Option>
|
|
);
|
|
})}
|
|
</Listbox.Options>
|
|
</Transition>
|
|
</>
|
|
)}
|
|
</Listbox>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export default MultiSelectDropDown;
|