@firstpick/pi-package-webui 0.8.2 → 0.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +76 -19
- package/bin/pi-webui.mjs +864 -140
- package/lib/WEBUI_TUI_NATIVE_PARITY.json +26 -0
- package/lib/git-workflow-preferences.mjs +246 -19
- package/lib/optional-feature-catalog.mjs +29 -0
- package/lib/optional-feature-migration.mjs +410 -0
- package/lib/session-summary-core.mjs +320 -0
- package/lib/session-summary-preferences.mjs +267 -0
- package/lib/thinking-stream-recovery.mjs +156 -0
- package/lib/ui-layout-settings.mjs +254 -0
- package/package.json +5 -40
- package/public/app.js +2898 -92
- package/public/index.html +77 -14
- package/public/service-worker.js +1 -1
- package/public/styles.css +669 -2
- package/session-summary.ts +403 -0
- package/tests/aur-review-widget-static.test.mjs +3 -2
- package/tests/boot-failure-diagnostics.test.mjs +3 -3
- package/tests/browser/composer-action-grid-reorder.spec.mjs +303 -0
- package/tests/browser/feature-decision-output-popup.spec.mjs +156 -0
- package/tests/browser/interaction-continuity.spec.mjs +29 -0
- package/tests/browser/persistent-ui-layout.spec.mjs +744 -0
- package/tests/browser/session-summary.spec.mjs +271 -0
- package/tests/codex-fast-mode-static.test.mjs +10 -9
- package/tests/composer-action-grid-reorder-static.test.mjs +63 -0
- package/tests/fast-mode-client-static.test.mjs +2 -2
- package/tests/feature-decision-output-popup-static.test.mjs +172 -0
- package/tests/fixtures/fake-pi.mjs +51 -1
- package/tests/git-workflow-preferences.test.mjs +4 -2
- package/tests/http-endpoints-harness.test.mjs +507 -4
- package/tests/interaction-state-stability-static.test.mjs +3 -0
- package/tests/mobile-continuity-tablet-static.test.mjs +3 -3
- package/tests/mobile-foundation-static.test.mjs +3 -3
- package/tests/mobile-phone-experience-static.test.mjs +1 -1
- package/tests/mobile-static.test.mjs +118 -103
- package/tests/native-parity-harness.test.mjs +9 -1
- package/tests/native-parity.test.mjs +23 -1
- package/tests/open-issue-wizard-static.test.mjs +1 -1
- package/tests/optional-feature-migration-frontend.test.mjs +72 -0
- package/tests/optional-feature-migration.test.mjs +142 -0
- package/tests/persistent-ui-layout-static.test.mjs +267 -0
- package/tests/questionnaire-dialog.test.mjs +511 -0
- package/tests/queue-edit-reorder-static.test.mjs +1 -0
- package/tests/remote-auth-settings-harness.test.mjs +1 -1
- package/tests/session-summary-core.test.mjs +491 -0
- package/tests/session-summary-preferences.test.mjs +103 -0
- package/tests/side-panel-resize-static.test.mjs +1 -0
- package/tests/side-panel-section-reorder-static.test.mjs +3 -3
- package/tests/subagent-launch-slots.test.mjs +1 -1
- package/tests/thinking-stream-recovery.test.mjs +88 -0
- package/tests/ui-layout-settings.test.mjs +92 -0
- package/tests/webui-settings-locking.test.mjs +159 -0
|
@@ -0,0 +1,744 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { spawn } from "node:child_process";
|
|
3
|
+
import { createServer } from "node:net";
|
|
4
|
+
import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
|
5
|
+
import { tmpdir } from "node:os";
|
|
6
|
+
import { dirname, join } from "node:path";
|
|
7
|
+
import { setTimeout as delay } from "node:timers/promises";
|
|
8
|
+
import { fileURLToPath } from "node:url";
|
|
9
|
+
import { expect, test } from "@playwright/test";
|
|
10
|
+
|
|
11
|
+
const root = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
|
|
12
|
+
const serverScript = join(root, "bin", "pi-webui.mjs");
|
|
13
|
+
const fakePi = join(root, "tests", "fixtures", "fake-pi.mjs");
|
|
14
|
+
const layoutKeys = {
|
|
15
|
+
sideOrder: "pi-webui-side-panel-section-order-v1",
|
|
16
|
+
sideCollapsed: "pi-webui-side-panel-collapsed",
|
|
17
|
+
composerOrder: "pi-webui-composer-action-order-v1",
|
|
18
|
+
composerGrid: "pi-webui-composer-action-layout-v2",
|
|
19
|
+
footerOrder: "pi-webui-footer-scoped-model-order-v1",
|
|
20
|
+
terminalLayout: "pi-webui-terminal-tabs-layout",
|
|
21
|
+
terminalGroups: "pi-webui-terminal-custom-groups-v1",
|
|
22
|
+
fileViewerWidth: "pi-webui-file-viewer-width",
|
|
23
|
+
sidePanelWidth: "pi-webui-side-panel-width",
|
|
24
|
+
};
|
|
25
|
+
const scopedModels = [
|
|
26
|
+
{ provider: "fake", id: "fake-model", name: "Fake Model" },
|
|
27
|
+
{ provider: "fake", id: "fake-beta", name: "Fake Beta" },
|
|
28
|
+
{ provider: "fake", id: "fake-gamma", name: "Fake Gamma" },
|
|
29
|
+
];
|
|
30
|
+
|
|
31
|
+
async function freePort() {
|
|
32
|
+
const server = createServer();
|
|
33
|
+
await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
|
|
34
|
+
const { port } = server.address();
|
|
35
|
+
await new Promise((resolve) => server.close(resolve));
|
|
36
|
+
return port;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
let child;
|
|
40
|
+
let baseURL;
|
|
41
|
+
let port;
|
|
42
|
+
let tempRoot;
|
|
43
|
+
let settingsFile;
|
|
44
|
+
let output = "";
|
|
45
|
+
|
|
46
|
+
async function startServer() {
|
|
47
|
+
child = spawn(process.execPath, [serverScript, "--cwd", tempRoot, "--host", "127.0.0.1", "--port", String(port), "--pi", fakePi], {
|
|
48
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
49
|
+
env: {
|
|
50
|
+
...process.env,
|
|
51
|
+
PI_WEBUI_RPC_SUPERVISOR: "0",
|
|
52
|
+
PI_CODING_AGENT_DIR: join(tempRoot, "agent"),
|
|
53
|
+
PI_WEBUI_SETTINGS_FILE: settingsFile,
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
child.stdout.on("data", (chunk) => { output += String(chunk); });
|
|
57
|
+
child.stderr.on("data", (chunk) => { output += String(chunk); });
|
|
58
|
+
for (let attempt = 0; attempt < 100; attempt += 1) {
|
|
59
|
+
if (child.exitCode !== null) break;
|
|
60
|
+
try {
|
|
61
|
+
const response = await fetch(`${baseURL}/api/health`, { signal: AbortSignal.timeout(500) });
|
|
62
|
+
if (response.ok) return;
|
|
63
|
+
} catch {
|
|
64
|
+
// Wait for the real server and fake Pi fixture to start.
|
|
65
|
+
}
|
|
66
|
+
await delay(100);
|
|
67
|
+
}
|
|
68
|
+
throw new Error(`Pi Web UI did not start:\n${output}`);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
async function stopServer() {
|
|
72
|
+
const stoppingChild = child;
|
|
73
|
+
if (!stoppingChild || stoppingChild.exitCode !== null) return;
|
|
74
|
+
const exited = new Promise((resolve) => stoppingChild.once("exit", resolve));
|
|
75
|
+
stoppingChild.kill("SIGTERM");
|
|
76
|
+
await Promise.race([
|
|
77
|
+
exited,
|
|
78
|
+
delay(5_000).then(() => {
|
|
79
|
+
if (stoppingChild.exitCode === null) stoppingChild.kill("SIGKILL");
|
|
80
|
+
return exited;
|
|
81
|
+
}),
|
|
82
|
+
]);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
async function ensureServerRunning() {
|
|
86
|
+
try {
|
|
87
|
+
const response = await fetch(`${baseURL}/api/health`, { signal: AbortSignal.timeout(1_000) });
|
|
88
|
+
if (response.ok) return;
|
|
89
|
+
} catch {
|
|
90
|
+
// Restart the isolated fixture server below.
|
|
91
|
+
}
|
|
92
|
+
await stopServer();
|
|
93
|
+
await startServer();
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
async function serverApi(pathname, { method = "GET", body } = {}) {
|
|
97
|
+
const response = await fetch(`${baseURL}${pathname}`, {
|
|
98
|
+
method,
|
|
99
|
+
headers: body === undefined ? undefined : { "content-type": "application/json" },
|
|
100
|
+
body: body === undefined ? undefined : JSON.stringify(body),
|
|
101
|
+
signal: AbortSignal.timeout(5_000),
|
|
102
|
+
});
|
|
103
|
+
const payload = await response.json().catch(() => ({}));
|
|
104
|
+
assert.equal(response.ok, true, `${method} ${pathname} should succeed: ${payload.error || output}`);
|
|
105
|
+
return payload;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
async function seedStaleServerLayout() {
|
|
109
|
+
const current = await serverApi("/api/interface-preferences");
|
|
110
|
+
await serverApi("/api/interface-preferences", {
|
|
111
|
+
method: "PUT",
|
|
112
|
+
body: {
|
|
113
|
+
sidePanelWidth: 352,
|
|
114
|
+
expectedLayoutRevision: current.data.layoutRevision,
|
|
115
|
+
layout: {
|
|
116
|
+
version: 1,
|
|
117
|
+
sidePanel: {
|
|
118
|
+
sectionOrder: ["git", "files", "controls"],
|
|
119
|
+
collapsedSectionIds: [],
|
|
120
|
+
hiddenSectionIds: [],
|
|
121
|
+
collapsed: false,
|
|
122
|
+
},
|
|
123
|
+
composerActions: { order: ["send", "new"], grid: null },
|
|
124
|
+
footerScopedModelOrder: ["fake/fake-gamma", "fake/fake-beta", "fake/fake-model"],
|
|
125
|
+
terminalTabs: { layout: "top", customGroups: { version: 1, groups: [] } },
|
|
126
|
+
fileViewerWidth: 384,
|
|
127
|
+
},
|
|
128
|
+
},
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
async function sectionOrder(page) {
|
|
133
|
+
return page.locator("#sidePanel .side-panel-body > [data-side-panel-section]").evaluateAll((sections) => (
|
|
134
|
+
sections.map((section) => section.dataset.sidePanelSection)
|
|
135
|
+
));
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
async function localLayout(page) {
|
|
139
|
+
return page.evaluate((keys) => {
|
|
140
|
+
const json = (key) => JSON.parse(localStorage.getItem(key) || "null");
|
|
141
|
+
return {
|
|
142
|
+
sideOrder: json(keys.sideOrder),
|
|
143
|
+
composerOrder: json(keys.composerOrder),
|
|
144
|
+
composerGrid: json(keys.composerGrid),
|
|
145
|
+
footerOrder: json(keys.footerOrder),
|
|
146
|
+
terminalLayout: localStorage.getItem(keys.terminalLayout),
|
|
147
|
+
terminalGroups: json(keys.terminalGroups),
|
|
148
|
+
fileViewerWidth: Number(localStorage.getItem(keys.fileViewerWidth)),
|
|
149
|
+
sidePanelWidth: Number(localStorage.getItem(keys.sidePanelWidth)),
|
|
150
|
+
};
|
|
151
|
+
}, layoutKeys);
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
async function installScopedModelFixture(page) {
|
|
155
|
+
await page.route("**/api/scoped-models*", async (route) => {
|
|
156
|
+
await route.fulfill({
|
|
157
|
+
status: 200,
|
|
158
|
+
contentType: "application/json",
|
|
159
|
+
body: JSON.stringify({ ok: true, data: { models: scopedModels, patterns: ["fake/*"], source: "browser-fixture", rpcRunning: true } }),
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
async function openFooterModelPicker(page) {
|
|
165
|
+
const trigger = page.locator(".footer-tui-model, .footer-model.footer-meta-action").first();
|
|
166
|
+
await expect(trigger).toBeVisible();
|
|
167
|
+
await trigger.click();
|
|
168
|
+
await expect(page.locator(".footer-model-picker .footer-model-option")).toHaveCount(scopedModels.length);
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
async function openAcceptanceFile(page) {
|
|
172
|
+
const filesToggle = page.locator('[data-side-panel-section-toggle="files"]');
|
|
173
|
+
if (await filesToggle.getAttribute("aria-expanded") !== "true") await filesToggle.click();
|
|
174
|
+
const file = page.locator('[role="treeitem"][data-path="acceptance.txt"]');
|
|
175
|
+
await expect(file).toBeVisible();
|
|
176
|
+
await file.click();
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
async function composerColumnCount(page) {
|
|
180
|
+
return page.locator(".composer-row").evaluate((row) => {
|
|
181
|
+
const style = getComputedStyle(row);
|
|
182
|
+
const rawMinWidth = style.getPropertyValue("--composer-action-cell-min-width").trim();
|
|
183
|
+
const numericMinWidth = Number.parseFloat(rawMinWidth);
|
|
184
|
+
const rootFontSize = Number.parseFloat(getComputedStyle(document.documentElement).fontSize) || 16;
|
|
185
|
+
const rowFontSize = Number.parseFloat(style.fontSize) || rootFontSize;
|
|
186
|
+
const minWidth = rawMinWidth.endsWith("rem")
|
|
187
|
+
? numericMinWidth * rootFontSize
|
|
188
|
+
: rawMinWidth.endsWith("em")
|
|
189
|
+
? numericMinWidth * rowFontSize
|
|
190
|
+
: numericMinWidth;
|
|
191
|
+
const gap = Number.parseFloat(style.columnGap || style.gap) || 0;
|
|
192
|
+
return Math.max(1, Math.floor((row.clientWidth + gap) / (minWidth + gap)));
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
async function useMatchingComposerViewport(page, columns) {
|
|
197
|
+
const current = page.viewportSize();
|
|
198
|
+
const candidates = [current.width, ...Array.from({ length: 51 }, (_, index) => 1100 + (index * 24))];
|
|
199
|
+
for (const width of [...new Set(candidates)]) {
|
|
200
|
+
await page.setViewportSize({ width, height: current.height });
|
|
201
|
+
await page.evaluate(() => new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve))));
|
|
202
|
+
if (await composerColumnCount(page) === columns) return width;
|
|
203
|
+
}
|
|
204
|
+
throw new Error(`Could not reproduce the stored ${columns}-column composer geometry`);
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
async function assertRestoredLayout(page, expected, { expectCustomGroup = null } = {}) {
|
|
208
|
+
await expect.poll(() => sectionOrder(page)).toEqual(expected.sideOrder);
|
|
209
|
+
await expect.poll(() => localLayout(page)).toMatchObject({
|
|
210
|
+
sideOrder: expected.sideOrder,
|
|
211
|
+
composerOrder: expected.composerOrder,
|
|
212
|
+
composerGrid: expected.composerGrid,
|
|
213
|
+
footerOrder: expected.footerOrder,
|
|
214
|
+
terminalLayout: "left",
|
|
215
|
+
fileViewerWidth: expected.fileViewerWidth,
|
|
216
|
+
sidePanelWidth: expected.sidePanelWidth,
|
|
217
|
+
});
|
|
218
|
+
await expect(page.locator("body")).toHaveClass(/terminal-tabs-left/);
|
|
219
|
+
await expect(page.locator("#terminalTabsLayoutSelect")).toHaveValue("left");
|
|
220
|
+
await expect.poll(async () => Number(await page.locator("#sidePanelResizeHandle").getAttribute("aria-valuenow"))).toBeGreaterThanOrEqual(320);
|
|
221
|
+
await expect.poll(async () => Number(await page.locator("#sidePanelResizeHandle").getAttribute("aria-valuenow"))).toBeLessThanOrEqual(expected.sidePanelWidth);
|
|
222
|
+
const matchingViewportWidth = await useMatchingComposerViewport(page, expected.composerGrid.columns);
|
|
223
|
+
await expect.poll(() => page.locator('[data-composer-action-id="options"]').evaluate((node) => node.style.getPropertyValue("--composer-action-grid-column"))).toBe(expected.optionsColumn);
|
|
224
|
+
if (expectCustomGroup === true) await expect(page.locator(".terminal-tab-custom-group")).toHaveCount(1);
|
|
225
|
+
if (expectCustomGroup === false) await expect(page.locator(".terminal-tab-custom-group")).toHaveCount(0);
|
|
226
|
+
|
|
227
|
+
await openFooterModelPicker(page);
|
|
228
|
+
await expect.poll(() => page.locator(".footer-model-option").evaluateAll((buttons) => buttons.map((button) => button.dataset.footerModelKey))).toEqual(expected.footerOrder);
|
|
229
|
+
await expect(page.locator('.footer-model-option[aria-selected="true"]')).toHaveAttribute("data-footer-model-key", "fake/fake-model");
|
|
230
|
+
await page.keyboard.press("Escape");
|
|
231
|
+
|
|
232
|
+
await openAcceptanceFile(page);
|
|
233
|
+
await expect(page.locator("#fileViewerPane")).toBeVisible();
|
|
234
|
+
await expect.poll(() => page.locator("#fileViewerResizeHandle").getAttribute("aria-valuenow")).toBe(String(expected.fileViewerWidth));
|
|
235
|
+
await page.locator("#fileViewerCloseButton").click();
|
|
236
|
+
return matchingViewportWidth;
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
test.beforeAll(async () => {
|
|
240
|
+
port = await freePort();
|
|
241
|
+
tempRoot = await mkdtemp(join(tmpdir(), "pi-webui-persistent-layout-browser-"));
|
|
242
|
+
settingsFile = join(tempRoot, "settings.json");
|
|
243
|
+
baseURL = `http://127.0.0.1:${port}`;
|
|
244
|
+
await mkdir(join(tempRoot, "other-cwd"));
|
|
245
|
+
await writeFile(join(tempRoot, "acceptance.txt"), "durable layout browser fixture\n", "utf8");
|
|
246
|
+
await startServer();
|
|
247
|
+
});
|
|
248
|
+
|
|
249
|
+
test.beforeEach(async () => {
|
|
250
|
+
await ensureServerRunning();
|
|
251
|
+
});
|
|
252
|
+
|
|
253
|
+
test.afterAll(async () => {
|
|
254
|
+
await stopServer();
|
|
255
|
+
await rm(tempRoot, { recursive: true, force: true });
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
test("server-owned layout survives stale reads, failed writes, localStorage clear, and process restart", async ({ browser }) => {
|
|
259
|
+
test.setTimeout(90_000);
|
|
260
|
+
|
|
261
|
+
const initialTabs = await serverApi("/api/tabs");
|
|
262
|
+
const firstTabId = initialTabs.data.tabs[0].id;
|
|
263
|
+
const created = await serverApi("/api/tabs", {
|
|
264
|
+
method: "POST",
|
|
265
|
+
body: { title: "Other cwd", cwd: join(tempRoot, "other-cwd") },
|
|
266
|
+
});
|
|
267
|
+
const secondTabId = created.data.tab.id;
|
|
268
|
+
await seedStaleServerLayout();
|
|
269
|
+
|
|
270
|
+
const context = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
271
|
+
const page = await context.newPage();
|
|
272
|
+
await installScopedModelFixture(page);
|
|
273
|
+
|
|
274
|
+
let releaseStaleGet;
|
|
275
|
+
let staleGetCaptured;
|
|
276
|
+
const staleGetReady = new Promise((resolve) => { staleGetCaptured = resolve; });
|
|
277
|
+
const releaseStaleGetPromise = new Promise((resolve) => { releaseStaleGet = resolve; });
|
|
278
|
+
let allowLayoutWrites = false;
|
|
279
|
+
let failedLayoutWrites = 0;
|
|
280
|
+
await page.route("**/api/interface-preferences", async (route) => {
|
|
281
|
+
const request = route.request();
|
|
282
|
+
if (request.method() === "GET" && !staleGetCaptured.used) {
|
|
283
|
+
staleGetCaptured.used = true;
|
|
284
|
+
const response = await route.fetch();
|
|
285
|
+
staleGetCaptured();
|
|
286
|
+
await releaseStaleGetPromise;
|
|
287
|
+
await route.fulfill({ response });
|
|
288
|
+
return;
|
|
289
|
+
}
|
|
290
|
+
if (request.method() === "PUT") {
|
|
291
|
+
const payload = request.postDataJSON();
|
|
292
|
+
if (payload?.layout && !allowLayoutWrites) {
|
|
293
|
+
failedLayoutWrites += 1;
|
|
294
|
+
await route.abort("failed");
|
|
295
|
+
return;
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
await route.continue();
|
|
299
|
+
});
|
|
300
|
+
|
|
301
|
+
await page.goto(baseURL);
|
|
302
|
+
await staleGetReady;
|
|
303
|
+
await expect(page.locator("#sidePanel")).toBeVisible();
|
|
304
|
+
await expect(page.locator('[data-composer-action-id="options"]')).toBeVisible();
|
|
305
|
+
|
|
306
|
+
const controls = page.locator('[data-side-panel-section-toggle="controls"]');
|
|
307
|
+
await controls.focus();
|
|
308
|
+
await controls.press("Alt+ArrowDown");
|
|
309
|
+
const expectedSideOrder = await sectionOrder(page);
|
|
310
|
+
expect(expectedSideOrder.slice(0, 3)).toEqual(["files", "controls", "git"]);
|
|
311
|
+
|
|
312
|
+
const sidePanelResize = page.locator("#sidePanelResizeHandle");
|
|
313
|
+
await sidePanelResize.focus();
|
|
314
|
+
await sidePanelResize.press("Shift+ArrowLeft");
|
|
315
|
+
const expectedSidePanelWidth = Number(await sidePanelResize.getAttribute("aria-valuenow"));
|
|
316
|
+
expect(expectedSidePanelWidth).toBeGreaterThan(352);
|
|
317
|
+
|
|
318
|
+
await openFooterModelPicker(page);
|
|
319
|
+
const selectedModel = page.locator('[data-footer-model-key="fake/fake-model"]');
|
|
320
|
+
await selectedModel.focus();
|
|
321
|
+
await selectedModel.press("Alt+ArrowUp");
|
|
322
|
+
const expectedFooterOrder = await page.locator(".footer-model-option").evaluateAll((buttons) => buttons.map((button) => button.dataset.footerModelKey));
|
|
323
|
+
expect(expectedFooterOrder).toEqual(["fake/fake-gamma", "fake/fake-model", "fake/fake-beta"]);
|
|
324
|
+
await expect(page.locator('.footer-model-option[aria-selected="true"]')).toHaveAttribute("data-footer-model-key", "fake/fake-model");
|
|
325
|
+
await page.keyboard.press("Escape");
|
|
326
|
+
|
|
327
|
+
const firstTab = page.locator(`[data-tab-id="${firstTabId}"]`).first();
|
|
328
|
+
const secondTab = page.locator(`[data-tab-id="${secondTabId}"]`).first();
|
|
329
|
+
await expect(firstTab).toBeVisible();
|
|
330
|
+
await expect(secondTab).toBeVisible();
|
|
331
|
+
await secondTab.dragTo(firstTab);
|
|
332
|
+
await expect(page.locator(".terminal-tab-custom-group")).toHaveCount(1);
|
|
333
|
+
const controlsToggle = page.locator('[data-side-panel-section-toggle="controls"]');
|
|
334
|
+
if (await controlsToggle.getAttribute("aria-expanded") !== "true") await controlsToggle.click();
|
|
335
|
+
await expect(page.locator("#terminalTabsLayoutSelect")).toBeVisible();
|
|
336
|
+
await page.locator("#terminalTabsLayoutSelect").selectOption("left");
|
|
337
|
+
await expect(page.locator("body")).toHaveClass(/terminal-tabs-left/);
|
|
338
|
+
|
|
339
|
+
const options = page.locator('[data-composer-action-id="options"]');
|
|
340
|
+
const optionsBox = await options.boundingBox();
|
|
341
|
+
expect(optionsBox).toBeTruthy();
|
|
342
|
+
await page.mouse.move(optionsBox.x + optionsBox.width / 2, optionsBox.y + optionsBox.height / 2);
|
|
343
|
+
await page.mouse.down();
|
|
344
|
+
await page.mouse.move(optionsBox.x + optionsBox.width / 2 + 12, optionsBox.y + optionsBox.height / 2, { steps: 2 });
|
|
345
|
+
const gridGuide = page.locator("#composerActionGridGuide");
|
|
346
|
+
await expect(gridGuide).toBeVisible();
|
|
347
|
+
const lastCell = await gridGuide.locator(".composer-action-grid-cell").last().boundingBox();
|
|
348
|
+
expect(lastCell).toBeTruthy();
|
|
349
|
+
await page.mouse.move(lastCell.x + lastCell.width / 2, lastCell.y + lastCell.height / 2, { steps: 8 });
|
|
350
|
+
await page.mouse.up();
|
|
351
|
+
await expect(gridGuide).toBeHidden();
|
|
352
|
+
|
|
353
|
+
await openAcceptanceFile(page);
|
|
354
|
+
await expect(page.locator("#fileViewerPane")).toBeVisible();
|
|
355
|
+
const fileViewerResize = page.locator("#fileViewerResizeHandle");
|
|
356
|
+
await fileViewerResize.focus();
|
|
357
|
+
await fileViewerResize.press("Shift+ArrowLeft");
|
|
358
|
+
const expectedFileViewerWidth = Number(await fileViewerResize.getAttribute("aria-valuenow"));
|
|
359
|
+
expect(expectedFileViewerWidth).toBeGreaterThan(384);
|
|
360
|
+
await page.locator("#fileViewerCloseButton").click();
|
|
361
|
+
|
|
362
|
+
const expectedLocal = await localLayout(page);
|
|
363
|
+
expect(expectedLocal.composerGrid?.positions?.options).toBeGreaterThan(0);
|
|
364
|
+
expect(expectedLocal.terminalGroups?.groups?.[0]?.tabIds).toEqual([firstTabId, secondTabId]);
|
|
365
|
+
const optionsColumn = String((expectedLocal.composerGrid.positions.options % expectedLocal.composerGrid.columns) + 1);
|
|
366
|
+
const expected = {
|
|
367
|
+
...expectedLocal,
|
|
368
|
+
sideOrder: expectedSideOrder,
|
|
369
|
+
footerOrder: expectedFooterOrder,
|
|
370
|
+
fileViewerWidth: expectedFileViewerWidth,
|
|
371
|
+
sidePanelWidth: expectedSidePanelWidth,
|
|
372
|
+
optionsColumn,
|
|
373
|
+
};
|
|
374
|
+
|
|
375
|
+
releaseStaleGet();
|
|
376
|
+
await expect.poll(() => sectionOrder(page)).toEqual(expectedSideOrder);
|
|
377
|
+
await expect.poll(() => localLayout(page)).toMatchObject(expectedLocal);
|
|
378
|
+
await expect.poll(() => failedLayoutWrites).toBeGreaterThan(0);
|
|
379
|
+
allowLayoutWrites = true;
|
|
380
|
+
await page.evaluate(() => window.dispatchEvent(new Event("online")));
|
|
381
|
+
|
|
382
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout).toMatchObject({
|
|
383
|
+
sidePanel: { sectionOrder: expected.sideOrder },
|
|
384
|
+
composerActions: { order: expected.composerOrder, grid: expected.composerGrid },
|
|
385
|
+
footerScopedModelOrder: expected.footerOrder,
|
|
386
|
+
terminalTabs: { layout: "left", customGroups: expected.terminalGroups },
|
|
387
|
+
fileViewerWidth: expected.fileViewerWidth,
|
|
388
|
+
});
|
|
389
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.preferences.sidePanelWidth).toBe(expected.sidePanelWidth);
|
|
390
|
+
|
|
391
|
+
await page.evaluate(() => localStorage.clear());
|
|
392
|
+
expect(await page.evaluate(() => localStorage.length)).toBe(0);
|
|
393
|
+
await page.reload();
|
|
394
|
+
const matchingViewportWidth = await assertRestoredLayout(page, expected, { expectCustomGroup: true });
|
|
395
|
+
|
|
396
|
+
await page.setViewportSize({ width: 900, height: 900 });
|
|
397
|
+
await expect.poll(() => options.evaluate((node) => node.style.getPropertyValue("--composer-action-grid-column"))).toBe("");
|
|
398
|
+
await expect.poll(() => page.evaluate((key) => JSON.parse(localStorage.getItem(key) || "null"), layoutKeys.composerGrid)).toEqual(expected.composerGrid);
|
|
399
|
+
await page.setViewportSize({ width: matchingViewportWidth, height: 1000 });
|
|
400
|
+
await expect.poll(() => options.evaluate((node) => node.style.getPropertyValue("--composer-action-grid-column"))).toBe(expected.optionsColumn);
|
|
401
|
+
|
|
402
|
+
await context.close();
|
|
403
|
+
await stopServer();
|
|
404
|
+
const settingsOnDisk = JSON.parse(await readFile(settingsFile, "utf8"));
|
|
405
|
+
assert.deepEqual(settingsOnDisk.uiLayout.sidePanel.sectionOrder, expected.sideOrder, "the private settings file should contain the browser-committed Control Deck order");
|
|
406
|
+
assert.deepEqual(settingsOnDisk.uiLayout.composerActions.grid, expected.composerGrid, "the private settings file should contain the exact sparse composer grid");
|
|
407
|
+
assert.equal(settingsOnDisk.uiLayout.fileViewerWidth, expected.fileViewerWidth, "the private settings file should contain the browser-committed file-viewer width");
|
|
408
|
+
|
|
409
|
+
await startServer();
|
|
410
|
+
const freshContext = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
411
|
+
assert.deepEqual((await freshContext.storageState()).origins, [], "the restart assertion must begin with a fresh browser context and no origin storage");
|
|
412
|
+
const freshPage = await freshContext.newPage();
|
|
413
|
+
await installScopedModelFixture(freshPage);
|
|
414
|
+
await freshPage.goto(baseURL);
|
|
415
|
+
await assertRestoredLayout(freshPage, expected, { expectCustomGroup: false });
|
|
416
|
+
await expect.poll(() => freshPage.evaluate((key) => localStorage.getItem(key), layoutKeys.terminalGroups)).not.toBeNull();
|
|
417
|
+
await freshContext.close();
|
|
418
|
+
});
|
|
419
|
+
|
|
420
|
+
test("returning browsers adopt authoritative Control Deck state without echo writes", async ({ browser }) => {
|
|
421
|
+
const current = await serverApi("/api/interface-preferences");
|
|
422
|
+
const serverSideOrder = ["git", "files", "controls"];
|
|
423
|
+
await serverApi("/api/interface-preferences", {
|
|
424
|
+
method: "PUT",
|
|
425
|
+
body: {
|
|
426
|
+
expectedLayoutRevision: current.data.layoutRevision,
|
|
427
|
+
layout: {
|
|
428
|
+
version: 1,
|
|
429
|
+
sidePanel: {
|
|
430
|
+
sectionOrder: serverSideOrder,
|
|
431
|
+
collapsedSectionIds: [],
|
|
432
|
+
hiddenSectionIds: [],
|
|
433
|
+
collapsed: false,
|
|
434
|
+
},
|
|
435
|
+
},
|
|
436
|
+
},
|
|
437
|
+
});
|
|
438
|
+
|
|
439
|
+
const context = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
440
|
+
await context.addInitScript(({ sideOrder, sideCollapsed }) => {
|
|
441
|
+
localStorage.setItem(sideOrder, JSON.stringify(["files", "controls", "git"]));
|
|
442
|
+
localStorage.setItem(sideCollapsed, "1");
|
|
443
|
+
}, layoutKeys);
|
|
444
|
+
const page = await context.newPage();
|
|
445
|
+
let layoutPuts = 0;
|
|
446
|
+
await page.route("**/api/interface-preferences", async (route) => {
|
|
447
|
+
if (route.request().method() === "PUT" && route.request().postDataJSON()?.layout) layoutPuts += 1;
|
|
448
|
+
await route.continue();
|
|
449
|
+
});
|
|
450
|
+
|
|
451
|
+
await page.goto(baseURL);
|
|
452
|
+
await expect.poll(async () => (await sectionOrder(page)).slice(0, serverSideOrder.length)).toEqual(serverSideOrder);
|
|
453
|
+
await expect(page.locator("body")).not.toHaveClass(/side-panel-collapsed/);
|
|
454
|
+
await page.waitForTimeout(700);
|
|
455
|
+
expect(layoutPuts).toBe(0);
|
|
456
|
+
const persisted = await serverApi("/api/interface-preferences");
|
|
457
|
+
assert.deepEqual(persisted.data.layout.sidePanel.sectionOrder, serverSideOrder);
|
|
458
|
+
assert.equal(persisted.data.layout.sidePanel.collapsed, false);
|
|
459
|
+
await context.close();
|
|
460
|
+
});
|
|
461
|
+
|
|
462
|
+
test("failed layout writes remain pending across reload and later synchronize", async ({ browser }) => {
|
|
463
|
+
const current = await serverApi("/api/interface-preferences");
|
|
464
|
+
await serverApi("/api/interface-preferences", {
|
|
465
|
+
method: "PUT",
|
|
466
|
+
body: {
|
|
467
|
+
expectedLayoutRevision: current.data.layoutRevision,
|
|
468
|
+
layout: { version: 1, composerActions: { order: ["send", "new"], grid: null } },
|
|
469
|
+
},
|
|
470
|
+
});
|
|
471
|
+
|
|
472
|
+
const context = await browser.newContext({ viewport: { width: 1440, height: 900 } });
|
|
473
|
+
const page = await context.newPage();
|
|
474
|
+
let allowWrites = false;
|
|
475
|
+
let failedWrites = 0;
|
|
476
|
+
await page.route("**/api/interface-preferences", async (route) => {
|
|
477
|
+
if (route.request().method() === "PUT" && route.request().postDataJSON()?.layout && !allowWrites) {
|
|
478
|
+
failedWrites += 1;
|
|
479
|
+
await route.abort("failed");
|
|
480
|
+
return;
|
|
481
|
+
}
|
|
482
|
+
await route.continue();
|
|
483
|
+
});
|
|
484
|
+
|
|
485
|
+
await page.goto(baseURL);
|
|
486
|
+
await expect.poll(() => page.evaluate((key) => JSON.parse(localStorage.getItem(key) || "[]").slice(0, 2), layoutKeys.composerOrder)).toEqual(["send", "new"]);
|
|
487
|
+
const newSession = page.locator('[data-composer-action-id="new"]');
|
|
488
|
+
await newSession.focus();
|
|
489
|
+
await newSession.press("Alt+ArrowLeft");
|
|
490
|
+
await expect.poll(() => page.evaluate((key) => JSON.parse(localStorage.getItem(key) || "[]").slice(0, 2), layoutKeys.composerOrder)).toEqual(["new", "send"]);
|
|
491
|
+
await expect.poll(() => failedWrites).toBeGreaterThan(0);
|
|
492
|
+
await expect.poll(() => page.evaluate(() => Object.keys(localStorage).find((key) => key.startsWith("pi-webui-ui-layout-pending-v3:")) || null)).not.toBeNull();
|
|
493
|
+
|
|
494
|
+
await page.reload();
|
|
495
|
+
await expect.poll(() => page.evaluate((key) => JSON.parse(localStorage.getItem(key) || "[]").slice(0, 2), layoutKeys.composerOrder)).toEqual(["new", "send"]);
|
|
496
|
+
allowWrites = true;
|
|
497
|
+
await page.evaluate(() => window.dispatchEvent(new Event("online")));
|
|
498
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.composerActions.order.slice(0, 2)).toEqual(["new", "send"]);
|
|
499
|
+
await expect.poll(() => page.evaluate(() => Object.keys(localStorage).find((key) => key.startsWith("pi-webui-ui-layout-pending-v3:")) || null)).toBeNull();
|
|
500
|
+
await context.close();
|
|
501
|
+
});
|
|
502
|
+
|
|
503
|
+
test("conflict retry updates only the changed Control Deck subfield", async ({ browser }) => {
|
|
504
|
+
const current = await serverApi("/api/interface-preferences");
|
|
505
|
+
const initialOrder = ["files", "controls", "git"];
|
|
506
|
+
await serverApi("/api/interface-preferences", {
|
|
507
|
+
method: "PUT",
|
|
508
|
+
body: {
|
|
509
|
+
expectedLayoutRevision: current.data.layoutRevision,
|
|
510
|
+
layout: {
|
|
511
|
+
version: 1,
|
|
512
|
+
sidePanel: {
|
|
513
|
+
sectionOrder: initialOrder,
|
|
514
|
+
collapsedSectionIds: [],
|
|
515
|
+
hiddenSectionIds: [],
|
|
516
|
+
collapsed: false,
|
|
517
|
+
},
|
|
518
|
+
},
|
|
519
|
+
},
|
|
520
|
+
});
|
|
521
|
+
|
|
522
|
+
const contextA = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
523
|
+
const contextB = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
524
|
+
const pageA = await contextA.newPage();
|
|
525
|
+
const pageB = await contextB.newPage();
|
|
526
|
+
await Promise.all([pageA.goto(baseURL), pageB.goto(baseURL)]);
|
|
527
|
+
await expect.poll(async () => (await sectionOrder(pageA)).slice(0, initialOrder.length)).toEqual(initialOrder);
|
|
528
|
+
await expect.poll(async () => (await sectionOrder(pageB)).slice(0, initialOrder.length)).toEqual(initialOrder);
|
|
529
|
+
|
|
530
|
+
const controlsA = pageA.locator('[data-side-panel-section-toggle="controls"]');
|
|
531
|
+
await controlsA.focus();
|
|
532
|
+
await controlsA.press("Alt+ArrowDown");
|
|
533
|
+
const newerOrder = ["files", "git", "controls"];
|
|
534
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.sidePanel.sectionOrder.slice(0, newerOrder.length)).toEqual(newerOrder);
|
|
535
|
+
|
|
536
|
+
await pageB.locator("#toggleSidePanelButton").click();
|
|
537
|
+
await expect(pageB.locator("body")).toHaveClass(/side-panel-collapsed/);
|
|
538
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.sidePanel.collapsed).toBe(true);
|
|
539
|
+
const final = await serverApi("/api/interface-preferences");
|
|
540
|
+
assert.deepEqual(final.data.layout.sidePanel.sectionOrder.slice(0, newerOrder.length), newerOrder, "a stale collapse retry must not revert another browser's newer section order");
|
|
541
|
+
|
|
542
|
+
await Promise.all([contextA.close(), contextB.close()]);
|
|
543
|
+
});
|
|
544
|
+
|
|
545
|
+
test("one tab cannot erase another tab's failed pending journal", async ({ browser }) => {
|
|
546
|
+
const current = await serverApi("/api/interface-preferences");
|
|
547
|
+
await serverApi("/api/interface-preferences", {
|
|
548
|
+
method: "PUT",
|
|
549
|
+
body: {
|
|
550
|
+
expectedLayoutRevision: current.data.layoutRevision,
|
|
551
|
+
layout: {
|
|
552
|
+
version: 1,
|
|
553
|
+
sidePanel: {
|
|
554
|
+
sectionOrder: ["files", "controls", "git"],
|
|
555
|
+
collapsedSectionIds: [],
|
|
556
|
+
hiddenSectionIds: [],
|
|
557
|
+
collapsed: false,
|
|
558
|
+
},
|
|
559
|
+
composerActions: { order: ["send", "new"], grid: null },
|
|
560
|
+
},
|
|
561
|
+
},
|
|
562
|
+
});
|
|
563
|
+
|
|
564
|
+
const context = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
565
|
+
const pageA = await context.newPage();
|
|
566
|
+
const pageB = await context.newPage();
|
|
567
|
+
let allowComposerWrites = false;
|
|
568
|
+
let failedComposerWrites = 0;
|
|
569
|
+
await pageA.route("**/api/interface-preferences", async (route) => {
|
|
570
|
+
const payload = route.request().method() === "PUT" ? route.request().postDataJSON() : null;
|
|
571
|
+
if (payload?.layout?.composerActions && !allowComposerWrites) {
|
|
572
|
+
failedComposerWrites += 1;
|
|
573
|
+
await route.abort("failed");
|
|
574
|
+
return;
|
|
575
|
+
}
|
|
576
|
+
await route.continue();
|
|
577
|
+
});
|
|
578
|
+
await Promise.all([pageA.goto(baseURL), pageB.goto(baseURL)]);
|
|
579
|
+
|
|
580
|
+
const newSession = pageA.locator('[data-composer-action-id="new"]');
|
|
581
|
+
await newSession.focus();
|
|
582
|
+
await newSession.press("Alt+ArrowLeft");
|
|
583
|
+
await expect.poll(() => failedComposerWrites).toBeGreaterThan(0);
|
|
584
|
+
await expect.poll(() => pageA.evaluate(() => Object.keys(localStorage).filter((key) => key.startsWith("pi-webui-ui-layout-pending-v3:")).length)).toBeGreaterThan(0);
|
|
585
|
+
|
|
586
|
+
await pageB.locator("#toggleSidePanelButton").click();
|
|
587
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.sidePanel.collapsed).toBe(true);
|
|
588
|
+
await expect.poll(() => pageB.evaluate(() => Object.keys(localStorage)
|
|
589
|
+
.filter((key) => key.startsWith("pi-webui-ui-layout-pending-v3:"))
|
|
590
|
+
.map((key) => JSON.parse(localStorage.getItem(key) || "null"))
|
|
591
|
+
.some((record) => record?.field === "composerActions"))).toBe(true);
|
|
592
|
+
|
|
593
|
+
await pageA.reload();
|
|
594
|
+
await expect.poll(() => pageA.evaluate((key) => JSON.parse(localStorage.getItem(key) || "[]").slice(0, 2), layoutKeys.composerOrder)).toEqual(["new", "send"]);
|
|
595
|
+
allowComposerWrites = true;
|
|
596
|
+
await pageA.evaluate(() => window.dispatchEvent(new Event("online")));
|
|
597
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.composerActions.order.slice(0, 2)).toEqual(["new", "send"]);
|
|
598
|
+
await context.close();
|
|
599
|
+
});
|
|
600
|
+
|
|
601
|
+
test("in-flight sibling acknowledgement clears only the acknowledged subfield", async ({ browser }) => {
|
|
602
|
+
const current = await serverApi("/api/interface-preferences");
|
|
603
|
+
const initialOrder = ["files", "controls", "git"];
|
|
604
|
+
await serverApi("/api/interface-preferences", {
|
|
605
|
+
method: "PUT",
|
|
606
|
+
body: {
|
|
607
|
+
expectedLayoutRevision: current.data.layoutRevision,
|
|
608
|
+
layout: {
|
|
609
|
+
version: 1,
|
|
610
|
+
sidePanel: {
|
|
611
|
+
sectionOrder: initialOrder,
|
|
612
|
+
collapsedSectionIds: [],
|
|
613
|
+
hiddenSectionIds: [],
|
|
614
|
+
collapsed: false,
|
|
615
|
+
},
|
|
616
|
+
},
|
|
617
|
+
},
|
|
618
|
+
});
|
|
619
|
+
|
|
620
|
+
const contextA = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
621
|
+
const contextB = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
622
|
+
const pageA = await contextA.newPage();
|
|
623
|
+
const pageB = await contextB.newPage();
|
|
624
|
+
let interceptWrites = false;
|
|
625
|
+
let firstOrderFetched;
|
|
626
|
+
let releaseFirstOrder;
|
|
627
|
+
let secondWriteSeen;
|
|
628
|
+
let releaseSecondWrite;
|
|
629
|
+
let secondPayload = null;
|
|
630
|
+
const firstOrderFetchedPromise = new Promise((resolve) => { firstOrderFetched = resolve; });
|
|
631
|
+
const releaseFirstOrderPromise = new Promise((resolve) => { releaseFirstOrder = resolve; });
|
|
632
|
+
const secondWriteSeenPromise = new Promise((resolve) => { secondWriteSeen = resolve; });
|
|
633
|
+
const releaseSecondWritePromise = new Promise((resolve) => { releaseSecondWrite = resolve; });
|
|
634
|
+
let firstOrderIntercepted = false;
|
|
635
|
+
let secondWriteIntercepted = false;
|
|
636
|
+
await pageA.route("**/api/interface-preferences", async (route) => {
|
|
637
|
+
const request = route.request();
|
|
638
|
+
const payload = request.method() === "PUT" ? request.postDataJSON() : null;
|
|
639
|
+
if (interceptWrites && payload?.layout && !firstOrderIntercepted && payload.layout.sidePanel?.sectionOrder) {
|
|
640
|
+
firstOrderIntercepted = true;
|
|
641
|
+
const response = await route.fetch();
|
|
642
|
+
firstOrderFetched();
|
|
643
|
+
await releaseFirstOrderPromise;
|
|
644
|
+
await route.fulfill({ response });
|
|
645
|
+
return;
|
|
646
|
+
}
|
|
647
|
+
if (interceptWrites && payload?.layout && firstOrderIntercepted && !secondWriteIntercepted) {
|
|
648
|
+
secondWriteIntercepted = true;
|
|
649
|
+
secondPayload = payload;
|
|
650
|
+
secondWriteSeen();
|
|
651
|
+
await releaseSecondWritePromise;
|
|
652
|
+
await route.continue();
|
|
653
|
+
return;
|
|
654
|
+
}
|
|
655
|
+
await route.continue();
|
|
656
|
+
});
|
|
657
|
+
await Promise.all([pageA.goto(baseURL), pageB.goto(baseURL)]);
|
|
658
|
+
interceptWrites = true;
|
|
659
|
+
|
|
660
|
+
const controlsA = pageA.locator('[data-side-panel-section-toggle="controls"]');
|
|
661
|
+
await controlsA.focus();
|
|
662
|
+
await controlsA.press("Alt+ArrowDown");
|
|
663
|
+
await firstOrderFetchedPromise;
|
|
664
|
+
await pageA.locator("#toggleSidePanelButton").click();
|
|
665
|
+
releaseFirstOrder();
|
|
666
|
+
await secondWriteSeenPromise;
|
|
667
|
+
assert.equal(Object.hasOwn(secondPayload.layout.sidePanel || {}, "sectionOrder"), false, "the acknowledged order must not remain in the pending collapse patch");
|
|
668
|
+
assert.equal(secondPayload.layout.sidePanel?.collapsed, true);
|
|
669
|
+
|
|
670
|
+
const controlsB = pageB.locator('[data-side-panel-section-toggle="controls"]');
|
|
671
|
+
await controlsB.focus();
|
|
672
|
+
await controlsB.press("Alt+ArrowUp");
|
|
673
|
+
const browserBOrder = ["controls", "files", "git"];
|
|
674
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.sidePanel.sectionOrder.slice(0, browserBOrder.length)).toEqual(browserBOrder);
|
|
675
|
+
releaseSecondWrite();
|
|
676
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.sidePanel.collapsed).toBe(true);
|
|
677
|
+
const final = await serverApi("/api/interface-preferences");
|
|
678
|
+
assert.deepEqual(final.data.layout.sidePanel.sectionOrder.slice(0, browserBOrder.length), browserBOrder);
|
|
679
|
+
await Promise.all([contextA.close(), contextB.close()]);
|
|
680
|
+
});
|
|
681
|
+
|
|
682
|
+
test("a delayed GET cannot regress the revision acknowledged by a newer PUT", async ({ browser }) => {
|
|
683
|
+
const current = await serverApi("/api/interface-preferences");
|
|
684
|
+
await serverApi("/api/interface-preferences", {
|
|
685
|
+
method: "PUT",
|
|
686
|
+
body: {
|
|
687
|
+
expectedLayoutRevision: current.data.layoutRevision,
|
|
688
|
+
layout: {
|
|
689
|
+
version: 1,
|
|
690
|
+
sidePanel: {
|
|
691
|
+
sectionOrder: ["files", "controls", "git"],
|
|
692
|
+
collapsedSectionIds: [],
|
|
693
|
+
hiddenSectionIds: [],
|
|
694
|
+
collapsed: false,
|
|
695
|
+
},
|
|
696
|
+
},
|
|
697
|
+
},
|
|
698
|
+
});
|
|
699
|
+
|
|
700
|
+
const context = await browser.newContext({ viewport: { width: 1680, height: 1000 } });
|
|
701
|
+
const page = await context.newPage();
|
|
702
|
+
let holdReconcileGet = false;
|
|
703
|
+
let delayedGetCaptured;
|
|
704
|
+
let releaseDelayedGet;
|
|
705
|
+
let captureNextPut = false;
|
|
706
|
+
let capturedExpectedRevision = null;
|
|
707
|
+
const delayedGetCapturedPromise = new Promise((resolve) => { delayedGetCaptured = resolve; });
|
|
708
|
+
const releaseDelayedGetPromise = new Promise((resolve) => { releaseDelayedGet = resolve; });
|
|
709
|
+
await page.route("**/api/interface-preferences", async (route) => {
|
|
710
|
+
const request = route.request();
|
|
711
|
+
if (holdReconcileGet && request.method() === "GET") {
|
|
712
|
+
holdReconcileGet = false;
|
|
713
|
+
const response = await route.fetch();
|
|
714
|
+
delayedGetCaptured();
|
|
715
|
+
await releaseDelayedGetPromise;
|
|
716
|
+
await route.fulfill({ response });
|
|
717
|
+
return;
|
|
718
|
+
}
|
|
719
|
+
if (captureNextPut && request.method() === "PUT" && request.postDataJSON()?.layout) {
|
|
720
|
+
captureNextPut = false;
|
|
721
|
+
capturedExpectedRevision = request.postDataJSON().expectedLayoutRevision;
|
|
722
|
+
}
|
|
723
|
+
await route.continue();
|
|
724
|
+
});
|
|
725
|
+
await page.goto(baseURL);
|
|
726
|
+
holdReconcileGet = true;
|
|
727
|
+
await page.evaluate(() => window.dispatchEvent(new Event("online")));
|
|
728
|
+
await delayedGetCapturedPromise;
|
|
729
|
+
|
|
730
|
+
const controls = page.locator('[data-side-panel-section-toggle="controls"]');
|
|
731
|
+
await controls.focus();
|
|
732
|
+
await controls.press("Alt+ArrowDown");
|
|
733
|
+
const newerOrder = ["files", "git", "controls"];
|
|
734
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.sidePanel.sectionOrder.slice(0, newerOrder.length)).toEqual(newerOrder);
|
|
735
|
+
const revisionAfterPut = (await serverApi("/api/interface-preferences")).data.layoutRevision;
|
|
736
|
+
releaseDelayedGet();
|
|
737
|
+
await page.waitForTimeout(300);
|
|
738
|
+
|
|
739
|
+
captureNextPut = true;
|
|
740
|
+
await page.locator("#toggleSidePanelButton").click();
|
|
741
|
+
await expect.poll(() => capturedExpectedRevision).toBe(revisionAfterPut);
|
|
742
|
+
await expect.poll(async () => (await serverApi("/api/interface-preferences")).data.layout.sidePanel.collapsed).toBe(true);
|
|
743
|
+
await context.close();
|
|
744
|
+
});
|