2024-08-22 17:09:05 -04:00
|
|
|
import React, { useRef, Dispatch, SetStateAction } from 'react';
|
2024-12-29 23:31:41 +01:00
|
|
|
import { TConversationTag } from 'librechat-data-provider';
|
📦 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 { OGDialogTemplate, OGDialog, Button, Spinner, useToastContext } from '@librechat/client';
|
2024-08-22 17:09:05 -04:00
|
|
|
import { useConversationTagMutation } from '~/data-provider';
|
|
|
|
|
import { NotificationSeverity } from '~/common';
|
2024-07-29 07:45:59 -07:00
|
|
|
import BookmarkForm from './BookmarkForm';
|
|
|
|
|
import { useLocalize } from '~/hooks';
|
2024-08-22 17:09:05 -04:00
|
|
|
import { logger } from '~/utils';
|
2024-07-29 07:45:59 -07:00
|
|
|
|
|
|
|
|
type BookmarkEditDialogProps = {
|
2024-08-16 10:30:14 +02:00
|
|
|
open: boolean;
|
|
|
|
|
setOpen: Dispatch<SetStateAction<boolean>>;
|
2024-12-29 23:31:41 +01:00
|
|
|
tags?: string[];
|
|
|
|
|
setTags?: (tags: string[]) => void;
|
|
|
|
|
context: string;
|
|
|
|
|
bookmark?: TConversationTag;
|
|
|
|
|
conversationId?: string;
|
|
|
|
|
children?: React.ReactNode;
|
|
|
|
|
triggerRef?: React.RefObject<HTMLButtonElement>;
|
2024-07-29 07:45:59 -07:00
|
|
|
};
|
2024-08-16 10:30:14 +02:00
|
|
|
|
2024-07-29 07:45:59 -07:00
|
|
|
const BookmarkEditDialog = ({
|
2024-08-16 10:30:14 +02:00
|
|
|
open,
|
|
|
|
|
setOpen,
|
2024-12-29 23:31:41 +01:00
|
|
|
tags,
|
|
|
|
|
setTags,
|
|
|
|
|
context,
|
|
|
|
|
bookmark,
|
|
|
|
|
children,
|
|
|
|
|
triggerRef,
|
|
|
|
|
conversationId,
|
2024-07-29 07:45:59 -07:00
|
|
|
}: BookmarkEditDialogProps) => {
|
|
|
|
|
const localize = useLocalize();
|
|
|
|
|
const formRef = useRef<HTMLFormElement>(null);
|
|
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
const { showToast } = useToastContext();
|
|
|
|
|
const mutation = useConversationTagMutation({
|
|
|
|
|
context,
|
|
|
|
|
tag: bookmark?.tag,
|
|
|
|
|
options: {
|
|
|
|
|
onSuccess: (_data, vars) => {
|
|
|
|
|
showToast({
|
|
|
|
|
message: bookmark
|
|
|
|
|
? localize('com_ui_bookmarks_update_success')
|
|
|
|
|
: localize('com_ui_bookmarks_create_success'),
|
|
|
|
|
});
|
|
|
|
|
setOpen(false);
|
|
|
|
|
logger.log('tag_mutation', 'tags before setting', tags);
|
2024-12-29 23:31:41 +01:00
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
if (setTags && vars.addToConversation === true) {
|
|
|
|
|
const newTags = [...(tags || []), vars.tag].filter(
|
|
|
|
|
(tag) => tag !== undefined,
|
|
|
|
|
) as string[];
|
|
|
|
|
setTags(newTags);
|
2024-12-29 23:31:41 +01:00
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
logger.log('tag_mutation', 'tags after', newTags);
|
2024-12-29 23:31:41 +01:00
|
|
|
if (vars.tag == null || vars.tag === '') {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
setTimeout(() => {
|
|
|
|
|
const tagElement = document.getElementById(vars.tag ?? '');
|
|
|
|
|
console.log('tagElement', tagElement);
|
|
|
|
|
if (!tagElement) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
tagElement.focus();
|
|
|
|
|
}, 5);
|
2024-08-22 17:09:05 -04:00
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
onError: () => {
|
|
|
|
|
showToast({
|
|
|
|
|
message: bookmark
|
|
|
|
|
? localize('com_ui_bookmarks_update_error')
|
|
|
|
|
: localize('com_ui_bookmarks_create_error'),
|
|
|
|
|
severity: NotificationSeverity.ERROR,
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
|
2024-07-29 07:45:59 -07:00
|
|
|
const handleSubmitForm = () => {
|
|
|
|
|
if (formRef.current) {
|
|
|
|
|
formRef.current.dispatchEvent(new Event('submit', { cancelable: true, bubbles: true }));
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return (
|
2024-12-29 23:31:41 +01:00
|
|
|
<OGDialog open={open} onOpenChange={setOpen} triggerRef={triggerRef}>
|
|
|
|
|
{children}
|
2024-07-29 19:25:36 -04:00
|
|
|
<OGDialogTemplate
|
2025-08-25 13:54:13 -04:00
|
|
|
title={bookmark ? localize('com_ui_bookmarks_edit') : localize('com_ui_bookmarks_new')}
|
2024-07-29 07:45:59 -07:00
|
|
|
showCloseButton={false}
|
🪄 refactor: UI Polish and Admin Dialog Unification (#11108)
* refactor(OpenSidebar): removed useless classNames
* style(Header): update hover styles across various components for improved UI consistency
* style(Nav): update hover styles in AccountSettings and SearchBar for improved UI consistency
* style: update button classes for consistent hover effects and improved UI responsiveness
* style(Nav, OpenSidebar, Header, Convo): improve UI responsiveness and animation transitions
* style(PresetsMenu, NewChat): update icon sizes and improve component styling for better UI consistency
* style(Nav, Root): enhance sidebar mobile animations and responsiveness for better UI experience
* style(ExportAndShareMenu, BookmarkMenu): update icon sizes for improved UI consistency
* style: remove transition duration from button classes for improved UI responsiveness
* style(CustomMenu, ModelSelector): update background colors for improved UI consistency and responsiveness
* style(ExportAndShareMenu): update icon color for improved UI consistency
* style(TemporaryChat): refine button styles for improved UI consistency and responsiveness
* style(BookmarkNav): refactor to use DropdownPopup and remove BookmarkNavItems for improved UI consistency and functionality
* style(CustomMenu, EndpointItem): enhance UI elements for improved consistency and accessibility
* style(EndpointItem): adjust gap in icon container for improved layout consistency
* style(CustomMenu, EndpointItem): update focus ring color for improved UI consistency
* style(EndpointItem): update icon color for improved UI consistency in dark theme
* style: update focus styles for improved accessibility and consistency across components
* refactor(Nav): extract sidebar width to NAV_WIDTH constant
Centralize mobile (320px) and desktop (260px) sidebar widths in a single
exported constant to avoid magic numbers and ensure consistency.
* fix(BookmarkNav): memoize handlers used in useMemo
Wrap handleTagClick and handleClear in useCallback and add them to the
dropdownItems useMemo dependency array to prevent stale closures.
* feat: introduce FilterInput component and replace existing inputs with it across multiple components
* feat(DataTable): replace custom input with FilterInput component for improved filtering
* fix: Nested dialog overlay stacking issue
Fixes overlay appearing behind content when opening nested dialogs.
Introduced dynamic z-index calculation based on dialog depth using React context.
- First dialog: overlay z-50, content z-100
- Nested dialogs increment by 60: overlay z-110/content z-160, etc.
Preserves a11y escape key handling from #10975 and #10851.
Regression from #11008 (afb67fcf1) which increased content z-index
without adjusting overlay z-index for nested dialog scenarios.
* Refactor admin settings components to use a unified AdminSettingsDialog
- Removed redundant code from AdminSettings, MCPAdminSettings, and Memories AdminSettings components.
- Introduced AdminSettingsDialog component to handle permission management for different sections.
- Updated permission handling logic to use a consistent structure across components.
- Enhanced role selection and permission confirmation features in the new dialog.
- Improved UI consistency and maintainability by centralizing dialog functionality.
* refactor(Memory): memory management UI components and replace MemoryViewer with MemoryPanel
* refactor(Memory): enhance UI components for Memory dialogs and improve input styling
* refactor(Bookmarks): improve bookmark management UI with enhanced styling
* refactor(translations): remove redundant filter input and bookmark count entries
* refactor(Convo): integrate useShiftKey hook for enhanced keyboard interaction and improve UI responsiveness
2025-12-28 17:01:25 +01:00
|
|
|
className="w-11/12 md:max-w-lg"
|
2024-07-29 07:45:59 -07:00
|
|
|
main={
|
|
|
|
|
<BookmarkForm
|
2024-08-22 17:09:05 -04:00
|
|
|
tags={tags}
|
|
|
|
|
setOpen={setOpen}
|
|
|
|
|
mutation={mutation}
|
2024-12-29 23:31:41 +01:00
|
|
|
conversationId={conversationId}
|
2024-07-29 07:45:59 -07:00
|
|
|
bookmark={bookmark}
|
|
|
|
|
formRef={formRef}
|
|
|
|
|
/>
|
|
|
|
|
}
|
|
|
|
|
buttons={
|
2024-10-19 14:30:52 +02:00
|
|
|
<Button
|
|
|
|
|
variant="submit"
|
2024-08-22 17:09:05 -04:00
|
|
|
type="submit"
|
|
|
|
|
disabled={mutation.isLoading}
|
|
|
|
|
onClick={handleSubmitForm}
|
2024-12-29 23:31:41 +01:00
|
|
|
className="text-white"
|
2024-08-22 17:09:05 -04:00
|
|
|
>
|
|
|
|
|
{mutation.isLoading ? <Spinner /> : localize('com_ui_save')}
|
2024-10-19 14:30:52 +02:00
|
|
|
</Button>
|
2024-07-29 07:45:59 -07:00
|
|
|
}
|
|
|
|
|
/>
|
2024-07-29 19:25:36 -04:00
|
|
|
</OGDialog>
|
2024-07-29 07:45:59 -07:00
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
export default BookmarkEditDialog;
|