Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion webview-ui/src/components/settings/ApiOptions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,11 @@ const ApiOptions = ({
)}

{selectedProvider === "gemini" && (
<Gemini apiConfiguration={apiConfiguration} setApiConfigurationField={setApiConfigurationField} />
<Gemini
apiConfiguration={apiConfiguration}
setApiConfigurationField={setApiConfigurationField}
fromWelcomeView={fromWelcomeView}
/>
)}

{selectedProvider === "openai" && (
Expand Down
45 changes: 25 additions & 20 deletions webview-ui/src/components/settings/providers/Gemini.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ import { inputEventTransform } from "../transforms"
type GeminiProps = {
apiConfiguration: ProviderSettings
setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void
fromWelcomeView?: boolean
}

export const Gemini = ({ apiConfiguration, setApiConfigurationField }: GeminiProps) => {
export const Gemini = ({ apiConfiguration, setApiConfigurationField, fromWelcomeView }: GeminiProps) => {
const { t } = useAppTranslation()

const [googleGeminiBaseUrlSelected, setGoogleGeminiBaseUrlSelected] = useState(
Expand Down Expand Up @@ -73,26 +74,30 @@ export const Gemini = ({ apiConfiguration, setApiConfigurationField }: GeminiPro
/>
)}

<Checkbox
className="mt-6"
data-testid="checkbox-url-context"
checked={!!apiConfiguration.enableUrlContext}
onChange={(checked: boolean) => setApiConfigurationField("enableUrlContext", checked)}>
{t("settings:providers.geminiParameters.urlContext.title")}
</Checkbox>
<div className="text-sm text-vscode-descriptionForeground mb-3 mt-1.5">
{t("settings:providers.geminiParameters.urlContext.description")}
</div>
{!fromWelcomeView && (
<>
<Checkbox
className="mt-6"
data-testid="checkbox-url-context"
checked={!!apiConfiguration.enableUrlContext}
onChange={(checked: boolean) => setApiConfigurationField("enableUrlContext", checked)}>
{t("settings:providers.geminiParameters.urlContext.title")}
</Checkbox>
<div className="text-sm text-vscode-descriptionForeground mb-3 mt-1.5">
{t("settings:providers.geminiParameters.urlContext.description")}
</div>

<Checkbox
data-testid="checkbox-grounding-search"
checked={!!apiConfiguration.enableGrounding}
onChange={(checked: boolean) => setApiConfigurationField("enableGrounding", checked)}>
{t("settings:providers.geminiParameters.groundingSearch.title")}
</Checkbox>
<div className="text-sm text-vscode-descriptionForeground mb-3 mt-1.5">
{t("settings:providers.geminiParameters.groundingSearch.description")}
</div>
<Checkbox
data-testid="checkbox-grounding-search"
checked={!!apiConfiguration.enableGrounding}
onChange={(checked: boolean) => setApiConfigurationField("enableGrounding", checked)}>
{t("settings:providers.geminiParameters.groundingSearch.title")}
</Checkbox>
<div className="text-sm text-vscode-descriptionForeground mb-3 mt-1.5">
{t("settings:providers.geminiParameters.groundingSearch.description")}
</div>
</>
)}
</div>
</>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,51 @@ describe("Gemini", () => {
expect(mockSetApiConfigurationField).toHaveBeenCalledWith("enableGrounding", true)
})
})

describe("fromWelcomeView prop", () => {
it("should hide URL context and grounding checkboxes when fromWelcomeView is true, but keep custom base URL", () => {
render(
<Gemini
apiConfiguration={defaultApiConfiguration}
setApiConfigurationField={mockSetApiConfigurationField}
fromWelcomeView={true}
/>,
)

// Should still render custom base URL checkbox
expect(screen.getByTestId("checkbox-custom-base-url")).toBeInTheDocument()
// Should not render URL context and grounding checkboxes
expect(screen.queryByTestId("checkbox-url-context")).not.toBeInTheDocument()
expect(screen.queryByTestId("checkbox-grounding-search")).not.toBeInTheDocument()
})

it("should show all checkboxes when fromWelcomeView is false", () => {
render(
<Gemini
apiConfiguration={defaultApiConfiguration}
setApiConfigurationField={mockSetApiConfigurationField}
fromWelcomeView={false}
/>,
)

// Should render all checkboxes
expect(screen.getByTestId("checkbox-custom-base-url")).toBeInTheDocument()
expect(screen.getByTestId("checkbox-url-context")).toBeInTheDocument()
expect(screen.getByTestId("checkbox-grounding-search")).toBeInTheDocument()
})

it("should show all checkboxes when fromWelcomeView is undefined (default behavior)", () => {
render(
<Gemini
apiConfiguration={defaultApiConfiguration}
setApiConfigurationField={mockSetApiConfigurationField}
/>,
)

// Should render all checkboxes (default behavior)
expect(screen.getByTestId("checkbox-custom-base-url")).toBeInTheDocument()
expect(screen.getByTestId("checkbox-url-context")).toBeInTheDocument()
expect(screen.getByTestId("checkbox-grounding-search")).toBeInTheDocument()
})
})
})