Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 08:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

📑 fix: Access Control for Bookmarks (UI) (#4612)

Browse source
This commit is contained in:
Danny Avila 2024-11-01 18:54:17 -04:00 • committed by GitHub
parent 95011ce349
commit 9437e95315
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/components/Nav/Bookmarks/BookmarkNav.tsx
View file

@ -1,7 +1,5 @@
import { type FC } from 'react'; import { type FC } from 'react';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { useLocation } from 'react-router-dom';
import { TConversation } from 'librechat-data-provider';
import { Menu, MenuButton, MenuItems } from '@headlessui/react'; import { Menu, MenuButton, MenuItems } from '@headlessui/react';
import { BookmarkFilledIcon, BookmarkIcon } from '@radix-ui/react-icons'; import { BookmarkFilledIcon, BookmarkIcon } from '@radix-ui/react-icons';
import { BookmarkContext } from '~/Providers/BookmarkContext'; import { BookmarkContext } from '~/Providers/BookmarkContext';
@ -19,19 +17,8 @@ type BookmarkNavProps = {
const BookmarkNav: FC<BookmarkNavProps> = ({ tags, setTags, isSmallScreen }: BookmarkNavProps) => { const BookmarkNav: FC<BookmarkNavProps> = ({ tags, setTags, isSmallScreen }: BookmarkNavProps) => {
const localize = useLocalize(); const localize = useLocalize();
const location = useLocation();
const { data } = useGetConversationTags(); const { data } = useGetConversationTags();
const conversation = useRecoilValue(store.conversationByIndex(0));
const activeConvo = useRecoilValue(store.conversationByIndex(0));
const globalConvo = useRecoilValue(store.conversation) ?? ({} as TConversation);
let conversation: TConversation | null | undefined;
if (location.state?.from?.pathname.includes('/chat')) {
conversation = globalConvo;
} else {
conversation = activeConvo;
}
return ( return (
<Menu as="div" className="group relative"> <Menu as="div" className="group relative">

12
client/src/components/Nav/Nav.tsx
View file

@ -176,11 +176,13 @@ const Nav = ({
{isSearchEnabled === true && ( {isSearchEnabled === true && (
<SearchBar clearSearch={clearSearch} isSmallScreen={isSmallScreen} /> <SearchBar clearSearch={clearSearch} isSmallScreen={isSmallScreen} />
)} )}
<BookmarkNav {hasAccessToBookmarks === true && (
tags={tags} <BookmarkNav
setTags={setTags} tags={tags}
isSmallScreen={isSmallScreen} setTags={setTags}
/> isSmallScreen={isSmallScreen}
/>
)}
</> </>
} }
/> />