Skip to content

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

fix: use router link for plan discussion action (#20534)

p0nyd03ced527cae
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx
index 7ada0a4d7e..1c96056066 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx
@@ -23,6 +23,10 @@ const mocks = vi.hoisted(() => ({
listIssueComments: vi.fn(async () => ({ issueComments: mocks.comments })),
requestIssue: vi.fn(async () => ({})),
routerPush: vi.fn(),
+ routerResolve: vi.fn(() => ({
+ fullPath: "/projects/p1/issues/123",
+ href: "/projects/p1/issues/123",
+ })),
useTranslation: vi.fn(() => ({
t: (key: string) => key,
})),
@@ -64,6 +68,7 @@ vi.mock("@/react/router", async (importOriginal) => ({
...(await importOriginal<typeof import("@/react/router")>()),
router: {
push: mocks.routerPush,
+ resolve: mocks.routerResolve,
},
}));
@@ -226,6 +231,7 @@ beforeEach(() => {
mocks.issueCommentStore.listIssueComments.mockClear();
mocks.requestIssue.mockClear();
mocks.routerPush.mockClear();
+ mocks.routerResolve.mockClear();
mocks.pushNotification.mockClear();
mocks.batchGetOrFetchGroups.mockClear();
mocks.projectIamPolicyStore.getOrFetchProjectIamPolicy.mockClear();
@@ -303,14 +309,14 @@ describe("PlanDetailApprovalFlow", () => {
"common.issue #123 · plan.view-discussion"
);
- const footerButton = [...container.querySelectorAll("button")].find(
- (button) =>
- button.textContent?.includes("common.issue #123 · plan.view-discussion")
+ const footerLink = [...container.querySelectorAll("a")].find((link) =>
+ link.textContent?.includes("common.issue #123 · plan.view-discussion")
);
- expect(footerButton).toBeTruthy();
+ expect(footerLink).toBeTruthy();
+ expect(footerLink?.getAttribute("href")).toBe("/projects/p1/issues/123");
act(() => {
- footerButton?.dispatchEvent(
+ footerLink?.dispatchEvent(
new MouseEvent("click", { bubbles: true, cancelable: true })
);
});
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx
index e8ae115663..9a99b83698 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx
@@ -11,6 +11,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { issueServiceClientConnect } from "@/connect";
import { FeatureBadge } from "@/react/components/FeatureBadge";
+import { RouterLink } from "@/react/components/RouterLink";
import { getAvatarColor, getInitials } from "@/react/components/UserAvatar";
import { Button } from "@/react/components/ui/button";
import { Tooltip } from "@/react/components/ui/tooltip";
@@ -18,7 +19,6 @@ import { useCurrentUser } from "@/react/hooks/useAppState";
import { useProjectByName } from "@/react/hooks/useProjectByName";
import { displayRoleTitleFromList } from "@/react/lib/role";
import { cn } from "@/react/lib/utils";
-import { router } from "@/react/router";
import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/react/router/handles";
import { useAppStore } from "@/react/stores/app";
import { ensureGroupIdentifier } from "@/react/stores/app/group";
@@ -321,21 +321,18 @@ function PlanDetailApprovalFlowContent({
{riskLevelText && ruleText && <span>·</span>}
{ruleText && <span className="min-w-0 truncate">{ruleText}</span>}
<div className="flex-1" />
- <button
- className="text-accent hover:underline"
- onClick={() =>
- void router.push({
- name: PROJECT_V1_ROUTE_ISSUE_DETAIL,
- params: {
- issueId: issueUID,
- projectId: page.projectId,
- },
- })
- }
- type="button"
+ <RouterLink
+ className="text-accent"
+ to={{
+ name: PROJECT_V1_ROUTE_ISSUE_DETAIL,
+ params: {
+ issueId: issueUID,
+ projectId: page.projectId,
+ },
+ }}
>
{t("common.issue")} #{issueUID} · {t("plan.view-discussion")} →
- </button>
+ </RouterLink>
</div>
</div>
);