Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions web/stovepipe/controller/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions web/stovepipe/entity/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
7 changes: 4 additions & 3 deletions web/stovepipe/module.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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+/="),
Expand Down
6 changes: 3 additions & 3 deletions web/stovepipe/view/app.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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();
Expand Down
14 changes: 14 additions & 0 deletions web/stovepipe/view/issues.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(<RequestIssues model={model} projects={selection} />);
expect(screen.getByRole("region", { name: "Affected projects for test unit" })).toBeVisible();
rerender(<RequestIssues model={{ ...model, issues: [{ ...issue, kind: "closed", projectsHref: null }] }} projects={selection} />);
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");
});
2 changes: 1 addition & 1 deletion web/stovepipe/view/issues.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export function RequestIssues({ model, projects }: { model: RequestIssuesModel;
<HeadingSmall as="h3" marginTop="0" marginBottom="scale300">{group.label}</HeadingSmall>
{issues.length ? <Table label={group.label} headers={["Task", "Unit", "First seen build", "Observed build", "Affected projects"]}>
{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 <Fragment key={JSON.stringify([issue.taskId, issue.unitId])}>
<StyledTableBodyRow>
<StyledTableBodyCell>{issue.taskId}</StyledTableBodyCell>
Expand Down
28 changes: 28 additions & 0 deletions web/stovepipe/view/projects.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(<ProjectResults pageKey="request/7" model={{ ...model, complete, projects: [
{ project: "green", projectType: "service", breakageDegree: 0, issuesHref: null },
{ project: "unknown", projectType: "", breakageDegree: null, issuesHref: null },
{ project: "partial", projectType: "service", breakageDegree: 0.25, issuesHref: "/partial-issues" },
{ project: "broken", projectType: "service", breakageDegree: 1, issuesHref: "/broken-issues" },
] }} />);
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(<ProjectResults pageKey="request/7" model={{ ...model, projects: [project] }} issues={selection} />);
expect(screen.getByRole("region", { name: "Issue attribution for p" })).toBeVisible();
rerender(<ProjectResults pageKey="request/7" model={{ ...model, projects: [
{ ...project, breakageDegree, issuesHref: null },
] }} issues={selection} />);
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" };
Expand Down
6 changes: 4 additions & 2 deletions web/stovepipe/view/projects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,15 @@ export function ProjectResults({ model, pageKey, issues }: { model: ProjectStatu
</Block>
) : <Table key={pageKey} label="Recorded project results" headers={["Project", "Project type", "Recorded result", "Issues"]} fill>
{model.projects.map(entry => {
const selected = issues?.project === entry.project ? issues : null;
const selected = entry.issuesHref && issues?.project === entry.project ? issues : null;
return <Fragment key={entry.project}>
<StyledTableBodyRow>
<StyledTableBodyCell>{entry.project}</StyledTableBodyCell>
<StyledTableBodyCell>{entry.projectType || "Unknown"}</StyledTableBodyCell>
<StyledTableBodyCell><RecordedResult degree={entry.breakageDegree} /></StyledTableBodyCell>
<StyledTableBodyCell><Link href={selected ? selected.closeHref : entry.issuesHref} scroll={false} aria-expanded={Boolean(selected)}>{selected ? "Hide issues" : "Show issues"}</Link></StyledTableBodyCell>
<StyledTableBodyCell>{entry.issuesHref
? <Link href={selected ? selected.closeHref : entry.issuesHref} scroll={false} aria-expanded={Boolean(selected)}>{selected ? "Hide issues" : "Show issues"}</Link>
: entry.breakageDegree === 0 ? "No issues" : "Not available"}</StyledTableBodyCell>
</StyledTableBodyRow>
{selected && <StyledTableBodyRow><StyledTableBodyCell colSpan={4}>
<Section cacheKey={selected.key} result={selected.result}>{page => page && <section aria-label={`Issue attribution for ${entry.project}`}>
Expand Down
2 changes: 1 addition & 1 deletion web/test/package/react18/react18-runtime.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Loading