From 80cd461ea1717ac440981056448d5fe7b36d7d39 Mon Sep 17 00:00:00 2001 From: Eve <92513238+1320209572@users.noreply.github.com> Date: Tue, 8 Sep 2026 11:50:26 +0800 Subject: [PATCH] fix(grid): keep restored sort out of where clause --- apps/desktop/src/components/layout/ContentArea.vue | 2 +- .../__tests__/ContentArea.unavailableDataReload.spec.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue index bd12425b16..4eff8a21aa 100644 --- a/apps/desktop/src/components/layout/ContentArea.vue +++ b/apps/desktop/src/components/layout/ContentArea.vue @@ -939,7 +939,7 @@ function refreshQueryEditorCompletionCache(): boolean { function reloadUnavailableDataTab() { const { whereInput, orderBy } = restoredDataTabReloadFilters(props.activeTab); - emit("reload", props.activeTab.id, undefined, whereInput, orderBy); + emit("reload", props.activeTab.id, undefined, undefined, whereInput, orderBy); } function refreshData(): boolean { diff --git a/apps/desktop/src/components/layout/__tests__/ContentArea.unavailableDataReload.spec.ts b/apps/desktop/src/components/layout/__tests__/ContentArea.unavailableDataReload.spec.ts index b6240ed8ff..24133330b5 100644 --- a/apps/desktop/src/components/layout/__tests__/ContentArea.unavailableDataReload.spec.ts +++ b/apps/desktop/src/components/layout/__tests__/ContentArea.unavailableDataReload.spec.ts @@ -15,7 +15,8 @@ describe("ContentArea restored data-tab refresh", () => { it("passes the restored tab's own WHERE/ORDER BY into the reload event", () => { expect(contentAreaSource).toContain("const { whereInput, orderBy } = restoredDataTabReloadFilters(props.activeTab);"); - // tabId-first contract: the reload event carries the owning tab's id. - expect(contentAreaSource).toContain(`emit("reload", props.activeTab.id, undefined, whereInput, orderBy);`); + // The tabId-first contract still reserves the sql and searchText slots before + // the restored filters. Omitting either placeholder shifts ORDER BY into WHERE. + expect(contentAreaSource).toContain(`emit("reload", props.activeTab.id, undefined, undefined, whereInput, orderBy);`); }); });