Skip to content

Commit 6ac6a92

Browse files
brunobergherroomote[bot]ellipsis-dev[bot]
authored
ux: Responsive Auto-Approve (#8032)
Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
1 parent dcc6db0 commit 6ac6a92

File tree

19 files changed

+343
-115
lines changed

19 files changed

+343
-115
lines changed

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,19 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
153153

154154
const { effectiveAutoApprovalEnabled } = useAutoApprovalState(toggles, autoApprovalEnabled)
155155

156+
const tooltipText =
157+
!effectiveAutoApprovalEnabled || enabledCount === 0
158+
? t("chat:autoApprove.tooltipManage")
159+
: t("chat:autoApprove.tooltipStatus", {
160+
toggles: settingsArray
161+
.filter((setting) => toggles[setting.key])
162+
.map((setting) => t(setting.labelKey))
163+
.join(", "),
164+
})
165+
156166
return (
157167
<Popover open={open} onOpenChange={setOpen} data-testid="auto-approve-dropdown-root">
158-
<StandardTooltip content={t("chat:autoApprove.tooltip")}>
168+
<StandardTooltip content={tooltipText}>
159169
<PopoverTrigger
160170
disabled={disabled}
161171
data-testid="auto-approve-dropdown-trigger"
@@ -187,7 +197,7 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
187197
align="start"
188198
sideOffset={4}
189199
container={portalContainer}
190-
className="p-0 overflow-hidden min-w-90 max-w-9/10"
200+
className="p-0 overflow-hidden w-[min(440px,calc(100vw-2rem))]"
191201
onOpenAutoFocus={(e) => e.preventDefault()}>
192202
<div className="flex flex-col w-full">
193203
{/* Header with description */}
@@ -205,7 +215,7 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
205215
{t("chat:autoApprove.description")}
206216
</p>
207217
</div>
208-
<div className="grid grid-cols-2 gap-x-2 gap-y-2 p-3">
218+
<div className="grid grid-cols-1 min-[340px]:grid-cols-2 gap-x-2 gap-y-2 p-3">
209219
{settingsArray.map(({ key, labelKey, descriptionKey, icon }) => {
210220
const isEnabled = toggles[key]
211221
return (

webview-ui/src/i18n/locales/ca/chat.json

Lines changed: 21 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/de/chat.json

Lines changed: 18 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/en/chat.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@
271271
"issues": "It seems like you're having Windows PowerShell issues, please see this"
272272
},
273273
"autoApprove": {
274-
"tooltip": "Manage auto-approval settings",
274+
"tooltipManage": "Manage auto-approval settings",
275+
"tooltipStatus": "Auto-approval enabled for: {{toggles}}",
275276
"title": "Auto-approve",
276277
"all": "All",
277278
"none": "None",

webview-ui/src/i18n/locales/es/chat.json

Lines changed: 21 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/fr/chat.json

Lines changed: 18 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/hi/chat.json

Lines changed: 20 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webview-ui/src/i18n/locales/id/chat.json

Lines changed: 26 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)