From 8fbc12613e2281e009841fae1a80dc167e4c74dd Mon Sep 17 00:00:00 2001 From: "prath.shenoy" Date: Tue, 17 Nov 2026 21:30:17 +0000 Subject: [PATCH] fix(stovepipe-web): Hide empty issue links --- web/stovepipe/controller/projects.ts | 18 +++++++----- web/stovepipe/entity/index.ts | 4 +-- web/stovepipe/module.test.ts | 7 +++-- web/stovepipe/view/app.test.tsx | 6 ++-- web/stovepipe/view/issues.test.tsx | 14 ++++++++++ web/stovepipe/view/issues.tsx | 2 +- web/stovepipe/view/projects.test.tsx | 28 +++++++++++++++++++ web/stovepipe/view/projects.tsx | 6 ++-- .../package/react18/react18-runtime.test.mjs | 2 +- 9 files changed, 68 insertions(+), 19 deletions(-) diff --git a/web/stovepipe/controller/projects.ts b/web/stovepipe/controller/projects.ts index d98108cee..92e2778db 100644 --- a/web/stovepipe/controller/projects.ts +++ b/web/stovepipe/controller/projects.ts @@ -33,13 +33,17 @@ export async function loadProjectStatus( pageSizeChoices: projectPageSizes.map(value => ({ value, href: paths.request(queue, requestId, "", value), })), - projects: result.projects.map((entry) => ({ - project: entry.project, - projectType: entry.projectType, - issuesHref: paths.projectIssues(queue, requestId, entry.project, pageToken, pageSize), - breakageDegree: entry.result.case === "breakageDegree" - ? breakageDegree(entry.result.value) : null, - })), + projects: result.projects.map((entry) => { + const degree = entry.result.case === "breakageDegree" + ? breakageDegree(entry.result.value) : null; + return { + project: entry.project, + projectType: entry.projectType, + issuesHref: degree !== null && degree > 0 + ? paths.projectIssues(queue, requestId, entry.project, pageToken, pageSize) : null, + breakageDegree: degree, + }; + }), firstHref: pageToken ? paths.request(queue, requestId, "", pageSize) : null, nextHref: result.nextPageToken ? paths.request(queue, requestId, result.nextPageToken, pageSize) diff --git a/web/stovepipe/entity/index.ts b/web/stovepipe/entity/index.ts index 5ecbd0622..c40fd5ea8 100644 --- a/web/stovepipe/entity/index.ts +++ b/web/stovepipe/entity/index.ts @@ -136,8 +136,8 @@ export interface ProjectStatusModel { pageSize: number; /** Supported page sizes and their first-page URLs for this request. */ pageSizeChoices: { value: number; href: string }[]; - /** Recorded projects on this page; null breakage means no result. */ - projects: { project: string; projectType: string; breakageDegree: number | null; issuesHref: string }[]; + /** Recorded projects on this page; null breakage means no result. Issue links are only available for recorded breakage. */ + projects: { project: string; projectType: string; breakageDegree: number | null; issuesHref: string | null }[]; /** First project page for this request; null on the first page. */ firstHref: string | null; /** Opaque project continuation URL; null on the final page. */ diff --git a/web/stovepipe/module.test.ts b/web/stovepipe/module.test.ts index ce0cc08b2..61a032930 100644 --- a/web/stovepipe/module.test.ts +++ b/web/stovepipe/module.test.ts @@ -473,9 +473,10 @@ describe("Stovepipe page loading", () => { repositoryBreakageDegree: 0, complete: false, projects: [ - { project: "green", projectType: "service", breakageDegree: 0 }, - { project: "broken", projectType: "future-type", breakageDegree: 0.25 }, - { project: "unknown", projectType: "", breakageDegree: null }, + { project: "green", projectType: "service", breakageDegree: 0, issuesHref: null }, + { project: "broken", projectType: "future-type", breakageDegree: 0.25, + issuesHref: paths.projectIssues(summary.queue, summary.requestId, "broken", "opaque+/=", 50) }, + { project: "unknown", projectType: "", breakageDegree: null, issuesHref: null }, ], firstHref: paths.request(summary.queue, summary.requestId), nextHref: paths.request(summary.queue, summary.requestId, "next+/="), diff --git a/web/stovepipe/view/app.test.tsx b/web/stovepipe/view/app.test.tsx index 5d728cb48..d28793f6a 100644 --- a/web/stovepipe/view/app.test.tsx +++ b/web/stovepipe/view/app.test.tsx @@ -29,10 +29,10 @@ const model: StovepipePageModel = { value, href: "/repo%2Fmain/request/7?projectPageSize=" + value, })), projects: [ - { project: "green-project", projectType: "service", breakageDegree: 0, issuesHref: "/project-issues" }, + { project: "green-project", projectType: "service", breakageDegree: 0, issuesHref: null }, { project: "partial-breakage-project", projectType: "future-type", breakageDegree: 0.25, issuesHref: "/project-issues" }, { project: "broken-project", projectType: "", breakageDegree: 1, issuesHref: "/project-issues" }, - { project: "unknown-project", projectType: "", breakageDegree: null, issuesHref: "/project-issues" }, + { project: "unknown-project", projectType: "", breakageDegree: null, issuesHref: null }, ], firstHref: null, nextHref: "/repo%2Fmain/request/7?projects=opaque%2B%2F%3D", @@ -235,7 +235,7 @@ it.each(["projects=next", "projectPageSize=25"])("preserves the request summary key: "/repo%2Fmain/request/7?" + query, projectStatus: { ok: true, data: { ...model.projectStatus.data, - projects: [{ project: "next-project", projectType: "", breakageDegree: 0, issuesHref: "/project-issues" }], + projects: [{ project: "next-project", projectType: "", breakageDegree: 0, issuesHref: null }], } }, }} />); expect(screen.getByText("git://repo/sha")).toBeVisible(); diff --git a/web/stovepipe/view/issues.test.tsx b/web/stovepipe/view/issues.test.tsx index 6f970ba43..85ef31a56 100644 --- a/web/stovepipe/view/issues.test.tsx +++ b/web/stovepipe/view/issues.test.tsx @@ -239,3 +239,17 @@ it("shows paginated affected projects and keeps the collapse action on failure", expect(screen.getByRole("alert")).toHaveTextContent("Projects unavailable"); expect(screen.getByRole("link", { name: "Hide projects" })).toHaveAttribute("href", "/issues"); }); + +it("removes stale affected projects when an issue becomes resolved", () => { + const issue = { taskId: "test", unitId: "unit", kind: "existing", buildId: "build/7", firstSeenBuildId: "build/1", projectsHref: "/projects" }; + const model = { status: "complete", firstHref: null, nextHref: null, issues: [issue] }; + const selection = { taskId: "test", unitId: "unit", key: "selection", closeHref: "/issues", result: { ok: true as const, data: { + projects: ["project-1"], complete: true, firstHref: null, nextHref: null, + } } }; + const { rerender } = render(); + expect(screen.getByRole("region", { name: "Affected projects for test unit" })).toBeVisible(); + rerender(); + expect(screen.queryByRole("region", { name: "Affected projects for test unit" })).toBeNull(); + expect(screen.queryByRole("link", { name: /projects/i })).toBeNull(); + expect(screen.getByRole("table", { name: "Resolved Issues" })).toHaveTextContent("Not available"); +}); diff --git a/web/stovepipe/view/issues.tsx b/web/stovepipe/view/issues.tsx index c20493804..2f526d977 100644 --- a/web/stovepipe/view/issues.tsx +++ b/web/stovepipe/view/issues.tsx @@ -113,7 +113,7 @@ export function RequestIssues({ model, projects }: { model: RequestIssuesModel; {group.label} {issues.length ? {issues.map(issue => { - const selected = projects?.taskId === issue.taskId && projects.unitId === issue.unitId ? projects : null; + const selected = issue.projectsHref && projects?.taskId === issue.taskId && projects.unitId === issue.unitId ? projects : null; return {issue.taskId} diff --git a/web/stovepipe/view/projects.test.tsx b/web/stovepipe/view/projects.test.tsx index 1cb7a6d54..c5520271f 100644 --- a/web/stovepipe/view/projects.test.tsx +++ b/web/stovepipe/view/projects.test.tsx @@ -62,6 +62,34 @@ it.each([false, true])("does not confuse missing attribution with a completed em expect(screen.getByRole("link", { name: "Hide issues" })).toHaveAttribute("href", "/projects"); }); +it.each([false, true])("only offers issue drill-downs for recorded breakage (recording complete: %s)", complete => { + render(); + expect(screen.getByRole("row", { name: "green service Green No issues" })).toBeVisible(); + expect(screen.getByRole("row", { name: "unknown Unknown No result recorded Not available" })).toBeVisible(); + expect(screen.getAllByRole("link", { name: "Show issues" }).map(link => link.getAttribute("href"))) + .toEqual(["/partial-issues", "/broken-issues"]); +}); + +it.each([0, null])("removes stale issue expansion when the project no longer has a drill-down (%s)", breakageDegree => { + const project = { project: "p", projectType: "service", breakageDegree: 1, issuesHref: "/issues" }; + const selection = { project: "p", key: "p", closeHref: "/projects", result: { ok: true as const, data: { + complete: true, issues: [{ taskId: "test", unitId: "//pkg:failed" }], firstHref: null, nextHref: null, + } } }; + const { rerender } = render(); + expect(screen.getByRole("region", { name: "Issue attribution for p" })).toBeVisible(); + rerender(); + expect(screen.queryByRole("region", { name: "Issue attribution for p" })).toBeNull(); + expect(screen.queryByRole("link", { name: /issues/i })).toBeNull(); + expect(screen.getByText(breakageDegree === 0 ? "No issues" : "Not available")).toBeVisible(); +}); + it("shows associated task/unit identities and keeps recorded results when a page fails", () => { const projectModel = { ...model, projects: [{ project: "p", projectType: "", breakageDegree: 0.25, issuesHref: "/issues" }] }; const selection = { project: "p", key: "p/first", closeHref: "/projects" }; diff --git a/web/stovepipe/view/projects.tsx b/web/stovepipe/view/projects.tsx index ea8ae7db3..df752def9 100644 --- a/web/stovepipe/view/projects.tsx +++ b/web/stovepipe/view/projects.tsx @@ -113,13 +113,15 @@ export function ProjectResults({ model, pageKey, issues }: { model: ProjectStatu ) :
{model.projects.map(entry => { - const selected = issues?.project === entry.project ? issues : null; + const selected = entry.issuesHref && issues?.project === entry.project ? issues : null; return {entry.project} {entry.projectType || "Unknown"} - {selected ? "Hide issues" : "Show issues"} + {entry.issuesHref + ? {selected ? "Hide issues" : "Show issues"} + : entry.breakageDegree === 0 ? "No issues" : "Not available"} {selected &&
{page => page &&
diff --git a/web/test/package/react18/react18-runtime.test.mjs b/web/test/package/react18/react18-runtime.test.mjs index 9b9d6bda6..07a0e2014 100644 --- a/web/test/package/react18/react18-runtime.test.mjs +++ b/web/test/package/react18/react18-runtime.test.mjs @@ -133,7 +133,7 @@ test("renders and hydrates packaged pages with React 18 and host themes", { time .find(entry => entry.textContent.includes("example-project")); assert.ok(row); assert.deepEqual([...row.querySelectorAll("td")].map(cell => cell.textContent), - ["example-project", "service", "Green", "Show issues"]); + ["example-project", "service", "Green", "No issues"]); assert.doesNotMatch(container.textContent, /%/u); } await act(async () => root.unmount());