diff --git a/website/src/pages/ProjectsPage.tsx b/website/src/pages/ProjectsPage.tsx
index cf9a04d3956c..603f7ae4ffec 100644
--- a/website/src/pages/ProjectsPage.tsx
+++ b/website/src/pages/ProjectsPage.tsx
@@ -383,7 +383,12 @@ export default function ProjectsPage() {
}
const cancelPlan = async () => {
- try { await api.cancelPlan() } finally { setIsPlanning(false); sessionStorage.removeItem('tr-planning') }
+ // A refused cancel leaves the plan running, so the banner stays and says why.
+ setPlanError('')
+ let r: ActionResult
+ try { r = await api.cancelPlan() } catch (e) { setPlanError(errText(e)); return }
+ if (r && r.ok === false) { setPlanError(r.error || i18nT('pages.projectsPage.action_failed')); return }
+ setIsPlanning(false); sessionStorage.removeItem('tr-planning')
}
const handleRun = (input: string, source: string) => {
diff --git a/website/src/test/ProjectsPageCoverage.test.tsx b/website/src/test/ProjectsPageCoverage.test.tsx
index 58e4b1811cad..35edfbe365e2 100644
--- a/website/src/test/ProjectsPageCoverage.test.tsx
+++ b/website/src/test/ProjectsPageCoverage.test.tsx
@@ -349,6 +349,25 @@ describe('ProjectsPage — planning lifecycle', () => {
expect(sessionStorage.getItem('tr-planning')).toBeNull()
})
+ it('keeps the planning banner and says why when the cancel is refused', async () => {
+ sessionStorage.setItem('tr-planning', '1')
+ vi.mocked(api.cancelPlan).mockRejectedValueOnce(new Error('zz-cancel-refused'))
+ renderWithProviders()
+ fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
+ expect(await screen.findByText(/zz-cancel-refused/)).toBeInTheDocument()
+ expect(await screen.findByText(/Generating execution plan/)).toBeInTheDocument()
+ expect(sessionStorage.getItem('tr-planning')).toBe('1')
+ })
+
+ it('keeps the planning banner when the cancel answers not ok', async () => {
+ sessionStorage.setItem('tr-planning', '1')
+ vi.mocked(api.cancelPlan).mockResolvedValueOnce({ ok: false, error: 'zz-no-cancel' })
+ renderWithProviders()
+ fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
+ expect(await screen.findByText(/zz-no-cancel/)).toBeInTheDocument()
+ expect(await screen.findByText(/Generating execution plan/)).toBeInTheDocument()
+ })
+
it('ticks the planning banner dots', async () => {
sessionStorage.setItem('tr-planning', '1')
vi.useFakeTimers()