2024-07-29 07:45:59 -07:00
|
|
|
import React, { useEffect } from 'react';
|
2024-08-22 17:09:05 -04:00
|
|
|
import { QueryKeys } from 'librechat-data-provider';
|
2024-07-29 07:45:59 -07:00
|
|
|
import { Controller, useForm } from 'react-hook-form';
|
2024-08-22 17:09:05 -04:00
|
|
|
import { useQueryClient } from '@tanstack/react-query';
|
📦 feat: Move Shared Components to `@librechat/client` (#8685)
* feat: init @librechat/client
* feat: Add common types and interfaces for accessibility, agents, artifacts, assistants, and tools
* feat: Add jotai as a peer dependency
* fix build client package
* feat: cleanup unused types from common/index.ts
- Remove 104 unused type exports from packages/client/src/common/index.ts
- Keep only 7 actually used exports (93% reduction)
- Add cleanup script with enhanced import pattern detection
- Support both named imports and namespace imports (* as t)
- Create automatic backups and comprehensive documentation
- Maintain type safety with build verification
- No breaking changes to existing code
Kept exports:
- TShowToast, Option, OptionWithIcon, DropdownValueSetter
- MentionOption, NotificationSeverity, MenuItemProps
Scripts: cleanup-common-types-safe.js, README-CLEANUP.md
* fix: cleanup
* fix: package; refactor: tsconfig
* feat: add back `recoil`
* fix: move dependencies to peerDependencies in client package
* feat: add @librechat/client as a dependency in package.json and package-lock.json
* feat: update client package configuration and dependencies
- Added new dependencies for Rollup plugins and updated existing ones in package.json and package-lock.json.
- Introduced a new Rollup configuration file for building the client package.
- Refactored build scripts to include a dedicated build command for the client.
- Updated TypeScript configuration for improved module resolution and type declaration output.
- Integrated a Toast component from the client package into the main App component.
* feat: enhance Rollup configuration for client package
- Updated terser plugin settings to preserve directives like 'use client'.
- Added custom warning handler to ignore "use client" directive warnings during the build process.
* chore: rename package/client build script command
* feat: update client package dependencies and Rollup configuration
- Added rollup-plugin-postcss to package.json and updated package-lock.json.
- Enhanced Rollup configuration to include postcss plugin for CSS handling.
- Updated index.ts to export all components from the components directory for better modularity.
* feat: add client package directory to update configuration
- Included the 'client' package directory in the update.js configuration to ensure it is recognized during updates.
* feat: export Toast component in client package
- Added export for the Toast component in index.ts to enhance modularity and accessibility of components.
* feat: /client transition to @librechat/client
* chore: fixed formatting issues
* fix: update peer dependencies in @librechat/client to prevent bundling them
* fix: correct useSprings implementation in SplitText component
* fix: circular dependencies in DataTable
* fix: add remaining peer dependencies and match actual versions previously used in `client/package.json`
* fix: correct frontend:ci script to include client package build
* chore: enhance unused package detection for @librechat/client and improve dependency extraction
* fix: add missing peer dependency for @radix-ui/react-collapsible
* chore: include "packages/client" in unused i18next keys detection
* test: update AgentFooter tests to use document.querySelector for spinner checks
test: mock window.matchMedia in setupTests.js for consistent test environment
* feat: add react-hook-form dependency and update FormInput component to use its types
* chore: linting
* refactor: remove unused defaultSelectedValues prop from MCPSelect and MultiSelect components
* chore: linting
* feat: update GitHub Actions workflow to publish @librechat/client
* chore: update GitHub Actions workflow to install and build data-provider and client dependencies
* chore: add missing @testing-library/react dependency to client package
* chore: update tsconfig.json to exclude additional test files
* chore: fix build issues, resolve latest LC changes
* chore: move MCP components outside of `~/components/ui`
* feat: implement dynamic theme system with environment variable support and Tailwind CSS integration
* chore: remove unnecessary logging of sttExternal and ttsExternal in Speech component
* chore: squashed cleanup commits
chore: move @tanstack/react-virtual to dependencies and remove recoil from package.json
chore: move dependencies to peerDependencies in package.json
feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration
feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration
refactor: reorganize exports in index.ts for improved clarity
refactor: remove unused types and interfaces from common files
refactor: update peer dependencies and improve component typings
- Removed duplicate peer dependencies from package.json and organized them.
- Updated rollup.config.js to disable TypeScript checking during the build process.
- Modified AnimatedTabs component to use React.ReactNode for label and content types, and added TypeScript workarounds for compatibility.
- Enhanced Label and Separator components to accept an optional className prop and improved prop spreading.
- Updated Slider component to include an optional className prop and refined prop handling for better type safety.
refactor: clean up client workflow and update package dependencies
refactor: update package dependencies and improve PostCSS and Rollup configurations
chore: bump version to 0.1.2 in package.json
chore: bump client version to 0.1.2 in package-lock.json
chore: bump client version to 0.1.3 and update dependencies
chore: bump client version to 0.1.4 and update @react-spring dependencies
chore: update package version to 0.1.5 and adjust peer dependencies
- Bump version in package.json from 0.1.4 to 0.1.5.
- Update peer dependency for @tanstack/react-query to allow version 5.0.0.
- Add @tanstack/react-table and @tanstack/react-virtual as dependencies.
- Update various dependencies to their latest compatible versions.
- Simplify postcss.config.js by removing unnecessary options.
- Clean up rollup.config.js by removing ignored PostCSS warnings.
- Update CheckboxButton component to cast icon as React JSX element.
- Adjust Combobox component's class names for better styling.
- Change DropdownPopup component to use React's namespace import.
- Modify InputOTP component to use 'any' type for OTPInputContext.
- Ensure displayLabel and value in ModelParameters are converted to strings.
- Update MultiSearch component's placeholder to ensure it's a string.
- Cast selectIcon in MultiSelect as React JSX element for consistency.
- Update OGDialogTemplate to cast selectText as React JSX element.
- Initialize animationRef in PixelCard with undefined for clarity.
- Add TypeScript ignore comments in Select and SelectDropDown components for Radix UI type conflicts.
- Ensure title in SelectDropDown is a string and adjust rendering of options.
- Update useLocalize hook to cast options as any for compatibility.
refactor: code structure; chore: translations cleanup
chore: remove unused imports and clean up code in NewChat component
refactor: enhance Menu component to support custom render functions for menu items
style: update itemClassName in ToolsDropdown for improved UI consistency
fix: merge conflicts
chore: update @radix-ui/react-accordion to version 1.2.11
* refactor: remove unnecessary TypeScript type assertions in AnimatedTabs, Label, Separator, and Slider components
* feat: enhance theme system with localStorage persistence and new theme atoms
* chore: bump version of @librechat/client to 0.1.7
* chore: fix ci/cd warnings/errors related to linting and unused localization keys
* chore: update dependencies for class-variance-authority, clsx, and match-sorter
* chore: bump @librechat/client to v0.1.8
* feat: add utility colors for theme customization and remove unused tailwindConfig
* v0.1.9
---------
Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com>
2025-07-27 12:19:01 -04:00
|
|
|
import { Checkbox, Label, TextareaAutosize, Input, useToastContext } from '@librechat/client';
|
2024-12-29 23:31:41 +01:00
|
|
|
import type { TConversationTag, TConversationTagRequest } from 'librechat-data-provider';
|
2024-07-29 07:45:59 -07:00
|
|
|
import { useBookmarkContext } from '~/Providers/BookmarkContext';
|
|
|
|
|
import { useConversationTagMutation } from '~/data-provider';
|
2024-08-22 17:09:05 -04:00
|
|
|
import { useLocalize } from '~/hooks';
|
2024-11-01 18:36:39 -04:00
|
|
|
import { cn, logger } from '~/utils';
|
2024-07-29 07:45:59 -07:00
|
|
|
|
|
|
|
|
type TBookmarkFormProps = {
|
2024-08-22 17:09:05 -04:00
|
|
|
tags?: string[];
|
2024-07-29 07:45:59 -07:00
|
|
|
bookmark?: TConversationTag;
|
2024-12-29 23:31:41 +01:00
|
|
|
conversationId?: string;
|
2024-07-29 07:45:59 -07:00
|
|
|
formRef: React.RefObject<HTMLFormElement>;
|
2024-08-22 17:09:05 -04:00
|
|
|
setOpen: React.Dispatch<React.SetStateAction<boolean>>;
|
|
|
|
|
mutation: ReturnType<typeof useConversationTagMutation>;
|
2024-07-29 07:45:59 -07:00
|
|
|
};
|
|
|
|
|
const BookmarkForm = ({
|
2024-08-22 17:09:05 -04:00
|
|
|
tags,
|
2024-07-29 07:45:59 -07:00
|
|
|
bookmark,
|
2024-08-22 17:09:05 -04:00
|
|
|
mutation,
|
2024-12-29 23:31:41 +01:00
|
|
|
conversationId,
|
2024-08-22 17:09:05 -04:00
|
|
|
setOpen,
|
2024-07-29 07:45:59 -07:00
|
|
|
formRef,
|
|
|
|
|
}: TBookmarkFormProps) => {
|
|
|
|
|
const localize = useLocalize();
|
2024-08-22 17:09:05 -04:00
|
|
|
const queryClient = useQueryClient();
|
2024-08-08 21:25:10 -04:00
|
|
|
const { showToast } = useToastContext();
|
2024-07-29 07:45:59 -07:00
|
|
|
const { bookmarks } = useBookmarkContext();
|
|
|
|
|
|
|
|
|
|
const {
|
|
|
|
|
register,
|
|
|
|
|
handleSubmit,
|
|
|
|
|
setValue,
|
|
|
|
|
getValues,
|
|
|
|
|
control,
|
|
|
|
|
formState: { errors },
|
|
|
|
|
} = useForm<TConversationTagRequest>({
|
2025-08-25 13:54:13 -04:00
|
|
|
mode: 'onBlur',
|
|
|
|
|
reValidateMode: 'onChange',
|
2024-07-29 07:45:59 -07:00
|
|
|
defaultValues: {
|
2024-08-22 17:09:05 -04:00
|
|
|
tag: bookmark?.tag ?? '',
|
|
|
|
|
description: bookmark?.description ?? '',
|
2024-12-29 23:31:41 +01:00
|
|
|
conversationId: conversationId ?? '',
|
|
|
|
|
addToConversation: conversationId != null && conversationId ? true : false,
|
2024-07-29 07:45:59 -07:00
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
2024-08-22 17:09:05 -04:00
|
|
|
if (bookmark && bookmark.tag) {
|
|
|
|
|
setValue('tag', bookmark.tag);
|
|
|
|
|
setValue('description', bookmark.description ?? '');
|
2024-07-29 07:45:59 -07:00
|
|
|
}
|
|
|
|
|
}, [bookmark, setValue]);
|
|
|
|
|
|
|
|
|
|
const onSubmit = (data: TConversationTagRequest) => {
|
2024-08-22 17:09:05 -04:00
|
|
|
logger.log('tag_mutation', 'BookmarkForm - onSubmit: data', data);
|
2024-07-29 07:45:59 -07:00
|
|
|
if (mutation.isLoading) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (data.tag === bookmark?.tag && data.description === bookmark?.description) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
2024-08-22 17:09:05 -04:00
|
|
|
if (data.tag != null && (tags ?? []).includes(data.tag)) {
|
|
|
|
|
showToast({
|
|
|
|
|
message: localize('com_ui_bookmarks_create_exists'),
|
|
|
|
|
status: 'warning',
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const allTags =
|
|
|
|
|
queryClient.getQueryData<TConversationTag[]>([QueryKeys.conversationTags]) ?? [];
|
2025-11-26 08:15:31 -08:00
|
|
|
if (allTags.some((tag) => tag.tag === data.tag && tag.tag !== bookmark?.tag)) {
|
2024-08-22 17:09:05 -04:00
|
|
|
showToast({
|
|
|
|
|
message: localize('com_ui_bookmarks_create_exists'),
|
|
|
|
|
status: 'warning',
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
2024-07-29 07:45:59 -07:00
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
mutation.mutate(data);
|
|
|
|
|
setOpen(false);
|
2024-07-29 07:45:59 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<form
|
|
|
|
|
ref={formRef}
|
|
|
|
|
className="mt-6"
|
|
|
|
|
aria-label="Bookmark form"
|
|
|
|
|
method="POST"
|
|
|
|
|
onSubmit={handleSubmit(onSubmit)}
|
|
|
|
|
>
|
|
|
|
|
<div className="flex w-full flex-col items-center gap-2">
|
|
|
|
|
<div className="grid w-full items-center gap-2">
|
|
|
|
|
<Label htmlFor="bookmark-tag" className="text-left text-sm font-medium">
|
|
|
|
|
{localize('com_ui_bookmarks_title')}
|
|
|
|
|
</Label>
|
2024-10-19 14:30:52 +02:00
|
|
|
<Input
|
2024-07-29 07:45:59 -07:00
|
|
|
type="text"
|
|
|
|
|
id="bookmark-tag"
|
2025-11-26 06:12:04 -08:00
|
|
|
aria-label={localize('com_ui_bookmarks_title')}
|
2024-07-29 07:45:59 -07:00
|
|
|
{...register('tag', {
|
2025-08-25 13:54:13 -04:00
|
|
|
required: localize('com_ui_field_required'),
|
2024-07-29 07:45:59 -07:00
|
|
|
maxLength: {
|
|
|
|
|
value: 128,
|
2025-08-25 13:54:13 -04:00
|
|
|
message: localize('com_ui_field_max_length', {
|
|
|
|
|
field: localize('com_ui_bookmarks_title'),
|
|
|
|
|
length: 128,
|
|
|
|
|
}),
|
2024-07-29 07:45:59 -07:00
|
|
|
},
|
|
|
|
|
validate: (value) => {
|
|
|
|
|
return (
|
|
|
|
|
value === bookmark?.tag ||
|
|
|
|
|
bookmarks.every((bookmark) => bookmark.tag !== value) ||
|
2025-08-25 13:54:13 -04:00
|
|
|
localize('com_ui_bookmarks_tag_exists')
|
2024-07-29 07:45:59 -07:00
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
})}
|
|
|
|
|
aria-invalid={!!errors.tag}
|
2025-08-25 13:54:13 -04:00
|
|
|
placeholder={
|
|
|
|
|
bookmark ? localize('com_ui_bookmarks_edit') : localize('com_ui_bookmarks_new')
|
|
|
|
|
}
|
2025-11-26 06:12:04 -08:00
|
|
|
aria-describedby={errors.tag ? 'bookmark-tag-error' : undefined}
|
2024-07-29 07:45:59 -07:00
|
|
|
/>
|
2025-11-26 06:12:04 -08:00
|
|
|
{errors.tag && (
|
|
|
|
|
<span id="bookmark-tag-error" role="alert" className="text-sm font-bold text-red-500">
|
|
|
|
|
{errors.tag.message}
|
|
|
|
|
</span>
|
|
|
|
|
)}
|
2024-07-29 07:45:59 -07:00
|
|
|
</div>
|
|
|
|
|
|
2024-10-19 14:30:52 +02:00
|
|
|
<div className="mt-4 grid w-full items-center gap-2">
|
2025-10-28 00:46:43 +01:00
|
|
|
<Label
|
|
|
|
|
id="bookmark-description-label"
|
|
|
|
|
htmlFor="bookmark-description"
|
|
|
|
|
className="text-left text-sm font-medium"
|
|
|
|
|
>
|
2024-07-29 07:45:59 -07:00
|
|
|
{localize('com_ui_bookmarks_description')}
|
|
|
|
|
</Label>
|
|
|
|
|
<TextareaAutosize
|
|
|
|
|
{...register('description', {
|
|
|
|
|
maxLength: {
|
|
|
|
|
value: 1048,
|
2025-08-25 13:54:13 -04:00
|
|
|
message: localize('com_ui_field_max_length', {
|
|
|
|
|
field: localize('com_ui_bookmarks_description'),
|
|
|
|
|
length: 1048,
|
|
|
|
|
}),
|
2024-07-29 07:45:59 -07:00
|
|
|
},
|
|
|
|
|
})}
|
|
|
|
|
id="bookmark-description"
|
|
|
|
|
disabled={false}
|
|
|
|
|
className={cn(
|
2024-10-19 14:30:52 +02:00
|
|
|
'flex h-10 max-h-[250px] min-h-[100px] w-full resize-none rounded-lg border border-input bg-transparent px-3 py-2 text-sm ring-offset-background focus-visible:outline-none',
|
2024-07-29 07:45:59 -07:00
|
|
|
)}
|
2025-10-28 00:46:43 +01:00
|
|
|
aria-labelledby="bookmark-description-label"
|
2024-07-29 07:45:59 -07:00
|
|
|
/>
|
|
|
|
|
</div>
|
2024-12-29 23:31:41 +01:00
|
|
|
{conversationId != null && conversationId && (
|
2024-07-29 19:25:36 -04:00
|
|
|
<div className="mt-2 flex w-full items-center">
|
2024-07-29 07:45:59 -07:00
|
|
|
<Controller
|
|
|
|
|
name="addToConversation"
|
|
|
|
|
control={control}
|
|
|
|
|
render={({ field }) => (
|
|
|
|
|
<Checkbox
|
|
|
|
|
{...field}
|
|
|
|
|
checked={field.value}
|
|
|
|
|
onCheckedChange={field.onChange}
|
|
|
|
|
className="relative float-left mr-2 inline-flex h-4 w-4 cursor-pointer"
|
2024-08-16 10:30:14 +02:00
|
|
|
value={field.value?.toString()}
|
2025-10-28 00:46:43 +01:00
|
|
|
aria-label={localize('com_ui_bookmarks_add_to_conversation')}
|
2024-07-29 07:45:59 -07:00
|
|
|
/>
|
|
|
|
|
)}
|
|
|
|
|
/>
|
2024-08-08 21:25:10 -04:00
|
|
|
<button
|
2024-08-22 17:09:05 -04:00
|
|
|
type="button"
|
2024-08-08 21:25:10 -04:00
|
|
|
aria-label={localize('com_ui_bookmarks_add_to_conversation')}
|
2024-08-22 17:09:05 -04:00
|
|
|
className="form-check-label w-full cursor-pointer text-text-primary"
|
2024-07-29 07:45:59 -07:00
|
|
|
onClick={() =>
|
2024-08-22 17:09:05 -04:00
|
|
|
setValue('addToConversation', !(getValues('addToConversation') ?? false), {
|
2024-07-29 07:45:59 -07:00
|
|
|
shouldDirty: true,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
>
|
|
|
|
|
<div className="flex select-none items-center">
|
|
|
|
|
{localize('com_ui_bookmarks_add_to_conversation')}
|
|
|
|
|
</div>
|
2024-08-08 21:25:10 -04:00
|
|
|
</button>
|
2024-07-29 07:45:59 -07:00
|
|
|
</div>
|
|
|
|
|
)}
|
|
|
|
|
</div>
|
|
|
|
|
</form>
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
export default BookmarkForm;
|