Skip to content

feat: react-hook-form field array for provider muxes #345

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

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
144 changes: 144 additions & 0 deletions src/features/workspace/components/__tests__/form-muxing-rules.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
import { render } from '@/lib/test-utils'
import { screen, waitFor } from '@testing-library/react'
import { FormMuxRules } from '../form-mux-rules'
import userEvent from '@testing-library/user-event'

test('all fields are disabled if the form is disabled', async () => {
render(<FormMuxRules isDisabled={true} workspaceName="fake-workspace" />)

expect(
screen.getByLabelText(/matcher type/i, { selector: 'button' })
).toBeDisabled()
expect(
screen.getByLabelText(/matcher/i, { selector: 'input' })
).toBeDisabled()
expect(screen.getByLabelText(/model/i, { selector: 'input' })).toBeDisabled()
expect(
screen.getByLabelText(/delete/i, { selector: 'button' })
).toBeDisabled()
expect(
screen.getByLabelText(/add filter/i, { selector: 'button' })
).toBeDisabled()
expect(
screen.getByLabelText(/revert changes/i, { selector: 'button' })
).toBeDisabled()
expect(screen.getByLabelText(/save/i, { selector: 'button' })).toBeDisabled()
})

test('muxing rules form works correctly', async () => {
render(<FormMuxRules isDisabled={false} workspaceName="fake-workspace" />)

// should only have 1 row initially
expect(
screen.getAllByLabelText(/matcher type/i, { selector: 'button' }).length
).toEqual(1)
expect(
screen.getAllByLabelText(/matcher/i, { selector: 'input' }).length
).toEqual(1)
expect(
screen.getAllByLabelText(/model/i, { selector: 'input' }).length
).toEqual(1)
expect(
screen.getAllByLabelText(/delete/i, { selector: 'button' }).length
).toEqual(1)

// shouldn't be able to delete the catch-all row
expect(
screen.getAllByLabelText(/delete/i, { selector: 'button' })[0]
).toBeDisabled()

// populate the "catch-all" row
await userEvent.click(screen.getByLabelText('Model', { selector: 'input' }))
await userEvent.click(screen.getByRole('option', { name: /claude-3.6/i }))
await waitFor(() => {
expect(screen.getByLabelText('Model', { selector: 'input' })).toHaveValue(
'claude-3.6'
)
})

// add a new row
await userEvent.click(
screen.getByLabelText(/add filter/i, { selector: 'button' })
)

// add a new row
expect(
screen.getAllByLabelText(/matcher type/i, { selector: 'button' }).length
).toEqual(2)
expect(
screen.getAllByLabelText(/matcher/i, { selector: 'input' }).length
).toEqual(2)
expect(
screen.getAllByLabelText(/model/i, { selector: 'input' }).length
).toEqual(2)
expect(
screen.getAllByLabelText(/delete/i, { selector: 'button' }).length
).toEqual(2)

// shouldn't be able to delete the catch-all row
expect(
screen.getAllByLabelText(/delete/i, { selector: 'button' })[1]
).toBeDisabled()

// populate new row
const newMatcherTypeSelect = screen.getAllByLabelText(/matcher type/i, {
selector: 'button',
})[0]
const newMatcherInput = screen.getAllByLabelText(/matcher/i, {
selector: 'input',
})[0]
const newModelComboBox = screen.getAllByLabelText(/model/i, {
selector: 'input',
})[0]

await userEvent.click(newMatcherTypeSelect as HTMLFormElement)
await userEvent.click(screen.getByRole('option', { name: 'FIM' }))

await userEvent.type(newMatcherInput as HTMLFormElement, '.tsx')

await userEvent.click(newModelComboBox as HTMLFormElement)
await userEvent.click(screen.getByRole('option', { name: /chatgpt-4p/i }))

await userEvent.click(screen.getByRole('button', { name: /save/i }))

await waitFor(() => {
expect(
screen.getByText(/muxing rules for fake-workspace updated/i)
).toBeVisible()
})
})

