Порівняти коміти

...
Автор SHA1 Повідомлення Дата
l0ng-ai 7f5403ba8a fix(database): table tabs keep their filter, sort and page when switching tabs
Table editor tabs unmounted when another tab was shown, so their WHERE / ORDER BY
text, paging and unsubmitted edits were lost and the rows were queried again.
Table tabs are now kept alive like other editors, and the view state (filter,
sort, page) is remembered per table so a tab that is closed and reopened, or
dropped from the kept set, starts from the same view.

Fixes #4158
2026-11-18 17:47:09 +08:00
3 змінених файлів з 59 додано та 6 видалено

No files matched your search

+33 -5
Переглянути файл
@@ -39,13 +39,41 @@ const PAGE_SIZES = ["100", "500", "1000", "5000"];
export { tableTitle } from "./tableInput";
/** WHERE, ORDER BY and page of a table tab, kept when a tab that is no longer kept alive mounts again. */
interface TableViewState {
offset: number;
limit: number;
sort: DbSortKey[];
filterText: string;
filter: string;
}
const MAX_VIEW_STATES = 100;
const viewStates = new Map<string, TableViewState>();
function rememberViewState(key: string, state: TableViewState) {
viewStates.delete(key);
viewStates.set(key, state);
if (viewStates.size > MAX_VIEW_STATES) viewStates.delete(viewStates.keys().next().value!);
}
/** Test hook: forget the remembered table view states. */
export function _resetTableViewStates() {
viewStates.clear();
}
export function TableEditor({ input }: { input: EditorInput }) {
const ref = input.data as TableRef;
const [offset, setOffset] = useState(0);
const [limit, setLimit] = useState(500);
const [sort, setSort] = useState<DbSortKey[]>([]);
const [filterText, setFilterText] = useState("");
const [filter, setFilter] = useState("");
const [initial] = useState(() => viewStates.get(input.key));
const [offset, setOffset] = useState(initial?.offset ?? 0);
const [limit, setLimit] = useState(initial?.limit ?? 500);
const [sort, setSort] = useState<DbSortKey[]>(initial?.sort ?? []);
const [filterText, setFilterText] = useState(initial?.filterText ?? "");
const [filter, setFilter] = useState(initial?.filter ?? "");
useEffect(
() => rememberViewState(input.key, { offset, limit, sort, filterText, filter }),
[input.key, offset, limit, sort, filterText, filter],
);
const [nonce, setNonce] = useState(0);
const [edits, setEdits] = useState<PendingEdits>(emptyEdits);
const [panel, setPanel] = useState<DataPanel | null>(null);
+2
Переглянути файл
@@ -111,6 +111,8 @@ export function activate(): () => void {
component: lazyComponent(() => import("./TableEditor").then((m) => m.TableEditor)),
title: tableTitle,
icon: () => "database",
// Switching tabs keeps the rows, filters, page and unsubmitted edits without querying again.
keepAlive: true,
}),
registerOverlay({
id: "database.dialogs",
+24 -1
Переглянути файл
@@ -4,7 +4,7 @@ import type { DbDriver, DbTablePage } from "@/platform/ipc";
import { installKeyboardDispatcher, useKeymap } from "@/platform/keymap";
import { activeCellGrid, installCellActions } from "./cellActions";
import { getContext } from "@/platform/context";
import { TableEditor } from "./TableEditor";
import { TableEditor, _resetTableViewStates } from "./TableEditor";
import { activeTableEditor, installTableEditorFocus } from "./tableEditorFocus";
import { tableInput } from "./tableInput";
@@ -59,6 +59,7 @@ const page: DbTablePage = {
};
beforeEach(() => {
_resetTableViewStates();
backend.driver = "clickhouse";
backend.page.mockResolvedValue({ status: "ok", data: page });
backend.applyEdits.mockClear();
@@ -211,3 +212,25 @@ it("omits a reset inserted cell from Submit instead of writing SQL NULL", async
disposeActions();
}
});
describe("table editor view state", () => {
it("queries with the sort it had when its tab mounts again", async () => {
const input = tableInput("source", "default", "users");
let view!: ReturnType<typeof render>;
await act(async () => {
view = render(<TableEditor input={input} />);
});
await screen.findByRole("gridcell", { name: "Ann" });
await act(async () => {
fireEvent.click(screen.getByRole("columnheader", { name: /name/ }));
});
const sorted = backend.page.mock.calls.at(-1)!;
expect(sorted[5]).toEqual([{ column: "name", descending: false }]);
view.unmount();
backend.page.mockClear();
await act(async () => {
render(<TableEditor input={input} />);
});
expect(backend.page.mock.calls[0]![5]).toEqual(sorted[5]);
});
});