Skip to content

Commit 2e8ed86

Browse files
fix(app): move compaction status below summary (#48262)
Co-authored-by: Hona <10430890+Hona@users.noreply.github.com>
1 parent 2695607 commit 2e8ed86

2 files changed

Lines changed: 20 additions & 12 deletions

File tree

‎packages/app/e2e/regression/session-timeline-notices.spec.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,15 @@ test("renders compaction progress, summary, and outcome in order", async ({ page
122122
)
123123
await expect(compaction.getByRole("heading", { name: "Checkpoint" })).toBeVisible()
124124
await expect(compaction).toContainText("Streamed implementation details.")
125-
await expect(compaction.getByRole("status").getByLabel("Compacting", { exact: true })).toBeVisible()
125+
const running = compaction.getByRole("status").getByLabel("Compacting", { exact: true })
126+
await expect(running).toBeVisible()
127+
await expect
128+
.poll(async () => {
129+
const summary = await compaction.locator('[data-component="text-part"]').boundingBox()
130+
const status = await running.boundingBox()
131+
return !!summary && !!status && status.y >= summary.y + summary.height
132+
})
133+
.toBe(true)
126134
await expect(compaction.getByText("Session compacted", { exact: true })).toHaveCount(0)
127135

128136
await timeline.send(

‎packages/session-ui/src/message/message-content.tsx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -427,17 +427,6 @@ export function SessionCompactionMessage(props: { message: SessionMessageCompact
427427
<div class="py-2">
428428
<TimelineSeparator label={i18n.t("ui.messagePart.compaction.started")} />
429429
</div>
430-
<Show when={props.message.status === "running"}>
431-
<div role="status" class="py-2">
432-
<BasicTool
433-
icon="archive"
434-
trigger={{ title: i18n.t("ui.messagePart.compaction.running") }}
435-
status="running"
436-
locked
437-
hideDetails
438-
/>
439-
</div>
440-
</Show>
441430
<Show when={summary().trim()}>
442431
<div data-component="text-part" data-timeline-part-id={props.message.id}>
443432
<div data-slot="text-part-body">
@@ -449,6 +438,17 @@ export function SessionCompactionMessage(props: { message: SessionMessageCompact
449438
</div>
450439
</div>
451440
</Show>
441+
<Show when={props.message.status === "running"}>
442+
<div role="status" class="py-2">
443+
<BasicTool
444+
icon="archive"
445+
trigger={{ title: i18n.t("ui.messagePart.compaction.running") }}
446+
status="running"
447+
locked
448+
hideDetails
449+
/>
450+
</div>
451+
</Show>
452452
<Show when={props.message.status !== "running"}>
453453
<div class="py-2">
454454
<TimelineSeparator label={label()} />

0 commit comments

Comments
 (0)