Skip to content

Do not reset expanded steps while polling, only extend them #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lewisbirks merged 6 commits into from
Jul 24, 2025
Merged

Do not reset expanded steps while polling, only extend them #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55fd9ad
Do not reset expanded steps while polling, only extend them
das7pad Jul 20, 2025
cfdff48
Merge branch 'main' into stay-open
lewisbirks Jul 23, 2025
5febeba
Merge branch 'main' into stay-open
lewisbirks Jul 23, 2025
81e1650
Fix mock after merging polling changes
das7pad Jul 23, 2025
2637aca
Optimize polling tests: 2.3s -> 500ms
das7pad Jul 23, 2025
8b853b1
Merge branch 'main' into stay-open
lewisbirks Jul 24, 2025
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
34 changes: 34 additions & 0 deletions src/main/frontend/pipeline-console-view/pipeline-console/main/hooks/use-steps-poller.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,37 @@ it("expands and collapses step when toggled", async () => {

unmount();
});

it("expanded steps remain expanded", async () => {
window.history.pushState({}, "", "/?selected-node=step-1&start-byte=0");

let currentSteps = [
{ id: "step-1", title: "Step 1", stageId: "stage-1", state: "running" },
{ id: "step-2", title: "Step 2", stageId: "stage-1", state: "queued" },
];
(model.getRunSteps as Mock).mockResolvedValue({ steps: currentSteps });

const props = { currentRunPath: "/run/1" };
const { result, unmount } = renderHook(() => useStepsPoller(props));
await waitFor(() => expect(result.current.expandedSteps).toContain("step-1"));

expect(result.current.expandedSteps).toContain("step-1");
act(() => result.current.onStepToggle("step-2"));
expect(result.current.expandedSteps).toContain("step-1");
expect(result.current.expandedSteps).toContain("step-2");

// Simulate step-1 finishing and step-2 becoming active
currentSteps = [
{ id: "step-1", title: "Step 1", stageId: "stage-1", state: "success" },
{ id: "step-2", title: "Step 2", stageId: "stage-1", state: "running" },
];
(model.getRunSteps as Mock).mockResolvedValue({ steps: currentSteps });

await waitFor(() =>
expect(result.current.openStageSteps).to.deep.equal(currentSteps),
);
expect(result.current.expandedSteps).toContain("step-1");
expect(result.current.expandedSteps).toContain("step-2");

unmount();
});
8 changes: 4 additions & 4 deletions src/main/frontend/pipeline-console-view/pipeline-console/main/hooks/use-steps-poller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@ export function useStepsPoller(props: RunPollerProps) {
setUserManuallySetNode(true);

const step = steps.find((s) => s.id === selected);
const expanded: string[] = [];

if (step) {
selected = step.stageId;
expanded.push(step.id);
setExpandedSteps((prev) => {
if (prev.includes(step.id)) return prev;
return [...prev, step.id];
});

updateStepConsoleOffset(
step.id,
Expand All @@ -81,7 +82,6 @@ export function useStepsPoller(props: RunPollerProps) {
}

setOpenStage(selected);
setExpandedSteps(expanded);
return true;
},
[updateStepConsoleOffset, collapsedSteps],
Expand Down