Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Bugfix/add fixes for search of view header #3271

Merged
merged 1 commit into from
Sep 26, 2024
Merged

Bugfix/add fixes for search of view header #3271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions packages/ui/src/hooks/useSearchShortcut.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ const isMac = getOS() === 'macos'
const useSearchShorcut = (inputRef) => {
useEffect(() => {
const component = inputRef.current

if (!component) return // Check if inputRef.current is defined

const handleKeyDown = (event) => {
if ((isMac && event.metaKey && event.key === 'f') || (!isMac && event.ctrlKey && event.key === 'f')) {
event.preventDefault()
Expand All @@ -17,14 +20,16 @@ const useSearchShorcut = (inputRef) => {
if (event.key === 'Escape') component.blur()
}

inputRef.current.addEventListener('keydown', handleInputEscape)
component.addEventListener('keydown', handleInputEscape)
document.addEventListener('keydown', handleKeyDown)

return () => {
component.addEventListener('keydown', handleInputEscape)
if (component) {
component.removeEventListener('keydown', handleInputEscape)
}
document.removeEventListener('keydown', handleKeyDown)
}
})
}, [inputRef]) // Add inputRef to the dependency array to ensure the effect is re-applied if inputRef changes
}

export default useSearchShorcut
19 changes: 17 additions & 2 deletions packages/ui/src/views/assistants/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ const Assistants = () => {
setShowLoadDialog(true)
}

const [search, setSearch] = useState('')
const onSearchChange = (event) => {
setSearch(event.target.value)
}

const onAssistantSelected = (selectedOpenAIAssistantId, credential) => {
setShowLoadDialog(false)
addNew(selectedOpenAIAssistantId, credential)
Expand Down Expand Up @@ -78,6 +83,11 @@ const Assistants = () => {
getAllAssistantsApi.request()
}

function filterAssistants(data) {
const parsedData = JSON.parse(data.details)
return parsedData && parsedData.name && parsedData.name.toLowerCase().indexOf(search.toLowerCase()) > -1
}

useEffect(() => {
getAllAssistantsApi.request()

Expand All @@ -101,7 +111,12 @@ const Assistants = () => {
<ErrorBoundary error={error} />
) : (
<Stack flexDirection='column' sx={{ gap: 3 }}>
<ViewHeader title='OpenAI Assistants'>
<ViewHeader
onSearchChange={onSearchChange}
search={true}
searchPlaceholder='Search Assistants'
title='OpenAI Assistants'
>
<Button
variant='outlined'
onClick={loadExisting}
Expand All @@ -128,7 +143,7 @@ const Assistants = () => {
) : (
<Box display='grid' gridTemplateColumns='repeat(3, 1fr)' gap={gridSpacing}>
{getAllAssistantsApi.data &&
getAllAssistantsApi.data.map((data, index) => (
getAllAssistantsApi.data?.filter(filterAssistants).map((data, index) => (
<ItemCard
data={{
name: JSON.parse(data.details)?.name,
Expand Down
19 changes: 15 additions & 4 deletions packages/ui/src/views/tools/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,17 @@ const Tools = () => {
getAllToolsApi.request()
}

const [search, setSearch] = useState('')
const onSearchChange = (event) => {
setSearch(event.target.value)
}

function filterTools(data) {
return (
data.name.toLowerCase().indexOf(search.toLowerCase()) > -1 || data.description.toLowerCase().indexOf(search.toLowerCase()) > -1
)
}

useEffect(() => {
getAllToolsApi.request()

Expand All @@ -127,7 +138,7 @@ const Tools = () => {
<ErrorBoundary error={error} />
) : (
<Stack flexDirection='column' sx={{ gap: 3 }}>
<ViewHeader title='Tools'>
<ViewHeader onSearchChange={onSearchChange} search={true} searchPlaceholder='Search Tools' title='Tools'>
<ToggleButtonGroup
sx={{ borderRadius: 2, maxHeight: 40 }}
value={view}
Expand Down Expand Up @@ -200,9 +211,9 @@ const Tools = () => {
) : (
<Box display='grid' gridTemplateColumns='repeat(3, 1fr)' gap={gridSpacing}>
{getAllToolsApi.data &&
getAllToolsApi.data.map((data, index) => (
<ItemCard data={data} key={index} onClick={() => edit(data)} />
))}
getAllToolsApi.data
?.filter(filterTools)
.map((data, index) => <ItemCard data={data} key={index} onClick={() => edit(data)} />)}
</Box>
)}
</>
Expand Down
Loading