mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-16 03:31:44 +01:00
fix(qa): schedule recovered cleanup promptly and wait for task panels (#21660)
## Thinking Path > - Paperclip lets people manage AI agents and their saved work. > - QA journeys check browser controls and the cleanup of owned agent resources. > - A recovered workspace queues sandbox destruction after its files are saved. > - The cleanup queue treated that first attempt as a retry and waited five minutes. > - Agent termination correctly waited for destruction, so QA cleanup failed first. > - This PR runs that first cleanup attempt promptly and keeps the existing safety gates. > - It also waits for task-panel transitions before the browser acts again. ## Linked Issues or Issue Description **What happened?** The full scheduled QA smoke completed with 23 passed and 1 failed. Stop/redirect passed all eleven behavior checks but failed cleanup. The cancelled run had a saved workspace and a bound stop receipt before agent termination. Its sandbox was destroyed about five minutes later. The shared cleanup schedule applied the retry delay before the first destruction attempt. The browser regressions also found that the current panel helper can consume all four actions while an opener remains visible during panel mounting. **Expected behavior** A recovered workspace's first cleanup attempt runs on the next eligible worker pass. A failed attempt retains normal backoff. Agent termination still waits for completed resource cleanup. Task-panel navigation waits for the next controls before it acts again. **Steps to reproduce** 1. Queue recovered-workspace destruction after the cleanup worker has become idle. 2. Read the next cleanup deadline and advance one normal worker pass. Before this fix, the deadline is five minutes late and no teardown runs. 3. Open task document controls with a delayed side-panel transition. Before the panel fix, both collapsed-panel controls fail. Refs #19224 and #19292 for retaining stop proof during workspace recovery. This change keeps the full cleanup requirement for agent termination. Current master supplies the shared task-panel helper; this branch uses it and retains additional browser regressions. ## What Changed - Use one shared first-attempt predicate for the cleanup deadline, sweep selection and ownership report. It now includes recovered workspace cleanup bound to the same run. - Preserve worker spacing, in-flight claims, ownership and saved-file checks, retry delays and attempt limits. - Wait for panel controls after opening the panel. Wait for the selected tab or menu action to finish. - Add real PostgreSQL cleanup regressions, keep the Chromium controls, and document the cleanup timing. ## Verification Tested on Linux x86_64, Node v25.9.0. Local commit `7c8e0f12aa4b19aaf53669141ab3299ce76db963` and published head `892c5dd4b4638796a138400d8bbe30aee19c71dd` have the same tree, `d135a98bdff58e3320cdc83976ffe1cf47f48b66`. - Red: both new real-PostgreSQL cleanup tests failed on the old code. The deadline was five minutes late and the first normal sweep made zero teardown calls. - Green: 87 cleanup, ownership and lifecycle tests pass. The restored-work case stays unconfirmed until the real cleanup worker destroys the lease; failure still backs off and the worker becomes idle again. - Red after master integration: both delayed document-panel browser cases failed. Green: all 18 Chromium support checks pass. - 77 journey contract tests pass. - Product E2E typecheck passes with the documented low-memory path. The initial ordinary attempt was killed by the local memory limit and is not counted as a pass. - The only follow-up after the passing checks removes new code comments to follow the contribution guide. Runtime and test behavior are unchanged. Final-head [CI run 43714742904](https://github.com/paperclipai/paperclip/actions/runs/43714742904) completed successfully at this exact head. All 63 PR checks are terminal: 58 success, 2 neutral and 3 conditional skips; no failures or pending checks. Typecheck, build, tests and the final verify gate pass. Greptile and Paperclip Review both score this head 5/5 with no actionable findings; both historical inline threads are resolved. - Hosted QA recovery is still unverified. No extra model run, merge, deployment or QA setting change was made. ## Risks Recovered workspace destruction starts sooner. Existing producer, file-preservation, ownership, claim and provider checks still decide whether teardown is allowed. Failed attempts retain the existing cooldown. Agent termination and purge gates are unchanged. The panel helper waits for visible controls and still fails when controls or saved values are absent. The PostgreSQL integration uses a controlled provider boundary. It does not prove a new live Daytona or deployed QA pass. That requires the fixed revision on QA and a later normal scheduled smoke. ## Model Used OpenAI GPT-6-based Codex, with tool use and code execution. The host does not expose a more specific model ID or context-window size for this run. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub references) - [x] My branch name describes the change and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
This commit is contained in:
1 parent
afca556728
commit
62033b9994
10 files changed
+133
-23
No files matched your search
@@ -454,6 +454,10 @@ delay that sweep until the claim expires. Neither an unconfirmed stop nor a
|
||||
stale receipt grants admission, and a changed lease or competing sandbox owner
|
||||
prevents cleanup from taking ownership. Retry export after the lease has a new
|
||||
confirmed stopped receipt. No provider turn is created by this recovery.
|
||||
Once recovery has saved the files and queued destruction of the stopped sandbox,
|
||||
the cleanup worker admits its first attempt without the five-minute retry delay.
|
||||
The shared worker spacing and any in-flight claim deadline still apply. A failed
|
||||
first attempt keeps the existing retry delay, attempt limit and ownership checks.
|
||||
Cleanup and its readiness probe use the plugin ID recorded on that lease. Another
|
||||
plugin with the same provider name cannot take over; an unavailable original
|
||||
plugin defers cleanup without consuming an attempt. Stop-only cleanup requires the exact plugin worker to advertise `environmentStopLease`. Older plugins without that hook receive neither release nor destroy; resume admission also defers until safe compensation is available.
|
||||
|
||||
@@ -10,7 +10,7 @@ import { idleWorkSnapshot } from "../services/task-admission.js";
|
||||
import { randomUUID } from "node:crypto";
|
||||
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { eq, sql } from "drizzle-orm";
|
||||
import { companies, createDb, sandboxCreationOperations, environmentLeases, environments, type Db } from "@paperclipai/db";
|
||||
import { agents, heartbeatRuns, companies, createDb, sandboxCreationOperations, environmentLeases, environments, type Db } from "@paperclipai/db";
|
||||
import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase } from "./helpers/embedded-postgres.js";
|
||||
import { createDeliveryWorkCoordinator } from "../services/delivery-work-coordinator.js";
|
||||
import { DELIVERY_QUEUES } from "../services/delivery-work-notifications.js";
|
||||
@@ -20,6 +20,9 @@ import { environmentService } from "../services/environments.js";
|
||||
import { historicalCleanupVerificationService } from "../services/historical-cleanup-verification.js";
|
||||
import { heartbeatService } from "../services/heartbeat.js";
|
||||
import { environmentRuntimeService } from "../services/environment-runtime.js";
|
||||
import { writeEnvironmentCleanup } from "../services/environment-cleanup-notifications.js";
|
||||
import { remoteTerminationReceipt } from "../services/remote-execution-termination.js";
|
||||
import { agentExecutionsHaveStopped } from "../services/agent-execution-stop.js";
|
||||
|
||||
import { resolveExternalTestDatabaseUrl } from "./helpers/external-test-database.js";
|
||||
|
||||
@@ -364,6 +367,52 @@ describe.skipIf(!support.supported)("environment cleanup scheduling", () => {
|
||||
expect((await environmentService(db).getLeaseById(lease.id))?.status).toBe("expired");
|
||||
await quiet();
|
||||
});
|
||||
async function recoveredWorkspaceCleanup() {
|
||||
const [agent] = await db.insert(agents).values({ companyId, name: "Stopped workspace owner" }).returning();
|
||||
const [run] = await db.insert(heartbeatRuns).values({ companyId, agentId: agent.id, status: "cancelled",
|
||||
runtimeMode: "native", invocationSource: "on_demand", startedAt: new Date(Date.now() - 60_000), finishedAt: new Date() }).returning();
|
||||
const lease = { id: randomUUID(), companyId, environmentId, heartbeatRunId: run.id, provider: "fixture",
|
||||
providerLeaseId: randomUUID(), leasePolicy: "ephemeral", status: "pending_cleanup", cleanupStatus: "failed",
|
||||
releasedAt: new Date(), updatedAt: new Date() };
|
||||
const metadata = { driver: "sandbox", workspaceRecoveryCleanup: { runId: run.id, snapshotId: randomUUID(), epoch: 1,
|
||||
stopReceipt: remoteTerminationReceipt(lease, { providerLeaseId: lease.providerLeaseId, state: "stopped" }) },
|
||||
pendingCleanupRetryAttempts: 0, pendingCleanupInFlight: false, pendingCleanupRetryAfterMs: 0 };
|
||||
await writeEnvironmentCleanup(db, tx => tx.insert(environmentLeases).values({ ...lease, metadata }), { companyId, runId: run.id });
|
||||
return { agent, run, lease, metadata };
|
||||
}
|
||||
it("destroys a recovered workspace on its first scheduled pass, before agent stop can finish", async () => {
|
||||
const destroy = vi.fn(async ({ lease }: { lease: { providerLeaseId: string } }) =>
|
||||
({ providerLeaseId: lease.providerLeaseId, state: "destroyed" as const }));
|
||||
const runtime = environmentRuntimeService(db, { drivers: [{ driver: "sandbox", retryPendingSandboxTeardown: destroy } as any] });
|
||||
const heartbeat = heartbeatService(db, { environmentRuntime: runtime });
|
||||
await start(false, backoffMs => heartbeat.sweepPendingCleanupLeases({ backoffMs })); await quiet();
|
||||
draining = true;
|
||||
const { agent, lease } = await recoveredWorkspaceCleanup();
|
||||
expect(await nextEnvironmentCleanupAt(db)).toBeLessThanOrEqual(Date.now());
|
||||
expect(await agentExecutionsHaveStopped(db, [agent.id])).toBe(false);
|
||||
draining = false;
|
||||
await settle();
|
||||
expect(destroy).toHaveBeenCalledTimes(1);
|
||||
expect((await environmentService(db).getLeaseById(lease.id))?.status).toBe("expired");
|
||||
expect(await agentExecutionsHaveStopped(db, [agent.id])).toBe(true);
|
||||
await quiet();
|
||||
});
|
||||
it("keeps normal retry backoff after a recovered workspace's first teardown fails", async () => {
|
||||
await start(); await quiet();
|
||||
failing = true;
|
||||
const { lease } = await recoveredWorkspaceCleanup();
|
||||
await settle();
|
||||
expect(releases).toHaveBeenCalledTimes(1);
|
||||
expect((await environmentService(db).getLeaseById(lease.id))?.status).toBe("pending_cleanup");
|
||||
expect(await nextEnvironmentCleanupAt(db)).toBeGreaterThan(Date.now() + 240_000);
|
||||
await settle(60_000);
|
||||
expect(releases).toHaveBeenCalledTimes(1);
|
||||
failing = false;
|
||||
await settle(240_000);
|
||||
expect(releases).toHaveBeenCalledTimes(2);
|
||||
expect((await environmentService(db).getLeaseById(lease.id))?.status).toBe("expired");
|
||||
await quiet();
|
||||
});
|
||||
it("does not rescan pending cleanup from an otherwise idle run-reaper pass", async () => {
|
||||
const lease = await pending();
|
||||
await db.update(environmentLeases).set({ updatedAt: new Date(Date.now() - 600_000) }).where(eq(environmentLeases.id, lease.id));
|
||||
|
||||
@@ -57,16 +57,11 @@ export function recoverableSandboxCreationCondition() {
|
||||
));
|
||||
}
|
||||
|
||||
/** A run lease the ownership settle moved to cleanup (an orphaned active
|
||||
* lease, or a retained orphan sandbox nothing references any more), or a warm
|
||||
* sandbox whose warm window ended, before its first cleanup attempt. Its
|
||||
* holder is proven gone, so the first stop or teardown is
|
||||
* due now regardless of how recently the lease was used; a failed attempt
|
||||
* counts and the normal retry backoff applies from then on. */
|
||||
export function recoveredOrphanFirstAttemptSql() {
|
||||
export function recoveredCleanupFirstAttemptSql() {
|
||||
return sql`(${environmentLeases.failureReason} in ('orphaned_active_lease_recovered', 'retained_orphan_sandbox_released')
|
||||
or ${environmentLeases.metadata}->'sandboxStopAndRetain'->>'recoveredOrphanedRunLease' = 'true'
|
||||
or ${environmentLeases.metadata}->'sandboxStopAndRetain'->>'warmWindowExpired' = 'true')
|
||||
or ${environmentLeases.metadata}->'sandboxStopAndRetain'->>'warmWindowExpired' = 'true'
|
||||
or ${environmentLeases.metadata}->'workspaceRecoveryCleanup'->>'runId' = ${environmentLeases.heartbeatRunId}::text)
|
||||
and coalesce(${environmentLeases.metadata}->>'pendingCleanupRetryAttempts', '0') = '0'
|
||||
and coalesce(${environmentLeases.metadata}->>'pendingCleanupInFlight', 'false') <> 'true'`;
|
||||
}
|
||||
@@ -84,7 +79,7 @@ export function pendingCleanupDeadlineSql(now = Date.now()) {
|
||||
}
|
||||
|
||||
export async function nextEnvironmentCleanupAt(db: Db, backoffMs = ENVIRONMENT_CLEANUP_RETRY_MS): Promise<number | null> {
|
||||
const [row] = await db.select({ next: sql<string | null>`min(case when ${recoveredOrphanFirstAttemptSql()}
|
||||
const [row] = await db.select({ next: sql<string | null>`min(case when ${recoveredCleanupFirstAttemptSql()}
|
||||
then ${pendingCleanupDeadlineSql()} else greatest(
|
||||
extract(epoch from ${environmentLeases.updatedAt}) * 1000 + ${backoffMs},
|
||||
${pendingCleanupDeadlineSql()}) end)` }).from(environmentLeases).where(eq(environmentLeases.status, "pending_cleanup"));
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
pendingCleanupAttemptsSql,
|
||||
pendingCleanupDeadlineSql,
|
||||
pendingCleanupMetadataObjectSql,
|
||||
recoveredOrphanFirstAttemptSql,
|
||||
recoveredCleanupFirstAttemptSql,
|
||||
} from "../environment-cleanup-state.js";
|
||||
import { currentControllerProcess, readControllerProcess } from "../controller-process-identity.js";
|
||||
import { writeEnvironmentCleanup } from "../environment-cleanup-notifications.js";
|
||||
@@ -1872,7 +1872,7 @@ export function createHeartbeatRecovery(db: Db, dependencies: HeartbeatRecoveryD
|
||||
opts?.explicitRetry ? eq(environmentLeases.heartbeatRunId, opts.explicitRetry.runId) : undefined,
|
||||
opts?.environmentRetry ? eq(environmentLeases.environmentId, opts.environmentRetry.environmentId) : undefined,
|
||||
pendingCleanupRetryDueSql(manualRetry),
|
||||
backoffMs > 0 ? or(lte(environmentLeases.updatedAt, cutoff), recoveredOrphanFirstAttemptSql()) : undefined,
|
||||
backoffMs > 0 ? or(lte(environmentLeases.updatedAt, cutoff), recoveredCleanupFirstAttemptSql()) : undefined,
|
||||
),
|
||||
)
|
||||
.orderBy(asc(environmentLeases.updatedAt))
|
||||
|
||||
@@ -62,7 +62,7 @@ import { ENVIRONMENT_LEASE_CONTROLLER_KEY } from "../environment-lease-controlle
|
||||
import {
|
||||
ENVIRONMENT_CLEANUP_RETRY_MS,
|
||||
pendingCleanupDeadlineSql,
|
||||
recoveredOrphanFirstAttemptSql,
|
||||
recoveredCleanupFirstAttemptSql,
|
||||
} from "../environment-cleanup-state.js";
|
||||
import { settleEnvironmentLoginProbeLease } from "../environment-login-probe-lease-settlement.js";
|
||||
import { settleEnvironmentRunLease } from "../environment-run-lease-settlement.js";
|
||||
@@ -515,7 +515,7 @@ function pendingCleanupKind(): OwnableKind {
|
||||
// by the settle; a row from before that is due since its last write).
|
||||
// Built per listing: the deadline reader bounds saved deadlines relative to
|
||||
// the current time, so it must not be frozen at module load.
|
||||
const dueMs = () => sql<string>`case when ${recoveredOrphanFirstAttemptSql()}
|
||||
const dueMs = () => sql<string>`case when ${recoveredCleanupFirstAttemptSql()}
|
||||
then coalesce(case when jsonb_typeof(${environmentLeases.metadata}->'pendingCleanupRecoveredAtMs') = 'number'
|
||||
then (${environmentLeases.metadata}->>'pendingCleanupRecoveredAtMs')::numeric end,
|
||||
extract(epoch from ${environmentLeases.updatedAt}) * 1000)
|
||||
|
||||
@@ -461,6 +461,12 @@ not evidence that its Cloud journey passed.
|
||||
|
||||
## Reuse and daily QA promotion
|
||||
|
||||
Task property and document journeys open the current side panel or the classic
|
||||
Properties control before they act. Property reads exclude inert and accessibility-hidden
|
||||
panels, select the Properties tab when needed, and check the row in the viewport.
|
||||
Document navigation waits for the available authoring controls after each reload.
|
||||
These browser regressions do not establish a new deployed QA pass.
|
||||
|
||||
The classic matrix and deployment-targeted stories share Plan revision actions,
|
||||
artifact download/oracle code, Skill Studio editing and protected-action decisions.
|
||||
Their target adapters own login, agent/connection provisioning, environment
|
||||
|
||||
@@ -1,9 +1,51 @@
|
||||
import { expect, test } from "@playwright/test";
|
||||
import { newProjectButton } from "./product-journeys/project-context-flow.js";
|
||||
import { storyArtifactDownloadLink } from "./story-artifact.js";
|
||||
import { taskProperties } from "./product-journeys/task-properties.js";
|
||||
import { showPropertyRow } from "./product-journeys/task-panel.js";
|
||||
import type { JourneyContext, JourneyEvidence, TargetSession } from "./product-journeys/types.js";
|
||||
|
||||
const id = "11111111-2222-4333-8444-555555555555";
|
||||
|
||||
test("property reads select Properties from an open panel and exclude inactive duplicate rows", async ({ page }) => {
|
||||
const row = (value: string) => `<div data-property-row><span data-property-label="Project">Project</span><span data-property-value>${value}</span></div>`;
|
||||
await page.setContent(`<aside inert aria-hidden="true">${row("Stale project")}</aside>
|
||||
<aside><button role="tab" onclick="document.querySelector('#properties').hidden=false">Properties</button><section id="properties" hidden>${row("Saved project")}</section></aside>`);
|
||||
const property = await showPropertyRow(page, "Project");
|
||||
await expect(property.locator("[data-property-value]")).toHaveText("Saved project");
|
||||
});
|
||||
|
||||
test("property reads cannot use an inert row when the panel has no open control", async ({ page }) => {
|
||||
await page.setContent('<aside inert aria-hidden="true"><div data-property-row><span data-property-label="Project">Project</span><span data-property-value>Saved project</span></div></aside>');
|
||||
await expect(showPropertyRow(page, "Project")).rejects.toThrow();
|
||||
});
|
||||
|
||||
test("assignment opens the current side panel again after reload and verifies the saved user", async ({ page }) => {
|
||||
const origin = "https://assignment-controls.test", title = "Owned assignment task", userId = "owned-user";
|
||||
let assigned = false;
|
||||
await page.route(`${origin}/**`, async route => {
|
||||
const pathname = new URL(route.request().url()).pathname;
|
||||
if (pathname === "/assign") {
|
||||
assigned = true;
|
||||
await route.fulfill({ json: {} });
|
||||
return;
|
||||
}
|
||||
await route.fulfill({ contentType: "text/html", body: pathname === "/QA/issues"
|
||||
? `<a href="/QA/issues/QA-201">${title}</a>`
|
||||
: `<button aria-label="Toggle side panel" aria-pressed="false" onclick="const p=document.querySelector('aside');p.removeAttribute('inert');p.removeAttribute('aria-hidden');p.style.width='300px';this.setAttribute('aria-pressed','true')">Open</button>
|
||||
<aside inert aria-hidden="true" style="width:0;overflow:hidden"><div style="width:300px" data-property-row><span data-property-label="Assignee">Assignee</span><div data-property-value><button onclick="document.querySelector('#choices').hidden=false">${assigned ? "You" : "Unassigned"}</button></div></div></aside>
|
||||
<div id="choices" hidden><button onclick="fetch('/assign',{method:'POST'}).then(()=>this.parentElement.hidden=true)">Assign to me</button></div>` });
|
||||
});
|
||||
const context = { page, company: { issuePrefix: "QA" }, user: { id: userId }, capabilities: ["company", "board-user", "task-write"],
|
||||
fixtures: { backlogTask: { id, title, identifier: "QA-201" } }, api: { origin,
|
||||
get: async (route: string) => route.endsWith("/runs") ? [] : { assigneeUserId: assigned ? userId : null, assigneeAgentId: null, status: "backlog" } },
|
||||
} as unknown as JourneyContext;
|
||||
const evidence: JourneyEvidence = { checks: [], outcome: "passed", startingState: "recipe", phases: [], resourceDisposition: "released", privacy: "private" };
|
||||
await taskProperties(context, {} as TargetSession, "owned-campaign", evidence);
|
||||
expect(evidence.checks).toEqual([{ id: "assignment-persisted", passed: true }, { id: "no-agent-work", passed: true }]);
|
||||
await expect(page.getByRole("button", { name: "You", exact: true })).toBeVisible();
|
||||
});
|
||||
|
||||
test("finds the attachment download link in legacy and Artifacts V1 markup only", async ({ page }) => {
|
||||
const markup = {
|
||||
legacy: `<a href="/api/attachments/${id}/content?download=1">Download</a>`,
|
||||
|
||||
@@ -19,11 +19,14 @@ export async function openTaskPanelTab(page: Page, tabName: "Properties" | "Arti
|
||||
for (let step = 0; step < 4; step++) {
|
||||
await expect.poll(() => anyVisible(ready, tab, option, newTab, toggle, opener)).toBe(true);
|
||||
if (await ready.isVisible()) return;
|
||||
if (await option.isVisible()) await option.click();
|
||||
else if (await tab.isVisible()) await tab.click();
|
||||
else if (await newTab.isVisible()) await newTab.click();
|
||||
else if (await toggle.isVisible()) await toggle.click();
|
||||
else await opener.click();
|
||||
if (await option.isVisible()) { await option.click(); await expect(ready).toBeVisible(); }
|
||||
else if (await tab.isVisible()) { await tab.click(); await expect(ready).toBeVisible(); }
|
||||
else if (await newTab.isVisible()) { await newTab.click(); await expect(option).toBeVisible(); }
|
||||
else {
|
||||
if (await toggle.isVisible()) await toggle.click();
|
||||
else await opener.click();
|
||||
await expect.poll(() => anyVisible(ready, tab, option, newTab)).toBe(true);
|
||||
}
|
||||
}
|
||||
await expect(ready).toBeVisible();
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ const projectPath = "/QA/projects/owned-project-f962db91/issues", taskPath = "/Q
|
||||
const projectInput = { origin, issuePrefix: "QA", projectName, projectRef: "owned-project-f962db91" };
|
||||
const taskInput = { origin, issuePrefix: "QA", projectName, taskTitle, prompt, taskRef: "QA-201" };
|
||||
|
||||
async function fixture(page: Page, changes: { missingProject?: boolean; wrongProject?: boolean; missingTask?: boolean; wrongTask?: boolean; wrongProperty?: boolean } = {}) {
|
||||
async function fixture(page: Page, changes: { missingProject?: boolean; wrongProject?: boolean; missingTask?: boolean; wrongTask?: boolean; wrongProperty?: boolean; sidePanel?: boolean } = {}) {
|
||||
const requests: string[] = [];
|
||||
await page.route(`${origin}/**`, async route => {
|
||||
const path = new URL(route.request().url()).pathname;
|
||||
@@ -15,9 +15,13 @@ async function fixture(page: Page, changes: { missingProject?: boolean; wrongPro
|
||||
// Layout can retain a hidden sidebar label. ProjectDetail renders its
|
||||
// production InlineEditor as h2; IssueRow has an overlay link with sr-only text.
|
||||
const sidebar = `<aside hidden><a href="/wrong-sidebar">${projectName}</a><a href="/wrong-task">${taskTitle}</a><p>${prompt}</p></aside>`;
|
||||
const propertyValue = changes.wrongProperty ? "Other project" : projectName;
|
||||
const panel = changes.sidePanel
|
||||
? `<button aria-label="Toggle side panel" aria-pressed="false" onclick="const p=document.querySelector('#properties');p.removeAttribute('inert');p.removeAttribute('aria-hidden');p.style.width='300px';this.setAttribute('aria-pressed','true')">Open</button><aside id="properties" inert aria-hidden="true" style="width:0;overflow:hidden"><div style="width:300px"><div data-property-row><span data-property-label="Project">Project</span><div data-property-value>${propertyValue}</div></div></div></aside>`
|
||||
: `<button onclick="document.querySelector('#properties').hidden=false;this.hidden=true">Show properties</button><section id="properties" hidden><div data-property-row><span data-property-label="Project">Project</span><div data-property-value>${propertyValue}</div></div></section>`;
|
||||
const body = path === "/QA/projects" ? `${sidebar}<main id="main-content">${changes.missingProject ? "" : `<a href="${changes.wrongProject ? "/QA/projects/foreign/issues" : projectPath}"><span>${projectName}</span></a>`}</main>`
|
||||
: path.includes("/projects/") ? `${sidebar}<main id="main-content"><h2>${projectName}</h2>${changes.missingTask ? "" : `<div data-issue-row-id="owned-task" style="position:relative;min-height:44px"><a style="position:absolute;inset:0" href="${changes.wrongTask ? "/QA/issues/QA-999" : taskPath}"><span class="sr-only">Open QA-201: ${taskTitle}</span></a><span>${taskTitle}</span></div>`}</main>`
|
||||
: `${sidebar}<main id="main-content"><h1>${taskTitle}</h1><p>${prompt}</p><button onclick="document.querySelector('#properties').hidden=false;this.hidden=true">Show properties</button><section id="properties" hidden><div data-property-row><span data-property-label="Project">Project</span><div data-property-value>${changes.wrongProperty ? "Other project" : projectName}</div></div></section></main>`;
|
||||
: `${sidebar}<main id="main-content"><h1>${taskTitle}</h1><p>${prompt}</p>${panel}</main>`;
|
||||
await route.fulfill({ contentType: "text/html", body: `<style>.sr-only{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0,0,0,0)}</style>${body}` });
|
||||
});
|
||||
return requests;
|
||||
@@ -32,6 +36,13 @@ test("reopens and reloads the owned project and task despite hidden duplicate si
|
||||
await expect(page.locator("main#main-content [data-property-value]")).toContainText(projectName);
|
||||
});
|
||||
|
||||
test("opens the current collapsed inert side panel before reading the saved project", async ({ page }) => {
|
||||
await fixture(page, { sidePanel: true });
|
||||
await page.goto(`${origin}${projectPath}`);
|
||||
await openProjectTaskThroughList({ ...taskInput, page });
|
||||
await expect(page.getByRole("button", { name: "Toggle side panel" })).toHaveAttribute("aria-pressed", "true");
|
||||
});
|
||||
|
||||
for (const [name, changes, code] of [
|
||||
["missing project list row", { missingProject: true }, "project_context_project_open_failed"],
|
||||
["wrong project route with a matching label", { wrongProject: true }, "project_context_project_open_failed"],
|
||||
|
||||
@@ -2,7 +2,7 @@ import { expect, test } from "@playwright/test";
|
||||
import { reopenTaskDocument } from "./product-journeys/task-document-flow.js";
|
||||
import type { JourneyContext } from "./product-journeys/types.js";
|
||||
|
||||
for (const layout of ["collapsed", "artifacts", "launcher", "classic"] as const) {
|
||||
for (const layout of ["collapsed", "side-panel", "artifacts", "launcher", "classic"] as const) {
|
||||
test(`document reopen waits for the ${layout} task controls after reload`, async ({ page }) => {
|
||||
const issue = { title: "Journey QA document navigation" };
|
||||
let taskLoads = 0;
|
||||
@@ -20,7 +20,7 @@ for (const layout of ["collapsed", "artifacts", "launcher", "classic"] as const)
|
||||
controls.querySelector('button').onclick = ${layout === "artifacts" ? "authoring" : `() => { controls.innerHTML = '<div role="option">Artifacts</div>'; controls.querySelector('[role="option"]').onclick = authoring; }`};
|
||||
}
|
||||
setTimeout(() => {
|
||||
${layout === "classic" ? "authoring();" : layout === "collapsed" ? `controls.innerHTML = '<button>Show properties</button>'; controls.querySelector('button').onclick = () => setTimeout(panel, 100);` : "panel();"}
|
||||
${layout === "classic" ? "authoring();" : layout === "collapsed" || layout === "side-panel" ? `controls.innerHTML = ${JSON.stringify(layout === "side-panel" ? '<button aria-label="Toggle side panel" aria-pressed="false">Open</button>' : '<button>Show properties</button>')}; controls.querySelector('button').onclick = () => setTimeout(panel, 100);` : "panel();"}
|
||||
}, 200);
|
||||
</script>` });
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user