Skip to content

Fix settings panel reset during state update #1051

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

Merged
mrubens merged 6 commits into from
Feb 20, 2025
Merged

Fix settings panel reset during state update #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2036e84
Fix settings panel reset during state update
System233 Feb 18, 2025
1fcdd33
Add confirmation dialog for discarding changes.
System233 Feb 18, 2025
e5f5cbc
Fix the sticky background color of the welcome view
System233 Feb 18, 2025
2d34cda
Add icon feedback for apiErrorMessage/modelIdErrorMessage
System233 Feb 18, 2025
b732005
fix: getunbound.ai may return null
System233 Feb 19, 2025
eeb1e45
Improve UI experience
System233 Feb 19, 2025
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
19 changes: 9 additions & 10 deletions src/core/webview/ClineProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2220,18 +2220,17 @@ export class ClineProvider implements vscode.WebviewViewProvider {

if (response.data) {
const rawModels: Record<string, any> = response.data

for (const [modelId, model] of Object.entries(rawModels)) {
models[modelId] = {
maxTokens: model.maxTokens ? parseInt(model.maxTokens) : undefined,
contextWindow: model.contextWindow ? parseInt(model.contextWindow) : 0,
supportsImages: model.supportsImages ?? false,
supportsPromptCache: model.supportsPromptCaching ?? false,
supportsComputerUse: model.supportsComputerUse ?? false,
inputPrice: model.inputTokenPrice ? parseFloat(model.inputTokenPrice) : undefined,
outputPrice: model.outputTokenPrice ? parseFloat(model.outputTokenPrice) : undefined,
cacheWritesPrice: model.cacheWritePrice ? parseFloat(model.cacheWritePrice) : undefined,
cacheReadsPrice: model.cacheReadPrice ? parseFloat(model.cacheReadPrice) : undefined,
maxTokens: model?.maxTokens ? parseInt(model.maxTokens) : undefined,
contextWindow: model?.contextWindow ? parseInt(model.contextWindow) : 0,
supportsImages: model?.supportsImages ?? false,
supportsPromptCache: model?.supportsPromptCaching ?? false,
supportsComputerUse: model?.supportsComputerUse ?? false,
inputPrice: model?.inputTokenPrice ? parseFloat(model.inputTokenPrice) : undefined,
outputPrice: model?.outputTokenPrice ? parseFloat(model.outputTokenPrice) : undefined,
cacheWritesPrice: model?.cacheWritePrice ? parseFloat(model.cacheWritePrice) : undefined,
cacheReadsPrice: model?.cacheReadPrice ? parseFloat(model.cacheReadPrice) : undefined,
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion webview-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"build-storybook": "storybook build"
},
"dependencies": {
"@radix-ui/react-alert-dialog": "^1.1.6",
"@radix-ui/react-collapsible": "^1.1.3",
"@radix-ui/react-dialog": "^1.1.6",
"@radix-ui/react-dropdown-menu": "^2.1.5",
Expand All @@ -23,7 +24,7 @@
"@radix-ui/react-progress": "^1.1.2",
"@radix-ui/react-separator": "^1.1.2",
"@radix-ui/react-slider": "^1.2.3",
"@radix-ui/react-slot": "^1.1.1",
"@radix-ui/react-slot": "^1.1.2",
"@radix-ui/react-tooltip": "^1.1.8",
"@tailwindcss/vite": "^4.0.0",
"@vscode/webview-ui-toolkit": "^1.4.0",
Expand Down
17 changes: 6 additions & 11 deletions webview-ui/src/components/settings/ApiConfigManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ApiConfigMeta } from "../../../../src/shared/ExtensionMessage"
import { Dropdown } from "vscrui"
import type { DropdownOption } from "vscrui"
import { Dialog, DialogContent, DialogTitle } from "../ui/dialog"
import { Button, Input } from "../ui"

interface ApiConfigManagerProps {
currentApiConfigName?: string
Expand Down Expand Up @@ -299,10 +300,7 @@ const ApiConfigManager = ({
aria-labelledby="new-profile-title">
<DialogContent className="p-4 max-w-sm">
<DialogTitle>New Configuration Profile</DialogTitle>
<button className="absolute right-4 top-4" aria-label="Close dialog" onClick={resetCreateState}>
<span className="codicon codicon-close" />
</button>
<VSCodeTextField
<Input
ref={newProfileInputRef}
value={newProfileName}
onInput={(e: unknown) => {
Expand All @@ -327,15 +325,12 @@ const ApiConfigManager = ({
</p>
)}
<div className="flex justify-end gap-2 mt-4">
<VSCodeButton appearance="secondary" onClick={resetCreateState}>
<Button variant="secondary" onClick={resetCreateState}>
Cancel
</VSCodeButton>
<VSCodeButton
appearance="primary"
disabled={!newProfileName.trim()}
onClick={handleNewProfileSave}>
</Button>
<Button variant="default" disabled={!newProfileName.trim()} onClick={handleNewProfileSave}>
Create Profile
</VSCodeButton>
</Button>
</div>
</DialogContent>
</Dialog>
Expand Down
Loading
Loading