Skip to content

Commit 72c6f96

Browse files
committed
Added terminal process fixes and improvements
2 parents b7d6f78 + 1b25190 commit 72c6f96

File tree

5 files changed

+35
-6
lines changed

5 files changed

+35
-6
lines changed

webview-ui/src/components/chat/ChatTextArea.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ interface ChatTextAreaProps {
3232
inputValue: string
3333
setInputValue: (value: string) => void
3434
textAreaDisabled: boolean
35+
selectApiConfigDisabled: boolean
3536
placeholderText: string
3637
selectedImages: string[]
3738
setSelectedImages: React.Dispatch<React.SetStateAction<string[]>>
@@ -50,6 +51,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
5051
inputValue,
5152
setInputValue,
5253
textAreaDisabled,
54+
selectApiConfigDisabled,
5355
placeholderText,
5456
selectedImages,
5557
setSelectedImages,
@@ -975,7 +977,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
975977
<div className={cn("flex-1", "min-w-0", "overflow-hidden")}>
976978
<SelectDropdown
977979
value={currentConfigId}
978-
disabled={textAreaDisabled}
980+
disabled={selectApiConfigDisabled}
979981
title={t("chat:selectApiConfig")}
980982
placeholder={displayName} // Always show the current name
981983
options={[

webview-ui/src/components/chat/ChatView.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,6 +1359,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
13591359
inputValue={inputValue}
13601360
setInputValue={setInputValue}
13611361
textAreaDisabled={textAreaDisabled}
1362+
selectApiConfigDisabled={textAreaDisabled && clineAsk !== "api_req_failed"}
13621363
placeholderText={placeholderText}
13631364
selectedImages={selectedImages}
13641365
setSelectedImages={setSelectedImages}

webview-ui/src/components/chat/__tests__/ChatTextArea.test.tsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ describe("ChatTextArea", () => {
4747
setInputValue: jest.fn(),
4848
onSend: jest.fn(),
4949
textAreaDisabled: false,
50+
selectApiConfigDisabled: false,
5051
onSelectImages: jest.fn(),
5152
shouldDisableImages: false,
5253
placeholderText: "Type a message...",
@@ -408,4 +409,21 @@ describe("ChatTextArea", () => {
408409
expect(setInputValue).not.toHaveBeenCalled()
409410
})
410411
})
412+
413+
describe("selectApiConfig", () => {
414+
// Helper function to get the API config dropdown
415+
const getApiConfigDropdown = () => {
416+
return screen.getByTitle("chat:selectApiConfig")
417+
}
418+
it("should be enabled independently of textAreaDisabled", () => {
419+
render(<ChatTextArea {...defaultProps} textAreaDisabled={true} selectApiConfigDisabled={false} />)
420+
const apiConfigDropdown = getApiConfigDropdown()
421+
expect(apiConfigDropdown).not.toHaveAttribute("disabled")
422+
})
423+
it("should be disabled when selectApiConfigDisabled is true", () => {
424+
render(<ChatTextArea {...defaultProps} textAreaDisabled={true} selectApiConfigDisabled={true} />)
425+
const apiConfigDropdown = getApiConfigDropdown()
426+
expect(apiConfigDropdown).toHaveAttribute("disabled")
427+
})
428+
})
411429
})

webview-ui/src/components/settings/constants.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,30 @@ export const PROVIDERS = [
3939
{ value: "human-relay", label: "Human Relay" },
4040
].sort((a, b) => a.label.localeCompare(b.label))
4141

42+
//This list alpha sorted and updated April 2, 2025 to include any region that supported 1 or
43+
//more models shown at https://docs.aws.amazon.com/bedrock/latest/userguide/models-regions.html
44+
4245
export const AWS_REGIONS = [
43-
{ value: "us-east-1", label: "us-east-1" },
44-
{ value: "us-east-2", label: "us-east-2" },
45-
{ value: "us-west-2", label: "us-west-2" },
46-
{ value: "ap-south-1", label: "ap-south-1" },
4746
{ value: "ap-northeast-1", label: "ap-northeast-1" },
4847
{ value: "ap-northeast-2", label: "ap-northeast-2" },
48+
{ value: "ap-south-1", label: "ap-south-1" },
4949
{ value: "ap-southeast-1", label: "ap-southeast-1" },
5050
{ value: "ap-southeast-2", label: "ap-southeast-2" },
5151
{ value: "ca-central-1", label: "ca-central-1" },
5252
{ value: "eu-central-1", label: "eu-central-1" },
53+
{ value: "eu-central-2", label: "eu-central-2" },
54+
{ value: "eu-north-1", label: "eu-north-1" },
55+
{ value: "eu-south-1", label: "eu-south-1" },
56+
{ value: "eu-south-2", label: "eu-south-2" },
5357
{ value: "eu-west-1", label: "eu-west-1" },
5458
{ value: "eu-west-2", label: "eu-west-2" },
5559
{ value: "eu-west-3", label: "eu-west-3" },
5660
{ value: "sa-east-1", label: "sa-east-1" },
61+
{ value: "us-east-1", label: "us-east-1" },
62+
{ value: "us-east-2", label: "us-east-2" },
63+
{ value: "us-gov-east-1", label: "us-gov-east-1" },
5764
{ value: "us-gov-west-1", label: "us-gov-west-1" },
65+
{ value: "us-west-2", label: "us-west-2" },
5866
]
5967

6068
export const VERTEX_REGIONS = [

webview-ui/src/components/ui/select-dropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const SelectDropdown = React.forwardRef<React.ElementRef<typeof DropdownM
8383
}
8484

8585
return (
86-
<DropdownMenu open={open} onOpenChange={setOpen}>
86+
<DropdownMenu open={open} onOpenChange={setOpen} modal={false}>
8787
<DropdownMenuTrigger
8888
ref={ref}
8989
disabled={disabled}

0 commit comments

Comments
 (0)