Skip to content

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

refactor: optimize the operation bar and transfer sheet (#20060)

ecmadaoaa3baddf399c
diff --git a/frontend/src/react/components/ProjectSelect.tsx b/frontend/src/react/components/ProjectSelect.tsx
new file mode 100644
index 0000000000..e4aa88b94a
--- /dev/null
+++ b/frontend/src/react/components/ProjectSelect.tsx
@@ -0,0 +1,70 @@
+import { useCallback, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Combobox } from "@/react/components/ui/combobox";
+import { useProjectV1Store } from "@/store";
+import type { Project } from "@/types/proto-es/v1/project_service_pb";
+import { extractProjectResourceName, getDefaultPagination } from "@/utils";
+
+export interface ProjectSelectProps {
+ value: string;
+ onChange: (value: string, project: Project | undefined) => void;
+ placeholder?: string;
+ disabled?: boolean;
+ className?: string;
+ /** When true, the workspace's default project is excluded. Defaults to true. */
+ excludeDefault?: boolean;
+}
+
+export function ProjectSelect({
+ value,
+ onChange,
+ placeholder,
+ disabled,
+ className,
+ excludeDefault = true,
+}: ProjectSelectProps) {
+ const { t } = useTranslation();
+ const projectStore = useProjectV1Store();
+ const [projects, setProjects] = useState<Project[]>([]);
+
+ const fetchProjects = useCallback(
+ (query: string) => {
+ projectStore
+ .fetchProjectList({
+ filter: { query, excludeDefault },
+ pageSize: getDefaultPagination(),
+ })
+ .then(({ projects: result }) => setProjects(result));
+ },
+ [projectStore, excludeDefault]
+ );
+
+ useEffect(() => {
+ fetchProjects("");
+ }, [fetchProjects]);
+
+ const handleChange = useCallback(
+ (name: string) => {
+ const proj = projects.find((p) => p.name === name);
+ onChange(name, proj);
+ },
+ [projects, onChange]
+ );
+
+ return (
+ <Combobox
+ value={value}
+ onChange={handleChange}
+ placeholder={placeholder ?? t("common.project")}
+ noResultsText={t("common.no-data")}
+ onSearch={fetchProjects}
+ disabled={disabled}
+ className={className}
+ options={projects.map((p) => ({
+ value: p.name,
+ label: p.title,
+ description: extractProjectResourceName(p.name),
+ }))}
+ />
+ );
+}
diff --git a/frontend/src/react/components/database/CreateDatabaseSheet.tsx b/frontend/src/react/components/database/CreateDatabaseSheet.tsx
index 6814c9e027..186cfb123e 100644
--- a/frontend/src/react/components/database/CreateDatabaseSheet.tsx
+++ b/frontend/src/react/components/database/CreateDatabaseSheet.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
import { v4 as uuidv4 } from "uuid";
import { EnvironmentLabel } from "@/react/components/EnvironmentLabel";
import { InstanceSelect } from "@/react/components/InstanceSelect";
+import { ProjectSelect } from "@/react/components/ProjectSelect";
import { Button } from "@/react/components/ui/button";
import { Combobox } from "@/react/components/ui/combobox";
import { Input } from "@/react/components/ui/input";
@@ -44,7 +45,6 @@ import {
} from "@/types/proto-es/v1/plan_service_pb";
import {
enginesSupportCreateDatabase,
- getDefaultPagination,
getIssueRoute,
instanceV1HasCollationAndCharacterSet,
normalizeTitle,
@@ -205,9 +205,6 @@ export function CreateDatabaseSheet({
{ name: string; roleName: string }[]
>([]);
- const [projects, setProjects] = useState<{ name: string; title: string }[]>(
- []
- );
const [selectedInstance, setSelectedInstance] = useState<
Instance | undefined
>();
@@ -325,20 +322,6 @@ export function CreateDatabaseSheet({
projectHydrated &&
!(enforceIssueTitle && !normalizeTitle(title));
- const searchProjects = useCallback(
- (query: string) => {
- projectStore
- .fetchProjectList({
- filter: { query, excludeDefault: true },
- pageSize: getDefaultPagination(),
- })
- .then(({ projects: result }) =>
- setProjects(result.map((p) => ({ name: p.name, title: p.title })))
- );
- },
- [projectStore]
- );
-
useEffect(() => {
if (!open) return;
setProjectName("");
@@ -356,8 +339,7 @@ export function CreateDatabaseSheet({
setInstanceRoles([]);
setTitle("");
setTitleEdited(false);
- if (!fixedProjectName) searchProjects("");
- }, [open, searchProjects, fixedProjectName]);
+ }, [open]);
const instanceFetchRef = useRef(0);
const handleInstanceChange = async (
@@ -463,17 +445,9 @@ export function CreateDatabaseSheet({
<label className="block text-sm font-medium mb-1">
{t("common.project")} <span className="text-error">*</span>
</label>
- <Combobox
+ <ProjectSelect
value={projectName}
- onChange={setProjectName}
- placeholder={t("common.project")}
- noResultsText={t("common.no-data")}
- onSearch={searchProjects}
- options={projects.map((p) => ({
- value: p.name,
- label: p.title,
- description: p.name,
- }))}
+ onChange={(name) => setProjectName(name)}
/>
</div>
)}
diff --git a/frontend/src/react/components/database/DatabaseBatchOperationsBar.tsx b/frontend/src/react/components/database/DatabaseBatchOperationsBar.tsx
index 7f86320f75..e526f89812 100644
--- a/frontend/src/react/components/database/DatabaseBatchOperationsBar.tsx
+++ b/frontend/src/react/components/database/DatabaseBatchOperationsBar.tsx
@@ -65,14 +65,14 @@ export function DatabaseBatchOperationsBar({
if (databases.length === 0) return null;
return (
<div className="text-sm flex flex-col lg:flex-row items-start lg:items-center bg-blue-100 py-3 px-4 text-main gap-y-2 gap-x-4">
- <span className="whitespace-nowrap">
+ <span className="whitespace-nowrap text-sm">
{t("database.selected-n-databases", { n: databases.length })}
</span>
- <div className="flex items-center gap-x-2 flex-wrap">
+ <div className="flex items-center flex-wrap">
{onChangeDatabase && (
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={!canChangeDatabase}
onClick={onChangeDatabase}
>
@@ -83,7 +83,7 @@ export function DatabaseBatchOperationsBar({
{onExportData && (
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={!canExportData}
onClick={onExportData}
>
@@ -93,7 +93,7 @@ export function DatabaseBatchOperationsBar({
)}
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={!canSync}
onClick={onSyncSchema}
>
@@ -102,7 +102,7 @@ export function DatabaseBatchOperationsBar({
</Button>
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={!canUpdate}
onClick={onEditLabels}
>
@@ -111,7 +111,7 @@ export function DatabaseBatchOperationsBar({
</Button>
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={!canUpdate || !canGetEnvironment}
onClick={onEditEnvironment}
>
@@ -121,7 +121,7 @@ export function DatabaseBatchOperationsBar({
{onTransferProject && (
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={!canUpdate}
onClick={onTransferProject}
>
@@ -132,7 +132,7 @@ export function DatabaseBatchOperationsBar({
{onUnassign && (
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={!canUpdate}
onClick={onUnassign}
>
diff --git a/frontend/src/react/components/database/TransferProjectSheet.tsx b/frontend/src/react/components/database/TransferProjectSheet.tsx
index 9f3ff48a11..ff7ec105d2 100644
--- a/frontend/src/react/components/database/TransferProjectSheet.tsx
+++ b/frontend/src/react/components/database/TransferProjectSheet.tsx
@@ -1,8 +1,8 @@
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { EngineIconPath } from "@/components/InstanceForm/constants";
+import { ProjectSelect } from "@/react/components/ProjectSelect";
import { Button } from "@/react/components/ui/button";
-import { Input } from "@/react/components/ui/input";
import {
Sheet,
SheetBody,
@@ -12,15 +12,9 @@ import {
SheetTitle,
} from "@/react/components/ui/sheet";
import { useVueState } from "@/react/hooks/useVueState";
-import { cn } from "@/react/lib/utils";
-import { useActuatorV1Store, useProjectV1Store } from "@/store";
+import { useActuatorV1Store } from "@/store";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
-import {
- extractDatabaseResourceName,
- extractProjectResourceName,
- getDefaultPagination,
- getInstanceResource,
-} from "@/utils";
+import { extractDatabaseResourceName, getInstanceResource } from "@/utils";
export function TransferProjectSheet({
open,
@@ -34,55 +28,21 @@ export function TransferProjectSheet({
onTransfer: (projectName: string) => Promise<void>;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
const actuatorStore = useActuatorV1Store();
const defaultProjectName = useVueState(
() => actuatorStore.serverInfo?.defaultProject ?? ""
);
const [mode, setMode] = useState<"project" | "unassign">("project");
- const [searchQuery, setSearchQuery] = useState("");
- const [projects, setProjects] = useState<{ name: string; title: string }[]>(
- []
- );
- const [loadingProjects, setLoadingProjects] = useState(false);
const [selectedProject, setSelectedProject] = useState("");
const [transferring, setTransferring] = useState(false);
- const searchTimerRef = useRef<ReturnType<typeof setTimeout>>(undefined);
-
- const fetchProjects = useCallback(
- async (query: string) => {
- setLoadingProjects(true);
- try {
- const { projects: result } = await projectStore.fetchProjectList({
- filter: { query, excludeDefault: true },
- pageSize: getDefaultPagination(),
- });
- setProjects(result.map((p) => ({ name: p.name, title: p.title })));
- } finally {
- setLoadingProjects(false);
- }
- },
- [projectStore]
- );
useEffect(() => {
if (open) {
setMode("project");
- setSearchQuery("");
setSelectedProject("");
setTransferring(false);
- fetchProjects("");
}
- }, [open, fetchProjects]);
-
- useEffect(() => {
- if (!open) return;
- if (searchTimerRef.current) clearTimeout(searchTimerRef.current);
- searchTimerRef.current = setTimeout(() => fetchProjects(searchQuery), 300);
- return () => {
- if (searchTimerRef.current) clearTimeout(searchTimerRef.current);
- };
- }, [searchQuery, open, fetchProjects]);
+ }, [open]);
return (
<Sheet open={open} onOpenChange={(next) => !next && onClose()}>
@@ -95,7 +55,7 @@ export function TransferProjectSheet({
{t("database.selected-n-databases", { n: databases.length })}
</p>
- <div className="border border-control-border rounded-sm max-h-48 overflow-y-auto">
+ <div className="border border-control-border rounded-xs max-h-48 overflow-y-auto">
{databases.map((db) => (
<div
key={db.name}
@@ -137,49 +97,10 @@ export function TransferProjectSheet({
</div>
{mode === "project" && (
- <div>
- <Input
- value={searchQuery}
- onChange={(e) => setSearchQuery(e.target.value)}
- placeholder={t("common.filter-by-name")}
- className="mb-2"
- />
- <div className="border border-control-border rounded-sm max-h-64 overflow-y-auto">
- {loadingProjects ? (
- <div className="px-3 py-4 text-sm text-center text-control-placeholder">
- {t("common.loading")}
- </div>
- ) : projects.length === 0 ? (
- <div className="px-3 py-4 text-sm text-center text-control-placeholder">
- {t("common.no-data")}
- </div>
- ) : (
- projects.map((project) => (
- <label
- key={project.name}
- className={cn(
- "flex items-center gap-x-3 px-3 py-2.5 cursor-pointer border-b last:border-b-0 transition-colors",
- selectedProject === project.name
- ? "bg-accent/5"
- : "hover:bg-control-bg"
- )}
- >
- <input
- type="radio"
- name="transfer-project"
- checked={selectedProject === project.name}
- onChange={() => setSelectedProject(project.name)}
- className="accent-accent"
- />
- <span className="text-sm">{project.title}</span>
- <span className="text-xs text-control-placeholder">
- {extractProjectResourceName(project.name)}
- </span>
- </label>
- ))
- )}
- </div>
- </div>
+ <ProjectSelect
+ value={selectedProject}
+ onChange={(name) => setSelectedProject(name)}
+ />
)}
</SheetBody>
<SheetFooter>
diff --git a/frontend/src/react/pages/settings/InstancesPage.tsx b/frontend/src/react/pages/settings/InstancesPage.tsx
index 5b2cbaa4f0..d7217ec1ca 100644
--- a/frontend/src/react/pages/settings/InstancesPage.tsx
+++ b/frontend/src/react/pages/settings/InstancesPage.tsx
@@ -597,7 +597,7 @@ function SyncDropdown({
<div ref={dropdownRef} className="relative">
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={disabled}
onClick={() => setOpen(!open)}
>
@@ -653,16 +653,16 @@ function BatchOperationsBar({
return (
<div className="relative z-10 text-sm flex flex-col lg:flex-row items-start lg:items-center bg-blue-100 py-3 px-4 text-main gap-y-2 gap-x-4 overflow-visible">
- <span className="whitespace-nowrap">
+ <span className="whitespace-nowrap text-sm">
{t("instance.selected-n-instances", {
count: selectedInstances.length,
})}
</span>
- <div className="flex items-center gap-x-2">
+ <div className="flex items-center">
<SyncDropdown disabled={!canSync || syncing} onSync={onSync} />
<Button
variant="ghost"
- size="sm"
+ size="md"
disabled={!canUpdate}
onClick={onEditEnvironment}
>
@@ -670,7 +670,7 @@ function BatchOperationsBar({
{t("database.edit-environment")}
</Button>
{showAssignLicense && (
- <Button variant="ghost" size="sm" disabled={!canUpdate}>
+ <Button variant="ghost" size="md" disabled={!canUpdate}>
<GraduationCap className="h-4 w-4 mr-1" />
{t("subscription.instance-assignment.assign-license")}
</Button>
diff --git a/frontend/src/react/pages/settings/ProjectsPage.tsx b/frontend/src/react/pages/settings/ProjectsPage.tsx
index dc0a9578f8..5ce2d1bd2b 100644
--- a/frontend/src/react/pages/settings/ProjectsPage.tsx
+++ b/frontend/src/react/pages/settings/ProjectsPage.tsx
@@ -470,16 +470,16 @@ function BatchOperationsBar({
return (
<>
<div className="text-sm flex flex-col lg:flex-row items-start lg:items-center bg-blue-100 py-3 px-4 text-main gap-y-2 gap-x-4 overflow-x-auto">
- <span className="whitespace-nowrap">
+ <span className="whitespace-nowrap text-sm">
{t("project.batch.selected", {
count: selectedProjects.length,
})}
</span>
- <div className="flex items-center gap-x-2">
+ <div className="flex items-center">
{hasActiveProjects && (
<Button
variant="ghost"
- size="sm"
+ size="md"
onClick={() => setShowArchiveConfirm(true)}
>
<Archive className="h-4 w-4 mr-1" />
@@ -489,7 +489,7 @@ function BatchOperationsBar({
{hasArchivedProjects && (
<Button
variant="ghost"
- size="sm"
+ size="md"
onClick={() => setShowRestoreConfirm(true)}
>
{t("common.restore")}
@@ -497,7 +497,7 @@ function BatchOperationsBar({
)}
<Button
variant="ghost"
- size="sm"
+ size="md"
onClick={() => setShowDeleteConfirm(true)}
>
<Trash2 className="h-4 w-4 mr-1" />