Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: workflow search blocks #7097

Merged
merged 1 commit into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion web/app/components/workflow/block-selector/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type {
import {
memo,
useCallback,
useMemo,
useState,
} from 'react'
import { useTranslation } from 'react-i18next'
Expand All @@ -17,6 +18,7 @@ import {
} from '@remixicon/react'
import type { BlockEnum, OnSelectBlock } from '../types'
import Tabs from './tabs'
import { TabsEnum } from './types'
import {
PortalToFollowElem,
PortalToFollowElemContent,
Expand Down Expand Up @@ -66,6 +68,9 @@ const NodeSelector: FC<NodeSelectorProps> = ({
const handleOpenChange = useCallback((newOpen: boolean) => {
setLocalOpen(newOpen)

if (!newOpen)
setSearchText('')

if (onOpenChange)
onOpenChange(newOpen)
}, [onOpenChange])
Expand All @@ -80,6 +85,19 @@ const NodeSelector: FC<NodeSelectorProps> = ({
onSelect(type, toolDefaultValue)
}, [handleOpenChange, onSelect])

const [activeTab, setActiveTab] = useState(noBlocks ? TabsEnum.Tools : TabsEnum.Blocks)
const handleActiveTabChange = useCallback((newActiveTab: TabsEnum) => {
setActiveTab(newActiveTab)
}, [])
const searchPlaceholder = useMemo(() => {
if (activeTab === TabsEnum.Blocks)
return t('workflow.tabs.searchBlock')

if (activeTab === TabsEnum.Tools)
return t('workflow.tabs.searchTool')
return ''
}, [activeTab, t])

return (
<PortalToFollowElem
placement={placement}
Expand Down Expand Up @@ -120,7 +138,7 @@ const NodeSelector: FC<NodeSelectorProps> = ({
<input
value={searchText}
className='grow px-0.5 py-[7px] text-[13px] text-gray-700 bg-transparent appearance-none outline-none caret-primary-600 placeholder:text-gray-400'
placeholder={t('workflow.tabs.searchBlock') || ''}
placeholder={searchPlaceholder}
onChange={e => setSearchText(e.target.value)}
autoFocus
/>
Expand All @@ -137,6 +155,8 @@ const NodeSelector: FC<NodeSelectorProps> = ({
</div>
</div>
<Tabs
activeTab={activeTab}
onActiveTabChange={handleActiveTabChange}
onSelect={handleSelect}
searchText={searchText}
availableBlocksTypes={availableBlocksTypes}
Expand Down
12 changes: 6 additions & 6 deletions web/app/components/workflow/block-selector/tabs.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import type { FC } from 'react'
import {
memo,
useState,
} from 'react'
import { memo } from 'react'
import type { BlockEnum } from '../types'
import { useTabs } from './hooks'
import type { ToolDefaultValue } from './types'
Expand All @@ -12,19 +9,22 @@ import AllTools from './all-tools'
import cn from '@/utils/classnames'

export type TabsProps = {
activeTab: TabsEnum
onActiveTabChange: (activeTab: TabsEnum) => void
searchText: string
onSelect: (type: BlockEnum, tool?: ToolDefaultValue) => void
availableBlocksTypes?: BlockEnum[]
noBlocks?: boolean
}
const Tabs: FC<TabsProps> = ({
activeTab,
onActiveTabChange,
searchText,
onSelect,
availableBlocksTypes,
noBlocks,
}) => {
const tabs = useTabs()
const [activeTab, setActiveTab] = useState(noBlocks ? TabsEnum.Tools : TabsEnum.Blocks)

return (
<div onClick={e => e.stopPropagation()}>
Expand All @@ -41,7 +41,7 @@ const Tabs: FC<TabsProps> = ({
? 'text-gray-700 after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-full after:bg-primary-600'
: 'text-gray-500',
)}
onClick={() => setActiveTab(tab.key)}
onClick={() => onActiveTabChange(tab.key)}
>
{tab.name}
</div>
Expand Down
1 change: 1 addition & 0 deletions web/i18n/en-US/workflow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ const translation = {
tabs: {
'searchBlock': 'Search block',
'blocks': 'Blocks',
'searchTool': 'Search tool',
'tools': 'Tools',
'allTool': 'All',
'builtInTool': 'Built-in',
Expand Down
1 change: 1 addition & 0 deletions web/i18n/zh-Hans/workflow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ const translation = {
tabs: {
'searchBlock': '搜索节点',
'blocks': '节点',
'searchTool': '搜索工具',
'tools': '工具',
'allTool': '全部',
'builtInTool': '内置',
Expand Down