Skip to content

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

refactor(frontend): eliminate UI guideline legacy debt (#21470)

ecmadaoab2002399fe8
diff --git a/frontend/AGENTS.md b/frontend/AGENTS.md
index 4df89c3a27..8fc3d2869e 100644
--- a/frontend/AGENTS.md
+++ b/frontend/AGENTS.md
@@ -19,9 +19,9 @@ This file provides additional guidance to AI coding assistants working under `./
- Follow [`../docs/agents/frontend-ux.md`](../docs/agents/frontend-ux.md) as the canonical source for foundations, page and sheet forms, sticky actions, dialogs, wizards, tables, pagination, selection, and responsive behavior.
- New shared UI and every UI element directly modified by a change MUST follow the guideline. Do not copy an adjacent legacy pattern merely because it is already present.
-- Existing feature violations in `scripts/ui-guideline-legacy-debt.json` are temporary incremental exceptions, not permission for new debt. A change may leave unrelated fingerprints in place, but MUST NOT add, mutate, or increase them.
+- Product UI must have no scanner violations. Existing code is not a design alternative to copy.
- Repeated measurements belong in `src/components/ui/styles.stylex.ts`; semantic colors belong in `src/assets/css/tailwind.css`; variants belong in the shared primitive's CVA definition.
-- Run `node frontend/scripts/check-ui-guideline.mjs` after UI work. When a change removes legacy debt, run `node frontend/scripts/check-ui-guideline.mjs --write-baseline`; the updater accepts reductions only.
+- Run `node frontend/scripts/check-ui-guideline.mjs` after UI work.
## Source ownership
diff --git a/frontend/scripts/check-ui-guideline.mjs b/frontend/scripts/check-ui-guideline.mjs
index 8cdfc4f1c5..8d5a48186b 100644
--- a/frontend/scripts/check-ui-guideline.mjs
+++ b/frontend/scripts/check-ui-guideline.mjs
@@ -1,14 +1,10 @@
// Enforces the objective subset of docs/agents/frontend-ux.md.
//
-// Existing feature debt is recorded as exact file/rule/token fingerprints in
-// ui-guideline-legacy-debt.json. Shared primitives cannot use debt exceptions.
// This is a conservative static scanner, not a complete Tailwind evaluator.
import {
- existsSync,
readFileSync,
readdirSync,
- writeFileSync,
} from "node:fs";
import { dirname, relative, resolve } from "node:path";
import { fileURLToPath } from "node:url";
@@ -18,32 +14,7 @@ import ts from "typescript-6";
const scriptDir = dirname(fileURLToPath(import.meta.url));
const frontendRoot = resolve(scriptDir, "..");
const sourceRoot = resolve(frontendRoot, "src");
-const baselinePath = resolve(scriptDir, "ui-guideline-legacy-debt.json");
const sharedPrimitivePrefix = "src/components/ui/";
-const baselineDescription =
- "Committed legacy UX debt. New or increased violations are rejected.";
-const baselineUpdateCommand =
- "node frontend/scripts/check-ui-guideline.mjs --write-baseline";
-const baselineRemovalCondition =
- "Delete this file and baseline handling after all violations are fixed.";
-
-const legacyRules = [
- "no-ad-hoc-sheet-width",
- "no-arbitrary-gap",
- "no-arbitrary-type",
- "no-manual-dark",
- "no-native-control",
- "no-raw-color",
- "no-space-between",
-];
-const enforcedRules = [
- ...legacyRules,
- "no-button-dimension-override",
- "no-literal-color",
- "no-off-scale-gap",
- "no-off-scale-radius",
- "no-raw-table",
-].sort();
const legacyIgnoredPrefixes = ["src/apps/explain-visualizer/"];
const generatedPrefixes = ["src/types/proto-es/"];
@@ -375,84 +346,6 @@ export function scanCssSource(source, path) {
return sortViolations(counts.values());
}
-const violationKey = ({ path, rule, token }) =>
- JSON.stringify([path, rule, token]);
-
-export function compareWithBaseline(violations, baseline) {
- if (
- ![1, 2].includes(baseline.version) ||
- !Array.isArray(baseline.violations) ||
- (baseline.version === 2 && !Array.isArray(baseline.rules))
- ) {
- return [{ kind: "invalid", rule: "baseline", token: "version" }];
- }
-
- const issues = [];
- const currentByKey = new Map();
- const baselineByKey = new Map();
-
- for (const violation of violations) {
- if (isSharedPrimitive(violation.path)) {
- issues.push({ kind: "shared", ...violation });
- continue;
- }
- currentByKey.set(violationKey(violation), violation);
- }
- for (const violation of baseline.violations) {
- if (!isSharedPrimitive(violation.path)) {
- baselineByKey.set(violationKey(violation), violation);
- }
- }
-
- for (const [key, violation] of currentByKey) {
- const expected = baselineByKey.get(key);
- if (!expected || expected.count !== violation.count) {
- issues.push({ kind: "new", ...violation });
- }
- }
- for (const [key, violation] of baselineByKey) {
- const current = currentByKey.get(key);
- if (!current || current.count !== violation.count) {
- issues.push({ kind: "stale", ...violation });
- }
- }
-
- return sortViolations(issues);
-}
-
-export function getBaselineUpdateIssues(violations, baseline) {
- if (
- ![1, 2].includes(baseline.version) ||
- !Array.isArray(baseline.violations) ||
- (baseline.version === 2 && !Array.isArray(baseline.rules))
- ) {
- return [{ kind: "invalid", rule: "baseline", token: "version" }];
- }
-
- const previouslyEnforcedRules = new Set(
- baseline.version === 1 ? legacyRules : baseline.rules
- );
-
- const expectedByKey = new Map(
- baseline.violations
- .filter((violation) => !isSharedPrimitive(violation.path))
- .map((violation) => [violationKey(violation), violation])
- );
- const issues = [];
- for (const violation of violations) {
- if (isSharedPrimitive(violation.path)) {
- issues.push({ kind: "shared", ...violation });
- continue;
- }
- if (!previouslyEnforcedRules.has(violation.rule)) continue;
- const expected = expectedByKey.get(violationKey(violation));
- if (!expected || violation.count > expected.count) {
- issues.push({ kind: "new", ...violation });
- }
- }
- return sortViolations(issues);
-}
-
const findSourceFiles = (directory) =>
readdirSync(directory, { withFileTypes: true }).flatMap((entry) => {
const path = resolve(directory, entry.name);
@@ -480,39 +373,9 @@ const printViolation = (violation) => {
};
const run = () => {
- const writeBaseline = process.argv.includes("--write-baseline");
const reportOnly = process.argv.includes("--report-only");
const violations = scanFrontend();
- if (writeBaseline) {
- const previousBaseline = existsSync(baselinePath)
- ? JSON.parse(readFileSync(baselinePath, "utf8"))
- : { version: 1, violations: [] };
- const updateIssues = existsSync(baselinePath)
- ? getBaselineUpdateIssues(violations, previousBaseline)
- : violations
- .filter((violation) => isSharedPrimitive(violation.path))
- .map((violation) => ({ kind: "shared", ...violation }));
- if (updateIssues.length > 0) {
- console.error(
- "The UI guideline baseline may only remove existing debt. Fix new and shared violations first:\n"
- );
- updateIssues.forEach(printViolation);
- process.exit(1);
- }
- const baseline = {
- description: baselineDescription,
- updateCommand: baselineUpdateCommand,
- removalCondition: baselineRemovalCondition,
- version: 2,
- rules: enforcedRules,
- violations,
- };
- writeFileSync(baselinePath, `${JSON.stringify(baseline, null, 2)}\n`);
- console.log(`Wrote ${violations.length} UI guideline fingerprints`);
- return;
- }
-
if (reportOnly) {
if (violations.length === 0) {
console.log("No UI guideline violations found");
@@ -523,33 +386,13 @@ const run = () => {
return;
}
- if (!existsSync(baselinePath)) {
- console.error(
- "UI guideline baseline is missing. Run with --write-baseline after fixing shared violations."
- );
- process.exit(1);
- }
-
- const baseline = JSON.parse(readFileSync(baselinePath, "utf8"));
- const issues = compareWithBaseline(violations, baseline);
- if (issues.length > 0) {
- console.error("UI guideline ratchet failed:\n");
- for (const issue of issues) {
- const prefix =
- issue.kind === "stale"
- ? "remove stale baseline"
- : issue.kind === "shared"
- ? "fix shared primitive"
- : issue.kind === "new"
- ? "new violation"
- : "invalid baseline";
- console.error(`${prefix}:`);
- printViolation(issue);
- }
+ if (violations.length > 0) {
+ console.error("UI guideline check failed:\n");
+ violations.forEach(printViolation);
process.exit(1);
}
- console.log(`UI guideline check passed (${violations.length} legacy fingerprints)`);
+ console.log("UI guideline check passed");
};
if (process.argv[1] && fileURLToPath(import.meta.url) === resolve(process.argv[1])) {
diff --git a/frontend/scripts/check-ui-guideline.test.mjs b/frontend/scripts/check-ui-guideline.test.mjs
deleted file mode 100644
index 09eef4d36d..0000000000
--- a/frontend/scripts/check-ui-guideline.test.mjs
+++ /dev/null
@@ -1,489 +0,0 @@
-// @vitest-environment node
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { describe, expect, test } from "vitest";
-import {
- compareWithBaseline,
- getBaselineUpdateIssues,
- isScannableSourcePath,
- scanCssSource,
- scanSource,
-} from "./check-ui-guideline.mjs";
-
-const FEATURE_FILE = "src/routes/project/Feature.tsx";
-const SHARED_FILE = "src/components/ui/control.tsx";
-
-describe("check-ui-guideline", () => {
- test("stores legacy debt as documented repository state", () => {
- const debtPath = join(import.meta.dirname, "ui-guideline-legacy-debt.json");
- const oldBaselinePath = join(import.meta.dirname, "ui-guideline-baseline.json");
-
- expect(existsSync(debtPath)).toBe(true);
- expect(existsSync(oldBaselinePath)).toBe(false);
-
- const debt = JSON.parse(readFileSync(debtPath, "utf8"));
- expect(debt.description).toBe(
- "Committed legacy UX debt. New or increased violations are rejected."
- );
- expect(debt.updateCommand).toBe(
- "node frontend/scripts/check-ui-guideline.mjs --write-baseline"
- );
- expect(debt.removalCondition).toBe(
- "Delete this file and baseline handling after all violations are fixed."
- );
- });
-
- test("scans product sources but not tests or generated declarations", () => {
- expect(isScannableSourcePath("src/routes/project/Feature.tsx")).toBe(true);
- expect(isScannableSourcePath("src/routes/project/Feature.test.tsx")).toBe(false);
- expect(isScannableSourcePath("src/routes/project/Feature.spec.ts")).toBe(false);
- expect(isScannableSourcePath("src/env.d.ts")).toBe(false);
- });
-
- test("allows semantic utilities and shared components", () => {
- const violations = scanSource(
- `
-import { Button } from "@/components/ui/button";
-
-export function Feature() {
- return (
- <div className="flex gap-x-2 bg-background text-control">
- <Button>Save</Button>
- </div>
- );
-}
-`,
- FEATURE_FILE
- );
-
- expect(violations).toEqual([]);
- });
-
- test("flags objective utility violations", () => {
- const violations = scanSource(
- `
-export function Feature() {
- return (
- <div className="space-x-2 bg-gray-100 dark:bg-gray-900 gap-[10px] text-[13px] leading-[18px]" />
- );
-}
-`,
- FEATURE_FILE
- );
-
- expect(violations).toEqual(
- expect.arrayContaining([
- expect.objectContaining({ rule: "no-space-between", token: "space-x-2" }),
- expect.objectContaining({ rule: "no-raw-color", token: "bg-gray-100" }),
- expect.objectContaining({ rule: "no-manual-dark", token: "dark:bg-gray-900" }),
- expect.objectContaining({ rule: "no-arbitrary-gap", token: "gap-[10px]" }),
- expect.objectContaining({ rule: "no-arbitrary-type", token: "text-[13px]" }),
- expect.objectContaining({ rule: "no-arbitrary-type", token: "leading-[18px]" }),
- ])
- );
- });
-
- test("flags spacing values outside the product scale", () => {
- const violations = scanSource(
- '<div className="gap-0 gap-1 gap-x-1.5 gap-y-2 gap-3 gap-4 gap-6 gap-8 gap-0.5 md:gap-x-5" />;',
- FEATURE_FILE
- );
-
- expect(violations).toEqual([
- expect.objectContaining({ rule: "no-off-scale-gap", token: "gap-0.5" }),
- expect.objectContaining({ rule: "no-off-scale-gap", token: "md:gap-x-5" }),
- ]);
- });
-
- test("flags radii outside the approved corner vocabulary", () => {
- const violations = scanSource(
- '<div className="rounded-none rounded-xs rounded-sm rounded-full rounded-t-none rounded-r-xs rounded-b-sm rounded-l-full rounded rounded-t rounded-md rounded-lg rounded-3xl md:rounded-t-lg hover:!rounded-lg rounded-[3px] rounded-[length:3px] rounded-(--card-radius)" />;',
- FEATURE_FILE
- );
-
- expect(violations).toEqual(
- expect.arrayContaining([
- expect.objectContaining({ rule: "no-off-scale-radius", token: "rounded" }),
- expect.objectContaining({ rule: "no-off-scale-radius", token: "rounded-t" }),
- expect.objectContaining({ rule: "no-off-scale-radius", token: "rounded-md" }),
- expect.objectContaining({ rule: "no-off-scale-radius", token: "rounded-lg" }),
- expect.objectContaining({ rule: "no-off-scale-radius", token: "rounded-3xl" }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "md:rounded-t-lg",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "rounded-[3px]",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "hover:!rounded-lg",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "rounded-[length:3px]",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "rounded-(--card-radius)",
- }),
- ])
- );
- expect(violations).toHaveLength(10);
- });
-
- test("flags inline React radius properties", () => {
- const violations = scanSource(
- `
-const styles = {
- borderRadius: "4px",
- borderTopLeftRadius: radius,
- "border-bottom-right-radius": "var(--radius-sm)",
- padding: "4px",
-};
-`,
- FEATURE_FILE
- );
-
- expect(violations).toEqual(
- expect.arrayContaining([
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "borderRadius",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "borderTopLeftRadius",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "border-bottom-right-radius",
- }),
- ])
- );
- expect(violations).toHaveLength(3);
- });
-
- test("flags shorthand inline React radius properties", () => {
- const violations = scanSource(
- `
-const borderRadius = "12px";
-const styles = { borderRadius };
-`,
- FEATURE_FILE
- );
-
- expect(violations).toEqual([
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "borderRadius",
- }),
- ]);
- });
-
- test("enforces the CSS radius vocabulary", () => {
- const violations = scanCssSource(
- `
-.allowed {
- border-radius: 0;
- border-top-left-radius: var(--radius-xs);
- border-top-right-radius: var(--radius-sm);
- border-bottom-radius: var(--radius-full);
-}
-.invalid {
- border-radius: 4px;
- border-top-left-radius: 50%;
- border-bottom-right-radius: 0 4px;
- border-bottom-left-radius: var(--card-radius);
- border-start-start-radius: var(--radius-md);
-}
-.utility {
- @apply rounded-sm rounded-lg;
-}
-`,
- "src/assets/css/example.css"
- );
-
- expect(violations).toEqual([
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "border-bottom-left-radius: var(--card-radius)",
- }),
- expect.objectContaining({
- path: "src/assets/css/example.css",
- rule: "no-off-scale-radius",
- token: "border-bottom-right-radius: 0 4px",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "border-radius: 4px",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "border-start-start-radius: var(--radius-md)",
- }),
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "border-top-left-radius: 50%",
- }),
- expect.objectContaining({ rule: "no-off-scale-radius", token: "rounded-lg" }),
- ]);
- });
-
- test("enforces radius in legacy adapters but still ignores generated code", () => {
- const source = '<div className="rounded-lg bg-gray-100" />;';
-
- expect(
- scanSource(source, "src/apps/explain-visualizer/Feature.tsx")
- ).toEqual([
- expect.objectContaining({
- rule: "no-off-scale-radius",
- token: "rounded-lg",
- }),
- ]);
- expect(scanSource(source, "src/types/proto-es/generated.ts")).toEqual([]);
- });
-
- test("allows intrinsic and responsive Button sizing but flags fixed dimension overrides", () => {
- const violations = scanSource(
- `
-export function Feature() {
- return (
- <>
- <Button appearance="link" className="h-auto p-0" />
- <Button className="h-auto px-2 py-1" />
- <Button
- className={cn(
- "h-8",
- compact ? "md:size-7" : "",
- "hover:h-9 2xl:h-9 max-xl:size-7"
- )}
- />
- </>
- );
-}
-`,
- FEATURE_FILE
- );
-
- expect(violations).toEqual([
- expect.objectContaining({
- rule: "no-button-dimension-override",
- token: "h-8",
- }),
- expect.objectContaining({
- rule: "no-button-dimension-override",
- token: "hover:h-9",
- }),
- ]);
- });
-
- test("flags raw feature tables but allows the shared table owner", () => {
- const source = '<table><tbody><tr><td>Value</td></tr></tbody></table>;';
-
- expect(scanSource(source, FEATURE_FILE)).toEqual([
- expect.objectContaining({ rule: "no-raw-table", token: "table" }),
- ]);
- expect(scanSource(source, "src/components/ui/table.tsx")).toEqual([]);
- });
-
- test("flags literal colors assigned to CSS color properties", () => {
- const violations = scanSource(
- `
-const direct = { backgroundColor: "#3B82F6" };
-const fixed = { color: "hsl(220, 55%, 55%)" };
-const dynamicDataColor = { color: \`hsl(\${hue}, 55%, 55%)\` };
-const camelCase = { borderTopColor: "rgb(1 2 3)" };
-const semantic = { borderColor: "rgb(var(--color-control-border))" };
-const data = { color: colorToHex("#4f46e5") };
-`,
- FEATURE_FILE
- );
-
- expect(violations).toEqual([
- expect.objectContaining({ rule: "no-literal-color", token: "#3B82F6" }),
- expect.objectContaining({
- rule: "no-literal-color",
- token: "hsl(",
- count: 1,
- }),
- expect.objectContaining({ rule: "no-literal-color", token: "rgb(" }),
- ]);
- });
-
- test("scans static portions of template expressions", () => {
- const violations = scanSource(
- 'const classes = `flex ${compact ? "gap-1" : "gap-2"} bg-gray-100`;',
- FEATURE_FILE
- );
-
- expect(violations).toEqual([
- expect.objectContaining({ rule: "no-raw-color", token: "bg-gray-100" }),
- ]);
- });
-
- test("flags native feature controls but allows primitive owners", () => {
- const source = `
-export function Control() {
- return <button><input /><select /><textarea /></button>;
-}
-`;
-
- expect(scanSource(source, FEATURE_FILE)).toEqual(
- expect.arrayContaining([
- expect.objectContaining({ rule: "no-native-control", token: "button" }),
- expect.objectContaining({ rule: "no-native-control", token: "input" }),
- expect.objectContaining({ rule: "no-native-control", token: "select" }),
- expect.objectContaining({ rule: "no-native-control", token: "textarea" }),
- ])
- );
- expect(scanSource(source, SHARED_FILE)).toEqual([]);
- });
-
- test("flags ad hoc SheetContent widths", () => {
- const source = `
-export function Feature() {
- return <SheetContent className="w-[42rem] max-w-4xl" />;
-}
-`;
-
- expect(scanSource(source, FEATURE_FILE)).toEqual(
- expect.arrayContaining([
- expect.objectContaining({
- rule: "no-ad-hoc-sheet-width",
- token: "w-[42rem]",
- }),
- expect.objectContaining({
- rule: "no-ad-hoc-sheet-width",
- token: "max-w-4xl",
- }),
- ])
- );
- expect(
- scanSource('<SheetContent width="wide" />;', FEATURE_FILE)
- ).toEqual([]);
- });
-
- test("accepts exact legacy fingerprints", () => {
- const violations = scanSource(
- '<div className="space-x-2 bg-gray-100" />;',
- FEATURE_FILE
- );
- const baseline = { version: 1, violations };
-
- expect(compareWithBaseline(violations, baseline)).toEqual([]);
- });
-
- test("rejects new and changed fingerprints", () => {
- const baselineViolations = scanSource(
- '<div className="space-x-2" />;',
- FEATURE_FILE
- );
- const currentViolations = scanSource(
- '<div className="space-x-4" />;',
- FEATURE_FILE
- );
-
- expect(
- compareWithBaseline(currentViolations, {
- version: 1,
- violations: baselineViolations,
- })
- ).toEqual(
- expect.arrayContaining([
- expect.objectContaining({ kind: "new", token: "space-x-4" }),
- expect.objectContaining({ kind: "stale", token: "space-x-2" }),
- ])
- );
- });
-
- test("rejects stale baseline entries after debt is removed", () => {
- const baselineViolations = scanSource(
- '<div className="space-x-2" />;',
- FEATURE_FILE
- );
-
- expect(
- compareWithBaseline([], { version: 1, violations: baselineViolations })
- ).toEqual([
- expect.objectContaining({ kind: "stale", token: "space-x-2" }),
- ]);
- });
-
- test("rejects baseline exceptions for shared primitives", () => {
- const sharedViolation = {
- path: SHARED_FILE,
- rule: "no-raw-color",
- token: "bg-gray-100",
- count: 1,
- };
-
- expect(
- compareWithBaseline([sharedViolation], {
- version: 1,
- violations: [sharedViolation],
- })
- ).toEqual([
- expect.objectContaining({ kind: "shared", token: "bg-gray-100" }),
- ]);
- });
-
- test("allows baseline updates only when debt shrinks", () => {
- const oldViolations = scanSource(
- '<div className="space-x-2 space-x-2 bg-gray-100" />;',
- FEATURE_FILE
- );
- const reducedViolations = scanSource(
- '<div className="space-x-2" />;',
- FEATURE_FILE
- );
-
- expect(
- getBaselineUpdateIssues(reducedViolations, {
- version: 1,
- violations: oldViolations,
- })
- ).toEqual([]);
- expect(
- getBaselineUpdateIssues(
- scanSource('<div className="space-x-4" />;', FEATURE_FILE),
- { version: 1, violations: oldViolations }
- )
- ).toEqual([
- expect.objectContaining({ kind: "new", token: "space-x-4" }),
- ]);
- });
-
- test("allows baseline updates to record only newly enforced rules", () => {
- const oldViolation = {
- path: FEATURE_FILE,
- rule: "no-space-between",
- token: "space-x-2",
- count: 1,
- };
- const newRuleViolation = {
- path: FEATURE_FILE,
- rule: "no-raw-table",
- token: "table",
- count: 1,
- };
- const baseline = {
- version: 2,
- rules: ["no-space-between"],
- violations: [oldViolation],
- };
-
- expect(
- getBaselineUpdateIssues([oldViolation, newRuleViolation], baseline)
- ).toEqual([]);
- expect(
- getBaselineUpdateIssues(
- [{ ...oldViolation, count: 2 }, newRuleViolation],
- baseline
- )
- ).toEqual([
- expect.objectContaining({ kind: "new", rule: "no-space-between" }),
- ]);
- });
-});
diff --git a/frontend/scripts/ui-guideline-legacy-debt.json b/frontend/scripts/ui-guideline-legacy-debt.json
deleted file mode 100644
index 73ea153f1a..0000000000
--- a/frontend/scripts/ui-guideline-legacy-debt.json
+++ /dev/null
@@ -1,778 +0,0 @@
-{
- "description": "Committed legacy UX debt. New or increased violations are rejected.",
- "updateCommand": "node frontend/scripts/check-ui-guideline.mjs --write-baseline",
- "removalCondition": "Delete this file and baseline handling after all violations are fixed.",
- "version": 2,
- "rules": [
- "no-ad-hoc-sheet-width",
- "no-arbitrary-gap",
- "no-arbitrary-type",
- "no-button-dimension-override",
- "no-literal-color",
- "no-manual-dark",
- "no-native-control",
- "no-off-scale-gap",
- "no-off-scale-radius",
- "no-raw-color",
- "no-raw-table",
- "no-space-between"
- ],
- "violations": [
- {
- "path": "src/app/components/SessionExpiredSurface.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/AccountMultiSelect.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/AdvancedSearch.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/components/AdvancedSearch.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/components/AuditLogTable.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/auth/EmailCodeSigninForm.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/auth/PasswordSigninForm.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/BannersWrapper.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/CreateWorkloadIdentitySheet.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/CustomApproval/RulesSection.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/components/DashboardBodyShell.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/database/LabelEditorSheet.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/DatabaseGroupDataTable.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/DatabaseResourceSelector.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 6
- },
- {
- "path": "src/components/ExprEditor.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 12
- },
- {
- "path": "src/components/ExprEditor.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/components/ExprEditor.tsx",
- "rule": "no-native-control",
- "token": "textarea",
- "count": 1
- },
- {
- "path": "src/components/header/DashboardHeader.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/header/HeaderBreadcrumb.tsx",
- "rule": "no-button-dimension-override",
- "token": "size-6",
- "count": 1
- },
- {
- "path": "src/components/header/HeaderBreadcrumb.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/components/header/ProfileMenuTrigger.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/instance/CreateDataSourceExample.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/instance/DataSourceForm.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/components/instance/DataSourceSection.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 4
- },
- {
- "path": "src/components/instance/InfoPanel.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/InstanceAssignmentSheet.tsx",
- "rule": "no-raw-table",
- "token": "table",
- "count": 1
- },
- {
- "path": "src/components/IssueLabelSelect.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/IssueTable.tsx",
- "rule": "no-native-control",
- "token": "textarea",
- "count": 1
- },
- {
- "path": "src/components/LabelListEditor.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/MarkdownEditor/MarkdownEditor.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/MatchedDatabaseView.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/components/MaxRowCountSelect.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/MaxRowCountSelect.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/components/plan-check/PlanCheckSection.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 3
- },
- {
- "path": "src/components/ResourceIdField.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/sql-review/Panels.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/sql-review/RuleComponents.tsx",
- "rule": "no-button-dimension-override",
- "token": "size-4",
- "count": 1
- },
- {
- "path": "src/components/sql-review/RuleComponents.tsx",
- "rule": "no-native-control",
- "token": "select",
- "count": 1
- },
- {
- "path": "src/components/sql-review/RuleTable.tsx",
- "rule": "no-button-dimension-override",
- "token": "size-7",
- "count": 4
- },
- {
- "path": "src/components/sql-review/RuleTable.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/components/sql-review/TemplateSelector.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/modules/agent/components/AgentChat.tsx",
- "rule": "no-raw-table",
- "token": "table",
- "count": 1
- },
- {
- "path": "src/modules/agent/components/AgentInput.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-[34px]",
- "count": 2
- },
- {
- "path": "src/modules/agent/components/AgentInput.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 5
- },
- {
- "path": "src/modules/agent/components/AgentInput.tsx",
- "rule": "no-native-control",
- "token": "textarea",
- "count": 1
- },
- {
- "path": "src/modules/agent/components/AgentWindow.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 7
- },
- {
- "path": "src/modules/ai/components/ChatView/ChatView.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/ai/components/ChatView/Markdown/CodeBlock.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/modules/ai/components/DynamicSuggestions.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-[22px]",
- "count": 3
- },
- {
- "path": "src/modules/ai/components/PromptInput.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-6",
- "count": 1
- },
- {
- "path": "src/modules/ai/components/PromptInput.tsx",
- "rule": "no-native-control",
- "token": "textarea",
- "count": 1
- },
- {
- "path": "src/modules/schema-diagram/common/FocusButton.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/schema-diagram/ER/TableNode.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/schema-diagram/ER/TableNode.tsx",
- "rule": "no-raw-table",
- "token": "table",
- "count": 1
- },
- {
- "path": "src/modules/schema-diagram/Navigator/Navigator.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/schema-editor/Panels/PreviewPane.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/schema-editor/Panels/TableColumnEditor/DataTypeCell.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/schema-editor/TabsContainer.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/ConnectChooser.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-7",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/ConnectChooser.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/ConnectionPane/ConnectionPane.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/modules/sql-editor/components/ConnectionPane/DatabaseGroupTag.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/FolderForm.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/HistorySearchInput.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/HistorySearchInput.tsx",
- "rule": "no-native-control",
- "token": "textarea",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/Panels/common/PanelSearchBox.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/ResultPanel/BatchQuerySelect.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-7",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/ResultPanel/BatchQuerySelect.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/ResultView/SelectionCopyTooltips.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-6",
- "count": 3
- },
- {
- "path": "src/modules/sql-editor/components/ResultView/VirtualDataTable.tsx",
- "rule": "no-button-dimension-override",
- "token": "size-6",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/ResultView/VirtualDataTable.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/SchemaPane/SchemaContextMenu.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/SharePopoverBody.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-full",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/SharePopoverBody.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/SQLEditorHomePage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/StandardPanel/SQLUploadButton.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-7",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/StandardPanel/SQLUploadButton.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/TabItem/Label.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/TabList.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/modules/sql-editor/components/TerminalPanel/TerminalPanel.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/auth/MultiFactorPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/routes/auth/OAuth2ConsentPage.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 7
- },
- {
- "path": "src/routes/auth/PasswordResetPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/project/database-detail/DatabaseDetailHeader.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/project/database-detail/overview/TableDetailSheet.tsx",
- "rule": "no-raw-table",
- "token": "table",
- "count": 2
- },
- {
- "path": "src/routes/project/database-detail/revision/ImportRevisionSheet.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/project/database-detail/revision/ImportRevisionSheet.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/project/database-detail/revision/ImportRevisionSheet.tsx",
- "rule": "no-native-control",
- "token": "select",
- "count": 1
- },
- {
- "path": "src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 3
- },
- {
- "path": "src/routes/project/issue-detail/components/IssueDetailLabels.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 3
- },
- {
- "path": "src/routes/project/issue-detail/components/IssueDetailStatementSection.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/project/issue-detail/components/IssueDetailTitleInput.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/project/plan-detail/components/deploy/DeployPendingTasksSection.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/project/plan-detail/components/deploy/DeployTaskFilter.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/project/plan-detail/components/deploy/DeployTaskHeader.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/routes/project/plan-detail/components/deploy/DeployTaskRunHistorySheet.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/project/plan-detail/components/lifecycle/PlanStatusAction.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 5
- },
- {
- "path": "src/routes/project/plan-detail/components/PlanDetailChangesBranch.tsx",
- "rule": "no-button-dimension-override",
- "token": "h-6",
- "count": 1
- },
- {
- "path": "src/routes/project/plan-detail/components/PlanDetailChangesBranch.tsx",
- "rule": "no-button-dimension-override",
- "token": "size-7",
- "count": 1
- },
- {
- "path": "src/routes/project/plan-detail/components/PlanDetailChangesBranch.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/routes/project/plan-detail/components/PlanDetailHeader.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/project/plan-detail/components/PlanDetailMeta.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 3
- },
- {
- "path": "src/routes/project/plan-detail/components/PlanDetailStatementSection.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/project/plan-detail/components/PlanDetailTabStrip.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/project/ProjectIssueDetailPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/project/ProjectPlanDashboardPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/routes/project/ProjectReleaseDashboardPage.tsx",
- "rule": "no-native-control",
- "token": "select",
- "count": 1
- },
- {
- "path": "src/routes/project/ProjectSettingsPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/routes/project/ProjectSettingsPage.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/project/ProjectSyncSchemaPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 11
- },
- {
- "path": "src/routes/project/ProjectSyncSchemaPage.tsx",
- "rule": "no-raw-table",
- "token": "table",
- "count": 1
- },
- {
- "path": "src/routes/workspace/EnvironmentsPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 4
- },
- {
- "path": "src/routes/workspace/EnvironmentsPage.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 2
- },
- {
- "path": "src/routes/workspace/general/BrandingSection.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/workspace/general/SecuritySection.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/workspace/GlobalMaskingPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 3
- },
- {
- "path": "src/routes/workspace/GroupsPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 1
- },
- {
- "path": "src/routes/workspace/GroupsPage.tsx",
- "rule": "no-native-control",
- "token": "select",
- "count": 1
- },
- {
- "path": "src/routes/workspace/MembersPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 3
- },
- {
- "path": "src/routes/workspace/MembersPage.tsx",
- "rule": "no-native-control",
- "token": "textarea",
- "count": 1
- },
- {
- "path": "src/routes/workspace/profile/UserPasswordSection.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/routes/workspace/RolesPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- },
- {
- "path": "src/routes/workspace/SemanticTypesPage.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 6
- },
- {
- "path": "src/routes/workspace/SemanticTypesPage.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/workspace/ServiceAccountsPage.tsx",
- "rule": "no-native-control",
- "token": "input",
- "count": 1
- },
- {
- "path": "src/routes/workspace/users/UserFormSheet.tsx",
- "rule": "no-native-control",
- "token": "button",
- "count": 2
- }
- ]
-}
diff --git a/frontend/src/app/components/SessionExpiredSurface.tsx b/frontend/src/app/components/SessionExpiredSurface.tsx
index 8f443065d9..a4a0092065 100644
--- a/frontend/src/app/components/SessionExpiredSurface.tsx
+++ b/frontend/src/app/components/SessionExpiredSurface.tsx
@@ -1,5 +1,6 @@
import { Dialog as BaseDialog } from "@base-ui/react/dialog";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import {
getLayerRoot,
LAYER_BACKDROP_CLASS,
@@ -17,13 +18,15 @@ export function SessionExpiredSurface({
const logoutFooter = (
<div className="mt-4 flex justify-center">
- <button
+ <Button
type="button"
- className="text-sm text-control-light hover:underline"
+ appearance="link"
+ size="xs"
+ className="h-auto p-0 text-sm text-control-light"
onClick={() => useAppStore.getState().logout()}
>
{t("common.logout")}
- </button>
+ </Button>
</div>
);
diff --git a/frontend/src/components/AccountMultiSelect.tsx b/frontend/src/components/AccountMultiSelect.tsx
index 6c9feb569b..b7bcf17543 100644
--- a/frontend/src/components/AccountMultiSelect.tsx
+++ b/frontend/src/components/AccountMultiSelect.tsx
@@ -2,6 +2,7 @@ import { Check, ChevronDown, KeyRound, Shield, Users, X } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { HighlightLabelText } from "@/components/HighlightLabelText";
+import { Button } from "@/components/ui/button";
import { LAYER_SURFACE_CLASS } from "@/components/ui/layer";
import { SearchInput } from "@/components/ui/search-input";
import { useCurrentUser } from "@/hooks/useAppState";
@@ -552,16 +553,19 @@ export function AccountMultiSelect({
>
{chipLabel(binding)}
{!disabled && (
- <button
+ <Button
type="button"
- className="hover:text-error"
+ appearance="secondary"
+ size="xs"
+ aria-label={t("common.remove")}
+ className="text-control-light hover:text-error"
onClick={(e) => {
e.stopPropagation();
remove(binding);
}}
>
<X className="h-3 w-3" />
- </button>
+ </Button>
)}
</span>
))}
diff --git a/frontend/src/components/AdvancedSearch.tsx b/frontend/src/components/AdvancedSearch.tsx
index f5afb6857e..8ee7d9bc84 100644
--- a/frontend/src/components/AdvancedSearch.tsx
+++ b/frontend/src/components/AdvancedSearch.tsx
@@ -2,6 +2,8 @@ import { Filter, X } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { HighlightLabelText } from "@/components/HighlightLabelText";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
import { LAYER_SURFACE_CLASS } from "@/components/ui/layer";
import { cn } from "@/lib/utils";
import { DEBOUNCE_SEARCH_DELAY } from "@/types/common";
@@ -713,15 +715,18 @@ export function AdvancedSearch({
>
{renderTagValue(scope)}
</span>
- <button
- className="ml-0.5 inline-flex size-4 shrink-0 items-center justify-center hover:text-error"
+ <Button
+ type="button"
+ appearance="secondary"
+ size="xs"
+ className="ml-0.5 shrink-0 hover:text-error"
onClick={(e) => {
e.stopPropagation();
removeScope(originalIndex);
}}
>
<X className="h-3 w-3" />
- </button>
+ </Button>
</span>
))}
</div>
@@ -752,7 +757,8 @@ export function AdvancedSearch({
* space, which is what made scope tags clip in panels like
* AccessPane.
*/}
- <input
+ <Input
+ size="xs"
ref={inputRef}
className={cn(
"flex-1 bg-transparent border-none px-2 text-sm text-main placeholder:text-control-placeholder focus:outline-none focus:border-none focus:ring-0 focus:shadow-none",
@@ -769,15 +775,18 @@ export function AdvancedSearch({
{/* Clear button */}
{clearable && (
- <button
- className="p-1.5 mr-1 hover:bg-control-bg rounded-full shrink-0"
+ <Button
+ type="button"
+ appearance="secondary"
+ size="xs"
+ className="mr-1 shrink-0 rounded-full hover:bg-control-bg"
onClick={(e) => {
e.stopPropagation();
handleClear();
}}
>
<X className="h-3 w-3 text-control-placeholder" />
- </button>
+ </Button>
)}
</div>
diff --git a/frontend/src/components/AuditLogTable.tsx b/frontend/src/components/AuditLogTable.tsx
index 017717f688..0007f7229d 100644
--- a/frontend/src/components/AuditLogTable.tsx
+++ b/frontend/src/components/AuditLogTable.tsx
@@ -319,13 +319,16 @@ function JSONStringView({ jsonString }: { jsonString: string }) {
<p className="line-clamp-2">
<code className="text-sm break-all">{jsonString}</code>
</p>
- <div className="hidden group-hover:block shrink-0 h-[22px]">
- <button
- className="p-0.5 border border-control-border rounded-xs hover:bg-control-bg"
+ <div className="hidden h-6 shrink-0 group-hover:block">
+ <Button
+ type="button"
+ appearance="outline"
+ size="xs"
+ aria-label={t("common.view-details")}
onClick={() => setShowModal(true)}
>
<Maximize2 className="size-3" />
- </button>
+ </Button>
</div>
</div>
{showModal && (
diff --git a/frontend/src/components/BannersWrapper.tsx b/frontend/src/components/BannersWrapper.tsx
index c0deb19fa2..36282cf09a 100644
--- a/frontend/src/components/BannersWrapper.tsx
+++ b/frontend/src/components/BannersWrapper.tsx
@@ -249,13 +249,15 @@ function BannerUpgradeSubscription() {
}}
components={{
neededPlan: (
- <button
+ <Button
type="button"
- className="mr-1 cursor-pointer whitespace-nowrap underline hover:opacity-60"
+ appearance="link"
+ size="xs"
+ className="mr-1 h-auto p-0 whitespace-nowrap text-sm text-main underline hover:opacity-60"
onClick={() => setShowModal(true)}
>
{neededPlanFeatures}
- </button>
+ </Button>
),
}}
/>
diff --git a/frontend/src/components/CreateWorkloadIdentitySheet.tsx b/frontend/src/components/CreateWorkloadIdentitySheet.tsx
index bb1cd67505..3d08eb1795 100644
--- a/frontend/src/components/CreateWorkloadIdentitySheet.tsx
+++ b/frontend/src/components/CreateWorkloadIdentitySheet.tsx
@@ -924,9 +924,11 @@ function WorkloadIdentityForm({
{/* Advanced Settings Toggle */}
{!isGenericOIDC && (
- <button
+ <Button
type="button"
- className="flex items-center gap-x-1 text-sm text-accent hover:underline w-fit"
+ appearance="link"
+ size="xs"
+ className="h-auto p-0 text-sm"
onClick={() => setShowAdvanced(!showAdvanced)}
>
{t("settings.members.workload-identity-advanced")}
@@ -935,7 +937,7 @@ function WorkloadIdentityForm({
) : (
<ChevronDown className="size-4" />
)}
- </button>
+ </Button>
)}
</div>
</SheetBody>
diff --git a/frontend/src/components/CustomApproval/RulesSection.tsx b/frontend/src/components/CustomApproval/RulesSection.tsx
index 105ef9fceb..969387f641 100644
--- a/frontend/src/components/CustomApproval/RulesSection.tsx
+++ b/frontend/src/components/CustomApproval/RulesSection.tsx
@@ -148,21 +148,25 @@ function SortableRow({
</div>
) : (
<>
- <button
+ <Button
type="button"
- className="inline-flex h-6 w-6 items-center justify-center rounded-xs hover:bg-control-bg-hover"
+ appearance="secondary"
+ size="xs"
+ className="hover:bg-control-bg-hover"
onClick={handleEditClick}
>
<Pencil className="h-3 w-3" />
- </button>
+ </Button>
{allowAdmin && (
- <button
+ <Button
type="button"
- className="inline-flex h-6 w-6 items-center justify-center rounded-xs hover:bg-control-bg-hover"
+ appearance="secondary"
+ size="xs"
+ className="hover:bg-control-bg-hover"
onClick={handleDeleteClick}
>
<Trash2 className="h-3 w-3" />
- </button>
+ </Button>
)}
</>
)}
diff --git a/frontend/src/components/DashboardBodyShell.tsx b/frontend/src/components/DashboardBodyShell.tsx
index f2a5c9a14e..7887e1cb38 100644
--- a/frontend/src/components/DashboardBodyShell.tsx
+++ b/frontend/src/components/DashboardBodyShell.tsx
@@ -7,6 +7,7 @@ import type {
} from "@/app/dashboard-shell";
import { MAIN_SCROLL_RESTORATION_ID } from "@/app/router/NavigationScrollRestoration";
import { DashboardHeader } from "@/components/header/DashboardHeader";
+import { Button } from "@/components/ui/button";
import { getLayerRoot, LAYER_SURFACE_CLASS } from "@/components/ui/layer";
import { cn } from "@/lib/utils";
@@ -56,10 +57,12 @@ export function DashboardBodyShell({
isMobileSidebarOpen ? "" : "pointer-events-none"
)}
>
- <button
+ <Button
aria-label={t("common.close-mobile-sidebar")}
+ appearance="secondary"
+ size="xs"
className={cn(
- "absolute inset-0 bg-overlay/20 transition-opacity",
+ "absolute inset-0 h-auto bg-overlay/20 transition-opacity hover:bg-overlay/20",
isMobileSidebarOpen ? "opacity-100" : "opacity-0"
)}
type="button"
diff --git a/frontend/src/components/DatabaseGroupDataTable.tsx b/frontend/src/components/DatabaseGroupDataTable.tsx
index 28fa492051..98de54d3d1 100644
--- a/frontend/src/components/DatabaseGroupDataTable.tsx
+++ b/frontend/src/components/DatabaseGroupDataTable.tsx
@@ -197,17 +197,19 @@ export function DatabaseGroupDataTable({
</TableCell>
{showExternalLink && (
<TableCell>
- <button
+ <Button
type="button"
+ appearance="secondary"
+ size="xs"
className={cn(
- "flex items-center justify-end cursor-pointer size-6 p-1 opacity-60",
+ "flex items-center justify-end opacity-60",
"hover:opacity-100 hover:bg-background hover:shadow-xs rounded-sm"
)}
onClick={(e) => handleExternalLink(e, group)}
aria-label={t("common.view-details")}
>
<ExternalLink className="size-4" />
- </button>
+ </Button>
</TableCell>
)}
{showActions && (
diff --git a/frontend/src/components/DatabaseResourceSelector.tsx b/frontend/src/components/DatabaseResourceSelector.tsx
index 1110a63715..8299affa76 100644
--- a/frontend/src/components/DatabaseResourceSelector.tsx
+++ b/frontend/src/components/DatabaseResourceSelector.tsx
@@ -16,6 +16,7 @@ import {
type ValueOption,
} from "@/components/AdvancedSearch";
import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
+import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { normalizeInstanceName } from "@/lib/resourceName";
import { useAppStore } from "@/stores/app";
@@ -887,7 +888,9 @@ export function DatabaseResourceSelector({
<div className="flex" style={{ height: "min(24rem, 60vh)" }}>
<div className="flex-1 flex flex-col border-r border-control-border min-w-0">
<div className="flex items-center justify-between px-3 py-1.5 bg-control-bg border-b border-control-border text-xs text-control-light">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-accent hover:underline cursor-pointer disabled:text-control-light disabled:no-underline disabled:cursor-not-allowed"
onClick={toggleSelectAll}
@@ -896,7 +899,7 @@ export function DatabaseResourceSelector({
{isAllSelected
? t("common.deselect-all")
: t("common.select-all")}
- </button>
+ </Button>
<span>
{nextPageToken
? `${databases.length}+`
@@ -916,9 +919,11 @@ export function DatabaseResourceSelector({
return (
<div key={db.name}>
<div className="flex items-center gap-x-1 px-2 py-1 hover:bg-control-bg group">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
- className="shrink-0 w-4 h-4 flex items-center justify-center text-control-light hover:text-control cursor-pointer"
+ className="shrink-0 flex items-center justify-center text-control-light hover:text-control cursor-pointer"
onClick={() => toggleExpandDatabase(db.name)}
>
{isExpanded ? (
@@ -926,7 +931,7 @@ export function DatabaseResourceSelector({
) : (
<ChevronRight className="w-3.5 h-3.5" />
)}
- </button>
+ </Button>
<Checkbox
className="shrink-0"
disabled={readonly}
@@ -978,9 +983,11 @@ export function DatabaseResourceSelector({
return (
<div key={schema.name}>
<div className="flex items-center gap-x-1 px-2 py-1 hover:bg-control-bg">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
- className="shrink-0 w-4 h-4 flex items-center justify-center text-control-light hover:text-control cursor-pointer"
+ className="shrink-0 flex items-center justify-center text-control-light hover:text-control cursor-pointer"
onClick={() =>
toggleExpandSchema(schemaKey)
}
@@ -990,7 +997,7 @@ export function DatabaseResourceSelector({
) : (
<ChevronRight className="w-3.5 h-3.5" />
)}
- </button>
+ </Button>
<Checkbox
className="shrink-0"
disabled={readonly}
@@ -1028,7 +1035,9 @@ export function DatabaseResourceSelector({
);
})}
{nextPageToken && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="w-full px-2 py-1.5 text-sm text-accent hover:underline cursor-pointer disabled:opacity-50 disabled:no-underline"
onClick={loadMore}
@@ -1037,7 +1046,7 @@ export function DatabaseResourceSelector({
{loadingMore
? `${t("common.loading")}...`
: t("common.load-more")}
- </button>
+ </Button>
)}
</div>
</div>
@@ -1062,13 +1071,15 @@ export function DatabaseResourceSelector({
>
<span className="flex-1 truncate">{resourceLabel(r)}</span>
{!readonly && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
- className="shrink-0 w-4 h-4 text-control-light hover:text-control opacity-0 group-hover:opacity-100 cursor-pointer"
+ className="shrink-0 text-control-light hover:text-control opacity-0 group-hover:opacity-100 cursor-pointer"
onClick={() => removeResource(r)}
>
<X className="w-3.5 h-3.5" />
- </button>
+ </Button>
)}
</div>
))}
@@ -1110,9 +1121,11 @@ function TableNode({
<div>
<div className="flex items-center gap-x-1 px-2 py-1 hover:bg-control-bg">
{includeColumns && columns.length > 0 ? (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
- className="shrink-0 w-4 h-4 flex items-center justify-center text-control-light hover:text-control cursor-pointer"
+ className="shrink-0 flex items-center justify-center text-control-light hover:text-control cursor-pointer"
onClick={onToggleExpand}
>
{expanded ? (
@@ -1120,7 +1133,7 @@ function TableNode({
) : (
<ChevronRight className="w-3.5 h-3.5" />
)}
- </button>
+ </Button>
) : (
<span className="shrink-0 w-4" />
)}
diff --git a/frontend/src/components/ExprEditor.test.tsx b/frontend/src/components/ExprEditor.test.tsx
index 7e53605d16..907072f7d0 100644
--- a/frontend/src/components/ExprEditor.test.tsx
+++ b/frontend/src/components/ExprEditor.test.tsx
@@ -202,8 +202,8 @@ describe("ExprEditor", () => {
await flushEffects();
const deleteButtons = Array.from(
- container.querySelectorAll('button[type="button"]')
- ).filter((button) => button.className.includes("size-7"));
+ container.querySelectorAll("svg.lucide-trash-2")
+ ).map((icon) => icon.closest("button"));
expect(deleteButtons).toHaveLength(2);
await act(async () => {
diff --git a/frontend/src/components/ExprEditor.tsx b/frontend/src/components/ExprEditor.tsx
index 35b7b37212..1e561c9755 100644
--- a/frontend/src/components/ExprEditor.tsx
+++ b/frontend/src/components/ExprEditor.tsx
@@ -14,6 +14,7 @@ import {
import { createPortal } from "react-dom";
import { useTranslation } from "react-i18next";
import { EnvironmentLabel } from "@/components/EnvironmentLabel";
+import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Input } from "@/components/ui/input";
import { getLayerRoot, LAYER_SURFACE_CLASS } from "@/components/ui/layer";
@@ -25,6 +26,7 @@ import {
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
+import { Textarea } from "@/components/ui/textarea";
import { Tooltip } from "@/components/ui/tooltip";
import { cn } from "@/lib/utils";
import type {
@@ -360,10 +362,12 @@ function SearchableSelect({
return (
<div className="min-w-28">
- <button
+ <Button
ref={triggerRef}
type="button"
- className="inline-flex h-9 w-full items-center rounded-xs border border-control-border bg-background px-3 text-left text-sm leading-5 text-control disabled:opacity-50"
+ appearance="outline"
+ size="md"
+ className="w-full bg-background text-left text-control"
disabled={disabled}
onClick={handleOpen}
>
@@ -374,7 +378,7 @@ function SearchableSelect({
</span>
)}
</span>
- </button>
+ </Button>
{open && (
<PortaledDropdown
anchorRef={triggerRef}
@@ -552,8 +556,10 @@ function MultiSearchableSelect({
>
{getLabelForValue(v)}
{!disabled && (
- <button
+ <Button
type="button"
+ appearance="secondary"
+ size="xs"
className="text-control-placeholder hover:text-control-light"
onMouseDown={(e) => {
e.stopPropagation();
@@ -561,7 +567,7 @@ function MultiSearchableSelect({
}}
>
<X className="size-3" />
- </button>
+ </Button>
)}
</span>
))}
@@ -670,18 +676,21 @@ function TagInput({
>
{tag}
{!disabled && (
- <button
+ <Button
type="button"
+ appearance="secondary"
+ size="xs"
className="text-control-placeholder hover:text-control-light"
onClick={() => removeTag(tag)}
>
<X className="size-3" />
- </button>
+ </Button>
)}
</span>
))}
{!disabled && (
- <input
+ <Input
+ size="xs"
className="flex-1 min-w-16 h-5 border-0 bg-transparent p-0 text-sm leading-5 shadow-none outline-none placeholder:text-control-placeholder focus:border-0 focus:ring-0"
placeholder={value.length === 0 ? (placeholder ?? "") : ""}
value={inputValue}
@@ -742,12 +751,14 @@ function MultiCheckSelect({
return (
<div className="min-w-32">
- <button
+ <Button
ref={triggerRef}
type="button"
+ appearance="secondary"
+ size="xs"
className={cn(
VALUE_MULTI_FIELD_CLASS,
- "inline-flex w-full flex-wrap items-center gap-1 text-left hover:bg-control-bg disabled:pointer-events-none disabled:opacity-50"
+ "h-auto w-full flex-wrap text-left hover:bg-control-bg disabled:pointer-events-none"
)}
disabled={disabled}
onClick={() => setOpen(!open)}
@@ -778,7 +789,7 @@ function MultiCheckSelect({
)}
</span>
))}
- </button>
+ </Button>
{open && (
<PortaledDropdown
anchorRef={triggerRef}
@@ -1234,9 +1245,11 @@ function ConditionRow({
/>
</div>
{!readonly && (
- <button
+ <Button
type="button"
- className="shrink-0 size-7 flex items-center justify-center rounded-xs text-control-placeholder hover:text-control hover:bg-control-bg"
+ appearance="secondary"
+ size="xs"
+ className="shrink-0 text-control-placeholder hover:text-control hover:bg-control-bg"
onClick={() =>
doUpdate((group) => {
group.args.splice(operandIndex, 1);
@@ -1244,7 +1257,7 @@ function ConditionRow({
}
>
<Trash2 className="size-3.5" />
- </button>
+ </Button>
)}
</div>
);
@@ -1268,7 +1281,8 @@ function RawStringEditor({
return (
<div className="w-full flex items-start gap-x-1">
- <textarea
+ <Textarea
+ size="xs"
className="flex-1 min-h-16 max-h-24 px-2 py-1 text-sm rounded-xs border border-control-border bg-background resize-y disabled:opacity-50"
placeholder="Enter raw CEL expression"
value={expr.content}
@@ -1283,9 +1297,11 @@ function RawStringEditor({
}}
/>
{!readonly && (
- <button
+ <Button
type="button"
- className="shrink-0 size-7 flex items-center justify-center rounded-xs text-control-placeholder hover:text-control hover:bg-control-bg"
+ appearance="secondary"
+ size="xs"
+ className="shrink-0 text-control-placeholder hover:text-control hover:bg-control-bg"
onClick={() =>
doUpdate((group) => {
group.args.splice(operandIndex, 1);
@@ -1293,7 +1309,7 @@ function RawStringEditor({
}
>
<Trash2 className="size-3.5" />
- </button>
+ </Button>
)}
</div>
);
@@ -1398,9 +1414,11 @@ function ConditionGroup({
</div>
{!readonly && (
<div className="flex items-center justify-end">
- <button
+ <Button
type="button"
- className="size-[22px] flex items-center justify-center rounded-xs hover:bg-control-bg"
+ appearance="secondary"
+ size="xs"
+ className="hover:bg-control-bg"
onClick={() =>
parentDoUpdate((group) => {
group.args.splice(operandIndex!, 1);
@@ -1408,7 +1426,7 @@ function ConditionGroup({
}
>
<Trash2 className="size-3.5" />
- </button>
+ </Button>
</div>
)}
</div>
@@ -1487,41 +1505,49 @@ function ConditionGroup({
{!root && (
<div className="pl-1.5 pb-1 flex gap-x-1">
- <button
+ <Button
type="button"
- className="inline-flex items-center gap-1 text-sm text-control-light px-1.5 py-0.5 rounded-xs hover:bg-control-bg disabled:opacity-50"
+ appearance="secondary"
+ size="xs"
+ className="h-auto px-1.5 py-0.5 text-sm text-control-light hover:bg-control-bg"
disabled={readonly}
onClick={addCondition}
>
<Plus className="size-4" />
{t("cel.condition.add")}
- </button>
- <button
+ </Button>
+ <Button
type="button"
- className="inline-flex items-center gap-1 text-sm text-control-light px-1.5 py-0.5 rounded-xs hover:bg-control-bg disabled:opacity-50"
+ appearance="secondary"
+ size="xs"
+ className="h-auto px-1.5 py-0.5 text-sm text-control-light hover:bg-control-bg"
disabled={readonly}
onClick={addRawString}
>
<Plus className="size-4" />
{t("cel.condition.add-raw-expression")}
- </button>
+ </Button>
</div>
)}
{root && (
<div className="flex gap-x-1">
- <button
+ <Button
type="button"
- className="inline-flex items-center gap-1 text-sm px-1.5 py-0.5 rounded-xs hover:bg-control-bg disabled:opacity-50"
+ appearance="secondary"
+ size="xs"
+ className="h-auto px-1.5 py-0.5 text-sm hover:bg-control-bg"
disabled={readonly}
onClick={addCondition}
>
<Plus className="size-4" />
{t("cel.condition.add")}
- </button>
- <button
+ </Button>
+ <Button
type="button"
- className="inline-flex items-center gap-1 text-sm px-1.5 py-0.5 rounded-xs hover:bg-control-bg disabled:opacity-50"
+ appearance="secondary"
+ size="xs"
+ className="h-auto px-1.5 py-0.5 text-sm hover:bg-control-bg"
disabled={readonly}
onClick={addConditionGroup}
>
@@ -1530,17 +1556,19 @@ function ConditionGroup({
<Tooltip content={t("cel.condition.group.tooltip")}>
<HelpCircle className="ml-1 size-3 text-control-placeholder" />
</Tooltip>
- </button>
+ </Button>
{enableRawExpression && (
- <button
+ <Button
type="button"
- className="inline-flex items-center gap-1 text-sm px-1.5 py-0.5 rounded-xs hover:bg-control-bg disabled:opacity-50"
+ appearance="secondary"
+ size="xs"
+ className="h-auto px-1.5 py-0.5 text-sm hover:bg-control-bg"
disabled={readonly}
onClick={addRawString}
>
<Plus className="size-4" />
{t("cel.condition.add-raw-expression")}
- </button>
+ </Button>
)}
</div>
)}
diff --git a/frontend/src/components/InstanceAssignmentSheet.tsx b/frontend/src/components/InstanceAssignmentSheet.tsx
index d7a26ea058..aa77435da3 100644
--- a/frontend/src/components/InstanceAssignmentSheet.tsx
+++ b/frontend/src/components/InstanceAssignmentSheet.tsx
@@ -16,6 +16,7 @@ import {
SheetHeader,
SheetTitle,
} from "@/components/ui/sheet";
+import { Table } from "@/components/ui/table";
import { useServerState, useSubscriptionState } from "@/hooks/useAppState";
import { PagedTableFooter } from "@/hooks/usePagedData";
import { pushNotification } from "@/stores";
@@ -245,7 +246,7 @@ export function InstanceAssignmentSheet({
</div>
<div className="overflow-x-auto rounded-sm border border-control-border">
- <table className="w-full min-w-[36rem] text-sm">
+ <Table className="min-w-[36rem]">
<thead>
<tr className="border-b border-control-border bg-control-bg text-left">
{canManageSubscription && <th className="w-12 px-4 py-2" />}
@@ -320,7 +321,7 @@ export function InstanceAssignmentSheet({
})
)}
</tbody>
- </table>
+ </Table>
</div>
<PagedTableFooter
diff --git a/frontend/src/components/IssueLabelSelect.tsx b/frontend/src/components/IssueLabelSelect.tsx
index 94d47f1808..f44a4ea65c 100644
--- a/frontend/src/components/IssueLabelSelect.tsx
+++ b/frontend/src/components/IssueLabelSelect.tsx
@@ -1,6 +1,7 @@
import { ChevronDown, X } from "lucide-react";
import { useState } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import {
Popover,
@@ -114,10 +115,12 @@ export function IssueLabelSelect({
labels.map((label) => {
const isSelected = selected.includes(label.value);
return (
- <button
+ <Button
key={label.value}
type="button"
- className="w-full text-left px-3 py-2 text-sm flex items-center gap-2 hover:bg-control-bg transition-colors"
+ appearance="secondary"
+ size="xs"
+ className="h-auto w-full px-3 py-2 text-left text-sm hover:bg-control-bg"
onClick={() => toggleLabel(label.value)}
>
<Checkbox checked={isSelected} />
@@ -126,7 +129,7 @@ export function IssueLabelSelect({
style={{ backgroundColor: getColor(label.color) }}
/>
<span>{label.value}</span>
- </button>
+ </Button>
);
})
)}
diff --git a/frontend/src/components/IssueTable.tsx b/frontend/src/components/IssueTable.tsx
index 1273df2dd3..b3d9a1cc4f 100644
--- a/frontend/src/components/IssueTable.tsx
+++ b/frontend/src/components/IssueTable.tsx
@@ -37,6 +37,7 @@ import {
SheetTitle,
} from "@/components/ui/sheet";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Textarea } from "@/components/ui/textarea";
import { Tooltip } from "@/components/ui/tooltip";
import { useCurrentUser } from "@/hooks/useAppState";
import { useEscapeKey } from "@/hooks/useEscapeKey";
@@ -1124,7 +1125,8 @@ export function BatchIssueStatusActionDrawer({
<div className="font-medium text-control">
{t("common.comment")}
</div>
- <textarea
+ <Textarea
+ size="md"
className="w-full border border-control-border rounded-sm px-3 py-2 text-sm focus:outline-none focus:border-accent min-h-[6rem] resize-y"
value={comment}
placeholder={t("issue.leave-a-comment")}
diff --git a/frontend/src/components/LabelListEditor.tsx b/frontend/src/components/LabelListEditor.tsx
index 099f9d4360..e0cd244028 100644
--- a/frontend/src/components/LabelListEditor.tsx
+++ b/frontend/src/components/LabelListEditor.tsx
@@ -159,14 +159,16 @@ export function LabelListEditor({
}
/>
)}
- <button
+ <Button
type="button"
+ appearance="secondary"
+ size="xs"
aria-label={t("common.delete")}
className={`ml-1 ${readonly ? "invisible" : "visible"} text-control-light hover:text-error`}
onClick={() => handleRemove(index)}
>
<Trash2 className="w-4 h-4" />
- </button>
+ </Button>
</div>
{kv.message && (
<div className="textinfolabel">{kv.message}</div>
diff --git a/frontend/src/components/MarkdownEditor/MarkdownEditor.tsx b/frontend/src/components/MarkdownEditor/MarkdownEditor.tsx
index 01b5f5d7fd..11429f1262 100644
--- a/frontend/src/components/MarkdownEditor/MarkdownEditor.tsx
+++ b/frontend/src/components/MarkdownEditor/MarkdownEditor.tsx
@@ -3,6 +3,7 @@ import { Bold, Code2, Hash, Heading1, Link2 } from "lucide-react";
import MarkdownIt from "markdown-it";
import { type ReactNode, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import { Tabs, TabsList, TabsPanel, TabsTrigger } from "@/components/ui/tabs";
import { Textarea } from "@/components/ui/textarea";
import "./MarkdownEditor.css";
@@ -273,15 +274,17 @@ function ToolbarButton({
onClick: () => void;
}) {
return (
- <button
+ <Button
aria-label={label}
- className="rounded-xs p-1 text-control transition-colors hover:bg-control-bg hover:text-main"
+ appearance="secondary"
+ size="xs"
+ className="text-control hover:bg-control-bg hover:text-main"
onClick={onClick}
title={label}
type="button"
>
{icon}
- </button>
+ </Button>
);
}
diff --git a/frontend/src/components/MatchedDatabaseView.tsx b/frontend/src/components/MatchedDatabaseView.tsx
index 8a51640901..8875be5b3f 100644
--- a/frontend/src/components/MatchedDatabaseView.tsx
+++ b/frontend/src/components/MatchedDatabaseView.tsx
@@ -2,6 +2,7 @@ import { ChevronRight } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
+import { Button } from "@/components/ui/button";
import type { ConditionGroupExpr } from "@/modules/cel";
import { validateSimpleExpr } from "@/modules/cel";
import { useAppStore } from "@/stores/app";
@@ -312,9 +313,11 @@ export function MatchedDatabaseView({
return (
<div key={section.name}>
- <button
+ <Button
type="button"
- className={`w-full flex items-center justify-between py-2 px-2 text-left text-sm border-b border-control-border/60 last:border-b-0 ${
+ appearance="secondary"
+ size="xs"
+ className={`h-auto w-full justify-between border-b border-control-border/60 px-2 py-2 text-left text-sm last:border-b-0 ${
isEmpty
? "cursor-default text-control-placeholder"
: "cursor-pointer hover:bg-control-bg"
@@ -335,7 +338,7 @@ export function MatchedDatabaseView({
{section.totalLabel}
</span>
)}
- </button>
+ </Button>
{isExpanded && !isEmpty && (
<div className="flex flex-col gap-y-2 w-full max-h-48 overflow-y-auto border-b border-control-border/60 last:border-b-0">
@@ -360,14 +363,16 @@ export function MatchedDatabaseView({
</div>
)}
{section.hasMore && (
- <button
+ <Button
type="button"
- className="self-start px-2 pb-2 text-sm text-accent hover:text-accent/80 disabled:opacity-50"
+ appearance="link"
+ size="xs"
+ className="self-start h-auto px-2 pb-2 text-sm hover:text-accent/80"
disabled={section.sectionLoading}
onClick={section.onLoadMore}
>
{section.sectionLoading ? "..." : t("common.load-more")}
- </button>
+ </Button>
)}
</div>
)}
diff --git a/frontend/src/components/MaxRowCountSelect.tsx b/frontend/src/components/MaxRowCountSelect.tsx
index d0181de660..4ee7332f9a 100644
--- a/frontend/src/components/MaxRowCountSelect.tsx
+++ b/frontend/src/components/MaxRowCountSelect.tsx
@@ -3,6 +3,7 @@ import { ChevronRight } from "lucide-react";
import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
import {
Popover,
PopoverContent,
@@ -72,21 +73,24 @@ export function MaxRowCountSelect({
<PopoverContent side="bottom" align="start" className="p-1 min-w-32">
<div className="flex flex-col">
{rowCountOptions.map((n) => (
- <button
+ <Button
key={n}
type="button"
+ appearance="secondary"
+ size="xs"
className={cn(
- "px-3 py-1.5 text-sm text-left rounded-xs cursor-pointer",
+ "h-auto px-3 py-1.5 text-left text-sm",
"hover:bg-control-bg",
n === value && "bg-control-bg font-medium"
)}
onClick={() => handlePresetClick(n)}
>
{t("common.rows.n-rows", { n })}
- </button>
+ </Button>
))}
<div className="flex items-center gap-1 px-3 py-1.5 border-t mt-1">
- <input
+ <Input
+ size="xs"
type="number"
className="w-20 border border-control-border rounded-xs px-2 py-0.5 text-sm"
value={value}
diff --git a/frontend/src/components/ResourceIdField.tsx b/frontend/src/components/ResourceIdField.tsx
index b81376fb58..277e8af706 100644
--- a/frontend/src/components/ResourceIdField.tsx
+++ b/frontend/src/components/ResourceIdField.tsx
@@ -7,6 +7,7 @@ import {
useState,
} from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import { CopyButton } from "@/components/ui/copy-button";
import { Input } from "@/components/ui/input";
import type { ValidatedMessage } from "@/types";
@@ -207,13 +208,15 @@ export const ResourceIdField = forwardRef<
{!readonly && (
<div>
<span>{t("resource-id.cannot-be-changed-later")}</span>
- <button
+ <Button
type="button"
- className="text-accent font-medium cursor-pointer hover:opacity-80 ml-1"
+ appearance="link"
+ size="xs"
+ className="ml-1 h-auto p-0 font-medium hover:opacity-80"
onClick={() => setManualEdit(true)}
>
{t("common.edit")}
- </button>
+ </Button>
</div>
)}
</div>
diff --git a/frontend/src/components/auth/EmailCodeSigninForm.tsx b/frontend/src/components/auth/EmailCodeSigninForm.tsx
index bf3d86f8e2..1d7c897ea9 100644
--- a/frontend/src/components/auth/EmailCodeSigninForm.tsx
+++ b/frontend/src/components/auth/EmailCodeSigninForm.tsx
@@ -136,16 +136,18 @@ export function EmailCodeSigninForm({ loading, onSignin }: Props) {
length={6}
/>
<div className="flex items-center justify-end">
- <button
+ <Button
type="button"
- className="text-sm text-accent disabled:text-control-light disabled:cursor-not-allowed"
+ appearance="link"
+ size="xs"
+ className="h-auto p-0 text-sm disabled:text-control-light"
disabled={resendCountdown > 0}
onClick={sendCode}
>
{resendCountdown > 0
? t("auth.sign-in.resend-in", { seconds: resendCountdown })
: t("auth.sign-in.resend-code")}
- </button>
+ </Button>
</div>
</div>
)}
diff --git a/frontend/src/components/auth/PasswordSigninForm.tsx b/frontend/src/components/auth/PasswordSigninForm.tsx
index 3b424628ed..a79fe982f6 100644
--- a/frontend/src/components/auth/PasswordSigninForm.tsx
+++ b/frontend/src/components/auth/PasswordSigninForm.tsx
@@ -113,9 +113,11 @@ export function PasswordSigninForm({
value={password}
onChange={(e) => setPassword(e.target.value)}
/>
- <button
+ <Button
type="button"
- className="hover:cursor-pointer absolute right-3"
+ appearance="secondary"
+ size="xs"
+ className="absolute right-3 text-control-light hover:text-control"
onClick={() => setShowPassword((v) => !v)}
aria-label="Toggle password visibility"
>
@@ -124,7 +126,7 @@ export function PasswordSigninForm({
) : (
<EyeOff className="w-4 h-4" />
)}
- </button>
+ </Button>
</div>
</div>
diff --git a/frontend/src/components/database/LabelEditorSheet.tsx b/frontend/src/components/database/LabelEditorSheet.tsx
index 9ec374d3cd..3e41596f24 100644
--- a/frontend/src/components/database/LabelEditorSheet.tsx
+++ b/frontend/src/components/database/LabelEditorSheet.tsx
@@ -128,12 +128,16 @@ export function LabelEditorSheet({
value
)}
</span>
- <button
- className="p-0.5 hover:bg-control-bg-hover rounded-xs"
+ <Button
+ type="button"
+ appearance="secondary"
+ size="xs"
+ aria-label={t("common.remove")}
+ className="hover:bg-control-bg-hover"
onClick={() => removeLabel(key)}
>
<X className="size-3" />
- </button>
+ </Button>
</div>
);
})}
diff --git a/frontend/src/components/header/DashboardHeader.tsx b/frontend/src/components/header/DashboardHeader.tsx
index c3a1e8b7a2..db32900b87 100644
--- a/frontend/src/components/header/DashboardHeader.tsx
+++ b/frontend/src/components/header/DashboardHeader.tsx
@@ -65,15 +65,17 @@ export function DashboardHeader({
) : null}
{showMobileSidebarToggle ? (
- <button
+ <Button
type="button"
+ appearance="secondary"
+ size="xs"
aria-label={t("common.open-mobile-sidebar")}
title={t("common.open-mobile-sidebar")}
- className="p-1 text-control-light hover:text-main md:hidden"
+ className="text-control-light hover:text-main md:hidden"
onClick={onOpenMobileSidebar}
>
<Menu className="h-4 w-4" />
- </button>
+ </Button>
) : null}
<div
diff --git a/frontend/src/components/header/HeaderBreadcrumb.tsx b/frontend/src/components/header/HeaderBreadcrumb.tsx
index 631cadf4ff..b835e559b1 100644
--- a/frontend/src/components/header/HeaderBreadcrumb.tsx
+++ b/frontend/src/components/header/HeaderBreadcrumb.tsx
@@ -170,9 +170,11 @@ export function WorkspaceSegment({
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger
render={
- <button
+ <Button
type="button"
- className="inline-flex items-center rounded-xs p-1 text-control-placeholder hover:bg-control-bg cursor-pointer"
+ appearance="secondary"
+ size="xs"
+ className="text-control-placeholder"
/>
}
>
@@ -188,11 +190,11 @@ export function WorkspaceSegment({
? ws.name.slice(workspaceNamePrefix.length)
: ws.name;
return (
- <button
+ <Button
key={ws.name}
type="button"
className={cn(
- "w-full flex items-center justify-between rounded-xs px-3 py-1.5 text-sm cursor-pointer gap-x-2",
+ "h-auto w-full flex items-center justify-between rounded-xs px-3 py-1.5 text-sm gap-x-2",
ws.name === currentWorkspaceName
? "bg-control-bg font-medium text-accent"
: "text-control hover:bg-control-bg"
@@ -213,7 +215,7 @@ export function WorkspaceSegment({
{ws.name === currentWorkspaceName && (
<Check className="size-4 shrink-0" />
)}
- </button>
+ </Button>
);
})}
</PopoverContent>
@@ -300,7 +302,7 @@ export function ProjectSegment({
appearance="secondary"
aria-label={t("project.select")}
size="xs"
- className="size-6 p-0 text-control-placeholder"
+ className="text-control-placeholder"
/>
) : (
<Button
diff --git a/frontend/src/components/header/ProfileMenuTrigger.tsx b/frontend/src/components/header/ProfileMenuTrigger.tsx
index 676dc226a8..c917cf830f 100644
--- a/frontend/src/components/header/ProfileMenuTrigger.tsx
+++ b/frontend/src/components/header/ProfileMenuTrigger.tsx
@@ -12,6 +12,7 @@ import {
} from "@/app/router";
import { SQLEditorButton } from "@/components/SQLEditorButton";
import { UserAvatar } from "@/components/UserAvatar";
+import { Button } from "@/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
@@ -139,7 +140,12 @@ export function ProfileMenuTrigger({
<DropdownMenu open={open} onOpenChange={setOpen}>
<DropdownMenuTrigger
render={
- <button type="button" className="cursor-pointer rounded-full" />
+ <Button
+ appearance="secondary"
+ size="xs"
+ type="button"
+ className="cursor-pointer rounded-full"
+ />
}
>
<UserAvatar
diff --git a/frontend/src/components/instance/CreateDataSourceExample.tsx b/frontend/src/components/instance/CreateDataSourceExample.tsx
index 14f5ddb711..8e35f576cf 100644
--- a/frontend/src/components/instance/CreateDataSourceExample.tsx
+++ b/frontend/src/components/instance/CreateDataSourceExample.tsx
@@ -1,6 +1,7 @@
import { useCallback, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { Alert } from "@/components/ui/alert";
+import { Button } from "@/components/ui/button";
import { writeTextToClipboard } from "@/lib/clipboard";
import {
DATASOURCE_ADMIN_USER_NAME,
@@ -508,9 +509,11 @@ export function CreateDataSourceExample({
<pre className="flex-1 min-w-0 w-full inline-flex items-center px-3 py-2 border border-r border-control-border bg-control-bg/50 text-sm whitespace-pre-line rounded-l-xs font-mono overflow-auto">
{grantStatement}
</pre>
- <button
+ <Button
type="button"
- className="flex items-center -ml-px px-2 py-2 border border-control-border text-sm font-medium text-control-light bg-control-bg/50 hover:bg-control-bg focus:ring-control focus:outline-hidden focus-visible:ring-2 focus:ring-offset-1 rounded-r-xs"
+ appearance="secondary"
+ size="xs"
+ className="-ml-px h-auto rounded-r-xs border border-control-border bg-control-bg/50 px-2 py-2 text-sm text-control-light hover:bg-control-bg focus:ring-control"
onClick={handleCopy}
title="Copy"
>
@@ -523,7 +526,7 @@ export function CreateDataSourceExample({
<rect x="9" y="9" width="13" height="13" rx="2" ry="2" />
<path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1" />
</svg>
- </button>
+ </Button>
</div>
</div>
)}
diff --git a/frontend/src/components/instance/DataSourceForm.tsx b/frontend/src/components/instance/DataSourceForm.tsx
index 2d3c73604e..f560fed94b 100644
--- a/frontend/src/components/instance/DataSourceForm.tsx
+++ b/frontend/src/components/instance/DataSourceForm.tsx
@@ -10,6 +10,7 @@ import {
FormError,
ResponsiveFormLayout,
} from "@/components/ui/form";
+import { Input as SharedInput } from "@/components/ui/input";
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
import {
Select,
@@ -1015,7 +1016,7 @@ export function DataSourceForm({
keytabResupplyRequired && "border-error"
)}
>
- <input
+ <SharedInput
type="file"
accept=".keytab"
className="hidden"
diff --git a/frontend/src/components/instance/DataSourceSection.test.tsx b/frontend/src/components/instance/DataSourceSection.test.tsx
index b012244f8e..485a001c79 100644
--- a/frontend/src/components/instance/DataSourceSection.test.tsx
+++ b/frontend/src/components/instance/DataSourceSection.test.tsx
@@ -50,8 +50,27 @@ vi.mock("@/components/ui/alert", () => ({
}));
vi.mock("@/components/ui/button", () => ({
- Button: ({ children }: { children: React.ReactNode }) => (
- <button type="button">{children}</button>
+ Button: ({
+ children,
+ className,
+ disabled,
+ onClick,
+ type = "button",
+ }: {
+ children: React.ReactNode;
+ className?: string;
+ disabled?: boolean;
+ onClick?: () => void;
+ type?: "button" | "submit" | "reset";
+ }) => (
+ <button
+ className={className}
+ disabled={disabled}
+ onClick={onClick}
+ type={type}
+ >
+ {children}
+ </button>
),
}));
diff --git a/frontend/src/components/instance/DataSourceSection.tsx b/frontend/src/components/instance/DataSourceSection.tsx
index ddaac9631f..196de1335a 100644
--- a/frontend/src/components/instance/DataSourceSection.tsx
+++ b/frontend/src/components/instance/DataSourceSection.tsx
@@ -137,9 +137,11 @@ export function DataSourceSection({
{/* Data source tabs */}
{showDataSourceTabs && (
<div className="mb-4 flex items-center gap-x-2 border-b border-block-border">
- <button
+ <Button
type="button"
- className={`pb-2 px-1 text-sm font-medium border-b-2 transition-colors ${
+ appearance="secondary"
+ size="xs"
+ className={`h-auto pb-2 px-1 text-sm font-medium border-b-2 ${
dataSourceEditState.editingDataSourceId === adminDataSource.id
? "border-accent text-accent"
: "border-transparent text-control-light hover:text-main"
@@ -148,12 +150,14 @@ export function DataSourceSection({
>
{t("common.admin")}
{incompleteMarker(adminDataSource)}
- </button>
+ </Button>
{readonlyDataSourceList.map((ds) => (
<div key={ds.id} className="flex items-center">
- <button
+ <Button
type="button"
- className={`pb-2 px-1 text-sm font-medium border-b-2 transition-colors ${
+ appearance="secondary"
+ size="xs"
+ className={`h-auto pb-2 px-1 text-sm font-medium border-b-2 ${
dataSourceEditState.editingDataSourceId === ds.id
? "border-accent text-accent"
: "border-transparent text-control-light hover:text-main"
@@ -162,11 +166,13 @@ export function DataSourceSection({
>
{t("common.read-only")}
{incompleteMarker(ds)}
- </button>
+ </Button>
{hasReadOnlyDataSource && (
- <button
+ <Button
type="button"
- className="ml-1 text-error hover:text-error-hover text-xs pb-2"
+ appearance="secondary"
+ size="xs"
+ className="ml-1 h-auto pb-2 text-error hover:text-error-hover"
disabled={!allowUpdate}
onClick={() => {
if (
@@ -180,7 +186,7 @@ export function DataSourceSection({
}}
>
✕
- </button>
+ </Button>
)}
</div>
))}
@@ -190,14 +196,16 @@ export function DataSourceSection({
</span>
)}
{allowEdit && (
- <button
+ <Button
type="button"
- className="pb-2 px-1 text-control-light hover:text-main disabled:opacity-50"
+ appearance="secondary"
+ size="xs"
+ className="h-auto px-1 pb-2 text-control-light hover:text-main"
disabled={!allowUpdate}
onClick={handleCreateRODataSource}
>
<Plus className="w-4 h-4" />
- </button>
+ </Button>
)}
</div>
)}
diff --git a/frontend/src/components/instance/InfoPanel.tsx b/frontend/src/components/instance/InfoPanel.tsx
index d55d242dbb..5c9d936d0b 100644
--- a/frontend/src/components/instance/InfoPanel.tsx
+++ b/frontend/src/components/instance/InfoPanel.tsx
@@ -3,6 +3,7 @@ import { X } from "lucide-react";
import type { ReactNode } from "react";
import { useCallback, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import { CopyButton } from "@/components/ui/copy-button";
import {
Sheet,
@@ -108,12 +109,15 @@ function PanelHeader({
<h3 className="min-w-0 truncate text-sm font-semibold text-main">
{title}
</h3>
- <button
- className="text-control-light hover:text-main p-0.5 rounded-xs"
+ <Button
+ type="button"
+ appearance="secondary"
+ size="xs"
+ className="text-control-light hover:text-main"
onClick={onClose}
>
<X className="size-4" />
- </button>
+ </Button>
</div>
);
}
diff --git a/frontend/src/components/plan-check/PlanCheckSection.tsx b/frontend/src/components/plan-check/PlanCheckSection.tsx
index 0dc2698331..7c02af5392 100644
--- a/frontend/src/components/plan-check/PlanCheckSection.tsx
+++ b/frontend/src/components/plan-check/PlanCheckSection.tsx
@@ -107,14 +107,16 @@ export function PlanCheckSection({
{hasAnyChecks ? (
<div className="flex min-w-0 flex-wrap items-center gap-3">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
aria-label={t("plan.navigator.checks")}
className="cursor-pointer text-left"
onClick={() => setDrawerOpen(true)}
type="button"
>
<PlanCheckSummaryRow summary={summary} />
- </button>
+ </Button>
{trailingSummary}
</div>
) : (
@@ -217,7 +219,9 @@ function PlanCheckFilterPills({
{entries.map(({ count, icon: Icon, label, status, textClass }) => {
const isSelected = selectedStatus === status;
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className={cn(
"flex cursor-pointer items-center gap-1 rounded-sm px-2 py-1 transition-colors",
textClass,
@@ -230,7 +234,7 @@ function PlanCheckFilterPills({
<Icon className="h-5 w-5" />
<span>{label}</span>
<span>{count}</span>
- </button>
+ </Button>
);
})}
</div>
@@ -383,7 +387,9 @@ export function PlanCheckResultsDrawer({
</div>
{remainingCount > 0 && (
<div className="flex justify-center py-4">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="cursor-pointer text-sm text-accent hover:underline"
onClick={() =>
setDisplayCount((count) => count + PAGE_SIZE)
@@ -391,7 +397,7 @@ export function PlanCheckResultsDrawer({
type="button"
>
{t("common.load-more")} ({remainingCount})
- </button>
+ </Button>
</div>
)}
</>
diff --git a/frontend/src/components/sql-review/Panels.tsx b/frontend/src/components/sql-review/Panels.tsx
index f92df4cb16..051fdd5097 100644
--- a/frontend/src/components/sql-review/Panels.tsx
+++ b/frontend/src/components/sql-review/Panels.tsx
@@ -264,10 +264,12 @@ function RuleSelectList({
rule.engine
);
return (
- <button
+ <Button
key={key}
type="button"
- className="w-full flex items-center gap-x-3 px-4 py-3 text-left hover:bg-control-bg/60"
+ appearance="secondary"
+ size="xs"
+ className="h-auto w-full px-4 py-3 text-left hover:bg-control-bg/60"
onClick={() => onToggleRule(rule)}
>
<Checkbox
@@ -286,7 +288,7 @@ function RuleSelectList({
>
<ExternalLink className="w-4 h-4" />
</a>
- </button>
+ </Button>
);
})}
</div>
diff --git a/frontend/src/components/sql-review/RuleComponents.tsx b/frontend/src/components/sql-review/RuleComponents.tsx
index 9776fe627a..d7f419dc28 100644
--- a/frontend/src/components/sql-review/RuleComponents.tsx
+++ b/frontend/src/components/sql-review/RuleComponents.tsx
@@ -12,6 +12,13 @@ import {
FormFieldGroup,
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
import { Tooltip } from "@/components/ui/tooltip";
import i18n from "@/lib/i18n";
import type { PayloadValueType } from "@/lib/sql-review/rule-config-types";
@@ -332,7 +339,7 @@ function StringArrayInput({
type="button"
appearance="secondary"
size="xs"
- className="size-4 p-0 text-control-light hover:bg-transparent hover:text-error"
+ className="text-control-light hover:bg-transparent hover:text-error"
onClick={() => removeTag(i)}
>
<XIcon className="w-3 h-3" />
@@ -379,18 +386,24 @@ function TemplateSelect({
}));
return (
- <select
- className="flex h-9 w-full rounded-xs border border-control-border bg-transparent px-3 py-1 text-sm text-main focus:outline-hidden focus:ring-2 focus:ring-accent disabled:cursor-not-allowed disabled:bg-control-bg disabled:opacity-50"
+ <Select
value={value}
disabled={disabled}
- onChange={(e) => onChange(e.target.value)}
+ onValueChange={(nextValue: string | null) => {
+ if (nextValue !== null) onChange(nextValue);
+ }}
>
- {options.map((opt) => (
- <option key={opt.id} value={opt.id}>
- {opt.description}
- </option>
- ))}
- </select>
+ <SelectTrigger className="w-full bg-transparent text-main">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {options.map((opt) => (
+ <SelectItem key={opt.id} value={opt.id}>
+ {opt.description}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
);
}
diff --git a/frontend/src/components/sql-review/RuleTable.test.tsx b/frontend/src/components/sql-review/RuleTable.test.tsx
index 9711606324..7436511dab 100644
--- a/frontend/src/components/sql-review/RuleTable.test.tsx
+++ b/frontend/src/components/sql-review/RuleTable.test.tsx
@@ -261,7 +261,6 @@ describe("RuleTable", () => {
'tbody tr[data-sql-review-rule-view="desktop"] button[aria-label="common.edit"]'
);
expect(editButton).toBeTruthy();
- expect(editButton?.className).toContain("size-7");
expect(editButton?.textContent).toBe("");
expect(editButton?.className).not.toContain("border");
@@ -269,7 +268,6 @@ describe("RuleTable", () => {
'tbody tr[data-sql-review-rule-view="desktop"] button[aria-label="common.delete"]'
);
expect(deleteButton).toBeTruthy();
- expect(deleteButton?.className).toContain("size-7");
expect(deleteButton?.textContent).toBe("");
expect(deleteButton?.className).not.toContain("border");
expect(editButton?.parentElement?.className).toContain("gap-x-1");
@@ -497,10 +495,6 @@ describe("RuleTable", () => {
);
expect(mobileEditButton).toBeTruthy();
expect(mobileDeleteButton).toBeTruthy();
- expect(mobileEditButton?.className).toContain("size-7");
- expect(mobileDeleteButton?.className).toContain("size-7");
- expect(mobileEditButton?.className).not.toContain("size-8");
- expect(mobileDeleteButton?.className).not.toContain("size-8");
expect(mobileDeleteButton?.textContent).toBe("");
unmount();
diff --git a/frontend/src/components/sql-review/RuleTable.tsx b/frontend/src/components/sql-review/RuleTable.tsx
index d889e29eec..441ed127e4 100644
--- a/frontend/src/components/sql-review/RuleTable.tsx
+++ b/frontend/src/components/sql-review/RuleTable.tsx
@@ -487,9 +487,11 @@ function RuleTableRow({
onClick={(e) => e.stopPropagation()}
>
{expandable && (
- <button
+ <Button
type="button"
- className="cursor-pointer p-0.5 text-control-light hover:text-control"
+ appearance="secondary"
+ size="xs"
+ className="text-control-light hover:text-control"
onClick={() => setExpanded((prev) => !prev)}
>
{expanded ? (
@@ -497,7 +499,7 @@ function RuleTableRow({
) : (
<ChevronRight className="w-4 h-4" />
)}
- </button>
+ </Button>
)}
</TableCell>
{supportSelect && (
@@ -555,7 +557,7 @@ function RuleTableRow({
<Button
appearance="secondary"
size="sm"
- className="size-7 p-0 text-control hover:text-accent"
+ className="text-control hover:text-accent"
aria-label={editable ? t("common.edit") : t("common.view")}
onClick={() => setEditing(true)}
>
@@ -568,7 +570,7 @@ function RuleTableRow({
variant="destructive"
appearance="secondary"
size="sm"
- className="size-7 p-0 text-error hover:bg-error/10 hover:text-error"
+ className="text-error hover:bg-error/10 hover:text-error"
aria-label={t("common.delete")}
onClick={() => onRuleRemove?.(rule)}
>
@@ -691,7 +693,7 @@ const MobileRuleTableRow = memo(function MobileRuleTableRow({
type="button"
appearance="secondary"
size="sm"
- className="size-7 p-0 text-control hover:text-accent"
+ className="text-control hover:text-accent"
aria-label={t("common.edit")}
onClick={() => setEditing(true)}
>
@@ -702,7 +704,7 @@ const MobileRuleTableRow = memo(function MobileRuleTableRow({
<Button
appearance="secondary"
size="sm"
- className="size-7 p-0 text-error hover:bg-error/10 hover:text-error"
+ className="text-error hover:bg-error/10 hover:text-error"
aria-label={t("common.delete")}
onClick={() => onRuleRemove?.(rule)}
>
diff --git a/frontend/src/components/sql-review/TemplateSelector.tsx b/frontend/src/components/sql-review/TemplateSelector.tsx
index d8e49d12a7..90ebff9f22 100644
--- a/frontend/src/components/sql-review/TemplateSelector.tsx
+++ b/frontend/src/components/sql-review/TemplateSelector.tsx
@@ -3,6 +3,7 @@ import { useEffect, useMemo } from "react";
import { useTranslation } from "react-i18next";
import { EnvironmentLabel } from "@/components/EnvironmentLabel";
import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
import { FormField } from "@/components/ui/form";
import { Separator } from "@/components/ui/separator";
import { useProjectByName } from "@/hooks/useProjectByName";
@@ -106,12 +107,14 @@ export function TemplateSelector({
<>
<div className="flex flex-wrap gap-4">
{reviewPolicyTemplateList.map((template) => (
- <button
+ <Button
type="button"
key={template.id}
+ appearance="secondary"
+ size="xs"
aria-pressed={isSelected(template)}
className={cn(
- "relative flex w-full cursor-pointer flex-col rounded-sm border border-control-border px-6 py-4 text-left transition-colors sm:max-w-xs",
+ "relative h-auto w-full flex-col rounded-sm border border-control-border px-6 py-4 text-left sm:max-w-xs",
"hover:bg-control-bg focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2",
isSelected(template) && "bg-control-bg"
)}
@@ -136,7 +139,7 @@ export function TemplateSelector({
{isSelected(template) && (
<CheckCircle className="absolute right-3 top-3 size-7 text-accent" />
)}
- </button>
+ </Button>
))}
</div>
@@ -146,12 +149,14 @@ export function TemplateSelector({
<div className="flex flex-wrap gap-4">
{builtInTemplateList.map((template) => (
- <button
+ <Button
type="button"
key={template.id}
+ appearance="secondary"
+ size="xs"
aria-pressed={isSelected(template)}
className={cn(
- "relative flex w-full cursor-pointer flex-col rounded-sm border border-control-border px-6 py-4 text-left transition-colors sm:max-w-xs",
+ "relative h-auto w-full flex-col rounded-sm border border-control-border px-6 py-4 text-left sm:max-w-xs",
"hover:bg-control-bg focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2",
isSelected(template) && "bg-control-bg"
)}
@@ -174,7 +179,7 @@ export function TemplateSelector({
{isSelected(template) && (
<CheckCircle className="absolute right-3 top-3 size-7 text-accent" />
)}
- </button>
+ </Button>
))}
</div>
</div>
diff --git a/frontend/src/components/ui/color-input.tsx b/frontend/src/components/ui/color-input.tsx
index 9bf17268ab..d1bfdd5124 100644
--- a/frontend/src/components/ui/color-input.tsx
+++ b/frontend/src/components/ui/color-input.tsx
@@ -21,6 +21,41 @@ interface ColorInputProps {
ariaLabel?: string;
}
+interface ColorSwatchInputProps {
+ value: string;
+ onChange: (value: string) => void;
+ id?: string;
+ disabled?: boolean;
+ ariaLabel?: string;
+ className?: string;
+}
+
+export function ColorSwatchInput({
+ value,
+ onChange,
+ id,
+ disabled,
+ ariaLabel,
+ className,
+}: Readonly<ColorSwatchInputProps>) {
+ return (
+ <input
+ id={id}
+ type="color"
+ className={cn(
+ "size-8 shrink-0 appearance-none rounded-xs border border-control-border bg-transparent p-0",
+ "[&::-webkit-color-swatch-wrapper]:p-0 [&::-webkit-color-swatch]:rounded-xs [&::-webkit-color-swatch]:border-0 [&::-moz-color-swatch]:rounded-xs [&::-moz-color-swatch]:border-0",
+ disabled ? "cursor-not-allowed opacity-50" : "cursor-pointer",
+ className
+ )}
+ value={value}
+ disabled={disabled}
+ aria-label={ariaLabel}
+ onChange={(e) => onChange(e.target.value)}
+ />
+ );
+}
+
/**
* A color control pairing the native swatch picker with an editable hex text
* field, so a color can be picked visually OR typed as `#081C56`. The text
diff --git a/frontend/src/modules/agent/components/AgentChat.tsx b/frontend/src/modules/agent/components/AgentChat.tsx
index 04ef8b8870..05936ec726 100644
--- a/frontend/src/modules/agent/components/AgentChat.tsx
+++ b/frontend/src/modules/agent/components/AgentChat.tsx
@@ -5,6 +5,7 @@ import remarkGfm from "remark-gfm";
import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/app/router/handles";
import { RouterLink } from "@/components/RouterLink";
import { Button, buttonVariants } from "@/components/ui/button";
+import { Table } from "@/components/ui/table";
import {
AI_ASSISTANT_PRODUCT_INTRO,
PRODUCT_INTRO_QUERY_KEY,
@@ -174,9 +175,9 @@ export function AgentChat({ className }: AgentChatProps) {
</blockquote>
),
table: ({ children }) => (
- <table className="my-1 border-collapse text-xs">
+ <Table className="my-1 border-collapse text-xs">
{children}
- </table>
+ </Table>
),
th: ({ children }) => (
<th className="border border-control-border px-2 py-1">
diff --git a/frontend/src/modules/agent/components/AgentInput.test.tsx b/frontend/src/modules/agent/components/AgentInput.test.tsx
index 4d0c60c2bf..3ccd2d4a2f 100644
--- a/frontend/src/modules/agent/components/AgentInput.test.tsx
+++ b/frontend/src/modules/agent/components/AgentInput.test.tsx
@@ -390,13 +390,13 @@ describe("AgentInput", () => {
const row = container.querySelector("[data-agent-input-row]");
expect(row?.className).toContain("items-end");
expect(container.querySelector("textarea")?.className).toContain(
- "min-h-[34px]"
+ "min-h-9"
);
expect(container.querySelector("textarea")?.className).toContain(
"max-h-[134px]"
);
expect(container.querySelector("textarea")?.className).toContain("block");
- expect(container.querySelector("button")?.className).toContain("h-[34px]");
+ expect(container.querySelector("button")?.className).toContain("h-9");
unmount();
});
diff --git a/frontend/src/modules/agent/components/AgentInput.tsx b/frontend/src/modules/agent/components/AgentInput.tsx
index 7c4545c519..b5324e29c8 100644
--- a/frontend/src/modules/agent/components/AgentInput.tsx
+++ b/frontend/src/modules/agent/components/AgentInput.tsx
@@ -13,6 +13,7 @@ import { v4 as uuidv4 } from "uuid";
import { router } from "@/app/router";
import { Button } from "@/components/ui/button";
import { getLayerRoot, LAYER_SURFACE_CLASS } from "@/components/ui/layer";
+import { Textarea } from "@/components/ui/textarea";
import type { DomRefSuggestion } from "../dom";
import { lazyExtractDomRefSuggestions } from "../dom";
import { runAgentLoop } from "../logic/agentLoop";
@@ -697,20 +698,24 @@ export function AgentInput() {
<div className="font-medium">{t("agent.interrupted")}</div>
<div className="mt-1">{t("agent.interrupted-retry-hint")}</div>
<div className="mt-2 flex flex-wrap gap-x-2 gap-y-2">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="rounded-xs bg-error px-3 py-2 text-sm text-accent-text hover:bg-error/90 disabled:opacity-50"
disabled={isCurrentChatRunning}
onClick={retryLastTurn}
>
{t("agent.retry-last-chat-turn")}
- </button>
- <button
+ </Button>
+ <Button
+ appearance="secondary"
+ size="xs"
className="rounded-xs border px-3 py-2 text-sm text-control hover:bg-control-bg disabled:opacity-50"
disabled={isCurrentChatRunning}
onClick={dismissInterrupted}
>
{t("common.dismiss")}
- </button>
+ </Button>
</div>
</div>
)}
@@ -725,26 +730,32 @@ export function AgentInput() {
{/* Confirm buttons */}
{isAwaitingConfirm ? (
<div className="flex flex-wrap gap-x-2 gap-y-2">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="rounded-xs bg-accent px-3 py-2 text-sm text-accent-text hover:bg-accent-hover disabled:opacity-50"
disabled={isCurrentChatRunning}
onClick={() => submitConfirmation(true)}
>
{confirmLabel}
- </button>
- <button
+ </Button>
+ <Button
+ appearance="secondary"
+ size="xs"
className="rounded-xs border px-3 py-2 text-sm text-control hover:bg-control-bg disabled:opacity-50"
disabled={isCurrentChatRunning}
onClick={() => submitConfirmation(false)}
>
{cancelLabel}
- </button>
+ </Button>
</div>
) : isAwaitingChoose ? (
/* Choose options */
<div className="flex flex-col gap-y-2">
{chooseOptions.map((option) => (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={option.value}
className="rounded-xs border px-3 py-2 text-left text-sm hover:bg-control-bg disabled:opacity-50"
disabled={isCurrentChatRunning}
@@ -756,7 +767,7 @@ export function AgentInput() {
{option.description}
</div>
)}
- </button>
+ </Button>
))}
</div>
) : (
@@ -771,11 +782,12 @@ export function AgentInput() {
{inputPlaceholder}
</div>
)}
- <textarea
+ <Textarea
+ size="md"
ref={textareaRef}
value={input}
rows={1}
- className="block min-h-[34px] max-h-[134px] w-full resize-none overflow-y-hidden rounded-xs border px-3 py-1.5 text-sm leading-5 outline-none focus:ring-1 focus:ring-accent disabled:opacity-50"
+ className="block min-h-9 max-h-[134px] w-full resize-none overflow-y-hidden rounded-xs border px-3 py-1.5 text-sm leading-5 outline-none focus:ring-1 focus:ring-accent disabled:opacity-50"
aria-label={inputPlaceholder}
disabled={isCurrentChatRunning || isAIConfigurationBlocked}
onChange={(e) => {
@@ -841,16 +853,16 @@ export function AgentInput() {
{loading ? (
<Button
variant="destructive"
- size="sm"
- className="h-[34px] shrink-0 self-end whitespace-nowrap"
+ size="md"
+ className="shrink-0 self-end whitespace-nowrap"
onClick={() => useAgentStore.getState().cancel(currentChat?.id)}
>
{t("agent.stop")}
</Button>
) : (
<Button
- size="sm"
- className="h-[34px] shrink-0 self-end whitespace-nowrap"
+ size="md"
+ className="shrink-0 self-end whitespace-nowrap"
disabled={isSendDisabled}
onClick={() => void send()}
>
diff --git a/frontend/src/modules/agent/components/AgentWindow.tsx b/frontend/src/modules/agent/components/AgentWindow.tsx
index 2578e41a99..a8ac616b09 100644
--- a/frontend/src/modules/agent/components/AgentWindow.tsx
+++ b/frontend/src/modules/agent/components/AgentWindow.tsx
@@ -926,9 +926,11 @@ export function AgentWindow() {
</span>
</div>
<div className="flex items-center gap-x-1">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
data-agent-window-action
- className="flex size-5 items-center justify-center rounded-xs text-control-placeholder hover:bg-control-bg-hover hover:text-control-light"
+ className="flex items-center justify-center rounded-xs text-control-placeholder hover:bg-control-bg-hover hover:text-control-light"
title={t("agent.minimize")}
onClick={(e) => {
e.stopPropagation();
@@ -936,10 +938,12 @@ export function AgentWindow() {
}}
>
&#8722;
- </button>
- <button
+ </Button>
+ <Button
+ appearance="secondary"
+ size="xs"
data-agent-window-action
- className="flex size-5 items-center justify-center rounded-xs text-control-placeholder hover:bg-control-bg-hover hover:text-control-light"
+ className="flex items-center justify-center rounded-xs text-control-placeholder hover:bg-control-bg-hover hover:text-control-light"
title={t("agent.close")}
onClick={(e) => {
e.stopPropagation();
@@ -947,7 +951,7 @@ export function AgentWindow() {
}}
>
&#10005;
- </button>
+ </Button>
</div>
</div>
@@ -1077,7 +1081,9 @@ export function AgentWindow() {
/>
) : (
<div className="flex items-start gap-x-2">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="min-w-0 flex-1 text-left disabled:cursor-not-allowed disabled:opacity-60"
disabled={
@@ -1111,7 +1117,7 @@ export function AgentWindow() {
/>
</AgentTooltip>
</span>
- </button>
+ </Button>
<div className="pointer-events-none flex shrink-0 items-center gap-x-2 opacity-0 transition-opacity group-hover:pointer-events-auto group-hover:opacity-100 group-focus-within:pointer-events-auto group-focus-within:opacity-100">
{chat.archived ? (
<>
@@ -1162,7 +1168,9 @@ export function AgentWindow() {
</aside>
{/* Sidebar resize handle */}
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
data-agent-window-action
data-agent-sidebar-resize
@@ -1170,7 +1178,7 @@ export function AgentWindow() {
onPointerDown={startSidebarResize}
>
<span className="pointer-events-none absolute inset-y-0 left-1/2 w-px -translate-x-1/2 bg-transparent transition-colors group-hover:bg-accent" />
- </button>
+ </Button>
{/* Main panel */}
<div className="flex min-w-0 flex-1 flex-col">
@@ -1235,7 +1243,9 @@ function ConfirmDialog({
{...triggerProps}
/>
) : (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="rounded-xs border px-2 py-1.5 text-xs font-medium text-control-light hover:bg-background"
onClick={(event) => event.stopPropagation()}
{...triggerProps}
@@ -1259,19 +1269,25 @@ function ConfirmDialog({
<div className="flex justify-end gap-x-2">
<AgentDialogClose
render={
- <button className="rounded-xs border px-3 py-1.5 text-sm font-medium text-control-light hover:bg-control-bg">
+ <Button
+ appearance="secondary"
+ size="xs"
+ className="rounded-xs border px-3 py-1.5 text-sm font-medium text-control-light hover:bg-control-bg"
+ >
{t("common.cancel")}
- </button>
+ </Button>
}
/>
<AgentDialogClose
render={
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="rounded-xs bg-accent px-3 py-1.5 text-sm font-medium text-accent-text hover:bg-accent-hover"
onClick={onConfirm}
>
{t("common.confirm")}
- </button>
+ </Button>
}
/>
</div>
diff --git a/frontend/src/modules/ai/components/ChatView/ChatView.tsx b/frontend/src/modules/ai/components/ChatView/ChatView.tsx
index b82f07fcab..297ee2d34f 100644
--- a/frontend/src/modules/ai/components/ChatView/ChatView.tsx
+++ b/frontend/src/modules/ai/components/ChatView/ChatView.tsx
@@ -1,5 +1,6 @@
import { useEffect, useMemo, useRef } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import type { Conversation } from "../../types";
import { useAIContext } from "../context";
import { AIMessageView } from "./AIMessageView";
@@ -92,13 +93,15 @@ export function ChatView({ mode = "CHAT", conversation }: Props) {
<div className="w-full h-full flex flex-col justify-end items-center pb-8">
<p className="text-sm text-control-light">
{selectOrCreateParts[0]}
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-accent underline hover:text-accent-hover cursor-pointer"
onClick={() => events.emit("new-conversation", { input: "" })}
>
{t("common.create")}
- </button>
+ </Button>
{selectOrCreateParts[1] ?? ""}
</p>
</div>
diff --git a/frontend/src/modules/ai/components/ChatView/Markdown/CodeBlock.tsx b/frontend/src/modules/ai/components/ChatView/Markdown/CodeBlock.tsx
index f81ebd0f38..72e4cbe569 100644
--- a/frontend/src/modules/ai/components/ChatView/Markdown/CodeBlock.tsx
+++ b/frontend/src/modules/ai/components/ChatView/Markdown/CodeBlock.tsx
@@ -2,6 +2,7 @@ import { PlayIcon } from "lucide-react";
import { useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { MonacoEditor } from "@/components/monaco/MonacoEditor";
+import { Button } from "@/components/ui/button";
import { CopyButton } from "@/components/ui/copy-button";
import { Tooltip } from "@/components/ui/tooltip";
import { monacoThemeName } from "@/modules/sql-editor/components/theme/derive";
@@ -88,27 +89,31 @@ export function CodeBlock({ code, width }: Props) {
<div className="text-xs">SQL</div>
<div className="flex items-center justify-end gap-2">
<Tooltip content={t("common.run")} side="bottom">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="inline-flex items-center justify-center hover:text-accent cursor-pointer"
onClick={handleExecute}
aria-label={t("common.run")}
>
<PlayIcon className="size-3.5" />
- </button>
+ </Button>
</Tooltip>
<Tooltip
content={t("plugin.ai.actions.insert-at-caret")}
side="bottom"
>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="inline-flex items-center justify-center hover:text-accent cursor-pointer"
onClick={handleInsertAtCaret}
aria-label={t("plugin.ai.actions.insert-at-caret")}
>
<InsertAtCaretIconCompact />
- </button>
+ </Button>
</Tooltip>
<CopyButton content={code} />
</div>
diff --git a/frontend/src/modules/ai/components/DynamicSuggestions.tsx b/frontend/src/modules/ai/components/DynamicSuggestions.tsx
index 4e15a319b1..69ab5b24f5 100644
--- a/frontend/src/modules/ai/components/DynamicSuggestions.tsx
+++ b/frontend/src/modules/ai/components/DynamicSuggestions.tsx
@@ -105,7 +105,7 @@ export function DynamicSuggestions({ onEnter }: Props) {
};
return (
- <div className="flex items-center overflow-hidden h-[22px]">
+ <div className="flex h-6 items-center overflow-hidden">
{!ready && (
<>
<Loader2 className="mr-2 size-4 animate-spin" />
@@ -121,7 +121,7 @@ export function DynamicSuggestions({ onEnter }: Props) {
<Button
appearance="outline"
size="xs"
- className="flex-1 overflow-hidden h-[22px]"
+ className="flex-1 overflow-hidden"
onClick={handleConsume}
>
<span className="w-full truncate leading-5">{current}</span>
@@ -136,7 +136,7 @@ export function DynamicSuggestions({ onEnter }: Props) {
<Button
appearance="secondary"
size="xs"
- className="shrink-0 h-[22px] px-1.5"
+ className="shrink-0"
onClick={handleRefresh}
aria-label={t("plugin.ai.conversation.tips.suggest-prompt")}
>
@@ -145,7 +145,7 @@ export function DynamicSuggestions({ onEnter }: Props) {
<Button
appearance="secondary"
size="xs"
- className="shrink-0 h-[22px] px-1.5"
+ className="shrink-0"
onClick={() => setShowSuggestion(false)}
aria-label={t("common.close")}
>
diff --git a/frontend/src/modules/ai/components/PromptInput.tsx b/frontend/src/modules/ai/components/PromptInput.tsx
index 5b34fafedd..e3cd7004ad 100644
--- a/frontend/src/modules/ai/components/PromptInput.tsx
+++ b/frontend/src/modules/ai/components/PromptInput.tsx
@@ -2,6 +2,7 @@ import { CornerDownLeft } from "lucide-react";
import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/components/ui/button";
+import { Textarea } from "@/components/ui/textarea";
import { Tooltip } from "@/components/ui/tooltip";
import { cn } from "@/lib/utils";
import { keyboardShortcutStr } from "@/utils";
@@ -129,7 +130,8 @@ export function PromptInput({ disabled = false, onEnter }: Props) {
return (
<div className="relative w-full">
- <textarea
+ <Textarea
+ size="xs"
ref={textareaRef}
value={value}
disabled={disabled}
@@ -149,7 +151,7 @@ export function PromptInput({ disabled = false, onEnter }: Props) {
<Button
appearance="secondary"
size="xs"
- className="absolute right-5 bottom-1 h-6 px-1.5 text-accent"
+ className="absolute right-5 bottom-1 text-accent"
disabled={!value || disabled}
onClick={handleSubmitClick}
aria-label={t("plugin.ai.send")}
diff --git a/frontend/src/modules/schema-diagram/ER/TableNode.tsx b/frontend/src/modules/schema-diagram/ER/TableNode.tsx
index 9ec9478562..ea2599172f 100644
--- a/frontend/src/modules/schema-diagram/ER/TableNode.tsx
+++ b/frontend/src/modules/schema-diagram/ER/TableNode.tsx
@@ -1,5 +1,7 @@
import { Diamond, Key, Pencil } from "lucide-react";
import { useCallback, useMemo } from "react";
+import { Button } from "@/components/ui/button";
+import { Table } from "@/components/ui/table";
import { cn } from "@/lib/utils";
import type {
ColumnMetadata,
@@ -165,17 +167,19 @@ export function TableNode({ schema, table }: TableNodeProps) {
)}
{editable && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="invisible group-hover:visible absolute top-[50%] -mt-[9px] right-1 text-control bg-background/70 hover:bg-control-bg p-0.5 rounded-sm"
onClick={() => events.emit("edit-table", { schema, table })}
>
<Pencil className="size-4" />
- </button>
+ </Button>
)}
</h3>
- <table className="w-full text-sm table-fixed">
+ <Table className="table-fixed">
<tbody>
{table.columns.map((column, i) => (
<tr
@@ -219,7 +223,7 @@ export function TableNode({ schema, table }: TableNodeProps) {
</tr>
))}
</tbody>
- </table>
+ </Table>
</div>
);
}
diff --git a/frontend/src/modules/schema-diagram/Navigator/Navigator.tsx b/frontend/src/modules/schema-diagram/Navigator/Navigator.tsx
index 18912f439d..35380c687f 100644
--- a/frontend/src/modules/schema-diagram/Navigator/Navigator.tsx
+++ b/frontend/src/modules/schema-diagram/Navigator/Navigator.tsx
@@ -1,5 +1,6 @@
import { ChevronLeft } from "lucide-react";
import { useEffect, useMemo, useRef, useState } from "react";
+import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
import { PanelSearchBox } from "@/modules/sql-editor/components/Panels/common/PanelSearchBox";
import { getInstanceResource, hasSchemaProperty } from "@/utils";
@@ -107,11 +108,13 @@ export function Navigator({ treeHeight }: NavigatorProps) {
* way to re-open. Anchoring the collapsed button at `left-1`
* keeps the whole 24px visible inside Canvas, on top.
*/}
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
onClick={() => setExpanded((prev) => !prev)}
className={cn(
- "absolute z-10 rounded-full shadow-lg w-6 h-6 top-16 flex items-center justify-center bg-background hover:bg-control-bg cursor-pointer transition-all",
+ "absolute z-10 rounded-full shadow-lg top-16 flex items-center justify-center bg-background hover:bg-control-bg cursor-pointer transition-all",
expanded ? "left-full -translate-x-3" : "left-1"
)}
>
@@ -121,7 +124,7 @@ export function Navigator({ treeHeight }: NavigatorProps) {
!expanded && "-scale-100"
)}
/>
- </button>
+ </Button>
</div>
);
}
diff --git a/frontend/src/modules/schema-diagram/common/FocusButton.tsx b/frontend/src/modules/schema-diagram/common/FocusButton.tsx
index 841ccc9a16..e194c654f1 100644
--- a/frontend/src/modules/schema-diagram/common/FocusButton.tsx
+++ b/frontend/src/modules/schema-diagram/common/FocusButton.tsx
@@ -1,5 +1,6 @@
import { ScanSearch } from "lucide-react";
import { useCallback, useMemo } from "react";
+import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
import type { TableMetadata } from "@/types/proto-es/v1/database_service_pb";
import { DEFAULT_PADDINGS } from "./const";
@@ -59,7 +60,9 @@ export function FocusButton({
);
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
onClick={toggleFocus}
className={cn(
@@ -70,6 +73,6 @@ export function FocusButton({
)}
>
<ScanSearch className="size-4" />
- </button>
+ </Button>
);
}
diff --git a/frontend/src/modules/schema-editor/Panels/PreviewPane.tsx b/frontend/src/modules/schema-editor/Panels/PreviewPane.tsx
index 12c62dca56..b3aef4b84a 100644
--- a/frontend/src/modules/schema-editor/Panels/PreviewPane.tsx
+++ b/frontend/src/modules/schema-editor/Panels/PreviewPane.tsx
@@ -5,6 +5,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { databaseServiceClientConnect } from "@/api";
import { ReadonlyMonaco } from "@/components/monaco/ReadonlyMonaco";
+import { Button } from "@/components/ui/button";
import type {
Database,
DatabaseMetadata,
@@ -137,7 +138,9 @@ export function PreviewPane({ db, database, schema, table }: Props) {
onMouseDown={handleResizeStart}
/>
)}
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="flex w-full items-center gap-x-1 px-4 py-1.5 text-xs font-medium text-control-light hover:text-control"
onClick={toggleExpanded}
@@ -148,7 +151,7 @@ export function PreviewPane({ db, database, schema, table }: Props) {
<ChevronRight className="size-3.5" />
)}
{t("schema-editor.preview")}
- </button>
+ </Button>
{expanded && (
<div
className="relative overflow-y-auto"
diff --git a/frontend/src/modules/schema-editor/Panels/TableColumnEditor/DataTypeCell.tsx b/frontend/src/modules/schema-editor/Panels/TableColumnEditor/DataTypeCell.tsx
index 18f07a9a4f..6d16039663 100644
--- a/frontend/src/modules/schema-editor/Panels/TableColumnEditor/DataTypeCell.tsx
+++ b/frontend/src/modules/schema-editor/Panels/TableColumnEditor/DataTypeCell.tsx
@@ -8,6 +8,7 @@ import {
useState,
} from "react";
import { createPortal } from "react-dom";
+import { Button } from "@/components/ui/button";
import {
getPortalDropdownStyle,
isPortalDropdownStyleEqual,
@@ -171,7 +172,9 @@ export function DataTypeCell({
)}
>
{suggestions.map((type) => (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={type}
type="button"
className={cn(
@@ -186,7 +189,7 @@ export function DataTypeCell({
}}
>
{type}
- </button>
+ </Button>
))}
</div>,
getLayerRoot("overlay")
diff --git a/frontend/src/modules/schema-editor/TabsContainer.tsx b/frontend/src/modules/schema-editor/TabsContainer.tsx
index 50d3e3e23a..00992e56c8 100644
--- a/frontend/src/modules/schema-editor/TabsContainer.tsx
+++ b/frontend/src/modules/schema-editor/TabsContainer.tsx
@@ -7,6 +7,7 @@ import {
X,
} from "lucide-react";
import { useEffect, useRef } from "react";
+import { Button } from "@/components/ui/button";
import { EllipsisText } from "@/components/ui/ellipsis-text";
import { cn } from "@/lib/utils";
import { extractDatabaseResourceName } from "@/utils";
@@ -54,15 +55,17 @@ export function TabsContainer() {
>
<TabIcon type={tab.type} />
<EllipsisText text={getTabName(tab)} className="flex-1" />
- <button
- className="block size-5 shrink-0 rounded-xs p-0.5 text-control-light transition-colors hover:bg-control-bg hover:text-control"
+ <Button
+ appearance="secondary"
+ size="xs"
+ className="block shrink-0 rounded-xs p-0.5 text-control-light transition-colors hover:bg-control-bg hover:text-control"
onClick={(e) => {
e.stopPropagation();
closeTab(tab.id);
}}
>
<X className="size-full" />
- </button>
+ </Button>
</div>
);
})}
diff --git a/frontend/src/modules/sql-editor/components/ConnectChooser.tsx b/frontend/src/modules/sql-editor/components/ConnectChooser.tsx
index 6c259d925c..ba6848e475 100644
--- a/frontend/src/modules/sql-editor/components/ConnectChooser.tsx
+++ b/frontend/src/modules/sql-editor/components/ConnectChooser.tsx
@@ -193,7 +193,9 @@ export function ConnectChooser({
filteredOptions.map((option) => {
const isSelected = option.value === value;
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={option.value}
type="button"
className={cn(
@@ -214,7 +216,7 @@ export function ConnectChooser({
{isSelected && (
<Check className="size-4 text-accent shrink-0" />
)}
- </button>
+ </Button>
);
})
)}
@@ -263,10 +265,7 @@ export function ConnectChooser({
ref={triggerRef}
variant="default"
size="sm"
- className={cn(
- "h-7 min-w-[10rem] px-1.5 gap-1 rounded-r-none text-sm",
- triggerClassName
- )}
+ className={cn("min-w-[10rem] rounded-r-none", triggerClassName)}
aria-label={placeholder}
aria-expanded={open}
onClick={() => setOpen((v) => !v)}
diff --git a/frontend/src/modules/sql-editor/components/ConnectionPane/ConnectionPane.tsx b/frontend/src/modules/sql-editor/components/ConnectionPane/ConnectionPane.tsx
index 180511cdb8..c2646c55df 100644
--- a/frontend/src/modules/sql-editor/components/ConnectionPane/ConnectionPane.tsx
+++ b/frontend/src/modules/sql-editor/components/ConnectionPane/ConnectionPane.tsx
@@ -11,6 +11,7 @@ import {
import { DatabaseGroupTable } from "@/components/DatabaseGroupTable";
import { EngineIcon } from "@/components/EngineIcon";
import { FeatureBadge } from "@/components/FeatureBadge";
+import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
import { Separator } from "@/components/ui/separator";
@@ -785,10 +786,12 @@ function SelectedDatabaseTag({
)}
<ChevronRight className="size-3 shrink-0" />
<span className="truncate max-w-[10rem]">{dbLabel}</span>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className={cn(
- "inline-flex items-center justify-center size-4 rounded-sm",
+ "inline-flex items-center justify-center rounded-sm",
"hover:bg-control-bg-hover disabled:opacity-50 disabled:cursor-not-allowed"
)}
aria-label={t("common.close")}
@@ -799,7 +802,7 @@ function SelectedDatabaseTag({
}}
>
<X className="size-3" />
- </button>
+ </Button>
</span>
);
}
@@ -1091,7 +1094,7 @@ function TreeRow({
// wrappers (Base UI's Tooltip.Trigger renders a `<span>`) can be
// the actual mousedown target when the wrapped control is
// disabled — `target.closest('button')` from that span walks UP
- // and won't find the disabled `<button>` descendant. Wrappers
+ // and won't find the disabled `<Button appearance="secondary" size="xs">` descendant. Wrappers
// owning interactive controls in this row mark themselves with
// `data-row-interactive` to opt out of row activation regardless
// of internal nesting.
@@ -1157,14 +1160,16 @@ function LoadMoreButton({
const { t } = useTranslation();
return (
<div className="w-full flex items-center justify-start pl-4">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-sm text-accent hover:underline disabled:opacity-50"
disabled={loading}
onClick={() => void onLoadMore()}
>
{t("common.load-more")}
- </button>
+ </Button>
</div>
);
}
diff --git a/frontend/src/modules/sql-editor/components/ConnectionPane/DatabaseGroupTag.tsx b/frontend/src/modules/sql-editor/components/ConnectionPane/DatabaseGroupTag.tsx
index b32b967d6d..71e59bd50e 100644
--- a/frontend/src/modules/sql-editor/components/ConnectionPane/DatabaseGroupTag.tsx
+++ b/frontend/src/modules/sql-editor/components/ConnectionPane/DatabaseGroupTag.tsx
@@ -1,6 +1,7 @@
import { Boxes, X } from "lucide-react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import { Tooltip } from "@/components/ui/tooltip";
import { cn } from "@/lib/utils";
import { useAppStore } from "@/stores/app";
@@ -42,10 +43,12 @@ export function DatabaseGroupTag({
>
<Boxes className="size-4 shrink-0" />
<span className="truncate max-w-[12rem]">{databaseGroup.title}</span>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className={cn(
- "inline-flex items-center justify-center size-4 rounded-sm",
+ "inline-flex items-center justify-center rounded-sm",
"hover:bg-control-bg-hover disabled:opacity-50 disabled:cursor-not-allowed"
)}
aria-label={t("common.close")}
@@ -57,7 +60,7 @@ export function DatabaseGroupTag({
}}
>
<X className="size-3" />
- </button>
+ </Button>
</span>
</Tooltip>
);
diff --git a/frontend/src/modules/sql-editor/components/FolderForm.tsx b/frontend/src/modules/sql-editor/components/FolderForm.tsx
index d1f79f3dbe..fec78e98f2 100644
--- a/frontend/src/modules/sql-editor/components/FolderForm.tsx
+++ b/frontend/src/modules/sql-editor/components/FolderForm.tsx
@@ -1,6 +1,7 @@
import { ChevronDown, ChevronRight } from "lucide-react";
import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { LAYER_ROOT_ID } from "@/components/ui/layer";
import { Popover, PopoverContent } from "@/components/ui/popover";
@@ -161,20 +162,22 @@ export function FolderForm({
onClick={() => handleUserClick(node.id)}
>
{hasChildren ? (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
onClick={(e) => {
e.stopPropagation();
node.toggle();
}}
- className="flex items-center justify-center size-4 shrink-0 text-control hover:text-main"
+ className="flex items-center justify-center shrink-0 text-control hover:text-main"
>
{node.isOpen ? (
<ChevronDown className="size-3" />
) : (
<ChevronRight className="size-3" />
)}
- </button>
+ </Button>
) : (
<span className="size-4 shrink-0" />
)}
diff --git a/frontend/src/modules/sql-editor/components/HistorySearchInput.tsx b/frontend/src/modules/sql-editor/components/HistorySearchInput.tsx
index 26dcac940f..d2187778d3 100644
--- a/frontend/src/modules/sql-editor/components/HistorySearchInput.tsx
+++ b/frontend/src/modules/sql-editor/components/HistorySearchInput.tsx
@@ -1,6 +1,8 @@
import { Search, X } from "lucide-react";
import { useLayoutEffect, useRef } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
+import { Textarea } from "@/components/ui/textarea";
import { cn } from "@/lib/utils";
// Tallest the box grows before it starts scrolling internally (px).
@@ -47,7 +49,8 @@ export function HistorySearchInput({
)}
>
<Search className="absolute left-2.5 top-2 h-4 w-4 text-control-placeholder pointer-events-none" />
- <textarea
+ <Textarea
+ size="xs"
ref={textareaRef}
rows={1}
value={value}
@@ -65,15 +68,17 @@ export function HistorySearchInput({
)}
/>
{value && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
data-clear-search
aria-label={t("common.clear")}
onClick={() => onChange("")}
- className="absolute right-1.5 top-1.5 flex h-5 w-5 items-center justify-center rounded-xs text-control-placeholder hover:bg-control-bg-hover hover:text-control"
+ className="absolute right-1.5 top-1.5 flex items-center justify-center rounded-xs text-control-placeholder hover:bg-control-bg-hover hover:text-control"
>
<X className="h-3.5 w-3.5" />
- </button>
+ </Button>
)}
</div>
);
diff --git a/frontend/src/modules/sql-editor/components/Panels/common/PanelSearchBox.tsx b/frontend/src/modules/sql-editor/components/Panels/common/PanelSearchBox.tsx
index edafd54024..6a1bf36d11 100644
--- a/frontend/src/modules/sql-editor/components/Panels/common/PanelSearchBox.tsx
+++ b/frontend/src/modules/sql-editor/components/Panels/common/PanelSearchBox.tsx
@@ -1,6 +1,7 @@
import { Search, X } from "lucide-react";
import type { ChangeEvent } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { cn } from "@/lib/utils";
@@ -36,14 +37,16 @@ export function PanelSearchBox({
onChange={handleChange}
/>
{value ? (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
aria-label={t("common.clear")}
- className="absolute right-1.5 top-1/2 -translate-y-1/2 size-5 inline-flex items-center justify-center rounded-xs text-control-placeholder hover:text-control hover:bg-control-bg"
+ className="absolute right-1.5 top-1/2 -translate-y-1/2 inline-flex items-center justify-center rounded-xs text-control-placeholder hover:text-control hover:bg-control-bg"
onClick={() => onChange("")}
>
<X className="size-3.5" />
- </button>
+ </Button>
) : null}
</div>
);
diff --git a/frontend/src/modules/sql-editor/components/ResultPanel/BatchQuerySelect.tsx b/frontend/src/modules/sql-editor/components/ResultPanel/BatchQuerySelect.tsx
index b9577b1d3a..0b118be011 100644
--- a/frontend/src/modules/sql-editor/components/ResultPanel/BatchQuerySelect.tsx
+++ b/frontend/src/modules/sql-editor/components/ResultPanel/BatchQuerySelect.tsx
@@ -323,7 +323,7 @@ export function BatchQuerySelect({
<Button
appearance={showEmpty ? "solid" : "secondary"}
size="sm"
- className="h-7 px-1.5 mb-2"
+ className="mb-2"
onClick={() => setShowEmpty(!showEmpty)}
aria-label={t(
"sql-editor.batch-query.show-or-hide-empty-query-results"
@@ -461,13 +461,15 @@ function TabButton({
...styleProp,
};
return (
- <button
+ <Button
+ appearance="secondary"
+ size="sm"
type="button"
ref={ref}
style={style}
onClick={onSelect}
className={cn(
- "inline-flex shrink-0 items-center gap-x-1 h-7 px-2 rounded-xs text-xs font-medium",
+ "inline-flex shrink-0 items-center gap-x-1 rounded-xs text-xs font-medium",
"border border-control-border cursor-pointer whitespace-nowrap",
className
)}
@@ -491,6 +493,6 @@ function TabButton({
onClose();
}}
/>
- </button>
+ </Button>
);
}
diff --git a/frontend/src/modules/sql-editor/components/ResultView/SelectionCopyTooltips.tsx b/frontend/src/modules/sql-editor/components/ResultView/SelectionCopyTooltips.tsx
index d286e13411..7ab588f7a5 100644
--- a/frontend/src/modules/sql-editor/components/ResultView/SelectionCopyTooltips.tsx
+++ b/frontend/src/modules/sql-editor/components/ResultView/SelectionCopyTooltips.tsx
@@ -60,9 +60,9 @@ export function SelectionCopyTooltips() {
return (
<Button
key={i}
- size="sm"
+ size="xs"
appearance="outline"
- className="h-6 px-2 gap-x-1 bg-control-bg text-control border-control-border"
+ className="bg-control-bg text-control border-control-border"
disabled
>
{isMac ? (
@@ -82,9 +82,9 @@ export function SelectionCopyTooltips() {
return (
<span key={i} className="inline-flex items-center">
<Button
- size="sm"
+ size="xs"
variant="default"
- className="h-6 px-2 gap-x-1 rounded-r-none"
+ className="rounded-r-none"
onClick={() => copy("selected", formatAsText)}
>
<CopyIcon className="size-3" />
@@ -96,10 +96,10 @@ export function SelectionCopyTooltips() {
delay={100}
render={
<Button
- size="sm"
+ size="xs"
variant="default"
aria-label={t("common.copy")}
- className="h-6 w-5 px-0 rounded-l-none border-l border-accent-text/30"
+ className="rounded-l-none border-l border-accent-text/30"
>
<ChevronDownIcon className="size-3" />
</Button>
diff --git a/frontend/src/modules/sql-editor/components/ResultView/VirtualDataTable.test.tsx b/frontend/src/modules/sql-editor/components/ResultView/VirtualDataTable.test.tsx
index 46ff032527..485872ecaf 100644
--- a/frontend/src/modules/sql-editor/components/ResultView/VirtualDataTable.test.tsx
+++ b/frontend/src/modules/sql-editor/components/ResultView/VirtualDataTable.test.tsx
@@ -137,7 +137,7 @@ describe("VirtualDataTable row detail action", () => {
});
expect(action).toHaveClass(
"border",
- "size-6",
+ "h-6",
"rounded-full",
"shadow"
);
diff --git a/frontend/src/modules/sql-editor/components/ResultView/VirtualDataTable.tsx b/frontend/src/modules/sql-editor/components/ResultView/VirtualDataTable.tsx
index 6da5eaa272..ffc14778cf 100644
--- a/frontend/src/modules/sql-editor/components/ResultView/VirtualDataTable.tsx
+++ b/frontend/src/modules/sql-editor/components/ResultView/VirtualDataTable.tsx
@@ -445,15 +445,15 @@ export const VirtualDataTable = forwardRef<
}}
>
{showRowDetailAction && (
- <div className="absolute left-3 top-1/2 size-6 -translate-y-1/2 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto">
+ <div className="absolute left-3 top-1/2 size-7 -translate-y-1/2 opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto group-focus-within:opacity-100 group-focus-within:pointer-events-auto">
<Tooltip
content={t("sql-editor.view-detail")}
side="right"
>
<Button
- size="sm"
+ size="xs"
appearance="outline"
- className="size-6 rounded-full p-0 shadow"
+ className="rounded-full shadow"
aria-label={t("sql-editor.view-detail")}
onClick={(event) => {
event.stopPropagation();
@@ -479,7 +479,9 @@ export const VirtualDataTable = forwardRef<
{rowIndex + 1}
</span>
{selectionEnabled && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
aria-label={`Select row ${rowIndex + 1}`}
onClick={(e) => handleSelectRow(e, rowIndex)}
diff --git a/frontend/src/modules/sql-editor/components/SQLEditorHomePage.tsx b/frontend/src/modules/sql-editor/components/SQLEditorHomePage.tsx
index 11f16a7cc9..fa857793fe 100644
--- a/frontend/src/modules/sql-editor/components/SQLEditorHomePage.tsx
+++ b/frontend/src/modules/sql-editor/components/SQLEditorHomePage.tsx
@@ -11,6 +11,7 @@ import {
import { useNavigate } from "@/app/router";
import { buildPlanCreateRoute } from "@/app/router/routeHelpers";
import { IAMRemindDialog } from "@/components/IAMRemindDialog";
+import { Button } from "@/components/ui/button";
import {
getLayerRoot,
LAYER_BACKDROP_CLASS,
@@ -179,10 +180,12 @@ export function SQLEditorHomePage() {
const mobileToggle = isNarrowWindow
? createPortal(
<SQLEditorThemeScope theme={theme} asContents>
- <button
+ <Button
+ appearance="secondary"
+ size="lg"
type="button"
className={cn(
- "fixed rounded-full border border-control-border shadow-lg w-10 h-10 bottom-16 flex items-center justify-center bg-background hover:bg-control-bg cursor-pointer transition-all",
+ "fixed rounded-full border border-control-border shadow-lg bottom-16 flex items-center justify-center bg-background hover:bg-control-bg cursor-pointer transition-all",
LAYER_SURFACE_CLASS,
sidebarExpanded ? "left-[80%] -translate-x-5" : "left-4"
)}
@@ -199,7 +202,7 @@ export function SQLEditorHomePage() {
!sidebarExpanded && "-scale-100"
)}
/>
- </button>
+ </Button>
</SQLEditorThemeScope>,
getLayerRoot("overlay")
)
diff --git a/frontend/src/modules/sql-editor/components/SchemaPane/SchemaContextMenu.tsx b/frontend/src/modules/sql-editor/components/SchemaPane/SchemaContextMenu.tsx
index e5f112bb42..34a35e8c5c 100644
--- a/frontend/src/modules/sql-editor/components/SchemaPane/SchemaContextMenu.tsx
+++ b/frontend/src/modules/sql-editor/components/SchemaPane/SchemaContextMenu.tsx
@@ -1,6 +1,7 @@
import { Menu as BaseMenu } from "@base-ui/react/menu";
import { forwardRef, useImperativeHandle, useRef, useState } from "react";
import { flushSync } from "react-dom";
+import { Button } from "@/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
@@ -79,7 +80,9 @@ export const SchemaContextMenu = forwardRef<SchemaContextMenuHandle, Props>(
aria-hidden
tabIndex={-1}
render={
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
style={{
position: "fixed",
diff --git a/frontend/src/modules/sql-editor/components/SharePopoverBody.tsx b/frontend/src/modules/sql-editor/components/SharePopoverBody.tsx
index 6af2a17c45..80e198883b 100644
--- a/frontend/src/modules/sql-editor/components/SharePopoverBody.tsx
+++ b/frontend/src/modules/sql-editor/components/SharePopoverBody.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
import { router } from "@/app/router";
import { SQL_EDITOR_SAVED_QUERY_MODULE } from "@/app/router/handles";
import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
import { Separator } from "@/components/ui/separator";
import { writeTextToClipboard } from "@/lib/clipboard";
import { useAppStore } from "@/stores/app";
@@ -97,7 +98,8 @@ export function SharePopoverBody({ savedQuery }: Props) {
<Link2 className="size-4" />
</div>
{/* URL input — always read-only; the link itself is not editable. */}
- <input
+ <Input
+ size="sm"
type="text"
readOnly
value={sharedTabLink}
@@ -115,7 +117,7 @@ export function SharePopoverBody({ savedQuery }: Props) {
data-copy-btn
disabled={!sharedTabLink}
onClick={handleCopyLink}
- className="h-full rounded-none border-l border-control-border bg-background enabled:hover:bg-control-bg-hover enabled:hover:text-main disabled:bg-control-bg focus-visible:ring-inset focus-visible:ring-offset-0"
+ className="self-stretch rounded-none border-l border-control-border bg-background enabled:hover:bg-control-bg-hover enabled:hover:text-main disabled:bg-control-bg focus-visible:ring-inset focus-visible:ring-offset-0"
>
<Copy className="size-4" />
</Button>
diff --git a/frontend/src/modules/sql-editor/components/StandardPanel/SQLUploadButton.tsx b/frontend/src/modules/sql-editor/components/StandardPanel/SQLUploadButton.tsx
index 4d87edb073..5b2b3e1e07 100644
--- a/frontend/src/modules/sql-editor/components/StandardPanel/SQLUploadButton.tsx
+++ b/frontend/src/modules/sql-editor/components/StandardPanel/SQLUploadButton.tsx
@@ -2,7 +2,7 @@ import type { ChangeEvent, ReactNode } from "react";
import { useCallback, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/components/ui/button";
-import { cn } from "@/lib/utils";
+import { Input } from "@/components/ui/input";
import { useAppStore } from "@/stores/app";
import { MAX_UPLOAD_FILE_SIZE_MB } from "@/utils";
import { FileContentPreviewModal } from "./FileContentPreviewModal";
@@ -87,7 +87,7 @@ export function SQLUploadButton({
type="button"
appearance="secondary"
size="sm"
- className={cn("h-7 px-1", className)}
+ className={className}
onClick={handleClick}
>
{children}
@@ -95,7 +95,7 @@ export function SQLUploadButton({
<span className="ml-1">{t("sql-editor.upload-file")}</span>
)}
</Button>
- <input
+ <Input
ref={inputRef}
type="file"
accept=".sql,.txt,application/sql,text/plain"
diff --git a/frontend/src/modules/sql-editor/components/TabItem/Label.tsx b/frontend/src/modules/sql-editor/components/TabItem/Label.tsx
index 9ecbf8462f..c1bbc6d9ed 100644
--- a/frontend/src/modules/sql-editor/components/TabItem/Label.tsx
+++ b/frontend/src/modules/sql-editor/components/TabItem/Label.tsx
@@ -2,6 +2,7 @@ import { create } from "@bufbuild/protobuf";
import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { EllipsisText } from "@/components/ui/ellipsis-text";
+import { Input } from "@/components/ui/input";
import { cn } from "@/lib/utils";
import { tabListEvents } from "@/modules/sql-editor/model/TabList/events";
import { getSQLEditorTabsState } from "@/modules/sql-editor/store/tab";
@@ -145,10 +146,11 @@ export function Label({ tab }: Props) {
/>
)}
{editing && (
- <input
+ <Input
+ size="xs"
ref={inputRef}
type="text"
- className="absolute inset-0 border-0 border-b p-0 text-sm leading-5 bg-background"
+ className="absolute inset-0 h-auto border-0 border-b p-0 text-sm leading-5 bg-background"
value={draft}
placeholder={t("common.untitled")}
onChange={(e) => setDraft(e.target.value)}
diff --git a/frontend/src/modules/sql-editor/components/TabList.tsx b/frontend/src/modules/sql-editor/components/TabList.tsx
index bec949f7fd..10fb7a8c8d 100644
--- a/frontend/src/modules/sql-editor/components/TabList.tsx
+++ b/frontend/src/modules/sql-editor/components/TabList.tsx
@@ -287,7 +287,9 @@ export function TabList() {
/>
))}
<div className="shrink-0 sticky right-0 bg-background flex items-stretch justify-end">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className={cn(
"bg-control-bg/20 hover:bg-accent/10 py-1 px-1.5",
@@ -298,7 +300,7 @@ export function TabList() {
aria-label={t("common.add")}
>
<Plus className="size-5" strokeWidth={2.5} />
- </button>
+ </Button>
</div>
</div>
</SortableContext>
diff --git a/frontend/src/modules/sql-editor/components/TerminalPanel/TerminalPanel.tsx b/frontend/src/modules/sql-editor/components/TerminalPanel/TerminalPanel.tsx
index 6f092ce152..495c7520cd 100644
--- a/frontend/src/modules/sql-editor/components/TerminalPanel/TerminalPanel.tsx
+++ b/frontend/src/modules/sql-editor/components/TerminalPanel/TerminalPanel.tsx
@@ -2,6 +2,7 @@ import { Loader2 } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import type { IStandaloneCodeEditor } from "@/components/monaco/types";
+import { Button } from "@/components/ui/button";
import { ConnectionHolder } from "@/modules/sql-editor/components/ConnectionHolder";
import { EditorAction } from "@/modules/sql-editor/components/EditorAction";
import { ResultView } from "@/modules/sql-editor/components/ResultView";
@@ -245,13 +246,15 @@ export function TerminalPanel() {
<div className="absolute inset-0 bg-overlay/20 flex justify-center items-center gap-2">
<Loader2 className="size-5 animate-spin text-control-light" />
{query === currentQuery && expired && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-control-placeholder cursor-pointer hover:underline text-sm select-none"
onClick={handleCancelQuery}
>
{t("common.cancel")}
- </button>
+ </Button>
)}
</div>
)}
diff --git a/frontend/src/routes/auth/MultiFactorPage.tsx b/frontend/src/routes/auth/MultiFactorPage.tsx
index fc0e121968..4a886dc454 100644
--- a/frontend/src/routes/auth/MultiFactorPage.tsx
+++ b/frontend/src/routes/auth/MultiFactorPage.tsx
@@ -99,24 +99,28 @@ export function MultiFactorPage() {
<ul className="list-disc list-inside pl-2 pt-1">
{mfaType !== "OTP" && (
<li>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="accent-link"
onClick={() => setMfaType("OTP")}
>
{t("multi-factor.other-methods.use-auth-app.self")}
- </button>
+ </Button>
</li>
)}
{mfaType !== "RECOVERY_CODE" && (
<li>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="accent-link"
onClick={() => setMfaType("RECOVERY_CODE")}
>
{t("multi-factor.other-methods.use-recovery-code.self")}
- </button>
+ </Button>
</li>
)}
</ul>
diff --git a/frontend/src/routes/auth/OAuth2ConsentPage.tsx b/frontend/src/routes/auth/OAuth2ConsentPage.tsx
index 46b533daf3..f4d459570a 100644
--- a/frontend/src/routes/auth/OAuth2ConsentPage.tsx
+++ b/frontend/src/routes/auth/OAuth2ConsentPage.tsx
@@ -6,6 +6,7 @@ import { AUTH_SIGNIN_MODULE } from "@/app/router/handles";
import { BytebaseLogo } from "@/components/BytebaseLogo";
import { readConsentCeiling } from "@/components/mcp/mcpPolicy";
import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
@@ -349,17 +350,17 @@ export function OAuth2ConsentPage() {
dataMaskingAvailable={dataMaskingAvailable}
/>
<form method="POST" action={AUTHORIZE_URL}>
- <input type="hidden" name="client_id" value={clientId} />
- <input type="hidden" name="redirect_uri" value={redirectUri} />
- <input type="hidden" name="state" value={oauthState} />
- <input type="hidden" name="code_challenge" value={codeChallenge} />
- <input
+ <Input type="hidden" name="client_id" value={clientId} />
+ <Input type="hidden" name="redirect_uri" value={redirectUri} />
+ <Input type="hidden" name="state" value={oauthState} />
+ <Input type="hidden" name="code_challenge" value={codeChallenge} />
+ <Input
type="hidden"
name="code_challenge_method"
value={codeChallengeMethod}
/>
- <input type="hidden" name="resource" value={resource} />
- <input type="hidden" name="scope" value={scope} />
+ <Input type="hidden" name="resource" value={resource} />
+ <Input type="hidden" name="scope" value={scope} />
<div className="flex gap-x-2">
<Button
type="button"
diff --git a/frontend/src/routes/auth/PasswordResetPage.tsx b/frontend/src/routes/auth/PasswordResetPage.tsx
index a1c49f9041..4b19ad60ce 100644
--- a/frontend/src/routes/auth/PasswordResetPage.tsx
+++ b/frontend/src/routes/auth/PasswordResetPage.tsx
@@ -231,7 +231,9 @@ export function PasswordResetPage() {
/>
</div>
<div className="mt-2 flex items-center justify-end">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-sm text-accent disabled:text-control-light disabled:cursor-not-allowed"
disabled={resendCountdown > 0}
@@ -242,7 +244,7 @@ export function PasswordResetPage() {
seconds: resendCountdown,
})
: t("auth.sign-in.resend-code")}
- </button>
+ </Button>
</div>
</div>
</>
diff --git a/frontend/src/routes/project/ProjectIssueDetailPage.tsx b/frontend/src/routes/project/ProjectIssueDetailPage.tsx
index 5fabac9a10..f3641482af 100644
--- a/frontend/src/routes/project/ProjectIssueDetailPage.tsx
+++ b/frontend/src/routes/project/ProjectIssueDetailPage.tsx
@@ -98,7 +98,9 @@ export function ProjectIssueDetailPage(props: ProjectIssueDetailPageProps) {
: "invisible pointer-events-none"
)}
>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className={cn(
"absolute inset-0 bg-overlay/40 transition-opacity duration-200",
LAYER_BACKDROP_CLASS,
diff --git a/frontend/src/routes/project/ProjectPlanDashboardPage.tsx b/frontend/src/routes/project/ProjectPlanDashboardPage.tsx
index 552ae6de75..70a51911af 100644
--- a/frontend/src/routes/project/ProjectPlanDashboardPage.tsx
+++ b/frontend/src/routes/project/ProjectPlanDashboardPage.tsx
@@ -815,7 +815,9 @@ function DatabaseAndGroupSelector({
return (
<div className="flex flex-col gap-y-3">
<div className="flex border-b border-control-border">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className={cn(
"px-4 py-2 text-sm font-medium border-b-2 -mb-px transition-colors",
@@ -829,8 +831,10 @@ function DatabaseAndGroupSelector({
<DatabaseIcon className="size-4" />
{t("common.databases")}
</span>
- </button>
- <button
+ </Button>
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className={cn(
"px-4 py-2 text-sm font-medium border-b-2 -mb-px transition-colors",
@@ -844,7 +848,7 @@ function DatabaseAndGroupSelector({
<FolderTree className="size-4" />
{t("common.database-group")}
</span>
- </button>
+ </Button>
</div>
{changeSource === "DATABASE" ? (
diff --git a/frontend/src/routes/project/ProjectReleaseDashboardPage.tsx b/frontend/src/routes/project/ProjectReleaseDashboardPage.tsx
index ad0b155275..f4c7316301 100644
--- a/frontend/src/routes/project/ProjectReleaseDashboardPage.tsx
+++ b/frontend/src/routes/project/ProjectReleaseDashboardPage.tsx
@@ -17,6 +17,13 @@ import {
ProjectPageLayout,
} from "@/components/ProjectPageLayout";
import { Button } from "@/components/ui/button";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
import {
Table,
TableBody,
@@ -174,19 +181,25 @@ function CategorySelect({
loading: boolean;
}) {
return (
- <select
- className="w-64 border border-control-border rounded-sm text-sm px-3 py-1.5 bg-background focus:outline-none focus:border-accent"
+ <Select
value={value}
- onChange={(e) => onChange(e.target.value)}
+ onValueChange={(nextValue: string | null) => {
+ if (nextValue !== null) onChange(nextValue);
+ }}
disabled={loading}
>
- <option value="">All</option>
- {categories.map((cat) => (
- <option key={cat} value={cat}>
- {cat}
- </option>
- ))}
- </select>
+ <SelectTrigger className="w-64 rounded-sm px-3 text-sm">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="">All</SelectItem>
+ {categories.map((cat) => (
+ <SelectItem key={cat} value={cat}>
+ {cat}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
);
}
diff --git a/frontend/src/routes/project/ProjectSettingsPage.tsx b/frontend/src/routes/project/ProjectSettingsPage.tsx
index 78db57cb6e..c1d8af4c1d 100644
--- a/frontend/src/routes/project/ProjectSettingsPage.tsx
+++ b/frontend/src/routes/project/ProjectSettingsPage.tsx
@@ -23,6 +23,7 @@ import { PermissionGuard } from "@/components/PermissionGuard";
import { ResourceIdField } from "@/components/ResourceIdField";
import { RouterLink } from "@/components/RouterLink";
import { Button } from "@/components/ui/button";
+import { ColorSwatchInput } from "@/components/ui/color-input";
import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
import {
FormControlRow,
@@ -895,24 +896,23 @@ export function ProjectSettingsPage() {
key={index}
className="inline-flex h-9 items-center gap-x-2 border border-control-border rounded-sm px-1 py-1"
>
- <input
- type="color"
+ <ColorSwatchInput
value={label.color ? colorToHex(label.color) : "#4f46e5"}
- onChange={(e) =>
- updateIssueLabelColor(index, e.target.value)
- }
+ onChange={(value) => updateIssueLabelColor(index, value)}
disabled={!canUpdateProject}
- className="w-5 h-6 rounded-sm cursor-pointer border-0 p-0"
+ className="h-6 w-5 rounded-sm border-0"
/>
<span className="text-sm">{label.value}</span>
{canUpdateProject && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-control-light hover:text-main"
onClick={() => removeIssueLabel(index)}
>
<X className="size-3" />
- </button>
+ </Button>
)}
</span>
))}
@@ -1208,7 +1208,9 @@ export function ProjectSettingsPage() {
</div>
) : (
reviewPolicyList.map((policy) => (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={policy.id}
type="button"
className="w-full text-left px-4 py-3 border border-control-border rounded-sm hover:bg-control-bg transition-colors"
@@ -1227,7 +1229,7 @@ export function ProjectSettingsPage() {
})}
</div>
)}
- </button>
+ </Button>
))
)}
</div>
diff --git a/frontend/src/routes/project/ProjectSyncSchemaPage.tsx b/frontend/src/routes/project/ProjectSyncSchemaPage.tsx
index ddc1172ce3..1c050b7dd1 100644
--- a/frontend/src/routes/project/ProjectSyncSchemaPage.tsx
+++ b/frontend/src/routes/project/ProjectSyncSchemaPage.tsx
@@ -46,6 +46,7 @@ import {
SheetTitle,
} from "@/components/ui/sheet";
import { StepIndicator } from "@/components/ui/step-indicator";
+import { Table } from "@/components/ui/table";
import { useClickOutside } from "@/hooks/useClickOutside";
import { useEscapeKey } from "@/hooks/useEscapeKey";
import { useProjectByName } from "@/hooks/useProjectByName";
@@ -797,11 +798,13 @@ function ChangelogSelector({
return (
<div ref={containerRef} className="relative w-full">
- <button
+ <Button
+ appearance="secondary"
+ size="md"
type="button"
disabled={disabled}
className={cn(
- "w-full flex items-center justify-between gap-2 border border-control-border rounded-xs h-9 px-3 text-sm bg-background text-left transition-colors",
+ "w-full flex items-center justify-between gap-2 border border-control-border rounded-xs text-sm bg-background text-left transition-colors",
"hover:border-control-border",
"disabled:opacity-50 disabled:pointer-events-none",
open && "border-accent shadow-[0_0_0_1px_var(--color-accent)]"
@@ -826,7 +829,7 @@ function ChangelogSelector({
open && "rotate-180"
)}
/>
- </button>
+ </Button>
{open && (
<div
className={cn(
@@ -836,7 +839,9 @@ function ChangelogSelector({
>
<div className="max-h-60 overflow-y-auto">
{entries.map((entry) => (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={entry.name}
type="button"
className={cn(
@@ -850,10 +855,12 @@ function ChangelogSelector({
}}
>
<ChangelogLabel entry={entry} />
- </button>
+ </Button>
))}
{nextPageToken && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="w-full text-center px-3 py-2 text-sm text-accent hover:bg-control-bg transition-colors"
onClick={(e) => {
@@ -863,7 +870,7 @@ function ChangelogSelector({
disabled={loadingMore}
>
{loadingMore ? t("common.loading") : t("common.load-more")}
- </button>
+ </Button>
)}
</div>
</div>
@@ -1066,7 +1073,9 @@ function SourceSchemaInfo({
<span>{t("database.sync-schema.source-schema")}</span>
{changelogSourceSchema ? (
<>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="inline-flex items-center gap-x-1 px-2.5 py-0.5 rounded-full bg-control-bg hover:bg-control-bg-hover text-sm transition-colors"
onClick={gotoDatabase}
>
@@ -1078,14 +1087,16 @@ function SourceSchemaInfo({
.databaseName
}
</span>
- </button>
- <button
+ </Button>
+ <Button
+ appearance="secondary"
+ size="xs"
className="inline-flex items-center gap-x-1 px-2.5 py-0.5 rounded-full bg-control-bg hover:bg-control-bg-hover text-sm transition-colors"
onClick={gotoChangelog}
>
<span className="opacity-60 mr-1">{t("common.changelog")}</span>
<span>{changelogUID ? `#${changelogUID}` : "Latest"}</span>
- </button>
+ </Button>
</>
) : (
<>
@@ -1407,17 +1418,21 @@ function SelectTargetDatabasesView({
<span className="text-sm">
{t("database.sync-schema.target-databases")}
</span>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="p-0.5 rounded-sm bg-control-bg hover:shadow-sm hover:opacity-80"
onClick={() => setShowSelectPanel(true)}
>
<Plus className="w-4 h-auto" />
- </button>
+ </Button>
</div>
{targetDatabaseList.length > 0 && (
<div className="w-full mt-2 px-2">
<div className="flex rounded-xs bg-control-bg p-0.5">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className={cn(
"flex-1 text-xs px-2 py-1 rounded-xs transition-colors",
showDatabaseWithDiff
@@ -1430,8 +1445,10 @@ function SelectTargetDatabasesView({
<span className="text-control-placeholder">
({databaseListWithDiff.length})
</span>
- </button>
- <button
+ </Button>
+ <Button
+ appearance="secondary"
+ size="xs"
className={cn(
"flex-1 text-xs px-2 py-1 rounded-xs transition-colors",
!showDatabaseWithDiff
@@ -1444,7 +1461,7 @@ function SelectTargetDatabasesView({
<span className="text-control-placeholder">
({databaseListWithoutDiff.length})
</span>
- </button>
+ </Button>
</div>
</div>
)}
@@ -1477,7 +1494,9 @@ function SelectTargetDatabasesView({
</span>
</span>
<div className="grow" />
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="hidden shrink-0 group-hover:block ml-1 p-0.5 rounded-sm bg-background hover:shadow-sm"
onClick={(e) => {
e.stopPropagation();
@@ -1485,7 +1504,7 @@ function SelectTargetDatabasesView({
}}
>
<Minus className="w-4 h-auto text-control-light" />
- </button>
+ </Button>
</div>
))}
{targetDatabaseList.length === 0 && (
@@ -1576,28 +1595,32 @@ function DiffViewPanel({
<div className="w-full h-full flex flex-col gap-y-2">
{/* Tabs */}
<div className="flex border-b border-control-border gap-x-4">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className={cn(
- "relative px-1 pb-2 text-sm font-medium transition-colors cursor-pointer",
+ "relative h-auto px-1 pb-2 text-sm font-medium transition-colors cursor-pointer",
tab === "diff"
- ? "text-accent after:absolute after:inset-x-0 after:-bottom-px after:h-0.5 after:bg-accent"
+ ? "text-accent after:absolute after:inset-x-0 after:-bottom-px after:border-b-2 after:border-accent"
: "text-control-light hover:text-control"
)}
onClick={() => setTab("diff")}
>
{t("database.sync-schema.schema-change")}
- </button>
- <button
+ </Button>
+ <Button
+ appearance="secondary"
+ size="xs"
className={cn(
- "relative px-1 pb-2 text-sm font-medium transition-colors cursor-pointer",
+ "relative h-auto px-1 pb-2 text-sm font-medium transition-colors cursor-pointer",
tab === "ddl"
- ? "text-accent after:absolute after:inset-x-0 after:-bottom-px after:h-0.5 after:bg-accent"
+ ? "text-accent after:absolute after:inset-x-0 after:-bottom-px after:border-b-2 after:border-accent"
: "text-control-light hover:text-control"
)}
onClick={() => setTab("ddl")}
>
{t("database.sync-schema.generated-ddl-statement")}
- </button>
+ </Button>
</div>
<div className="flex-1 w-full flex flex-col gap-y-2 overflow-hidden">
@@ -2042,7 +2065,7 @@ function TargetDatabasesSelectPanel({
</div>
) : (
<>
- <table className="w-full text-sm">
+ <Table>
<thead>
<tr className="border-b">
<th className="py-2 px-2 w-8 text-left">
@@ -2099,7 +2122,7 @@ function TargetDatabasesSelectPanel({
</tr>
))}
</tbody>
- </table>
+ </Table>
{dbNextPageToken && (
<div className="flex justify-center py-3">
<Button
diff --git a/frontend/src/routes/project/database-detail/DatabaseDetailHeader.tsx b/frontend/src/routes/project/database-detail/DatabaseDetailHeader.tsx
index ed07ee0f51..4386be3d08 100644
--- a/frontend/src/routes/project/database-detail/DatabaseDetailHeader.tsx
+++ b/frontend/src/routes/project/database-detail/DatabaseDetailHeader.tsx
@@ -3,6 +3,7 @@ import { useCallback, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { InstanceLabel } from "@/components/InstanceLabel";
import { RouterLink } from "@/components/RouterLink";
+import { Button } from "@/components/ui/button";
import { useEnvironment, usePlanFeature } from "@/hooks/useAppState";
import { writeTextToClipboard } from "@/lib/clipboard";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
@@ -102,7 +103,9 @@ export function DatabaseDetailHeader({ database }: { database: Database }) {
<span className="min-w-0 truncate" title={database.name}>
{database.name}
</span>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="inline-flex shrink-0 items-center p-0.5 text-control-light hover:text-main"
onClick={() => void handleCopy()}
@@ -112,7 +115,7 @@ export function DatabaseDetailHeader({ database }: { database: Database }) {
) : (
<Copy className="h-3.5 w-3.5" />
)}
- </button>
+ </Button>
</div>
</div>
diff --git a/frontend/src/routes/project/database-detail/overview/TableDetailSheet.tsx b/frontend/src/routes/project/database-detail/overview/TableDetailSheet.tsx
index 4b99c46c1f..7ad80ec6eb 100644
--- a/frontend/src/routes/project/database-detail/overview/TableDetailSheet.tsx
+++ b/frontend/src/routes/project/database-detail/overview/TableDetailSheet.tsx
@@ -1122,7 +1122,7 @@ function TableDetailSheetContent({
/>
</div>
<div className="rounded-sm border border-block-border">
- <table className="min-w-full divide-y divide-block-border text-sm">
+ <Table className="min-w-full divide-y divide-block-border">
<thead className="bg-control-bg">
<tr className="text-left text-sm text-control-light">
<th className="px-4 py-2 font-medium">
@@ -1247,7 +1247,7 @@ function TableDetailSheetContent({
</tr>
)}
</tbody>
- </table>
+ </Table>
</div>
</DetailSection>
)}
@@ -1262,7 +1262,7 @@ function TableDetailSheetContent({
<div className="border-b border-block-border px-4 py-3 text-base font-medium text-main">
{index.name}
</div>
- <table className="min-w-full divide-y divide-block-border text-sm">
+ <Table className="min-w-full divide-y divide-block-border">
<thead className="bg-control-bg">
<tr className="text-left text-sm text-control-light">
<th className="px-4 py-2 font-medium">
@@ -1303,7 +1303,7 @@ function TableDetailSheetContent({
)}
</tr>
</tbody>
- </table>
+ </Table>
</div>
))}
</DetailSection>
diff --git a/frontend/src/routes/project/database-detail/revision/ImportRevisionSheet.tsx b/frontend/src/routes/project/database-detail/revision/ImportRevisionSheet.tsx
index 51cf223b1f..2466957994 100644
--- a/frontend/src/routes/project/database-detail/revision/ImportRevisionSheet.tsx
+++ b/frontend/src/routes/project/database-detail/revision/ImportRevisionSheet.tsx
@@ -15,6 +15,13 @@ import { ReleaseFileTable } from "@/components/release/ReleaseFileTable";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
import {
Sheet,
SheetBody,
@@ -578,7 +585,9 @@ function SourceOption({
onSelect: (source: "release" | "local") => void;
}) {
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
role="radio"
aria-checked={selected}
@@ -601,7 +610,7 @@ function SourceOption({
<p className="mt-1 text-sm text-control-light">{description}</p>
</div>
</div>
- </button>
+ </Button>
);
}
@@ -700,7 +709,7 @@ function LocalFileUpload({
<div className="text-sm text-control-light">
{t("database.revision.upload-files-description")}
</div>
- <input
+ <Input
ref={fileInputRef}
type="file"
multiple
@@ -781,25 +790,30 @@ function LocalFileUpload({
<span className="text-xs text-control-light">
{t("database.revision.revision-type")}
</span>
- <select
- className="h-9 rounded-xs border border-control-border bg-background px-2 text-sm"
+ <Select
value={file.type}
- onChange={(event) => {
+ onValueChange={(type: Revision_Type | null) => {
+ if (type === null) return;
const next = [...files];
next[index] = {
...file,
- type: Number(event.target.value) as Revision_Type,
+ type,
};
onFilesChange(next);
}}
>
- <option value={Revision_Type.VERSIONED}>
- {t("database.revision.type-versioned")}
- </option>
- <option value={Revision_Type.DECLARATIVE}>
- {t("database.revision.type-declarative")}
- </option>
- </select>
+ <SelectTrigger className="px-2 text-sm">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value={Revision_Type.VERSIONED}>
+ {t("database.revision.type-versioned")}
+ </SelectItem>
+ <SelectItem value={Revision_Type.DECLARATIVE}>
+ {t("database.revision.type-declarative")}
+ </SelectItem>
+ </SelectContent>
+ </Select>
</label>
</div>
{file.content && (
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
index 738299b1b4..7baa7c8696 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
@@ -11,6 +11,7 @@ import {
import { buildPlanRolloutRouteFromPlanName } from "@/app/router/routeHelpers";
import { DatabaseTargetDisplay } from "@/components/DatabaseTargetDisplay";
import { RouterLink } from "@/components/RouterLink";
+import { Button } from "@/components/ui/button";
import { SearchInput } from "@/components/ui/search-input";
import {
Select,
@@ -114,7 +115,9 @@ export function IssueDetailDatabaseChangeView({
{specs.map((spec, index) => {
const isSelected = selectedSpec?.id === spec.id;
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={spec.id}
className={cn(
"relative -mb-px flex cursor-pointer items-center gap-1 rounded-t-sm border px-3 py-1.5 text-sm transition-colors",
@@ -132,7 +135,7 @@ export function IssueDetailDatabaseChangeView({
<span className="text-error">*</span>
</Tooltip>
)}
- </button>
+ </Button>
);
})}
</div>
@@ -666,13 +669,15 @@ function IssueDetailDatabaseChangeTargets({
</div>
))}
{targets.length > DEFAULT_VISIBLE_TARGETS && (
- <button
- className="h-7 cursor-pointer rounded-sm px-2 text-xs text-control transition-colors hover:bg-control-bg"
+ <Button
+ appearance="secondary"
+ size="sm"
+ className="cursor-pointer rounded-sm text-xs text-control transition-colors hover:bg-control-bg"
onClick={() => setShowAllTargetsDialog(true)}
type="button"
>
{t("plan.targets.view-all", { count: targets.length })}
- </button>
+ </Button>
)}
</div>
) : (
@@ -817,13 +822,15 @@ function IssueDetailDatabaseGroupTarget({
{extractDatabaseGroupName(databaseGroup.name || target)}
</span>
{isValidDatabaseGroupName(databaseGroup.name) && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="flex cursor-pointer items-center opacity-60 hover:opacity-100"
onClick={gotoDatabaseGroupDetailPage}
type="button"
>
<ExternalLink className="h-4 w-auto" />
- </button>
+ </Button>
)}
</div>
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailLabels.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailLabels.tsx
index 828cdaab02..71c4ddfefb 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailLabels.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailLabels.tsx
@@ -12,6 +12,7 @@ import { issueServiceClientConnect } from "@/api";
import { router } from "@/app/router";
import { PROJECT_V1_ROUTE_SETTINGS } from "@/app/router/handles";
import { RouterLink } from "@/components/RouterLink";
+import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { LAYER_SURFACE_CLASS } from "@/components/ui/layer";
import { useClickOutside } from "@/hooks/useClickOutside";
@@ -137,7 +138,9 @@ export function IssueDetailLabels() {
{project?.forceIssueLabels && <span className="text-error">*</span>}
</div>
<div ref={containerRef} className="relative">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className={cn(
"flex min-h-9 w-full items-center justify-between gap-2 rounded-sm border border-control-border bg-background px-3 py-1.5 text-left text-sm transition-colors",
allowChange && !isUpdating && "hover:bg-control-bg",
@@ -163,7 +166,9 @@ export function IssueDetailLabels() {
/>
<span className="truncate">{value}</span>
{allowChange && !isUpdating && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="text-control-placeholder hover:text-control"
onClick={(e) => {
void removeSelectedLabel(value, e);
@@ -171,7 +176,7 @@ export function IssueDetailLabels() {
type="button"
>
<X className="size-3" />
- </button>
+ </Button>
)}
</span>
);
@@ -188,7 +193,7 @@ export function IssueDetailLabels() {
open && "rotate-180"
)}
/>
- </button>
+ </Button>
{open && (
<div
@@ -221,7 +226,9 @@ export function IssueDetailLabels() {
options.map((option) => {
const isSelected = selected.includes(option.value);
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={option.value}
className="flex w-full items-center gap-x-2 px-3 py-2 text-left text-sm transition-colors hover:bg-control-bg"
disabled={isUpdating}
@@ -236,7 +243,7 @@ export function IssueDetailLabels() {
style={{ backgroundColor: option.color }}
/>
<span>{option.value}</span>
- </button>
+ </Button>
);
})
)}
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailStatementSection.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailStatementSection.tsx
index bf483b4749..e73a42da0e 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailStatementSection.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailStatementSection.tsx
@@ -7,6 +7,7 @@ import { MonacoEditor, ReadonlyMonaco } from "@/components/monaco";
import { ReleaseInfoCard } from "@/components/release/ReleaseInfoCard";
import { Alert } from "@/components/ui/alert";
import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
import { useCurrentUser, useReleaseByName } from "@/hooks/useAppState";
import { useProjectByName } from "@/hooks/useProjectByName";
import { seedSheetStatement } from "@/hooks/useSheetStatement";
@@ -395,7 +396,7 @@ export function IssueDetailStatementSection({
<span>{statementTitle}</span>
{isEmpty && <span className="text-error">*</span>}
</div>
- <input
+ <Input
ref={inputRef}
accept=".sql,.txt,application/sql,text/plain"
className="hidden"
diff --git a/frontend/src/routes/project/issue-detail/components/IssueDetailTitleInput.tsx b/frontend/src/routes/project/issue-detail/components/IssueDetailTitleInput.tsx
index 2b81203aa2..ec0bed8920 100644
--- a/frontend/src/routes/project/issue-detail/components/IssueDetailTitleInput.tsx
+++ b/frontend/src/routes/project/issue-detail/components/IssueDetailTitleInput.tsx
@@ -3,6 +3,7 @@ import { Loader2 } from "lucide-react";
import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { issueServiceClientConnect } from "@/api";
+import { Input } from "@/components/ui/input";
import { useProjectByName } from "@/hooks/useProjectByName";
import { pushNotification } from "@/stores";
import { useAppStore } from "@/stores/app";
@@ -87,7 +88,8 @@ export function IssueDetailTitleInput() {
return (
<div className="relative min-w-0 flex-1">
- <input
+ <Input
+ size="lg"
className={[
"h-10 w-full bg-transparent text-xl! font-bold text-main transition-colors outline-hidden",
"placeholder:text-control-placeholder",
diff --git a/frontend/src/routes/project/plan-detail/components/PlanDetailChangesBranch.tsx b/frontend/src/routes/project/plan-detail/components/PlanDetailChangesBranch.tsx
index a034230bd8..9896b9678e 100644
--- a/frontend/src/routes/project/plan-detail/components/PlanDetailChangesBranch.tsx
+++ b/frontend/src/routes/project/plan-detail/components/PlanDetailChangesBranch.tsx
@@ -589,7 +589,7 @@ export function PlanDetailChangesBranch({
aria-label={t("plan.add-spec")}
className={cn(
ICON_ACTION_CLASS,
- "size-7 rounded-xs p-0 [touch-action:manipulation]"
+ "rounded-xs [touch-action:manipulation]"
)}
disabled={Boolean(pendingNewSpec)}
onClick={() => setShowAddSpecSheet(true)}
@@ -1695,7 +1695,9 @@ function DatabaseAndGroupSelector({
return (
<div className="flex flex-col gap-y-3">
<div className="flex border-b border-control-border">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className={cn(
"border-b-2 -mb-px px-4 py-2 text-sm font-medium transition-colors",
@@ -1709,8 +1711,10 @@ function DatabaseAndGroupSelector({
<DatabaseIcon className="size-4" />
{t("common.databases")}
</span>
- </button>
- <button
+ </Button>
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className={cn(
"border-b-2 -mb-px px-4 py-2 text-sm font-medium transition-colors",
@@ -1724,7 +1728,7 @@ function DatabaseAndGroupSelector({
<FolderTree className="size-4" />
{t("common.database-group")}
</span>
- </button>
+ </Button>
</div>
{changeSource === "DATABASE" ? (
@@ -2096,7 +2100,7 @@ export function DatabaseGroupTarget({
<PopoverTrigger
render={
<Button
- className="h-6 px-1.5 text-xs text-accent hover:bg-accent/10 hover:text-accent"
+ className="text-accent hover:bg-accent/10 hover:text-accent"
size="xs"
type="button"
appearance="secondary"
diff --git a/frontend/src/routes/project/plan-detail/components/PlanDetailHeader.tsx b/frontend/src/routes/project/plan-detail/components/PlanDetailHeader.tsx
index 605028ef89..3705049449 100644
--- a/frontend/src/routes/project/plan-detail/components/PlanDetailHeader.tsx
+++ b/frontend/src/routes/project/plan-detail/components/PlanDetailHeader.tsx
@@ -12,6 +12,7 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
+import { Input } from "@/components/ui/input";
import {
createPlanWithDraftReview,
DraftReviewIssueCreationError,
@@ -582,7 +583,8 @@ export function PlanDetailHeader() {
{/* Terminal status (Closed / Deployed) sits at the far left, before
the title — a state badge, not an action. */}
<PlanLifecycleStamp state={lifecycle} />
- <input
+ <Input
+ size="md"
ref={titleInputRef}
className={cn(
"h-9 min-w-0 flex-1 bg-transparent text-xl! font-bold text-main outline-hidden",
diff --git a/frontend/src/routes/project/plan-detail/components/PlanDetailMeta.tsx b/frontend/src/routes/project/plan-detail/components/PlanDetailMeta.tsx
index 8073f8ea74..1468e9a1c8 100644
--- a/frontend/src/routes/project/plan-detail/components/PlanDetailMeta.tsx
+++ b/frontend/src/routes/project/plan-detail/components/PlanDetailMeta.tsx
@@ -4,6 +4,7 @@ import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { issueServiceClientConnect } from "@/api";
import { HumanizeTs } from "@/components/HumanizeTs";
+import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import {
Popover,
@@ -167,7 +168,9 @@ function InlineLabels({
/>
<span className="truncate">{value}</span>
{allowChange && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
aria-label={t("common.remove")}
className={cn(
"inline-flex shrink-0 items-center justify-center text-control-placeholder transition-colors",
@@ -180,7 +183,7 @@ function InlineLabels({
type="button"
>
<X className="size-3" />
- </button>
+ </Button>
)}
</span>
);
@@ -194,7 +197,9 @@ function InlineLabels({
<Popover open={open} onOpenChange={allowChange ? setOpen : undefined}>
<PopoverTrigger
render={
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className={cn(
"inline-flex items-center gap-1 rounded-xs border border-dashed border-control-border px-1.5 py-0.5 text-xs text-control-placeholder transition-colors",
allowChange &&
@@ -231,7 +236,9 @@ function InlineLabels({
issueLabels.map((option) => {
const isSelected = labels.includes(option.value);
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={option.value}
className="flex w-full items-center gap-x-2 px-3 py-2 text-left text-sm transition-colors hover:bg-control-bg"
disabled={isUpdating}
@@ -248,7 +255,7 @@ function InlineLabels({
}}
/>
<span>{option.value}</span>
- </button>
+ </Button>
);
})
)}
diff --git a/frontend/src/routes/project/plan-detail/components/PlanDetailStatementSection.tsx b/frontend/src/routes/project/plan-detail/components/PlanDetailStatementSection.tsx
index fc163df82f..b1961b073f 100644
--- a/frontend/src/routes/project/plan-detail/components/PlanDetailStatementSection.tsx
+++ b/frontend/src/routes/project/plan-detail/components/PlanDetailStatementSection.tsx
@@ -16,6 +16,7 @@ import {
import { ReleaseInfoCard } from "@/components/release/ReleaseInfoCard";
import { Alert } from "@/components/ui/alert";
import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
import { seedSheetStatement } from "@/hooks/useSheetStatement";
import { cn } from "@/lib/utils";
import { pushNotification } from "@/stores";
@@ -508,7 +509,7 @@ export function PlanDetailStatementSection({
<span>{statementTitle}</span>
{isEmpty && <span className="text-error">*</span>}
</div>
- <input
+ <Input
ref={inputRef}
accept=".sql,.txt,application/sql,text/plain"
className="hidden"
diff --git a/frontend/src/routes/project/plan-detail/components/PlanDetailTabStrip.tsx b/frontend/src/routes/project/plan-detail/components/PlanDetailTabStrip.tsx
index 748355c8f9..d6f91578ea 100644
--- a/frontend/src/routes/project/plan-detail/components/PlanDetailTabStrip.tsx
+++ b/frontend/src/routes/project/plan-detail/components/PlanDetailTabStrip.tsx
@@ -1,4 +1,5 @@
import type { ReactNode } from "react";
+import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
export function PlanDetailTabStrip({
@@ -64,7 +65,9 @@ export function PlanDetailTabItem({
: "border-b-block-border border-transparent hover:opacity-80"
)}
>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
aria-label={accessibleLabel}
className={cn(
"flex min-h-9 min-w-0 items-center gap-2 px-4 py-2 text-left",
@@ -74,7 +77,7 @@ export function PlanDetailTabItem({
type="button"
>
{children}
- </button>
+ </Button>
{action && (
// Pulled into the label's right padding so it sits close to the text.
<div className="-ml-3 mr-2 flex shrink-0 items-center">{action}</div>
diff --git a/frontend/src/routes/project/plan-detail/components/deploy/DeployPendingTasksSection.tsx b/frontend/src/routes/project/plan-detail/components/deploy/DeployPendingTasksSection.tsx
index abc9f427d1..dc6f483323 100644
--- a/frontend/src/routes/project/plan-detail/components/deploy/DeployPendingTasksSection.tsx
+++ b/frontend/src/routes/project/plan-detail/components/deploy/DeployPendingTasksSection.tsx
@@ -143,7 +143,9 @@ export function DeployPendingTasksSection({
{groups.map((group) => (
<div key={group.environment} className="rounded-sm border">
<div className="flex items-center gap-2 bg-control-bg/50 px-3 py-2">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="flex flex-1 items-center gap-2 text-left"
onClick={() => toggleEnv(group.environment)}
type="button"
@@ -161,7 +163,7 @@ export function DeployPendingTasksSection({
count: group.tasks.length,
})}
</span>
- </button>
+ </Button>
<Button
disabled={Boolean(creatingEnv)}
onClick={async () => {
diff --git a/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskFilter.tsx b/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskFilter.tsx
index bd937c8850..0eb6e375b6 100644
--- a/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskFilter.tsx
+++ b/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskFilter.tsx
@@ -1,5 +1,6 @@
import { useTranslation } from "react-i18next";
import { TaskStatusIcon } from "@/components/TaskStatusIcon";
+import { Button } from "@/components/ui/button";
import type { Stage } from "@/types/proto-es/v1/rollout_service_pb";
import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";
import { stringifyTaskStatus, TASK_STATUS_PRIORITY } from "@/utils";
@@ -24,7 +25,9 @@ export function DeployTaskFilter({
if (count <= 0) return null;
const checked = selectedStatuses.includes(status);
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={status}
className={[
"inline-flex items-center gap-1 rounded-full border px-2 py-1",
@@ -46,7 +49,7 @@ export function DeployTaskFilter({
{stringifyTaskStatus(status, t)}
</span>
<span className="select-none text-sm font-medium">{count}</span>
- </button>
+ </Button>
);
})}
</div>
diff --git a/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskHeader.tsx b/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskHeader.tsx
index f0dc79ced9..a6a47fb781 100644
--- a/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskHeader.tsx
+++ b/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskHeader.tsx
@@ -73,7 +73,9 @@ export function DeployTaskHeader({
{/* The identity is the toggle. It hugs its content, not the full row,
so the hover and hit target track the target — not the empty space
out to the caret. */}
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
aria-expanded={isExpanded}
className="flex min-w-0 cursor-pointer items-center gap-x-2 rounded-sm border-0 bg-transparent p-0 text-left outline-none hover:bg-control-bg/50 focus-visible:ring-2 focus-visible:ring-accent"
onClick={onToggleExpand}
@@ -89,7 +91,7 @@ export function DeployTaskHeader({
</span>
)}
</div>
- </button>
+ </Button>
{/* Right cluster, pushed to the row's edge: the collapsed duration or
the expanded actions, then the caret. Actions live in the header —
@@ -137,7 +139,9 @@ export function DeployTaskHeader({
{/* Redundant mouse affordance for the toggle; the identity button is
the keyboard-accessible control, so keep this out of the tab
order. */}
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
aria-hidden="true"
className="shrink-0 rounded-sm p-1 text-control-light outline-none hover:bg-control-bg/50"
onClick={onToggleExpand}
@@ -149,7 +153,7 @@ export function DeployTaskHeader({
) : (
<ChevronRight className="size-4" />
)}
- </button>
+ </Button>
</div>
</div>
diff --git a/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskRunHistorySheet.tsx b/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskRunHistorySheet.tsx
index 665c723ab5..8eb8857227 100644
--- a/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskRunHistorySheet.tsx
+++ b/frontend/src/routes/project/plan-detail/components/deploy/DeployTaskRunHistorySheet.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
import { HumanizeTs } from "@/components/HumanizeTs";
import { TaskRunStatusIcon } from "@/components/TaskRunStatusIcon";
import { TaskRunLogViewer } from "@/components/task-run-log";
+import { Button } from "@/components/ui/button";
import { EllipsisText } from "@/components/ui/ellipsis-text";
import {
Sheet,
@@ -116,7 +117,9 @@ function TaskRunHistoryItem({
return (
<div className="rounded-sm border">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
aria-expanded={isExpanded}
className="flex w-full items-center gap-x-2 rounded-sm px-3 py-2 text-left hover:bg-control-bg focus-visible:ring-2 focus-visible:ring-accent"
onClick={onToggle}
@@ -153,7 +156,7 @@ function TaskRunHistoryItem({
</span>
)}
</span>
- </button>
+ </Button>
{isExpanded && (
<div className="flex flex-col gap-2 border-t p-3">
<TaskRunErrorAlert taskRun={taskRun} />
diff --git a/frontend/src/routes/project/plan-detail/components/lifecycle/PlanStatusAction.tsx b/frontend/src/routes/project/plan-detail/components/lifecycle/PlanStatusAction.tsx
index 8e5ea59598..23e1ae5033 100644
--- a/frontend/src/routes/project/plan-detail/components/lifecycle/PlanStatusAction.tsx
+++ b/frontend/src/routes/project/plan-detail/components/lifecycle/PlanStatusAction.tsx
@@ -21,6 +21,7 @@ import { type ReactNode, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { issueServiceClientConnect } from "@/api";
import { PlanCheckResultsDrawer } from "@/components/plan-check/PlanCheckSection";
+import { Button } from "@/components/ui/button";
import {
Popover,
PopoverContent,
@@ -88,9 +89,11 @@ export function PlanStatusAction({
<Popover onOpenChange={setOpen} open={open}>
<PopoverTrigger
render={
- <button
+ <Button
+ appearance="secondary"
+ size="md"
className={cn(
- "inline-flex h-9 shrink-0 items-center gap-x-1 rounded-full border px-3 text-sm hover:bg-control-bg/40",
+ "inline-flex shrink-0 items-center gap-x-1 rounded-full border text-sm hover:bg-control-bg/40",
TONE_TRIGGER[tone]
)}
type="button"
@@ -177,7 +180,9 @@ function GateRow({
}) {
return (
<div>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="flex w-full items-center gap-3 px-4 py-3 text-left hover:bg-control-bg/40"
onClick={onToggle}
type="button"
@@ -190,7 +195,7 @@ function GateRow({
open && "rotate-180"
)}
/>
- </button>
+ </Button>
{open && <div className="border-t bg-control-bg/20">{children}</div>}
</div>
);
@@ -312,14 +317,16 @@ function ChecksGateRow({
{icon}
<GateLabel subtitle={subtitle} title={title} />
{summary.total > 0 && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="inline-flex shrink-0 items-center gap-1 text-xs text-accent hover:underline"
onClick={onViewDetails}
type="button"
>
{t("common.view-details")}
<ChevronRight className="size-3.5" />
- </button>
+ </Button>
)}
</div>
);
@@ -399,14 +406,16 @@ function ReRequestGuidance({ issue }: { issue: Issue }) {
<span className="text-xs leading-relaxed text-control-light">
{t("plan.review.rejection.guidance-prefix")}{" "}
{canReRequest ? (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="font-medium text-accent hover:underline disabled:opacity-60"
disabled={reRequesting}
onClick={() => void handleReRequest()}
type="button"
>
{t("plan.review.rejection.re-request-review")}
- </button>
+ </Button>
) : (
<span>{t("plan.review.rejection.re-request-review")}</span>
)}{" "}
@@ -426,7 +435,9 @@ function BypassAction({
}) {
const { t } = useTranslation();
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="inline-flex shrink-0 items-center gap-x-1 text-xs text-control-placeholder underline hover:text-control disabled:opacity-60"
disabled={bypass.creating}
onClick={onClick}
@@ -434,6 +445,6 @@ function BypassAction({
>
{bypass.creating && <Loader2 className="size-3 animate-spin" />}
{t("plan.review.footer.bypass-and-deploy")}
- </button>
+ </Button>
);
}
diff --git a/frontend/src/routes/workspace/EnvironmentsPage.tsx b/frontend/src/routes/workspace/EnvironmentsPage.tsx
index be90c7b171..39eba7368a 100644
--- a/frontend/src/routes/workspace/EnvironmentsPage.tsx
+++ b/frontend/src/routes/workspace/EnvironmentsPage.tsx
@@ -42,6 +42,7 @@ import { ResourceIdField } from "@/components/ResourceIdField";
import { RouterLink } from "@/components/RouterLink";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
+import { ColorSwatchInput } from "@/components/ui/color-input";
import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
import {
DropdownMenu,
@@ -62,6 +63,7 @@ import {
SheetTitle,
} from "@/components/ui/sheet";
import { StickyActionFooter } from "@/components/ui/sticky-action-footer";
+import { Switch } from "@/components/ui/switch";
import { Tabs, TabsList, TabsPanel, TabsTrigger } from "@/components/ui/tabs";
import { useEnvironmentList } from "@/hooks/useAppState";
import { useUnsavedChangesGuard } from "@/hooks/useUnsavedChangesGuard";
@@ -104,29 +106,22 @@ import {
function ToggleSwitch({
checked,
disabled,
+ ariaLabel,
onChange,
}: {
checked: boolean;
disabled?: boolean;
+ ariaLabel: string;
onChange: (value: boolean) => void;
}) {
return (
- <button
- type="button"
- role="switch"
- aria-checked={checked}
+ <Switch
disabled={disabled}
- className={`relative inline-flex h-5 w-9 shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 ${
- checked ? "bg-accent" : "bg-control-bg-hover"
- }`}
- onClick={() => onChange(!checked)}
- >
- <span
- className={`pointer-events-none inline-block h-4 w-4 rounded-full bg-background shadow-sm transition-transform ${
- checked ? "translate-x-4" : "translate-x-0"
- }`}
- />
- </button>
+ checked={checked}
+ size="md"
+ aria-label={ariaLabel}
+ onCheckedChange={onChange}
+ />
);
}
@@ -255,13 +250,15 @@ function RolloutPolicyConfig({
>
{displayPolicyRoleTitle(role)}
{canUpdatePolicy && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-control-placeholder hover:text-control-light-hover"
onClick={() => removeRole(role)}
>
<X className="w-3.5 h-3.5" />
- </button>
+ </Button>
)}
</span>
))}
@@ -309,6 +306,7 @@ function RolloutPolicyConfig({
<ToggleSwitch
checked={rolloutPolicy.automatic}
disabled={!canUpdatePolicy}
+ ariaLabel={t("policy.rollout.auto")}
onChange={toggleAutomatic}
/>
<div className="flex flex-col">
@@ -434,6 +432,7 @@ function SQLReviewSectionInner(
<ToggleSwitch
checked={enforce}
disabled={!canUpdateReviewConfig}
+ ariaLabel={pendingPolicy.name}
onChange={setEnforce}
/>
<div className="flex items-center gap-x-1">
@@ -449,7 +448,9 @@ function SQLReviewSectionInner(
{pendingPolicy.name}
</RouterLink>
{canUpdatePolicy && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="p-0.5 text-control-placeholder hover:text-control-light-hover"
onClick={() => {
@@ -458,7 +459,7 @@ function SQLReviewSectionInner(
}}
>
<X className="w-4 h-4" />
- </button>
+ </Button>
)}
</div>
</div>
@@ -727,16 +728,11 @@ function EnvironmentDetail({
<FormField
title={
<span className="flex items-center gap-x-2">
- <input
- type="color"
+ <ColorSwatchInput
value={editColor}
disabled={!canEdit}
- onChange={(e) => onColorChange(e.target.value)}
- className={cn(
- "size-6 shrink-0 appearance-none rounded-xs border border-control-border bg-transparent p-0",
- "[&::-webkit-color-swatch-wrapper]:p-0 [&::-webkit-color-swatch]:rounded-xs [&::-webkit-color-swatch]:border-0 [&::-moz-color-swatch]:rounded-xs [&::-moz-color-swatch]:border-0",
- "cursor-pointer"
- )}
+ onChange={onColorChange}
+ className={cn("size-6", "cursor-pointer")}
/>
<span>
{t("common.environment-name")}
@@ -1033,15 +1029,10 @@ function CreateSheet({
<FormField
title={
<span className="flex items-center gap-x-2">
- <input
- type="color"
+ <ColorSwatchInput
value={color}
- onChange={(e) => onColorChange(e.target.value)}
- className={cn(
- "size-6 shrink-0 appearance-none rounded-xs border border-control-border bg-transparent p-0",
- "[&::-webkit-color-swatch-wrapper]:p-0 [&::-webkit-color-swatch]:rounded-xs [&::-webkit-color-swatch]:border-0 [&::-moz-color-swatch]:rounded-xs [&::-moz-color-swatch]:border-0",
- "cursor-pointer"
- )}
+ onChange={onColorChange}
+ className={cn("size-6", "cursor-pointer")}
/>
<span>
{t("common.environment-name")}
@@ -1175,7 +1166,9 @@ function SortableEnvironmentRow({
<span className="textinfo">{index + 1}.</span>
<EnvironmentLabel environment={env} />
</div>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="cursor-grab active:cursor-grabbing touch-none p-1 text-control-light hover:text-control"
aria-label="Drag to reorder"
@@ -1183,7 +1176,7 @@ function SortableEnvironmentRow({
{...listeners}
>
<GripVertical className="size-5" />
- </button>
+ </Button>
</div>
);
}
diff --git a/frontend/src/routes/workspace/GlobalMaskingPage.tsx b/frontend/src/routes/workspace/GlobalMaskingPage.tsx
index 174ea271c7..d3c2ed6956 100644
--- a/frontend/src/routes/workspace/GlobalMaskingPage.tsx
+++ b/frontend/src/routes/workspace/GlobalMaskingPage.tsx
@@ -645,33 +645,39 @@ export function GlobalMaskingPage() {
{reorderRules ? (
<div className="pt-2 flex flex-col">
{index > 0 && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
- className="w-6 h-6 flex items-center justify-center rounded-xs hover:bg-control-bg"
+ className="flex items-center justify-center rounded-xs hover:bg-control-bg"
onClick={() => onReorder(item, -1)}
>
<ChevronUp className="w-4 h-4" />
- </button>
+ </Button>
)}
{index !== items.length - 1 && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
- className="w-6 h-6 flex items-center justify-center rounded-xs hover:bg-control-bg"
+ className="flex items-center justify-center rounded-xs hover:bg-control-bg"
onClick={() => onReorder(item, 1)}
>
<ChevronDown className="w-4 h-4" />
- </button>
+ </Button>
)}
</div>
) : (
<div className="pt-2">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
- className="w-6 h-6 flex items-center justify-center rounded-xs hover:bg-control-bg"
+ className="flex items-center justify-center rounded-xs hover:bg-control-bg"
onClick={() => onEdit(index)}
>
<Pencil className="w-4 h-4" />
- </button>
+ </Button>
</div>
)}
</div>
diff --git a/frontend/src/routes/workspace/GroupsPage.tsx b/frontend/src/routes/workspace/GroupsPage.tsx
index dd797f78fd..749bf0b0b5 100644
--- a/frontend/src/routes/workspace/GroupsPage.tsx
+++ b/frontend/src/routes/workspace/GroupsPage.tsx
@@ -348,7 +348,9 @@ function GroupRow({
>
<TableCell className="py-2">
<div className="flex items-center gap-x-2">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="shrink-0 p-0.5 rounded-xs hover:bg-control-bg-hover"
onClick={(e) => {
e.stopPropagation();
@@ -360,7 +362,7 @@ function GroupRow({
) : (
<ChevronRight className="h-4 w-4" />
)}
- </button>
+ </Button>
<Users className="h-4 w-4 shrink-0 text-control-light" />
<div className="flex flex-col">
<div className="flex items-center gap-x-1.5">
@@ -943,18 +945,24 @@ function GroupForm({
{domainOptions[0]}
</span>
) : (
- <select
+ <Select
value={selectedDomain}
- onChange={(e) => setSelectedDomain(e.target.value)}
- className="border border-control-border rounded-sm text-sm pl-2 pr-6 py-1"
+ onValueChange={(value: string | null) => {
+ if (value !== null) setSelectedDomain(value);
+ }}
disabled={!allowEdit}
>
- {domainOptions.map((d) => (
- <option key={d} value={d}>
- {d}
- </option>
- ))}
- </select>
+ <SelectTrigger className="rounded-sm px-2 text-sm">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {domainOptions.map((domain) => (
+ <SelectItem key={domain} value={domain}>
+ {domain}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
)}
</>
)}
diff --git a/frontend/src/routes/workspace/MembersPage.tsx b/frontend/src/routes/workspace/MembersPage.tsx
index 6dcad81fda..8d9ca77aee 100644
--- a/frontend/src/routes/workspace/MembersPage.tsx
+++ b/frontend/src/routes/workspace/MembersPage.tsx
@@ -62,6 +62,7 @@ import {
TableRow,
} from "@/components/ui/table";
import { Tabs, TabsList, TabsPanel, TabsTrigger } from "@/components/ui/tabs";
+import { Textarea } from "@/components/ui/textarea";
import { Tooltip } from "@/components/ui/tooltip";
import {
WorkspacePageLayout,
@@ -404,9 +405,11 @@ function MemberTable({
avatar={
mb.type === "groups" ? (
<>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
- className="flex size-5 shrink-0 items-center justify-center cursor-pointer"
+ className="flex shrink-0 items-center justify-center cursor-pointer"
onClick={() =>
mb.group && toggleGroupExpand(mb.group)
}
@@ -416,7 +419,7 @@ function MemberTable({
) : (
<ChevronRight className="size-4 text-control-light" />
)}
- </button>
+ </Button>
<div className="size-9 rounded-full bg-control-bg-hover flex items-center justify-center shrink-0">
<Users className="size-4 text-control-light" />
</div>
@@ -903,7 +906,9 @@ function ExpirationChip({
onClick: () => void;
}) {
return (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className={cn(
"px-2.5 py-1 text-xs rounded-sm border transition-colors",
@@ -914,7 +919,7 @@ function ExpirationChip({
onClick={onClick}
>
{label}
- </button>
+ </Button>
);
}
@@ -1157,13 +1162,15 @@ function ProjectRoleBindingForm({
return (
<div className="border rounded-sm p-4 flex flex-col gap-y-4 relative">
{canRemove && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="absolute top-2 right-2 text-control-light hover:text-error"
onClick={onRemove}
>
<X className="h-4 w-4" />
- </button>
+ </Button>
)}
{/* Role select */}
@@ -1205,7 +1212,8 @@ function ProjectRoleBindingForm({
</>
}
>
- <textarea
+ <Textarea
+ size="sm"
className="w-full rounded-xs border border-control-border bg-transparent px-3 py-2 text-sm resize-none"
rows={2}
value={form.reason}
diff --git a/frontend/src/routes/workspace/RolesPage.tsx b/frontend/src/routes/workspace/RolesPage.tsx
index 4d9fa47f96..79fe0a7670 100644
--- a/frontend/src/routes/workspace/RolesPage.tsx
+++ b/frontend/src/routes/workspace/RolesPage.tsx
@@ -126,14 +126,16 @@ function PermissionTransfer({
{/* Source */}
<div className="flex-1 flex flex-col border-r min-w-0">
<div className="flex items-center gap-x-2 px-3 py-2 border-b">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-sm text-main hover:text-accent disabled:opacity-50"
disabled={disabled || sourceItems.length === 0}
onClick={selectAll}
>
{t("common.select-all")}
- </button>
+ </Button>
<span className="text-xs text-control-light">
{t("common.total-n-items", { n: totalSourceCount })}
</span>
@@ -167,14 +169,16 @@ function PermissionTransfer({
{/* Target */}
<div className="flex-1 flex flex-col min-w-0">
<div className="flex items-center gap-x-2 px-3 py-2 border-b">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-sm text-main hover:text-accent disabled:opacity-50"
disabled={disabled || value.length === 0}
onClick={clearAll}
>
{t("common.clear")}
- </button>
+ </Button>
<span className="text-xs text-control-light">
{t("common.n-items-selected", { n: value.length })}
</span>
diff --git a/frontend/src/routes/workspace/SemanticTypesPage.tsx b/frontend/src/routes/workspace/SemanticTypesPage.tsx
index ef76876063..1d28a75511 100644
--- a/frontend/src/routes/workspace/SemanticTypesPage.tsx
+++ b/frontend/src/routes/workspace/SemanticTypesPage.tsx
@@ -640,7 +640,9 @@ function MaskingAlgorithmDrawer({
</label>
<div className="grid grid-cols-3 gap-2 mt-2">
{maskingTypeOptions.map((opt) => (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
key={opt.value}
className={`px-3 py-2 text-sm border rounded-sm transition-colors ${
maskingType === opt.value
@@ -650,7 +652,7 @@ function MaskingAlgorithmDrawer({
onClick={() => onMaskingTypeChange(opt.value)}
>
{opt.label}
- </button>
+ </Button>
))}
</div>
</div>
@@ -739,7 +741,9 @@ function MaskingAlgorithmDrawer({
}
/>
</div>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="p-1 rounded-xs hover:bg-error/10 text-error mb-0.5"
onClick={() =>
setRangeMaskSlices((prev) =>
@@ -748,7 +752,7 @@ function MaskingAlgorithmDrawer({
}
>
<Trash2 className="w-4 h-4" />
- </button>
+ </Button>
</div>
))}
{rangeMaskErrorMessage && (
@@ -1037,7 +1041,9 @@ function SemanticTypeRow({
</span>
)}
{!isItemReadonly && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="p-1 rounded-xs hover:bg-control-bg-hover text-control-light"
onClick={() => {
const algo = getMaskingType(row.item.algorithm)
@@ -1047,7 +1053,7 @@ function SemanticTypeRow({
}}
>
<Pencil className="w-4 h-4" />
- </button>
+ </Button>
)}
</div>
</TableCell>
@@ -1057,12 +1063,14 @@ function SemanticTypeRow({
{!isBuiltin && (
<>
{isEditing && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="p-1 rounded-xs hover:bg-control-bg-hover text-control-light"
onClick={() => onCancel(index)}
>
<Undo2 className="w-4 h-4" />
- </button>
+ </Button>
)}
{row.mode === "EDIT" && (
<DeleteConfirmButton
@@ -1077,7 +1085,9 @@ function SemanticTypeRow({
{isEditing && (
<Tooltip content={confirmDisabledReason}>
<span className="inline-flex">
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
aria-label={t("common.confirm")}
className="p-1 rounded-xs hover:bg-accent/10 text-accent disabled:opacity-50 disabled:cursor-not-allowed"
@@ -1085,17 +1095,19 @@ function SemanticTypeRow({
onClick={() => onConfirm(index)}
>
<Check className="w-4 h-4" />
- </button>
+ </Button>
</span>
</Tooltip>
)}
{row.mode === "NORMAL" && (
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
className="p-1 rounded-xs hover:bg-control-bg-hover text-control-light"
onClick={() => onStartEdit(index)}
>
<Pencil className="w-4 h-4" />
- </button>
+ </Button>
)}
</>
)}
@@ -1177,7 +1189,7 @@ function IconPicker({ value, onChange }: IconPickerProps) {
{t("common.upload")}
</span>
)}
- <input
+ <Input
ref={fileInputRef}
type="file"
className="hidden"
diff --git a/frontend/src/routes/workspace/ServiceAccountsPage.tsx b/frontend/src/routes/workspace/ServiceAccountsPage.tsx
index bc4cd43ab7..2e8bee440f 100644
--- a/frontend/src/routes/workspace/ServiceAccountsPage.tsx
+++ b/frontend/src/routes/workspace/ServiceAccountsPage.tsx
@@ -602,7 +602,8 @@ function ServiceAccountForm({
<Input value={serviceAccount?.email ?? ""} disabled />
) : (
<div className="px-1 flex items-center border border-control-border rounded-xs overflow-hidden focus-within:border-accent">
- <input
+ <Input
+ size="md"
type="text"
autoComplete="off"
value={emailPrefix}
diff --git a/frontend/src/routes/workspace/general/BrandingSection.tsx b/frontend/src/routes/workspace/general/BrandingSection.tsx
index 60540bfb79..11b04027b6 100644
--- a/frontend/src/routes/workspace/general/BrandingSection.tsx
+++ b/frontend/src/routes/workspace/general/BrandingSection.tsx
@@ -245,7 +245,7 @@ export const BrandingSection = forwardRef<SectionHandle, BrandingSectionProps>(
})}
</p>
</div>
- <input
+ <Input
ref={fileInputRef}
type="file"
accept={SUPPORT_IMAGE_EXTENSIONS.join(",")}
diff --git a/frontend/src/routes/workspace/general/SecuritySection.tsx b/frontend/src/routes/workspace/general/SecuritySection.tsx
index c3229a565f..c9c46cba15 100644
--- a/frontend/src/routes/workspace/general/SecuritySection.tsx
+++ b/frontend/src/routes/workspace/general/SecuritySection.tsx
@@ -18,6 +18,7 @@ import {
PermissionGuard,
usePermissionCheck,
} from "@/components/PermissionGuard";
+import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { FormField, FormFieldGroup, FormSection } from "@/components/ui/form";
import { Input } from "@/components/ui/input";
@@ -408,14 +409,16 @@ export const SecuritySection = forwardRef<SectionHandle, SecuritySectionProps>(
className="inline-flex items-center gap-1 rounded-xs bg-control-bg px-2 py-1.5 text-sm"
>
{domain}
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="text-control-light hover:text-control disabled:opacity-50"
disabled={!canEdit}
onClick={() => removeDomain(index)}
>
<X className="h-3.5 w-3.5" />
- </button>
+ </Button>
</span>
))}
</div>
diff --git a/frontend/src/routes/workspace/profile/UserPasswordSection.tsx b/frontend/src/routes/workspace/profile/UserPasswordSection.tsx
index 2a7d3b015a..ec9e9b0617 100644
--- a/frontend/src/routes/workspace/profile/UserPasswordSection.tsx
+++ b/frontend/src/routes/workspace/profile/UserPasswordSection.tsx
@@ -7,6 +7,7 @@ import {
} from "lucide-react";
import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
+import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Tooltip } from "@/components/ui/tooltip";
import type { WorkspaceProfileSetting_PasswordRestriction } from "@/types/proto-es/v1/setting_service_pb";
@@ -174,7 +175,9 @@ export function UserPasswordSection({
className={passwordHint ? "border-error focus:ring-error" : ""}
onChange={(e) => onPasswordChange(e.target.value)}
/>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
tabIndex={-1}
className="hover:cursor-pointer absolute right-3"
@@ -185,7 +188,7 @@ export function UserPasswordSection({
) : (
<EyeOff className="w-4 h-4" />
)}
- </button>
+ </Button>
</div>
</div>
</div>
@@ -209,7 +212,9 @@ export function UserPasswordSection({
}
onChange={(e) => onPasswordConfirmChange(e.target.value)}
/>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
tabIndex={-1}
className="hover:cursor-pointer absolute right-3"
@@ -220,7 +225,7 @@ export function UserPasswordSection({
) : (
<EyeOff className="w-4 h-4" />
)}
- </button>
+ </Button>
</div>
{passwordMismatch && (
<span className="text-error text-sm mt-1 pl-1">
diff --git a/frontend/src/routes/workspace/users/UserFormSheet.tsx b/frontend/src/routes/workspace/users/UserFormSheet.tsx
index 492156d10d..e363360816 100644
--- a/frontend/src/routes/workspace/users/UserFormSheet.tsx
+++ b/frontend/src/routes/workspace/users/UserFormSheet.tsx
@@ -291,7 +291,9 @@ function UserForm({ onClose, onCreated }: Omit<UserFormSheetProps, "open">) {
placeholder={t("common.sensitive-placeholder")}
className={passwordHint ? "border-error" : ""}
/>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="absolute right-3 cursor-pointer"
onClick={() => setShowPassword(!showPassword)}
@@ -301,7 +303,7 @@ function UserForm({ onClose, onCreated }: Omit<UserFormSheetProps, "open">) {
) : (
<EyeOff className="w-4 h-4" />
)}
- </button>
+ </Button>
</div>
</FormField>
@@ -322,7 +324,9 @@ function UserForm({ onClose, onCreated }: Omit<UserFormSheetProps, "open">) {
)}
className={passwordMismatch ? "border-error" : ""}
/>
- <button
+ <Button
+ appearance="secondary"
+ size="xs"
type="button"
className="absolute right-3 cursor-pointer"
onClick={() => setShowPassword(!showPassword)}
@@ -332,7 +336,7 @@ function UserForm({ onClose, onCreated }: Omit<UserFormSheetProps, "open">) {
) : (
<EyeOff className="w-4 h-4" />
)}
- </button>
+ </Button>
</div>
{passwordMismatch && (
<FormError className="pl-1">