From f17e22ca490e81a577ac28e21ccbe38e98261cbb Mon Sep 17 00:00:00 2001 From: Antoine Dewez <44063631+Zewed@users.noreply.github.com> Date: Sun, 21 Jan 2024 22:36:06 -0800 Subject: [PATCH 01/14] fix(frontend): remove actions modal (#2054) # Description Please include a summary of the changes and the related issue. Please also include relevant motivation and context. ## Checklist before requesting a review Please delete options that are not relevant. - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented hard-to-understand areas - [ ] I have ideally added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged ## Screenshots (if appropriate): --- .../components/ActionsModal/ActionsModal.tsx | 48 ------- .../ChatHistoryButton/ChatHistoryButton.tsx | 34 ----- .../ChatsList/__tests__/ChatsList.test.tsx | 123 ------------------ .../components/WelcomeChat/WelcomeChat.tsx | 19 --- .../WelcomeChat/hooks/useWelcomeChat.ts | 28 ---- .../ChatsList/components/WelcomeChat/index.ts | 1 - .../components/ChatsList/index.tsx | 21 --- .../components/ConfigModal/ConfigModal.tsx | 83 ------------ .../ConfigModal/hooks/useConfigModal.ts | 78 ----------- .../components/ConfigModal/index.ts | 1 - .../FeedCardTrigger/FeedCardTrigger.tsx | 21 --- .../hooks/useFeedCardTrigger.ts | 27 ---- .../hooks/useFeedCardTriggerUtils.ts | 27 ---- .../components/FeedCardTrigger/index.ts | 1 - .../components/SelectedBrainTag.tsx | 18 --- .../ActionsBar/components/ChatInput/index.tsx | 3 - .../components/BrainsManagementButton.tsx | 4 +- .../Menu/components/DiscussionButton.tsx | 4 +- .../Menu/components/ExplorerButton.tsx | 4 +- .../Menu/components/MenuButton.tsx} | 4 +- .../Menu/components/ParametersButton.tsx | 4 +- .../Menu/components/ProfileButton.tsx | 4 +- .../Menu/components/UpgradeToPlus.tsx | 4 +- 23 files changed, 14 insertions(+), 547 deletions(-) delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/ActionsModal.tsx delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/ChatHistoryButton.tsx delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/components/ChatsList/__tests__/ChatsList.test.tsx delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/components/ChatsList/components/WelcomeChat/WelcomeChat.tsx delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/components/ChatsList/components/WelcomeChat/hooks/useWelcomeChat.ts delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/components/ChatsList/components/WelcomeChat/index.ts delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/components/ChatsList/index.tsx delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ConfigModal/ConfigModal.tsx delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ConfigModal/hooks/useConfigModal.ts delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ConfigModal/index.ts delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/FeedCardTrigger/FeedCardTrigger.tsx delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/FeedCardTrigger/hooks/useFeedCardTrigger.ts delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/FeedCardTrigger/hooks/useFeedCardTriggerUtils.ts delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/FeedCardTrigger/index.ts delete mode 100644 frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/SelectedBrainTag.tsx rename frontend/{app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/Button.tsx => lib/components/Menu/components/MenuButton.tsx} (91%) diff --git a/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/ActionsModal.tsx b/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/ActionsModal.tsx deleted file mode 100644 index db9bed1de..000000000 --- a/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/ActionsModal.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { PopoverAnchor } from "@radix-ui/react-popover"; -import { useState } from "react"; -import { LuPlusCircle, LuXCircle } from "react-icons/lu"; - -import Button from "@/lib/components/ui/Button"; -import { - Popover, - PopoverContent, - PopoverTrigger, -} from "@/lib/components/ui/Popover"; - -import { ChatHistoryButton } from "./components/ChatHistoryButton/ChatHistoryButton"; -import { ConfigModal } from "./components/ConfigModal"; -import { FeedCardTrigger } from "./components/FeedCardTrigger"; -import { SelectedBrainTag } from "./components/SelectedBrainTag"; - -export const ActionsModal = (): JSX.Element => { - const [isActionsModalOpened, setIsActionsModalOpened] = useState(false); - - const Icon = isActionsModalOpened ? LuXCircle : LuPlusCircle; - - return ( -
- setIsActionsModalOpened(isOpened)} - > - - - - - - - - - - - - -
- ); -}; diff --git a/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/ChatHistoryButton.tsx b/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/ChatHistoryButton.tsx deleted file mode 100644 index 8a0f54fbb..000000000 --- a/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/ChatHistoryButton/ChatHistoryButton.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { useTranslation } from "react-i18next"; -import { LuChevronRight, LuHistory } from "react-icons/lu"; - -import { - Popover, - PopoverContent, - PopoverTrigger, -} from "@/lib/components/ui/Popover"; - -import { ChatsList } from "./components/ChatsList"; -import { Button } from "../Button"; - -export const ChatHistoryButton = (): JSX.Element => { - const { t } = useTranslation("chat"); - - return ( - - - - diff --git a/frontend/lib/components/Menu/components/BrainsManagementButton.tsx b/frontend/lib/components/Menu/components/BrainsManagementButton.tsx index 8e6ee4df5..6c444ce38 100644 --- a/frontend/lib/components/Menu/components/BrainsManagementButton.tsx +++ b/frontend/lib/components/Menu/components/BrainsManagementButton.tsx @@ -3,7 +3,7 @@ import { usePathname } from "next/navigation"; import { useTranslation } from "react-i18next"; import { LuBrain, LuChevronRight } from "react-icons/lu"; -import { Button } from "@/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/components/Button"; +import { MenuButton } from "@/lib/components/Menu/components/MenuButton"; import { cn } from "@/lib/utils"; export const BrainsManagementButton = (): JSX.Element => { @@ -14,7 +14,7 @@ export const BrainsManagementButton = (): JSX.Element => { return ( -