Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(react): unblock approval and align control sizing (#20025)

boojack55d548a63830
diff --git a/frontend/src/react/components/MarkdownEditor/MarkdownEditor.tsx b/frontend/src/react/components/MarkdownEditor/MarkdownEditor.tsx
index 8275ec5be1..a15110c960 100644
--- a/frontend/src/react/components/MarkdownEditor/MarkdownEditor.tsx
+++ b/frontend/src/react/components/MarkdownEditor/MarkdownEditor.tsx
@@ -112,7 +112,7 @@ export function MarkdownEditor({
<div className="flex gap-x-4">
<button
className={cn(
- "relative px-1 pb-2 text-sm transition-colors",
+ "relative px-1 pb-1 text-sm transition-colors",
tab === "write"
? "text-accent after:absolute after:inset-x-0 after:-bottom-px after:h-0.5 after:bg-accent"
: "text-control-light hover:text-control"
@@ -124,7 +124,7 @@ export function MarkdownEditor({
</button>
<button
className={cn(
- "relative px-1 pb-2 text-sm transition-colors",
+ "relative px-1 pb-1 text-sm transition-colors",
tab === "preview"
? "text-accent after:absolute after:inset-x-0 after:-bottom-px after:h-0.5 after:bg-accent"
: "text-control-light hover:text-control"
diff --git a/frontend/src/react/components/ui/button.tsx b/frontend/src/react/components/ui/button.tsx
index b994cd39f9..b8a22a1bc0 100644
--- a/frontend/src/react/components/ui/button.tsx
+++ b/frontend/src/react/components/ui/button.tsx
@@ -16,11 +16,12 @@ const buttonVariants = cva(
link: "text-accent underline-offset-4 hover:underline",
},
size: {
- default: "h-9 px-4 py-2",
- xs: "h-6 px-1.5 text-[11px] gap-1.5",
- sm: "h-8 px-3 text-xs",
- md: "h-9 px-4 text-sm",
- lg: "h-10 px-6",
+ // `default` is an alias for `md` — both render identically.
+ default: "h-9 px-4 text-sm leading-5",
+ xs: "h-6 px-1.5 text-xs leading-4 gap-1.5",
+ sm: "h-8 px-3 text-xs leading-4",
+ md: "h-9 px-4 text-sm leading-5",
+ lg: "h-10 px-6 text-sm leading-5",
icon: "h-9 w-9",
},
},
diff --git a/frontend/src/react/components/ui/combobox.tsx b/frontend/src/react/components/ui/combobox.tsx
index d5731d36be..19938c40dd 100644
--- a/frontend/src/react/components/ui/combobox.tsx
+++ b/frontend/src/react/components/ui/combobox.tsx
@@ -405,7 +405,7 @@ export function Combobox(props: ComboboxProps) {
{/* Trigger */}
<div
className={cn(
- "flex flex-wrap items-center gap-1 min-h-[2.25rem] w-full rounded-xs border border-control-border bg-background px-2 py-1 text-sm cursor-pointer",
+ "flex flex-wrap items-center gap-1 min-h-9 w-full rounded-xs border border-control-border bg-background px-3 py-1 text-sm leading-5 cursor-pointer",
disabled && "opacity-50 cursor-not-allowed",
open && "border-accent"
)}
diff --git a/frontend/src/react/components/ui/input.tsx b/frontend/src/react/components/ui/input.tsx
index 326fa187a6..f2e8a6f0be 100644
--- a/frontend/src/react/components/ui/input.tsx
+++ b/frontend/src/react/components/ui/input.tsx
@@ -1,21 +1,39 @@
import { Input as BaseInput } from "@base-ui/react/input";
+import { cva, type VariantProps } from "class-variance-authority";
import type { ComponentProps } from "react";
import { cn } from "@/react/lib/utils";
-type InputProps = ComponentProps<"input">;
+const inputVariants = cva(
+ cn(
+ "flex w-full rounded-xs border border-control-border bg-transparent text-main transition-colors",
+ "placeholder:text-control-placeholder",
+ "focus:outline-hidden",
+ "disabled:cursor-not-allowed disabled:bg-control-bg disabled:opacity-50",
+ "read-only:cursor-default read-only:bg-control-bg read-only:focus:ring-0 read-only:focus:border-control-border"
+ ),
+ {
+ variants: {
+ size: {
+ xs: "h-6 px-2 text-xs leading-4",
+ sm: "h-8 px-3 text-xs leading-4",
+ md: "h-9 px-3 text-sm leading-5",
+ lg: "h-10 px-3 text-sm leading-5",
+ },
+ },
+ defaultVariants: {
+ size: "md",
+ },
+ }
+);
-function Input({ className, ref, ...props }: InputProps) {
+type InputProps = Omit<ComponentProps<"input">, "size"> &
+ VariantProps<typeof inputVariants>;
+
+function Input({ className, size, ref, ...props }: InputProps) {
return (
<BaseInput
ref={ref}
- className={cn(
- "flex h-9 w-full rounded-xs border border-control-border bg-transparent px-3 py-1 text-sm text-main transition-colors",
- "placeholder:text-control-placeholder",
- "focus:outline-hidden",
- "disabled:cursor-not-allowed disabled:bg-control-bg disabled:opacity-50",
- "read-only:cursor-default read-only:bg-control-bg read-only:focus:ring-0 read-only:focus:border-control-border",
- className
- )}
+ className={cn(inputVariants({ size }), className)}
{...props}
/>
);
diff --git a/frontend/src/react/components/ui/search-input.tsx b/frontend/src/react/components/ui/search-input.tsx
index 9f04446e33..0e8d24d5d5 100644
--- a/frontend/src/react/components/ui/search-input.tsx
+++ b/frontend/src/react/components/ui/search-input.tsx
@@ -21,7 +21,7 @@ export const SearchInput = forwardRef<HTMLInputElement, SearchInputProps>(
<Search className="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
<Input
ref={ref}
- className={cn("h-9 text-sm pl-8", className)}
+ className={cn("pl-8", className)}
placeholder={placeholder ?? t("common.type-to-search")}
{...props}
/>
diff --git a/frontend/src/react/components/ui/select.tsx b/frontend/src/react/components/ui/select.tsx
index 2e14c4007e..23335931fc 100644
--- a/frontend/src/react/components/ui/select.tsx
+++ b/frontend/src/react/components/ui/select.tsx
@@ -1,4 +1,5 @@
import { Select as BaseSelect } from "@base-ui/react/select";
+import { cva, type VariantProps } from "class-variance-authority";
import { Check, ChevronDown } from "lucide-react";
import type { ComponentProps } from "react";
import { cn } from "@/react/lib/utils";
@@ -8,21 +9,41 @@ import { getLayerRoot, LAYER_SURFACE_CLASS } from "./layer";
const Select = BaseSelect.Root;
// ---- Trigger ----
+const selectTriggerVariants = cva(
+ cn(
+ "inline-flex items-center justify-between gap-1 rounded-xs border border-control-border bg-background text-control whitespace-nowrap",
+ "hover:bg-control-bg focus:outline-hidden focus-visible:ring-2 focus-visible:ring-accent",
+ "disabled:pointer-events-none disabled:opacity-50"
+ ),
+ {
+ variants: {
+ size: {
+ xs: "h-6 px-2 text-xs leading-4",
+ sm: "h-8 px-3 text-xs leading-4",
+ md: "h-9 px-3 text-sm leading-5",
+ lg: "h-10 px-3 text-sm leading-5",
+ },
+ },
+ defaultVariants: {
+ size: "md",
+ },
+ }
+);
+
+type SelectTriggerProps = ComponentProps<typeof BaseSelect.Trigger> &
+ VariantProps<typeof selectTriggerVariants>;
+
function SelectTrigger({
className,
children,
ref,
+ size,
...props
-}: ComponentProps<typeof BaseSelect.Trigger>) {
+}: SelectTriggerProps) {
return (
<BaseSelect.Trigger
ref={ref}
- className={cn(
- "inline-flex items-center justify-between gap-1 h-8 px-2 text-sm rounded-xs border border-control-border bg-background text-control whitespace-nowrap",
- "hover:bg-control-bg focus:outline-hidden focus-visible:ring-2 focus-visible:ring-accent",
- "disabled:pointer-events-none disabled:opacity-50",
- className
- )}
+ className={cn(selectTriggerVariants({ size }), className)}
{...props}
>
{children}
diff --git a/frontend/src/react/components/ui/switch.tsx b/frontend/src/react/components/ui/switch.tsx
index 4b18c1cae3..3f83a2aa78 100644
--- a/frontend/src/react/components/ui/switch.tsx
+++ b/frontend/src/react/components/ui/switch.tsx
@@ -1,12 +1,33 @@
import { Switch as BaseSwitch } from "@base-ui/react/switch";
import { cn } from "@/react/lib/utils";
+type SwitchSize = "xs" | "sm" | "md" | "lg";
+
+const SWITCH_SIZES: Record<SwitchSize, { root: string; thumb: string }> = {
+ xs: {
+ root: "h-3 w-5",
+ thumb: "h-2 w-2 translate-x-0.5 data-[checked]:translate-x-[10px]",
+ },
+ sm: {
+ root: "h-4 w-7",
+ thumb: "h-3 w-3 translate-x-0.5 data-[checked]:translate-x-[14px]",
+ },
+ md: {
+ root: "h-5 w-9",
+ thumb: "h-4 w-4 translate-x-0.5 data-[checked]:translate-x-[18px]",
+ },
+ lg: {
+ root: "h-6 w-11",
+ thumb: "h-5 w-5 translate-x-0.5 data-[checked]:translate-x-[22px]",
+ },
+};
+
interface SwitchProps {
checked: boolean;
onCheckedChange: (checked: boolean) => void;
disabled?: boolean;
className?: string;
- size?: "default" | "small";
+ size?: SwitchSize;
}
function Switch({
@@ -14,9 +35,9 @@ function Switch({
onCheckedChange,
disabled,
className,
- size = "default",
+ size = "md",
}: SwitchProps) {
- const isSmall = size === "small";
+ const sizeClasses = SWITCH_SIZES[size];
return (
<BaseSwitch.Root
@@ -25,7 +46,7 @@ function Switch({
disabled={disabled}
className={cn(
"relative inline-flex cursor-pointer items-center rounded-full transition-colors",
- isSmall ? "h-4 w-7" : "h-5 w-9",
+ sizeClasses.root,
"bg-control-border data-[checked]:bg-accent",
"focus:outline-hidden focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2",
"disabled:cursor-not-allowed disabled:opacity-50",
@@ -35,9 +56,7 @@ function Switch({
<BaseSwitch.Thumb
className={cn(
"block rounded-full bg-background shadow-sm transition-transform",
- isSmall
- ? "h-3 w-3 translate-x-0.5 data-[checked]:translate-x-[12px]"
- : "h-4 w-4 translate-x-0.5 data-[checked]:translate-x-[18px]"
+ sizeClasses.thumb
)}
/>
</BaseSwitch.Root>
diff --git a/frontend/src/react/components/ui/textarea.tsx b/frontend/src/react/components/ui/textarea.tsx
index 9980dd157f..9d82a79217 100644
--- a/frontend/src/react/components/ui/textarea.tsx
+++ b/frontend/src/react/components/ui/textarea.tsx
@@ -1,19 +1,37 @@
+import { cva, type VariantProps } from "class-variance-authority";
import type { ComponentProps } from "react";
import { cn } from "@/react/lib/utils";
-type TextareaProps = ComponentProps<"textarea">;
+const textareaVariants = cva(
+ cn(
+ "flex min-h-25 w-full rounded-xs border border-control-border bg-transparent text-main transition-colors",
+ "placeholder:text-control-placeholder",
+ "focus:outline-hidden focus:ring-1 focus:ring-accent focus:border-accent",
+ "disabled:cursor-not-allowed disabled:bg-control-bg disabled:opacity-50"
+ ),
+ {
+ variants: {
+ size: {
+ xs: "px-2 py-1 text-xs leading-4",
+ sm: "px-3 py-1.5 text-xs leading-4",
+ md: "px-3 py-2 text-sm leading-5",
+ lg: "px-3 py-2 text-sm leading-5",
+ },
+ },
+ defaultVariants: {
+ size: "md",
+ },
+ }
+);
-function Textarea({ className, ref, ...props }: TextareaProps) {
+type TextareaProps = Omit<ComponentProps<"textarea">, "size"> &
+ VariantProps<typeof textareaVariants>;
+
+function Textarea({ className, size, ref, ...props }: TextareaProps) {
return (
<textarea
ref={ref}
- className={cn(
- "flex min-h-25 w-full rounded-xs border border-control-border bg-transparent px-3 py-2 text-sm text-main transition-colors",
- "placeholder:text-control-placeholder",
- "focus:outline-hidden focus:ring-1 focus:ring-accent focus:border-accent",
- "disabled:cursor-not-allowed disabled:bg-control-bg disabled:opacity-50",
- className
- )}
+ className={cn(textareaVariants({ size }), className)}
{...props}
/>
);
diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.json
index a0aba0bb95..d60d769923 100644
--- a/frontend/src/react/locales/en-US.json
+++ b/frontend/src/react/locales/en-US.json
@@ -1084,7 +1084,6 @@
"details": "Access Grant Details",
"expired-at": "Expired at"
},
- "action-anyway": "{{action}} anyway",
"advanced-search": {
"filter": "Filter",
"scope": {
diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.json
index 474d43a2c8..a3cc6dd8f6 100644
--- a/frontend/src/react/locales/es-ES.json
+++ b/frontend/src/react/locales/es-ES.json
@@ -1084,7 +1084,6 @@
"details": "Access Grant Details",
"expired-at": "Expired at"
},
- "action-anyway": "{{action}} de todos modos",
"advanced-search": {
"filter": "Filtrar",
"scope": {
diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.json
index 2cd33d278b..e4609e1d78 100644
--- a/frontend/src/react/locales/ja-JP.json
+++ b/frontend/src/react/locales/ja-JP.json
@@ -1084,7 +1084,6 @@
"details": "Access Grant Details",
"expired-at": "Expired at"
},
- "action-anyway": "まだ {{action}} が必要です",
"advanced-search": {
"filter": "フィルター",
"scope": {
diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.json
index c13ce44bbe..166248508a 100644
--- a/frontend/src/react/locales/vi-VN.json
+++ b/frontend/src/react/locales/vi-VN.json
@@ -1084,7 +1084,6 @@
"details": "Access Grant Details",
"expired-at": "Expired at"
},
- "action-anyway": "{{action}} bằng mọi cách",
"advanced-search": {
"filter": "Bộ lọc",
"scope": {
diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.json
index 82b0dbe192..fdb4931966 100644
--- a/frontend/src/react/locales/zh-CN.json
+++ b/frontend/src/react/locales/zh-CN.json
@@ -144,7 +144,7 @@
"address": "地址",
"admin": "管理员",
"all": "全部",
- "approve": "Approve",
+ "approve": "批准",
"approved": "已批准",
"archive": "归档",
"archive-description": "将「{{name}}」标记为已归档且只读。",
@@ -260,7 +260,7 @@
"read-only": "只读",
"reason": "Reason",
"regenerate": "重新生成",
- "reject": "Reject",
+ "reject": "驳回",
"rejected": "已拒绝",
"release": "版本",
"reorder": "排序",
@@ -299,7 +299,7 @@
"state": "状态",
"statement": "语句",
"status": "状态",
- "submit": "Submit",
+ "submit": "提交",
"system": "系统",
"table": "表",
"title": "标题",
@@ -1084,7 +1084,6 @@
"details": "Access Grant Details",
"expired-at": "Expired at"
},
- "action-anyway": "仍要{{action}}",
"advanced-search": {
"filter": "过滤",
"scope": {
@@ -1223,14 +1222,14 @@
"upload-sql": "上传 SQL",
"waiting-approval": "等待审批"
},
- "issue.comment-editor.nothing-to-preview": "Nothing to preview",
- "issue.comment-editor.preview": "Preview",
- "issue.comment-editor.toolbar.bold": "Insert bold text",
- "issue.comment-editor.toolbar.code": "Insert SQL code snippet",
- "issue.comment-editor.toolbar.hashtag": "Insert hashtag",
- "issue.comment-editor.toolbar.header": "Insert heading text",
- "issue.comment-editor.toolbar.link": "Insert a link",
- "issue.comment-editor.write": "Write",
+ "issue.comment-editor.nothing-to-preview": "暂无预览",
+ "issue.comment-editor.preview": "预览",
+ "issue.comment-editor.toolbar.bold": "插入粗体文本",
+ "issue.comment-editor.toolbar.code": "插入 SQL 代码片段",
+ "issue.comment-editor.toolbar.hashtag": "通过 id 插入工单链接。请在\"#\"后填入工单 id",
+ "issue.comment-editor.toolbar.header": "插入标题",
+ "issue.comment-editor.toolbar.link": "插入链接",
+ "issue.comment-editor.write": "编辑",
"issue.data-export.format": "格式",
"issue.data-export.limits": "限制",
"issue.data-export.options": "选项",
diff --git a/frontend/src/react/pages/project/DatabaseChangelogDetailPage.tsx b/frontend/src/react/pages/project/DatabaseChangelogDetailPage.tsx
index 119449702e..14e70033fc 100644
--- a/frontend/src/react/pages/project/DatabaseChangelogDetailPage.tsx
+++ b/frontend/src/react/pages/project/DatabaseChangelogDetailPage.tsx
@@ -462,7 +462,7 @@ export function DatabaseChangelogDetailPage({
<Switch
checked={showDiff}
onCheckedChange={setShowDiff}
- size="small"
+ size="sm"
/>
<span className="text-sm font-semibold">
{t("changelog.show-diff")}
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
index 60111dfee0..14225ab5b8 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
@@ -3,12 +3,9 @@ import dayjs from "dayjs";
import { first, orderBy } from "lodash-es";
import {
CalendarX,
- Check,
ChevronDown,
EllipsisVertical,
Loader2,
- MessageCircle,
- X,
} from "lucide-react";
import {
type ReactNode,
@@ -65,7 +62,6 @@ import {
ListIssueCommentsRequestSchema,
RejectIssueRequestSchema,
} from "@/types/proto-es/v1/issue_service_pb";
-import { PlanCheckRun_Status } from "@/types/proto-es/v1/plan_service_pb";
import {
BatchRunTasksRequestSchema,
CreateRolloutRequestSchema,
@@ -451,7 +447,6 @@ export function IssueDetailActionBar() {
onClick={() => {
void router.push(planRoute);
}}
- size="sm"
variant="outline"
>
<span>#{extractPlanUID(page.plan.name)}</span>
@@ -505,7 +500,6 @@ export function IssueDetailActionBar() {
primaryAction && isActionDisabled(primaryAction)
)}
onClick={() => setMenuOpen((open) => !open)}
- size="sm"
variant="ghost"
>
<EllipsisVertical className="h-4 w-4" />
@@ -609,7 +603,6 @@ function IssueDetailReviewTrigger({
onClick={() => {
void onExecute(action.id);
}}
- size="sm"
variant={action.buttonType === "default" ? "outline" : "default"}
>
{loading && <Loader2 className="h-4 w-4 animate-spin" />}
@@ -669,7 +662,6 @@ function IssueDetailActionButton({
onClick={() => {
void onExecute(action.id);
}}
- size="sm"
variant={action.buttonType === "default" ? "outline" : "default"}
>
{loading && <Loader2 className="h-4 w-4 animate-spin" />}
@@ -709,14 +701,10 @@ function IssueDetailConfirmDialog({
<DialogTitle>{label}</DialogTitle>
<div className="mt-3 text-sm text-control-light">{content}</div>
<div className="mt-6 flex items-center justify-end gap-x-2">
- <Button
- onClick={() => onOpenChange(false)}
- size="sm"
- variant="ghost"
- >
+ <Button onClick={() => onOpenChange(false)} variant="ghost">
{t("common.cancel")}
</Button>
- <Button disabled={busy} onClick={onConfirm} size="sm">
+ <Button disabled={busy} onClick={onConfirm}>
{busy && <Loader2 className="h-4 w-4 animate-spin" />}
{label}
</Button>
@@ -752,61 +740,21 @@ function IssueDetailReviewPopover({
const [selectedAction, setSelectedAction] = useState<
"COMMENT" | "APPROVE" | "REJECT"
>("COMMENT");
- const [performActionAnyway, setPerformActionAnyway] = useState(false);
const issue = page.issue;
- const planCheckWarnings = useMemo(() => {
- const warnings: string[] = [];
- for (const run of page.planCheckRuns) {
- if (run.status === PlanCheckRun_Status.FAILED) {
- warnings.push(
- t(
- "custom-approval.issue-review.disallow-approve-reason.some-task-checks-didnt-pass"
- )
- );
- break;
- }
- }
- for (const run of page.planCheckRuns) {
- if (run.status === PlanCheckRun_Status.RUNNING) {
- warnings.push(
- t(
- "custom-approval.issue-review.disallow-approve-reason.some-task-checks-are-still-running"
- )
- );
- break;
- }
- }
- return warnings;
- }, [page.planCheckRuns, t]);
- const confirmErrors = useMemo(() => {
- if (
- selectedAction === "APPROVE" &&
- planCheckWarnings.length > 0 &&
- !performActionAnyway
- ) {
- return planCheckWarnings;
- }
- return [];
- }, [comment, performActionAnyway, planCheckWarnings, selectedAction, t]);
const submitDisabled =
- loading ||
- (selectedAction === "COMMENT" && comment.trim().length === 0) ||
- (selectedAction === "APPROVE" &&
- planCheckWarnings.length > 0 &&
- !performActionAnyway);
+ loading || (selectedAction === "COMMENT" && comment.trim().length === 0);
useEffect(() => {
if (!open) {
setComment("");
setSelectedAction("COMMENT");
- setPerformActionAnyway(false);
}
}, [open]);
useClickOutside(popoverRef, open && !mobile, () => onOpenChange(false));
const handleSubmit = useCallback(async () => {
- if (!issue || confirmErrors.length > 0) {
+ if (!issue) {
return;
}
@@ -871,13 +819,13 @@ function IssueDetailReviewPopover({
}
}, [
comment,
- confirmErrors.length,
issue,
issueCommentStore,
onOpenChange,
onRefreshIssueComments,
onRefreshState,
page.issueId,
+ page.patchState,
page.plan,
selectedAction,
t,
@@ -900,7 +848,6 @@ function IssueDetailReviewPopover({
<div className="flex flex-col gap-y-2.5">
<IssueDetailReviewOption
description={t("issue.review.comment-description")}
- icon={<MessageCircle className="mt-0.5 h-4 w-4 text-gray-600" />}
label={t("common.comment")}
onSelect={() => setSelectedAction("COMMENT")}
selected={selectedAction === "COMMENT"}
@@ -908,7 +855,6 @@ function IssueDetailReviewPopover({
{context.permissions.isApprovalCandidate && (
<IssueDetailReviewOption
description={t("issue.review.approve-description")}
- icon={<Check className="mt-0.5 h-4 w-4 text-green-600" />}
label={t("common.approve")}
onSelect={() => setSelectedAction("APPROVE")}
selected={selectedAction === "APPROVE"}
@@ -917,7 +863,6 @@ function IssueDetailReviewPopover({
{context.permissions.isApprovalCandidate && (
<IssueDetailReviewOption
description={t("issue.review.reject-description")}
- icon={<X className="mt-0.5 h-4 w-4 text-red-600" />}
label={t("common.reject")}
onSelect={() => setSelectedAction("REJECT")}
selected={selectedAction === "REJECT"}
@@ -925,29 +870,6 @@ function IssueDetailReviewPopover({
)}
</div>
- {selectedAction === "APPROVE" && planCheckWarnings.length > 0 && (
- <div className="rounded-xs border border-warning/30 bg-warning/5 px-4 py-3 text-sm text-warning">
- <ul className="list-inside list-disc">
- {planCheckWarnings.map((warning) => (
- <li key={warning}>{warning}</li>
- ))}
- </ul>
- <label className="mt-3 flex items-center gap-x-2 text-main">
- <input
- checked={performActionAnyway}
- className="h-4 w-4 rounded border-control-border"
- onChange={(e) => setPerformActionAnyway(e.target.checked)}
- type="checkbox"
- />
- <span className="text-sm">
- {t("issue.action-anyway", {
- action: t("common.approve"),
- })}
- </span>
- </label>
- </div>
- )}
-
<div className="flex items-center justify-start gap-x-2 pt-1">
<Button
disabled={submitDisabled}
@@ -994,13 +916,11 @@ function IssueDetailReviewPopover({
function IssueDetailReviewOption({
description,
- icon,
label,
onSelect,
selected,
}: {
description?: string;
- icon: ReactNode;
label: string;
onSelect: () => void;
selected: boolean;
@@ -1008,7 +928,7 @@ function IssueDetailReviewOption({
return (
<label
className={cn(
- "flex cursor-pointer items-start gap-3 rounded-xs px-0 py-0.5 text-left transition-colors",
+ "flex cursor-pointer items-start gap-3 text-left transition-colors",
selected ? "text-main" : "text-control"
)}
>
@@ -1018,13 +938,10 @@ function IssueDetailReviewOption({
onChange={onSelect}
type="radio"
/>
- <span className="mt-1 shrink-0">{icon}</span>
- <span className="flex flex-col gap-y-0.5">
+ <span className="flex flex-col">
<span className="text-sm font-medium leading-6">{label}</span>
{description && (
- <span className="text-sm leading-6 text-control-light">
- {description}
- </span>
+ <span className="text-xs text-control-light">{description}</span>
)}
</span>
</label>
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
index 16542b9091..58acb74d60 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
@@ -400,7 +400,7 @@ function IssueDetailDatabaseChangeOptions({
checked={transactionModeChecked}
disabled
onCheckedChange={() => {}}
- size="small"
+ size="sm"
/>
</div>
</Tooltip>
@@ -433,7 +433,7 @@ function IssueDetailDatabaseChangeOptions({
checked={preBackupEnabled}
disabled
onCheckedChange={() => {}}
- size="small"
+ size="sm"
/>
</div>
</div>
@@ -447,7 +447,7 @@ function IssueDetailDatabaseChangeOptions({
checked={ghostEnabled}
disabled
onCheckedChange={() => {}}
- size="small"
+ size="sm"
/>
</div>
</Tooltip>
@@ -478,7 +478,7 @@ function IssueDetailReadonlySelect({
onValueChange={() => {}}
value={value || EMPTY_SELECT_VALUE}
>
- <SelectTrigger className={cn("h-6 text-xs", widthClassName)}>
+ <SelectTrigger className={widthClassName} size="xs">
<SelectValue>
{options.find((option) => option.value === value)?.label ||
placeholder}
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseExportView.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseExportView.tsx
index f1246a5c29..e1da2f2c71 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseExportView.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseExportView.tsx
@@ -338,7 +338,7 @@ function IssueDetailDatabaseExportOptions() {
checked={encryptionEnabled}
disabled={!optionsEditable}
onCheckedChange={handlePasswordEnabledChange}
- size="small"
+ size="sm"
/>
</div>
{optionsEditable && encryptionEnabled && (
diff --git a/frontend/src/react/pages/settings/GroupsPage.tsx b/frontend/src/react/pages/settings/GroupsPage.tsx
index f2aad39cd4..9a8b548cca 100644
--- a/frontend/src/react/pages/settings/GroupsPage.tsx
+++ b/frontend/src/react/pages/settings/GroupsPage.tsx
@@ -833,7 +833,7 @@ function GroupForm({
}}
disabled={!allowEdit}
>
- <SelectTrigger className="h-9 w-36 shrink-0">
+ <SelectTrigger className="w-36 shrink-0">
<SelectValue>
{(value: GroupMember_Role | null) =>
value === GroupMember_Role.OWNER