diff --git a/web/app/components/plugins/plugin-page/index.tsx b/web/app/components/plugins/plugin-page/index.tsx index 598c2d7015..7ec7dbfae8 100644 --- a/web/app/components/plugins/plugin-page/index.tsx +++ b/web/app/components/plugins/plugin-page/index.tsx @@ -111,7 +111,9 @@ const PluginPage = ({ {canManagement && ( - + setActiveTab('discover')} + /> )} { canDebugger && ( diff --git a/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx b/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx index cd682f42b7..7a20d5b43e 100644 --- a/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx +++ b/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx @@ -6,7 +6,6 @@ import Button from '@/app/components/base/button' import { MagicBox } from '@/app/components/base/icons/src/vender/solid/mediaAndDevices' import { FileZip } from '@/app/components/base/icons/src/vender/solid/files' import { Github } from '@/app/components/base/icons/src/vender/solid/general' -import InstallFromMarketplace from '@/app/components/plugins/install-plugin/install-from-marketplace' import InstallFromGitHub from '@/app/components/plugins/install-plugin/install-from-github' import InstallFromLocalPackage from '@/app/components/plugins/install-plugin/install-from-local-package' import cn from '@/utils/classnames' @@ -17,7 +16,12 @@ import { } from '@/app/components/base/portal-to-follow-elem' import { useSelector as useAppContextSelector } from '@/context/app-context' -const InstallPluginDropdown = () => { +type Props = { + onSwitchToMarketplaceTab: () => void +} +const InstallPluginDropdown = ({ + onSwitchToMarketplaceTab, +}: Props) => { const fileInputRef = useRef(null) const [isMenuOpen, setIsMenuOpen] = useState(false) const [selectedAction, setSelectedAction] = useState(null) @@ -53,7 +57,7 @@ const InstallPluginDropdown = () => { - Install Form + Install From { {[ ...( - enable_marketplace + (enable_marketplace || true) ? [{ icon: MagicBox, text: 'Marketplace', action: 'marketplace' }] : [] ), @@ -79,6 +83,10 @@ const InstallPluginDropdown = () => { if (action === 'local') { fileInputRef.current?.click() } + else if (action === 'marketplace') { + onSwitchToMarketplaceTab() + setIsMenuOpen(false) + } else { setSelectedAction(action) setIsMenuOpen(false) @@ -93,7 +101,6 @@ const InstallPluginDropdown = () => { - {selectedAction === 'marketplace' && setSelectedAction(null)} />} {selectedAction === 'github' && setSelectedAction(null)} />} {selectedAction === 'local' && selectedFile && (