Skip to content

Keep chart order lines visible during bulk cancel #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackhai9 merged 1 commit into from
Sep 1, 2026
Merged

Keep chart order lines visible during bulk cancel #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions e2e/binance-orderbook/fixtures/binance-futures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,9 @@ export function renderBinanceFuturesFixture(scenario) {
record('cancel-requested', { symbol: scenario.currentSymbol });
setTimeout(() => {
if (scenario.host.clearMode === 'currentSymbol') {
const removedOrders = currentOrders().map((item) => ({ ...item }));
state.orders = state.orders.filter((item) => item.symbol !== scenario.currentSymbol);
scheduleChartOrderRemovals(removedOrders);
}
closeDialog('confirm');
renderAccountWidget();
Expand Down Expand Up @@ -402,6 +404,25 @@ export function renderBinanceFuturesFixture(scenario) {
},
};

function scheduleChartOrderRemovals(orders) {
if (!state.showOrders) return;
orders.forEach((order, index) => {
setTimeout(() => {
tradingViewApi.emit('drawing_event', 'order-' + order.id, 'remove');
record('chart-save-requested', {
checked: true,
index,
orderId: order.id,
});
tradingViewApi.saveChart({
checked: true,
drawingCount: Math.max(0, orders.length - index - 1),
finalOrderId: order.id,
});
}, scenario.host.mutationDelayMs + (index * 2));
});
}

function renderChartOrdersPopover() {
chartOrdersPopover.innerHTML =
'<div role="checkbox" aria-checked="true">仓位</div>' +
Expand Down
19 changes: 9 additions & 10 deletions e2e/binance-orderbook/specs/cancel-covering-matrix.pw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ for (const entry of CANCEL_COVERING_SCENARIOS) {
await expect(page.getByRole('button', { name: '无挂单' })).toBeVisible();
} else {
await expect(page.getByRole('dialog')).toBeVisible();
await expect.poll(async () => (await readFixtureState(page)).showOrders).toBe(false);
await expect.poll(async () => (await readFixtureState(page)).showOrders).toBe(
scenario.ui.showOrders,
);
await page.getByRole('button', {
name: vector.dialogOutcome === 'confirm' ? '确认' : '取消',
}).click();
Expand Down Expand Up @@ -79,19 +81,16 @@ for (const entry of CANCEL_COVERING_SCENARIOS) {
hasCurrentOrders && vector.dialogOutcome === 'confirm' ? 1 : 0,
);
const currentOrderCount = currentSymbolOrders(scenario).length;
const expectedChartToggleCount = hasCurrentOrders && scenario.ui.showOrders ? 2 : 0;
const expectedChartSaveBurstCount = expectedChartToggleCount === 0
? 0
: vector.dialogOutcome === 'confirm' ? 1 : 2;
const expectedChartSaveRequestCount = expectedChartSaveBurstCount * currentOrderCount;
expect(state.events.filter((event) => event.type === 'chart-orders-checked')).toHaveLength(
expectedChartToggleCount,
);
const expectsChartRemovalSave = hasCurrentOrders
&& scenario.ui.showOrders
&& vector.dialogOutcome === 'confirm';
const expectedChartSaveRequestCount = expectsChartRemovalSave ? currentOrderCount : 0;
expect(state.events.filter((event) => event.type === 'chart-orders-checked')).toHaveLength(0);
expect(state.events.filter((event) => event.type === 'chart-save-requested')).toHaveLength(
expectedChartSaveRequestCount,
);
expect(state.events.filter((event) => event.type === 'chart-saved')).toHaveLength(
expectedChartSaveBurstCount,
expectsChartRemovalSave ? 1 : 0,
);
expect(errors).toEqual([]);
});
Expand Down
62 changes: 23 additions & 39 deletions e2e/binance-orderbook/specs/cancel-current-symbol.pw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ test('cancelling the native dialog preserves current and other orders and restor

await page.getByRole('button', { name: '撤单' }).click();
await expect(page.getByRole('dialog')).toBeVisible();
await expect.poll(async () => (await readFixtureState(page)).showOrders).toBe(false);
await expect.poll(async () => (await readFixtureState(page)).showOrders).toBe(true);
await page.getByRole('button', { name: '取消' }).click();
await expect(page.getByText('撤单已取消')).toBeVisible();

Expand All @@ -105,7 +105,7 @@ test('cancelling the native dialog preserves current and other orders and restor
expect(errors).toEqual([]);
});

test('a 70-order drawing burst split across tasks performs one full save per toggle', async ({ page }) => {
test('a 70-order confirmed cancellation keeps drawings visible and performs one final full save', async ({ page }) => {
const orders = Array.from({ length: 70 }, (_, index) => ({
id: `current-${index + 1}`,
symbol: 'HYPEUSDT',
Expand All @@ -123,48 +123,34 @@ test('a 70-order drawing burst split across tasks performs one full save per tog

await page.getByRole('button', { name: '撤单' }).click();
await expect(page.getByRole('dialog')).toBeVisible();
await expect.poll(async () => (await readFixtureState(page)).showOrders).toBe(false);
await page.getByRole('button', { name: '取消' }).click();
await expect(page.getByText('撤单已取消')).toBeVisible();
await expect.poll(async () => (await readFixtureState(page)).showOrders).toBe(true);
await page.getByRole('button', { name: '确认' }).click();
await expect(page.getByText('撤单已完成')).toBeVisible();

const state = await readFixtureState(page);
expect(state.orders).toEqual(orders);
expect(state.orders).toEqual([]);
expect(
state.events.filter((event) => event.type === 'chart-save-requested'),
).toHaveLength(140);
expect(state.events.filter((event) => event.type === 'chart-saved')).toHaveLength(2);
).toHaveLength(70);
expect(state.events.filter((event) => event.type === 'chart-saved')).toHaveLength(1);
expect(
state.events
.filter((event) => event.type === 'chart-orders-checked')
.map((event) => event.value),
).toEqual([false, true]);
for (const checked of [false, true]) {
const checkedIndex = state.events.findIndex(
(event) => event.type === 'chart-orders-checked' && event.value === checked,
);
const popoverClosedIndex = state.events.findIndex(
(event, index) => index > checkedIndex && event.type === 'chart-orders-popover-closed',
);
const finalSaveRequestIndex = state.events.findLastIndex(
(event) => event.type === 'chart-save-requested' && event.checked === checked,
);
const fullSaveIndex = state.events.findIndex(
(event, index) => index > finalSaveRequestIndex
&& event.type === 'chart-saved'
&& event.snapshot.checked === checked,
);
expect(popoverClosedIndex).toBeGreaterThan(checkedIndex);
expect(popoverClosedIndex).toBeLessThan(finalSaveRequestIndex);
expect(popoverClosedIndex).toBeLessThan(fullSaveIndex);
}
).toEqual([]);
const finalSaveRequestIndex = state.events.findLastIndex(
(event) => event.type === 'chart-save-requested',
);
const fullSaveIndex = state.events.findIndex((event) => event.type === 'chart-saved');
expect(fullSaveIndex).toBeGreaterThan(finalSaveRequestIndex);
await expectRestoredState(page, scenario);
const probe = await finishInteractionProbe(page);
assertResponsiveInteraction(expect, probe);
assertStableGeometry(expect, probe.baseline, probe.current);
expect(errors).toEqual([]);
});

test('a popover close failure does not discard coalesced chart saves', async ({ page }) => {
test('bulk cancel no longer depends on the chart orders popover', async ({ page }) => {
const scenario = createCancelScenario({
positions: POSITION_SETS.current,
orders: ORDER_SETS.current,
Expand All @@ -174,17 +160,19 @@ test('a popover close failure does not discard coalesced chart saves', async ({
const { errors } = await openUserscriptScenario(page, scenario);

await page.getByRole('button', { name: '撤单' }).click();
await expect(page.getByText('未能恢复图表当前委托显示')).toBeVisible({ timeout: 6_000 });
await expect(page.getByRole('dialog')).toBeVisible();
await page.getByRole('button', { name: '取消' }).click();
await expect(page.getByText('撤单已取消')).toBeVisible();

const state = await readFixtureState(page);
expect(state.dialogOpen).toBe(false);
expect(state.orders).toEqual(ORDER_SETS.current);
expect(state.showOrders).toBe(true);
expect(state.events.filter((event) => event.type === 'chart-save-requested')).toHaveLength(2);
expect(state.events.filter((event) => event.type === 'chart-saved')).toHaveLength(2);
expect(state.events.filter((event) => event.type === 'chart-save-requested')).toHaveLength(0);
expect(state.events.filter((event) => event.type === 'chart-saved')).toHaveLength(0);
expect(
state.events.filter((event) => event.type === 'chart-orders-popover-close-requested'),
).toHaveLength(2);
).toHaveLength(0);
expect(errors).toEqual([]);
});

Expand Down Expand Up @@ -317,7 +305,7 @@ test('a real pagehide aborts dialog tracking without mutating orders', async ({
const state = await readFixtureState(page);
expect(state.orders).toEqual(ORDER_SETS.current);
expect(state.events.filter((event) => event.type === 'cancel-requested')).toEqual([]);
expect(state.showOrders).toBe(false);
expect(state.showOrders).toBe(true);
expect(state.hideOtherSymbols).toBe(true);
expect(errors).toEqual([]);
});
Expand Down Expand Up @@ -360,11 +348,7 @@ for (const dialogMode of ['extraAction', 'missingPrimary']) {
const state = await readFixtureState(page);
expect(state.orders).toEqual(ORDER_SETS.current);
expect(state.events.filter((event) => event.type === 'cancel-requested')).toEqual([]);
expect(
state.events
.filter((event) => event.type === 'chart-orders-checked')
.map((event) => event.value),
).toEqual([false, true]);
expect(state.events.filter((event) => event.type === 'chart-orders-checked')).toEqual([]);
expect(state.showOrders).toBe(true);
expect(state.hideOtherSymbols).toBe(true);
expect(errors).toEqual([]);
Expand Down
Loading
Loading