Keep manual result entry visible after finishing a brew

Author: cubicj

src/views/BrewingView.ts

@@ -175,7 +175,7 @@ export class BrewingView extends ItemView {
 		});
 	}
 
-	private renderContent(focusStep?: FlowStep): void {
+	private renderContent(focusStep?: FlowStep, alsoExpand?: FlowStep): void {
 		this.accordion.destroy();
 		for (const fn of this.cleanups) fn();
 		this.cleanups = [];
@@ -194,6 +194,9 @@ export class BrewingView extends ItemView {
 		const targetStep = focusStep ?? (this.flowState.step as FlowStep);
 		if (shouldFocus) {
 			this.accordion.focusStep(targetStep);
+			if (alsoExpand !== undefined) {
+				this.accordion.expandStep(alsoExpand);
+			}
 			this.lastFocusedStep = this.flowState.step;
 		}
 		this.accordion.update();
@@ -213,7 +216,7 @@ export class BrewingView extends ItemView {
 		return {
 			flowState: this.flowState,
 			plugin: this.plugin,
-			renderContent: (focusStep) => this.renderContent(focusStep),
+			renderContent: (focusStep, alsoExpand) => this.renderContent(focusStep, alsoExpand),
 			accordion: {
 				update: () => this.accordion.update(),
 				expand: (step) => this.accordion.expandStep(step),

src/views/StepRenderers.ts

@@ -36,7 +36,7 @@ export interface AccordionActions {
 export interface StepRenderContext {
 	flowState: BrewFlowState;
 	plugin: CubicJBrewingPlugin;
-	renderContent: (focusStep?: FlowStep) => void;
+	renderContent: (focusStep?: FlowStep, alsoExpand?: FlowStep) => void;
 	accordion: AccordionActions;
 	timerController: TimerController;
 	getWeightText: () => string;

src/views/steps/renderBrewing.ts

@@ -24,7 +24,7 @@ export function renderBrewing(container: HTMLElement, ctx: StepRenderContext): v
 		});
 		doneBtn.addEventListener('click', () => {
 			ctx.flowState.finishBrewing(undefined, undefined);
-			ctx.renderContent();
+			ctx.renderContent('brewing', 'saving');
 		});
 		return;
 	}
@@ -67,7 +67,11 @@ export function renderBrewing(container: HTMLElement, ctx: StepRenderContext): v
 				} else {
 					ctx.flowState.finishBrewing(undefined, undefined);
 				}
-				ctx.renderContent();
+				if (ctx.recorder.getPoints().length > 0) {
+					ctx.renderContent();
+				} else {
+					ctx.renderContent('brewing', 'saving');
+				}
 			} catch (err) {
 				console.error('[StepRenderers] brew stop failed:', err);
 				new Notice(t('brew.unexpectedError'));

tests/views/steps/renderBrewing.test.ts

@@ -215,6 +215,35 @@ describe('renderBrewing phase controls', () => {
 		expect(ctx.timerController.cancelRun).not.toHaveBeenCalled();
 	});
 
+	it('finishing without a recorded profile keeps focus on brewing and expands saving', async () => {
+		const container = createContainer();
+		const flowState = makeFlowState('filter');
+		flowState.beginBrewingRun();
+		const { ctx } = makeContext(flowState, [], 'disconnected');
+		renderBrewing(container, ctx);
+		(container.querySelector('.brew-flow-stop-btn') as HTMLButtonElement).click();
+		await vi.waitFor(() => expect(ctx.renderContent).toHaveBeenCalledWith('brewing', 'saving'));
+		expect(ctx.flowState.step).toBe('saving');
+	});
+
+	it('espresso done keeps focus on brewing and expands saving', () => {
+		const container = createContainer();
+		const { ctx } = makeContext(makeFlowState('espresso'));
+		renderBrewing(container, ctx);
+		(container.querySelector('.brew-flow-stop-btn') as HTMLButtonElement).click();
+		expect(ctx.renderContent).toHaveBeenCalledWith('brewing', 'saving');
+		expect(ctx.flowState.step).toBe('saving');
+	});
+
+	it('finishing with a recorded profile focuses saving as before', async () => {
+		const container = createContainer();
+		const ctx = makeRunningContext();
+		renderBrewing(container, ctx);
+		(container.querySelector('.brew-flow-stop-btn') as HTMLButtonElement).click();
+		await vi.waitFor(() => expect(ctx.renderContent).toHaveBeenCalledWith());
+		expect(ctx.flowState.step).toBe('saving');
+	});
+
 	it('cancel rejection still re-renders a coherent armed brewing state', async () => {
 		const container = createContainer();
 		const ctx = makeRunningContext();