diff --git a/webview-ui/playwright/gallery/stories.tsx b/webview-ui/playwright/gallery/stories.tsx index b95e59b733..e832802dbc 100644 --- a/webview-ui/playwright/gallery/stories.tsx +++ b/webview-ui/playwright/gallery/stories.tsx @@ -146,6 +146,32 @@ export const stories: Record = { ) }, + "api-provider-dropdown": async () => { + const [{ AppProviders }, { default: ApiOptions }, { providerIdentifiers }] = await Promise.all([ + import("../AppProviders"), + import("@/components/settings/ApiOptions"), + import("@roo-code/types"), + ]) + const apiConfiguration: import("@roo-code/types").ProviderSettings = { + apiProvider: providerIdentifiers.anthropic, + apiKey: "sk-ant-example-key", + } + return ( + +
+ undefined} + errorMessage={undefined} + setErrorMessage={() => undefined} + /> +
+
+ ) + }, "auto-approve-settings": async () => { const { AutoApproveSettingsStory } = await import("@/components/settings/__tests__/AutoApproveSettings.visual.fixture") diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index 0d03cded66..794dbf7629 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -435,6 +435,12 @@ const ApiOptions = ({ } } + const zooGatewayIndex = options.findIndex((opt) => opt.value === providerIdentifiers.zooGateway) + if (zooGatewayIndex > 0) { + const [zooGatewayOption] = options.splice(zooGatewayIndex, 1) + options.unshift(zooGatewayOption) + } + return options }, [organizationAllowList, apiConfiguration.apiProvider, fromWelcomeView]) diff --git a/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx b/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx index b68bee99e6..97a0996480 100644 --- a/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx +++ b/webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx @@ -11,6 +11,11 @@ import { useSelectedModel } from "@src/components/ui/hooks/useSelectedModel" import ApiOptions from "../ApiOptions" import { MODELS_BY_PROVIDER, PROVIDERS } from "../constants" +type ProviderOption = { + value: string + label: string +} + // Mock the extension state context vi.mock("@src/context/ExtensionStateContext", () => ({ ExtensionStateContextProvider: ({ children }: any) => children, @@ -113,6 +118,11 @@ describe("ApiOptions Provider Filtering", () => { return renderWithExtensionState() } + const getProviderOptions = (): ProviderOption[] => { + const selectElement = screen.getByTestId("provider-select") + return JSON.parse(selectElement.getAttribute("data-options") || "[]") as ProviderOption[] + } + beforeEach(() => { vi.clearAllMocks() vi.mocked(useSelectedModel).mockReturnValue({ @@ -190,6 +200,64 @@ describe("ApiOptions Provider Filtering", () => { expect(providerValues).toContain("ollama") // dynamic provider }) + it("pins Zoo Gateway first while preserving alphabetical order for the remaining providers", () => { + renderWithProviders() + + const options = getProviderOptions() + const remainingLabels = options.slice(1).map(({ label }) => label) + + expect(options[0]?.value).toBe(providerIdentifiers.zooGateway) + expect(remainingLabels).toEqual([...remainingLabels].sort((a, b) => a.localeCompare(b))) + }) + + it("pins Zoo Gateway first and OpenRouter second in the welcome view", () => { + renderWithProviders({ ...defaultProps, fromWelcomeView: true }) + + const providerValues = getProviderOptions().map(({ value }) => value) + + expect(providerValues.slice(0, 2)).toEqual([providerIdentifiers.zooGateway, providerIdentifiers.openrouter]) + }) + + it("does not reintroduce Zoo Gateway when an organization allow list excludes it", () => { + vi.mocked(useExtensionState).mockReturnValueOnce({ + ...useExtensionState(), + organizationAllowList: { + allowAll: false, + providers: { + [providerIdentifiers.anthropic]: { allowAll: true }, + [providerIdentifiers.openrouter]: { allowAll: true }, + }, + }, + }) + + renderWithProviders() + + expect(getProviderOptions().map(({ value }) => value)).toEqual([ + providerIdentifiers.anthropic, + providerIdentifiers.openrouter, + ]) + }) + + it("keeps Zoo Gateway first when an organization allow list includes it", () => { + vi.mocked(useExtensionState).mockReturnValueOnce({ + ...useExtensionState(), + organizationAllowList: { + allowAll: false, + providers: { + [providerIdentifiers.anthropic]: { allowAll: true }, + [providerIdentifiers.zooGateway]: { allowAll: true }, + }, + }, + }) + + renderWithProviders() + + expect(getProviderOptions().map(({ value }) => value)).toEqual([ + providerIdentifiers.zooGateway, + providerIdentifiers.anthropic, + ]) + }) + it("should hide static providers with empty models", () => { // Mock MODELS_BY_PROVIDER to have an empty provider const _originalModels = { ...MODELS_BY_PROVIDER } diff --git a/webview-ui/src/components/settings/__tests__/ApiProviderDropdown.visual.tsx b/webview-ui/src/components/settings/__tests__/ApiProviderDropdown.visual.tsx new file mode 100644 index 0000000000..dea576938f --- /dev/null +++ b/webview-ui/src/components/settings/__tests__/ApiProviderDropdown.visual.tsx @@ -0,0 +1,13 @@ +import { expect, test } from "../../../../playwright/coverage-fixture" +import { mountedStory } from "../../../../playwright/mounted-story" + +test("renders the open provider dropdown with Zoo Gateway first", async ({ mount, page }) => { + await page.setViewportSize({ width: 520, height: 720 }) + // The full provider bundle leaves bare Zod references after gallery tree-shaking. + await page.evaluate(() => Object.assign(globalThis, { z: undefined, z$1: undefined })) + const component = mountedStory(await mount("api-provider-dropdown")) + + await component.getByTestId("provider-select").click() + await expect(page.getByRole("listbox")).toBeVisible() + await expect(page).toHaveScreenshot("api-provider-dropdown-open.png") +}) diff --git a/webview-ui/src/components/settings/__tests__/__screenshots__/api-provider-dropdown-open.png b/webview-ui/src/components/settings/__tests__/__screenshots__/api-provider-dropdown-open.png new file mode 100644 index 0000000000..1b8cc8b052 Binary files /dev/null and b/webview-ui/src/components/settings/__tests__/__screenshots__/api-provider-dropdown-open.png differ