Skip to content

fix(web): make tool provider cards buttons #40249

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.

Sign up for GitHub

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

Draft
lyzno1 wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −14
Draft

fix(web): make tool provider cards buttons #40249

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
8 changes: 0 additions & 8 deletions oxlint-suppressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3616,14 +3616,6 @@
"count": 1
}
},
"web/app/components/tools/provider/tool-item.tsx": {
"jsx_a11y/click-events-have-key-events": {
"count": 1
},
"jsx_a11y/no-static-element-interactions": {
"count": 1
}
},
"web/app/components/tools/setting/build-in/config-credentials.tsx": {
"typescript/no-explicit-any": {
"count": 3
Expand Down
20 changes: 17 additions & 3 deletions web/app/components/tools/provider/__tests__/tool-item.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Collection, Tool } from '../../types'
import { fireEvent, render, screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { describe, expect, it, vi } from 'vitest'
import ToolItem from '../tool-item'

Expand Down Expand Up @@ -38,10 +39,11 @@ const tool = {
} as Tool

describe('ToolItem', () => {
it('opens and closes tool details', () => {
it('opens and closes tool details', async () => {
const user = userEvent.setup()
render(<ToolItem collection={collection} tool={tool} isBuiltIn isModel={false} />)

fireEvent.click(screen.getByText('Tool label'))
await user.click(screen.getByRole('button', { name: /Tool label/ }))
expect(screen.getByTestId('tool-detail')).toBeInTheDocument()
expect(screen.getByTestId('tool-detail')).toHaveAttribute(
'data-show-readonly-setting-details',
Expand All @@ -52,10 +54,22 @@ describe('ToolItem', () => {
expect(screen.queryByTestId('tool-detail')).not.toBeInTheDocument()
})

it('is reachable and opens tool details from the keyboard', async () => {
const user = userEvent.setup()
render(<ToolItem collection={collection} tool={tool} isBuiltIn isModel={false} />)

await user.tab()
expect(screen.getByRole('button', { name: /Tool label/ })).toHaveFocus()

await user.keyboard('{Enter}')
expect(screen.getByTestId('tool-detail')).toBeInTheDocument()
})

it('does not open tool details when disabled', () => {
render(<ToolItem collection={collection} tool={tool} isBuiltIn isModel={false} disabled />)

fireEvent.click(screen.getByText('Tool label'))
expect(screen.getByRole('button', { name: /Tool label/ })).toBeDisabled()
fireEvent.click(screen.getByRole('button', { name: /Tool label/ }))

expect(screen.queryByTestId('tool-detail')).not.toBeInTheDocument()
})
Expand Down
8 changes: 5 additions & 3 deletions web/app/components/tools/provider/tool-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ const ToolItem = ({ disabled, collection, tool, isBuiltIn, isModel }: Props) =>

return (
<>
<div
<button
type="button"
disabled={disabled}
className={cn(
'bg-components-panel-item-bg cursor-pointer rounded-xl border-[0.5px] border-components-panel-border-subtle px-4 py-3 shadow-xs hover:bg-components-panel-on-panel-item-bg-hover',
'bg-components-panel-item-bg w-full cursor-pointer rounded-xl border-[0.5px] border-components-panel-border-subtle px-4 py-3 text-start shadow-xs hover:bg-components-panel-on-panel-item-bg-hover',
disabled && 'cursor-not-allowed! opacity-50',
)}
onClick={() => !disabled && setShowDetail(true)}
Expand All @@ -36,7 +38,7 @@ const ToolItem = ({ disabled, collection, tool, isBuiltIn, isModel }: Props) =>
>
{tool.description[language]}
</div>
</div>
</button>
{showDetail && (
<SettingBuiltInTool
showBackButton
Expand Down
Loading