Skip to content

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

chore: several ui update and fix (#20938)

ecmadaoc720cf3394ca
diff --git a/frontend/src/react/components/ProjectLabel.test.tsx b/frontend/src/react/components/ProjectLabel.test.tsx
index f29e92e777..bed5379afc 100644
--- a/frontend/src/react/components/ProjectLabel.test.tsx
+++ b/frontend/src/react/components/ProjectLabel.test.tsx
@@ -11,6 +11,7 @@ const mocks = vi.hoisted(() => ({
useProjectByName: vi.fn(),
getOrFetchProjectByName: vi.fn(),
hasWorkspacePermissionV2: vi.fn(() => true),
+ isDefaultProject: vi.fn((_name: string) => false),
}));
vi.mock("react-i18next", () => ({
@@ -58,6 +59,11 @@ vi.mock("@/utils", async (importOriginal) => ({
hasWorkspacePermissionV2: mocks.hasWorkspacePermissionV2,
}));
+vi.mock("@/types/v1/project", async (importOriginal) => ({
+ ...(await importOriginal<typeof import("@/types/v1/project")>()),
+ isDefaultProject: mocks.isDefaultProject,
+}));
+
import { ProjectLabel } from "./ProjectLabel";
const render = async (element: ReactElement) => {
@@ -79,6 +85,7 @@ describe("ProjectLabel", () => {
beforeEach(() => {
vi.clearAllMocks();
mocks.hasWorkspacePermissionV2.mockReturnValue(true);
+ mocks.isDefaultProject.mockReturnValue(false);
mocks.useProjectByName.mockReturnValue({
name: "projects/sample",
title: "Sample Project",
@@ -177,4 +184,61 @@ describe("ProjectLabel", () => {
expect(rendered.container.textContent).toBe("Custom Project");
expect(mocks.getOrFetchProjectByName).not.toHaveBeenCalled();
});
+
+ test("renders unknown project names as plain text even when link is requested", async () => {
+ const rendered = await render(
+ <ProjectLabel projectName="projects/-1" link />
+ );
+ root = rendered.root;
+
+ expect(rendered.container.querySelector("a")).toBeNull();
+ expect(rendered.container.textContent).toBe("projects/-1");
+ expect(mocks.getOrFetchProjectByName).not.toHaveBeenCalled();
+ });
+
+ test("renders wildcard project names as plain text even when link is requested", async () => {
+ const rendered = await render(<ProjectLabel projectName="projects/-" link />);
+ root = rendered.root;
+
+ expect(rendered.container.querySelector("a")).toBeNull();
+ expect(rendered.container.textContent).toBe("projects/-");
+ expect(mocks.getOrFetchProjectByName).not.toHaveBeenCalled();
+ });
+
+ test("renders empty project names as plain text even when link is requested", async () => {
+ const rendered = await render(<ProjectLabel projectName="" link />);
+ root = rendered.root;
+
+ expect(rendered.container.querySelector("a")).toBeNull();
+ expect(rendered.container.textContent).toBe("-");
+ expect(mocks.getOrFetchProjectByName).not.toHaveBeenCalled();
+ });
+
+ test("renders empty project IDs as plain text even when link is requested", async () => {
+ const rendered = await render(<ProjectLabel projectName="projects/" link />);
+ root = rendered.root;
+
+ expect(rendered.container.querySelector("a")).toBeNull();
+ expect(rendered.container.textContent).toBe("projects/");
+ expect(mocks.getOrFetchProjectByName).not.toHaveBeenCalled();
+ });
+
+ test("renders the default project as plain text even when link is requested", async () => {
+ mocks.isDefaultProject.mockImplementation(
+ (name) => name === "projects/default"
+ );
+ mocks.useProjectByName.mockReturnValue({
+ name: "projects/default",
+ title: "Default project",
+ });
+
+ const rendered = await render(
+ <ProjectLabel projectName="projects/default" link />
+ );
+ root = rendered.root;
+
+ expect(rendered.container.querySelector("a")).toBeNull();
+ expect(rendered.container.textContent).toBe("Default project");
+ expect(mocks.getOrFetchProjectByName).not.toHaveBeenCalled();
+ });
});
diff --git a/frontend/src/react/components/ProjectLabel.tsx b/frontend/src/react/components/ProjectLabel.tsx
index 29752b3153..5203b247bd 100644
--- a/frontend/src/react/components/ProjectLabel.tsx
+++ b/frontend/src/react/components/ProjectLabel.tsx
@@ -8,7 +8,7 @@ import { useProjectByName } from "@/react/hooks/useProjectByName";
import { cn } from "@/react/lib/utils";
import { PROJECT_V1_ROUTE_DETAIL } from "@/react/router/handles";
import { useAppStore } from "@/react/stores/app";
-import { projectNamePrefix } from "@/store/modules/v1/common";
+import { isDefaultProject, isValidProjectName } from "@/types/v1/project";
import { extractProjectResourceName, hasWorkspacePermissionV2 } from "@/utils";
export function ProjectLabel({
@@ -29,19 +29,20 @@ export function ProjectLabel({
const { t } = useTranslation();
const project = useProjectByName(projectName);
const projectId = extractProjectResourceName(projectName);
- const validProjectName =
- projectName.startsWith(projectNamePrefix) && projectId.length > 0;
+ const validProjectName = isValidProjectName(projectName);
+ const defaultProject = isDefaultProject(projectName);
const shouldFetchProject = children === undefined;
useEffect(() => {
if (
shouldFetchProject &&
validProjectName &&
+ !defaultProject &&
hasWorkspacePermissionV2("bb.projects.get")
) {
void useAppStore.getState().getOrFetchProjectByName(projectName, true);
}
- }, [projectName, shouldFetchProject, validProjectName]);
+ }, [defaultProject, projectName, shouldFetchProject, validProjectName]);
if (!validProjectName) {
return (
@@ -62,7 +63,7 @@ export function ProjectLabel({
</>
);
- if (!link) {
+ if (!link || defaultProject) {
if (className) {
return <span className={className}>{content}</span>;
}
diff --git a/frontend/src/react/components/header/ProjectSwitchDialog.tsx b/frontend/src/react/components/header/ProjectSwitchDialog.tsx
deleted file mode 100644
index 00386f81a4..0000000000
--- a/frontend/src/react/components/header/ProjectSwitchDialog.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
- Dialog,
- DialogContent,
- DialogTitle,
-} from "@/react/components/ui/dialog";
-import { ProjectCreateDialog } from "./ProjectCreateDialog";
-import { ProjectSwitchPanel } from "./ProjectSwitchPanel";
-
-export interface ProjectSwitchDialogProps {
- open: boolean;
- onClose: () => void;
-}
-
-export function ProjectSwitchDialog({
- open,
- onClose,
-}: ProjectSwitchDialogProps) {
- const { t } = useTranslation();
- const [createOpen, setCreateOpen] = useState(false);
-
- return (
- <>
- <Dialog open={open} onOpenChange={(next) => !next && onClose()}>
- <DialogContent className="w-[min(90vw,48rem)] p-6">
- <DialogTitle className="mb-4">{t("project.select")}</DialogTitle>
- <ProjectSwitchPanel
- onClose={onClose}
- onRequestCreate={() => setCreateOpen(true)}
- />
- </DialogContent>
- </Dialog>
-
- <ProjectCreateDialog
- open={createOpen}
- onClose={() => setCreateOpen(false)}
- />
- </>
- );
-}
diff --git a/frontend/src/react/components/header/ProjectSwitchPopover.tsx b/frontend/src/react/components/header/ProjectSwitchPopover.tsx
deleted file mode 100644
index 42513019a6..0000000000
--- a/frontend/src/react/components/header/ProjectSwitchPopover.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { ChevronDown } from "lucide-react";
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from "@/react/components/ui/popover";
-import { useProject } from "@/react/hooks/useAppState";
-import {
- isValidProjectName,
- projectNamePrefix,
-} from "@/react/lib/resourceName";
-import { useCurrentRoute } from "@/react/router";
-import { ProjectCreateDialog } from "./ProjectCreateDialog";
-import { ProjectSwitchPanel } from "./ProjectSwitchPanel";
-
-export function ProjectSwitchPopover() {
- const { t } = useTranslation();
- const [open, setOpen] = useState(false);
- const [createOpen, setCreateOpen] = useState(false);
- const route = useCurrentRoute();
- const projectId = route.params.projectId as string | undefined;
- const currentProjectName = projectId
- ? `${projectNamePrefix}${projectId}`
- : "";
- const currentProject = useProject(currentProjectName);
-
- useEffect(() => {
- setOpen(false);
- }, [route.fullPath]);
-
- return (
- <>
- <Popover open={open} onOpenChange={setOpen}>
- <PopoverTrigger
- render={
- <button
- type="button"
- className="hidden h-8 items-center gap-x-2 rounded-xs border border-control-border bg-background px-3 text-xs hover:bg-control-bg sm:inline-flex"
- />
- }
- >
- <div className="min-w-32 text-left">
- {isValidProjectName(currentProject?.name) ? (
- <span className="block truncate text-sm font-medium text-control">
- {currentProject.title}
- </span>
- ) : (
- <span className="text-sm text-control-placeholder">
- {t("project.select")}
- </span>
- )}
- </div>
- <ChevronDown className="h-4 w-4 opacity-80" />
- </PopoverTrigger>
- <PopoverContent
- align="start"
- sideOffset={6}
- className="w-[24rem] max-w-[calc(100vw-2rem)] p-0! py-3!"
- >
- <ProjectSwitchPanel
- onClose={() => setOpen(false)}
- onRequestCreate={() => {
- setOpen(false);
- setCreateOpen(true);
- }}
- />
- </PopoverContent>
- </Popover>
-
- <ProjectCreateDialog
- open={createOpen}
- onClose={() => setCreateOpen(false)}
- />
- </>
- );
-}
diff --git a/frontend/src/react/components/instance/InstanceFormBody.tsx b/frontend/src/react/components/instance/InstanceFormBody.tsx
index e04f93ee1f..598292f772 100644
--- a/frontend/src/react/components/instance/InstanceFormBody.tsx
+++ b/frontend/src/react/components/instance/InstanceFormBody.tsx
@@ -381,7 +381,11 @@ function ScanIntervalInput({
<RadioGroupItem value="DEFAULT" disabled={!allowEdit}>
{t("instance.scan-interval.default-never")}
</RadioGroupItem>
- <RadioGroupItem value="CUSTOM" disabled={!allowEdit}>
+ <RadioGroupItem
+ value="CUSTOM"
+ disabled={!allowEdit}
+ contentClassName="flex items-center gap-x-2"
+ >
<span>{t("common.custom")}</span>
<Input
type="number"
diff --git a/frontend/src/react/pages/settings/LandingPage.navigation.test.ts b/frontend/src/react/pages/settings/LandingPage.navigation.test.ts
new file mode 100644
index 0000000000..ca0cad12e3
--- /dev/null
+++ b/frontend/src/react/pages/settings/LandingPage.navigation.test.ts
@@ -0,0 +1,12 @@
+import { describe, expect, test } from "vitest";
+
+import source from "./LandingPage.tsx?raw";
+
+describe("LandingPage navigation", () => {
+ test("routes the visit projects quick link to the projects page", () => {
+ expect(source).toContain('id: "visit-projects"');
+ expect(source).toContain("route: PROJECT_V1_ROUTE_DASHBOARD");
+ expect(source).not.toContain("ProjectSwitchDialog");
+ expect(source).not.toContain("setShowProjectSwitchDialog");
+ });
+});
diff --git a/frontend/src/react/pages/settings/LandingPage.tsx b/frontend/src/react/pages/settings/LandingPage.tsx
index 14d14b65d9..b5a64991b4 100644
--- a/frontend/src/react/pages/settings/LandingPage.tsx
+++ b/frontend/src/react/pages/settings/LandingPage.tsx
@@ -21,7 +21,6 @@ import {
useState,
} from "react";
import { useTranslation } from "react-i18next";
-import { ProjectSwitchDialog } from "@/react/components/header/ProjectSwitchDialog";
import { RouterLink } from "@/react/components/RouterLink";
import { Checkbox } from "@/react/components/ui/checkbox";
import {
@@ -92,6 +91,7 @@ function useFullQuickLinkList(): QuickLinkDef[] {
{
id: "visit-projects",
title: t("landing.quick-link.visit-prjects"),
+ route: PROJECT_V1_ROUTE_DASHBOARD,
icon: GalleryHorizontalEnd,
},
{
@@ -431,7 +431,6 @@ function ConfigSheet({
export function LandingPage(_: Record<string, never> = {}) {
const { t } = useTranslation();
const [showConfigDrawer, setShowConfigDrawer] = useState(false);
- const [showProjectSwitchDialog, setShowProjectSwitchDialog] = useState(false);
const email = useOptionalCurrentUser()?.email ?? "";
const { version, changelogURL } = useServerState();
@@ -454,13 +453,8 @@ export function LandingPage(_: Record<string, never> = {}) {
router.push({ name: link.route });
return;
}
- switch (link.id) {
- case "visit-projects":
- setShowProjectSwitchDialog(true);
- break;
- case "visit-issues":
- router.push({ name: WORKSPACE_ROUTE_MY_ISSUES });
- break;
+ if (link.id === "visit-issues") {
+ router.push({ name: WORKSPACE_ROUTE_MY_ISSUES });
}
}, []);
@@ -543,11 +537,6 @@ export function LandingPage(_: Record<string, never> = {}) {
config={config}
setConfig={setConfig}
/>
-
- <ProjectSwitchDialog
- open={showProjectSwitchDialog}
- onClose={() => setShowProjectSwitchDialog(false)}
- />
</>
);
}
diff --git a/frontend/src/react/router/guard.test.ts b/frontend/src/react/router/guard.test.ts
index 31579aeafe..5bff782f69 100644
--- a/frontend/src/react/router/guard.test.ts
+++ b/frontend/src/react/router/guard.test.ts
@@ -8,6 +8,7 @@ const session = {
requireResetPassword: false,
requireMfa: false,
hasTwoFa: false,
+ isSaaSMode: false,
currentUser: undefined as { mfaEnabled: boolean } | undefined,
};
@@ -25,6 +26,7 @@ vi.mock("@/react/stores/app", () => ({
requireResetPassword: () => session.requireResetPassword,
getWorkspaceProfile: () => ({ requireMfa: session.requireMfa }),
hasFeature: () => session.hasTwoFa,
+ isSaaSMode: () => session.isSaaSMode,
currentUser: session.currentUser,
...resets,
}),
@@ -42,6 +44,7 @@ import {
AUTH_OAUTH_CALLBACK_MODULE,
AUTH_PASSWORD_RESET_MODULE,
AUTH_SIGNIN_MODULE,
+ AUTH_SIGNUP_MODULE,
PROJECT_V1_ROUTE_DASHBOARD,
WORKSPACE_ROUTE_404,
} from "./handles";
@@ -54,6 +57,7 @@ beforeEach(() => {
session.requireResetPassword = false;
session.requireMfa = false;
session.hasTwoFa = false;
+ session.isSaaSMode = false;
session.currentUser = undefined;
vi.clearAllMocks();
setRouteNameIndex(
@@ -144,6 +148,19 @@ describe("rootGuard", () => {
expect(resets.resetProjects).toHaveBeenCalled();
});
+ test("redirects SaaS signup route to signin", () => {
+ session.isSaaSMode = true;
+
+ expect(
+ location(
+ run(
+ AUTH_SIGNUP_MODULE,
+ "/auth/signup?email=alice%40example.com&invitation=invite-1"
+ )
+ )
+ ).toBe("/auth?email=alice%40example.com&invitation=invite-1");
+ });
+
test("not-logged-in user is redirected to signin with a redirect query", () => {
const target = location(run(PROJECT_V1_ROUTE_DASHBOARD, "/projects/p1"));
expect(target).toBe("/auth?redirect=%2Fprojects%2Fp1");
diff --git a/frontend/src/react/router/guard.ts b/frontend/src/react/router/guard.ts
index 59d14354c0..5d9130f792 100644
--- a/frontend/src/react/router/guard.ts
+++ b/frontend/src/react/router/guard.ts
@@ -191,6 +191,14 @@ export function rootGuard({
const store = useAppStore.getState();
const isLoggedIn = store.isLoggedIn();
+ if (toName === AUTH_SIGNUP_MODULE && store.isSaaSMode()) {
+ return redirect(
+ resolvePath(AUTH_SIGNIN_MODULE, {
+ query: Object.fromEntries(url.searchParams),
+ })
+ );
+ }
+
// Allow 2FA setup / password reset / profile setup for logged-in users.
if (
isLoggedIn &&
diff --git a/frontend/src/types/v1/project.ts b/frontend/src/types/v1/project.ts
index 05f78f2b94..8ede7feede 100644
--- a/frontend/src/types/v1/project.ts
+++ b/frontend/src/types/v1/project.ts
@@ -35,7 +35,12 @@ export const defaultProject = (name: string): Project => {
};
export const isValidProjectName = (name: string | undefined) => {
+ const projectID = name?.slice("projects/".length);
return (
- !!name && name.startsWith("projects/") && name !== UNKNOWN_PROJECT_NAME
+ !!name &&
+ name.startsWith("projects/") &&
+ !!projectID &&
+ projectID !== "-" &&
+ name !== UNKNOWN_PROJECT_NAME
);
};