Skip to content

Commit bc751e7

Browse files
authored
fix(web): label workspace default model selectors (#44500)
1 parent 30286da commit bc751e7

4 files changed

Lines changed: 18 additions & 8 deletions

File tree

‎web/app/components/header/account-setting/model-provider-page/__tests__/index.spec.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,11 @@ describe('ModelProviderPage', () => {
698698
const refreshedDialog = screen.getByRole('dialog', {
699699
name: 'modelProvider.modelProvider.systemModelSettingsTitle',
700700
})
701-
expect(await within(refreshedDialog).findByRole('button', { name: /^GPT-4/ })).toBeVisible()
701+
expect(
702+
await within(refreshedDialog).findByRole('button', {
703+
name: 'modelProvider.modelProvider.systemReasoningModel.key GPT-4',
704+
}),
705+
).toBeVisible()
702706
expect(mockDefaultModelQuery).toHaveBeenCalledTimes(5)
703707
})
704708

‎web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/clear-confirmation.browser.spec.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ it.each([
8383
)
8484
await screen.getByRole('button', { name: 'System Model Settings' }).click()
8585
const settings = screen.getByRole('dialog', { name: 'Default Model Settings' })
86-
await settings.getByRole('button', { name: new RegExp(`^${modelType} model`) }).hover()
86+
await settings.getByRole('button', { name: `${label} ${modelType} model` }).hover()
8787
const clearButton = settings.getByRole('button', { name: `Clear ${label}` })
8888
const settingsPopup = settings.element()
8989
await clearButton.click()
@@ -101,9 +101,10 @@ it.each([
101101
await expect.element(screen.getByRole('alertdialog')).not.toBeInTheDocument()
102102
}
103103
await expect.element(clearButton).not.toBeInTheDocument()
104-
// All other defaults remain configured, so the only empty selector is the cleared field.
105104
await expect
106-
.element(settings.getByRole('button', { name: 'plugin.detailPanel.configureModel' }))
105+
.element(
106+
settings.getByRole('button', { name: `${label} plugin.detailPanel.configureModel` }),
107+
)
107108
.toHaveFocus()
108109
} finally {
109110
queryClient.clear()

‎web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ describe('SystemModel', () => {
266266
screen.queryByRole('button', { name: 'Clear Speech to Text Model' }),
267267
).not.toBeInTheDocument()
268268
expect(
269-
screen.getAllByRole('button', { name: 'plugin.detailPanel.configureModel' }),
269+
screen.getAllByRole('button', { name: / plugin\.detailPanel\.configureModel$/ }),
270270
).toHaveLength(4)
271271
expect(save).toBeEnabled()
272272
})
@@ -564,7 +564,9 @@ describe('SystemModel', () => {
564564

565565
await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())
566566
expect(screen.getByRole('dialog', { name: 'Default Model Settings' })).toBeInTheDocument()
567-
expect(screen.getByRole('button', { name: /^Test model/ })).toBeInTheDocument()
567+
expect(
568+
screen.getByRole('button', { name: 'System Reasoning Model Test model' }),
569+
).toBeInTheDocument()
568570
expect(
569571
await screen.findByRole('button', { name: 'Clear System Reasoning Model' }),
570572
).toBeEnabled()
@@ -655,7 +657,7 @@ describe('SystemModel', () => {
655657
await user.click(screen.getByRole('button', { name: /system model settings/i }))
656658

657659
expect(
658-
await screen.findAllByRole('button', { name: 'plugin.detailPanel.configureModel' }),
660+
await screen.findAllByRole('button', { name: / plugin\.detailPanel\.configureModel$/ }),
659661
).toHaveLength(5)
660662
expect(
661663
screen.queryByRole('button', { name: 'Clear System Reasoning Model' }),
@@ -686,7 +688,9 @@ describe('SystemModel', () => {
686688
)
687689
})
688690

689-
expect(screen.getByRole('button', { name: /^Test model/ })).toBeInTheDocument()
691+
expect(
692+
screen.getByRole('button', { name: 'System Reasoning Model Test model' }),
693+
).toBeInTheDocument()
690694
expect(screen.queryByText('background-model')).not.toBeInTheDocument()
691695
await user.click(screen.getByRole('button', { name: 'Save' }))
692696
await waitFor(() => {

‎web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ function SystemModelSession({
287287
}
288288

289289
const getClearProps = (modelType: ModelTypeEnum, labelKey: SystemModelLabelKey) => ({
290+
'aria-labelledby': `${modelLabelId}-${labelKey}`,
290291
triggerRef: (element: HTMLButtonElement | null) => {
291292
modelTriggersRef.current[modelType] = element
292293
},

0 commit comments

Comments
 (0)