test('displays validation errors with invalid config', async () => {
render(<FormMuxRules isDisabled={false} workspaceName="fake-workspace" />)

// should only have 1 row initially
expect(
screen.getAllByLabelText(/matcher type/i, { selector: 'button' }).length
).toEqual(1)
expect(
screen.getAllByLabelText(/matcher/i, { selector: 'input' }).length
).toEqual(1)
expect(
screen.getAllByLabelText(/model/i, { selector: 'input' }).length
).toEqual(1)
expect(
screen.getAllByLabelText(/delete/i, { selector: 'button' }).length
).toEqual(1)

// add a new row
await userEvent.click(
screen.getByLabelText(/add filter/i, { selector: 'button' })
)

// populate the matcher input, but not the model
const matcherInput = screen.getAllByLabelText(/matcher/i, {
selector: 'input',
})[0]
await userEvent.type(matcherInput as HTMLFormElement, '.tsx')

await userEvent.click(screen.getByRole('button', { name: /save/i }))

await waitFor(() => {
expect(screen.getByText(/muxing: model is required/i)).toBeVisible()
})
})

This file was deleted.

26 changes: 26 additions & 0 deletions src/features/workspace/components/form-mux-button-add-row.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { Button } from '@stacklok/ui-kit'
import { MuxMatcherType } from '@/api/generated'
import { Plus } from '@untitled-ui/icons-react'
import { useFormMuxRulesContext } from './form-mux-context-provider'

export function FormMuxButtonAddRow({ isDisabled }: { isDisabled: boolean }) {
const { prepend } = useFormMuxRulesContext()

return (
<Button
aria-label="Add filter"
className="w-fit"
variant="tertiary"
isDisabled={isDisabled}
onPress={() =>
prepend({
model: '',
matcher: '',
matcher_type: MuxMatcherType.FILENAME_MATCH,
})
}
>
<Plus /> Add Filter
</Button>
)
}
29 changes: 29 additions & 0 deletions src/features/workspace/components/form-mux-button-delete-rule.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { Button } from '@stacklok/ui-kit'
import { Trash01 } from '@untitled-ui/icons-react'
import { useFormMuxRulesContext } from './form-mux-context-provider'
import { FieldValuesMuxRow } from '../lib/schema-mux'
import { MuxMatcherType } from '@/api/generated'

export function FormMuxButtonDeleteRow({
index,
row,
isDisabled,
}: {
index: number
row: FieldValuesMuxRow & { id: string }
isDisabled: boolean
}) {
const { remove } = useFormMuxRulesContext()

return (
<Button
aria-label="Delete"
isIcon
isDisabled={row.matcher_type === MuxMatcherType.CATCH_ALL || isDisabled}
variant="secondary"
onPress={() => remove(index)}
>
<Trash01 />
</Button>
)
}
Loading

Unchanged files with check annotations Beta

ChatBubbleAvatar,
ChatBubbleMessage,
ChatBubbleTimestamp,
chatBubbleVariant,

Check warning on line 200 in src/components/ui/chat/chat-bubble.tsx

GitHub Actions / Static Checks / ESLint Check

Fast refresh only works when a file only exports components. Use a new file to share constants or functions between components
chatBubbleMessageVariants,

Check warning on line 201 in src/components/ui/chat/chat-bubble.tsx

GitHub Actions / Static Checks / ESLint Check

Fast refresh only works when a file only exports components. Use a new file to share constants or functions between components
ChatBubbleAction,
ChatBubbleActionWrapper,
}
confirm: (message: ReactNode, config: Config) => Promise<boolean>
}
export const ConfirmContext = createContext<ConfirmContextType | null>(null)

Check warning on line 37 in src/context/confirm-context.tsx

GitHub Actions / Static Checks / ESLint Check

Fast refresh only works when a file only exports components. Move your React context(s) to a separate file
export function ConfirmProvider({ children }: { children: ReactNode }) {
const [activeQuestion, setActiveQuestion] = useState<Question | null>(null)
</TestQueryClientProvider>
)
export * from '@testing-library/react'

Check warning on line 66 in src/lib/test-utils.tsx

GitHub Actions / Static Checks / ESLint Check

This rule can't verify that `export *` only exports components
export { renderWithProviders as render }

Check warning on line 68 in src/lib/test-utils.tsx

GitHub Actions / Static Checks / ESLint Check

Fast refresh only works when a file only exports components. Use a new file to share constants or functions between components