Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: several bugfix and refactor (#20699)
ecmadaob0f159c343a4
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.goindex 5c137236a1..776c5e3a65 100644--- a/backend/api/v1/actuator_service.go+++ b/backend/api/v1/actuator_service.go@@ -289,7 +289,23 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context, workspaceID strin}// database group- databaseGroups, err := s.store.ListDatabaseGroups(ctx, &store.FindDatabaseGroupMessage{})+ projects, err := s.store.ListProjects(ctx, &store.FindProjectMessage{+ Workspace: workspaceID,+ ShowDeleted: false,+ })+ if err != nil {+ return nil, errors.Wrapf(err, "failed to list projects")+ }+ projectIDs := make([]string, 0, len(projects))+ for _, project := range projects {+ projectIDs = append(projectIDs, project.ResourceID)+ }+ if len(projectIDs) == 0 {+ return features, nil+ }+ databaseGroups, err := s.store.ListDatabaseGroups(ctx, &store.FindDatabaseGroupMessage{+ ProjectIDs: projectIDs,+ })if err != nil {return nil, errors.Wrapf(err, "failed to list database groups")}diff --git a/backend/api/v1/database_group_service.go b/backend/api/v1/database_group_service.goindex 6fff6e8203..86ae4851ba 100644--- a/backend/api/v1/database_group_service.go+++ b/backend/api/v1/database_group_service.go@@ -116,7 +116,7 @@ func (s *DatabaseGroupService) UpdateDatabaseGroup(ctx context.Context, req *con}existedDatabaseGroup, err := s.store.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{- ProjectID: &project.ResourceID,+ ProjectIDs: []string{project.ResourceID},ResourceID: &databaseGroupResourceID,})if err != nil {@@ -184,7 +184,7 @@ func (s *DatabaseGroupService) DeleteDatabaseGroup(ctx context.Context, req *conreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q has been deleted", projectResourceID))}existedDatabaseGroup, err := s.store.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{- ProjectID: &project.ResourceID,+ ProjectIDs: []string{project.ResourceID},ResourceID: &databaseGroupResourceID,})if err != nil {@@ -220,7 +220,7 @@ func (s *DatabaseGroupService) ListDatabaseGroups(ctx context.Context, req *conn}databaseGroups, err := s.store.ListDatabaseGroups(ctx, &store.FindDatabaseGroupMessage{- ProjectID: &project.ResourceID,+ ProjectIDs: []string{project.ResourceID},})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to list database groups"))@@ -273,7 +273,7 @@ func getDatabaseGroupByName(ctx context.Context, stores *store.Store, databaseGrreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q not found", projectResourceID))}databaseGroup, err := stores.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{- ProjectID: &project.ResourceID,+ ProjectIDs: []string{project.ResourceID},ResourceID: &databaseGroupResourceID,})if err != nil {diff --git a/backend/api/v1/release_service_check.go b/backend/api/v1/release_service_check.goindex a9bbc5271f..8f93751d4f 100644--- a/backend/api/v1/release_service_check.go+++ b/backend/api/v1/release_service_check.go@@ -100,7 +100,7 @@ func (s *ReleaseService) CheckRelease(ctx context.Context, req *connect.Request[return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q has been deleted", projectResourceID))}existedDatabaseGroup, err := s.store.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{- ProjectID: &project.ResourceID,+ ProjectIDs: []string{project.ResourceID},ResourceID: &databaseGroupResourceID,})if err != nil {diff --git a/backend/api/v1/rollout_service_task.go b/backend/api/v1/rollout_service_task.goindex a8b15f12c0..1862f149bb 100644--- a/backend/api/v1/rollout_service_task.go+++ b/backend/api/v1/rollout_service_task.go@@ -29,7 +29,7 @@ func applyDatabaseGroupSpecTransformations(ctx context.Context, s *store.Store,// Re-evaluate database group matches live instead of using deployment snapshotdatabaseGroup, err := s.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{ResourceID: &databaseGroupID,- ProjectID: &projectID,+ ProjectIDs: []string{projectID},})if err != nil {return nil, errors.Wrapf(err, "failed to get database group")diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.goindex 64c0dcc6de..fd0d1b84e0 100644--- a/backend/runner/approval/runner.go+++ b/backend/runner/approval/runner.go@@ -418,7 +418,7 @@ func unfoldDatabaseTargets(ctx context.Context, stores *store.Store, dbTargets [// This is a database group - unfold itdatabaseGroup, err := stores.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{ResourceID: &databaseGroupID,- ProjectID: &projectID,+ ProjectIDs: []string{projectID},})if err != nil {return nil, errors.Wrapf(err, "failed to get database group")diff --git a/backend/runner/plancheck/scheduler.go b/backend/runner/plancheck/scheduler.goindex 77e836cec7..45f18c6d03 100644--- a/backend/runner/plancheck/scheduler.go+++ b/backend/runner/plancheck/scheduler.go@@ -231,7 +231,7 @@ func (s *Scheduler) getDatabaseGroupForPlan(ctx context.Context, plan *store.Pla// Found a database group reference - fetch and expand itdbGroup, err := s.store.GetDatabaseGroup(ctx, &store.FindDatabaseGroupMessage{ResourceID: &databaseGroupID,- ProjectID: &plan.ProjectID,+ ProjectIDs: []string{plan.ProjectID},})if err != nil {return nil, errors.Wrapf(err, "failed to get database group %q", target)diff --git a/backend/store/database_group.go b/backend/store/database_group.goindex 9c4e9a9a99..425430303d 100644--- a/backend/store/database_group.go+++ b/backend/store/database_group.go@@ -21,7 +21,8 @@ type DatabaseGroupMessage struct {// FindDatabaseGroupMessage is the message for finding database group.type FindDatabaseGroupMessage struct {- ProjectID *string+ // Required field+ ProjectIDs []stringResourceID *string}@@ -47,28 +48,9 @@ func (s *Store) DeleteDatabaseGroup(ctx context.Context, projectID, resourceID s// ListDatabaseGroups lists database groups.func (s *Store) ListDatabaseGroups(ctx context.Context, find *FindDatabaseGroupMessage) ([]*DatabaseGroupMessage, error) {- q := qb.Q().Space(`- SELECT- project,- resource_id,- name,- expression- FROM db_group- WHERE TRUE- `)-- if v := find.ProjectID; v != nil {- q.And("project = ?", *v)- }- if v := find.ResourceID; v != nil {- q.And("resource_id = ?", *v)- }-- q.Space("ORDER BY project, resource_id ASC")-- query, args, err := q.ToSQL()+ query, args, err := buildListDatabaseGroupsQuery(find)if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")+ return nil, err}var databaseGroups []*DatabaseGroupMessage@@ -103,6 +85,38 @@ func (s *Store) ListDatabaseGroups(ctx context.Context, find *FindDatabaseGroupMreturn databaseGroups, nil}+func buildListDatabaseGroupsQuery(find *FindDatabaseGroupMessage) (string, []any, error) {+ q := qb.Q().Space(`+ SELECT+ project,+ resource_id,+ name,+ expression+ FROM db_group+ WHERE TRUE+ `)++ switch len(find.ProjectIDs) {+ case 0:+ return "", nil, errors.Errorf("invalid project filter")+ case 1:+ q.And("project = ?", find.ProjectIDs[0])+ default:+ q.And("project = ANY(?)", find.ProjectIDs)+ }+ if v := find.ResourceID; v != nil {+ q.And("resource_id = ?", *v)+ }++ q.Space("ORDER BY project, resource_id ASC")++ query, args, err := q.ToSQL()+ if err != nil {+ return "", nil, errors.Wrapf(err, "failed to build sql")+ }+ return query, args, nil+}+// GetDatabaseGroup gets a database group.func (s *Store) GetDatabaseGroup(ctx context.Context, find *FindDatabaseGroupMessage) (*DatabaseGroupMessage, error) {databaseGroups, err := s.ListDatabaseGroups(ctx, find)diff --git a/backend/store/database_group_test.go b/backend/store/database_group_test.gonew file mode 100644index 0000000000..85dc77c82f--- /dev/null+++ b/backend/store/database_group_test.go@@ -0,0 +1,73 @@+package store++import (+ "strings"+ "testing"++ "github.com/stretchr/testify/require"+)++func TestBuildListDatabaseGroupsQueryMultiProjectFilter(t *testing.T) {+ resourceID := "group-a"+ tests := []struct {+ name string+ find *FindDatabaseGroupMessage+ wantSQLPart string+ wantArgs []any+ wantErr string+ }{+ {+ name: "rejects empty project filter",+ find: &FindDatabaseGroupMessage{},+ wantErr: "invalid project filter",+ },+ {+ name: "single project uses equality",+ find: &FindDatabaseGroupMessage{+ ProjectIDs: []string{"project-a"},+ },+ wantSQLPart: "WHERE TRUE AND project = $1 ORDER BY project, resource_id ASC",+ wantArgs: []any{"project-a"},+ },+ {+ name: "multiple projects use any",+ find: &FindDatabaseGroupMessage{+ ProjectIDs: []string{"project-a", "project-b"},+ },+ wantSQLPart: "WHERE TRUE AND project = ANY($1) ORDER BY project, resource_id ASC",+ wantArgs: []any{[]string{"project-a", "project-b"}},+ },+ {+ name: "single project with resource id",+ find: &FindDatabaseGroupMessage{+ ProjectIDs: []string{"project-a"},+ ResourceID: &resourceID,+ },+ wantSQLPart: "WHERE TRUE AND project = $1 AND resource_id = $2 ORDER BY project, resource_id ASC",+ wantArgs: []any{"project-a", "group-a"},+ },+ {+ name: "multiple projects with resource id",+ find: &FindDatabaseGroupMessage{+ ProjectIDs: []string{"project-a", "project-b"},+ ResourceID: &resourceID,+ },+ wantSQLPart: "WHERE TRUE AND project = ANY($1) AND resource_id = $2 ORDER BY project, resource_id ASC",+ wantArgs: []any{[]string{"project-a", "project-b"}, "group-a"},+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ query, args, err := buildListDatabaseGroupsQuery(tt.find)+ if tt.wantErr != "" {+ require.ErrorContains(t, err, tt.wantErr)+ return+ }++ require.NoError(t, err)+ require.Contains(t, strings.Join(strings.Fields(query), " "), tt.wantSQLPart)+ require.Equal(t, tt.wantArgs, args)+ })+ }+}diff --git a/backend/store/workspace.go b/backend/store/workspace.goindex d7ad3d905b..7bd958be47 100644--- a/backend/store/workspace.go+++ b/backend/store/workspace.go@@ -139,8 +139,8 @@ func (s *Store) CreateWorkspace(ctx context.Context, create *WorkspaceMessage, a}},{storepb.SettingName_ENVIRONMENT, &storepb.EnvironmentSetting{Environments: []*storepb.EnvironmentSetting_Environment{- {Title: "Test", Id: "test"},- {Title: "Prod", Id: "prod"},+ {Title: "Test", Id: "test", Color: "#4f46e5"},+ {Title: "Prod", Id: "prod", Color: "#4f46e5"},},}},}diff --git a/frontend/src/react/components/EnvironmentLabel.tsx b/frontend/src/react/components/EnvironmentLabel.tsxindex 0adfca402c..4c343ed1a3 100644--- a/frontend/src/react/components/EnvironmentLabel.tsx+++ b/frontend/src/react/components/EnvironmentLabel.tsx@@ -4,7 +4,11 @@ import { useTranslation } from "react-i18next";import { useEnvironment, usePlanFeature } from "@/react/hooks/useAppState";import { cn } from "@/react/lib/utils";import type { Environment } from "@/types";-import { NULL_ENVIRONMENT_NAME, UNKNOWN_ENVIRONMENT_NAME } from "@/types";+import {+ DEFAULT_ENVIRONMENT_COLOR,+ NULL_ENVIRONMENT_NAME,+ UNKNOWN_ENVIRONMENT_NAME,+} from "@/types";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { hexToRgb } from "@/utils";@@ -33,7 +37,9 @@ export const EnvironmentBadge = memo(function EnvironmentBadge({environment.name === NULL_ENVIRONMENT_NAME;const isProtected =hasEnvTierFeature && environment.tags?.protected === "protected";- const bgColorRgb = environment.color ? hexToRgb(environment.color) : null;+ const bgColorRgb = isUnset+ ? null+ : hexToRgb(environment.color || DEFAULT_ENVIRONMENT_COLOR);return (<spandiff --git a/frontend/src/react/components/sql-editor/ConnectionPane/ConnectionPane.tsx b/frontend/src/react/components/sql-editor/ConnectionPane/ConnectionPane.tsxindex 9cc0115a77..486486df00 100644--- a/frontend/src/react/components/sql-editor/ConnectionPane/ConnectionPane.tsx+++ b/frontend/src/react/components/sql-editor/ConnectionPane/ConnectionPane.tsx@@ -1157,7 +1157,7 @@ function TreeRow({{/* Expand / collapse chevron — shown for non-leaf rows. Renders anempty spacer for leaf rows so labels stay vertically aligned. */}<span className="shrink-0 inline-flex size-4 items-center justify-center text-control-light">- {hasChildren ? (+ {hasChildren || node.meta.type === "environment" ? (isOpen ? (<ChevronDown className="size-3.5" />) : (diff --git a/frontend/src/react/components/sql-editor/ConnectionPane/TreeNode/Label.test.tsx b/frontend/src/react/components/sql-editor/ConnectionPane/TreeNode/Label.test.tsxindex 71830253b7..ddc9391941 100644--- a/frontend/src/react/components/sql-editor/ConnectionPane/TreeNode/Label.test.tsx+++ b/frontend/src/react/components/sql-editor/ConnectionPane/TreeNode/Label.test.tsx@@ -26,6 +26,7 @@ vi.mock("@/types/proto-es/v1/subscription_service_pb", () => ({vi.mock("@/types", () => ({NULL_ENVIRONMENT_NAME: "environments/-",UNKNOWN_ENVIRONMENT_NAME: "environments/-1",+ DEFAULT_ENVIRONMENT_COLOR: "#4f46e5",}));vi.mock("@/utils", () => ({hexToRgb: () => [128, 128, 128],diff --git a/frontend/src/react/components/sql-editor/ConnectionPane/TreeNode/Label.tsx b/frontend/src/react/components/sql-editor/ConnectionPane/TreeNode/Label.tsxindex cf3f91bc0b..b34efc0968 100644--- a/frontend/src/react/components/sql-editor/ConnectionPane/TreeNode/Label.tsx+++ b/frontend/src/react/components/sql-editor/ConnectionPane/TreeNode/Label.tsx@@ -4,7 +4,11 @@ import { HighlightLabelText } from "@/react/components/HighlightLabelText";import { useSQLEditorFeature } from "@/react/hooks/useSQLEditorBridge";import { cn } from "@/react/lib/utils";import type { SQLEditorTreeNode } from "@/types";-import { NULL_ENVIRONMENT_NAME, UNKNOWN_ENVIRONMENT_NAME } from "@/types";+import {+ DEFAULT_ENVIRONMENT_COLOR,+ NULL_ENVIRONMENT_NAME,+ UNKNOWN_ENVIRONMENT_NAME,+} from "@/types";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { hexToRgb } from "@/utils";import { DatabaseNode } from "./DatabaseNode";@@ -75,8 +79,9 @@ function EnvironmentLabel({);const isProtected =hasEnvTierFeature && environment.tags?.protected === "protected";- const bgColorRgb =- !isUnset && environment.color ? hexToRgb(environment.color) : null;+ const bgColorRgb = isUnset+ ? null+ : hexToRgb(environment.color || DEFAULT_ENVIRONMENT_COLOR);return (<spandiff --git a/frontend/src/react/components/sql-editor/ResultPanel/BatchQuerySelect.tsx b/frontend/src/react/components/sql-editor/ResultPanel/BatchQuerySelect.tsxindex 190c111680..04b2867f64 100644--- a/frontend/src/react/components/sql-editor/ResultPanel/BatchQuerySelect.tsx+++ b/frontend/src/react/components/sql-editor/ResultPanel/BatchQuerySelect.tsx@@ -28,6 +28,7 @@ import { ExportFormat } from "@/types/proto-es/v1/common_pb";import type { Database } from "@/types/proto-es/v1/database_service_pb";import { ExportRequestSchema } from "@/types/proto-es/v1/sql_service_pb";import type { SQLEditorDatabaseQueryContext } from "@/types/sqlEditor/tab";+import { DEFAULT_ENVIRONMENT_COLOR } from "@/types/v1/environment";import {extractDatabaseResourceName,getDatabaseEnvironment,@@ -448,7 +449,9 @@ function TabButton({}: TabButtonProps & { ref?: React.Ref<HTMLButtonElement> }) {const { t } = useTranslation();const environment = getDatabaseEnvironment(item.database);- const colorRgb = hexToRgb(environment.color || "#4f46e5").join(", ");+ const colorRgb = hexToRgb(+ environment.color || DEFAULT_ENVIRONMENT_COLOR+ ).join(", ");const style = {backgroundColor: `rgba(${colorRgb}, 0.1)`,borderTopColor: `rgb(${colorRgb})`,diff --git a/frontend/src/react/pages/auth/ProfileSetupPage.test.tsx b/frontend/src/react/pages/auth/ProfileSetupPage.test.tsxnew file mode 100644index 0000000000..460e05b423--- /dev/null+++ b/frontend/src/react/pages/auth/ProfileSetupPage.test.tsx@@ -0,0 +1,155 @@+import type { ReactElement } from "react";+import { act } from "react";+import { createRoot } from "react-dom/client";+import { beforeEach, describe, expect, test, vi } from "vitest";+import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";+import type { User } from "@/types/proto-es/v1/user_service_pb";+import type { Workspace } from "@/types/proto-es/v1/workspace_service_pb";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++const mocks = vi.hoisted(() => ({+ canUpdateWorkspace: true,+ currentUser: {+ name: "users/[email protected]",+ email: "[email protected]",+ title: "Ed",+ } as User,+ workspace: {+ name: "workspaces/ws1",+ title: "Workspace One",+ } as Workspace,+ workspacePolicy: {+ bindings: [+ {+ role: "roles/workspaceAdmin",+ members: ["users/[email protected]"],+ },+ ],+ } as IamPolicy,+ updateUser: vi.fn(),+ updateWorkspace: vi.fn(),+ routerReplace: vi.fn(),+ pushNotification: vi.fn(),+ hasWorkspacePermissionV2: vi.fn(() => false),+}));++vi.mock("@/react/hooks/useAppState", () => ({+ useCurrentUser: () => mocks.currentUser,+ useWorkspace: () => mocks.workspace,+ useWorkspacePermission: () => mocks.canUpdateWorkspace,+}));++vi.mock("@/react/stores/app", () => ({+ useAppStore: (+ selector: (state: {+ workspacePolicy: IamPolicy;+ updateUser: typeof mocks.updateUser;+ updateWorkspace: typeof mocks.updateWorkspace;+ }) => unknown+ ) =>+ selector({+ workspacePolicy: mocks.workspacePolicy,+ updateUser: mocks.updateUser,+ updateWorkspace: mocks.updateWorkspace,+ }),+}));++vi.mock("@/react/router", async (importOriginal) => ({+ ...(await importOriginal<typeof import("@/react/router")>()),+ router: {+ replace: mocks.routerReplace,+ },+}));++vi.mock("@/store", () => ({+ pushNotification: mocks.pushNotification,+}));++vi.mock("@/utils", () => ({+ hasWorkspacePermissionV2: mocks.hasWorkspacePermissionV2,+}));++vi.mock("@/react/components/UserAvatar", () => ({+ UserAvatar: () => null,+}));++vi.mock("react-i18next", () => ({+ useTranslation: () => ({+ t: (key: string) => key,+ }),+}));++let ProfileSetupPage: typeof import("./ProfileSetupPage").ProfileSetupPage;++const renderIntoContainer = (element: ReactElement) => {+ const container = document.createElement("div");+ const root = createRoot(container);+ return {+ container,+ render: () => {+ act(() => {+ root.render(element);+ });+ },+ unmount: () =>+ act(() => {+ root.unmount();+ }),+ };+};++beforeEach(async () => {+ vi.clearAllMocks();+ mocks.canUpdateWorkspace = true;+ mocks.workspacePolicy = {+ bindings: [+ {+ role: "roles/workspaceAdmin",+ members: ["users/[email protected]"],+ },+ ],+ } as IamPolicy;+ ({ ProfileSetupPage } = await import("./ProfileSetupPage"));+});++describe("ProfileSetupPage", () => {+ test("shows workspace name when the sole member can update the workspace", () => {+ const page = renderIntoContainer(<ProfileSetupPage />);++ page.render();++ expect(page.container.textContent).toContain(+ "settings.profile.workspace-name"+ );+ expect(mocks.hasWorkspacePermissionV2).not.toHaveBeenCalled();++ page.unmount();+ });++ test("hides workspace name for users joining an existing workspace", () => {+ mocks.workspacePolicy = {+ bindings: [+ {+ role: "roles/workspaceAdmin",+ members: ["users/[email protected]"],+ },+ {+ role: "roles/workspaceMember",+ members: ["users/[email protected]"],+ },+ ],+ } as IamPolicy;+ const page = renderIntoContainer(<ProfileSetupPage />);++ page.render();++ expect(page.container.textContent).not.toContain(+ "settings.profile.workspace-name"+ );++ page.unmount();+ });+});diff --git a/frontend/src/react/pages/auth/ProfileSetupPage.tsx b/frontend/src/react/pages/auth/ProfileSetupPage.tsxindex 7519b30010..9694570954 100644--- a/frontend/src/react/pages/auth/ProfileSetupPage.tsx+++ b/frontend/src/react/pages/auth/ProfileSetupPage.tsx@@ -5,35 +5,30 @@ import { useTranslation } from "react-i18next";import { UserAvatar } from "@/react/components/UserAvatar";import { Button } from "@/react/components/ui/button";import { Input } from "@/react/components/ui/input";-import { useCurrentUser, useWorkspace } from "@/react/hooks/useAppState";+import {+ useCurrentUser,+ useWorkspace,+ useWorkspacePermission,+} from "@/react/hooks/useAppState";import { router } from "@/react/router";import { useAppStore } from "@/react/stores/app";import { pushNotification } from "@/store";import { UpdateUserRequestSchema } from "@/types/proto-es/v1/user_service_pb";import { WorkspaceSchema } from "@/types/proto-es/v1/workspace_service_pb";-import { hasWorkspacePermissionV2 } from "@/utils";export function ProfileSetupPage() {const { t } = useTranslation();const currentUser = useCurrentUser();const updateUser = useAppStore((state) => state.updateUser);const updateWorkspace = useAppStore((state) => state.updateWorkspace);- const fetchWorkspaceIamPolicy = useAppStore(- (state) => state.fetchWorkspaceIamPolicy- );const workspace = useWorkspace();const workspacePolicy = useAppStore((state) => state.workspacePolicy);-- // The member count below gates the workspace-rename field, so make sure the- // policy is loaded even when this page is reached outside the setup flow.- useEffect(() => {- void fetchWorkspaceIamPolicy();- }, [fetchWorkspaceIamPolicy]);+ const canUpdateWorkspace = useWorkspacePermission("bb.workspaces.update");// Show workspace name field only if the user is the sole member of the// workspace (i.e. they just created it), not when they were invited.const canRenameWorkspace =- hasWorkspacePermissionV2("bb.workspaces.update") &&+ canUpdateWorkspace &&(workspacePolicy?.bindings ?? []).reduce((count, b) => count + b.members.length,0diff --git a/frontend/src/react/pages/project/database-detail/DatabaseDetailHeader.tsx b/frontend/src/react/pages/project/database-detail/DatabaseDetailHeader.tsxindex 1391a85dec..7793b22acc 100644--- a/frontend/src/react/pages/project/database-detail/DatabaseDetailHeader.tsx+++ b/frontend/src/react/pages/project/database-detail/DatabaseDetailHeader.tsx@@ -9,6 +9,7 @@ import { INSTANCE_ROUTE_DETAIL } from "@/react/router/handles";import type { Database } from "@/types/proto-es/v1/database_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {+ DEFAULT_ENVIRONMENT_COLOR,formatEnvironmentName,isValidEnvironmentName,UNKNOWN_ENVIRONMENT_NAME,@@ -75,10 +76,10 @@ export function DatabaseDetailHeader({environment.tags?.protected === "protected";const environmentColorRgb = useMemo(() => {- if (!isValidEnv || !environment.color) {+ if (!isValidEnv) {return "";}- return hexToRgb(environment.color).join(", ");+ return hexToRgb(environment.color || DEFAULT_ENVIRONMENT_COLOR).join(", ");}, [environment, isValidEnv]);const environmentBadgeStyle: React.CSSProperties | undefined = useMemo(() => {diff --git a/frontend/src/react/pages/settings/EnvironmentsPage.tsx b/frontend/src/react/pages/settings/EnvironmentsPage.tsxindex 9fcb2ee8f9..5f228f7d1e 100644--- a/frontend/src/react/pages/settings/EnvironmentsPage.tsx+++ b/frontend/src/react/pages/settings/EnvironmentsPage.tsx@@ -71,6 +71,7 @@ import { useSQLReviewStore } from "@/react/stores/sqlReview";import { pushNotification } from "@/store";import { environmentNamePrefix } from "@/store/modules/v1/common";import {+ DEFAULT_ENVIRONMENT_COLOR,formatEnvironmentName,isValidEnvironmentName,PRESET_PROJECT_ROLES,@@ -112,7 +113,7 @@ function EnvironmentName({const hasEnvTierFeature = useAppStore((s) =>s.hasInstanceFeature(PlanFeature.FEATURE_ENVIRONMENT_TIERS));- const color = environment.color || "#4f46e5";+ const color = environment.color || DEFAULT_ENVIRONMENT_COLOR;const rgbValues = hexToRgb(color);const rgbStr = rgbValues.join(", ");const showProductionIcon =@@ -645,7 +646,9 @@ function EnvironmentDetail({// Local editing stateconst [editTitle, setEditTitle] = useState(environment.title);- const [editColor, setEditColor] = useState(environment.color || "#4f46e5");+ const [editColor, setEditColor] = useState(+ environment.color || DEFAULT_ENVIRONMENT_COLOR+ );const [editProtected, setEditProtected] = useState(environment.tags?.protected === "protected");@@ -666,7 +669,7 @@ function EnvironmentDetail({// Reset state when environment changesuseEffect(() => {setEditTitle(environment.title);- setEditColor(environment.color || "#4f46e5");+ setEditColor(environment.color || DEFAULT_ENVIRONMENT_COLOR);setEditProtected(environment.tags?.protected === "protected");setShowDeleteConfirm(false);}, [environment.id, environment.title, environment.color, environment.tags]);@@ -729,7 +732,7 @@ function EnvironmentDetail({const envChanged = useMemo(() => {return (editTitle !== environment.title ||- editColor !== (environment.color || "#4f46e5") ||+ editColor !== (environment.color || DEFAULT_ENVIRONMENT_COLOR) ||editProtected !== (environment.tags?.protected === "protected"));}, [editTitle, editColor, editProtected, environment]);@@ -747,7 +750,7 @@ function EnvironmentDetail({const revert = () => {setEditTitle(environment.title);- setEditColor(environment.color || "#4f46e5");+ setEditColor(environment.color || DEFAULT_ENVIRONMENT_COLOR);setEditProtected(environment.tags?.protected === "protected");if (originalRolloutPolicy) {setRolloutPolicy(cloneDeep(originalRolloutPolicy));@@ -773,7 +776,7 @@ function EnvironmentDetail({});// Sync local state to the saved values so hasChanges becomes falsesetEditTitle(updated.title);- setEditColor(updated.color || "#4f46e5");+ setEditColor(updated.color || DEFAULT_ENVIRONMENT_COLOR);setEditProtected(updated.tags?.protected === "protected");await refreshEnvironmentList();}@@ -813,7 +816,7 @@ function EnvironmentDetail({title: t("common.warning"),description: "Invalid color",});- setEditColor("#4f46e5");+ setEditColor(DEFAULT_ENVIRONMENT_COLOR);return;}setEditColor(color);@@ -833,7 +836,11 @@ function EnvironmentDetail({value={editColor}disabled={!canEdit}onChange={(e) => onColorChange(e.target.value)}- className="w-5 h-5 rounded-sm cursor-pointer border-0 p-0"+ 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"+ )}/><span className="font-medium">{t("common.environment-name")}@@ -934,7 +941,7 @@ function EnvironmentDetail({{allowDelete && (<div className="mt-6 border-t border-block-border flex justify-between items-center pt-4 pb-2"><Button- variant="destructive"+ variant="ghost-destructive"onClick={() => setShowDeleteConfirm(true)}>{t("common.delete")}@@ -1039,7 +1046,7 @@ function CreateSheet({);const [title, setTitle] = useState("");- const [color, setColor] = useState("#4f46e5");+ const [color, setColor] = useState(DEFAULT_ENVIRONMENT_COLOR);const [isProtected, setIsProtected] = useState(false);const [rolloutPolicy, setRolloutPolicy] = useState<Policy>(getEmptyRolloutPolicy("", PolicyResourceType.ENVIRONMENT)@@ -1052,7 +1059,7 @@ function CreateSheet({useEffect(() => {if (!open) return;setTitle("");- setColor("#4f46e5");+ setColor(DEFAULT_ENVIRONMENT_COLOR);setIsProtected(false);setRolloutPolicy(getEmptyRolloutPolicy("", PolicyResourceType.ENVIRONMENT));setResourceId("");@@ -1110,7 +1117,7 @@ function CreateSheet({title: t("common.warning"),description: "Invalid color",});- setColor("#4f46e5");+ setColor(DEFAULT_ENVIRONMENT_COLOR);return;}setColor(newColor);@@ -1132,7 +1139,11 @@ function CreateSheet({type="color"value={color}onChange={(e) => onColorChange(e.target.value)}- className="w-5 h-5 rounded-sm cursor-pointer border-0 p-0"+ 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"+ )}/><span className="font-medium">{t("common.environment-name")}diff --git a/frontend/src/react/pages/settings/InstancesPage.tsx b/frontend/src/react/pages/settings/InstancesPage.tsxindex 647b1f2162..79f0a2c2b5 100644--- a/frontend/src/react/pages/settings/InstancesPage.tsx+++ b/frontend/src/react/pages/settings/InstancesPage.tsx@@ -71,6 +71,7 @@ import type { InstanceFilter } from "@/react/stores/app/types";import { pushNotification } from "@/store";import { environmentNamePrefix } from "@/store/modules/v1/common";import {+ DEFAULT_ENVIRONMENT_COLOR,isValidInstanceName,NULL_ENVIRONMENT_NAME,UNKNOWN_ENVIRONMENT_NAME,@@ -191,7 +192,9 @@ function EnvironmentName({ environmentName }: { environmentName: string }) {const isProtected =hasEnvTierFeature && environment.tags?.protected === "protected";- const bgColorRgb = environment.color ? hexToRgb(environment.color) : null;+ const bgColorRgb = isUnset+ ? null+ : hexToRgb(environment.color || DEFAULT_ENVIRONMENT_COLOR);return (<span@@ -475,12 +478,12 @@ function EditEnvironmentSheet({className="accent-accent"/><div className="flex items-center gap-x-2">- {env.color && (- <span- className="inline-block size-3 rounded-full"- style={{ backgroundColor: env.color }}- />- )}+ <span+ className="inline-block size-3 rounded-full"+ style={{+ backgroundColor: env.color || DEFAULT_ENVIRONMENT_COLOR,+ }}+ /><span>{env.title}</span></div></label>diff --git a/frontend/src/types/v1/environment.ts b/frontend/src/types/v1/environment.tsindex 991df53431..ac7a00d49e 100644--- a/frontend/src/types/v1/environment.ts+++ b/frontend/src/types/v1/environment.ts@@ -8,6 +8,7 @@ import {export const UNKNOWN_ENVIRONMENT_NAME = `environments/${UNKNOWN_ID}`;export const NULL_ENVIRONMENT_NAME = "environments/-";+export const DEFAULT_ENVIRONMENT_COLOR = "#4f46e5";export interface Environment extends EnvironmentSetting_Environment {order: number;